From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Mon, 19 Dec 2011 13:40:28 +0000 (+0100)
Subject: merged from debian-sid
X-Git-Tag: 0.9.0~38
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/0418949ebe9fc886e7794fa1de17c8b6c74e65ea

merged from debian-sid
---

0418949ebe9fc886e7794fa1de17c8b6c74e65ea
diff --cc debian/changelog
index 197e27a65,4fb8b89bc..dc8ffbf8d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,243 -1,21 +1,261 @@@
 +apt (0.8.16~exp9) UNRELEASED; urgency=low
 +
 +  [ Julian Andres Klode ]
 +  * apt-pkg/cdrom.cc:
 +    - Accept .bz2, .xz files in addition to .gz files (Closes: #649451)
 +
 +  [ Michael Vogt ]
 +  * apt-pkg/cdrom.cc:
 +    - use aptconfiguration to get the supported compression types
 +  * debian/control:
 +    - bump debhelper build-dep to debhelper (>= 8.1.3~)
 +    - set libapt-pkg-dev to multi-arch: same too
 +
 +  [ Colin Watson ]
 +  * Convert libapt-pkg4.12 and libapt-inst1.4 to Multi-Arch: same.
 +
 +  [ David Kalnischkies ]
 +  * apt-pkg/cacheset.cc:
 +    - make the cachesets real containers which can embedding any container
 +      to be able to use the same interface regardless of set or list usage
 +    - provide a {Package,Version}List similar to {Package,Version}Set
 +  * cmdline/apt-{get,cache,mark}.cc:
 +    - use Lists instead of Sets if input order should be preserved for
 +      commands accepting lists of packages, e.g. policy (Closes: #625960)
 +  * apt-pkg/depcache.cc:
 +    - prefer native providers over foreigns even if the chain is foreign
 +  * cmdline/apt-get.cc:
 +    - ignore foreign architectures if we check if a provides has only one
 +      resolver as it's basically the same for the user, so no need to choose
 +  * cmdline/apt-config.cc:
 +    - dump the APT::Compressor settings correctly and completely
 +  * apt-pkg/contrib/fileutl.{h,cc}:
 +    - implement a ModificationTime method for FileFd
 +    - add a ReadLine method
 +    - drop the explicit export of gz-compression handling
 +  * apt-pkg/cdrom.cc:
 +    - support InRelease files on cdrom
 +
 + -- David Kalnischkies <kalnischkies@gmail.com>  Sun, 11 Dec 2011 19:34:58 +0100
 +
 +apt (0.8.16~exp8) experimental; urgency=low
 +
 +  [ David Kalnischkies ]
 +  * algorithms.cc:
 +    - show a debug why a package was kept by ResolveByKeep()
 +  * apt-pkg/packagemanager.cc:
 +    - do not fail on unpacked packages in SmartUnPack, just don't
 +      shedule them for unpack, but do all checks and configure them
 +    - do not enter an endless loop for (essential) pre-dependency loops
 +  * apt-pkg/contrib/sha2_internal.cc:
 +    - use a pointer-union to peace gcc strict-aliasing warning
 +  * apt-pkg/deb/deblistparser.cc:
 +    - M-A: foreign packages provide for other archs, too
 +
 + -- David Kalnischkies <kalnischkies@gmail.com>  Thu, 03 Nov 2011 09:40:29 -0500
 +
 +apt (0.8.16~exp7) experimental; urgency=low
 +
 +  [ David Kalnischkies ]
 +  * do not pollute namespace in the headers with using (Closes: #500198)
 +  * use forward declaration in headers if possible instead of includes
 +  * remove old APT_COMPATIBILITY ifdef's
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - use std::vector instead of fixed size arrays to store args and
 +      multiarch-packagename strings
 +    - load the dpkg base arguments only one time and reuse them later
 +  * cmdline/apt-get.cc:
 +    - follow Provides in the evaluation of saving candidates, too, for
 +      statisfying garbage package dependencies (Closes: #640590)
 +  * apt-pkg/algorithms.cc:
 +    - if a package is garbage, don't try to save it with FixByInstall
 +  * apt-pkg/deb/debsrcrecords.cc:
 +    - remove the limit of 400 Binaries for a source package (Closes: #622110)
 +  * apt-pkg/deb/deblistparser.cc:
 +    - fix crash when the dynamic mmap needs to be grown in
 +      LoadReleaseInfo (LP: #854090)
 +  * apt-pkg/deb/debmetaindex.cc:
 +    - none is a separator, not a language: no need for Index (Closes: #624218)
 +  * apt-pkg/aptconfiguration.cc:
 +    - do not builtin languages only if none is forced (Closes: #643787)
 +  * apt-pkg/pkgcachegen.cc:
 +    - refactor MergeList by creating -Group, -Package and -Version specialist
 +    - share description list between "same" versions (LP: #868977)
 +      This also means that descriptions are shared across archives now.
 +    - add implicit dependencies needed for Multi-Arch at the time a Version
 +      struct is created and not at the end of the cache generation
 +  * apt-pkg/pkgcache.cc:
 +    - always prefer "en" over "" for "en"-language regardless of cache-order
 +
 +  [ Michael Vogt ]
 +  * apt-pkg/contrib/configuration.cc:
 +    - fix double delete (LP: #848907)
 +    - ignore only the invalid regexp instead of all options
 +  * apt-pkg/acquire-item.h, apt-pkg/deb/debmetaindex.cc:
 +    - fix fetching language information by adding OptionalSubIndexTarget
 +  * methods/https.cc:
 +    - cleanup broken downloads properly
 +
 +  [ Colin Watson ]
 +  * ftparchive/cachedb.cc:
 +    - fix buffersize in bytes2hex
 +
 + -- Michael Vogt <mvo@debian.org>  Fri, 14 Oct 2011 13:51:35 +0200
 +
 +apt (0.8.16~exp6) experimental; urgency=low
 +
 +  [ Christopher Baines ]
 +  * enable APT in unpack/configure ordering to handle loops as well
 +    as tight dependencies between immediate packages better
 +    enabling also the possibility to mark all packages as immediate
 +    (at least Closes: #353290, #540227, #559733, #621836, #639290)
 +
 +  [ David Kalnischkies ]
 +  * [abi-break] Support large files in the complete toolset. Indexes of this
 +    size are pretty unlikely for now, but we need it for deb
 +    packages which could become bigger than 4GB now (LP: #815895)
 +  * merged the debian-sid branch
 +  
 +  [ Michael Vogt ]
 +  * bump ABI version
 +
 + -- Michael Vogt <mvo@debian.org>  Wed, 14 Sep 2011 21:06:51 +0200
 +
 +apt (0.8.16~exp5) experimental; urgency=low
 +
 +  * merged the latest debian-sid fixes
 +  * apt-pkg/makefile:
 +    - install sha256.h compat header
 +  * apt-pkg/pkgcachegen.{cc,h}:
 +    - use ref-to-ptr semantic in NewDepends() to ensure that the   
 +      libapt does not segfault if the cache is remapped in between
 +      (LP: #812862)
 +    - fix crash when P.Arch() was used but the cache got remapped
 +  * apt-pkg/acquire-item.{cc,h}:
 +    - do not check for a "Package" tag in optional index targets
 +      like the translations index
 +  * apt-pkg/acquire.cc:
 +    - fix potential divide-by-zero
 +  * methods/mirror.cc:
 +    - include the architecture(s) in the query string as well so 
 +      that the server can make better decisions
 +
 + -- Michael Vogt <mvo@debian.org>  Mon, 15 Aug 2011 14:52:54 +0200
 +
 +apt (0.8.16~exp4) experimental; urgency=low
 +
 +  [ Julian Andres Klode ]
 +  * apt-pkg/pkgcache.h:
 +    - [ABI break] Add pkgCache::Header::CacheFileSize, storing the cache size
 +  * apt-pkg/pkgcachegen.cc:
 +    - Write the file size to the cache
 +  * apt-pkg/pkgcache.cc:
 +    - Check that cache is at least CacheFileSize bytes large (LP: #16467)
 +  
 +  [ Michael Vogt ]
 +  * merged latest fixes from debian-sid
 +  * apt-pkg/cdrom.{cc,h}:
 +    - cleanup old ABI break avoidance hacks
 +  * [ABI break] apt-pkg/acquire-item.{cc,h}:
 +    - cleanup around OptionalIndexTarget and SubIndexTarget
 +  * [ABI break] merged patch from Jonathan Thomas to have a new
 +    RecordField() function in the pkgRecorder parser. Many thanks
 +    Thomas
 +  * [ABI break] merge patch from Jonathan Thomas to speed up the
 +    depcache by caching the install-recommends and install-suggests
 +    values
 +  * apt-pkg/contrib/fileutl.{cc,h}:
 +    - add GetModificationTime() helper
 +  * apt-pkg/pkgcachegen.cc:
 +    - regenerate the cache if the sources.list changes to ensure
 +      that changes in the ordering there will be honored by apt
 +  * apt-pkg/sourcelist.{cc,h}:
 +    - add pkgSourceList::GetLastModifiedTime() helper
 +
 + -- Michael Vogt <mvo@debian.org>  Thu, 28 Jul 2011 16:57:08 +0200
 +
 +apt (0.8.16~exp3) experimental; urgency=low
 +
 +  [ David Kalnischkies ]
 +  * apt-pkg/pkgcache.h:
 +    - readd All{Foreign,Allowed} as suggested by Julian to
 +      remain strictly API compatible
 +  * apt-pkg/acquire*.{cc,h}:
 +    - try even harder to support really big files in the fetcher by
 +      converting (hopefully) everything to 'long long' (Closes: #632271)
 +  * ftparchive/writer.cc:
 +    - generate all checksums in one run over the file for Release
 +  * cmdline/apt-get.cc:
 +    - add an --assume-no option for testing to say 'no' to everything
 +  * apt-pkg/deb/debmetaindex.cc:
 +    - add trusted=yes option to mark unsigned (local) repository as trusted
 +      based on a patch from Ansgar Burchardt, thanks a lot! (Closes: #596498)
 +
 +  [ Michael Vogt ]
 +  * merge fixes from the debian/unstable upload
 +  * merge lp:~mvo/apt/sha512-template to get fixes for the 
 +    sha1/md5 verifiation (closes: #632520)
 +
 + -- Michael Vogt <mvo@debian.org>  Fri, 15 Jul 2011 09:56:17 +0200
 +
 +apt (0.8.16~exp2) experimental; urgency=low
 +
 +  [ David Kalnischkies ]
 +  * [ABI-Break] Implement EDSP in libapt-pkg so that all front-ends which
 +    use the internal resolver can now be used also with external
 +    ones as the usage is hidden in between the old API
 +  * provide two edsp solvers in apt-utils:
 +    - 'dump' to quickly output a complete scenario and
 +    - 'apt' to use the internal as an external resolver
 +  * apt-pkg/pkgcache.h:
 +    - clean up mess with the "all" handling in MultiArch to
 +      fix LP: #733741 cleanly for everyone now
 +  * apt-pkg/depcache.cc:
 +    - use a boolean instead of an int for Add/Remove in AddStates
 +      similar to how it works with AddSizes
 +    - let the Mark methods return if their marking was successful
 +    - if a Breaks can't be upgraded, remove it. If it or a Conflict
 +      can't be removed the installation of the breaker fails.
 +  * cmdline/apt-get.cc:
 +    - do not discard the error messages from the resolver and instead
 +      only show the general 'Broken packages' message if nothing else
 +
 +  [ Stefano Zacchiroli ]
 +  * doc/external-dependency-solver-protocol.txt:
 +    - describe EDSP and the configuration interface around it
 +  
 +  [ Michael Vogt ]
 +  * [ABI-Break] merge lp:~mvo/apt/sha512-template to add support for sha512
 +  * [ABI-Break] merge lp:~mvo/apt/dpointer to support easier extending
 +    without breaking the ABI
 +  * increase ABI version and update package names
 +
 + -- Michael Vogt <mvo@debian.org>  Wed, 29 Jun 2011 13:57:28 +0200
 +
 +apt (0.8.16~exp1) experimental; urgency=low
 +
 +  * merged with the debian/unstable upload
 +
 + -- Michael Vogt <mvo@debian.org>  Wed, 29 Jun 2011 12:40:31 +0200
 +
+ apt (0.8.15.10) UNRELEASEDunstable; urgency=low
+ 
+   [ David Kalnischkies ]
+   * algorithms.cc:
+     - show a debug why a package was kept by ResolveByKeep()
+   * doc/manpage-style.xml:
+     - put <brackets> around email addresses
+ 
+   [ Chris Leick ]
+   * German manpage translation update
+   * doc/*.xml:
+     - find and fix a bunch of misspellings
+ 
+   [ Program translation updatex ]
+   * Dutch (Jeroen Schot). Closes: #652230
+ 
+  -- David Kalnischkies <kalnischkies@gmail.com>  Sun, 20 Nov 2011 18:02:08 +0100
+ 
  apt (0.8.15.9) unstable; urgency=low
  
    [ David Kalnischkies ]
diff --cc doc/po/de.po
index 1c3ab0e90,5b5366ed4..b095e6597
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@@ -5,10 -5,10 +5,10 @@@
  #
  msgid ""
  msgstr ""
- "Project-Id-Version: apt-doc 0.8.14-1\n"
+ "Project-Id-Version: apt-doc 0.8.15-9\n"
  "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 -"POT-Creation-Date: 2011-10-05 23:06+0300\n"
 +"POT-Creation-Date: 2011-06-08 16:54+0300\n"
- "PO-Revision-Date: 2011-05-31 21:00+0100\n"
+ "PO-Revision-Date: 2011-11-13 11:21+0100\n"
  "Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
  "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
  "Language: de\n"
@@@ -1396,28 -1396,21 +1396,29 @@@ msgstr "<option>--no-enhances</option>
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-cache.8.xml:317
 +#, fuzzy
 +#| msgid ""
 +#| "Per default the <literal>depends</literal> and <literal>rdepends</"
- #| "literal> print all dependencies. This can be twicked with these flags "
++#| "literal> print all dependencies. This can be tweaked with these flags "
 +#| "which will omit the specified dependency type.  Configuration Item: "
 +#| "<literal>APT::Cache::Show<replaceable>DependencyType</replaceable></"
 +#| "literal> e.g. <literal>APT::Cache::ShowRecommends</literal>."
  msgid ""
  "Per default the <literal>depends</literal> and <literal>rdepends</literal> "
 -"print all dependencies. This can be tweaked with these flags which will omit "
 +"print all dependencies. This can be twicked with these flags which will omit "
  "the specified dependency type.  Configuration Item: <literal>APT::Cache::"
  "Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::"
  "Cache::ShowRecommends</literal>."
  msgstr ""
  "Standardmäßig geben <literal>depends</literal> und <literal>rdepends</"
- "literal> alle Abhängigkeiten aus. Dies kann mit diesen Schaltern überlistet "
+ "literal> alle Abhängigkeiten aus. Dies kann mit diesen Schaltern optimiert "
  "werden, die den angegebenen Abhängigkeitstyp weglassen. "
- "Konfigurationselement: <literal>APT::Cache::Show<replaceable>DependencyType</"
- "replaceable></literal> z.B. <literal>APT::Cache::ShowRecommends</literal>."
 -"Konfigurationselement: <literal>APT::Cache::Show<replaceable>Abhängigkeitstyp"
 -"</replaceable></literal> z.B. <literal>APT::Cache::ShowRecommends</literal>."
++"Konfigurationselement: <literal>APT::Cache::"
++"Show<replaceable>Abhängigkeitstyp</replaceable></literal> z.B. <literal>APT::"
++"Cache::ShowRecommends</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-cache.8.xml:323 apt-cdrom.8.xml:124 apt-get.8.xml:361
 +#: apt-cache.8.xml:323 apt-cdrom.8.xml:124 apt-get.8.xml:350
  msgid "<option>-f</option>"
  msgstr "<option>-f</option>"
  
@@@ -3397,35 -3379,6 +3398,37 @@@ msgstr "APT-Werkzeug für den Umgang mi
  
  #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
  #: apt-get.8.xml:39
 +#, fuzzy
 +#| msgid ""
 +#| "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
 +#| "<option>-o= <replaceable>config_string</replaceable> </option> </arg> "
 +#| "<arg> <option>-c= <replaceable>config_file</replaceable> </option> </arg> "
 +#| "<arg> <option>-t=</option> <arg choice='plain'> "
- #| "<replaceable>target_release</replaceable> </arg> </arg> <group choice="
- #| "\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</"
- #| "arg> <arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-"
- #| "upgrade</arg> <arg choice='plain'>install <arg choice=\"plain\" rep="
- #| "\"repeat\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg "
++#| "<replaceable>target_release</replaceable> </arg> </arg> <arg> <option>-"
++#| "a=</option> <arg choice='plain'> <replaceable>default_architecture</"
++#| "replaceable> </arg> </arg> <group choice=\"req\"> <arg "
++#| "choice='plain'>update</arg> <arg choice='plain'>upgrade</arg> <arg "
++#| "choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-upgrade</"
++#| "arg> <arg choice='plain'>install <arg choice=\"plain\" rep=\"repeat"
++#| "\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg "
 +#| "choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> "
 +#| "<arg choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
 +#| "group> </arg> </arg> </arg> <arg choice='plain'>remove <arg choice=\"plain"
 +#| "\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
 +#| "choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
 +#| "\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>source "
 +#| "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> "
 +#| "<group choice='req'> <arg choice='plain'> "
 +#| "=<replaceable>pkg_version_number</replaceable> </arg> <arg "
 +#| "choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
 +#| "group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice="
 +#| "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
 +#| "choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
 +#| "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
 +#| "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
 +#| "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> "
 +#| "<group choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--"
 +#| "help</arg> </group> </arg> </group>"
  msgid ""
  "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
  "<option>-o= <replaceable>config_string</replaceable> </option> </arg> <arg> "
@@@ -3456,34 -3410,35 +3459,35 @@@
  msgstr ""
  "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
  "<option>-o= <replaceable>Konfigurationszeichenkette</replaceable> </option> "
 -"</arg> <arg> <option>-c= <replaceable>Konfigurationsdatei</replaceable> "
 -"</option> </arg> <arg> <option>-t=</option> <arg choice='plain'> "
 -"<replaceable>Ziel-Release</replaceable> </arg> </arg> <arg> "
 -"<option>-a=</option> <arg choice='plain'> "
 -"<replaceable>Vorgabearchitektur</replaceable> </arg> </arg> <group choice="
 -"\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</arg> "
 -"<arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-upgrade</"
 -"arg> <arg choice='plain'>install <arg choice=\"plain\" rep=\"repeat"
 -"\"><replaceable>Paket</replaceable> <arg> <group choice='req'> <arg "
 -"choice='plain'> =<replaceable>Paket-Versionsnummer</replaceable> </arg> <arg "
 -"choice='plain'> /<replaceable>Ziel-Release</replaceable> </arg> </group> </"
 -"arg> </arg> </arg> <arg choice='plain'>remove <arg choice=\"plain\" rep="
 -"\"repeat\"><replaceable>Paket</replaceable></arg></arg> <arg "
 -"choice='plain'>purge <arg choice=\"plain\" rep=\"repeat\"><replaceable>Paket</"
 -"replaceable></arg></arg> <arg choice='plain'>source <arg choice=\"plain\" "
 -"rep=\"repeat\"><replaceable>Paket</replaceable> <arg> <group choice='req'> "
 -"<arg choice='plain'> =<replaceable>Paket-Versionsnummer</replaceable> </arg> "
 -"<arg choice='plain'> /<replaceable>Ziel-Release</replaceable> </arg> </"
 -"group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice=\"plain"
 -"\" rep=\"repeat\"><replaceable>Paket</replaceable></arg></arg> <arg "
 -"choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
 -"choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
 -"choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
 -"choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> <group "
 -"choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--help</arg> "
 -"</group> </arg> </group>"
 +"</arg> <arg> <option>-c= <replaceable>Konfigurationsdatei</replaceable> </"
 +"option> </arg> <arg> <option>-t=</option> <arg choice='plain'> "
- "<replaceable>Ziel-Release</replaceable> </arg> </arg> <group choice=\"req\"> "
- "<arg choice='plain'>update</arg> <arg choice='plain'>upgrade</arg> <arg "
- "choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-upgrade</arg> "
- "<arg choice='plain'>install <arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>Paket</replaceable> <arg> <group choice='req'> <arg "
- "choice='plain'> =<replaceable>Paket-Versionsnummer</replaceable> </arg> <arg "
- "choice='plain'> /<replaceable>Ziel-Release</replaceable> </arg> </group> </"
- "arg> </arg> </arg> <arg choice='plain'>remove <arg choice=\"plain\" rep="
- "\"repeat\"><replaceable>Paket</replaceable></arg></arg> <arg "
- "choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
++"<replaceable>Ziel-Release</replaceable> </arg> </arg> <arg> <option>-a=</"
++"option> <arg choice='plain'> <replaceable>Vorgabearchitektur</replaceable> </"
++"arg> </arg> <group choice=\"req\"> <arg choice='plain'>update</arg> <arg "
++"choice='plain'>upgrade</arg> <arg choice='plain'>dselect-upgrade</arg> <arg "
++"choice='plain'>dist-upgrade</arg> <arg choice='plain'>install <arg choice="
++"\"plain\" rep=\"repeat\"><replaceable>Paket</replaceable> <arg> <group "
++"choice='req'> <arg choice='plain'> =<replaceable>Paket-Versionsnummer</"
++"replaceable> </arg> <arg choice='plain'> /<replaceable>Ziel-Release</"
++"replaceable> </arg> </group> </arg> </arg> </arg> <arg choice='plain'>remove "
++"<arg choice=\"plain\" rep=\"repeat\"><replaceable>Paket</replaceable></arg></"
++"arg> <arg choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
 +"\"><replaceable>Paket</replaceable></arg></arg> <arg choice='plain'>source "
 +"<arg choice=\"plain\" rep=\"repeat\"><replaceable>Paket</replaceable> <arg> "
 +"<group choice='req'> <arg choice='plain'> =<replaceable>Paket-"
 +"Versionsnummer</replaceable> </arg> <arg choice='plain'> /<replaceable>Ziel-"
 +"Release</replaceable> </arg> </group> </arg> </arg> </arg> <arg "
 +"choice='plain'>build-dep <arg choice=\"plain\" rep=\"repeat"
 +"\"><replaceable>Paket</replaceable></arg></arg> <arg choice='plain'>check</"
 +"arg> <arg choice='plain'>clean</arg> <arg choice='plain'>autoclean</arg> "
 +"<arg choice='plain'>autoremove</arg> <arg choice='plain'> <group "
 +"choice='req'> <arg choice='plain'>-v</arg> <arg choice='plain'>--version</"
 +"arg> </group> </arg> <arg choice='plain'> <group choice='req'> <arg "
 +"choice='plain'>-h</arg> <arg choice='plain'>--help</arg> </group> </arg> </"
 +"group>"
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt-get.8.xml:122
 +#: apt-get.8.xml:115
  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 "
@@@ -3795,26 -3750,22 +3799,28 @@@ msgstr "
  "installiert haben oder installieren könnten."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:262
 +#: apt-get.8.xml:255
 +#, fuzzy
 +#| msgid ""
 +#| "If the <option>--compile</option> option is specified then the package "
 +#| "will be compiled to a binary .deb using <command>dpkg-buildpackage</"
- #| "command>, if <option>--download-only</option> is specified then the "
- #| "source package will not be unpacked."
++#| "command> for the architecture as defined by the <command>--host-"
++#| "architecture</command> option.  If <option>--download-only</option> is "
++#| "specified then the source package will not be unpacked."
  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 "
 -"the architecture as defined by the <command>--host-architecture</command> "
 -"option.  If <option>--download-only</option> is specified then the source "
 -"package will not be unpacked."
 +"be compiled to a binary .deb using <command>dpkg-buildpackage</command>, if "
 +"<option>--download-only</option> is specified then the source package will "
 +"not be unpacked."
  msgstr ""
- "Wenn die <option>--compile</option>-Option angegeben ist, dann wird das "
- "Paket unter Benutzung von <command>dpkg-buildpackage</command> zu einem "
- "binären .deb kompiliert, wenn <option>--download-only</option> angegeben "
- "ist, wird das Quellpaket nicht entpackt."
+ "Falls die Option <option>--compile</option> angegeben ist, dann wird das "
+ "Paket unter Benutzung von <command>dpkg-buildpackage</command> für die "
+ "Architektur, die durch <command>--host-architecture</command> definiert ist, "
+ "zu einem binären .deb kompiliert. Falls <option>--download-only</option> "
+ "angegeben ist, wird das Quellpaket nicht entpackt."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:269
 +#: apt-get.8.xml:260
  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 "
@@@ -3846,21 -3797,23 +3852,27 @@@ msgid "build-dep
  msgstr "build-dep"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:281
 +#: apt-get.8.xml:272
 +#, fuzzy
 +#| msgid ""
 +#| "<literal>build-dep</literal> causes apt-get to install/remove packages in "
- #| "an attempt to satisfy the build dependencies for a source package."
++#| "an attempt to satisfy the build dependencies for a source package. By "
++#| "default the dependencies are satisfied to build the package natively. If "
++#| "desired a host-architecture can be specified with the <option>--host-"
++#| "architecture</option> option instead."
  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 "
 -"the dependencies are satisfied to build the package natively. If desired a "
 -"host-architecture can be specified with the <option>--host-architecture</"
 -"option> option instead."
 +"attempt to satisfy the build dependencies for a source package."
  msgstr ""
  "<literal>build-dep</literal> veranlasst apt-get, Pakete zu installieren/"
- "entfernen, um zu versuchen, die Bauabhängigkeiten eines Quellpakets zu "
- "erfüllen."
+ "entfernen, um zu versuchen, die Bau-Abhängigkeiten eines Quellpakets zu "
+ "erfüllen. Standardmäßig werden die Abhängigkeiten erfüllt, um das Paket auf "
+ "native Art zu bauen. Falls gewünscht, kann stattdessen eine "
+ "Rechnerarchitektur mit der Option <option>--host-architecture</option> "
+ "angegeben werden."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:287
 +#: apt-get.8.xml:276
  msgid "check"
  msgstr "check"
  
@@@ -3941,23 -3890,18 +3953,23 @@@ msgid "autoremove
  msgstr "autoremove"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:319
 +#: apt-get.8.xml:308
 +#, fuzzy
 +#| msgid ""
 +#| "<literal>autoremove</literal> is used to remove packages that were "
- #| "automatically installed to satisfy dependencies for some package and that "
- #| "are no more needed."
++#| "automatically installed to satisfy dependencies for other packages and "
++#| "are now no longer needed."
  msgid ""
  "<literal>autoremove</literal> is used to remove packages that were "
 -"automatically installed to satisfy dependencies for other packages and are "
 -"now no longer needed."
 +"automatically installed to satisfy dependencies for some package and that "
 +"are no more needed."
  msgstr ""
- "<literal>autoremove</literal> wird benutzt, um Pakete, die automatisch "
- "installiert wurden, um Abhängigkeiten für einige Pakete zu erfüllen und die "
- "nicht mehr benötigt werden, zu entfernen."
+ "<literal>autoremove</literal> wird benutzt, um Pakete zu entfernen, die "
+ "automatisch installiert wurden, um Abhängigkeiten für andere Pakete zu "
+ "erfüllen und die nicht mehr benötigt werden."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:323
 +#: apt-get.8.xml:312
  msgid "changelog"
  msgstr "changelog"
  
@@@ -4777,31 -4743,43 +4789,41 @@@ msgstr "
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-key.8.xml:131
  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 "
 -"shipped in the <literal>archive-keyring</literal> package of your "
 -"distribution, e.g. the <literal>debian-archive-keyring</literal> package in "
 -"Debian."
 +"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 ""
- "Den lokalen Schlüsselbund mit dem Schlüsselbund der Debian-Archivschlüssel "
- "aktualisieren und aus dem Schlüsselbund die Archivschlüssel entfernen, die "
- "nicht länger gültig sind."
 -"Aktualisiert den lokalen Schlüsselbund mit dem Archivschlüsselbund und "
 -"entfernt die Archivschlüssel, die nicht länger gültig sind, aus dem lokalen "
 -"Schlüsselbund. Der Archivschlüsselbund wird im Paket "
 -"<literal>archive-keyring</literal> Ihrer Distribution mitgeliefert, z.B. dem "
 -"Paket <literal>debian-archive-keyring</literal> in Debian."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-key.8.xml:141
 +#: apt-key.8.xml:140
- #, fuzzy
- #| msgid "update"
  msgid "net-update"
- msgstr "update"
+ msgstr "net-update"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-key.8.xml:145
 +#: apt-key.8.xml:144
++#, fuzzy
++#| msgid ""
++#| "Work similar to the <command>update</command> command above, but get the "
++#| "archive keyring from an URI instead and validate it against a master "
++#| "key.  This requires an installed &wget; and an APT build configured to "
++#| "have a server to fetch from and a master keyring to validate.  APT in "
++#| "Debian does not support this command and relies on <command>update</"
++#| "command> instead, but Ubuntu's APT does."
  msgid ""
 -"Work similar to the <command>update</command> command above, but get the "
 -"archive keyring from an URI instead and validate it against a master key.  "
 -"This requires an installed &wget; and an APT build configured to have a "
 -"server to fetch from and a master keyring to validate.  APT in Debian does "
 -"not support this command and relies on <command>update</command> instead, "
 -"but Ubuntu's APT does."
 +"Update the local keyring with the keys of a key server and removes from the "
 +"keyring the archive keys which are no longer valid. This requires an "
 +"installed wget and an APT build configured to have a server to fetch from. "
 +"APT in Debian does not support this command, but Ubuntu's APT does."
  msgstr ""
+ "funktioniert ähnlich dem vorhergehenden Befehl <command>update</command>, "
+ "bezieht aber den Archivschlüsselbund stattdessen von einer URI und bestätigt "
+ "ihn anhand eines Master-Schlüssels. Dies erfordert ein installiertes &wget; "
+ "und einen derart gebauten APT, bei dem ein Server konfiguriert ist, um den "
+ "Master-Schlüsselbund zur Bestätigung abzuholen. APT unterstützt in Debian "
 -"diesen Befehl nicht und beruht stattdessen auf <command>update</command>, "
 -"in Ubuntu funktioniert dies aber."
++"diesen Befehl nicht und beruht stattdessen auf <command>update</command>, in "
++"Ubuntu funktioniert dies aber."
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt-key.8.xml:162
 +#: apt-key.8.xml:159
  msgid ""
  "Note that options need to be defined before the commands described in the "
  "previous section."
@@@ -4815,7 -4793,7 +4837,15 @@@ msgid "--keyring <replaceable>filename<
  msgstr "--keyring <replaceable>Dateiname</replaceable>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-key.8.xml:165
 +#: apt-key.8.xml:162
++#, fuzzy
++#| msgid ""
++#| "With this option it is possible to specify a specific keyring file the "
++#| "command should operate on. The default is that a command is executed on "
++#| "the <filename>trusted.gpg</filename> file as well as on all parts in the "
++#| "<filename>trusted.gpg.d</filename> directory, though <filename>trusted."
++#| "gpg</filename> is the primary keyring which means that e.g. new keys are "
++#| "added to this one."
  msgid ""
  "With this option it is possible to specify a specific keyring file the "
  "command should operate on. The default is that a command is executed on the "
@@@ -4919,12 -4885,13 +4937,13 @@@ msgid "
  "choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </"
  "arg> </group>"
  msgstr ""
 -"  <command>apt-mark</command> <arg><option>-hv</option></arg> "
 -"<arg><option>-f=<replaceable>DATEINAME</replaceable></option></arg> <group "
 -"choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg "
 -"choice=\"plain\">auto</arg> <arg choice=\"plain\">manual</arg> <arg "
 -"choice=\"plain\">showauto</arg> <arg choice=\"plain\">showmanual</arg> "
 -"</group> <arg choice=\"plain\" "
 -"rep=\"repeat\"><replaceable>Paket</replaceable></arg> </arg> </group>"
 +"  <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
 +"f=<replaceable>DATEINAME</replaceable></option></arg> <group choice=\"plain"
 +"\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain"
- "\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </group> <arg "
++"\">auto</arg> <arg choice=\"plain\">manual</arg> <arg choice=\"plain"
++"\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </group> <arg "
 +"choice=\"plain\" rep=\"repeat\"><replaceable>Paket</replaceable></arg> </"
- "arg> <arg choice=\"plain\">showauto</arg> </group>"
++"arg> </group>"
  
  #. type: Content of: <refentry><refsect1><para>
  #: apt-mark.8.xml:57
@@@ -5009,6 -4964,12 +5016,12 @@@ msgid "
  "selections</command> and the state is therefore maintained by &dpkg; and not "
  "effected by the <option>--filename</option> option."
  msgstr ""
+ "<literal>hold</literal> wird benutzt, um ein Paket als zurückgehalten zu "
+ "markieren, was verhindert, dass das Paket automatisch installiert, ein "
+ "Upgrade davon durchgeführt oder es entfernt wird. Der Befehl ist nur ein "
 -"Wrapper um <command>dpkg --set-selections</command> und der Status wird daher "
 -"durch &dpkg; verwaltet und nicht durch die Option "
 -"<option>--filename</option>."
++"Wrapper um <command>dpkg --set-selections</command> und der Status wird "
++"daher durch &dpkg; verwaltet und nicht durch die Option <option>--filename</"
++"option>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
  #: apt-mark.8.xml:95
@@@ -5025,8 -4982,8 +5034,8 @@@ msgid "
  "<literal>unhold</literal> is used to cancel a previously set hold on a "
  "package to allow all actions again."
  msgstr ""
- "<literal>showauto</literal> wird benutzt, um eine Liste automatisch "
- "installierter Pakete mit einem Paket in jeder neuen Zeile, auszugeben."
 -"<literal>unhold</literal> wird benutzt, um ein vorher gesetztes »hold« "
 -"auf ein Paket aufzuheben, um alle Aktionen wieder zu erlauben."
++"<literal>unhold</literal> wird benutzt, um ein vorher gesetztes »hold« auf "
++"ein Paket aufzuheben, um alle Aktionen wieder zu erlauben."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
  #: apt-mark.8.xml:101
@@@ -5581,31 -5532,23 +5584,31 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
  #: apt.conf.5.xml:52
 +#, fuzzy
 +#| msgid ""
 +#| "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
- #| "order which have no or \"<literal>conf</literal>\" as filename extension "
- #| "and which only contain alphanumeric, hyphen (-), underscore (_) and "
- #| "period (.) characters.  Otherwise APT will print a notice that it has "
++#| "order which have either no or \"<literal>conf</literal>\" as filename "
++#| "extension and which only contain alphanumeric, hyphen (-), underscore (_) "
++#| "and period (.) characters.  Otherwise APT will print a notice that it has "
 +#| "ignored a file if the file doesn't match a pattern in the <literal>Dir::"
 +#| "Ignore-Files-Silently</literal> configuration list - in this case it will "
 +#| "be silently ignored."
  msgid ""
  "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
 -"order which have either no or \"<literal>conf</literal>\" as filename "
 -"extension and which only contain alphanumeric, hyphen (-), underscore (_) "
 -"and period (.) characters.  Otherwise APT will print a notice that it has "
 -"ignored a file if the file doesn't match a pattern in the <literal>Dir::"
 -"Ignore-Files-Silently</literal> configuration list - in this case it will be "
 -"silently ignored."
 +"order which have no or \"<literal>conf</literal>\" as filename extension and "
 +"which only contain alphanumeric, hyphen (-), underscore (_) and period (.) "
 +"characters.  Otherwise APT will print a notice that it has ignored a file if "
 +"the file doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</"
 +"literal> configuration list - in this case it will be silently ignored."
  msgstr ""
  "alle Dateien in <literal>Dir::Etc::Parts</literal> in aufsteigender "
- "alphanumerischer Reihenfolge, die kein »<literal>conf</literal>« als "
- "Dateinamenserweiterung haben und die nur alphanumerische Zeichen, "
- "Bindestriche (-), Unterstriche (_) und Punkte (.) enthalten. Andernfalls "
- "wird APT einen Hinweis ausgeben, dass es eine Datei ignoriert hat, falls die "
- "Datei nicht auf ein Muster in der Konfigurationsliste <literal>Dir::Ignore-"
- "Files-Silently</literal> passt – in diesem Fall wird sie stillschweigend "
- "ignoriert."
 -"alphanumerischer Reihenfolge, die entweder keine oder "
 -"»<literal>conf</literal>« als Dateinamenserweiterung haben und die nur "
 -"alphanumerische Zeichen, Bindestriche (-), Unterstriche (_) und Punkte (.) "
 -"enthalten. Andernfalls wird APT einen Hinweis ausgeben, dass es eine Datei "
 -"ignoriert hat, falls die Datei nicht auf ein Muster in der "
 -"Konfigurationsliste <literal>Dir::Ignore-Files-Silently</literal> passt – in "
 -"diesem Fall wird sie stillschweigend ignoriert."
++"alphanumerischer Reihenfolge, die entweder keine oder »<literal>conf</"
++"literal>« als Dateinamenserweiterung haben und die nur alphanumerische "
++"Zeichen, Bindestriche (-), Unterstriche (_) und Punkte (.) enthalten. "
++"Andernfalls wird APT einen Hinweis ausgeben, dass es eine Datei ignoriert "
++"hat, falls die Datei nicht auf ein Muster in der Konfigurationsliste "
++"<literal>Dir::Ignore-Files-Silently</literal> passt – in diesem Fall wird "
++"sie stillschweigend ignoriert."
  
  #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
  #: apt.conf.5.xml:59
@@@ -6145,37 -6107,20 +6148,32 @@@ msgid "Max-ValidTime
  msgstr "Max-ValidTime"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:269
 -msgid ""
 -"Seconds the Release file should be considered valid after it was created "
 -"(indicated by the <literal>Date</literal> header).  If the Release file "
 -"itself includes a <literal>Valid-Until</literal> header the earlier date of "
 -"the two is used as the expiration date.  The default value is <literal>0</"
 -"literal> which stands for \"for ever\".  Archive specific settings can be "
 -"made by appending the label of the archive to the option name."
 +#: apt.conf.5.xml:261
 +#, 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."
++#| "Seconds the Release file should be considered valid after it was created "
++#| "(indicated by the <literal>Date</literal> header).  If the Release file "
++#| "itself includes a <literal>Valid-Until</literal> header the earlier date "
++#| "of the two is used as the expiration date.  The default value is "
++#| "<literal>0</literal> which stands for \"for ever\".  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 ""
  "Sekunden, die die Release-Datei als gültig betrachtet werden sollte, nachdem "
- "sie erzeugt wurde. Vorgabe ist »für immer« (0), falls die Release-Datei des "
- "Archivs keine <literal>Valid-Until</literal>-Kopfzeile enthält. Falls dies "
- "so ist, ist dieses Datum vorgegeben. Das Datum aus der Release-Datei oder "
- "das Datum, das durch die Erstellungszeit der Release-Datei angegeben wurde "
- "(<literal>Date</literal>-Kopfzeile) plus die mit diesen Optionen angegebenen "
- "Sekunden werden benutzt, um zu prüfen, ob die Bestätigung einer Datei "
- "abgelaufen ist indem das neuere Datum der beiden benutzt wird. "
+ "sie erzeugt wurde (angezeigt durch die Kopfzeile <literal>Date</literal>). "
+ "Falls die Release-Datei selbst eine <literal>Valid-Until</literal>-Kopfzeile "
+ "enhält, wird der frühere von beiden Terminen als Verfallsdatum benutzt. "
+ "Vorgabewert ist <literal>0</literal>, was »für immer« bedeutet. "
  "Archivspezifische Einstellungen können durch Anhängen des Archivetiketts an "
  "die Option »name« vorgenommen werden."
  
@@@ -6654,19 -6615,7 +6652,19 @@@ msgid "Dir::Bin::bzip2 \"/bin/bzip2\";
  msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:459
 +#: apt.conf.5.xml:442
 +#, fuzzy
 +#| msgid ""
 +#| "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
 +#| "replaceable></literal> will be checked: If this setting exists the method "
 +#| "will only be used if this file exists, e.g. for the bzip2 method (the "
- #| "inbuilt) setting is <placeholder type=\"literallayout\" id=\"0\"/> Note "
++#| "inbuilt) setting is: <placeholder type=\"literallayout\" id=\"0\"/> Note "
 +#| "also that list entries specified on the command line will be added at the "
 +#| "end of the list specified in the configuration files, but before the "
 +#| "default entries. To prefer a type in this case over the ones specified in "
 +#| "the configuration files you can set the option direct - not in list "
 +#| "style.  This will not override the defined list, it will only prefix the "
 +#| "list with this type."
  msgid ""
  "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
  "replaceable></literal> will be checked: If this setting exists the method "
@@@ -7986,16 -7929,6 +7984,16 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><para>
  #: apt_preferences.5.xml:70
 +#, fuzzy
 +#| 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 "
- #| "following naming convention: The files have no or \"<literal>pref</"
- #| "literal>\" as filename extension and which only contain alphanumeric, "
- #| "hyphen (-), underscore (_) and period (.) characters.  Otherwise APT will "
- #| "print a notice that it has ignored a file if the file doesn't match a "
- #| "pattern in the <literal>Dir::Ignore-Files-Silently</literal> "
- #| "configuration list - in this case it will be silently ignored."
++#| "following naming convention: The files have either no or \"<literal>pref</"
++#| "literal>\" as filename extension and only contain alphanumeric, hyphen "
++#| "(-), underscore (_) and period (.) characters.  Otherwise APT will print "
++#| "a notice that it has ignored a file if the file doesn't match a pattern "
++#| "in the <literal>Dir::Ignore-Files-Silently</literal> configuration list - "
++#| "in this case it will be silently ignored."
  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 "
@@@ -8785,13 -8692,13 +8769,13 @@@ msgid "
  "\"0\"/>"
  msgstr ""
  "Die <filename>Packages</filename>-Datei wird normalerweise im Verzeichnis "
- "<filename>.../dists/<replaceable>Distributions-Name</replaceable>/"
+ "<filename>…/dists/<replaceable>Distributions-Name</replaceable>/"
  "<replaceable>Komponente</replaceable>/<replaceable>Architektur</"
- "replaceable></filename> gefunden, zum Beispiel <filename>.../dists/stable/"
 -"replaceable></filename> gefunden, zum Beispiel <filename>…/dists/stable/"
--"main/binary-i386/Packages</filename>. Sie besteht aus einer Serie "
--"mehrzeiliger Datensätze, einem für jedes verfügbare Paket in diesem "
--"Verzeichnis. In jedem Datensatz sind nur zwei Zeilen zum Setzen der APT-"
--"Prioritäten relevant: <placeholder type=\"variablelist\" id=\"0\"/>"
++"replaceable></filename> gefunden, zum Beispiel <filename>…/dists/stable/main/"
++"binary-i386/Packages</filename>. Sie besteht aus einer Serie mehrzeiliger "
++"Datensätze, einem für jedes verfügbare Paket in diesem Verzeichnis. In jedem "
++"Datensatz sind nur zwei Zeilen zum Setzen der APT-Prioritäten relevant: "
++"<placeholder type=\"variablelist\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
  #: apt_preferences.5.xml:427
@@@ -8967,9 -8874,9 +8951,9 @@@ msgid "
  "\"0\"/>"
  msgstr ""
  "Die <filename>Release</filename>-Datei ist normalerweise im Verzeichnis "
- "<filename>.../dists/<replaceable>Distributionsname</replaceable></filename> "
- "zu finden, zum Beispiel <filename>.../dists/stable/Release</filename> oder "
- "<filename>.../dists/&stable-codename;/Release</filename>. Sie besteht aus "
 -"<filename>…/dists/<replaceable>Distributionsname</replaceable></filename> "
 -"zu finden, zum Beispiel <filename>…/dists/stable/Release</filename> oder "
++"<filename>…/dists/<replaceable>Distributionsname</replaceable></filename> zu "
++"finden, zum Beispiel <filename>…/dists/stable/Release</filename> oder "
+ "<filename>…/dists/&stable-codename;/Release</filename>. Sie besteht aus "
  "einem einzelnen mehrzeiligen Datensatz, der auf <emphasis>alle</emphasis> "
  "Pakete im Verzeichnisbaum unterhalb des übergeordneten Verzeichnisses "
  "zutrifft. Anders als die <filename>Packages</filename>-Datei sind nahezu "
@@@ -9427,10 -9334,8 +9411,10 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><literallayout>
  #: sources.list.5.xml:81
 -msgid "deb [ options ] uri distribution [component1] [component2] [...]"
 +#, fuzzy, no-wrap
- #| msgid "deb uri distribution [component1] [component2] [...]"
++#| msgid "deb [ options ] uri distribution [component1] [component2] [...]"
 +msgid "deb uri distribution [component1] [component2] [...]"
- msgstr "deb URI Distribution [Komponente1] [Komponente2] [...]"
+ msgstr "deb [ Optionen ] URI Distribution [Komponente1] [Komponente2] […]"
  
  #. type: Content of: <refentry><refsect1><para>
  #: sources.list.5.xml:83
@@@ -11349,208 -11309,3 +11333,119 @@@ msgstr "  # apt-get -o dir::cache::arch
  #: offline.sgml:234
  msgid "Which will use the already fetched archives on the disc."
  msgstr "Es wird die bereits auf die Platte heruntergeladenen Archive benutzen."
 +
- #, fuzzy
- #~| msgid "<option>--recurse</option>"
 +#~ msgid "<option>--host-architecture</option>"
- #~ msgstr "<option>--recurse</option>"
- 
- #, fuzzy
- #~| msgid "Max-ValidTime"
- #~ msgid "Min-ValidTime"
- #~ msgstr "Max-ValidTime"
- 
- #, 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 ""
- #~ "Minimum of seconds the Release file should be considered valid after it "
- #~ "was created (indicated by the <literal>Date</literal> header).  Use this "
- #~ "if you need to use a seldomly updated (local) mirror of a more regular "
- #~ "updated archive with a <literal>Valid-Until</literal> header instead of "
- #~ "competely disabling the expiration date checking.  Archive specific "
- #~ "settings can and should be used by appending the label of the archive to "
- #~ "the option name."
- #~ msgstr ""
- #~ "Sekunden, die die Release-Datei als gültig betrachtet werden sollte, "
- #~ "nachdem sie erzeugt wurde. Vorgabe ist »für immer« (0), falls die Release-"
- #~ "Datei des Archivs keine <literal>Valid-Until</literal>-Kopfzeile enthält. "
- #~ "Falls dies so ist, ist dieses Datum vorgegeben. Das Datum aus der Release-"
- #~ "Datei oder das Datum, das durch die Erstellungszeit der Release-Datei "
- #~ "angegeben wurde (<literal>Date</literal>-Kopfzeile) plus die mit diesen "
- #~ "Optionen angegebenen Sekunden werden benutzt, um zu prüfen, ob die "
- #~ "Bestätigung einer Datei abgelaufen ist indem das neuere Datum der beiden "
- #~ "benutzt wird. Archivspezifische Einstellungen können durch Anhängen des "
- #~ "Archivetiketts an die Option »name« vorgenommen werden."
++#~ msgstr "<option>--host-architecture</option>"
 +
- #, fuzzy
- #~| msgid ""
- #~| "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
- #~| "deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
- #~| "   "
 +#~ msgid ""
- #~ "deb http://ftp.debian.org/debian &stable-codename; main\n"
- #~ "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
- #~ msgstr ""
- #~ "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
- #~ "deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
- #~ "   "
- 
- #~ msgid "<option>--md5</option>"
- #~ msgstr "<option>--md5</option>"
- 
- #~ 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 ""
- #~ "Generiert MD5-Summen. Dies ist standardmäßig an, wenn es ausgeschaltet "
- #~ "ist, haben die generierten Indexdateien keine MD5Sum-Felder, sofern dies "
- #~ "möglich ist. Konfigurationselement: <literal>APT::FTPArchive::MD5</"
- #~ "literal>"
- 
- #~ msgid "unmarkauto"
- #~ msgstr "unmarkauto"
- 
- #~ msgid "<option>-h</option>"
- #~ msgstr "<option>-h</option>"
- 
- #~ msgid "<option>--help</option>"
- #~ msgstr "<option>--help</option>"
- 
- #~ msgid "Show a short usage summary."
- #~ msgstr "Eine kurze Zusammenfassung anzeigen."
- 
- #~ msgid "<option>-v</option>"
- #~ msgstr "<option>-v</option>"
- 
- #~ msgid "<option>--version</option>"
- #~ msgstr "<option>--version</option>"
- 
- #~ msgid "Show the program version."
- #~ msgstr "Die Programmversion anzeigen."
- 
- #~ msgid "to the version that is already installed (if any)."
- #~ msgstr "zu der Version, die bereits installiert ist (wenn vorhanden)."
- 
- #~ msgid "APT package handling utility -- cache manipulator"
++#~ "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>"
 +#~ msgstr ""
- #~ "APT-Werkzeug zur Handhabung von Paketen -- Zwischenspeichermanipulierer"
- 
- #~ msgid "add <replaceable>file(s)</replaceable>"
- #~ msgstr "add <replaceable>Datei(en)</replaceable>"
++#~ "Diese Option steuert, wie die Architekturpakete durch <command>apt-get "
++#~ "source --compile</command> gebaut und wie Cross-Bau-Abhängigkeiten "
++#~ "erfüllt werden. Standardmäßig ist sie nicht gesetze, was bedeutet, dass "
++#~ "die Rechnerarchitektur die gleiche wie die Bau-Architektur ist (die durch "
++#~ "<literal>APT::Architecture</literal>) definiert wird). "
++#~ "Konfigurationselement: <literal>APT::Get::Host-Architecture</literal>"
 +
 +#~ msgid ""
- #~ "<literal>add</literal> adds the named package index files to the package "
- #~ "cache.  This is for debugging only."
++#~ "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 shipped in the <literal>archive-keyring</literal> package of "
++#~ "your distribution, e.g. the <literal>debian-archive-keyring</literal> "
++#~ "package in Debian."
 +#~ msgstr ""
- #~ "<literal>add</literal> fügt die genannten Paket-Index-Dateien zum "
- #~ "Paketzwischenspeicher hinzu. Dies dient nur der Fehlersuche."
++#~ "Aktualisiert den lokalen Schlüsselbund mit dem Archivschlüsselbund und "
++#~ "entfernt die Archivschlüssel, die nicht länger gültig sind, aus dem "
++#~ "lokalen Schlüsselbund. Der Archivschlüsselbund wird im Paket "
++#~ "<literal>archive-keyring</literal> Ihrer Distribution mitgeliefert, z.B. "
++#~ "dem Paket <literal>debian-archive-keyring</literal> in Debian."
 +
 +#~ 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."
++#~ "All Architectures the system supports. Processors implementing the "
++#~ "<literal>amd64</literal> are e.g. also able to execute binaries compiled "
++#~ "for <literal>i386</literal>; This list is use when fetching files and "
++#~ "parsing package lists. The internal default is always the native "
++#~ "architecture (<literal>APT::Architecture</literal>)  and all foreign "
++#~ "architectures it can retrieve by calling <command>dpkg --print-foreign-"
++#~ "architectures</command>."
 +#~ msgstr ""
- #~ "Der <literal>release</literal>-Befehl generiert eine Release-Datei aus "
- #~ "einem Verzeichnisbaum. Er durchsucht das vorgegebene Verzeichnis rekursiv "
- #~ "nach Packages-, Packages.gz-, Packages.bz2-, Sources-, Sources.gz-, "
- #~ "Sources.bz2-, Release- und md5sum.txt-Dateien. Dann schreibt es eine "
- #~ "Release-Datei nach stdout, die einen MD5- und SHA1-Hash für jede Datei "
- #~ "enthält."
- 
- #~ msgid "<option>--install-recommends</option>"
- #~ msgstr "<option>--install-recommends</option>"
- 
- #~ msgid "Also install recommended packages."
- #~ msgstr "Installiert außerdem empfohlene Pakete."
- 
- #~ msgid "Do not install recommended packages."
- #~ msgstr "Keine empfohlenen Pakete installieren."
++#~ "Alle Architekturen, die das System unterstützt. Prozessoren, die "
++#~ "<literal>amd64</literal> implementieren sind beispielsweise ebenso in der "
++#~ "Lage, Programme auszuführen, die für <literal>i386</literal> kompiliert "
++#~ "wurden. Diese Liste wird benutzt, wenn Dateien abgerufen und Paketlisten "
++#~ "ausgewertet werden. Die interne Vorgabe ist immer die native Architektur "
++#~ "(<literal>APT::Architecture</literal>) und alle fremden Architekturen, "
++#~ "die durch Aufruf von <command>dpkg --print-foreign-architectures</"
++#~ "command> abgefragt werden können."
 +
- #~ 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 ""
- #~ "Obwohl es möglich ist, einen leeren Komprimierungstyp zu der "
- #~ "Reihenfolgenliste hinzuzufügen, versteht dies APT in der aktuellen "
- #~ "Version nicht richtig und wird viele Warnungen wegen nicht "
- #~ "heruntergeladener Dateien anzeigen – diese Warnungen sind meistens "
- #~ "inkorrekte Treffer. Zukünftige Versionen werden möglicherweise eine "
- #~ "Möglichkeit enthalten, um wirklich unkomprimierte Dateien vorzuziehen, um "
- #~ "den Gebrauch lokaler Spiegel zu unterstützen."
++#~ msgid "Min-ValidTime"
++#~ msgstr "Min-ValidTime"
 +
 +#~ msgid ""
- #~ "Uses HTTP to access the archive at nonus.debian.org, under the debian-non-"
- #~ "US directory."
++#~ "Minimum of seconds the Release file should be considered valid after it "
++#~ "was created (indicated by the <literal>Date</literal> header).  Use this "
++#~ "if you need to use a seldomly updated (local) mirror of a more regular "
++#~ "updated archive with a <literal>Valid-Until</literal> header instead of "
++#~ "completely disabling the expiration date checking.  Archive specific "
++#~ "settings can and should be used by appending the label of the archive to "
++#~ "the option name."
 +#~ msgstr ""
- #~ "Benutzt HTTP, um auf das Archiv auf nonus.debian.org unter dem debian-non-"
- #~ "US-Verzeichnis zuzugreifen."
++#~ "Minimale Anzahl der Sekunden, die die Release-Datei als gültig betrachtet "
++#~ "werden sollte, nachdem sie erzeugt wurde (angezeigt durch die Kopfzeile "
++#~ "<literal>Date</literal>). Benutzen Sie dies, falls Sie einen selten "
++#~ "aktualisierten (lokalen) Spiegel eines regelmäßiger aktualisierten "
++#~ "Archivs mit einer <literal>Valid-Until</literal>-Kopfzeile haben, anstatt "
++#~ "die Überprüfung des Ablaufdatum komplett zu deaktivieren. "
++#~ "Archivspezifische Einstellungen können und sollten durch Anhängen des "
++#~ "Archivetiketts an die Option »name« vorgenommen werden."
 +
 +#~ msgid ""
- #~ "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-"
- #~ "free"
++#~ "<literal>options</literal> is always optional and needs to be surounded "
++#~ "by square brackets. It can consist of multiple settings in the form "
++#~ "<literal><replaceable>setting</replaceable>=<replaceable>value</"
++#~ "replaceable></literal>.  Multiple settings are separated by spaces. The "
++#~ "following settings are supported by APT, note though that unsupported "
++#~ "settings will be ignored silently:"
 +#~ msgstr ""
- #~ "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-"
- #~ "free"
- 
- #~ msgid "OPTIONS"
- #~ msgstr "OPTIONEN"
- 
- #~ msgid "None."
- #~ msgstr "Keine"
- 
- #~ msgid "FILES"
- #~ msgstr "DATEIEN"
- 
- #~ msgid "<filename>/var/lib/apt/extended_states</filename>"
- #~ msgstr "<filename>/var/lib/apt/extended_states</filename>"
++#~ "<literal>options</literal> ist immer optional und muss in eckige Klammern "
++#~ "eingeschlossen werden. Es kann aus mehreren Einstellungen in der Form "
++#~ "<literal><replaceable>Einstellung</replaceable>=<replaceable>Wert</"
++#~ "replaceable></literal> bestehen. Mehrere Einstellungen werden durch "
++#~ "Leerzeichen getrennt. Die folgenden Einstellungen werden von APT "
++#~ "unterstützt. Beachten Sie allerdings, dass nicht unterstützte "
++#~ "Einstellungen stillschweigend ignoriert werden."
 +
 +#~ msgid ""
- #~ "Status list of auto-installed packages.  Configuration Item: "
- #~ "<literal>Dir::State</literal> sets the path to the "
- #~ "<filename>extended_states</filename> file."
++#~ "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
++#~ "replaceable>,…</literal> can be used to specify for which architectures "
++#~ "packages information should be downloaded. If this option is not set all "
++#~ "architectures defined by the <literal>APT::Architectures</literal> option "
++#~ "will be downloaded."
 +#~ msgstr ""
- #~ "Statusliste automatisch installierter Pakete. Konfigurationselement: "
- #~ "<literal>Dir::State</literal> setzt den Pfad zur Datei "
- #~ "<filename>extended_states</filename>."
- 
- #~ msgid "Cache-Limit"
- #~ msgstr "Cache-Limit"
++#~ "<literal>arch=<replaceable>Architektur1</replaceable>,"
++#~ "<replaceable>Architektur2</replaceable>, …</literal> kann benutzt werden, "
++#~ "um anzugeben, für welche Architekturen Paketinformationen heruntergeladen "
++#~ "werden sollen. Falls diese Option nicht gesetzt ist, werden alle durch "
++#~ "die Option <literal>APT::Architectures</literal> definierten "
++#~ "Architekturen heruntergeladen."
 +
 +#~ msgid ""
- #~ "APT uses a fixed size memory mapped cache file to store the 'available' "
- #~ "information. This sets the size of that cache (in bytes)."
++#~ "The first line gets package information for the architectures in "
++#~ "<literal>APT::Architectures</literal> while the second always retrieves "
++#~ "<literal>amd64</literal> and <literal>armel</literal>."
 +#~ msgstr ""
- #~ "APT benutzt eine Zwischenspeicherdatei mit fester Größe, um die "
- #~ "»verfügbar«-Informationen zu speichern. Dies setzt die Größe dieses "
- #~ "Zwischenspeichers (in Bytes)."
- 
- #~ msgid "Pin: release n=squeeze\n"
- #~ msgstr "Pin: release n=squeeze\n"
++#~ "Die erste Zeile bekommt Paketinformationen für die Architekturen in "
++#~ "<literal>APT::Architectures</literal>, während die zweite immer "
++#~ "<literal>amd64</literal> und <literal>armel</literal> holt."
 +
 +#~ 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>."
++#~ "deb http://ftp.debian.org/debian &stable-codename; main\n"
++#~ "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
 +#~ msgstr ""
- #~ "Die <literal>Pin-Priority:</literal>-Zeile in jedem APT-"
- #~ "Einstellungsdatensatz ist optional. Wenn diese weggelassen wird, weist "
- #~ "APT ein Priorität zu, die um 1 kleiner ist, als der letzte Wert, der in "
- #~ "einer Zeile angegeben wurde, die mit <literal>Pin-Priority: release ...</"
- #~ "literal> anfängt."
++#~ "deb http://ftp.debian.org/debian &stable-codename; main\n"
++#~ "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
diff --cc doc/po/es.po
index db8b9a848,0849736fa..35b8d0af7
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@@ -1466,9 -1466,16 +1466,16 @@@ msgstr "<option>--no-enhances</option>
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-cache.8.xml:317
+ #, fuzzy
+ #| msgid ""
+ #| "Per default the <literal>depends</literal> and <literal>rdepends</"
+ #| "literal> print all dependencies. This can be twicked with these flags "
+ #| "which will omit the specified dependency type.  Configuration Item: "
+ #| "<literal>APT::Cache::Show<replaceable>DependencyType</replaceable></"
+ #| "literal> e.g. <literal>APT::Cache::ShowRecommends</literal>."
  msgid ""
  "Per default the <literal>depends</literal> and <literal>rdepends</literal> "
 -"print all dependencies. This can be tweaked with these flags which will omit "
 +"print all dependencies. This can be twicked with these flags which will omit "
  "the specified dependency type.  Configuration Item: <literal>APT::Cache::"
  "Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::"
  "Cache::ShowRecommends</literal>."
@@@ -3814,12 -3834,19 +3850,18 @@@ msgstr "
  "instalada o de la que podría instalar."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:262
 +#: apt-get.8.xml:255
+ #, fuzzy
+ #| msgid ""
+ #| "If the <option>--compile</option> option is specified then the package "
+ #| "will be compiled to a binary .deb using <command>dpkg-buildpackage</"
+ #| "command>, if <option>--download-only</option> is specified then the "
+ #| "source package will not be unpacked."
  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 "
 -"the architecture as defined by the <command>--host-architecture</command> "
 -"option.  If <option>--download-only</option> is specified then the source "
 -"package will not be unpacked."
 +"be compiled to a binary .deb using <command>dpkg-buildpackage</command>, if "
 +"<option>--download-only</option> is specified then the source package will "
 +"not be unpacked."
  msgstr ""
  "Si se especifica la opción <option>--compile</option> el paquete se "
  "compilará en un binario «.deb» usando <command>dpkg-buildpackage</command>, "
@@@ -3858,10 -3885,17 +3900,14 @@@ msgid "build-dep
  msgstr "build-dep"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:281
 +#: apt-get.8.xml:272
+ #, fuzzy
+ #| msgid ""
+ #| "<literal>build-dep</literal> causes apt-get to install/remove packages in "
+ #| "an attempt to satisfy the build dependencies for a source package."
  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 "
 -"the dependencies are satisfied to build the package natively. If desired a "
 -"host-architecture can be specified with the <option>--host-architecture</"
 -"option> option instead."
 +"attempt to satisfy the build dependencies for a source package."
  msgstr ""
  "<literal>build-dep</literal> hace que apt-get instale/desinstale paquetes en "
  "un intento de satisfacer las dependencias de compilación de un paquete "
@@@ -3942,11 -3976,16 +3988,16 @@@ msgid "autoremove
  msgstr "autoremove"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:319
 +#: apt-get.8.xml:308
+ #, fuzzy
+ #| msgid ""
+ #| "<literal>autoremove</literal> is used to remove packages that were "
+ #| "automatically installed to satisfy dependencies for some package and that "
+ #| "are no more needed."
  msgid ""
  "<literal>autoremove</literal> is used to remove packages that were "
 -"automatically installed to satisfy dependencies for other packages and are "
 -"now no longer needed."
 +"automatically installed to satisfy dependencies for some package and that "
 +"are no more needed."
  msgstr ""
  "<literal>autoremove</literal> se usa para desinstalar paquetes que se "
  "instalaron automáticamente para satisfacer las dependencias de algún "
@@@ -4802,7 -4862,7 +4853,15 @@@ msgid "--keyring <replaceable>filename<
  msgstr "--keyring <replaceable>nombre-de-fichero</replaceable>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-key.8.xml:165
 +#: apt-key.8.xml:162
++#, fuzzy
++#| msgid ""
++#| "With this option it is possible to specify a specific keyring file the "
++#| "command should operate on. The default is that a command is executed on "
++#| "the <filename>trusted.gpg</filename> file as well as on all parts in the "
++#| "<filename>trusted.gpg.d</filename> directory, though <filename>trusted."
++#| "gpg</filename> is the primary keyring which means that e.g. new keys are "
++#| "added to this one."
  msgid ""
  "With this option it is possible to specify a specific keyring file the "
  "command should operate on. The default is that a command is executed on the "
@@@ -6117,17 -6189,25 +6176,28 @@@ msgid "Max-ValidTime
  msgstr "Max-ValidTime"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:269
 +#: apt.conf.5.xml:261
+ #, 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 "
 -"(indicated by the <literal>Date</literal> header).  If the Release file "
 -"itself includes a <literal>Valid-Until</literal> header the earlier date of "
 -"the two is used as the expiration date.  The default value is <literal>0</"
 -"literal> which stands for \"for ever\".  Archive specific settings can be "
 -"made by appending the label of the archive to the option name."
 +"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 ""
  "Los segundos que el fichero «Release» se considerará válido después de su "
  "creación. El valor predeterminado es «para siempre» (cero) si el fichero "
@@@ -9365,8 -9477,9 +9435,9 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><literallayout>
  #: sources.list.5.xml:81
- #, no-wrap
+ #, fuzzy, no-wrap
+ #| msgid "deb uri distribution [component1] [component2] [...]"
 -msgid "deb [ options ] uri distribution [component1] [component2] [...]"
 +msgid "deb uri distribution [component1] [component2] [...]"
  msgstr "deb uri distribución [componente1] [componente2] [...]"
  
  #. type: Content of: <refentry><refsect1><para>
@@@ -11255,6 -11412,14 +11326,61 @@@ msgstr "  # apt-get -o dir::cache::arch
  msgid "Which will use the already fetched archives on the disc."
  msgstr "Ésto usará los archivos del disco previamente obtenidos."
  
++#, fuzzy
++#~| msgid "<option>--recurse</option>"
++#~ msgid "<option>--host-architecture</option>"
++#~ msgstr "<option>--recurse</option>"
++
++#, fuzzy
++#~| msgid "Max-ValidTime"
++#~ msgid "Min-ValidTime"
++#~ msgstr "Max-ValidTime"
++
++#, 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 ""
++#~ "Minimum of seconds the Release file should be considered valid after it "
++#~ "was created (indicated by the <literal>Date</literal> header).  Use this "
++#~ "if you need to use a seldomly updated (local) mirror of a more regular "
++#~ "updated archive with a <literal>Valid-Until</literal> header instead of "
++#~ "completely disabling the expiration date checking.  Archive specific "
++#~ "settings can and should be used by appending the label of the archive to "
++#~ "the option name."
++#~ msgstr ""
++#~ "Los segundos que el fichero «Release» se considerará válido después de su "
++#~ "creación. El valor predeterminado es «para siempre» (cero) si el fichero "
++#~ "«Release» del archivo no incluye una cabecera <literal>Valid-Until</"
++#~ "literal>. Si lo incluye, el valor predeterminado es esta fecha. La fecha "
++#~ "del fichero «Release» o la fecha definida por la hora de creación del "
++#~ "fichero «Release» (cabecera <literal>Date</literal>), a lo que se añaden "
++#~ "los segundos definidos con estas opciones, se usan para comprobar si la "
++#~ "validez de un fichero a expirado, usando la fecha más antigua de las dos "
++#~ "anteriormente mencionadas. Se pueden definir opciones de configuración "
++#~ "específicas al archivo añadiendo la etiqueta del archivo al nombre de la "
++#~ "opción."
++
++#, fuzzy
++#~| msgid ""
++#~| "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
++#~| "deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
++#~| "   "
+ #~ 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."
++#~ "deb http://ftp.debian.org/debian &stable-codename; main\n"
++#~ "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
+ #~ msgstr ""
 -#~ "Actualiza el registro de claves local con el registro de claves del "
 -#~ "archivo Debian, y elimina del registro las claves del archivo que ya no "
 -#~ "son válidas."
++#~ "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
++#~ "deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
++#~ "   "
+ 
  #~ msgid "<option>--md5</option>"
  #~ msgstr "<option>--md5</option>"
  
diff --cc doc/po/fr.po
index 037c50de5,bed2c2985..2e0e766a7
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@@ -1391,9 -1391,16 +1391,16 @@@ msgstr "<option>--no-enhances</option>
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-cache.8.xml:317
+ #, fuzzy
+ #| msgid ""
+ #| "Per default the <literal>depends</literal> and <literal>rdepends</"
+ #| "literal> print all dependencies. This can be twicked with these flags "
+ #| "which will omit the specified dependency type.  Configuration Item: "
+ #| "<literal>APT::Cache::Show<replaceable>DependencyType</replaceable></"
+ #| "literal> e.g. <literal>APT::Cache::ShowRecommends</literal>."
  msgid ""
  "Per default the <literal>depends</literal> and <literal>rdepends</literal> "
 -"print all dependencies. This can be tweaked with these flags which will omit "
 +"print all dependencies. This can be twicked with these flags which will omit "
  "the specified dependency type.  Configuration Item: <literal>APT::Cache::"
  "Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::"
  "Cache::ShowRecommends</literal>."
@@@ -3747,12 -3767,19 +3783,18 @@@ msgstr "
  "installé ou que vous voulez installer."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:262
 +#: apt-get.8.xml:255
+ #, fuzzy
+ #| msgid ""
+ #| "If the <option>--compile</option> option is specified then the package "
+ #| "will be compiled to a binary .deb using <command>dpkg-buildpackage</"
+ #| "command>, if <option>--download-only</option> is specified then the "
+ #| "source package will not be unpacked."
  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 "
 -"the architecture as defined by the <command>--host-architecture</command> "
 -"option.  If <option>--download-only</option> is specified then the source "
 -"package will not be unpacked."
 +"be compiled to a binary .deb using <command>dpkg-buildpackage</command>, if "
 +"<option>--download-only</option> is specified then the source package will "
 +"not be unpacked."
  msgstr ""
  "Si l'option <option>--compile</option> est spécifiée, le paquet est compilé "
  "en un binaire .deb avec <command>dpkg-buildpackage</command>. Si <option>--"
@@@ -3790,10 -3817,17 +3832,14 @@@ msgid "build-dep
  msgstr "build-dep"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:281
 +#: apt-get.8.xml:272
+ #, fuzzy
+ #| msgid ""
+ #| "<literal>build-dep</literal> causes apt-get to install/remove packages in "
+ #| "an attempt to satisfy the build dependencies for a source package."
  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 "
 -"the dependencies are satisfied to build the package natively. If desired a "
 -"host-architecture can be specified with the <option>--host-architecture</"
 -"option> option instead."
 +"attempt to satisfy the build dependencies for a source package."
  msgstr ""
  "Avec la commande <literal>build-dep</literal>, apt-get installe ou supprime "
  "des paquets dans le but de satisfaire les dépendances de construction d'un "
@@@ -3819,10 -3853,10 +3865,14 @@@ msgid "download
  msgstr "download"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:293
 +#: apt-get.8.xml:282
++#, fuzzy
++#| msgid ""
++#| "<literal>download</literal> will download the given binary package into "
++#| "the current directory."
  msgid ""
  "<literal>download</literal> will download the given binary package into the "
 -"current directory."
 +"current directoy."
  msgstr ""
  "<literal>download</literal> télécharge le fichier binaire indiqué dans le "
  "répertoire courant."
@@@ -3876,11 -3910,16 +3926,16 @@@ msgid "autoremove
  msgstr "autoremove"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:319
 +#: apt-get.8.xml:308
+ #, fuzzy
+ #| msgid ""
+ #| "<literal>autoremove</literal> is used to remove packages that were "
+ #| "automatically installed to satisfy dependencies for some package and that "
+ #| "are no more needed."
  msgid ""
  "<literal>autoremove</literal> is used to remove packages that were "
 -"automatically installed to satisfy dependencies for other packages and are "
 -"now no longer needed."
 +"automatically installed to satisfy dependencies for some package and that "
 +"are no more needed."
  msgstr ""
  "Avec la commande <literal>autoremove</literal>, apt-get supprime les paquets "
  "installés dans le but de satisfaire les dépendances d'un paquet donné et qui "
@@@ -4740,7 -4800,7 +4795,15 @@@ msgid "--keyring <replaceable>filename<
  msgstr "--keyring <replaceable>fichier</replaceable>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-key.8.xml:165
 +#: apt-key.8.xml:162
++#, fuzzy
++#| msgid ""
++#| "With this option it is possible to specify a specific keyring file the "
++#| "command should operate on. The default is that a command is executed on "
++#| "the <filename>trusted.gpg</filename> file as well as on all parts in the "
++#| "<filename>trusted.gpg.d</filename> directory, though <filename>trusted."
++#| "gpg</filename> is the primary keyring which means that e.g. new keys are "
++#| "added to this one."
  msgid ""
  "With this option it is possible to specify a specific keyring file the "
  "command should operate on. The default is that a command is executed on the "
@@@ -5497,13 -5557,23 +5560,22 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
  #: apt.conf.5.xml:52
+ #, fuzzy
+ #| msgid ""
+ #| "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
+ #| "order which have no or \"<literal>conf</literal>\" as filename extension "
+ #| "and which only contain alphanumeric, hyphen (-), underscore (_) and "
+ #| "period (.) characters.  Otherwise APT will print a notice that it has "
+ #| "ignored a file if the file doesn't match a pattern in the <literal>Dir::"
+ #| "Ignore-Files-Silently</literal> configuration list - in this case it will "
+ #| "be silently ignored."
  msgid ""
  "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
 -"order which have either no or \"<literal>conf</literal>\" as filename "
 -"extension and which only contain alphanumeric, hyphen (-), underscore (_) "
 -"and period (.) characters.  Otherwise APT will print a notice that it has "
 -"ignored a file if the file doesn't match a pattern in the <literal>Dir::"
 -"Ignore-Files-Silently</literal> configuration list - in this case it will be "
 -"silently ignored."
 +"order which have no or \"<literal>conf</literal>\" as filename extension and "
 +"which only contain alphanumeric, hyphen (-), underscore (_) and period (.) "
 +"characters.  Otherwise APT will print a notice that it has ignored a file if "
 +"the file doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</"
 +"literal> configuration list - in this case it will be silently ignored."
  msgstr ""
  "tous les fichiers de <literal>Dir::Etc::Parts</literal> dans l'ordre "
  "alphanumérique ascendant qui ont soit l'extension \"<literal>conf</literal>"
@@@ -6051,17 -6132,25 +6123,28 @@@ msgid "Max-ValidTime
  msgstr "Max-ValidTime"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:269
 +#: apt.conf.5.xml:261
+ #, 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 "
 -"(indicated by the <literal>Date</literal> header).  If the Release file "
 -"itself includes a <literal>Valid-Until</literal> header the earlier date of "
 -"the two is used as the expiration date.  The default value is <literal>0</"
 -"literal> which stands for \"for ever\".  Archive specific settings can be "
 -"made by appending the label of the archive to the option name."
 +"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 ""
  "Durée (en secondes) pendant laquelle un fichier Release est considéré comme "
  "valable, à partir du moment de sa création. La valeur par défaut est 0 "
@@@ -6546,7 -6666,19 +6629,19 @@@ msgid "Dir::Bin::bzip2 \"/bin/bzip2\";
  msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:459
 +#: apt.conf.5.xml:442
+ #, fuzzy
+ #| msgid ""
+ #| "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
+ #| "replaceable></literal> will be checked: If this setting exists the method "
+ #| "will only be used if this file exists, e.g. for the bzip2 method (the "
+ #| "inbuilt) setting is <placeholder type=\"literallayout\" id=\"0\"/> Note "
+ #| "also that list entries specified on the command line will be added at the "
+ #| "end of the list specified in the configuration files, but before the "
+ #| "default entries. To prefer a type in this case over the ones specified in "
+ #| "the configuration files you can set the option direct - not in list "
+ #| "style.  This will not override the defined list, it will only prefix the "
+ #| "list with this type."
  msgid ""
  "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
  "replaceable></literal> will be checked: If this setting exists the method "
@@@ -6572,10 -6704,10 +6667,16 @@@ msgstr "
  "elle sera simplement préfixée avec l'option en question."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:466
 +#: apt.conf.5.xml:449
++#, fuzzy
++#| msgid ""
++#| "The special type <literal>uncompressed</literal> can be used to give "
++#| "uncompressed files a preference, but note that most archives don't "
++#| "provide uncompressed files so this is mostly only useable for local "
++#| "mirrors."
  msgid ""
  "The special type <literal>uncompressed</literal> can be used to give "
 -"uncompressed files a preference, but note that most archives don't provide "
 +"uncompressed files a preference, but note that most archives doesn't provide "
  "uncompressed files so this is mostly only useable for local mirrors."
  msgstr ""
  "Le type spécial <literal>uncompressed</literal> peut servir à donner la "
@@@ -9267,8 -9409,9 +9378,9 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><literallayout>
  #: sources.list.5.xml:81
- #, no-wrap
+ #, fuzzy, no-wrap
+ #| msgid "deb uri distribution [component1] [component2] [...]"
 -msgid "deb [ options ] uri distribution [component1] [component2] [...]"
 +msgid "deb uri distribution [component1] [component2] [...]"
  msgstr "deb uri distribution [composant1] [composant2] [...]"
  
  #. type: Content of: <refentry><refsect1><para>
@@@ -11193,6 -11380,13 +11305,60 @@@ msgstr "  # apt-get -o dir::cache::arch
  msgid "Which will use the already fetched archives on the disc."
  msgstr "Cette commande utilisera les fichiers récupérés sur le disque."
  
++#, fuzzy
++#~| msgid "<option>--recurse</option>"
++#~ msgid "<option>--host-architecture</option>"
++#~ msgstr "<option>--recurse</option>"
++
++#, fuzzy
++#~| msgid "Max-ValidTime"
++#~ msgid "Min-ValidTime"
++#~ msgstr "Max-ValidTime"
++
++#, 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 ""
++#~ "Minimum of seconds the Release file should be considered valid after it "
++#~ "was created (indicated by the <literal>Date</literal> header).  Use this "
++#~ "if you need to use a seldomly updated (local) mirror of a more regular "
++#~ "updated archive with a <literal>Valid-Until</literal> header instead of "
++#~ "completely disabling the expiration date checking.  Archive specific "
++#~ "settings can and should be used by appending the label of the archive to "
++#~ "the option name."
++#~ msgstr ""
++#~ "Durée (en secondes) pendant laquelle un fichier Release est considéré "
++#~ "comme valable, à partir du moment de sa création. La valeur par défaut "
++#~ "est 0 (fichier valable indéfiniment) si le fichier Release de l'archive "
++#~ "ne comporte pas d'en-tête <literal>Valid-Until</literal>. Dans le cas "
++#~ "contraire, c'est la valeur de cet en-tête qui est la valeur par défaut du "
++#~ "paramètre. La date du fichier Release ou la date indiquée dans l'en-tête "
++#~ "<literal>Date</literal>, augmentées du nombre de secondes indiquées sont "
++#~ "comparées à la date courante pour déterminer si un fichier Release donné "
++#~ "est obsolète ou pas. Un réglage spécifique pour une archive donnée peut "
++#~ "être défini en ajoutant l'étiquette de l'archive au nom de l'option."
++
++#, fuzzy
++#~| msgid ""
++#~| "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
++#~| "deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
++#~| "   "
+ #~ 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."
++#~ "deb http://ftp.debian.org/debian &stable-codename; main\n"
++#~ "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
+ #~ msgstr ""
 -#~ "Mettre à jour le trousseau de clés local avec le trousseau de clés de "
 -#~ "l'archive Debian et supprimer les clés qui y sont périmées."
++#~ "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
++#~ "deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
++#~ "   "
+ 
  #~ msgid "<option>--md5</option>"
  #~ msgstr "<option>--md5</option>"
  
diff --cc doc/po/ja.po
index 4b08de7df,b79809055..22488b227
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@@ -3907,12 -3921,19 +3936,18 @@@ msgstr "
  "もっと適切なものを取得します。"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:262
 +#: apt-get.8.xml:255
+ #, fuzzy
+ #| msgid ""
+ #| "If the <option>--compile</option> option is specified then the package "
+ #| "will be compiled to a binary .deb using <command>dpkg-buildpackage</"
+ #| "command>, if <option>--download-only</option> is specified then the "
+ #| "source package will not be unpacked."
  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 "
 -"the architecture as defined by the <command>--host-architecture</command> "
 -"option.  If <option>--download-only</option> is specified then the source "
 -"package will not be unpacked."
 +"be compiled to a binary .deb using <command>dpkg-buildpackage</command>, if "
 +"<option>--download-only</option> is specified then the source package will "
 +"not be unpacked."
  msgstr ""
  "<option>--compile</option> オプションを指定すると、<command>dpkg-"
  "buildpackage</command> を用いてバイナリ .deb パッケージをコンパイルします。"
@@@ -3952,10 -3973,17 +3987,14 @@@ msgstr "build-dep
  
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:281
 +#: apt-get.8.xml:272
+ #, fuzzy
+ #| msgid ""
+ #| "<literal>build-dep</literal> causes apt-get to install/remove packages in "
+ #| "an attempt to satisfy the build dependencies for a source package."
  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 "
 -"the dependencies are satisfied to build the package natively. If desired a "
 -"host-architecture can be specified with the <option>--host-architecture</"
 -"option> option instead."
 +"attempt to satisfy the build dependencies for a source package."
  msgstr ""
  "<literal>build-dep</literal> は、ソースパッケージの構築依存関係を満たすよう"
  "に、パッケージのインストール・削除を行います。"
@@@ -4038,11 -4066,16 +4077,16 @@@ msgstr "autoremove
  
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:319
 +#: apt-get.8.xml:308
+ #, fuzzy
+ #| msgid ""
+ #| "<literal>autoremove</literal> is used to remove packages that were "
+ #| "automatically installed to satisfy dependencies for some package and that "
+ #| "are no more needed."
  msgid ""
  "<literal>autoremove</literal> is used to remove packages that were "
 -"automatically installed to satisfy dependencies for other packages and are "
 -"now no longer needed."
 +"automatically installed to satisfy dependencies for some package and that "
 +"are no more needed."
  msgstr ""
  "<literal>autoremove</literal> は、依存関係を満たすために自動的にインストール"
  "され、もう必要なくなったパッケージを削除するのに使用します。"
@@@ -4916,7 -4969,7 +4960,15 @@@ msgid "--keyring <replaceable>filename<
  msgstr "--keyring <replaceable>filename</replaceable>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-key.8.xml:165
 +#: apt-key.8.xml:162
++#, fuzzy
++#| msgid ""
++#| "With this option it is possible to specify a specific keyring file the "
++#| "command should operate on. The default is that a command is executed on "
++#| "the <filename>trusted.gpg</filename> file as well as on all parts in the "
++#| "<filename>trusted.gpg.d</filename> directory, though <filename>trusted."
++#| "gpg</filename> is the primary keyring which means that e.g. new keys are "
++#| "added to this one."
  msgid ""
  "With this option it is possible to specify a specific keyring file the "
  "command should operate on. The default is that a command is executed on the "
@@@ -9368,8 -9440,9 +9420,9 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><literallayout>
  #: sources.list.5.xml:81
- #, no-wrap
+ #, fuzzy, no-wrap
+ #| msgid "deb uri distribution [component1] [component2] [...]"
 -msgid "deb [ options ] uri distribution [component1] [component2] [...]"
 +msgid "deb uri distribution [component1] [component2] [...]"
  msgstr "deb uri distribution [component1] [component2] [...]"
  
  # type: Content of: <refentry><refsect1><para>
@@@ -10932,6 -11049,14 +10985,29 @@@ msgstr "  # apt-get -o dir::cache::arch
  msgid "Which will use the already fetched archives on the disc."
  msgstr "これで、disc にある取得済みのアーカイブを使用するようになります。"
  
 -# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
++#, fuzzy
++#~| msgid "<option>--recurse</option>"
++#~ msgid "<option>--host-architecture</option>"
++#~ msgstr "<option>--recurse</option>"
++
++#, fuzzy
++#~| msgid "Max-ValidTime"
++#~ msgid "Min-ValidTime"
++#~ msgstr "Max-ValidTime"
++
++#, fuzzy
++#~| msgid ""
++#~| "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
++#~| "deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
++#~| "   "
+ #~ 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."
++#~ "deb http://ftp.debian.org/debian &stable-codename; main\n"
++#~ "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
+ #~ msgstr ""
 -#~ "Debian アーカイブキーで、ローカルキーリングを更新し、もう有効でないキーを"
 -#~ "キーリングから削除します。"
++#~ "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
++#~ "deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
++#~ "   "
+ 
  #~ msgid "<option>--md5</option>"
  #~ msgstr "<option>--md5</option>"
  
diff --cc doc/po/pl.po
index 0721cbf13,309fe2637..41eb56684
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@@ -3753,12 -3755,19 +3753,18 @@@ msgstr "
  "jest zainstalowana lub możliwa do zainstalowania."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:262
 +#: apt-get.8.xml:255
+ #, fuzzy
+ #| msgid ""
+ #| "If the <option>--compile</option> option is specified then the package "
+ #| "will be compiled to a binary .deb using <command>dpkg-buildpackage</"
+ #| "command>, if <option>--download-only</option> is specified then the "
+ #| "source package will not be unpacked."
  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 "
 -"the architecture as defined by the <command>--host-architecture</command> "
 -"option.  If <option>--download-only</option> is specified then the source "
 -"package will not be unpacked."
 +"be compiled to a binary .deb using <command>dpkg-buildpackage</command>, if "
 +"<option>--download-only</option> is specified then the source package will "
 +"not be unpacked."
  msgstr ""
  "Jeżeli podano opcję <option>--compile</option>, to pakiet źródłowy zostanie "
  "skompilowany do pakietu binarnego .deb za pomocą programu <command>dpkg-"
@@@ -3800,10 -3809,17 +3806,14 @@@ msgstr "build-dep
  
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:281
 +#: apt-get.8.xml:272
+ #, fuzzy
+ #| msgid ""
+ #| "<literal>build-dep</literal> causes apt-get to install/remove packages in "
+ #| "an attempt to satisfy the build dependencies for a source package."
  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 "
 -"the dependencies are satisfied to build the package natively. If desired a "
 -"host-architecture can be specified with the <option>--host-architecture</"
 -"option> option instead."
 +"attempt to satisfy the build dependencies for a source package."
  msgstr ""
  "<literal>build-dep</literal> powoduje, że apt-get zainstaluje/usunie pakiety "
  "tak, żeby spełnić zależności wymagane do zbudowania danego pakietu "
@@@ -3888,11 -3904,16 +3898,16 @@@ msgid "autoremove
  msgstr "autoremove"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:319
 +#: apt-get.8.xml:308
+ #, fuzzy
+ #| msgid ""
+ #| "<literal>autoremove</literal> is used to remove packages that were "
+ #| "automatically installed to satisfy dependencies for some package and that "
+ #| "are no more needed."
  msgid ""
  "<literal>autoremove</literal> is used to remove packages that were "
 -"automatically installed to satisfy dependencies for other packages and are "
 -"now no longer needed."
 +"automatically installed to satisfy dependencies for some package and that "
 +"are no more needed."
  msgstr ""
  "<literal>autoremove</literal> jest używane do usuwania pakietów, które  "
  "zostały zainstalowane automatycznie, żeby rozwiązać zależności, i nie są już "
@@@ -4784,7 -4826,7 +4799,15 @@@ msgid "--keyring <replaceable>filename<
  msgstr "--keyring <replaceable>nazwa_pliku</replaceable>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-key.8.xml:165
 +#: apt-key.8.xml:162
++#, fuzzy
++#| msgid ""
++#| "With this option it is possible to specify a specific keyring file the "
++#| "command should operate on. The default is that a command is executed on "
++#| "the <filename>trusted.gpg</filename> file as well as on all parts in the "
++#| "<filename>trusted.gpg.d</filename> directory, though <filename>trusted."
++#| "gpg</filename> is the primary keyring which means that e.g. new keys are "
++#| "added to this one."
  msgid ""
  "With this option it is possible to specify a specific keyring file the "
  "command should operate on. The default is that a command is executed on the "
@@@ -5456,14 -5498,29 +5479,28 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
  #: apt.conf.5.xml:52
+ #, fuzzy
+ #| 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 the regular <filename>sources.list</filename> file.  File names need "
+ #| "to end with <filename>.list</filename> and may only contain letters (a-z "
+ #| "and A-Z), digits (0-9), underscore (_), hyphen (-) and period (.) "
+ #| "characters.  Otherwise they will be silently ignored."
  msgid ""
  "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
 -"order which have either no or \"<literal>conf</literal>\" as filename "
 -"extension and which only contain alphanumeric, hyphen (-), underscore (_) "
 -"and period (.) characters.  Otherwise APT will print a notice that it has "
 -"ignored a file if the file doesn't match a pattern in the <literal>Dir::"
 -"Ignore-Files-Silently</literal> configuration list - in this case it will be "
 -"silently ignored."
 +"order which have no or \"<literal>conf</literal>\" as filename extension and "
 +"which only contain alphanumeric, hyphen (-), underscore (_) and period (.) "
 +"characters.  Otherwise APT will print a notice that it has ignored a file if "
 +"the file doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</"
 +"literal> configuration list - in this case it will be silently ignored."
  msgstr ""
+ "Katalog <filename>/etc/apt/sources.list.d</filename>  umożliwia podzielenie "
+ "pliku źródeł na osobne pliki. Format jest dokładnie taki sam, jak w "
+ "przypadku zwykłego pliku <filename>sources.list</filename>. Nazwy plików w "
+ "tym katalogu muszą się kończyć rozszerzeniem <filename>.list</filename> i "
+ "mogą składać się tylko z liter (a-z i A-Z), cyfr (0-9), znaku podkreślenia "
+ "(_), pauzy (-) i kropki (.). Inne pliki zostaną zignorowane."
  
  #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
  #: apt.conf.5.xml:59
@@@ -8308,8 -8403,9 +8359,9 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><literallayout>
  #: sources.list.5.xml:81
- #, no-wrap
+ #, fuzzy, no-wrap
+ #| msgid "deb uri distribution [component1] [component2] [...]"
 -msgid "deb [ options ] uri distribution [component1] [component2] [...]"
 +msgid "deb uri distribution [component1] [component2] [...]"
  msgstr "deb URI dystrybucja [komponent1] [komponent2] [...]"
  
  #. type: Content of: <refentry><refsect1><para>
@@@ -10217,6 -10357,14 +10269,24 @@@ msgstr "  # apt-get -o dir::cache::arch
  msgid "Which will use the already fetched archives on the disc."
  msgstr "Które użyje pobranych uprzednio archiwów z dysku."
  
++#, fuzzy
++#~| msgid "<option>--recurse</option>"
++#~ msgid "<option>--host-architecture</option>"
++#~ msgstr "<option>--recurse</option>"
++
++#, fuzzy
++#~| msgid ""
++#~| "deb http://http.us.debian.org/debian stable main contrib non-free\n"
++#~| "deb http://http.us.debian.org/debian dists/stable-updates/\n"
++#~| "   "
+ #~ 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."
++#~ "deb http://ftp.debian.org/debian &stable-codename; main\n"
++#~ "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
+ #~ msgstr ""
 -#~ "Aktualizuje lokalną składnicę kluczy używając składnicy kluczy archiwum "
 -#~ "Debiana i usuwa z lokalnej składnicy nieaktualne już klucze archiwów "
 -#~ "Debiana."
++#~ "deb http://http.us.debian.org/debian stable main contrib non-free\n"
++#~ "deb http://http.us.debian.org/debian dists/stable-updates/\n"
++#~ "   "
+ 
  #~ msgid "<option>--md5</option>"
  #~ msgstr "<option>--md5</option>"
  
diff --cc doc/po/pt.po
index 3c82b2df1,a96a2c97a..e298281f8
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@@ -1418,9 -1418,16 +1418,16 @@@ msgstr "<option>--no-enhances</option>
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-cache.8.xml:317
+ #, fuzzy
+ #| msgid ""
+ #| "Per default the <literal>depends</literal> and <literal>rdepends</"
+ #| "literal> print all dependencies. This can be twicked with these flags "
+ #| "which will omit the specified dependency type.  Configuration Item: "
+ #| "<literal>APT::Cache::Show<replaceable>DependencyType</replaceable></"
+ #| "literal> e.g. <literal>APT::Cache::ShowRecommends</literal>."
  msgid ""
  "Per default the <literal>depends</literal> and <literal>rdepends</literal> "
 -"print all dependencies. This can be tweaked with these flags which will omit "
 +"print all dependencies. This can be twicked with these flags which will omit "
  "the specified dependency type.  Configuration Item: <literal>APT::Cache::"
  "Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::"
  "Cache::ShowRecommends</literal>."
@@@ -3749,12 -3769,19 +3785,18 @@@ msgstr "
  "instalada ou pode instalar."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:262
 +#: apt-get.8.xml:255
+ #, fuzzy
+ #| msgid ""
+ #| "If the <option>--compile</option> option is specified then the package "
+ #| "will be compiled to a binary .deb using <command>dpkg-buildpackage</"
+ #| "command>, if <option>--download-only</option> is specified then the "
+ #| "source package will not be unpacked."
  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 "
 -"the architecture as defined by the <command>--host-architecture</command> "
 -"option.  If <option>--download-only</option> is specified then the source "
 -"package will not be unpacked."
 +"be compiled to a binary .deb using <command>dpkg-buildpackage</command>, if "
 +"<option>--download-only</option> is specified then the source package will "
 +"not be unpacked."
  msgstr ""
  "Se for especificada a opção <option>--compile</option> então o pacote irá "
  "ser compilado para um binário .deb usando <command>dpkg-buildpackage</"
@@@ -3793,10 -3820,17 +3835,14 @@@ msgid "build-dep
  msgstr "build-dep"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:281
 +#: apt-get.8.xml:272
+ #, fuzzy
+ #| msgid ""
+ #| "<literal>build-dep</literal> causes apt-get to install/remove packages in "
+ #| "an attempt to satisfy the build dependencies for a source package."
  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 "
 -"the dependencies are satisfied to build the package natively. If desired a "
 -"host-architecture can be specified with the <option>--host-architecture</"
 -"option> option instead."
 +"attempt to satisfy the build dependencies for a source package."
  msgstr ""
  "<literal>build-dep</literal> faz o apt-get instalar/remover pacotes numa "
  "tentativa de satisfazer dependências de compilação para um pacote fonte."
@@@ -3876,11 -3910,16 +3922,16 @@@ msgid "autoremove
  msgstr "autoremove"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:319
 +#: apt-get.8.xml:308
+ #, fuzzy
+ #| msgid ""
+ #| "<literal>autoremove</literal> is used to remove packages that were "
+ #| "automatically installed to satisfy dependencies for some package and that "
+ #| "are no more needed."
  msgid ""
  "<literal>autoremove</literal> is used to remove packages that were "
 -"automatically installed to satisfy dependencies for other packages and are "
 -"now no longer needed."
 +"automatically installed to satisfy dependencies for some package and that "
 +"are no more needed."
  msgstr ""
  "<literal>autoremove</literal> é usado para remover pacotes que foram "
  "instalados automaticamente para satisfazer dependências de algum pacote e "
@@@ -4725,7 -4785,7 +4776,15 @@@ msgid "--keyring <replaceable>filename<
  msgstr "--keyring <replaceable>nome-de-ficheiro</replaceable>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-key.8.xml:165
 +#: apt-key.8.xml:162
++#, fuzzy
++#| msgid ""
++#| "With this option it is possible to specify a specific keyring file the "
++#| "command should operate on. The default is that a command is executed on "
++#| "the <filename>trusted.gpg</filename> file as well as on all parts in the "
++#| "<filename>trusted.gpg.d</filename> directory, though <filename>trusted."
++#| "gpg</filename> is the primary keyring which means that e.g. new keys are "
++#| "added to this one."
  msgid ""
  "With this option it is possible to specify a specific keyring file the "
  "command should operate on. The default is that a command is executed on the "
@@@ -6038,17 -6110,25 +6097,28 @@@ msgid "Max-ValidTime
  msgstr "Max-ValidTime"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:269
 +#: apt.conf.5.xml:261
+ #, 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 "
 -"(indicated by the <literal>Date</literal> header).  If the Release file "
 -"itself includes a <literal>Valid-Until</literal> header the earlier date of "
 -"the two is used as the expiration date.  The default value is <literal>0</"
 -"literal> which stands for \"for ever\".  Archive specific settings can be "
 -"made by appending the label of the archive to the option name."
 +"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 "
@@@ -9253,8 -9363,9 +9323,9 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><literallayout>
  #: sources.list.5.xml:81
- #, no-wrap
+ #, fuzzy, no-wrap
+ #| msgid "deb uri distribution [component1] [component2] [...]"
 -msgid "deb [ options ] uri distribution [component1] [component2] [...]"
 +msgid "deb uri distribution [component1] [component2] [...]"
  msgstr "deb uri distribuição [componente1] [componente2] [...]"
  
  #. type: Content of: <refentry><refsect1><para>
@@@ -11138,6 -11293,13 +11209,59 @@@ msgstr "  # apt-get -o dir::cache::arch
  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."
  
++#, fuzzy
++#~| msgid "<option>--recurse</option>"
++#~ msgid "<option>--host-architecture</option>"
++#~ msgstr "<option>--recurse</option>"
++
++#, fuzzy
++#~| msgid "Max-ValidTime"
++#~ msgid "Min-ValidTime"
++#~ msgstr "Max-ValidTime"
++
++#, 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 ""
++#~ "Minimum of seconds the Release file should be considered valid after it "
++#~ "was created (indicated by the <literal>Date</literal> header).  Use this "
++#~ "if you need to use a seldomly updated (local) mirror of a more regular "
++#~ "updated archive with a <literal>Valid-Until</literal> header instead of "
++#~ "completely disabling the expiration date checking.  Archive specific "
++#~ "settings can and should be used 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. "
++
++#, fuzzy
++#~| msgid ""
++#~| "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
++#~| "deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
++#~| "   "
+ #~ 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."
++#~ "deb http://ftp.debian.org/debian &stable-codename; main\n"
++#~ "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
+ #~ 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."
++#~ "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
++#~ "deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
++#~ "   "
+ 
  #~ msgid "<option>--md5</option>"
  #~ msgstr "<option>--md5</option>"
  
diff --cc po/apt-all.pot
index 8e4d9d62b,f3392d204..82d61f4c4
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@@ -7,7 -7,7 +7,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2011-10-30 13:46-0500\n"
 -"POT-Creation-Date: 2011-10-14 12:59+0200\n"
++"POT-Creation-Date: 2011-12-19 14:28+0100\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"
@@@ -109,7 -109,7 +109,7 @@@ msgstr "
  msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
  msgstr ""
  
- #: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:445
 -#: cmdline/apt-cache.cc:1448 apt-pkg/cacheset.cc:440
++#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:459
  #, c-format
  msgid "Unable to locate package %s"
  msgstr ""
@@@ -152,10 -152,9 +152,10 @@@ msgstr "
  msgid "  Version table:"
  msgstr ""
  
 -#: cmdline/apt-cache.cc:1675 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:73
 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589
 -#: cmdline/apt-get.cc:3235 cmdline/apt-mark.cc:264 cmdline/apt-sortpkgs.cc:144
 +#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:199 cmdline/apt-config.cc:75
 +#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:590
- #: cmdline/apt-get.cc:3244 cmdline/apt-internal-solver.cc:32
++#: cmdline/apt-get.cc:3255 cmdline/apt-internal-solver.cc:32
 +#: cmdline/apt-mark.cc:266 cmdline/apt-sortpkgs.cc:147
  #, c-format
  msgid "%s %s for %s compiled on %s %s\n"
  msgstr ""
@@@ -253,7 -252,7 +253,7 @@@ msgid "
  "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
  msgstr ""
  
- #: cmdline/apt-extracttemplates.cc:269 apt-pkg/pkgcachegen.cc:1269
 -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1164
++#: cmdline/apt-extracttemplates.cc:269 apt-pkg/pkgcachegen.cc:1271
  #, c-format
  msgid "Unable to write to %s"
  msgstr ""
@@@ -486,63 -485,63 +486,51 @@@ msgstr "
  msgid "Failed to read the override file %s"
  msgstr ""
  
- #: ftparchive/multicompress.cc:69
 -#: ftparchive/multicompress.cc:67
++#: ftparchive/multicompress.cc:70
  #, c-format
  msgid "Unknown compression algorithm '%s'"
  msgstr ""
  
- #: ftparchive/multicompress.cc:99
 -#: ftparchive/multicompress.cc:97
++#: ftparchive/multicompress.cc:100
  #, c-format
  msgid "Compressed output %s needs a compression set"
  msgstr ""
  
- #: ftparchive/multicompress.cc:167 methods/rsh.cc:97
 -#: ftparchive/multicompress.cc:165 methods/rsh.cc:91
++#: ftparchive/multicompress.cc:168 methods/rsh.cc:97
  msgid "Failed to create IPC pipe to subprocess"
  msgstr ""
  
- #: ftparchive/multicompress.cc:193
 -#: ftparchive/multicompress.cc:191
++#: ftparchive/multicompress.cc:189
  msgid "Failed to create FILE*"
  msgstr ""
  
- #: ftparchive/multicompress.cc:196
 -#: ftparchive/multicompress.cc:194
++#: ftparchive/multicompress.cc:192
  msgid "Failed to fork"
  msgstr ""
  
- #: ftparchive/multicompress.cc:210
 -#: ftparchive/multicompress.cc:208
++#: ftparchive/multicompress.cc:206
  msgid "Compress child"
  msgstr ""
  
- #: ftparchive/multicompress.cc:233
 -#: ftparchive/multicompress.cc:231
++#: ftparchive/multicompress.cc:229
  #, c-format
  msgid "Internal error, failed to create %s"
  msgstr ""
  
- #: ftparchive/multicompress.cc:284
 -#: ftparchive/multicompress.cc:282
--msgid "Failed to create subprocess IPC"
--msgstr ""
--
- #: ftparchive/multicompress.cc:321
 -#: ftparchive/multicompress.cc:319
--msgid "Failed to exec compressor "
--msgstr ""
--
- #: ftparchive/multicompress.cc:360
 -#: ftparchive/multicompress.cc:358
--msgid "decompressor"
--msgstr ""
--
- #: ftparchive/multicompress.cc:403
 -#: ftparchive/multicompress.cc:401
++#: ftparchive/multicompress.cc:304
  msgid "IO to subprocess/file failed"
  msgstr ""
  
- #: ftparchive/multicompress.cc:455
 -#: ftparchive/multicompress.cc:453
++#: ftparchive/multicompress.cc:342
  msgid "Failed to read while computing MD5"
  msgstr ""
  
- #: ftparchive/multicompress.cc:472
 -#: ftparchive/multicompress.cc:470
++#: ftparchive/multicompress.cc:358
  #, c-format
  msgid "Problem unlinking %s"
  msgstr ""
  
- #: ftparchive/multicompress.cc:487 apt-inst/extract.cc:188
 -#: ftparchive/multicompress.cc:485 apt-inst/extract.cc:185
++#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
  #, c-format
  msgid "Failed to rename %s to %s"
  msgstr ""
@@@ -654,34 -649,34 +642,34 @@@ msgstr "
  msgid "%lu not fully installed or removed.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:633
 -#: cmdline/apt-get.cc:628
++#: cmdline/apt-get.cc:632
  #, c-format
  msgid "Note, selecting '%s' for task '%s'\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:639
 -#: cmdline/apt-get.cc:634
++#: cmdline/apt-get.cc:637
  #, c-format
  msgid "Note, selecting '%s' for regex '%s'\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:656
 -#: cmdline/apt-get.cc:651
++#: cmdline/apt-get.cc:654
  #, c-format
  msgid "Package %s is a virtual package provided by:\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:667
 -#: cmdline/apt-get.cc:662
++#: cmdline/apt-get.cc:665
  msgid " [Installed]"
  msgstr ""
  
- #: cmdline/apt-get.cc:676
 -#: cmdline/apt-get.cc:671
++#: cmdline/apt-get.cc:674
  msgid " [Not candidate version]"
  msgstr ""
  
- #: cmdline/apt-get.cc:678
 -#: cmdline/apt-get.cc:673
++#: cmdline/apt-get.cc:676
  msgid "You should explicitly select one to install."
  msgstr ""
  
- #: cmdline/apt-get.cc:681
 -#: cmdline/apt-get.cc:676
++#: cmdline/apt-get.cc:679
  #, c-format
  msgid ""
  "Package %s is not available, but is referred to by another package.\n"
@@@ -689,177 -684,177 +677,177 @@@
  "is only available from another source\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:699
 -#: cmdline/apt-get.cc:694
++#: cmdline/apt-get.cc:697
  msgid "However the following packages replace it:"
  msgstr ""
  
- #: cmdline/apt-get.cc:711
 -#: cmdline/apt-get.cc:706
++#: cmdline/apt-get.cc:709
  #, c-format
  msgid "Package '%s' has no installation candidate"
  msgstr ""
  
- #: cmdline/apt-get.cc:722
 -#: cmdline/apt-get.cc:717
++#: cmdline/apt-get.cc:720
  #, c-format
  msgid "Virtual packages like '%s' can't be removed\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:753
 -#: cmdline/apt-get.cc:748
++#: cmdline/apt-get.cc:764
  #, c-format
  msgid "Note, selecting '%s' instead of '%s'\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:783
 -#: cmdline/apt-get.cc:778
++#: cmdline/apt-get.cc:794
  #, c-format
  msgid "Skipping %s, it is already installed and upgrade is not set.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:787
 -#: cmdline/apt-get.cc:782
++#: cmdline/apt-get.cc:798
  #, c-format
  msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:799
 -#: cmdline/apt-get.cc:794
++#: cmdline/apt-get.cc:810
  #, c-format
  msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:804
 -#: cmdline/apt-get.cc:799
++#: cmdline/apt-get.cc:815
  #, c-format
  msgid "%s is already the newest version.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:823 cmdline/apt-get.cc:2103 cmdline/apt-mark.cc:61
 -#: cmdline/apt-get.cc:818 cmdline/apt-get.cc:2096 cmdline/apt-mark.cc:59
++#: cmdline/apt-get.cc:834 cmdline/apt-get.cc:2114 cmdline/apt-mark.cc:61
  #, c-format
  msgid "%s set to manually installed.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:849
 -#: cmdline/apt-get.cc:844
++#: cmdline/apt-get.cc:860
  #, c-format
  msgid "Selected version '%s' (%s) for '%s'\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:854
 -#: cmdline/apt-get.cc:849
++#: cmdline/apt-get.cc:865
  #, c-format
  msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:896
 -#: cmdline/apt-get.cc:891
++#: cmdline/apt-get.cc:907
  #, c-format
  msgid "Package %s is not installed, so not removed\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:974
 -#: cmdline/apt-get.cc:969
++#: cmdline/apt-get.cc:985
  msgid "Correcting dependencies..."
  msgstr ""
  
- #: cmdline/apt-get.cc:977
 -#: cmdline/apt-get.cc:972
++#: cmdline/apt-get.cc:988
  msgid " failed."
  msgstr ""
  
- #: cmdline/apt-get.cc:980
 -#: cmdline/apt-get.cc:975
++#: cmdline/apt-get.cc:991
  msgid "Unable to correct dependencies"
  msgstr ""
  
- #: cmdline/apt-get.cc:983
 -#: cmdline/apt-get.cc:978
++#: cmdline/apt-get.cc:994
  msgid "Unable to minimize the upgrade set"
  msgstr ""
  
- #: cmdline/apt-get.cc:985
 -#: cmdline/apt-get.cc:980
++#: cmdline/apt-get.cc:996
  msgid " Done"
  msgstr ""
  
- #: cmdline/apt-get.cc:989
 -#: cmdline/apt-get.cc:984
++#: cmdline/apt-get.cc:1000
  msgid "You might want to run 'apt-get -f install' to correct these."
  msgstr ""
  
- #: cmdline/apt-get.cc:992
 -#: cmdline/apt-get.cc:987
++#: cmdline/apt-get.cc:1003
  msgid "Unmet dependencies. Try using -f."
  msgstr ""
  
- #: cmdline/apt-get.cc:1017
 -#: cmdline/apt-get.cc:1012
++#: cmdline/apt-get.cc:1028
  msgid "WARNING: The following packages cannot be authenticated!"
  msgstr ""
  
- #: cmdline/apt-get.cc:1021
 -#: cmdline/apt-get.cc:1016
++#: cmdline/apt-get.cc:1032
  msgid "Authentication warning overridden.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:1028
 -#: cmdline/apt-get.cc:1023
++#: cmdline/apt-get.cc:1039
  msgid "Install these packages without verification [y/N]? "
  msgstr ""
  
- #: cmdline/apt-get.cc:1030
 -#: cmdline/apt-get.cc:1025
++#: cmdline/apt-get.cc:1041
  msgid "Some packages could not be authenticated"
  msgstr ""
  
- #: cmdline/apt-get.cc:1039 cmdline/apt-get.cc:1200
 -#: cmdline/apt-get.cc:1034 cmdline/apt-get.cc:1195
++#: cmdline/apt-get.cc:1050 cmdline/apt-get.cc:1211
  msgid "There are problems and -y was used without --force-yes"
  msgstr ""
  
- #: cmdline/apt-get.cc:1080
 -#: cmdline/apt-get.cc:1075
++#: cmdline/apt-get.cc:1091
  msgid "Internal error, InstallPackages was called with broken packages!"
  msgstr ""
  
- #: cmdline/apt-get.cc:1089
 -#: cmdline/apt-get.cc:1084
++#: cmdline/apt-get.cc:1100
  msgid "Packages need to be removed but remove is disabled."
  msgstr ""
  
- #: cmdline/apt-get.cc:1100
 -#: cmdline/apt-get.cc:1095
++#: cmdline/apt-get.cc:1111
  msgid "Internal error, Ordering didn't finish"
  msgstr ""
  
- #: cmdline/apt-get.cc:1138
 -#: cmdline/apt-get.cc:1133
++#: cmdline/apt-get.cc:1149
  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
- #: cmdline/apt-get.cc:1145
 -#: cmdline/apt-get.cc:1140
++#: cmdline/apt-get.cc:1156
  #, 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
- #: cmdline/apt-get.cc:1150
 -#: cmdline/apt-get.cc:1145
++#: cmdline/apt-get.cc:1161
  #, 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
- #: cmdline/apt-get.cc:1157
 -#: cmdline/apt-get.cc:1152
++#: cmdline/apt-get.cc:1168
  #, 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
- #: cmdline/apt-get.cc:1162
 -#: cmdline/apt-get.cc:1157
++#: cmdline/apt-get.cc:1173
  #, c-format
  msgid "After this operation, %sB disk space will be freed.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:1177 cmdline/apt-get.cc:1180 cmdline/apt-get.cc:2523
- #: cmdline/apt-get.cc:2526
 -#: cmdline/apt-get.cc:1172 cmdline/apt-get.cc:1175 cmdline/apt-get.cc:2514
 -#: cmdline/apt-get.cc:2517
++#: cmdline/apt-get.cc:1188 cmdline/apt-get.cc:1191 cmdline/apt-get.cc:2534
++#: cmdline/apt-get.cc:2537
  #, c-format
  msgid "Couldn't determine free space in %s"
  msgstr ""
  
- #: cmdline/apt-get.cc:1190
 -#: cmdline/apt-get.cc:1185
++#: cmdline/apt-get.cc:1201
  #, c-format
  msgid "You don't have enough free space in %s."
  msgstr ""
  
- #: cmdline/apt-get.cc:1206 cmdline/apt-get.cc:1226
 -#: cmdline/apt-get.cc:1201 cmdline/apt-get.cc:1221
++#: cmdline/apt-get.cc:1217 cmdline/apt-get.cc:1237
  msgid "Trivial Only specified but this is not a trivial operation."
  msgstr ""
  
- #: cmdline/apt-get.cc:1208
 -#: cmdline/apt-get.cc:1203
++#: cmdline/apt-get.cc:1219
  msgid "Yes, do as I say!"
  msgstr ""
  
- #: cmdline/apt-get.cc:1210
 -#: cmdline/apt-get.cc:1205
++#: cmdline/apt-get.cc:1221
  #, c-format
  msgid ""
  "You are about to do something potentially harmful.\n"
@@@ -867,46 -862,46 +855,46 @@@
  " ?] "
  msgstr ""
  
- #: cmdline/apt-get.cc:1216 cmdline/apt-get.cc:1235
 -#: cmdline/apt-get.cc:1211 cmdline/apt-get.cc:1230
++#: cmdline/apt-get.cc:1227 cmdline/apt-get.cc:1246
  msgid "Abort."
  msgstr ""
  
- #: cmdline/apt-get.cc:1231
 -#: cmdline/apt-get.cc:1226
++#: cmdline/apt-get.cc:1242
  msgid "Do you want to continue [Y/n]? "
  msgstr ""
  
- #: cmdline/apt-get.cc:1303 cmdline/apt-get.cc:2588 apt-pkg/algorithms.cc:1492
 -#: cmdline/apt-get.cc:1298 cmdline/apt-get.cc:2579 apt-pkg/algorithms.cc:1445
++#: cmdline/apt-get.cc:1314 cmdline/apt-get.cc:2599 apt-pkg/algorithms.cc:1492
  #, c-format
  msgid "Failed to fetch %s  %s\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:1321
 -#: cmdline/apt-get.cc:1316
++#: cmdline/apt-get.cc:1332
  msgid "Some files failed to download"
  msgstr ""
  
- #: cmdline/apt-get.cc:1322 cmdline/apt-get.cc:2600
 -#: cmdline/apt-get.cc:1317 cmdline/apt-get.cc:2591
++#: cmdline/apt-get.cc:1333 cmdline/apt-get.cc:2611
  msgid "Download complete and in download only mode"
  msgstr ""
  
- #: cmdline/apt-get.cc:1328
 -#: cmdline/apt-get.cc:1323
++#: cmdline/apt-get.cc:1339
  msgid ""
  "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
  "missing?"
  msgstr ""
  
- #: cmdline/apt-get.cc:1332
 -#: cmdline/apt-get.cc:1327
++#: cmdline/apt-get.cc:1343
  msgid "--fix-missing and media swapping is not currently supported"
  msgstr ""
  
- #: cmdline/apt-get.cc:1337
 -#: cmdline/apt-get.cc:1332
++#: cmdline/apt-get.cc:1348
  msgid "Unable to correct missing packages."
  msgstr ""
  
- #: cmdline/apt-get.cc:1338
 -#: cmdline/apt-get.cc:1333
++#: cmdline/apt-get.cc:1349
  msgid "Aborting install."
  msgstr ""
  
- #: cmdline/apt-get.cc:1366
 -#: cmdline/apt-get.cc:1361
++#: cmdline/apt-get.cc:1377
  msgid ""
  "The following package disappeared from your system as\n"
  "all files have been overwritten by other packages:"
@@@ -916,35 -911,35 +904,35 @@@ msgid_plural "
  msgstr[0] ""
  msgstr[1] ""
  
- #: cmdline/apt-get.cc:1370
 -#: cmdline/apt-get.cc:1365
++#: cmdline/apt-get.cc:1381
  msgid "Note: This is done automatic and on purpose by dpkg."
  msgstr ""
  
- #: cmdline/apt-get.cc:1508
 -#: cmdline/apt-get.cc:1503
++#: cmdline/apt-get.cc:1519
  #, c-format
  msgid "Ignore unavailable target release '%s' of package '%s'"
  msgstr ""
  
- #: cmdline/apt-get.cc:1540
 -#: cmdline/apt-get.cc:1535
++#: cmdline/apt-get.cc:1551
  #, c-format
  msgid "Picking '%s' as source package instead of '%s'\n"
  msgstr ""
  
  #. if (VerTag.empty() == false && Last == 0)
- #: cmdline/apt-get.cc:1578
 -#: cmdline/apt-get.cc:1573
++#: cmdline/apt-get.cc:1589
  #, c-format
  msgid "Ignore unavailable version '%s' of package '%s'"
  msgstr ""
  
- #: cmdline/apt-get.cc:1594
 -#: cmdline/apt-get.cc:1589
++#: cmdline/apt-get.cc:1605
  msgid "The update command takes no arguments"
  msgstr ""
  
- #: cmdline/apt-get.cc:1657
 -#: cmdline/apt-get.cc:1652
++#: cmdline/apt-get.cc:1668
  msgid "We are not supposed to delete stuff, can't start AutoRemover"
  msgstr ""
  
- #: cmdline/apt-get.cc:1761
 -#: cmdline/apt-get.cc:1756
++#: cmdline/apt-get.cc:1772
  msgid ""
  "Hmm, seems like the AutoRemover destroyed something which really\n"
  "shouldn't happen. Please file a bug report against apt."
@@@ -960,15 -955,15 +948,15 @@@ msgstr "
  #. "that package should be filed.") << endl;
  #. }
  #.
- #: cmdline/apt-get.cc:1764 cmdline/apt-get.cc:1933
 -#: cmdline/apt-get.cc:1759 cmdline/apt-get.cc:1929
++#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1944
  msgid "The following information may help to resolve the situation:"
  msgstr ""
  
- #: cmdline/apt-get.cc:1768
 -#: cmdline/apt-get.cc:1763
++#: cmdline/apt-get.cc:1779
  msgid "Internal Error, AutoRemover broke stuff"
  msgstr ""
  
- #: cmdline/apt-get.cc:1775
 -#: cmdline/apt-get.cc:1770
++#: cmdline/apt-get.cc:1786
  msgid ""
  "The following package was automatically installed and is no longer required:"
  msgid_plural ""
@@@ -977,7 -972,7 +965,7 @@@
  msgstr[0] ""
  msgstr[1] ""
  
- #: cmdline/apt-get.cc:1779
 -#: cmdline/apt-get.cc:1774
++#: cmdline/apt-get.cc:1790
  #, c-format
  msgid "%lu package was automatically installed and is no longer required.\n"
  msgid_plural ""
@@@ -985,25 -980,25 +973,25 @@@
  msgstr[0] ""
  msgstr[1] ""
  
- #: cmdline/apt-get.cc:1781
 -#: cmdline/apt-get.cc:1776
++#: cmdline/apt-get.cc:1792
  msgid "Use 'apt-get autoremove' to remove them."
  msgstr ""
  
- #: cmdline/apt-get.cc:1800
 -#: cmdline/apt-get.cc:1795
++#: cmdline/apt-get.cc:1811
  msgid "Internal error, AllUpgrade broke stuff"
  msgstr ""
  
- #: cmdline/apt-get.cc:1899
 -#: cmdline/apt-get.cc:1894
++#: cmdline/apt-get.cc:1910
  msgid "You might want to run 'apt-get -f install' to correct these:"
  msgstr ""
  
- #: cmdline/apt-get.cc:1903
 -#: cmdline/apt-get.cc:1898
++#: cmdline/apt-get.cc:1914
  msgid ""
  "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
  "solution)."
  msgstr ""
  
- #: cmdline/apt-get.cc:1918
 -#: cmdline/apt-get.cc:1914
++#: cmdline/apt-get.cc:1929
  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"
@@@ -1011,80 -1006,80 +999,80 @@@
  "or been moved out of Incoming."
  msgstr ""
  
- #: cmdline/apt-get.cc:1939
 -#: cmdline/apt-get.cc:1932
++#: cmdline/apt-get.cc:1950
  msgid "Broken packages"
  msgstr ""
  
- #: cmdline/apt-get.cc:1965
 -#: cmdline/apt-get.cc:1958
++#: cmdline/apt-get.cc:1976
  msgid "The following extra packages will be installed:"
  msgstr ""
  
- #: cmdline/apt-get.cc:2055
 -#: cmdline/apt-get.cc:2048
++#: cmdline/apt-get.cc:2066
  msgid "Suggested packages:"
  msgstr ""
  
- #: cmdline/apt-get.cc:2056
 -#: cmdline/apt-get.cc:2049
++#: cmdline/apt-get.cc:2067
  msgid "Recommended packages:"
  msgstr ""
  
- #: cmdline/apt-get.cc:2098
 -#: cmdline/apt-get.cc:2091
++#: cmdline/apt-get.cc:2109
  #, c-format
  msgid "Couldn't find package %s"
  msgstr ""
  
- #: cmdline/apt-get.cc:2105 cmdline/apt-mark.cc:63
 -#: cmdline/apt-get.cc:2098 cmdline/apt-mark.cc:61
++#: cmdline/apt-get.cc:2116 cmdline/apt-mark.cc:63
  #, c-format
  msgid "%s set to automatically installed.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2113 cmdline/apt-mark.cc:107
 -#: cmdline/apt-get.cc:2106 cmdline/apt-mark.cc:105
++#: cmdline/apt-get.cc:2124 cmdline/apt-mark.cc:107
  msgid ""
  "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
  "instead."
  msgstr ""
  
- #: cmdline/apt-get.cc:2129
 -#: cmdline/apt-get.cc:2122
++#: cmdline/apt-get.cc:2140
  msgid "Calculating upgrade... "
  msgstr ""
  
- #: cmdline/apt-get.cc:2132 methods/ftp.cc:711 methods/connect.cc:115
 -#: cmdline/apt-get.cc:2125 methods/ftp.cc:708 methods/connect.cc:111
++#: cmdline/apt-get.cc:2143 methods/ftp.cc:711 methods/connect.cc:115
  msgid "Failed"
  msgstr ""
  
- #: cmdline/apt-get.cc:2137
 -#: cmdline/apt-get.cc:2130
++#: cmdline/apt-get.cc:2148
  msgid "Done"
  msgstr ""
  
- #: cmdline/apt-get.cc:2204 cmdline/apt-get.cc:2212
 -#: cmdline/apt-get.cc:2197 cmdline/apt-get.cc:2205
++#: cmdline/apt-get.cc:2215 cmdline/apt-get.cc:2223
  msgid "Internal error, problem resolver broke stuff"
  msgstr ""
  
- #: cmdline/apt-get.cc:2240 cmdline/apt-get.cc:2276
 -#: cmdline/apt-get.cc:2233 cmdline/apt-get.cc:2269
++#: cmdline/apt-get.cc:2251 cmdline/apt-get.cc:2287
  msgid "Unable to lock the download directory"
  msgstr ""
  
- #: cmdline/apt-get.cc:2327
 -#: cmdline/apt-get.cc:2320
++#: cmdline/apt-get.cc:2338
  #, c-format
  msgid "Downloading %s %s"
  msgstr ""
  
- #: cmdline/apt-get.cc:2385
 -#: cmdline/apt-get.cc:2376
++#: cmdline/apt-get.cc:2396
  msgid "Must specify at least one package to fetch source for"
  msgstr ""
  
- #: cmdline/apt-get.cc:2425 cmdline/apt-get.cc:2737
 -#: cmdline/apt-get.cc:2416 cmdline/apt-get.cc:2728
++#: cmdline/apt-get.cc:2436 cmdline/apt-get.cc:2748
  #, c-format
  msgid "Unable to find a source package for %s"
  msgstr ""
  
- #: cmdline/apt-get.cc:2442
 -#: cmdline/apt-get.cc:2433
++#: cmdline/apt-get.cc:2453
  #, c-format
  msgid ""
  "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
  "%s\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2447
 -#: cmdline/apt-get.cc:2438
++#: cmdline/apt-get.cc:2458
  #, c-format
  msgid ""
  "Please use:\n"
@@@ -1092,141 -1087,141 +1080,141 @@@
  "to retrieve the latest (possibly unreleased) updates to the package.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2500
 -#: cmdline/apt-get.cc:2491
++#: cmdline/apt-get.cc:2511
  #, c-format
  msgid "Skipping already downloaded file '%s'\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2537
 -#: cmdline/apt-get.cc:2528
++#: cmdline/apt-get.cc:2548
  #, c-format
  msgid "You don't have enough free space in %s"
  msgstr ""
  
  #. TRANSLATOR: The required space between number and unit is already included
  #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
- #: cmdline/apt-get.cc:2546
 -#: cmdline/apt-get.cc:2537
++#: cmdline/apt-get.cc:2557
  #, c-format
  msgid "Need to get %sB/%sB of source archives.\n"
  msgstr ""
  
  #. TRANSLATOR: The required space between number and unit is already included
  #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
- #: cmdline/apt-get.cc:2551
 -#: cmdline/apt-get.cc:2542
++#: cmdline/apt-get.cc:2562
  #, c-format
  msgid "Need to get %sB of source archives.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2557
 -#: cmdline/apt-get.cc:2548
++#: cmdline/apt-get.cc:2568
  #, c-format
  msgid "Fetch source %s\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2595
 -#: cmdline/apt-get.cc:2586
++#: cmdline/apt-get.cc:2606
  msgid "Failed to fetch some archives."
  msgstr ""
  
- #: cmdline/apt-get.cc:2626
 -#: cmdline/apt-get.cc:2617
++#: cmdline/apt-get.cc:2637
  #, c-format
  msgid "Skipping unpack of already unpacked source in %s\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2638
 -#: cmdline/apt-get.cc:2629
++#: cmdline/apt-get.cc:2649
  #, c-format
  msgid "Unpack command '%s' failed.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2639
 -#: cmdline/apt-get.cc:2630
++#: cmdline/apt-get.cc:2650
  #, c-format
  msgid "Check if the 'dpkg-dev' package is installed.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2661
 -#: cmdline/apt-get.cc:2652
++#: cmdline/apt-get.cc:2672
  #, c-format
  msgid "Build command '%s' failed.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2681
 -#: cmdline/apt-get.cc:2672
++#: cmdline/apt-get.cc:2692
  msgid "Child process failed"
  msgstr ""
  
- #: cmdline/apt-get.cc:2700
 -#: cmdline/apt-get.cc:2691
++#: cmdline/apt-get.cc:2711
  msgid "Must specify at least one package to check builddeps for"
  msgstr ""
  
- #: cmdline/apt-get.cc:2725
 -#: cmdline/apt-get.cc:2716
++#: cmdline/apt-get.cc:2736
  #, c-format
  msgid ""
  "No architecture information available for %s. See apt.conf(5) APT::"
  "Architectures for setup"
  msgstr ""
  
- #: cmdline/apt-get.cc:2742
 -#: cmdline/apt-get.cc:2733
++#: cmdline/apt-get.cc:2753
  #, c-format
  msgid "Unable to get build-dependency information for %s"
  msgstr ""
  
- #: cmdline/apt-get.cc:2762
 -#: cmdline/apt-get.cc:2753
++#: cmdline/apt-get.cc:2773
  #, c-format
  msgid "%s has no build depends.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2892
 -#: cmdline/apt-get.cc:2883
++#: cmdline/apt-get.cc:2903
  #, c-format
  msgid ""
  "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
  "packages"
  msgstr ""
  
- #: cmdline/apt-get.cc:2913
 -#: cmdline/apt-get.cc:2904
++#: cmdline/apt-get.cc:2924
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because the package %s cannot be "
  "found"
  msgstr ""
  
- #: cmdline/apt-get.cc:2936
 -#: cmdline/apt-get.cc:2927
++#: cmdline/apt-get.cc:2947
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
  msgstr ""
  
- #: cmdline/apt-get.cc:2975
 -#: cmdline/apt-get.cc:2966
++#: cmdline/apt-get.cc:2986
  #, 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:2981
 -#: cmdline/apt-get.cc:2972
++#: cmdline/apt-get.cc:2992
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because package %s has no candidate "
  "version"
  msgstr ""
  
- #: cmdline/apt-get.cc:3004
 -#: cmdline/apt-get.cc:2995
++#: cmdline/apt-get.cc:3015
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: %s"
  msgstr ""
  
- #: cmdline/apt-get.cc:3020
 -#: cmdline/apt-get.cc:3011
++#: cmdline/apt-get.cc:3031
  #, c-format
  msgid "Build-dependencies for %s could not be satisfied."
  msgstr ""
  
- #: cmdline/apt-get.cc:3025
 -#: cmdline/apt-get.cc:3016
++#: cmdline/apt-get.cc:3036
  msgid "Failed to process build dependencies"
  msgstr ""
  
- #: cmdline/apt-get.cc:3118 cmdline/apt-get.cc:3130
 -#: cmdline/apt-get.cc:3109 cmdline/apt-get.cc:3121
++#: cmdline/apt-get.cc:3129 cmdline/apt-get.cc:3141
  #, c-format
  msgid "Changelog for %s (%s)"
  msgstr ""
  
- #: cmdline/apt-get.cc:3249
 -#: cmdline/apt-get.cc:3240
++#: cmdline/apt-get.cc:3260
  msgid "Supported modules:"
  msgstr ""
  
- #: cmdline/apt-get.cc:3290
 -#: cmdline/apt-get.cc:3281
++#: cmdline/apt-get.cc:3301
  msgid ""
  "Usage: apt-get [options] command\n"
  "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@@ -1272,7 -1267,7 +1260,7 @@@
  "                       This APT has Super Cow Powers.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:3455
 -#: cmdline/apt-get.cc:3444
++#: cmdline/apt-get.cc:3466
  msgid ""
  "NOTE: This is only a simulation!\n"
  "      apt-get needs root privileges for real execution.\n"
@@@ -1579,11 -1558,11 +1567,11 @@@ msgstr "
  
  #. Only warn if there are no sources.list.d.
  #. Only warn if there is no sources.list file.
 -#: apt-inst/extract.cc:462 apt-pkg/contrib/cdromutl.cc:179
 -#: apt-pkg/contrib/fileutl.cc:343 apt-pkg/sourcelist.cc:204
 -#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:454 apt-pkg/init.cc:103
 -#: apt-pkg/init.cc:111 apt-pkg/clean.cc:33 apt-pkg/policy.cc:353
 -#: methods/mirror.cc:91
 +#: apt-inst/extract.cc:465 apt-pkg/contrib/cdromutl.cc:183
- #: apt-pkg/contrib/fileutl.cc:344 apt-pkg/sourcelist.cc:208
++#: apt-pkg/contrib/fileutl.cc:372 apt-pkg/sourcelist.cc:208
 +#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:456 apt-pkg/init.cc:108
 +#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
 +#: methods/mirror.cc:95
  #, c-format
  msgid "Unable to read %s"
  msgstr ""
@@@ -1612,9 -1591,9 +1600,9 @@@ msgstr "
  msgid "The info and temp directories need to be on the same filesystem"
  msgstr ""
  
- #: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:1168
- #: apt-pkg/pkgcachegen.cc:1272 apt-pkg/pkgcachegen.cc:1278
- #: apt-pkg/pkgcachegen.cc:1434
 -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1063
 -#: apt-pkg/pkgcachegen.cc:1167 apt-pkg/pkgcachegen.cc:1173
 -#: apt-pkg/pkgcachegen.cc:1335
++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:1170
++#: apt-pkg/pkgcachegen.cc:1274 apt-pkg/pkgcachegen.cc:1280
++#: apt-pkg/pkgcachegen.cc:1436
  msgid "Reading package lists"
  msgstr ""
  
@@@ -1730,14 -1709,14 +1718,14 @@@ msgstr "
  msgid "Read error from %s process"
  msgstr ""
  
 -#: methods/bzip2.cc:140 methods/bzip2.cc:149 methods/copy.cc:43
 -#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:527
 -#: methods/rred.cc:536
 +#: methods/bzip2.cc:143 methods/bzip2.cc:152 methods/copy.cc:46
- #: methods/gzip.cc:94 methods/gzip.cc:103 methods/rred.cc:530
- #: methods/rred.cc:539
++#: methods/gzip.cc:94 methods/gzip.cc:103 methods/rred.cc:491
++#: methods/rred.cc:500
  msgid "Failed to stat"
  msgstr ""
  
 -#: methods/bzip2.cc:146 methods/copy.cc:80 methods/gzip.cc:98
 -#: methods/rred.cc:533
 +#: methods/bzip2.cc:149 methods/copy.cc:83 methods/gzip.cc:100
- #: methods/rred.cc:536
++#: methods/rred.cc:497
  msgid "Failed to set modification time"
  msgstr ""
  
@@@ -1825,7 -1804,7 +1813,7 @@@ msgstr "
  msgid "Server closed the connection"
  msgstr ""
  
- #: methods/ftp.cc:348 apt-pkg/contrib/fileutl.cc:832 methods/rsh.cc:197
 -#: methods/ftp.cc:345 apt-pkg/contrib/fileutl.cc:831 methods/rsh.cc:191
++#: methods/ftp.cc:348 apt-pkg/contrib/fileutl.cc:1065 methods/rsh.cc:197
  msgid "Read error"
  msgstr ""
  
@@@ -1837,7 -1816,7 +1825,7 @@@ msgstr "
  msgid "Protocol corruption"
  msgstr ""
  
- #: methods/ftp.cc:456 apt-pkg/contrib/fileutl.cc:874 methods/rsh.cc:239
 -#: methods/ftp.cc:453 apt-pkg/contrib/fileutl.cc:873 methods/rsh.cc:233
++#: methods/ftp.cc:456 apt-pkg/contrib/fileutl.cc:1139 methods/rsh.cc:239
  msgid "Write error"
  msgstr ""
  
@@@ -1891,7 -1870,7 +1879,7 @@@ msgstr "
  msgid "Unable to accept connection"
  msgstr ""
  
- #: methods/ftp.cc:873 methods/http.cc:1031 methods/rsh.cc:309
 -#: methods/ftp.cc:870 methods/http.cc:1023 methods/rsh.cc:303
++#: methods/ftp.cc:873 methods/http.cc:1022 methods/rsh.cc:309
  msgid "Problem hashing file"
  msgstr ""
  
@@@ -2063,19 -2042,19 +2051,15 @@@ msgstr "
  msgid "Error reading from server"
  msgstr ""
  
- #: methods/http.cc:1016 apt-pkg/contrib/mmap.cc:293
 -#: methods/http.cc:1008 apt-pkg/contrib/mmap.cc:291
--msgid "Failed to truncate file"
--msgstr ""
--
- #: methods/http.cc:1191
 -#: methods/http.cc:1183
++#: methods/http.cc:1181
  msgid "Bad header data"
  msgstr ""
  
- #: methods/http.cc:1208 methods/http.cc:1263
 -#: methods/http.cc:1200 methods/http.cc:1255
++#: methods/http.cc:1198 methods/http.cc:1253
  msgid "Connection failed"
  msgstr ""
  
- #: methods/http.cc:1355
 -#: methods/http.cc:1347
++#: methods/http.cc:1345
  msgid "Internal error"
  msgstr ""
  
@@@ -2083,44 -2062,39 +2067,48 @@@
  msgid "Can't mmap an empty file"
  msgstr ""
  
- #: apt-pkg/contrib/mmap.cc:91
 -#: apt-pkg/contrib/mmap.cc:89
++#: apt-pkg/contrib/mmap.cc:109
  #, c-format
  msgid "Couldn't duplicate file descriptor %i"
  msgstr ""
  
- #: apt-pkg/contrib/mmap.cc:99
 -#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:258
++#: apt-pkg/contrib/mmap.cc:117
  #, c-format
 -msgid "Couldn't make mmap of %lu bytes"
 +msgid "Couldn't make mmap of %llu bytes"
  msgstr ""
  
- #: apt-pkg/contrib/mmap.cc:126
 -#: apt-pkg/contrib/mmap.cc:124
++#: apt-pkg/contrib/mmap.cc:144
  msgid "Unable to close mmap"
  msgstr ""
  
- #: apt-pkg/contrib/mmap.cc:154 apt-pkg/contrib/mmap.cc:182
 -#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180
++#: apt-pkg/contrib/mmap.cc:172 apt-pkg/contrib/mmap.cc:200
  msgid "Unable to synchronize mmap"
  msgstr ""
  
- #: apt-pkg/contrib/mmap.cc:260
 -#: apt-pkg/contrib/mmap.cc:310
++#: apt-pkg/contrib/mmap.cc:278
 +#, c-format
 +msgid "Couldn't make mmap of %lu bytes"
 +msgstr ""
 +
- #: apt-pkg/contrib/mmap.cc:312
++#: apt-pkg/contrib/mmap.cc:311
++msgid "Failed to truncate file"
++msgstr ""
++
++#: apt-pkg/contrib/mmap.cc:330
  #, c-format
  msgid ""
  "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
  "Current value: %lu. (man 5 apt.conf)"
  msgstr ""
  
- #: apt-pkg/contrib/mmap.cc:411
 -#: apt-pkg/contrib/mmap.cc:409
++#: apt-pkg/contrib/mmap.cc:429
  #, c-format
  msgid ""
  "Unable to increase the size of the MMap as the limit of %lu bytes is already "
  "reached."
  msgstr ""
  
- #: apt-pkg/contrib/mmap.cc:414
 -#: apt-pkg/contrib/mmap.cc:412
++#: apt-pkg/contrib/mmap.cc:432
  msgid ""
  "Unable to increase size of the MMap as automatic growing is disabled by user."
  msgstr ""
@@@ -2281,113 -2255,113 +2269,121 @@@ msgstr "
  msgid "Failed to stat the cdrom"
  msgstr ""
  
- #: apt-pkg/contrib/fileutl.cc:169
 -#: apt-pkg/contrib/fileutl.cc:168
++#: apt-pkg/contrib/fileutl.cc:197
  #, c-format
  msgid "Not using locking for read only lock file %s"
  msgstr ""
  
- #: apt-pkg/contrib/fileutl.cc:174
 -#: apt-pkg/contrib/fileutl.cc:173
++#: apt-pkg/contrib/fileutl.cc:202
  #, c-format
  msgid "Could not open lock file %s"
  msgstr ""
  
- #: apt-pkg/contrib/fileutl.cc:192
 -#: apt-pkg/contrib/fileutl.cc:191
++#: apt-pkg/contrib/fileutl.cc:220
  #, c-format
  msgid "Not using locking for nfs mounted lock file %s"
  msgstr ""
  
- #: apt-pkg/contrib/fileutl.cc:196
 -#: apt-pkg/contrib/fileutl.cc:195
++#: apt-pkg/contrib/fileutl.cc:224
  #, c-format
  msgid "Could not get lock %s"
  msgstr ""
  
- #: apt-pkg/contrib/fileutl.cc:336
 -#: apt-pkg/contrib/fileutl.cc:335
++#: apt-pkg/contrib/fileutl.cc:364
  #, c-format
  msgid "List of files can't be created as '%s' is not a directory"
  msgstr ""
  
- #: apt-pkg/contrib/fileutl.cc:363
 -#: apt-pkg/contrib/fileutl.cc:362
++#: apt-pkg/contrib/fileutl.cc:391
  #, c-format
  msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
  msgstr ""
  
- #: apt-pkg/contrib/fileutl.cc:381
 -#: apt-pkg/contrib/fileutl.cc:380
++#: apt-pkg/contrib/fileutl.cc:409
  #, c-format
  msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
  msgstr ""
  
- #: apt-pkg/contrib/fileutl.cc:390
 -#: apt-pkg/contrib/fileutl.cc:389
++#: apt-pkg/contrib/fileutl.cc:418
  #, c-format
  msgid ""
  "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
  msgstr ""
  
- #: apt-pkg/contrib/fileutl.cc:691
 -#: apt-pkg/contrib/fileutl.cc:690
++#: apt-pkg/contrib/fileutl.cc:719
  #, c-format
  msgid "Waited for %s but it wasn't there"
  msgstr ""
  
- #: apt-pkg/contrib/fileutl.cc:703
 -#: apt-pkg/contrib/fileutl.cc:702
++#: apt-pkg/contrib/fileutl.cc:731
  #, c-format
  msgid "Sub-process %s received a segmentation fault."
  msgstr ""
  
- #: apt-pkg/contrib/fileutl.cc:705
 -#: apt-pkg/contrib/fileutl.cc:704
++#: apt-pkg/contrib/fileutl.cc:733
  #, c-format
  msgid "Sub-process %s received signal %u."
  msgstr ""
  
- #: apt-pkg/contrib/fileutl.cc:709
 -#: apt-pkg/contrib/fileutl.cc:708
++#: apt-pkg/contrib/fileutl.cc:737
  #, c-format
  msgid "Sub-process %s returned an error code (%u)"
  msgstr ""
  
- #: apt-pkg/contrib/fileutl.cc:711
 -#: apt-pkg/contrib/fileutl.cc:710
++#: apt-pkg/contrib/fileutl.cc:739
  #, c-format
  msgid "Sub-process %s exited unexpectedly"
  msgstr ""
  
- #: apt-pkg/contrib/fileutl.cc:776 apt-pkg/indexcopy.cc:676
 -#: apt-pkg/contrib/fileutl.cc:775 apt-pkg/indexcopy.cc:673
++#: apt-pkg/contrib/fileutl.cc:877 apt-pkg/indexcopy.cc:655
  #, c-format
  msgid "Could not open file %s"
  msgstr ""
  
- #: apt-pkg/contrib/fileutl.cc:793
 -#: apt-pkg/contrib/fileutl.cc:792
++#: apt-pkg/contrib/fileutl.cc:923
  #, c-format
  msgid "Could not open file descriptor %d"
  msgstr ""
  
- #: apt-pkg/contrib/fileutl.cc:853
 -#: apt-pkg/contrib/fileutl.cc:852
++#: apt-pkg/contrib/fileutl.cc:970
++msgid "Failed to create subprocess IPC"
++msgstr ""
++
++#: apt-pkg/contrib/fileutl.cc:1019
++msgid "Failed to exec compressor "
++msgstr ""
++
++#: apt-pkg/contrib/fileutl.cc:1087
  #, c-format
 -msgid "read, still have %lu to read but none left"
 +msgid "read, still have %llu to read but none left"
  msgstr ""
  
- #: apt-pkg/contrib/fileutl.cc:886
 -#: apt-pkg/contrib/fileutl.cc:885
++#: apt-pkg/contrib/fileutl.cc:1152
  #, c-format
 -msgid "write, still have %lu to write but couldn't"
 +msgid "write, still have %llu to write but couldn't"
  msgstr ""
  
- #: apt-pkg/contrib/fileutl.cc:1023
 -#: apt-pkg/contrib/fileutl.cc:1021
++#: apt-pkg/contrib/fileutl.cc:1410
  #, c-format
  msgid "Problem closing the gzip file %s"
  msgstr ""
  
- #: apt-pkg/contrib/fileutl.cc:1026
 -#: apt-pkg/contrib/fileutl.cc:1024
++#: apt-pkg/contrib/fileutl.cc:1414
  #, c-format
  msgid "Problem closing the file %s"
  msgstr ""
  
- #: apt-pkg/contrib/fileutl.cc:1031
 -#: apt-pkg/contrib/fileutl.cc:1029
++#: apt-pkg/contrib/fileutl.cc:1419
  #, c-format
  msgid "Problem renaming the file %s to %s"
  msgstr ""
  
- #: apt-pkg/contrib/fileutl.cc:1042
 -#: apt-pkg/contrib/fileutl.cc:1040
++#: apt-pkg/contrib/fileutl.cc:1430
  #, c-format
  msgid "Problem unlinking the file %s"
  msgstr ""
  
- #: apt-pkg/contrib/fileutl.cc:1055
 -#: apt-pkg/contrib/fileutl.cc:1053
++#: apt-pkg/contrib/fileutl.cc:1450
  msgid "Problem syncing the file"
  msgstr ""
  
@@@ -2472,28 -2442,28 +2468,28 @@@ msgstr "
  msgid "extra"
  msgstr ""
  
- #: apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:159
 -#: apt-pkg/depcache.cc:125 apt-pkg/depcache.cc:154
++#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
  msgid "Building dependency tree"
  msgstr ""
  
- #: apt-pkg/depcache.cc:131
 -#: apt-pkg/depcache.cc:126
++#: apt-pkg/depcache.cc:133
  msgid "Candidate versions"
  msgstr ""
  
- #: apt-pkg/depcache.cc:160
 -#: apt-pkg/depcache.cc:155
++#: apt-pkg/depcache.cc:162
  msgid "Dependency generation"
  msgstr ""
  
- #: apt-pkg/depcache.cc:180 apt-pkg/depcache.cc:213 apt-pkg/depcache.cc:217
 -#: apt-pkg/depcache.cc:175 apt-pkg/depcache.cc:208 apt-pkg/depcache.cc:212
++#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
  msgid "Reading state information"
  msgstr ""
  
- #: apt-pkg/depcache.cc:242
 -#: apt-pkg/depcache.cc:237
++#: apt-pkg/depcache.cc:244
  #, c-format
  msgid "Failed to open StateFile %s"
  msgstr ""
  
- #: apt-pkg/depcache.cc:248
 -#: apt-pkg/depcache.cc:243
++#: apt-pkg/depcache.cc:250
  #, c-format
  msgid "Failed to write temporary StateFile %s"
  msgstr ""
@@@ -2563,7 -2533,7 +2559,7 @@@ msgstr "
  msgid "Opening %s"
  msgstr ""
  
- #: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:447
 -#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:444
++#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:485
  #, c-format
  msgid "Line %u too long in source list %s."
  msgstr ""
@@@ -2578,27 -2548,29 +2574,27 @@@ msgstr "
  msgid "Type '%s' is not known on line %u in source list %s"
  msgstr ""
  
- #: apt-pkg/packagemanager.cc:298 apt-pkg/packagemanager.cc:770
 -#: apt-pkg/packagemanager.cc:335 apt-pkg/packagemanager.cc:645
++#: apt-pkg/packagemanager.cc:298 apt-pkg/packagemanager.cc:775
  #, 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:432 apt-pkg/packagemanager.cc:462
 -#: apt-pkg/packagemanager.cc:456
++#: apt-pkg/packagemanager.cc:437 apt-pkg/packagemanager.cc:467
  #, 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 "Could not configure '%s'. "
  msgstr ""
  
- #: apt-pkg/packagemanager.cc:502
 -#: apt-pkg/packagemanager.cc:501
++#: apt-pkg/packagemanager.cc:507
  #, c-format
  msgid ""
 -"Could not perform immediate configuration on already unpacked '%s'. Please "
 -"see man 5 apt.conf under APT::Immediate-Configure for details."
 +"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/pkgrecords.cc:32
 +#: apt-pkg/pkgrecords.cc:34
  #, c-format
  msgid "Index file type '%s' is not supported"
  msgstr ""
@@@ -2718,54 -2690,92 +2714,54 @@@ msgstr "
  msgid "No priority (or zero) specified for pin"
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:83
 -#: apt-pkg/pkgcachegen.cc:80
++#: apt-pkg/pkgcachegen.cc:85
  msgid "Cache has an incompatible versioning system"
  msgstr ""
  
 -#: apt-pkg/pkgcachegen.cc:190
 -#, c-format
 -msgid "Error occurred while processing %s (NewPackage)"
 -msgstr ""
 -
 -#: apt-pkg/pkgcachegen.cc:207
 -#, c-format
 -msgid "Error occurred while processing %s (UsePackage1)"
 -msgstr ""
 -
 -#: apt-pkg/pkgcachegen.cc:245
 +#. TRANSLATOR: The first placeholder is a package name,
 +#. the other two should be copied verbatim as they include debug info
- #: apt-pkg/pkgcachegen.cc:209 apt-pkg/pkgcachegen.cc:275
- #: apt-pkg/pkgcachegen.cc:311 apt-pkg/pkgcachegen.cc:353
- #: apt-pkg/pkgcachegen.cc:357 apt-pkg/pkgcachegen.cc:374
- #: apt-pkg/pkgcachegen.cc:384 apt-pkg/pkgcachegen.cc:388
- #: apt-pkg/pkgcachegen.cc:392 apt-pkg/pkgcachegen.cc:413
- #: apt-pkg/pkgcachegen.cc:418 apt-pkg/pkgcachegen.cc:463
- #: apt-pkg/pkgcachegen.cc:494 apt-pkg/pkgcachegen.cc:508
++#: apt-pkg/pkgcachegen.cc:211 apt-pkg/pkgcachegen.cc:277
++#: apt-pkg/pkgcachegen.cc:313 apt-pkg/pkgcachegen.cc:355
++#: apt-pkg/pkgcachegen.cc:359 apt-pkg/pkgcachegen.cc:376
++#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:390
++#: apt-pkg/pkgcachegen.cc:394 apt-pkg/pkgcachegen.cc:415
++#: apt-pkg/pkgcachegen.cc:420 apt-pkg/pkgcachegen.cc:465
++#: apt-pkg/pkgcachegen.cc:496 apt-pkg/pkgcachegen.cc:510
  #, c-format
 -msgid "Error occurred while processing %s (NewFileDesc1)"
 +msgid "Error occurred while processing %s (%s%d)"
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:232
 -#: apt-pkg/pkgcachegen.cc:277
 -#, c-format
 -msgid "Error occurred while processing %s (UsePackage2)"
 -msgstr ""
 -
 -#: apt-pkg/pkgcachegen.cc:281
 -#, c-format
 -msgid "Error occurred while processing %s (NewFileVer1)"
 -msgstr ""
 -
 -#: apt-pkg/pkgcachegen.cc:298 apt-pkg/pkgcachegen.cc:308
 -#: apt-pkg/pkgcachegen.cc:316
 -#, c-format
 -msgid "Error occurred while processing %s (NewVersion%d)"
 -msgstr ""
 -
 -#: apt-pkg/pkgcachegen.cc:312
 -#, c-format
 -msgid "Error occurred while processing %s (UsePackage3)"
 -msgstr ""
 -
 -#: apt-pkg/pkgcachegen.cc:345
 -#, c-format
 -msgid "Error occurred while processing %s (NewFileDesc2)"
 -msgstr ""
 -
 -#: apt-pkg/pkgcachegen.cc:351
++#: apt-pkg/pkgcachegen.cc:234
  msgid "Wow, you exceeded the number of package names this APT is capable of."
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:235
 -#: apt-pkg/pkgcachegen.cc:354
++#: apt-pkg/pkgcachegen.cc:237
  msgid "Wow, you exceeded the number of versions this APT is capable of."
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:238
 -#: apt-pkg/pkgcachegen.cc:357
++#: apt-pkg/pkgcachegen.cc:240
  msgid "Wow, you exceeded the number of descriptions this APT is capable of."
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:241
 -#: apt-pkg/pkgcachegen.cc:360
++#: apt-pkg/pkgcachegen.cc:243
  msgid "Wow, you exceeded the number of dependencies this APT is capable of."
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:515
 -#: apt-pkg/pkgcachegen.cc:389
 -#, c-format
 -msgid "Error occurred while processing %s (FindPkg)"
 -msgstr ""
 -
 -#: apt-pkg/pkgcachegen.cc:403
 -#, c-format
 -msgid "Error occurred while processing %s (CollectFileProvides)"
 -msgstr ""
 -
 -#: apt-pkg/pkgcachegen.cc:409
++#: apt-pkg/pkgcachegen.cc:517
  #, c-format
  msgid "Package %s %s was not found while processing file dependencies"
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:1080
 -#: apt-pkg/pkgcachegen.cc:975
++#: apt-pkg/pkgcachegen.cc:1082
  #, c-format
  msgid "Couldn't stat source package list %s"
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:1185
 -#: apt-pkg/pkgcachegen.cc:1080
++#: apt-pkg/pkgcachegen.cc:1187
  msgid "Collecting File Provides"
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:1376 apt-pkg/pkgcachegen.cc:1383
 -#: apt-pkg/pkgcachegen.cc:1274 apt-pkg/pkgcachegen.cc:1281
++#: apt-pkg/pkgcachegen.cc:1378 apt-pkg/pkgcachegen.cc:1385
  msgid "IO Error saving source cache"
  msgstr ""
  
@@@ -2878,177 -2888,177 +2874,177 @@@ msgstr "
  msgid "Vendor block %s contains no fingerprint"
  msgstr ""
  
- #: apt-pkg/cdrom.cc:528
 -#: apt-pkg/cdrom.cc:525
++#: apt-pkg/cdrom.cc:566
  #, c-format
  msgid ""
  "Using CD-ROM mount point %s\n"
  "Mounting CD-ROM\n"
  msgstr ""
  
- #: apt-pkg/cdrom.cc:537 apt-pkg/cdrom.cc:634
 -#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:631
++#: apt-pkg/cdrom.cc:575 apt-pkg/cdrom.cc:672
  msgid "Identifying.. "
  msgstr ""
  
- #: apt-pkg/cdrom.cc:565
 -#: apt-pkg/cdrom.cc:562
++#: apt-pkg/cdrom.cc:603
  #, c-format
  msgid "Stored label: %s\n"
  msgstr ""
  
- #: apt-pkg/cdrom.cc:574 apt-pkg/cdrom.cc:850
 -#: apt-pkg/cdrom.cc:571 apt-pkg/cdrom.cc:847
++#: apt-pkg/cdrom.cc:612 apt-pkg/cdrom.cc:894
  msgid "Unmounting CD-ROM...\n"
  msgstr ""
  
- #: apt-pkg/cdrom.cc:594
 -#: apt-pkg/cdrom.cc:591
++#: apt-pkg/cdrom.cc:632
  #, c-format
  msgid "Using CD-ROM mount point %s\n"
  msgstr ""
  
- #: apt-pkg/cdrom.cc:612
 -#: apt-pkg/cdrom.cc:609
++#: apt-pkg/cdrom.cc:650
  msgid "Unmounting CD-ROM\n"
  msgstr ""
  
- #: apt-pkg/cdrom.cc:617
 -#: apt-pkg/cdrom.cc:614
++#: apt-pkg/cdrom.cc:655
  msgid "Waiting for disc...\n"
  msgstr ""
  
- #: apt-pkg/cdrom.cc:626
 -#: apt-pkg/cdrom.cc:623
++#: apt-pkg/cdrom.cc:664
  msgid "Mounting CD-ROM...\n"
  msgstr ""
  
- #: apt-pkg/cdrom.cc:645
 -#: apt-pkg/cdrom.cc:642
++#: apt-pkg/cdrom.cc:683
  msgid "Scanning disc for index files..\n"
  msgstr ""
  
- #: apt-pkg/cdrom.cc:687
 -#: apt-pkg/cdrom.cc:684
++#: apt-pkg/cdrom.cc:731
  #, c-format
  msgid ""
  "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
  "%zu signatures\n"
  msgstr ""
  
- #: apt-pkg/cdrom.cc:698
 -#: apt-pkg/cdrom.cc:695
++#: apt-pkg/cdrom.cc:742
  msgid ""
  "Unable to locate any package files, perhaps this is not a Debian Disc or the "
  "wrong architecture?"
  msgstr ""
  
- #: apt-pkg/cdrom.cc:725
 -#: apt-pkg/cdrom.cc:722
++#: apt-pkg/cdrom.cc:769
  #, c-format
  msgid "Found label '%s'\n"
  msgstr ""
  
- #: apt-pkg/cdrom.cc:754
 -#: apt-pkg/cdrom.cc:751
++#: apt-pkg/cdrom.cc:798
  msgid "That is not a valid name, try again.\n"
  msgstr ""
  
- #: apt-pkg/cdrom.cc:771
 -#: apt-pkg/cdrom.cc:768
++#: apt-pkg/cdrom.cc:815
  #, c-format
  msgid ""
  "This disc is called: \n"
  "'%s'\n"
  msgstr ""
  
- #: apt-pkg/cdrom.cc:773
 -#: apt-pkg/cdrom.cc:770
++#: apt-pkg/cdrom.cc:817
  msgid "Copying package lists..."
  msgstr ""
  
- #: apt-pkg/cdrom.cc:800
 -#: apt-pkg/cdrom.cc:797
++#: apt-pkg/cdrom.cc:844
  msgid "Writing new source list\n"
  msgstr ""
  
- #: apt-pkg/cdrom.cc:808
 -#: apt-pkg/cdrom.cc:805
++#: apt-pkg/cdrom.cc:852
  msgid "Source list entries for this disc are:\n"
  msgstr ""
  
- #: apt-pkg/indexcopy.cc:273 apt-pkg/indexcopy.cc:930
 -#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:927
++#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:873
  #, c-format
  msgid "Wrote %i records.\n"
  msgstr ""
  
- #: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:932
 -#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:929
++#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:875
  #, c-format
  msgid "Wrote %i records with %i missing files.\n"
  msgstr ""
  
- #: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:935
 -#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:932
++#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:878
  #, c-format
  msgid "Wrote %i records with %i mismatched files\n"
  msgstr ""
  
- #: apt-pkg/indexcopy.cc:281 apt-pkg/indexcopy.cc:938
 -#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:935
++#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:881
  #, c-format
  msgid "Wrote %i records with %i missing files and %i mismatched files\n"
  msgstr ""
  
- #: apt-pkg/indexcopy.cc:540
 -#: apt-pkg/indexcopy.cc:537
++#: apt-pkg/indexcopy.cc:503
  #, c-format
  msgid "Skipping nonexistent file %s"
  msgstr ""
  
- #: apt-pkg/indexcopy.cc:546
 -#: apt-pkg/indexcopy.cc:543
++#: apt-pkg/indexcopy.cc:509
  #, c-format
  msgid "Can't find authentication record for: %s"
  msgstr ""
  
- #: apt-pkg/indexcopy.cc:552
 -#: apt-pkg/indexcopy.cc:549
++#: apt-pkg/indexcopy.cc:515
  #, c-format
  msgid "Hash mismatch for: %s"
  msgstr ""
  
- #: apt-pkg/indexcopy.cc:680
 -#: apt-pkg/indexcopy.cc:677
++#: apt-pkg/indexcopy.cc:659
  #, c-format
  msgid "File %s doesn't start with a clearsigned message"
  msgstr ""
  
  #. TRANSLATOR: %s is the trusted keyring parts directory
- #: apt-pkg/indexcopy.cc:711
 -#: apt-pkg/indexcopy.cc:708
++#: apt-pkg/indexcopy.cc:690
  #, c-format
  msgid "No keyring installed in %s."
  msgstr ""
  
- #: apt-pkg/cacheset.cc:342
 -#: apt-pkg/cacheset.cc:337
++#: apt-pkg/cacheset.cc:352
  #, c-format
  msgid "Release '%s' for '%s' was not found"
  msgstr ""
  
- #: apt-pkg/cacheset.cc:345
 -#: apt-pkg/cacheset.cc:340
++#: apt-pkg/cacheset.cc:355
  #, c-format
  msgid "Version '%s' for '%s' was not found"
  msgstr ""
  
- #: apt-pkg/cacheset.cc:452
 -#: apt-pkg/cacheset.cc:447
++#: apt-pkg/cacheset.cc:466
  #, c-format
  msgid "Couldn't find task '%s'"
  msgstr ""
  
- #: apt-pkg/cacheset.cc:459
 -#: apt-pkg/cacheset.cc:454
++#: apt-pkg/cacheset.cc:472
  #, c-format
  msgid "Couldn't find any package by regex '%s'"
  msgstr ""
  
- #: apt-pkg/cacheset.cc:472
 -#: apt-pkg/cacheset.cc:467
++#: apt-pkg/cacheset.cc:483
  #, c-format
  msgid "Can't select versions from package '%s' as it is purely virtual"
  msgstr ""
  
- #: apt-pkg/cacheset.cc:480 apt-pkg/cacheset.cc:488
 -#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
++#: apt-pkg/cacheset.cc:490 apt-pkg/cacheset.cc:497
  #, c-format
  msgid ""
  "Can't select installed nor candidate version from package '%s' as it has "
  "neither of them"
  msgstr ""
  
- #: apt-pkg/cacheset.cc:496
 -#: apt-pkg/cacheset.cc:491
++#: apt-pkg/cacheset.cc:504
  #, c-format
  msgid "Can't select newest version from package '%s' as it is purely virtual"
  msgstr ""
  
- #: apt-pkg/cacheset.cc:504
 -#: apt-pkg/cacheset.cc:499
++#: apt-pkg/cacheset.cc:512
  #, c-format
  msgid "Can't select candidate version from package %s as it has no candidate"
  msgstr ""
  
- #: apt-pkg/cacheset.cc:512
 -#: apt-pkg/cacheset.cc:507
++#: apt-pkg/cacheset.cc:520
  #, c-format
  msgid "Can't select installed version from package %s as it is not installed"
  msgstr ""
@@@ -3241,14 -3227,14 +3237,14 @@@ msgstr "
  msgid "[Mirror: %s]"
  msgstr ""
  
- #: methods/rred.cc:509
 -#: methods/rred.cc:506
++#: methods/rred.cc:470
  #, c-format
  msgid ""
  "Could not patch %s with mmap and with file operation usage - the patch seems "
  "to be corrupt."
  msgstr ""
  
- #: methods/rred.cc:514
 -#: methods/rred.cc:511
++#: methods/rred.cc:475
  #, c-format
  msgid ""
  "Could not patch %s with mmap (but no mmap specific fail) - the patch seems "