* doc/apt.conf.5.xml:

  - review and fix typo, grammar and style issues
  - rephrase APT::Immediate-Configuration and many others

12 files changed, 8111 insertions, 6097 deletions

diff --git a/debian/changelog b/debian/changelog
index e4cdc3a28..44a6b6b90 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,9 @@ apt (0.9.5.2) UNRELEASED; urgency=low
     doc/apt_preferences.5.xml, doc/apt-secure.8.xml,
     doc/apt-sortpkgs.1.xml, sources.list.5.xml:
     - review and fix typo, grammar and style issues
+  * doc/apt.conf.5.xml:
+    - review and fix typo, grammar and style issues
+    - rephrase APT::Immediate-Configuration and many others
 
   [ Robert Luberda ]
   * Polish manpage translation update (Closes: #675603)
diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml
index d2784501e..3e304a89d 100644
--- a/doc/apt.conf.5.xml
+++ b/doc/apt.conf.5.xml
@@ -37,12 +37,13 @@
     <refname>apt.conf</refname>
     <refpurpose>Configuration file for APT</refpurpose>
  </refnamediv>
- 
+
  <refsect1><title>Description</title>
- <para><filename>apt.conf</filename> is the main configuration file for
-   the APT suite of tools, but by far not the only place changes to options
-   can be made. All tools therefore share the configuration files and also
-   use a common command line parser to provide a uniform environment.</para>
+   <para><filename>/etc/apt/apt.conf</filename> is the main configuration
+   file shared by all the tools in the APT suite of tools, though it is by
+   no means the only place options can be set. The suite also shares a common
+   command line parser to provide a uniform environment.</para>
+
    <orderedlist>
       <para>When an APT tool starts up it will read the configuration files
       in the following order:</para>
@@ -54,7 +55,7 @@
 	 hyphen (-), underscore (_) and period (.) characters.
 	 Otherwise APT will print a notice that it has ignored a file, unless that
 	 file matches a pattern in the <literal>Dir::Ignore-Files-Silently</literal>
-	 configuration list - in this case it will be silently ignored.</para></listitem>
+	 configuration list - in which case it will be silently ignored.</para></listitem>
       <listitem><para>the main configuration file specified by
 	 <literal>Dir::Etc::main</literal></para></listitem>
       <listitem><para>the command line options are applied to override the
@@ -64,7 +65,7 @@
    <refsect1><title>Syntax</title>
    <para>The configuration file is organized in a tree with options organized into
    functional groups. Option specification is given with a double colon
-   notation, for instance <literal>APT::Get::Assume-Yes</literal> is an option within 
+   notation; for instance <literal>APT::Get::Assume-Yes</literal> is an option within 
    the APT tool group, for the Get tool. Options do not inherit from their 
    parent groups.</para> 
 
@@ -73,13 +74,12 @@
    <literal>//</literal> are treated as comments (ignored), as well as all text
    between <literal>/*</literal> and <literal>*/</literal>, just like C/C++ comments.
    Each line is of the form
-   <literal>APT::Get::Assume-Yes "true";</literal>. The trailing 
-   semicolon and the quotes are required. The value must be on one line, and
-   there is no kind of string concatenation. It must not include inside quotes.
-   The behavior of the backslash "\" and escaped characters inside a value is
-   undefined and it should not be used. An option name may include
-   alphanumerical characters and the "/-:._+" characters. A new scope can
-   be opened with curly braces, like:</para>
+   <literal>APT::Get::Assume-Yes "true";</literal>.
+   The quotation marks and trailing semicolon are required.
+   The value must be on one line, and there is no kind of string concatenation.
+   Values must not include backslashes or extra quotation marks.
+   Option names are made up of alphanumeric characters and the characters "/-:._+".
+   A new scope can be opened with curly braces, like this:</para>
 
 <informalexample><programlisting>   
 APT {
@@ -92,7 +92,7 @@ APT {
 
    <para>with newlines placed to make it more readable. Lists can be created by 
    opening a scope and including a single string enclosed in quotes followed by a
-   semicolon. Multiple entries can be included, each separated by a semicolon.</para>
+   semicolon. Multiple entries can be included, separated by a semicolon.</para>
 
 <informalexample><programlisting>   
 DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
@@ -102,44 +102,53 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
    <filename>&docdir;examples/apt.conf</filename> &configureindex;
    is a good guide for how it should look.</para>
 
-   <para>The names of the configuration items are not case-sensitive. So in the previous example
-   you could use <literal>dpkg::pre-install-pkgs</literal>.</para>
+   <para>Case is not significant in names of configuration items, so in the
+   previous example you could use <literal>dpkg::pre-install-pkgs</literal>.</para>
 
-   <para>Names for the configuration items are optional if a list is defined as it can be see in
+   <para>Names for the configuration items are optional if a list is defined as can be seen in
    the <literal>DPkg::Pre-Install-Pkgs</literal> example above. If you don't specify a name a
    new entry will simply add a new option to the list. If you specify a name you can override
-   the option as every other option by reassigning a new value to the option.</para>
+   the option in the same way as any other option by reassigning a new value to the option.</para>
 
-   <para>Two specials are allowed, <literal>#include</literal> (which is deprecated
-   and not supported by alternative implementations) and <literal>#clear</literal>:
-   <literal>#include</literal> will include the given file, unless the filename
-   ends in a slash, then the whole directory is included.  
+   <para>Two special commands are defined: <literal>#include</literal> (which is
+   deprecated and not supported by alternative implementations) and
+   <literal>#clear</literal>. <literal>#include</literal> will include the
+   given file, unless the filename ends in a slash, in which case the whole
+   directory is included.
    <literal>#clear</literal> is used to erase a part of the configuration tree. The
    specified element and all its descendants are erased.
    (Note that these lines also need to end with a semicolon.)</para>
 
-   <para>The #clear command is the only way to delete a list or a complete scope.
-   Reopening a scope or the ::-style described below will <emphasis>not</emphasis>
-   override previously written entries. Only options can be overridden by addressing a new
-   value to it - lists and scopes can't be overridden, only cleared.</para>
+   <para>
+   The <literal>#clear</literal> command is the only way to delete a list or
+   a complete scope. Reopening a scope (or using the syntax described below
+   with an appended <literal>::</literal>) will <emphasis>not</emphasis>
+   override previously written entries. Options can only be overridden by
+   addressing a new value to them - lists and scopes can't be overridden,
+   only cleared.
+   </para>
 
-   <para>All of the APT tools take a -o option which allows an arbitrary configuration 
+   <para>All of the APT tools take an -o option which allows an arbitrary configuration 
    directive to be specified on the command line. The syntax is a full option
    name (<literal>APT::Get::Assume-Yes</literal> for instance) followed by an equals
    sign then the new value of the option. To append a new element to a list, add a
-   trailing :: to the name of the list. (As you might suspect: The scope syntax can't
-   be used on the command line.)</para>
-
-   <para>Note that you can use :: only for appending one item per line to a list and
-   that you should not use it in combination with the scope syntax.
-   (The scope syntax implicit insert ::) Using both syntaxes together will trigger a bug
-   which some users unfortunately depend on: An option with the unusual name "<literal>::</literal>"
-   which acts like every other option with a name. These introduces many problems
-   including that a user who writes multiple lines in this <emphasis>wrong</emphasis> syntax in
-   the hope to append to a list will gain the opposite as only the last assignment for this option
-   "<literal>::</literal>" will be used. Upcoming APT versions will raise errors and
-   will stop working if they encounter this misuse, so please correct such statements now
-   as long as APT doesn't complain explicit about them.</para>
+   trailing <literal>::</literal> to the name of the list.
+   (As you might suspect, the scope syntax can't be used on the command line.)</para>
+
+   <para>
+   Note that appending items to a list using <literal>::</literal> only works
+   for one item per line, and that you should not use it in combination with
+   the scope syntax (which adds <literal>::</literal> implicitly). Using both
+   syntaxes together will trigger a bug which some users unfortunately depend
+   on: an option with the unusual name "<literal>::</literal>" which acts
+   like every other option with a name. This introduces many problems; for
+   one thing, users who write multiple lines in this
+   <emphasis>wrong</emphasis> syntax in the hope of appending to a list will
+   achieve the opposite, as only the last assignment for this option
+   "<literal>::</literal>" will be used. Future versions of APT will raise
+   errors and stop working if they encounter this misuse, so please correct
+   such statements now while APT doesn't explicitly complain about them.
+   </para>
  </refsect1>
 
  <refsect1><title>The APT Group</title>
@@ -154,23 +163,27 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
      </varlistentry>
 
      <varlistentry><term><option>Architectures</option></term>
-     <listitem><para>All Architectures the system supports. Processors implementing the
-     <literal>amd64</literal> (also called <literal>x86-64</literal>) instruction set are
-     e.g. also able to execute binaries compiled for the <literal>i386</literal>
-     (<literal>x86</literal>) instruction set; 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>.
+     <listitem><para>
+     All Architectures the system supports. For instance, CPUs implementing
+     the <literal>amd64</literal> (also called <literal>x86-64</literal>)
+     instruction set are also able to execute binaries compiled for the
+     <literal>i386</literal> (<literal>x86</literal>) instruction set. This
+     list is used when fetching files and parsing package lists. The
+     initial default is always the system's native architecture
+     (<literal>APT::Architecture</literal>), and foreign architectures are
+     added to the default list when they are registered via
+     <command>dpkg --add-architecture</command>.
      </para></listitem>
      </varlistentry>
 
      <varlistentry><term><option>Default-Release</option></term>
      <listitem><para>Default release to install packages from if more than one
-     version available. Contains release name, codename or release version. Examples: 'stable', 'testing',
+     version is available. Contains release name, codename or release version. Examples: 'stable', 'testing',
      'unstable', '&stable-codename;', '&testing-codename;', '4.0', '5.0*'. See also &apt-preferences;.</para></listitem>
      </varlistentry>
 
      <varlistentry><term><option>Ignore-Hold</option></term>
-     <listitem><para>Ignore Held packages; This global option causes the problem resolver to
+     <listitem><para>Ignore held packages; this global option causes the problem resolver to
      ignore held packages in its decision making.</para></listitem>
      </varlistentry>
 
@@ -182,106 +195,129 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
      </varlistentry>
 
      <varlistentry><term><option>Immediate-Configure</option></term>
-     <listitem><para>Defaults to on which will cause APT to install essential and important packages
-     as fast as possible in the install/upgrade operation. This is done to limit the effect of a failing
-     &dpkg; call: If this option is disabled APT does treat an important package in the same way as
-     an extra package: Between the unpacking of the important package A and his configuration can then
-     be many other unpack or configuration calls, e.g. for package B which has no relation to A, but
-     causes the dpkg call to fail (e.g. because maintainer script of package B generates an error) which results
-     in a system state in which package A is unpacked but unconfigured - each package depending on A is now no
-     longer guaranteed to work as their dependency on A is not longer satisfied. The immediate configuration marker
-     is also applied to all dependencies which can generate a problem if the dependencies e.g. form a circle
-     as a dependency with the immediate flag is comparable with a Pre-Dependency. So in theory it is possible
-     that APT encounters a situation in which it is unable to perform immediate configuration, errors out and
-     refers to this option so the user can deactivate the immediate configuration temporarily to be able to perform
-     an install/upgrade again. Note the use of the word "theory" here as this problem was only encountered by now
-     in real world a few times in non-stable distribution versions and was caused by wrong dependencies of the package
-     in question or by a system in an already broken state, so you should not blindly disable this option as
-     the mentioned scenario above is not the only problem immediate configuration can help to prevent in the first place.
-     Before a big operation like <literal>dist-upgrade</literal> is run with this option disabled it should be tried to
-     explicitly <literal>install</literal> the package APT is unable to configure immediately, but please make sure to
-     report your problem also to your distribution and to the APT team with the buglink below so they can work on
-     improving or correcting the upgrade process.</para></listitem>
+     <listitem><para>
+     Defaults to on, which will cause APT to install essential and important
+     packages as soon as possible in an install/upgrade operation, in order
+     to limit the effect of a failing &dpkg; call. If this option is
+     disabled, APT treats an important package in the same way as an extra
+     package: between the unpacking of the package A and its configuration
+     there can be many other unpack or configuration calls for other
+     unrelated packages B, C etc. If these cause the &dpkg; call to fail
+     (e.g. because package B's maintainer scripts generate an error), this
+     results in a system state in which package A is unpacked but
+     unconfigured - so any package depending on A is now no longer
+     guaranteed to work, as its dependency on A is no longer satisfied.
+     </para><para>
+     The immediate configuration marker is also applied in the potentially
+     problematic case of circular dependencies, since a dependency with the
+     immediate flag is equivalent to a Pre-Dependency. In theory this allows
+     APT to recognise a situation in which it is unable to perform immediate
+     configuration, abort, and suggest to the user that the option should be
+     temporarily deactivated in order to allow the operation to proceed.
+     Note the use of the word "theory" here; in the real world this problem
+     has rarely been encountered, in non-stable distribution versions, and
+     was caused by wrong dependencies of the package in question or by a
+     system in an already broken state; so you should not blindly disable
+     this option, as the scenario mentioned above is not the only problem it
+     can help to prevent in the first place.
+     </para><para>
+     Before a big operation like <literal>dist-upgrade</literal> is run
+     with this option disabled you should try to explicitly
+     <literal>install</literal> the package APT is unable to configure
+     immediately; but please make sure you also report your problem to your
+     distribution and to the APT team with the buglink below, so they can
+     work on improving or correcting the upgrade process.
+     </para></listitem>
      </varlistentry>
 
      <varlistentry><term><option>Force-LoopBreak</option></term>
-     <listitem><para>Never Enable this option unless you -really- know what you are doing. It
-     permits APT to temporarily remove an essential package to break a
-     Conflicts/Conflicts or Conflicts/Pre-Depend loop between two essential
-     packages. SUCH A LOOP SHOULD NEVER EXIST AND IS A GRAVE BUG. This option 
-     will work if the essential packages are not tar, gzip, libc, dpkg, bash or
-     anything that those packages depend on.</para></listitem>
+     <listitem><para>
+     Never enable this option unless you <emphasis>really</emphasis> know
+     what you are doing. It permits APT to temporarily remove an essential
+     package to break a Conflicts/Conflicts or Conflicts/Pre-Depends loop
+     between two essential packages. <emphasis>Such a loop should never exist
+     and is a grave bug</emphasis>. This option will work if the essential
+     packages are not <command>tar</command>, <command>gzip</command>,
+     <command>libc</command>, <command>dpkg</command>, <command>dash</command>
+     or anything that those packages depend on.
+     </para></listitem>
      </varlistentry>
 
      <varlistentry><term><option>Cache-Start</option></term><term><option>Cache-Grow</option></term><term><option>Cache-Limit</option></term>
-     <listitem><para>APT uses since version 0.7.26 a resizable memory mapped cache file to store the 'available'
-     information. <literal>Cache-Start</literal> acts as a hint to which size the Cache will grow
+     <listitem><para>APT uses since version 0.7.26 a resizable memory mapped cache file to store the available
+     information. <literal>Cache-Start</literal> acts as a hint of the size the cache will grow to,
      and is therefore the amount of memory APT will request at startup. The default value is
-     20971520 bytes (~20 MB). Note that this amount of space needs to be available for APT
+     20971520 bytes (~20 MB). Note that this amount of space needs to be available for APT;
      otherwise it will likely fail ungracefully, so for memory restricted devices this value should
      be lowered while on systems with a lot of configured sources it should be increased.
      <literal>Cache-Grow</literal> defines in bytes with the default of 1048576 (~1 MB) how much
-     the Cache size will be increased in the event the space defined by <literal>Cache-Start</literal>
-     is not enough. These value will be applied again and again until either the cache is big
+     the cache size will be increased in the event the space defined by <literal>Cache-Start</literal>
+     is not enough. This value will be applied again and again until either the cache is big
      enough to store all information or the size of the cache reaches the <literal>Cache-Limit</literal>.
      The default of <literal>Cache-Limit</literal> is 0 which stands for no limit.
-     If <literal>Cache-Grow</literal> is set to 0 the automatic grow of the cache is disabled.
+     If <literal>Cache-Grow</literal> is set to 0 the automatic growth of the cache is disabled.
      </para></listitem>
      </varlistentry>
 
      <varlistentry><term><option>Build-Essential</option></term>
-     <listitem><para>Defines which package(s) are considered essential build dependencies.</para></listitem>
+     <listitem><para>Defines which packages are considered essential build dependencies.</para></listitem>
      </varlistentry>
 
      <varlistentry><term><option>Get</option></term>
-     <listitem><para>The Get subsection controls the &apt-get; tool, please see its
+     <listitem><para>The Get subsection controls the &apt-get; tool; please see its
      documentation for more information about the options here.</para></listitem>
      </varlistentry>
 
      <varlistentry><term><option>Cache</option></term>
-     <listitem><para>The Cache subsection controls the &apt-cache; tool, please see its
+     <listitem><para>The Cache subsection controls the &apt-cache; tool; please see its
      documentation for more information about the options here.</para></listitem>
      </varlistentry>
 
      <varlistentry><term><option>CDROM</option></term>
-     <listitem><para>The CDROM subsection controls the &apt-cdrom; tool, please see its
+     <listitem><para>The CDROM subsection controls the &apt-cdrom; tool; please see its
      documentation for more information about the options here.</para></listitem>
      </varlistentry>
    </variablelist>
  </refsect1>
 
  <refsect1><title>The Acquire Group</title>
-   <para>The <literal>Acquire</literal> group of options controls the download of packages 
-   and the URI handlers. 
+   <para>The <literal>Acquire</literal> group of options controls the
+   download of packages as well as the various "acquire methods" responsible
+   for the download itself (see also &sources-list;).</para>
 
    <variablelist>
      <varlistentry><term><option>Check-Valid-Until</option></term>
-	 <listitem><para>Security related option defaulting to true as an
-	 expiring validation for a Release file prevents longtime replay attacks
-	 and can e.g. also help users to identify no longer updated mirrors -
-	 but the feature depends on the correctness of the time on the user system.
-	 Archive maintainers are encouraged to create Release files with the
-	 <literal>Valid-Until</literal> header, but if they don't or a stricter value
-	 is volitional the following <literal>Max-ValidTime</literal> option can be used.
-	 </para></listitem>
+     <listitem><para>
+     Security related option defaulting to true, as giving a Release file's
+     validation an expiration date prevents replay attacks over a long
+     timescale, and can also for example help users to identify mirrors
+     that are no longer updated - but the feature depends on the
+     correctness of the clock on the user system. Archive maintainers are
+     encouraged to create Release files with the
+     <literal>Valid-Until</literal> header, but if they don't or a
+     stricter value is desired the <literal>Max-ValidTime</literal>
+     option below can be used.
+     </para></listitem>
      </varlistentry>
 
      <varlistentry><term><option>Max-ValidTime</option></term>
-	 <listitem><para>Seconds the Release file should be considered valid after
-	 it was created (indicated by the <literal>Date</literal> header).
+	 <listitem><para>Maximum time (in seconds) after its creation (as indicated
+	 by the <literal>Date</literal> header) that the <filename>Release</filename>
+	 file should be considered valid.
 	 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 valid".
+	 The default value is <literal>0</literal> which stands for "valid forever".
 	 Archive specific settings can be made by appending the label of the archive
 	 to the option name.
 	 </para></listitem>
      </varlistentry>
 
      <varlistentry><term><option>Min-ValidTime</option></term>
-	 <listitem><para>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
+	 <listitem><para>Minimum time (in seconds) after its creation (as indicated
+	 by the <literal>Date</literal> header) that the <filename>Release</filename>
+	 file should be considered valid.
+	 Use this if you need to use a seldom updated (local) mirror of a more
+	 frequently 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.
@@ -290,11 +326,11 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
 
      <varlistentry><term><option>PDiffs</option></term>
 	 <listitem><para>Try to download deltas called <literal>PDiffs</literal> for
-	 Packages or Sources files instead of downloading whole ones. True
-	 by default.</para>
+	 indexes (like <filename>Packages</filename> files) instead of downloading
+	 whole ones. True by default.</para>
 	 <para>Two sub-options to limit the use of PDiffs are also available:
-	 With <literal>FileLimit</literal> can be specified how many PDiff files
-	 are downloaded at most to update a file. <literal>SizeLimit</literal>
+	 <literal>FileLimit</literal> can be used to specify a maximum number of
+	 PDiff files should be downloaded to update a file. <literal>SizeLimit</literal>
 	 on the other hand is the maximum percentage of the size of all patches
 	 compared to the size of the targeted file. If one of these limits is
 	 exceeded the complete file is downloaded instead of the patches.
@@ -320,41 +356,41 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
      </varlistentry>
 
      <varlistentry><term><option>http</option></term>
-     <listitem><para>HTTP URIs; http::Proxy is the default http proxy to use. It is in the 
-     standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per 
-     host proxies can also be specified by using the form 
+     <listitem><para><literal>http::Proxy</literal> sets the default proxy to use for HTTP
+     URIs. It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>.
+     Per host proxies can also be specified by using the form
      <literal>http::Proxy::&lt;host&gt;</literal> with the special keyword <literal>DIRECT</literal> 
 	 meaning to use no proxies. If no one of the above settings is specified,
 	 <envar>http_proxy</envar> environment variable
 	 will be used.</para>
 
-     <para>Three settings are provided for cache control with HTTP/1.1 compliant 
-     proxy caches. <literal>No-Cache</literal> tells the proxy to not use its cached 
-     response under any circumstances, <literal>Max-Age</literal> is sent only for 
-     index files and tells the cache to refresh its object if it is older than 
-     the given number of seconds. Debian updates its index files daily so the 
-     default is 1 day. <literal>No-Store</literal> specifies that the cache should never 
-     store this request, it is only set for archive files. This may be useful 
-     to prevent polluting a proxy cache with very large .deb files. Note: 
-     Squid 2.0.2 does not support any of these options.</para>
+     <para>Three settings are provided for cache control with HTTP/1.1 compliant
+     proxy caches.
+     <literal>No-Cache</literal> tells the proxy not to use its cached
+     response under any circumstances.
+     <literal>Max-Age</literal> sets the allowed maximum age (in seconds) of
+     an index file in the cache of the proxy.
+     <literal>No-Store</literal> specifies that the proxy should not store
+     the requested archive files in its cache, which can be used to prevent
+     the proxy from polluting its cache with (big) .deb files.</para>
 
-     <para>The option <literal>timeout</literal> sets the timeout timer used by the method, 
-     this applies to all things including connection timeout and data timeout.</para>
+     <para>The option <literal>timeout</literal> sets the timeout timer used by the method;
+     this value applies to the connection as well as the data timeout.</para>
 
      <para>The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to
-     enabled HTTP pipeling (RFC 2616 section 8.1.2.2) which can be beneficial e.g. on
-     high-latency connections. It specifies how many requests are send in a pipeline.
+     enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e.g. on
+     high-latency connections. It specifies how many requests are sent in a pipeline.
      Previous APT versions had a default of 10 for this setting, but the default value
      is now 0 (= disabled) to avoid problems with the ever-growing amount of webservers
      and proxies which choose to not conform to the HTTP/1.1 specification.</para>
 
-     <para><literal>Acquire::http::AllowRedirect</literal> controls if APT will follow
+     <para><literal>Acquire::http::AllowRedirect</literal> controls whether APT will follow
      redirects, which is enabled by default.</para>
 
      <para>The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</literal>
-     which accepts integer values in kilobyte. The default value is 0 which deactivates
-     the limit and tries uses as much as possible of the bandwidth (Note that this option implicit
-     deactivates the download from multiple servers at the same time.)</para>
+     which accepts integer values in kilobytes. The default value is 0 which deactivates
+     the limit and tries to use all available bandwidth (note that this option implicitly
+     disables downloading from multiple servers at the same time.)</para>
 
      <para><literal>Acquire::http::User-Agent</literal> can be used to set a different
      User-Agent for the http download method as some proxies allow access for clients
@@ -363,59 +399,65 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
      </varlistentry>
 
      <varlistentry><term><option>https</option></term>
-	 <listitem><para>HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and
-	 proxy options are the same as for <literal>http</literal> method and will also
-	 default to the options from the <literal>http</literal> method if they are not
-	 explicitly set for https. <literal>Pipeline-Depth</literal> option is not
-	 supported yet.</para>
+	 <listitem><para>
+	 The <literal>Cache-control</literal>, <literal>Timeout</literal>,
+	 <literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and
+	 <literal>proxy</literal> options work for HTTPS URIs in the same way
+	 as for the <literal>http</literal> method, and default to the same
+	 values if they are not explicitly set. The
+	 <literal>Pipeline-Depth</literal> option is not yet supported.
+	 </para>
 
 	 <para><literal>CaInfo</literal> suboption specifies place of file that
 	 holds info about trusted certificates.
-	 <literal>&lt;host&gt;::CaInfo</literal> is corresponding per-host option.
-	 <literal>Verify-Peer</literal> boolean suboption determines whether verify
-	 server's host certificate against trusted certificates or not.
-	 <literal>&lt;host&gt;::Verify-Peer</literal> is corresponding per-host option.
-	 <literal>Verify-Host</literal> boolean suboption determines whether verify
-	 server's hostname or not.
-	 <literal>&lt;host&gt;::Verify-Host</literal> is corresponding per-host option.
+	 <literal>&lt;host&gt;::CaInfo</literal> is the corresponding per-host option.
+	 <literal>Verify-Peer</literal> boolean suboption determines whether or not the
+	 server's host certificate should be verified against trusted certificates.
+	 <literal>&lt;host&gt;::Verify-Peer</literal> is the corresponding per-host option.
+	 <literal>Verify-Host</literal> boolean suboption determines whether or not the
+	 server's hostname should be verified.
+	 <literal>&lt;host&gt;::Verify-Host</literal> is the corresponding per-host option.
 	 <literal>SslCert</literal> determines what certificate to use for client
-	 authentication. <literal>&lt;host&gt;::SslCert</literal> is corresponding per-host option.
+	 authentication. <literal>&lt;host&gt;::SslCert</literal> is the corresponding per-host option.
 	 <literal>SslKey</literal> determines what private key to use for client
-	 authentication. <literal>&lt;host&gt;::SslKey</literal> is corresponding per-host option.
+	 authentication. <literal>&lt;host&gt;::SslKey</literal> is the corresponding per-host option.
 	 <literal>SslForceVersion</literal> overrides default SSL version to use.
-	 Can contain 'TLSv1' or 'SSLv3' string.
-	 <literal>&lt;host&gt;::SslForceVersion</literal> is corresponding per-host option.
+	 It can contain either of the strings '<literal>TLSv1</literal>' or
+	 '<literal>SSLv3</literal>'.
+	 <literal>&lt;host&gt;::SslForceVersion</literal> is the corresponding per-host option.
 	 </para></listitem></varlistentry>
 
      <varlistentry><term><option>ftp</option></term>
-     <listitem><para>FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the 
-     standard form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per 
-     host proxies can also be specified by using the form 
+     <listitem><para>
+     <literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs.
+     It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>.
+     Per host proxies can also be specified by using the form
      <literal>ftp::Proxy::&lt;host&gt;</literal> with the special keyword <literal>DIRECT</literal> 
 	 meaning to use no proxies. If no one of the above settings is specified,
 	 <envar>ftp_proxy</envar> environment variable
-	 will be used. To use a ftp 
+	 will be used. To use an FTP
      proxy you will have to set the <literal>ftp::ProxyLogin</literal> script in the 
      configuration file. This entry specifies the commands to send to tell 
      the proxy server what to connect to. Please see 
      &configureindex; for an example of 
-     how to do this. The substitution variables available are 
-     <literal>$(PROXY_USER)</literal> <literal>$(PROXY_PASS)</literal> <literal>$(SITE_USER)</literal>
-     <literal>$(SITE_PASS)</literal> <literal>$(SITE)</literal> and <literal>$(SITE_PORT)</literal>
-     Each is taken from it's respective URI component.</para>
+     how to do this. The substitution variables representing the corresponding
+     URI component are <literal>$(PROXY_USER)</literal>,
+     <literal>$(PROXY_PASS)</literal>, <literal>$(SITE_USER)</literal>,
+     <literal>$(SITE_PASS)</literal>, <literal>$(SITE)</literal> and
+     <literal>$(SITE_PORT)</literal>.</para>
 
-     <para>The option <literal>timeout</literal> sets the timeout timer used by the method, 
-     this applies to all things including connection timeout and data timeout.</para>
+     <para>The option <literal>timeout</literal> sets the timeout timer used by the method;
+     this value applies to the connection as well as the data timeout.</para>
 
      <para>Several settings are provided to control passive mode. Generally it is 
-     safe to leave passive mode on, it works in nearly every environment. 
-     However some situations require that passive mode be disabled and port 
-     mode ftp used instead. This can be done globally, for connections that 
-     go through a proxy or for a specific host (See the sample config file 
+     safe to leave passive mode on; it works in nearly every environment. 
+     However, some situations require that passive mode be disabled and port 
+     mode FTP used instead. This can be done globally or for connections that 
+     go through a proxy or for a specific host (see the sample config file 
      for examples).</para>
 
      <para>It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</envar>
-     environment variable to a http url - see the discussion of the http method
+     environment variable to an HTTP URL - see the discussion of the http method
      above for syntax. You cannot set this in the configuration file and it is
      not recommended to use FTP over HTTP due to its low efficiency.</para>
 
@@ -427,45 +469,51 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
      </varlistentry>
 
      <varlistentry><term><option>cdrom</option></term>
-     <listitem><para>CD-ROM URIs; the only setting for CD-ROM URIs is the mount point, 
-     <literal>cdrom::Mount</literal> which must be the mount point for the CD-ROM drive 
-     as specified in <filename>/etc/fstab</filename>. It is possible to provide 
-     alternate mount and unmount commands if your mount point cannot be listed 
-     in the fstab (such as an SMB mount and old mount packages). The syntax 
-     is to put <literallayout>/cdrom/::Mount "foo";</literallayout> within 
-     the cdrom block. It is important to have the trailing slash. Unmount 
-     commands can be specified using UMount.</para></listitem>
+     <listitem><para>
+     For URIs using the <literal>cdrom</literal> method, the only configurable
+     option is the mount point, <literal>cdrom::Mount</literal>, which must be
+     the mount point for the CD-ROM (or DVD, or whatever) drive as specified in
+     <filename>/etc/fstab</filename>. It is possible to provide alternate mount
+     and unmount commands if your mount point cannot be listed in the fstab.
+     The syntax is to put <literallayout>/cdrom/::Mount "foo";</literallayout> within
+     the <literal>cdrom</literal> block. It is important to have the trailing slash.
+     Unmount commands can be specified using UMount.
+     </para></listitem>
      </varlistentry>
 
      <varlistentry><term><option>gpgv</option></term>
-     <listitem><para>GPGV URIs; the only option for GPGV URIs is the option to pass additional parameters to gpgv.
-     <literal>gpgv::Options</literal> Additional options passed to gpgv.
+     <listitem><para>
+     For GPGV URIs the only configurable option is <literal>gpgv::Options</literal>,
+     which passes additional parameters to gpgv.
      </para></listitem>
      </varlistentry>
 
      <varlistentry><term><option>CompressionTypes</option></term>
      <listitem><para>List of compression types which are understood by the acquire methods.
      Files like <filename>Packages</filename> can be available in various compression formats.
-     Per default the acquire methods can decompress <command>bzip2</command>, <command>lzma</command>
-     and <command>gzip</command> compressed files, with this setting more formats can be added
+     By default the acquire methods can decompress <command>bzip2</command>, <command>lzma</command>
+     and <command>gzip</command> compressed files; with this setting more formats can be added
      on the fly or the used method can be changed. The syntax for this is:
      <synopsis>Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> "<replaceable>Methodname</replaceable>";</synopsis>
-     </para><para>Also the <literal>Order</literal> subgroup can be used to define in which order
+     </para><para>Also, the <literal>Order</literal> subgroup can be used to define in which order
      the acquire system will try to download the compressed files. The acquire system will try the first
      and proceed with the next compression type in this list on error, so to prefer one over the other type
-     simple add the preferred type at first - not already added default types will be added at run time
+     simply add the preferred type first - default types not already added will be implicitly appended
      to the end of the list, so e.g. <synopsis>Acquire::CompressionTypes::Order:: "gz";</synopsis> can
      be used to prefer <command>gzip</command> compressed files over <command>bzip2</command> and <command>lzma</command>.
      If <command>lzma</command> should be preferred over <command>gzip</command> and <command>bzip2</command> the
-     configure setting should look like this <synopsis>Acquire::CompressionTypes::Order { "lzma"; "gz"; };</synopsis>
-     It is not needed to add <literal>bz2</literal> explicit to the list as it will be added automatic.</para>
-     <para>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: <literallayout>Dir::Bin::bzip2 "/bin/bzip2";</literallayout>
+     configure setting should look like this: <synopsis>Acquire::CompressionTypes::Order { "lzma"; "gz"; };</synopsis>
+     It is not needed to add <literal>bz2</literal> to the list explicitly as it will be added automatically.</para>
+     <para>Note that the
+     <literal>Dir::Bin::<replaceable>Methodname</replaceable></literal>
+     will be checked at run time. If this option has been set, the
+     method will only be used if this file exists; e.g. for the
+     <literal>bzip2</literal> method (the inbuilt) setting is:
+     <literallayout>Dir::Bin::bzip2 "/bin/bzip2";</literallayout>
      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.</para>
+     This will not override the defined list; it will only prefix the list with this type.</para>
      <para>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.</para></listitem>
@@ -482,21 +530,22 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
 
      <varlistentry><term><option>Languages</option></term>
      <listitem><para>The Languages subsection controls which <filename>Translation</filename> files are downloaded
-     and in which order APT tries to display the Description-Translations. APT will try to display the first
-     available Description in the Language which is listed at first. Languages can be defined with their
-     short or long Languagecodes. Note that not all archives provide <filename>Translation</filename>
-     files for every Language - especially the long Languagecodes are rare, so please
-     inform you which ones are available before you set here impossible values.</para>
+     and in which order APT tries to display the description-translations. APT will try to display the first
+     available description in the language which is listed first. Languages can be defined with their
+     short or long language codes. Note that not all archives provide <filename>Translation</filename>
+     files for every language - the long language codes are especially rare.</para>
      <para>The default list includes "environment" and "en". "<literal>environment</literal>" has a special meaning here:
-     It will be replaced at runtime with the languagecodes extracted from the <literal>LC_MESSAGES</literal> environment variable.
+     it will be replaced at runtime with the language codes extracted from the <literal>LC_MESSAGES</literal> environment variable.
      It will also ensure that these codes are not included twice in the list. If <literal>LC_MESSAGES</literal>
      is set to "C" only the <filename>Translation-en</filename> file (if available) will be used.
-     To force apt to use no Translation file use the setting <literal>Acquire::Languages=none</literal>. "<literal>none</literal>"
-     is another special meaning code which will stop the search for a fitting <filename>Translation</filename> file.
-     This can be used by the system administrator to let APT know that it should download also this files without
-     actually use them if the environment doesn't specify this languages. So the following example configuration will
-     result in the order "en, de" in an english and in "de, en" in a german localization. Note that "fr" is downloaded,
-     but not used if APT is not used in a french localization, in such an environment the order would be "fr, de, en".
+     To force APT to use no Translation file use the setting <literal>Acquire::Languages=none</literal>. "<literal>none</literal>"
+     is another special meaning code which will stop the search for a suitable <filename>Translation</filename> file.
+     This tells APT to download these translations too, without actually
+     using them unless the environment specifies the languages. So the
+     following example configuration will result in the order "en, de" in an
+     English locale or "de, en" in a German one. Note that "fr" is
+     downloaded, but not used unless APT is used in a French locale (where
+     the order would be "fr, de, en").
      <programlisting>Acquire::Languages { "environment"; "de"; "en"; "none"; "fr"; };</programlisting></para>
      <para>Note: To prevent problems resulting from APT being executed in different environments
      (e.g. by different users or by other programs) all Translation files which are found in
@@ -506,24 +555,23 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
      </varlistentry>
 
    </variablelist>
-  </para>
  </refsect1>
 
  <refsect1><title>Directories</title>
 
    <para>The <literal>Dir::State</literal> section has directories that pertain to local 
    state information. <literal>lists</literal> is the directory to place downloaded 
-   package lists in and <literal>status</literal> is the name of the dpkg status file.
+   package lists in and <literal>status</literal> is the name of the &dpkg; status file.
    <literal>preferences</literal> is the name of the APT <filename>preferences</filename> file.
-   <literal>Dir::State</literal> contains the default directory to prefix on all sub 
-   items if they do not start with <filename>/</filename> or <filename>./</filename>.</para>
+   <literal>Dir::State</literal> contains the default directory to prefix on all
+   sub-items if they do not start with <filename>/</filename> or <filename>./</filename>.</para>
 
    <para><literal>Dir::Cache</literal> contains locations pertaining to local cache 
    information, such as the two package caches <literal>srcpkgcache</literal> and 
    <literal>pkgcache</literal> as well as the location to place downloaded archives, 
    <literal>Dir::Cache::archives</literal>. Generation of caches can be turned off
-   by setting their names to be blank. This will slow down startup but
-   save disk space. It is probably preferred to turn off the pkgcache rather
+   by setting their names to the empty string. This will slow down startup but
+   save disk space. It is probably preferable to turn off the pkgcache rather
    than the srcpkgcache. Like <literal>Dir::State</literal> the default
    directory is contained in <literal>Dir::Cache</literal></para>
 
@@ -570,25 +618,30 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
  <refsect1><title>APT in DSelect</title>
    <para>   
    When APT is used as a &dselect; method several configuration directives
-   control the default behaviour. These are in the <literal>DSelect</literal> section.</para>
+   control the default behavior. These are in the <literal>DSelect</literal> section.</para>
    
    <variablelist>
      <varlistentry><term><option>Clean</option></term>
-     <listitem><para>Cache Clean mode; this value may be one of always, prompt, auto,
-     pre-auto and never.  always and prompt will remove all packages from
-     the cache after upgrading, prompt (the default) does so conditionally. 
-     auto removes only those packages which are no longer downloadable
-     (replaced with a new version for instance).  pre-auto performs this
-     action before downloading new packages.</para></listitem>
+     <listitem><para>Cache Clean mode; this value may be one of
+     <literal>always</literal>, <literal>prompt</literal>,
+     <literal>auto</literal>, <literal>pre-auto</literal> and
+     <literal>never</literal>.
+     <literal>always</literal> and <literal>prompt</literal> will remove
+     all packages from the cache after upgrading, <literal>prompt</literal>
+     (the default) does so conditionally.
+     <literal>auto</literal> removes only those packages which are no longer
+     downloadable (replaced with a new version for instance).
+     <literal>pre-auto</literal> performs this action before downloading
+     new packages.</para></listitem>
      </varlistentry>
 
      <varlistentry><term><option>options</option></term>
-     <listitem><para>The contents of this variable is passed to &apt-get; as command line
+     <listitem><para>The contents of this variable are passed to &apt-get; as command line
      options when it is run for the install phase.</para></listitem>
      </varlistentry>
 
      <varlistentry><term><option>Updateoptions</option></term>
-     <listitem><para>The contents of this variable is passed to &apt-get; as command line
+     <listitem><para>The contents of this variable are passed to &apt-get; as command line
      options when it is run for the update phase.</para></listitem>
      </varlistentry>
 
@@ -599,13 +652,13 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
    </variablelist>
  </refsect1>
  
- <refsect1><title>How APT calls dpkg</title>
+ <refsect1><title>How APT calls &dpkg;</title>
    <para>Several configuration directives control how APT invokes &dpkg;. These are 
    in the <literal>DPkg</literal> section.</para>
 
    <variablelist>
      <varlistentry><term><option>options</option></term>
-     <listitem><para>This is a list of options to pass to dpkg. The options must be specified
+     <listitem><para>This is a list of options to pass to &dpkg;. The options must be specified
      using the list notation and each list item is passed as a single argument
      to &dpkg;.</para></listitem>
      </varlistentry>
@@ -613,16 +666,16 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
      <varlistentry><term><option>Pre-Invoke</option></term><term><option>Post-Invoke</option></term>
      <listitem><para>This is a list of shell commands to run before/after invoking &dpkg;. 
      Like <literal>options</literal> this must be specified in list notation. The 
-     commands are invoked in order using <filename>/bin/sh</filename>, should any 
+     commands are invoked in order using <filename>/bin/sh</filename>; should any 
      fail APT will abort.</para></listitem>
      </varlistentry>
 
      <varlistentry><term><option>Pre-Install-Pkgs</option></term>
-     <listitem><para>This is a list of shell commands to run before invoking dpkg. Like
+     <listitem><para>This is a list of shell commands to run before invoking &dpkg;. Like
      <literal>options</literal> this must be specified in list notation. The commands
-     are invoked in order using <filename>/bin/sh</filename>, should any fail APT 
-     will abort. APT will pass to the commands on standard input the 
-     filenames of all .deb files it is going to install, one per line.</para>
+     are invoked in order using <filename>/bin/sh</filename>; should any fail APT 
+     will abort. APT will pass the filenames of all .deb files it is going to
+     install to the commands, one per line on standard input.</para>
 
      <para>Version 2 of this protocol dumps more information, including the 
      protocol version, the APT configuration space and the packages, files
@@ -632,31 +685,31 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
      </varlistentry>
 
      <varlistentry><term><option>Run-Directory</option></term>
-     <listitem><para>APT chdirs to this directory before invoking dpkg, the default is 
+     <listitem><para>APT chdirs to this directory before invoking &dpkg;, the default is 
      <filename>/</filename>.</para></listitem>
      </varlistentry>
 
      <varlistentry><term><option>Build-options</option></term>
-     <listitem><para>These options are passed to &dpkg-buildpackage; when compiling packages,
+     <listitem><para>These options are passed to &dpkg-buildpackage; when compiling packages;
      the default is to disable signing and produce all binaries.</para></listitem>
      </varlistentry>
    </variablelist>
 
    <refsect2><title>dpkg trigger usage (and related options)</title>
-     <para>APT can call dpkg in a way so it can make aggressive use of triggers over
-     multiple calls of dpkg. Without further options dpkg will use triggers only in between his
-     own run. Activating these options can therefore decrease the time needed to perform the
-     install / upgrade. Note that it is intended to activate these options per default in the
-     future, but as it changes the way APT calling dpkg drastically it needs a lot more testing.
+     <para>APT can call &dpkg; in such a way as to let it make aggressive use of triggers over
+     multiple calls of &dpkg;. Without further options &dpkg; will use triggers once each time it runs.
+     Activating these options can therefore decrease the time needed to perform the
+     install or upgrade. Note that it is intended to activate these options per default in the
+     future, but as it drastically changes the way APT calls &dpkg; it needs a lot more testing.
      <emphasis>These options are therefore currently experimental and should not be used in
-     productive environments.</emphasis> Also it breaks the progress reporting so all frontends will
+     production environments.</emphasis> It also breaks progress reporting such that all front-ends will
      currently stay around half (or more) of the time in the 100% state while it actually configures
      all packages.</para>
      <para>Note that it is not guaranteed that APT will support these options or that these options will
      not cause (big) trouble in the future. If you have understand the current risks and problems with
-     these options, but are brave enough to help testing them create a new configuration file and test a
+     these options, but are brave enough to help testing them, create a new configuration file and test a
      combination of options. Please report any bugs, problems and improvements you encounter and make sure
-     to note which options you have used in your reports. Asking dpkg for help could also be useful for
+     to note which options you have used in your reports. Asking &dpkg; for help could also be useful for
      debugging proposes, see e.g. <command>dpkg --audit</command>. A defensive option combination would be
 <literallayout>DPkg::NoTriggers "true";
 PackageManager::Configure "smart";
@@ -665,53 +718,49 @@ DPkg::TriggersPending "true";</literallayout></para>
 
      <variablelist>
        <varlistentry><term><option>DPkg::NoTriggers</option></term>
-       <listitem><para>Add the no triggers flag to all dpkg calls (except the ConfigurePending call).
-       See &dpkg; if you are interested in what this actually means. In short: dpkg will not run the
+       <listitem><para>Add the no triggers flag to all &dpkg; calls (except the ConfigurePending call).
+       See &dpkg; if you are interested in what this actually means. In short: &dpkg; will not run the
        triggers when this flag is present unless it is explicitly called to do so in an extra call.
-       Note that this option exists (undocumented) also in older apt versions with a slightly different
-       meaning: Previously these option only append --no-triggers to the configure calls to dpkg -
-       now apt will add these flag also to the unpack and remove calls.</para></listitem>
+       Note that this option exists (undocumented) also in older APT versions with a slightly different
+       meaning: Previously these option only append --no-triggers to the configure calls to &dpkg; -
+       now APT will also add this flag to the unpack and remove calls.</para></listitem>
        </varlistentry>
        <varlistentry><term><option>PackageManager::Configure</option></term>
-       <listitem><para>Valid values are "<literal>all</literal>", "<literal>smart</literal>" and "<literal>no</literal>".
-       "<literal>all</literal>" is the default value and causes APT to configure all packages explicit.
-       The "<literal>smart</literal>" way is it to configure only packages which need to be configured before
-       another package can be unpacked (Pre-Depends) and let the rest configure by dpkg with a call generated
-       by the next option. "<literal>no</literal>" on the other hand will not configure anything and totally
-       rely on dpkg for configuration (which will at the moment fail if a Pre-Depends is encountered).
-       Setting this option to another than the all value will implicitly activate also the next option per
-       default as otherwise the system could end in an unconfigured status which could be unbootable!
-       </para></listitem>
+       <listitem><para>Valid values are "<literal>all</literal>",
+       "<literal>smart</literal>" and "<literal>no</literal>".
+       The default value is "<literal>all</literal>", which causes APT to
+       configure all packages. The "<literal>smart</literal>" way is to
+       configure only packages which need to be configured before another
+       package can be unpacked (Pre-Depends), and let the rest be configured
+       by &dpkg; with a call generated by the ConfigurePending option (see
+       below). On the other hand, "<literal>no</literal>" will not configure
+       anything, and totally relies on &dpkg; for configuration (which at the
+       moment will fail if a Pre-Depends is encountered). Setting this option
+       to any value other than <literal>all</literal> will implicitly also
+       activate the next option by default, as otherwise the system could end
+       in an unconfigured and potentially unbootable state.</para></listitem>
        </varlistentry>
        <varlistentry><term><option>DPkg::ConfigurePending</option></term>
-       <listitem><para>If this option is set apt will call <command>dpkg --configure --pending</command>
-       to let dpkg handle all required configurations and triggers. This option is activated automatic
-       per default if the previous option is not set to <literal>all</literal>, but deactivating could be useful
+       <listitem><para>If this option is set APT will call <command>dpkg --configure --pending</command>
+       to let &dpkg; handle all required configurations and triggers. This option is activated automatically
+       per default if the previous option is not set to <literal>all</literal>, but deactivating it could be useful
        if you want to run APT multiple times in a row - e.g. in an installer. In these sceneries you could
        deactivate this option in all but the last run.</para></listitem>
        </varlistentry>
        <varlistentry><term><option>DPkg::TriggersPending</option></term>
-       <listitem><para>Useful for <literal>smart</literal> configuration as a package which has pending
-       triggers is not considered as <literal>installed</literal> and dpkg treats them as <literal>unpacked</literal>
-       currently which is a dealbreaker for Pre-Dependencies (see debbugs #526774). Note that this will
+       <listitem><para>Useful for the <literal>smart</literal> configuration as a package which has pending
+       triggers is not considered as <literal>installed</literal>, and &dpkg; treats them as <literal>unpacked</literal>
+       currently which is a showstopper for Pre-Dependencies (see debbugs #526774). Note that this will
        process all triggers, not only the triggers needed to configure this package.</para></listitem>
        </varlistentry>
-       <varlistentry><term><option>PackageManager::UnpackAll</option></term>
-       <listitem><para>As the configuration can be deferred to be done at the end by dpkg it can be
-       tried to order the unpack series only by critical needs, e.g. by Pre-Depends. Default is true
-       and therefore the "old" method of ordering in various steps by everything. While both method
-       were present in earlier APT versions the <literal>OrderCritical</literal> method was unused, so
-       this method is very experimental and needs further improvements before becoming really useful.
-       </para></listitem>
-       </varlistentry>
        <varlistentry><term><option>OrderList::Score::Immediate</option></term>
-       <listitem><para>Essential packages (and there dependencies) should be configured immediately
-       after unpacking. It will be a good idea to do this quite early in the upgrade process as these
-       these configure calls require currently also <literal>DPkg::TriggersPending</literal> which
-       will run quite a few triggers (which maybe not needed). Essentials get per default a high score
-       but the immediate flag is relatively low (a package which has a Pre-Depends is higher rated).
+       <listitem><para>Essential packages (and their dependencies) should be configured immediately
+       after unpacking. It is a good idea to do this quite early in the upgrade process as these
+       configure calls also currently require <literal>DPkg::TriggersPending</literal> which
+       will run quite a few triggers (which may not be needed). Essentials get per default a high score
+       but the immediate flag is relatively low (a package which has a Pre-Depends is rated higher).
        These option and the others in the same group can be used to change the scoring. The following
-       example shows the settings with there default values.
+       example shows the settings with their default values.
        <literallayout>OrderList::Score {
 	Delete 500;
 	Essential 200;
@@ -728,7 +777,7 @@ DPkg::TriggersPending "true";</literallayout></para>
    <title>Periodic and Archives options</title>
    <para><literal>APT::Periodic</literal> and <literal>APT::Archives</literal>
    groups of options configure behavior of apt periodic updates, which is
-   done by <literal>/etc/cron.daily/apt</literal> script. See header of
+   done by the <literal>/etc/cron.daily/apt</literal> script. See the top of
    this script for the brief documentation of these options.
    </para>
  </refsect1>
@@ -977,10 +1026,10 @@ DPkg::TriggersPending "true";</literallayout></para>
        <term><option>Debug::pkgDepCache::Marker</option></term>
        <listitem>
         <para>
-           Generate debug messages describing which package is marked
+           Generate debug messages describing which packages are marked
           as keep/install/remove while the ProblemResolver does his work.
           Each addition or deletion may trigger additional actions;
-          they are shown indented two additional space under the original entry.
+          they are shown indented two additional spaces under the original entry.
           The format for each line is <literal>MarkKeep</literal>,
           <literal>MarkDelete</literal> or <literal>MarkInstall</literal> followed by
           <literal>package-name &lt;a.b.c -&gt; d.e.f | x.y.z&gt; (section)</literal>
@@ -988,23 +1037,12 @@ DPkg::TriggersPending "true";</literallayout></para>
           <literal>d.e.f</literal> is the version considered for installation and
           <literal>x.y.z</literal> is a newer version, but not considered for installation
           (because of a low pin score). The later two can be omitted if there is none or if
-          it is the same version as the installed.
+          it is the same as the installed version.
           <literal>section</literal> is the name of the section the package appears in.
         </para>
        </listitem>
      </varlistentry>
 
-     <!-- Question: why doesn't this do anything?  The code says it should. -->
-     <varlistentry>
-       <term><option>Debug::pkgInitConfig</option></term>
-       <listitem>
-	 <para>
-	   Dump the default configuration to standard error on
-	   startup.
-	 </para>
-       </listitem>
-     </varlistentry>
-
      <varlistentry>
        <term><option>Debug::pkgDPkgPM</option></term>
        <listitem>
diff --git a/doc/files.sgml b/doc/files.sgml
index 974b73fb0..a52efc756 100644
--- a/doc/files.sgml
+++ b/doc/files.sgml
@@ -163,7 +163,7 @@ The extended_states file serves the same purpose as the normal dpkg status file
 This includes currently only the autoflag but is open to store more
 unique data that come up over time. It duplicates nothing from the normal
 dpkg status file.  Please see other APT documentation for a discussion
-of the exact internal behaviour of these fields. The Package and the
+of the exact internal behavior of these fields. The Package and the
 Architecture field are placed directly before the new fields to indicate
 which package they apply to. The new fields are as follows:
 
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 714ef542b..a0f1333c0 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 0.9.5.1\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-07 00:01+0300\n"
+"POT-Creation-Date: 2012-06-09 19:12+0300\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"
@@ -1105,12 +1105,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:518 apt-cache.8.xml:343 apt-key.8.xml:174 apt-mark.8.xml:125 apt.conf.5.xml:1118 apt_preferences.5.xml:698
+#: apt-get.8.xml:518 apt-cache.8.xml:343 apt-key.8.xml:174 apt-mark.8.xml:125 apt.conf.5.xml:1156 apt_preferences.5.xml:698
 msgid "Files"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131 apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109 apt.conf.5.xml:1124 apt_preferences.5.xml:705 sources.list.5.xml:252 apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63 apt-ftparchive.1.xml:607
+#: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131 apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109 apt.conf.5.xml:1162 apt_preferences.5.xml:705 sources.list.5.xml:252 apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63 apt-ftparchive.1.xml:607
 msgid "See Also"
 msgstr ""
 
@@ -2229,79 +2229,78 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:42
 msgid ""
-"<filename>apt.conf</filename> is the main configuration file for the APT "
-"suite of tools, but by far not the only place changes to options can be "
-"made. All tools therefore share the configuration files and also use a "
-"common command line parser to provide a uniform environment."
+"<filename>/etc/apt/apt.conf</filename> is the main configuration file shared "
+"by all the tools in the APT suite of tools, though it is by no means the "
+"only place options can be set. The suite also shares a common command line "
+"parser to provide a uniform environment."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><orderedlist><para>
-#: apt.conf.5.xml:47
+#: apt.conf.5.xml:48
 msgid ""
 "When an APT tool starts up it will read the configuration files in the "
 "following order:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:49
+#: apt.conf.5.xml:50
 msgid ""
 "the file specified by the <envar>APT_CONFIG</envar> environment variable (if "
 "any)"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:51
+#: apt.conf.5.xml:52
 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, unless that file matches a pattern in the "
-"<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this "
+"<literal>Dir::Ignore-Files-Silently</literal> configuration list - in which "
 "case it will be silently ignored."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:58
+#: apt.conf.5.xml:59
 msgid "the main configuration file specified by <literal>Dir::Etc::main</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:60
+#: apt.conf.5.xml:61
 msgid ""
 "the command line options are applied to override the configuration "
 "directives or to load even more configuration files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:64
+#: apt.conf.5.xml:65
 msgid "Syntax"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:65
+#: apt.conf.5.xml:66
 msgid ""
 "The configuration file is organized in a tree with options organized into "
 "functional groups. Option specification is given with a double colon "
-"notation, for instance <literal>APT::Get::Assume-Yes</literal> is an option "
+"notation; for instance <literal>APT::Get::Assume-Yes</literal> is an option "
 "within the APT tool group, for the Get tool. Options do not inherit from "
 "their parent groups."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:71
+#: apt.conf.5.xml:72
 msgid ""
 "Syntactically the configuration language is modeled after what the ISC tools "
 "such as bind and dhcp use. Lines starting with <literal>//</literal> are "
 "treated as comments (ignored), as well as all text between "
 "<literal>/*</literal> and <literal>*/</literal>, just like C/C++ comments.  "
-"Each line is of the form <literal>APT::Get::Assume-Yes "
-"\"true\";</literal>. The trailing semicolon and the quotes are required. The "
-"value must be on one line, and there is no kind of string concatenation. It "
-"must not include inside quotes.  The behavior of the backslash \"\\\" and "
-"escaped characters inside a value is undefined and it should not be used. An "
-"option name may include alphanumerical characters and the \"/-:._+\" "
-"characters. A new scope can be opened with curly braces, like:"
+"Each line is of the form <literal>APT::Get::Assume-Yes \"true\";</literal>.  "
+"The quotation marks and trailing semicolon are required.  The value must be "
+"on one line, and there is no kind of string concatenation.  Values must not "
+"include backslashes or extra quotation marks.  Option names are made up of "
+"alphanumeric characters and the characters \"/-:._+\".  A new scope can be "
+"opened with curly braces, like this:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
@@ -2321,8 +2320,7 @@ msgstr ""
 msgid ""
 "with newlines placed to make it more readable. Lists can be created by "
 "opening a scope and including a single string enclosed in quotes followed by "
-"a semicolon. Multiple entries can be included, each separated by a "
-"semicolon."
+"a semicolon. Multiple entries can be included, separated by a semicolon."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
@@ -2342,84 +2340,85 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:105
 msgid ""
-"The names of the configuration items are not case-sensitive. So in the "
-"previous example you could use <literal>dpkg::pre-install-pkgs</literal>."
+"Case is not significant in names of configuration items, so in the previous "
+"example you could use <literal>dpkg::pre-install-pkgs</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:108
 msgid ""
-"Names for the configuration items are optional if a list is defined as it "
-"can be see in the <literal>DPkg::Pre-Install-Pkgs</literal> example "
-"above. If you don't specify a name a new entry will simply add a new option "
-"to the list. If you specify a name you can override the option as every "
-"other option by reassigning a new value to the option."
+"Names for the configuration items are optional if a list is defined as can "
+"be seen in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. If "
+"you don't specify a name a new entry will simply add a new option to the "
+"list. If you specify a name you can override the option in the same way as "
+"any other option by reassigning a new value to the option."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:113
 msgid ""
-"Two specials are allowed, <literal>#include</literal> (which is deprecated "
-"and not supported by alternative implementations) and "
-"<literal>#clear</literal>: <literal>#include</literal> will include the "
-"given file, unless the filename ends in a slash, then the whole directory is "
-"included.  <literal>#clear</literal> is used to erase a part of the "
-"configuration tree. The specified element and all its descendants are "
+"Two special commands are defined: <literal>#include</literal> (which is "
+"deprecated and not supported by alternative implementations) and "
+"<literal>#clear</literal>. <literal>#include</literal> will include the "
+"given file, unless the filename ends in a slash, in which case the whole "
+"directory is included.  <literal>#clear</literal> is used to erase a part of "
+"the configuration tree. The specified element and all its descendants are "
 "erased.  (Note that these lines also need to end with a semicolon.)"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:121
+#: apt.conf.5.xml:123
 msgid ""
-"The #clear command is the only way to delete a list or a complete scope.  "
-"Reopening a scope or the ::-style described below will "
-"<emphasis>not</emphasis> override previously written entries. Only options "
-"can be overridden by addressing a new value to it - lists and scopes can't "
-"be overridden, only cleared."
+"The <literal>#clear</literal> command is the only way to delete a list or a "
+"complete scope. Reopening a scope (or using the syntax described below with "
+"an appended <literal>::</literal>) will <emphasis>not</emphasis> override "
+"previously written entries. Options can only be overridden by addressing a "
+"new value to them - lists and scopes can't be overridden, only cleared."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:126
+#: apt.conf.5.xml:131
 msgid ""
-"All of the APT tools take a -o option which allows an arbitrary "
+"All of the APT tools take an -o option which allows an arbitrary "
 "configuration directive to be specified on the command line. The syntax is a "
 "full option name (<literal>APT::Get::Assume-Yes</literal> for instance) "
 "followed by an equals sign then the new value of the option. To append a new "
-"element to a list, add a trailing :: to the name of the list. (As you might "
-"suspect: The scope syntax can't be used on the command line.)"
+"element to a list, add a trailing <literal>::</literal> to the name of the "
+"list.  (As you might suspect, the scope syntax can't be used on the command "
+"line.)"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:133
-msgid ""
-"Note that you can use :: only for appending one item per line to a list and "
-"that you should not use it in combination with the scope syntax.  (The scope "
-"syntax implicit insert ::) Using both syntaxes together will trigger a bug "
-"which some users unfortunately depend on: An option with the unusual name "
-"\"<literal>::</literal>\" which acts like every other option with a "
-"name. These introduces many problems including that a user who writes "
-"multiple lines in this <emphasis>wrong</emphasis> syntax in the hope to "
-"append to a list will gain the opposite as only the last assignment for this "
-"option \"<literal>::</literal>\" will be used. Upcoming APT versions will "
-"raise errors and will stop working if they encounter this misuse, so please "
-"correct such statements now as long as APT doesn't complain explicit about "
-"them."
+#: apt.conf.5.xml:139
+msgid ""
+"Note that appending items to a list using <literal>::</literal> only works "
+"for one item per line, and that you should not use it in combination with "
+"the scope syntax (which adds <literal>::</literal> implicitly). Using both "
+"syntaxes together will trigger a bug which some users unfortunately depend "
+"on: an option with the unusual name \"<literal>::</literal>\" which acts "
+"like every other option with a name. This introduces many problems; for one "
+"thing, users who write multiple lines in this <emphasis>wrong</emphasis> "
+"syntax in the hope of appending to a list will achieve the opposite, as only "
+"the last assignment for this option \"<literal>::</literal>\" will be "
+"used. Future versions of APT will raise errors and stop working if they "
+"encounter this misuse, so please correct such statements now while APT "
+"doesn't explicitly complain about them."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:145
+#: apt.conf.5.xml:154
 msgid "The APT Group"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:146
+#: apt.conf.5.xml:155
 msgid ""
 "This group of options controls general APT behavior as well as holding the "
 "options for all of the tools."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:151
+#: apt.conf.5.xml:160
 msgid ""
 "System Architecture; sets the architecture to use when fetching files and "
 "parsing package lists. The internal default is the architecture apt was "
@@ -2427,36 +2426,37 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:157
+#: apt.conf.5.xml:167
 msgid ""
-"All Architectures the system supports. Processors implementing the "
-"<literal>amd64</literal> (also called <literal>x86-64</literal>) instruction "
-"set are e.g. also able to execute binaries compiled for the "
-"<literal>i386</literal> (<literal>x86</literal>) instruction set; 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>."
+"All Architectures the system supports. For instance, CPUs implementing the "
+"<literal>amd64</literal> (also called <literal>x86-64</literal>)  "
+"instruction set are also able to execute binaries compiled for the "
+"<literal>i386</literal> (<literal>x86</literal>) instruction set. This list "
+"is used when fetching files and parsing package lists. The initial default "
+"is always the system's native architecture "
+"(<literal>APT::Architecture</literal>), and foreign architectures are added "
+"to the default list when they are registered via <command>dpkg "
+"--add-architecture</command>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:167
+#: apt.conf.5.xml:180
 msgid ""
-"Default release to install packages from if more than one version "
+"Default release to install packages from if more than one version is "
 "available. Contains release name, codename or release version. Examples: "
 "'stable', 'testing', 'unstable', '&stable-codename;', '&testing-codename;', "
 "'4.0', '5.0*'. See also &apt-preferences;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:173
+#: apt.conf.5.xml:186
 msgid ""
-"Ignore Held packages; This global option causes the problem resolver to "
+"Ignore held packages; this global option causes the problem resolver to "
 "ignore held packages in its decision making."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:178
+#: apt.conf.5.xml:191
 msgid ""
 "Defaults to on. When turned on the autoclean feature will remove any "
 "packages which can no longer be downloaded from the cache. If turned off "
@@ -2465,163 +2465,180 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:185
+#: apt.conf.5.xml:199
+msgid ""
+"Defaults to on, which will cause APT to install essential and important "
+"packages as soon as possible in an install/upgrade operation, in order to "
+"limit the effect of a failing &dpkg; call. If this option is disabled, APT "
+"treats an important package in the same way as an extra package: between the "
+"unpacking of the package A and its configuration there can be many other "
+"unpack or configuration calls for other unrelated packages B, C etc. If "
+"these cause the &dpkg; call to fail (e.g. because package B's maintainer "
+"scripts generate an error), this results in a system state in which package "
+"A is unpacked but unconfigured - so any package depending on A is now no "
+"longer guaranteed to work, as its dependency on A is no longer satisfied."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:211
 msgid ""
-"Defaults to on which will cause APT to install essential and important "
-"packages as fast as possible in the install/upgrade operation. This is done "
-"to limit the effect of a failing &dpkg; call: If this option is disabled APT "
-"does treat an important package in the same way as an extra package: Between "
-"the unpacking of the important package A and his configuration can then be "
-"many other unpack or configuration calls, e.g. for package B which has no "
-"relation to A, but causes the dpkg call to fail (e.g. because maintainer "
-"script of package B generates an error) which results in a system state in "
-"which package A is unpacked but unconfigured - each package depending on A "
-"is now no longer guaranteed to work as their dependency on A is not longer "
-"satisfied. The immediate configuration marker is also applied to all "
-"dependencies which can generate a problem if the dependencies e.g. form a "
-"circle as a dependency with the immediate flag is comparable with a "
-"Pre-Dependency. So in theory it is possible that APT encounters a situation "
-"in which it is unable to perform immediate configuration, errors out and "
-"refers to this option so the user can deactivate the immediate configuration "
-"temporarily to be able to perform an install/upgrade again. Note the use of "
-"the word \"theory\" here as this problem was only encountered by now in real "
-"world a few times in non-stable distribution versions and was caused by "
-"wrong dependencies of the package in question or by a system in an already "
-"broken state, so you should not blindly disable this option as the mentioned "
-"scenario above is not the only problem immediate configuration can help to "
-"prevent in the first place.  Before a big operation like "
-"<literal>dist-upgrade</literal> is run with this option disabled it should "
-"be tried to explicitly <literal>install</literal> the package APT is unable "
-"to configure immediately, but please make sure to report your problem also "
-"to your distribution and to the APT team with the buglink below so they can "
-"work on improving or correcting the upgrade process."
+"The immediate configuration marker is also applied in the potentially "
+"problematic case of circular dependencies, since a dependency with the "
+"immediate flag is equivalent to a Pre-Dependency. In theory this allows APT "
+"to recognise a situation in which it is unable to perform immediate "
+"configuration, abort, and suggest to the user that the option should be "
+"temporarily deactivated in order to allow the operation to proceed.  Note "
+"the use of the word \"theory\" here; in the real world this problem has "
+"rarely been encountered, in non-stable distribution versions, and was caused "
+"by wrong dependencies of the package in question or by a system in an "
+"already broken state; so you should not blindly disable this option, as the "
+"scenario mentioned above is not the only problem it can help to prevent in "
+"the first place."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:208
+#: apt.conf.5.xml:224
 msgid ""
-"Never Enable this option unless you -really- know what you are doing. It "
-"permits APT to temporarily remove an essential package to break a "
-"Conflicts/Conflicts or Conflicts/Pre-Depend loop between two essential "
-"packages. SUCH A LOOP SHOULD NEVER EXIST AND IS A GRAVE BUG. This option "
-"will work if the essential packages are not tar, gzip, libc, dpkg, bash or "
-"anything that those packages depend on."
+"Before a big operation like <literal>dist-upgrade</literal> is run with this "
+"option disabled you should try to explicitly <literal>install</literal> the "
+"package APT is unable to configure immediately; but please make sure you "
+"also report your problem to your distribution and to the APT team with the "
+"buglink below, so they can work on improving or correcting the upgrade "
+"process."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:217
+#: apt.conf.5.xml:235
+msgid ""
+"Never enable this option unless you <emphasis>really</emphasis> know what "
+"you are doing. It permits APT to temporarily remove an essential package to "
+"break a Conflicts/Conflicts or Conflicts/Pre-Depends loop between two "
+"essential packages. <emphasis>Such a loop should never exist and is a grave "
+"bug</emphasis>. This option will work if the essential packages are not "
+"<command>tar</command>, <command>gzip</command>, <command>libc</command>, "
+"<command>dpkg</command>, <command>dash</command> or anything that those "
+"packages depend on."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:247
 msgid ""
 "APT uses since version 0.7.26 a resizable memory mapped cache file to store "
-"the 'available' information. <literal>Cache-Start</literal> acts as a hint "
-"to which size the Cache will grow and is therefore the amount of memory APT "
+"the available information. <literal>Cache-Start</literal> acts as a hint of "
+"the size the cache will grow to, and is therefore the amount of memory APT "
 "will request at startup. The default value is 20971520 bytes (~20 MB). Note "
-"that this amount of space needs to be available for APT otherwise it will "
+"that this amount of space needs to be available for APT; otherwise it will "
 "likely fail ungracefully, so for memory restricted devices this value should "
 "be lowered while on systems with a lot of configured sources it should be "
 "increased.  <literal>Cache-Grow</literal> defines in bytes with the default "
-"of 1048576 (~1 MB) how much the Cache size will be increased in the event "
-"the space defined by <literal>Cache-Start</literal> is not enough. These "
+"of 1048576 (~1 MB) how much the cache size will be increased in the event "
+"the space defined by <literal>Cache-Start</literal> is not enough. This "
 "value will be applied again and again until either the cache is big enough "
 "to store all information or the size of the cache reaches the "
 "<literal>Cache-Limit</literal>.  The default of "
 "<literal>Cache-Limit</literal> is 0 which stands for no limit.  If "
-"<literal>Cache-Grow</literal> is set to 0 the automatic grow of the cache is "
-"disabled."
+"<literal>Cache-Grow</literal> is set to 0 the automatic growth of the cache "
+"is disabled."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:233
-msgid "Defines which package(s) are considered essential build dependencies."
+#: apt.conf.5.xml:263
+msgid "Defines which packages are considered essential build dependencies."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:237
+#: apt.conf.5.xml:267
 msgid ""
-"The Get subsection controls the &apt-get; tool, please see its documentation "
+"The Get subsection controls the &apt-get; tool; please see its documentation "
 "for more information about the options here."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:242
+#: apt.conf.5.xml:272
 msgid ""
-"The Cache subsection controls the &apt-cache; tool, please see its "
+"The Cache subsection controls the &apt-cache; tool; please see its "
 "documentation for more information about the options here."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:247
+#: apt.conf.5.xml:277
 msgid ""
-"The CDROM subsection controls the &apt-cdrom; tool, please see its "
+"The CDROM subsection controls the &apt-cdrom; tool; please see its "
 "documentation for more information about the options here."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:253
+#: apt.conf.5.xml:283
 msgid "The Acquire Group"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:254
+#: apt.conf.5.xml:284
 msgid ""
 "The <literal>Acquire</literal> group of options controls the download of "
-"packages and the URI handlers."
+"packages as well as the various \"acquire methods\" responsible for the "
+"download itself (see also &sources-list;)."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:259
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:291
 msgid ""
-"Security related option defaulting to true as an expiring validation for a "
-"Release file prevents longtime replay attacks and can e.g. also help users "
-"to identify no longer updated mirrors - but the feature depends on the "
-"correctness of the time on the user system.  Archive maintainers are "
-"encouraged to create Release files with the <literal>Valid-Until</literal> "
-"header, but if they don't or a stricter value is volitional the following "
-"<literal>Max-ValidTime</literal> option can be used."
+"Security related option defaulting to true, as giving a Release file's "
+"validation an expiration date prevents replay attacks over a long timescale, "
+"and can also for example help users to identify mirrors that are no longer "
+"updated - but the feature depends on the correctness of the clock on the "
+"user system. Archive maintainers are encouraged to create Release files with "
+"the <literal>Valid-Until</literal> header, but if they don't or a stricter "
+"value is desired the <literal>Max-ValidTime</literal> option below can be "
+"used."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:270
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:304
 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 valid\".  Archive specific "
-"settings can be made by appending the label of the archive to the option "
-"name."
+"Maximum time (in seconds) after its creation (as indicated by the "
+"<literal>Date</literal> header) that the <filename>Release</filename> file "
+"should be considered valid.  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 \"valid forever\".  Archive specific settings can be made by appending "
+"the label of the archive to the option name."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:281
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:316
 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."
+"Minimum time (in seconds) after its creation (as indicated by the "
+"<literal>Date</literal> header) that the <filename>Release</filename> file "
+"should be considered valid.  Use this if you need to use a seldom updated "
+"(local) mirror of a more frequently 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 ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:292
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:328
 msgid ""
-"Try to download deltas called <literal>PDiffs</literal> for Packages or "
-"Sources files instead of downloading whole ones. True by default."
+"Try to download deltas called <literal>PDiffs</literal> for indexes (like "
+"<filename>Packages</filename> files) instead of downloading whole ones. True "
+"by default."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:295
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:331
 msgid ""
-"Two sub-options to limit the use of PDiffs are also available: With "
-"<literal>FileLimit</literal> can be specified how many PDiff files are "
-"downloaded at most to update a file. <literal>SizeLimit</literal> on the "
-"other hand is the maximum percentage of the size of all patches compared to "
-"the size of the targeted file. If one of these limits is exceeded the "
-"complete file is downloaded instead of the patches."
+"Two sub-options to limit the use of PDiffs are also available: "
+"<literal>FileLimit</literal> can be used to specify a maximum number of "
+"PDiff files should be downloaded to update a "
+"file. <literal>SizeLimit</literal> on the other hand is the maximum "
+"percentage of the size of all patches compared to the size of the targeted "
+"file. If one of these limits is exceeded the complete file is downloaded "
+"instead of the patches."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:305
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:341
 msgid ""
 "Queuing mode; <literal>Queue-Mode</literal> can be one of "
 "<literal>host</literal> or <literal>access</literal> which determines how "
@@ -2630,165 +2647,167 @@ msgid ""
 "means that one connection per URI type will be opened."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:313
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:349
 msgid ""
 "Number of retries to perform. If this is non-zero APT will retry failed "
 "files the given number of times."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:318
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:354
 msgid ""
 "Use symlinks for source archives. If set to true then source archives will "
 "be symlinked when possible instead of copying. True is the default."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:323
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:359
 msgid ""
-"HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
-"standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per "
-"host proxies can also be specified by using the form "
+"<literal>http::Proxy</literal> sets the default proxy to use for HTTP "
+"URIs. It is in the standard form of "
+"<literal>http://[[user][:pass]@]host[:port]/</literal>.  Per host proxies "
+"can also be specified by using the form "
 "<literal>http::Proxy::&lt;host&gt;</literal> with the special keyword "
 "<literal>DIRECT</literal> meaning to use no proxies. If no one of the above "
 "settings is specified, <envar>http_proxy</envar> environment variable will "
 "be used."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:331
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:367
 msgid ""
 "Three settings are provided for cache control with HTTP/1.1 compliant proxy "
-"caches. <literal>No-Cache</literal> tells the proxy to not use its cached "
-"response under any circumstances, <literal>Max-Age</literal> is sent only "
-"for index files and tells the cache to refresh its object if it is older "
-"than the given number of seconds. Debian updates its index files daily so "
-"the default is 1 day. <literal>No-Store</literal> specifies that the cache "
-"should never store this request, it is only set for archive files. This may "
-"be useful to prevent polluting a proxy cache with very large .deb "
-"files. Note: Squid 2.0.2 does not support any of these options."
+"caches.  <literal>No-Cache</literal> tells the proxy not to use its cached "
+"response under any circumstances.  <literal>Max-Age</literal> sets the "
+"allowed maximum age (in seconds) of an index file in the cache of the "
+"proxy.  <literal>No-Store</literal> specifies that the proxy should not "
+"store the requested archive files in its cache, which can be used to prevent "
+"the proxy from polluting its cache with (big) .deb files."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:341 apt.conf.5.xml:407
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:377 apt.conf.5.xml:449
 msgid ""
 "The option <literal>timeout</literal> sets the timeout timer used by the "
-"method, this applies to all things including connection timeout and data "
-"timeout."
+"method; this value applies to the connection as well as the data timeout."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:344
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:380
 msgid ""
 "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
-"enabled HTTP pipeling (RFC 2616 section 8.1.2.2) which can be beneficial "
-"e.g. on high-latency connections. It specifies how many requests are send in "
+"enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial "
+"e.g. on high-latency connections. It specifies how many requests are sent in "
 "a pipeline.  Previous APT versions had a default of 10 for this setting, but "
 "the default value is now 0 (= disabled) to avoid problems with the "
 "ever-growing amount of webservers and proxies which choose to not conform to "
 "the HTTP/1.1 specification."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:351
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:387
 msgid ""
-"<literal>Acquire::http::AllowRedirect</literal> controls if APT will follow "
-"redirects, which is enabled by default."
+"<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
+"follow redirects, which is enabled by default."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:354
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:390
 msgid ""
 "The used bandwidth can be limited with "
 "<literal>Acquire::http::Dl-Limit</literal> which accepts integer values in "
-"kilobyte. The default value is 0 which deactivates the limit and tries uses "
-"as much as possible of the bandwidth (Note that this option implicit "
-"deactivates the download from multiple servers at the same time.)"
+"kilobytes. The default value is 0 which deactivates the limit and tries to "
+"use all available bandwidth (note that this option implicitly disables "
+"downloading from multiple servers at the same time.)"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:359
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:395
 msgid ""
 "<literal>Acquire::http::User-Agent</literal> can be used to set a different "
 "User-Agent for the http download method as some proxies allow access for "
 "clients only if the client uses a known identifier."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:366
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:403
 msgid ""
-"HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
-"options are the same as for <literal>http</literal> method and will also "
-"default to the options from the <literal>http</literal> method if they are "
-"not explicitly set for https. <literal>Pipeline-Depth</literal> option is "
-"not supported yet."
+"The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
+"<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
+"<literal>proxy</literal> options work for HTTPS URIs in the same way as for "
+"the <literal>http</literal> method, and default to the same values if they "
+"are not explicitly set. The <literal>Pipeline-Depth</literal> option is not "
+"yet supported."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:372
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:411
 msgid ""
 "<literal>CaInfo</literal> suboption specifies place of file that holds info "
-"about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is "
+"about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is the "
 "corresponding per-host option.  <literal>Verify-Peer</literal> boolean "
-"suboption determines whether verify server's host certificate against "
-"trusted certificates or not.  <literal>&lt;host&gt;::Verify-Peer</literal> "
-"is corresponding per-host option.  <literal>Verify-Host</literal> boolean "
-"suboption determines whether verify server's hostname or not.  "
-"<literal>&lt;host&gt;::Verify-Host</literal> is corresponding per-host "
+"suboption determines whether or not the server's host certificate should be "
+"verified against trusted certificates.  "
+"<literal>&lt;host&gt;::Verify-Peer</literal> is the corresponding per-host "
+"option.  <literal>Verify-Host</literal> boolean suboption determines whether "
+"or not the server's hostname should be verified.  "
+"<literal>&lt;host&gt;::Verify-Host</literal> is the corresponding per-host "
 "option.  <literal>SslCert</literal> determines what certificate to use for "
-"client authentication. <literal>&lt;host&gt;::SslCert</literal> is "
+"client authentication. <literal>&lt;host&gt;::SslCert</literal> is the "
 "corresponding per-host option.  <literal>SslKey</literal> determines what "
 "private key to use for client "
-"authentication. <literal>&lt;host&gt;::SslKey</literal> is corresponding "
+"authentication. <literal>&lt;host&gt;::SslKey</literal> is the corresponding "
 "per-host option.  <literal>SslForceVersion</literal> overrides default SSL "
-"version to use.  Can contain 'TLSv1' or 'SSLv3' string.  "
-"<literal>&lt;host&gt;::SslForceVersion</literal> is corresponding per-host "
-"option."
+"version to use.  It can contain either of the strings "
+"'<literal>TLSv1</literal>' or '<literal>SSLv3</literal>'.  "
+"<literal>&lt;host&gt;::SslForceVersion</literal> is the corresponding "
+"per-host option."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:391
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:432
 msgid ""
-"FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard "
-"form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host "
-"proxies can also be specified by using the form "
+"<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs.  "
+"It is in the standard form of "
+"<literal>ftp://[[user][:pass]@]host[:port]/</literal>.  Per host proxies can "
+"also be specified by using the form "
 "<literal>ftp::Proxy::&lt;host&gt;</literal> with the special keyword "
 "<literal>DIRECT</literal> meaning to use no proxies. If no one of the above "
 "settings is specified, <envar>ftp_proxy</envar> environment variable will be "
-"used. To use a ftp proxy you will have to set the "
+"used. To use an FTP proxy you will have to set the "
 "<literal>ftp::ProxyLogin</literal> script in the configuration file. This "
 "entry specifies the commands to send to tell the proxy server what to "
 "connect to. Please see &configureindex; for an example of how to do "
-"this. The substitution variables available are "
-"<literal>$(PROXY_USER)</literal> <literal>$(PROXY_PASS)</literal> "
-"<literal>$(SITE_USER)</literal> <literal>$(SITE_PASS)</literal> "
-"<literal>$(SITE)</literal> and <literal>$(SITE_PORT)</literal> Each is taken "
-"from it's respective URI component."
+"this. The substitution variables representing the corresponding URI "
+"component are <literal>$(PROXY_USER)</literal>, "
+"<literal>$(PROXY_PASS)</literal>, <literal>$(SITE_USER)</literal>, "
+"<literal>$(SITE_PASS)</literal>, <literal>$(SITE)</literal> and "
+"<literal>$(SITE_PORT)</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:410
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:452
 msgid ""
 "Several settings are provided to control passive mode. Generally it is safe "
-"to leave passive mode on, it works in nearly every environment.  However "
-"some situations require that passive mode be disabled and port mode ftp used "
-"instead. This can be done globally, for connections that go through a proxy "
-"or for a specific host (See the sample config file for examples)."
+"to leave passive mode on; it works in nearly every environment.  However, "
+"some situations require that passive mode be disabled and port mode FTP used "
+"instead. This can be done globally or for connections that go through a "
+"proxy or for a specific host (see the sample config file for examples)."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:417
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:459
 msgid ""
 "It is possible to proxy FTP over HTTP by setting the "
-"<envar>ftp_proxy</envar> environment variable to a http url - see the "
+"<envar>ftp_proxy</envar> environment variable to an HTTP URL - see the "
 "discussion of the http method above for syntax. You cannot set this in the "
 "configuration file and it is not recommended to use FTP over HTTP due to its "
 "low efficiency."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:422
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:464
 msgid ""
 "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
 "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -2797,113 +2816,115 @@ msgid ""
 "that most FTP servers do not support RFC2428."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:435
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
+#: apt.conf.5.xml:478
 #, no-wrap
 msgid "/cdrom/::Mount \"foo\";"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:430
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:473
 msgid ""
-"CD-ROM URIs; the only setting for CD-ROM URIs is the mount point, "
-"<literal>cdrom::Mount</literal> which must be the mount point for the CD-ROM "
-"drive as specified in <filename>/etc/fstab</filename>. It is possible to "
-"provide alternate mount and unmount commands if your mount point cannot be "
-"listed in the fstab (such as an SMB mount and old mount packages). The "
+"For URIs using the <literal>cdrom</literal> method, the only configurable "
+"option is the mount point, <literal>cdrom::Mount</literal>, which must be "
+"the mount point for the CD-ROM (or DVD, or whatever) drive as specified in "
+"<filename>/etc/fstab</filename>. It is possible to provide alternate mount "
+"and unmount commands if your mount point cannot be listed in the fstab.  The "
 "syntax is to put <placeholder type=\"literallayout\" id=\"0\"/> within the "
-"cdrom block. It is important to have the trailing slash. Unmount commands "
-"can be specified using UMount."
+"<literal>cdrom</literal> block. It is important to have the trailing slash.  "
+"Unmount commands can be specified using UMount."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:441
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:486
 msgid ""
-"GPGV URIs; the only option for GPGV URIs is the option to pass additional "
-"parameters to gpgv.  <literal>gpgv::Options</literal> Additional options "
-"passed to gpgv."
+"For GPGV URIs the only configurable option is "
+"<literal>gpgv::Options</literal>, which passes additional parameters to "
+"gpgv."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:452
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
+#: apt.conf.5.xml:497
 #, no-wrap
 msgid ""
 "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> "
 "\"<replaceable>Methodname</replaceable>\";"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:447
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:492
 msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "
-"compression formats.  Per default the acquire methods can decompress "
+"compression formats.  By default the acquire methods can decompress "
 "<command>bzip2</command>, <command>lzma</command> and "
-"<command>gzip</command> compressed files, with this setting more formats can "
+"<command>gzip</command> compressed files; with this setting more formats can "
 "be added on the fly or the used method can be changed. The syntax for this "
 "is: <placeholder type=\"synopsis\" id=\"0\"/>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:457
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
+#: apt.conf.5.xml:502
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order:: \"gz\";"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:460
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
+#: apt.conf.5.xml:505
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:453
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:498
 msgid ""
-"Also the <literal>Order</literal> subgroup can be used to define in which "
+"Also, the <literal>Order</literal> subgroup can be used to define in which "
 "order the acquire system will try to download the compressed files. The "
 "acquire system will try the first and proceed with the next compression type "
-"in this list on error, so to prefer one over the other type simple add the "
-"preferred type at first - not already added default types will be added at "
-"run time to the end of the list, so e.g. <placeholder type=\"synopsis\" "
+"in this list on error, so to prefer one over the other type simply add the "
+"preferred type first - default types not already added will be implicitly "
+"appended to the end of the list, so e.g. <placeholder type=\"synopsis\" "
 "id=\"0\"/> can be used to prefer <command>gzip</command> compressed files "
 "over <command>bzip2</command> and <command>lzma</command>.  If "
 "<command>lzma</command> should be preferred over <command>gzip</command> and "
-"<command>bzip2</command> the configure setting should look like this "
+"<command>bzip2</command> the configure setting should look like this: "
 "<placeholder type=\"synopsis\" id=\"1\"/> It is not needed to add "
-"<literal>bz2</literal> explicit to the list as it will be added automatic."
+"<literal>bz2</literal> to the list explicitly as it will be added "
+"automatically."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:464
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
+#: apt.conf.5.xml:512
 #, no-wrap
 msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:462
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:507
 msgid ""
-"Note that at run time the "
+"Note that 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."
+"checked at run time. If this option has been set, the method will only be "
+"used if this file exists; e.g. for the <literal>bzip2</literal> 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."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:469
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:517
 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."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:476
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:524
 msgid ""
 "When downloading <literal>gzip</literal> compressed indexes (Packages, "
 "Sources, or Translations), keep them gzip compressed locally instead of "
@@ -2911,50 +2932,48 @@ msgid ""
 "CPU requirements when building the local package caches. False by default."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:484
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:532
 msgid ""
 "The Languages subsection controls which <filename>Translation</filename> "
 "files are downloaded and in which order APT tries to display the "
-"Description-Translations. APT will try to display the first available "
-"Description in the Language which is listed at first. Languages can be "
-"defined with their short or long Languagecodes. Note that not all archives "
-"provide <filename>Translation</filename> files for every Language - "
-"especially the long Languagecodes are rare, so please inform you which ones "
-"are available before you set here impossible values."
+"description-translations. APT will try to display the first available "
+"description in the language which is listed first. Languages can be defined "
+"with their short or long language codes. Note that not all archives provide "
+"<filename>Translation</filename> files for every language - the long "
+"language codes are especially rare."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:500
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
+#: apt.conf.5.xml:549
 #, no-wrap
 msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:490
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:537
 msgid ""
 "The default list includes \"environment\" and "
-"\"en\". \"<literal>environment</literal>\" has a special meaning here: It "
-"will be replaced at runtime with the languagecodes extracted from the "
+"\"en\". \"<literal>environment</literal>\" has a special meaning here: it "
+"will be replaced at runtime with the language codes extracted from the "
 "<literal>LC_MESSAGES</literal> environment variable.  It will also ensure "
 "that these codes are not included twice in the list. If "
 "<literal>LC_MESSAGES</literal> is set to \"C\" only the "
 "<filename>Translation-en</filename> file (if available) will be used.  To "
-"force apt to use no Translation file use the setting "
+"force APT to use no Translation file use the setting "
 "<literal>Acquire::Languages=none</literal>. \"<literal>none</literal>\" is "
-"another special meaning code which will stop the search for a fitting "
-"<filename>Translation</filename> file.  This can be used by the system "
-"administrator to let APT know that it should download also this files "
-"without actually use them if the environment doesn't specify this "
-"languages. So the following example configuration will result in the order "
-"\"en, de\" in an english and in \"de, en\" in a german localization. Note "
-"that \"fr\" is downloaded, but not used if APT is not used in a french "
-"localization, in such an environment the order would be \"fr, de, en\".  "
-"<placeholder type=\"programlisting\" id=\"0\"/>"
+"another special meaning code which will stop the search for a suitable "
+"<filename>Translation</filename> file.  This tells APT to download these "
+"translations too, without actually using them unless the environment "
+"specifies the languages. So the following example configuration will result "
+"in the order \"en, de\" in an English locale or \"de, en\" in a German "
+"one. Note that \"fr\" is downloaded, but not used unless APT is used in a "
+"French locale (where the order would be \"fr, de, en\").  <placeholder "
+"type=\"programlisting\" id=\"0\"/>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:501
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:550
 msgid ""
 "Note: To prevent problems resulting from APT being executed in different "
 "environments (e.g. by different users or by other programs) all Translation "
@@ -2964,37 +2983,37 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:560
 msgid "Directories"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:514
+#: apt.conf.5.xml:562
 msgid ""
 "The <literal>Dir::State</literal> section has directories that pertain to "
 "local state information. <literal>lists</literal> is the directory to place "
 "downloaded package lists in and <literal>status</literal> is the name of the "
-"dpkg status file.  <literal>preferences</literal> is the name of the APT "
+"&dpkg; status file.  <literal>preferences</literal> is the name of the APT "
 "<filename>preferences</filename> file.  <literal>Dir::State</literal> "
-"contains the default directory to prefix on all sub items if they do not "
+"contains the default directory to prefix on all sub-items if they do not "
 "start with <filename>/</filename> or <filename>./</filename>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:521
+#: apt.conf.5.xml:569
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
 "and <literal>pkgcache</literal> as well as the location to place downloaded "
 "archives, <literal>Dir::Cache::archives</literal>. Generation of caches can "
-"be turned off by setting their names to be blank. This will slow down "
-"startup but save disk space. It is probably preferred to turn off the "
+"be turned off by setting their names to the empty string. This will slow "
+"down startup but save disk space. It is probably preferable to turn off the "
 "pkgcache rather than the srcpkgcache. Like <literal>Dir::State</literal> the "
 "default directory is contained in <literal>Dir::Cache</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:530
+#: apt.conf.5.xml:578
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -3004,7 +3023,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:536
+#: apt.conf.5.xml:584
 msgid ""
 "The <literal>Dir::Parts</literal> setting reads in all the config fragments "
 "in lexical order from the directory specified. After this is done then the "
@@ -3012,7 +3031,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:540
+#: apt.conf.5.xml:588
 msgid ""
 "Binary programs are pointed to by "
 "<literal>Dir::Bin</literal>. <literal>Dir::Bin::Methods</literal> specifies "
@@ -3024,7 +3043,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:548
+#: apt.conf.5.xml:596
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "
@@ -3037,7 +3056,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:561
+#: apt.conf.5.xml:609
 msgid ""
 "The <literal>Ignore-Files-Silently</literal> list can be used to specify "
 "which files APT should silently ignore while parsing the files in the "
@@ -3048,91 +3067,94 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:570
+#: apt.conf.5.xml:618
 msgid "APT in DSelect"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:572
+#: apt.conf.5.xml:620
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
-"control the default behaviour. These are in the <literal>DSelect</literal> "
+"control the default behavior. These are in the <literal>DSelect</literal> "
 "section."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:577
+#: apt.conf.5.xml:625
 msgid ""
-"Cache Clean mode; this value may be one of always, prompt, auto, pre-auto "
-"and never.  always and prompt will remove all packages from the cache after "
-"upgrading, prompt (the default) does so conditionally.  auto removes only "
-"those packages which are no longer downloadable (replaced with a new version "
-"for instance).  pre-auto performs this action before downloading new "
-"packages."
+"Cache Clean mode; this value may be one of <literal>always</literal>, "
+"<literal>prompt</literal>, <literal>auto</literal>, "
+"<literal>pre-auto</literal> and <literal>never</literal>.  "
+"<literal>always</literal> and <literal>prompt</literal> will remove all "
+"packages from the cache after upgrading, <literal>prompt</literal> (the "
+"default) does so conditionally.  <literal>auto</literal> removes only those "
+"packages which are no longer downloadable (replaced with a new version for "
+"instance).  <literal>pre-auto</literal> performs this action before "
+"downloading new packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:586
+#: apt.conf.5.xml:639
 msgid ""
-"The contents of this variable is passed to &apt-get; as command line options "
-"when it is run for the install phase."
+"The contents of this variable are passed to &apt-get; as command line "
+"options when it is run for the install phase."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:591
+#: apt.conf.5.xml:644
 msgid ""
-"The contents of this variable is passed to &apt-get; as command line options "
-"when it is run for the update phase."
+"The contents of this variable are passed to &apt-get; as command line "
+"options when it is run for the update phase."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:596
+#: apt.conf.5.xml:649
 msgid ""
 "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
 "The default is to prompt only on error."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:602
-msgid "How APT calls dpkg"
+#: apt.conf.5.xml:655
+msgid "How APT calls &dpkg;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:603
+#: apt.conf.5.xml:656
 msgid ""
 "Several configuration directives control how APT invokes &dpkg;. These are "
 "in the <literal>DPkg</literal> section."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:608
+#: apt.conf.5.xml:661
 msgid ""
-"This is a list of options to pass to dpkg. The options must be specified "
+"This is a list of options to pass to &dpkg;. The options must be specified "
 "using the list notation and each list item is passed as a single argument to "
 "&dpkg;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:614
+#: apt.conf.5.xml:667
 msgid ""
 "This is a list of shell commands to run before/after invoking &dpkg;.  Like "
 "<literal>options</literal> this must be specified in list notation. The "
-"commands are invoked in order using <filename>/bin/sh</filename>, should any "
+"commands are invoked in order using <filename>/bin/sh</filename>; should any "
 "fail APT will abort."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:621
+#: apt.conf.5.xml:674
 msgid ""
-"This is a list of shell commands to run before invoking dpkg. Like "
+"This is a list of shell commands to run before invoking &dpkg;. Like "
 "<literal>options</literal> this must be specified in list notation. The "
-"commands are invoked in order using <filename>/bin/sh</filename>, should any "
-"fail APT will abort. APT will pass to the commands on standard input the "
-"filenames of all .deb files it is going to install, one per line."
+"commands are invoked in order using <filename>/bin/sh</filename>; should any "
+"fail APT will abort. APT will pass the filenames of all .deb files it is "
+"going to install to the commands, one per line on standard input."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:627
+#: apt.conf.5.xml:680
 msgid ""
 "Version 2 of this protocol dumps more information, including the protocol "
 "version, the APT configuration space and the packages, files and versions "
@@ -3143,41 +3165,41 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:635
+#: apt.conf.5.xml:688
 msgid ""
-"APT chdirs to this directory before invoking dpkg, the default is "
+"APT chdirs to this directory before invoking &dpkg;, the default is "
 "<filename>/</filename>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:640
+#: apt.conf.5.xml:693
 msgid ""
-"These options are passed to &dpkg-buildpackage; when compiling packages, the "
+"These options are passed to &dpkg-buildpackage; when compiling packages; the "
 "default is to disable signing and produce all binaries."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:645
+#: apt.conf.5.xml:698
 msgid "dpkg trigger usage (and related options)"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:646
+#: apt.conf.5.xml:699
 msgid ""
-"APT can call dpkg in a way so it can make aggressive use of triggers over "
-"multiple calls of dpkg. Without further options dpkg will use triggers only "
-"in between his own run. Activating these options can therefore decrease the "
-"time needed to perform the install / upgrade. Note that it is intended to "
-"activate these options per default in the future, but as it changes the way "
-"APT calling dpkg drastically it needs a lot more testing.  <emphasis>These "
-"options are therefore currently experimental and should not be used in "
-"productive environments.</emphasis> Also it breaks the progress reporting so "
-"all frontends will currently stay around half (or more) of the time in the "
-"100% state while it actually configures all packages."
+"APT can call &dpkg; in such a way as to let it make aggressive use of "
+"triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
+"use triggers once each time it runs.  Activating these options can therefore "
+"decrease the time needed to perform the install or upgrade. Note that it is "
+"intended to activate these options per default in the future, but as it "
+"drastically changes the way APT calls &dpkg; it needs a lot more testing.  "
+"<emphasis>These options are therefore currently experimental and should not "
+"be used in production environments.</emphasis> It also breaks progress "
+"reporting such that all front-ends will currently stay around half (or more) "
+"of the time in the 100% state while it actually configures all packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:661
+#: apt.conf.5.xml:714
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
@@ -3187,84 +3209,75 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:655
+#: apt.conf.5.xml:708
 msgid ""
 "Note that it is not guaranteed that APT will support these options or that "
 "these options will not cause (big) trouble in the future. If you have "
 "understand the current risks and problems with these options, but are brave "
-"enough to help testing them create a new configuration file and test a "
+"enough to help testing them, create a new configuration file and test a "
 "combination of options. Please report any bugs, problems and improvements "
 "you encounter and make sure to note which options you have used in your "
-"reports. Asking dpkg for help could also be useful for debugging proposes, "
+"reports. Asking &dpkg; for help could also be useful for debugging proposes, "
 "see e.g. <command>dpkg --audit</command>. A defensive option combination "
 "would be <placeholder type=\"literallayout\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:668
+#: apt.conf.5.xml:721
 msgid ""
-"Add the no triggers flag to all dpkg calls (except the ConfigurePending "
+"Add the no triggers flag to all &dpkg; calls (except the ConfigurePending "
 "call).  See &dpkg; if you are interested in what this actually means. In "
-"short: dpkg will not run the triggers when this flag is present unless it is "
-"explicitly called to do so in an extra call.  Note that this option exists "
-"(undocumented) also in older apt versions with a slightly different meaning: "
-"Previously these option only append --no-triggers to the configure calls to "
-"dpkg - now apt will add these flag also to the unpack and remove calls."
+"short: &dpkg; will not run the triggers when this flag is present unless it "
+"is explicitly called to do so in an extra call.  Note that this option "
+"exists (undocumented) also in older APT versions with a slightly different "
+"meaning: Previously these option only append --no-triggers to the configure "
+"calls to &dpkg; - now APT will also add this flag to the unpack and remove "
+"calls."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:676
+#: apt.conf.5.xml:729
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
-"and \"<literal>no</literal>\".  \"<literal>all</literal>\" is the default "
-"value and causes APT to configure all packages explicit.  The "
-"\"<literal>smart</literal>\" way is it to configure only packages which need "
-"to be configured before another package can be unpacked (Pre-Depends) and "
-"let the rest configure by dpkg with a call generated by the next "
-"option. \"<literal>no</literal>\" on the other hand will not configure "
-"anything and totally rely on dpkg for configuration (which will at the "
-"moment fail if a Pre-Depends is encountered).  Setting this option to "
-"another than the all value will implicitly activate also the next option per "
-"default as otherwise the system could end in an unconfigured status which "
-"could be unbootable!"
+"and \"<literal>no</literal>\".  The default value is "
+"\"<literal>all</literal>\", which causes APT to configure all packages. The "
+"\"<literal>smart</literal>\" way is to configure only packages which need to "
+"be configured before another package can be unpacked (Pre-Depends), and let "
+"the rest be configured by &dpkg; with a call generated by the "
+"ConfigurePending option (see below). On the other hand, "
+"\"<literal>no</literal>\" will not configure anything, and totally relies on "
+"&dpkg; for configuration (which at the moment will fail if a Pre-Depends is "
+"encountered). Setting this option to any value other than "
+"<literal>all</literal> will implicitly also activate the next option by "
+"default, as otherwise the system could end in an unconfigured and "
+"potentially unbootable state."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:687
+#: apt.conf.5.xml:744
 msgid ""
-"If this option is set apt will call <command>dpkg --configure "
-"--pending</command> to let dpkg handle all required configurations and "
-"triggers. This option is activated automatic per default if the previous "
-"option is not set to <literal>all</literal>, but deactivating could be "
+"If this option is set APT will call <command>dpkg --configure "
+"--pending</command> to let &dpkg; handle all required configurations and "
+"triggers. This option is activated automatically per default if the previous "
+"option is not set to <literal>all</literal>, but deactivating it could be "
 "useful if you want to run APT multiple times in a row - e.g. in an "
 "installer. In these sceneries you could deactivate this option in all but "
 "the last run."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:694
+#: apt.conf.5.xml:751
 msgid ""
-"Useful for <literal>smart</literal> configuration as a package which has "
-"pending triggers is not considered as <literal>installed</literal> and dpkg "
-"treats them as <literal>unpacked</literal> currently which is a dealbreaker "
-"for Pre-Dependencies (see debbugs #526774). Note that this will process all "
-"triggers, not only the triggers needed to configure this package."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:700
-msgid ""
-"As the configuration can be deferred to be done at the end by dpkg it can be "
-"tried to order the unpack series only by critical needs, e.g. by "
-"Pre-Depends. Default is true and therefore the \"old\" method of ordering in "
-"various steps by everything. While both method were present in earlier APT "
-"versions the <literal>OrderCritical</literal> method was unused, so this "
-"method is very experimental and needs further improvements before becoming "
-"really useful."
+"Useful for the <literal>smart</literal> configuration as a package which has "
+"pending triggers is not considered as <literal>installed</literal>, and "
+"&dpkg; treats them as <literal>unpacked</literal> currently which is a "
+"showstopper for Pre-Dependencies (see debbugs #526774). Note that this will "
+"process all triggers, not only the triggers needed to configure this "
+"package."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:715
+#: apt.conf.5.xml:764
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
@@ -3276,40 +3289,40 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:708
+#: apt.conf.5.xml:757
 msgid ""
-"Essential packages (and there dependencies) should be configured immediately "
-"after unpacking. It will be a good idea to do this quite early in the "
-"upgrade process as these these configure calls require currently also "
+"Essential packages (and their dependencies) should be configured immediately "
+"after unpacking. It is a good idea to do this quite early in the upgrade "
+"process as these configure calls also currently require "
 "<literal>DPkg::TriggersPending</literal> which will run quite a few triggers "
-"(which maybe not needed). Essentials get per default a high score but the "
-"immediate flag is relatively low (a package which has a Pre-Depends is "
-"higher rated).  These option and the others in the same group can be used to "
-"change the scoring. The following example shows the settings with there "
+"(which may not be needed). Essentials get per default a high score but the "
+"immediate flag is relatively low (a package which has a Pre-Depends is rated "
+"higher).  These option and the others in the same group can be used to "
+"change the scoring. The following example shows the settings with their "
 "default values.  <placeholder type=\"literallayout\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:728
+#: apt.conf.5.xml:777
 msgid "Periodic and Archives options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:729
+#: apt.conf.5.xml:778
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
-"of options configure behavior of apt periodic updates, which is done by "
-"<literal>/etc/cron.daily/apt</literal> script. See header of this script for "
-"the brief documentation of these options."
+"of options configure behavior of apt periodic updates, which is done by the "
+"<literal>/etc/cron.daily/apt</literal> script. See the top of this script "
+"for the brief documentation of these options."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:737
+#: apt.conf.5.xml:786
 msgid "Debug options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:739
+#: apt.conf.5.xml:788
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -3320,7 +3333,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:750
+#: apt.conf.5.xml:799
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, "
@@ -3328,7 +3341,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:758
+#: apt.conf.5.xml:807
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s "
@@ -3336,7 +3349,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:767
+#: apt.conf.5.xml:816
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
@@ -3346,65 +3359,65 @@ msgstr ""
 #. 	   motivating example, except I haven't a clue why you'd want
 #. 	   to do this. 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:775
+#: apt.conf.5.xml:824
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
 "in CD-ROM IDs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:785
+#: apt.conf.5.xml:834
 msgid "A full list of debugging options to apt follows."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:794
+#: apt.conf.5.xml:843
 msgid "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:805
+#: apt.conf.5.xml:854
 msgid "Print information related to downloading packages using FTP."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:816
+#: apt.conf.5.xml:865
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:827
+#: apt.conf.5.xml:876
 msgid "Print information related to downloading packages using HTTPS."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:838
+#: apt.conf.5.xml:887
 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:849
+#: apt.conf.5.xml:898
 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:859
+#: apt.conf.5.xml:908
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:869
+#: apt.conf.5.xml:918
 msgid ""
 "Output each cryptographic hash that is generated by the "
 "<literal>apt</literal> libraries."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:879
+#: apt.conf.5.xml:928
 msgid ""
 "Do not include information from <literal>statfs</literal>, namely the number "
 "of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@ -3412,52 +3425,52 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:890
+#: apt.conf.5.xml:939
 msgid ""
 "Disable all file locking.  For instance, this will allow two instances of "
 "<quote><literal>apt-get update</literal></quote> to run at the same time."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:902
+#: apt.conf.5.xml:951
 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:912
+#: apt.conf.5.xml:961
 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:922
+#: apt.conf.5.xml:971
 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:934
+#: apt.conf.5.xml:983
 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:945
+#: apt.conf.5.xml:994
 msgid "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:956
+#: apt.conf.5.xml:1005
 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:966
+#: apt.conf.5.xml:1015
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial "
@@ -3467,12 +3480,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:980
+#: apt.conf.5.xml:1029
 msgid ""
-"Generate debug messages describing which package is marked as "
+"Generate debug messages describing which packages are marked as "
 "keep/install/remove while the ProblemResolver does his work.  Each addition "
 "or deletion may trigger additional actions; they are shown indented two "
-"additional space under the original entry.  The format for each line is "
+"additional spaces under the original entry.  The format for each line is "
 "<literal>MarkKeep</literal>, <literal>MarkDelete</literal> or "
 "<literal>MarkInstall</literal> followed by <literal>package-name &lt;a.b.c "
 "-&gt; d.e.f | x.y.z&gt; (section)</literal> where <literal>a.b.c</literal> "
@@ -3480,55 +3493,50 @@ msgid ""
 "version considered for installation and <literal>x.y.z</literal> is a newer "
 "version, but not considered for installation (because of a low pin "
 "score). The later two can be omitted if there is none or if it is the same "
-"version as the installed.  <literal>section</literal> is the name of the "
+"as the installed version.  <literal>section</literal> is the name of the "
 "section the package appears in."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1002
-msgid "Dump the default configuration to standard error on startup."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1012
+#: apt.conf.5.xml:1050
 msgid ""
 "When invoking &dpkg;, output the precise command line with which it is being "
 "invoked, with arguments separated by a single space character."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1023
+#: apt.conf.5.xml:1061
 msgid ""
 "Output all the data received from &dpkg; on the status file descriptor and "
 "any errors encountered while parsing it."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1034
+#: apt.conf.5.xml:1072
 msgid ""
 "Generate a trace of the algorithm that decides the order in which "
 "<literal>apt</literal> should pass packages to &dpkg;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1046
+#: apt.conf.5.xml:1084
 msgid "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1057
+#: apt.conf.5.xml:1095
 msgid "Output the priority of each package list on startup."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1067
+#: apt.conf.5.xml:1105
 msgid ""
 "Trace the execution of the dependency resolver (this applies only to what "
 "happens when a complex dependency problem is encountered)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1078
+#: apt.conf.5.xml:1116
 msgid ""
 "Display a list of all installed packages with their calculated score used by "
 "the pkgProblemResolver. The description of the package is the same as "
@@ -3536,19 +3544,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1090
+#: apt.conf.5.xml:1128
 msgid ""
 "Print information about the vendors read from "
 "<filename>/etc/apt/vendors.list</filename>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1112 apt_preferences.5.xml:545 sources.list.5.xml:211 apt-ftparchive.1.xml:596
+#: apt.conf.5.xml:1150 apt_preferences.5.xml:545 sources.list.5.xml:211 apt-ftparchive.1.xml:596
 msgid "Examples"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1113
+#: apt.conf.5.xml:1151
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
@@ -3556,7 +3564,7 @@ msgstr ""
 
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1125
+#: apt.conf.5.xml:1163
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr ""
 
@@ -3621,7 +3629,7 @@ msgid ""
 "alphanumeric, hyphen (-), underscore (_) and period (.) characters.  "
 "Otherwise APT will print a notice that it has ignored a file, unless that "
 "file matches a pattern in the <literal>Dir::Ignore-Files-Silently</literal> "
-"configuration list - in this case it will be silently ignored."
+"configuration list - in which case it will be silently ignored."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
@@ -4554,25 +4562,24 @@ msgid "Package resource list for APT"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:37
+#: sources.list.5.xml:38
 msgid ""
-"The package resource list is used to locate archives of the package "
-"distribution system in use on the system. At this time, this manual page "
-"documents only the packaging system used by the Debian system.  This control "
-"file is <filename>/etc/apt/sources.list</filename>."
+"The source list <filename>/etc/apt/sources.list</filename> is designed to "
+"support any number of active sources and a variety of source media. The file "
+"lists one source per line, with the most preferred source listed first. The "
+"information available from the configured sources is acquired by "
+"<command>apt-get update</command> (or by an equivalent command from another "
+"APT front-end)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:42
+#: sources.list.5.xml:45
 msgid ""
-"The source list is designed to support any number of active sources and a "
-"variety of source media. The file lists one source per line, with the most "
-"preferred source listed first. The format of each line is: <literal>type uri "
-"args</literal> The first item, <literal>type</literal> determines the format "
-"for <literal>args</literal>. <literal>uri</literal> is a Universal Resource "
-"Identifier (URI), which is a superset of the more specific and well-known "
-"Universal Resource Locator, or URL. The rest of the line can be marked as a "
-"comment by using a #."
+"Each line specifying a source starts with type "
+"(e.g. <literal>deb-src</literal>)  followed by options and arguments for "
+"this type.  Individual entries cannot be continued onto a following "
+"line. Empty lines are ignored, and a <literal>#</literal> character anywhere "
+"on a line marks the remainder of that line as a comment."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
@@ -4590,7 +4597,7 @@ msgid ""
 "digits (0-9), underscore (_), hyphen (-) and period (.) characters.  "
 "Otherwise APT will print a notice that it has ignored a file, unless that "
 "file matches a pattern in the <literal>Dir::Ignore-Files-Silently</literal> "
-"configuration list - in this case it will be silently ignored."
+"configuration list - in which case it will be silently ignored."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
@@ -4601,15 +4608,15 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:66
 msgid ""
-"The <literal>deb</literal> type describes a typical two-level Debian "
-"archive, <filename>distribution/component</filename>. Typically, "
-"<literal>distribution</literal> is generally an archivename like "
+"The <literal>deb</literal> type references a typical two-level Debian "
+"archive, <filename>distribution/component</filename>. The "
+"<literal>distribution</literal> is generally an archive name like "
 "<literal>stable</literal> or <literal>testing</literal> or a codename like "
 "<literal>&stable-codename;</literal> or "
 "<literal>&testing-codename;</literal> while component is one of "
-"<literal>main</literal> <literal>contrib</literal> or "
-"<literal>non-free</literal>. The <literal>deb-src</literal> type describes a "
-"debian distribution's source code in the same form as the "
+"<literal>main</literal>, <literal>contrib</literal> or "
+"<literal>non-free</literal>. The <literal>deb-src</literal> type references "
+"a Debian distribution's source code in the same form as the "
 "<literal>deb</literal> type.  A <literal>deb-src</literal> line is required "
 "to fetch source indexes."
 msgstr ""
@@ -4634,8 +4641,8 @@ msgid ""
 "Debian distribution, from which APT will find the information it needs.  "
 "<literal>distribution</literal> can specify an exact path, in which case the "
 "components must be omitted and <literal>distribution</literal> must end with "
-"a slash (/). This is useful for when the case only a particular sub-section "
-"of the archive denoted by the URI is of interest.  If "
+"a slash (<literal>/</literal>). This is useful for the case when only a "
+"particular sub-section of the archive denoted by the URI is of interest.  If "
 "<literal>distribution</literal> does not specify an exact path, at least one "
 "<literal>component</literal> must be present."
 msgstr ""
@@ -4644,12 +4651,12 @@ msgstr ""
 #: sources.list.5.xml:92
 msgid ""
 "<literal>distribution</literal> may also contain a variable, "
-"<literal>$(ARCH)</literal> which expands to the Debian architecture (i386, "
-"m68k, powerpc, ...)  used on the system. This permits "
-"architecture-independent <filename>sources.list</filename> files to be "
-"used. In general this is only of interest when specifying an exact path, "
-"<literal>APT</literal> will automatically generate a URI with the current "
-"architecture otherwise."
+"<literal>$(ARCH)</literal> which expands to the Debian architecture (such as "
+"<literal>amd64</literal> or <literal>armel</literal>) used on the "
+"system. This permits architecture-independent "
+"<filename>sources.list</filename> files to be used. In general this is only "
+"of interest when specifying an exact path, <literal>APT</literal> will "
+"automatically generate a URI with the current architecture otherwise."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -4670,20 +4677,20 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:112
 msgid ""
-"<literal>options</literal> is always optional and needs to be surounded by "
+"<literal>options</literal> is always optional and needs to be surrounded 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:"
+"supported by APT (note however that unsupported settings will be ignored "
+"silently):"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #: sources.list.5.xml:117
 msgid ""
 "<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 "
+"can be used to specify for which architectures information should be "
+"downloaded. If this option is not set all architectures defined by the "
 "<literal>APT::Architectures</literal> option will be downloaded."
 msgstr ""
 
@@ -4765,29 +4772,30 @@ msgstr ""
 msgid ""
 "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
 "is highly configurable; for more information see the &apt-conf; manual "
-"page. Please note that a ftp proxy can be specified by using the "
-"<envar>ftp_proxy</envar> environment variable. It is possible to specify a "
-"http proxy (http proxy servers often understand ftp urls)  using this method "
-"and ONLY this method. ftp proxies using http specified in the configuration "
-"file will be ignored."
+"page. Please note that an FTP proxy can be specified by using the "
+"<envar>ftp_proxy</envar> environment variable. It is possible to specify an "
+"HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
+"environment variable and <emphasis>ONLY</emphasis> this environment "
+"variable. Proxies using HTTP specified in the configuration file will be "
+"ignored."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:183
+#: sources.list.5.xml:184
 msgid ""
 "The copy scheme is identical to the file scheme except that packages are "
 "copied into the cache directory instead of used directly at their location.  "
-"This is useful for people using a zip disk to copy files around with APT."
+"This is useful for people using removable media to copy files around with "
+"APT."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:190
+#: sources.list.5.xml:191
 msgid ""
-"The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given "
-"user and access the files. It is a good idea to do prior arrangements with "
-"RSA keys or rhosts.  Access to files on the remote uses standard "
-"<command>find</command> and <command>dd</command> commands to perform the "
-"file transfers from the remote."
+"The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
+"the files as a given user. Prior configuration of rhosts or RSA keys is "
+"recommended. The standard <command>find</command> and <command>dd</command> "
+"commands are used to perform the file transfers from the remote host."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
@@ -4798,13 +4806,13 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml:200
 msgid ""
-"APT can be extended with more methods shipped in other optional packages "
-"which should follow the nameing scheme "
-"<package>apt-transport-<replaceable>method</replaceable></package>.  The APT "
-"team e.g. maintains also the <package>apt-transport-https</package> package "
-"which provides access methods for https-URIs with features similar to the "
-"http method, but other methods for using e.g. debtorrent are also available, "
-"see &apt-transport-debtorrent;."
+"APT can be extended with more methods shipped in other optional packages, "
+"which should follow the naming scheme "
+"<package>apt-transport-<replaceable>method</replaceable></package>.  For "
+"instance, the APT team also maintains the package "
+"<package>apt-transport-https</package>, which provides access methods for "
+"HTTPS URIs with features similar to the http method.  Methods for using "
+"e.g. debtorrent are also available - see &apt-transport-debtorrent;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -4990,7 +4998,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-sortpkgs.1.xml:45
-msgid "All output is sent to stdout, the input must be a seekable file."
+msgid "All output is sent to standard output; the input must be a seekable file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
diff --git a/doc/po/de.po b/doc/po/de.po
index c84999b21..c9eb39e51 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 0.9.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-06 23:46+0300\n"
+"POT-Creation-Date: 2012-06-09 19:12+0300\n"
 "PO-Revision-Date: 2012-05-21 23:18+0100\n"
 "Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -1246,12 +1246,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:338
-#, fuzzy
-#| msgid ""
-#| "Simulate prints out a series of lines each one representing a dpkg "
-#| "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square "
-#| "brackets indicate broken packages and empty set of square brackets "
-#| "meaning breaks that are of no consequence (rare)."
 msgid ""
 "Simulated runs print out a series of lines, each representing a "
 "<command>dpkg</command> operation: configure (<literal>Conf</literal>), "
@@ -1259,9 +1253,10 @@ msgid ""
 "Square brackets indicate broken packages, and empty square brackets indicate "
 "breaks that are of no consequence (rare)."
 msgstr ""
-"Simulieren gibt eine Serie von Zeilen aus, von denen jede eine Dpkg-"
-"Operation darstellt: Konfigurieren (Conf), Entfernen (Remv), Entpacken "
-"(Inst). Eckige Klammern zeigen beschädigte Pakete an und ein leeres Paar "
+"Simulieren gibt eine Serie von Zeilen aus, von denen jede eine "
+"<command>dpkg</command>-Operation darstellt: Konfigurieren (<literal>Conf</"
+"literal>), Entfernen (<literal>Remv</literal>), Entpacken (<literal>Inst</"
+"literal>). Eckige Klammern zeigen beschädigte Pakete an und ein leeres Paar "
 "eckiger Klammern bedeutet Unterbrechungen, die keine Folgen haben (selten)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -1291,10 +1286,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:359
-#, fuzzy
-#| msgid ""
-#| "Show upgraded packages; Print out a list of all packages that are to be "
-#| "upgraded.  Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
 msgid ""
 "Show upgraded packages; print out a list of all packages that are to be "
 "upgraded.  Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
@@ -1581,14 +1572,14 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml:518 apt-cache.8.xml:343 apt-key.8.xml:174 apt-mark.8.xml:125
-#: apt.conf.5.xml:1118 apt_preferences.5.xml:698
+#: apt.conf.5.xml:1156 apt_preferences.5.xml:698
 msgid "Files"
 msgstr "Dateien"
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131
 #: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109
-#: apt.conf.5.xml:1124 apt_preferences.5.xml:705 sources.list.5.xml:252
+#: apt.conf.5.xml:1162 apt_preferences.5.xml:705 sources.list.5.xml:252
 #: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63
 #: apt-ftparchive.1.xml:607
 msgid "See Also"
@@ -3199,11 +3190,17 @@ msgstr "Konfigurationsdatei für APT"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:42
+#, fuzzy
+#| msgid ""
+#| "<filename>apt.conf</filename> is the main configuration file for the APT "
+#| "suite of tools, but by far not the only place changes to options can be "
+#| "made. All tools therefore share the configuration files and also use a "
+#| "common command line parser to provide a uniform environment."
 msgid ""
-"<filename>apt.conf</filename> is the main configuration file for the APT "
-"suite of tools, but by far not the only place changes to options can be "
-"made. All tools therefore share the configuration files and also use a "
-"common command line parser to provide a uniform environment."
+"<filename>/etc/apt/apt.conf</filename> is the main configuration file shared "
+"by all the tools in the APT suite of tools, though it is by no means the "
+"only place options can be set. The suite also shares a common command line "
+"parser to provide a uniform environment."
 msgstr ""
 "<filename>apt.conf</filename> ist die Hauptkonfigurationsdatei für die APT-"
 "Werkzeugsammlung, aber bei weitem nicht der einzige Ort, an dem Änderungen "
@@ -3212,7 +3209,7 @@ msgstr ""
 "benutzt, um eine einheitliche Umgebung bereitzustellen."
 
 #. type: Content of: <refentry><refsect1><orderedlist><para>
-#: apt.conf.5.xml:47
+#: apt.conf.5.xml:48
 msgid ""
 "When an APT tool starts up it will read the configuration files in the "
 "following order:"
@@ -3221,7 +3218,7 @@ msgstr ""
 "folgenden Reihenfolge lesen:"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:49
+#: apt.conf.5.xml:50
 msgid ""
 "the file specified by the <envar>APT_CONFIG</envar> environment variable (if "
 "any)"
@@ -3230,15 +3227,15 @@ msgstr ""
 "angegeben wird (falls gesetzt)"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:51
+#: apt.conf.5.xml:52
 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, unless that file matches a pattern in the <literal>Dir::"
-"Ignore-Files-Silently</literal> configuration list - in this case it will be "
-"silently ignored."
+"Ignore-Files-Silently</literal> configuration list - in which case it will "
+"be silently ignored."
 msgstr ""
 "alle Dateien in <literal>Dir::Etc::Parts</literal> in aufsteigender "
 "alphanumerischer Reihenfolge, die entweder keine oder »<literal>conf</"
@@ -3250,7 +3247,7 @@ msgstr ""
 "sie stillschweigend ignoriert."
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:58
+#: apt.conf.5.xml:59
 msgid ""
 "the main configuration file specified by <literal>Dir::Etc::main</literal>"
 msgstr ""
@@ -3258,7 +3255,7 @@ msgstr ""
 "angegeben wird"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:60
+#: apt.conf.5.xml:61
 msgid ""
 "the command line options are applied to override the configuration "
 "directives or to load even more configuration files."
@@ -3267,16 +3264,16 @@ msgstr ""
 "zu überschreiben oder um sogar mehrere Konfigurationsdateien zu laden."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:64
+#: apt.conf.5.xml:65
 msgid "Syntax"
 msgstr "Syntax"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:65
+#: apt.conf.5.xml:66
 msgid ""
 "The configuration file is organized in a tree with options organized into "
 "functional groups. Option specification is given with a double colon "
-"notation, for instance <literal>APT::Get::Assume-Yes</literal> is an option "
+"notation; for instance <literal>APT::Get::Assume-Yes</literal> is an option "
 "within the APT tool group, for the Get tool. Options do not inherit from "
 "their parent groups."
 msgstr ""
@@ -3287,19 +3284,31 @@ msgstr ""
 "das Werkzeug Get. Optionen werden nicht von ihren Elterngruppe geerbt."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:71
+#: apt.conf.5.xml:72
+#, fuzzy
+#| msgid ""
+#| "Syntactically the configuration language is modeled after what the ISC "
+#| "tools such as bind and dhcp use. Lines starting with <literal>//</"
+#| "literal> are treated as comments (ignored), as well as all text between "
+#| "<literal>/*</literal> and <literal>*/</literal>, just like C/C++ "
+#| "comments.  Each line is of the form <literal>APT::Get::Assume-Yes \"true"
+#| "\";</literal>. The trailing semicolon and the quotes are required. The "
+#| "value must be on one line, and there is no kind of string concatenation. "
+#| "It must not include inside quotes.  The behavior of the backslash \"\\\" "
+#| "and escaped characters inside a value is undefined and it should not be "
+#| "used. An option name may include alphanumerical characters and the \"/-:._"
+#| "+\" characters. A new scope can be opened with curly braces, like:"
 msgid ""
 "Syntactically the configuration language is modeled after what the ISC tools "
 "such as bind and dhcp use. Lines starting with <literal>//</literal> are "
 "treated as comments (ignored), as well as all text between <literal>/*</"
 "literal> and <literal>*/</literal>, just like C/C++ comments.  Each line is "
-"of the form <literal>APT::Get::Assume-Yes \"true\";</literal>. The trailing "
-"semicolon and the quotes are required. The value must be on one line, and "
-"there is no kind of string concatenation. It must not include inside "
-"quotes.  The behavior of the backslash \"\\\" and escaped characters inside "
-"a value is undefined and it should not be used. An option name may include "
-"alphanumerical characters and the \"/-:._+\" characters. A new scope can be "
-"opened with curly braces, like:"
+"of the form <literal>APT::Get::Assume-Yes \"true\";</literal>.  The "
+"quotation marks and trailing semicolon are required.  The value must be on "
+"one line, and there is no kind of string concatenation.  Values must not "
+"include backslashes or extra quotation marks.  Option names are made up of "
+"alphanumeric characters and the characters \"/-:._+\".  A new scope can be "
+"opened with curly braces, like this:"
 msgstr ""
 "Syntaktisch ist die Konfigurationssprache dem nachempfunden, was die ISC-"
 "Werkzeuge, wie bind und dhcp, benutzen. Zeilen, die mit <literal>//</"
@@ -3338,7 +3347,7 @@ msgstr ""
 msgid ""
 "with newlines placed to make it more readable. Lists can be created by "
 "opening a scope and including a single string enclosed in quotes followed by "
-"a semicolon. Multiple entries can be included, each separated by a semicolon."
+"a semicolon. Multiple entries can be included, separated by a semicolon."
 msgstr ""
 "mit eingefügten Zeilenumbrüchen, um es leserlicher zu gestalten. Listen "
 "können erstellt werden, indem ein Geltungsbereich geöffnet wird und eine "
@@ -3364,9 +3373,13 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:105
+#, fuzzy
+#| msgid ""
+#| "The names of the configuration items are not case-sensitive. So in the "
+#| "previous example you could use <literal>dpkg::pre-install-pkgs</literal>."
 msgid ""
-"The names of the configuration items are not case-sensitive. So in the "
-"previous example you could use <literal>dpkg::pre-install-pkgs</literal>."
+"Case is not significant in names of configuration items, so in the previous "
+"example you could use <literal>dpkg::pre-install-pkgs</literal>."
 msgstr ""
 "Die Namen der Konfigurationselemente sind nicht von Groß- und "
 "Kleinschreibung abhängig. Deshalb könnten Sie im vorherigen Beispiel auch "
@@ -3375,11 +3388,11 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:108
 msgid ""
-"Names for the configuration items are optional if a list is defined as it "
-"can be see in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. "
-"If you don't specify a name a new entry will simply add a new option to the "
-"list. If you specify a name you can override the option as every other "
-"option by reassigning a new value to the option."
+"Names for the configuration items are optional if a list is defined as can "
+"be seen in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. If "
+"you don't specify a name a new entry will simply add a new option to the "
+"list. If you specify a name you can override the option in the same way as "
+"any other option by reassigning a new value to the option."
 msgstr ""
 "Namen für die Konfigurationselemente sind optional, wenn eine Liste, wie sie "
 "im Beispiel <literal>DPkg::Pre-Install-Pkgs</literal> oberhalb gesehen "
@@ -3390,14 +3403,23 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:113
-msgid ""
-"Two specials are allowed, <literal>#include</literal> (which is deprecated "
-"and not supported by alternative implementations) and <literal>#clear</"
-"literal>: <literal>#include</literal> will include the given file, unless "
-"the filename ends in a slash, then the whole directory is included.  "
-"<literal>#clear</literal> is used to erase a part of the configuration tree. "
-"The specified element and all its descendants are erased.  (Note that these "
-"lines also need to end with a semicolon.)"
+#, fuzzy
+#| msgid ""
+#| "Two specials are allowed, <literal>#include</literal> (which is "
+#| "deprecated and not supported by alternative implementations) and "
+#| "<literal>#clear</literal>: <literal>#include</literal> will include the "
+#| "given file, unless the filename ends in a slash, then the whole directory "
+#| "is included.  <literal>#clear</literal> is used to erase a part of the "
+#| "configuration tree. The specified element and all its descendants are "
+#| "erased.  (Note that these lines also need to end with a semicolon.)"
+msgid ""
+"Two special commands are defined: <literal>#include</literal> (which is "
+"deprecated and not supported by alternative implementations) and "
+"<literal>#clear</literal>. <literal>#include</literal> will include the "
+"given file, unless the filename ends in a slash, in which case the whole "
+"directory is included.  <literal>#clear</literal> is used to erase a part of "
+"the configuration tree. The specified element and all its descendants are "
+"erased.  (Note that these lines also need to end with a semicolon.)"
 msgstr ""
 "Es sind die beiden Spezialfälle <literal>#include</literal> (das missbilligt "
 "ist und von alternativen Implementierungen nicht unterstützt wird) und "
@@ -3409,13 +3431,20 @@ msgstr ""
 "(Beachten Sie, dass diese Zeilen auch mit einem Semikolon enden müssen.)"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:121
-msgid ""
-"The #clear command is the only way to delete a list or a complete scope.  "
-"Reopening a scope or the ::-style described below will <emphasis>not</"
-"emphasis> override previously written entries. Only options can be "
-"overridden by addressing a new value to it - lists and scopes can't be "
-"overridden, only cleared."
+#: apt.conf.5.xml:123
+#, fuzzy
+#| msgid ""
+#| "The #clear command is the only way to delete a list or a complete scope.  "
+#| "Reopening a scope or the ::-style described below will <emphasis>not</"
+#| "emphasis> override previously written entries. Only options can be "
+#| "overridden by addressing a new value to it - lists and scopes can't be "
+#| "overridden, only cleared."
+msgid ""
+"The <literal>#clear</literal> command is the only way to delete a list or a "
+"complete scope. Reopening a scope (or using the syntax described below with "
+"an appended <literal>::</literal>) will <emphasis>not</emphasis> override "
+"previously written entries. Options can only be overridden by addressing a "
+"new value to them - lists and scopes can't be overridden, only cleared."
 msgstr ""
 "Der #clear-Befehl ist der einzige Weg, eine Liste oder einen kompletten "
 "Geltungsbereich zu löschen. Erneutes Öffnen eines Geltungsbereichs oder der "
@@ -3425,39 +3454,54 @@ msgstr ""
 "überschrieben, sondern nur bereinigt werden."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:126
+#: apt.conf.5.xml:131
 msgid ""
-"All of the APT tools take a -o option which allows an arbitrary "
+"All of the APT tools take an -o option which allows an arbitrary "
 "configuration directive to be specified on the command line. The syntax is a "
 "full option name (<literal>APT::Get::Assume-Yes</literal> for instance) "
 "followed by an equals sign then the new value of the option. To append a new "
-"element to a list, add a trailing :: to the name of the list. (As you might "
-"suspect: The scope syntax can't be used on the command line.)"
+"element to a list, add a trailing <literal>::</literal> to the name of the "
+"list.  (As you might suspect, the scope syntax can't be used on the command "
+"line.)"
 msgstr ""
 "Alle APT-Werkzeuge bringen eine Option -o mit, die es einer beliebigen "
 "Konfigurationsdirektiven erlaubt, auf der Befehlszeile angegeben zu werden. "
 "Die Syntax ist ein vollständiger Optionsname (<literal>APT::Get::Assume-Yes</"
 "literal> zum Beispiel), gefolgt von einem Gleichheitszeichen und dann dem "
 "neuen Wert der Option. Um ein neues Element an eine Liste anzuhängen, fügen "
-"Sie ein führendes :: an den Namen der Liste. (Wenn Ihnen das merkwürdig "
-"vorkommt: Die Geltungsbereichs-Syntax kann nicht auf der Befehlszeile "
-"benutzt werden.)"
+"Sie ein führendes <literal>::</literal> an den Namen der Liste. (Wenn Ihnen "
+"das merkwürdig vorkommt: Die Geltungsbereichs-Syntax kann nicht auf der "
+"Befehlszeile benutzt werden.)"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:133
-msgid ""
-"Note that you can use :: only for appending one item per line to a list and "
-"that you should not use it in combination with the scope syntax.  (The scope "
-"syntax implicit insert ::) Using both syntaxes together will trigger a bug "
-"which some users unfortunately depend on: An option with the unusual name "
-"\"<literal>::</literal>\" which acts like every other option with a name. "
-"These introduces many problems including that a user who writes multiple "
-"lines in this <emphasis>wrong</emphasis> syntax in the hope to append to a "
-"list will gain the opposite as only the last assignment for this option "
-"\"<literal>::</literal>\" will be used. Upcoming APT versions will raise "
-"errors and will stop working if they encounter this misuse, so please "
-"correct such statements now as long as APT doesn't complain explicit about "
-"them."
+#: apt.conf.5.xml:139
+#, fuzzy
+#| msgid ""
+#| "Note that you can use :: only for appending one item per line to a list "
+#| "and that you should not use it in combination with the scope syntax.  "
+#| "(The scope syntax implicit insert ::) Using both syntaxes together will "
+#| "trigger a bug which some users unfortunately depend on: An option with "
+#| "the unusual name \"<literal>::</literal>\" which acts like every other "
+#| "option with a name. These introduces many problems including that a user "
+#| "who writes multiple lines in this <emphasis>wrong</emphasis> syntax in "
+#| "the hope to append to a list will gain the opposite as only the last "
+#| "assignment for this option \"<literal>::</literal>\" will be used. "
+#| "Upcoming APT versions will raise errors and will stop working if they "
+#| "encounter this misuse, so please correct such statements now as long as "
+#| "APT doesn't complain explicit about them."
+msgid ""
+"Note that appending items to a list using <literal>::</literal> only works "
+"for one item per line, and that you should not use it in combination with "
+"the scope syntax (which adds <literal>::</literal> implicitly). Using both "
+"syntaxes together will trigger a bug which some users unfortunately depend "
+"on: an option with the unusual name \"<literal>::</literal>\" which acts "
+"like every other option with a name. This introduces many problems; for one "
+"thing, users who write multiple lines in this <emphasis>wrong</emphasis> "
+"syntax in the hope of appending to a list will achieve the opposite, as only "
+"the last assignment for this option \"<literal>::</literal>\" will be used. "
+"Future versions of APT will raise errors and stop working if they encounter "
+"this misuse, so please correct such statements now while APT doesn't "
+"explicitly complain about them."
 msgstr ""
 "Beachten Sie, dass Sie :: nur benutzen können, um ein Element pro Zeile an "
 "eine Liste anzuhängen und dass Sie es nicht nicht in Verbindung mit einer "
@@ -3475,12 +3519,12 @@ msgstr ""
 "sich APT nicht explizit darüber beklagt."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:145
+#: apt.conf.5.xml:154
 msgid "The APT Group"
 msgstr "Die APT-Gruppe"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:146
+#: apt.conf.5.xml:155
 msgid ""
 "This group of options controls general APT behavior as well as holding the "
 "options for all of the tools."
@@ -3489,7 +3533,7 @@ msgstr ""
 "wie es die Optionen für alle Werkzeuge enthält."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:151
+#: apt.conf.5.xml:160
 msgid ""
 "System Architecture; sets the architecture to use when fetching files and "
 "parsing package lists. The internal default is the architecture apt was "
@@ -3500,16 +3544,26 @@ msgstr ""
 "die Architektur für die APT kompiliert wurde."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:157
-msgid ""
-"All Architectures the system supports. Processors implementing the "
-"<literal>amd64</literal> (also called <literal>x86-64</literal>) instruction "
-"set are e.g. also able to execute binaries compiled for the <literal>i386</"
-"literal> (<literal>x86</literal>) instruction set; 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>."
+#: apt.conf.5.xml:167
+#, fuzzy
+#| msgid ""
+#| "All Architectures the system supports. Processors implementing the "
+#| "<literal>amd64</literal> (also called <literal>x86-64</literal>) "
+#| "instruction set are e.g. also able to execute binaries compiled for the "
+#| "<literal>i386</literal> (<literal>x86</literal>) instruction set; 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>."
+msgid ""
+"All Architectures the system supports. For instance, CPUs implementing the "
+"<literal>amd64</literal> (also called <literal>x86-64</literal>)  "
+"instruction set are also able to execute binaries compiled for the "
+"<literal>i386</literal> (<literal>x86</literal>) instruction set. This list "
+"is used when fetching files and parsing package lists. The initial default "
+"is always the system's native architecture (<literal>APT::Architecture</"
+"literal>), and foreign architectures are added to the default list when they "
+"are registered via <command>dpkg --add-architecture</command>."
 msgstr ""
 "alle Architekturen, die das System unterstützt. Prozessoren, die "
 "<literal>amd64</literal>-Befehlssätze implementieren (auch <literal>x86-64</"
@@ -3522,12 +3576,12 @@ msgstr ""
 "architectures</command> abgefragt werden können."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:167
+#: apt.conf.5.xml:180
 msgid ""
-"Default release to install packages from if more than one version available. "
-"Contains release name, codename or release version. Examples: 'stable', "
-"'testing', 'unstable', '&stable-codename;', '&testing-codename;', '4.0', "
-"'5.0*'. See also &apt-preferences;."
+"Default release to install packages from if more than one version is "
+"available. Contains release name, codename or release version. Examples: "
+"'stable', 'testing', 'unstable', '&stable-codename;', '&testing-codename;', "
+"'4.0', '5.0*'. See also &apt-preferences;."
 msgstr ""
 "Standard-Release von dem Pakete installiert werden, wenn mehr als eine "
 "Version verfügbar ist. Enthält Release-Name, Codename oder Release-Version. "
@@ -3535,16 +3589,16 @@ msgstr ""
 "codename;«, »4.0«, »5.0*«. Siehe auch &apt-preferences;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:173
+#: apt.conf.5.xml:186
 msgid ""
-"Ignore Held packages; This global option causes the problem resolver to "
+"Ignore held packages; this global option causes the problem resolver to "
 "ignore held packages in its decision making."
 msgstr ""
 "Halten von Paketen ignorieren. Diese globale Option veranlasst den "
 "Problemlöser, gehaltene Pakete beim Treffen von Entscheidungen zu ignorieren."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:178
+#: apt.conf.5.xml:191
 msgid ""
 "Defaults to on. When turned on the autoclean feature will remove any "
 "packages which can no longer be downloaded from the cache. If turned off "
@@ -3559,110 +3613,114 @@ msgstr ""
 "Möglichkeiten bereitstellt, um sie erneut zu installieren."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:185
-msgid ""
-"Defaults to on which will cause APT to install essential and important "
-"packages as fast as possible in the install/upgrade operation. This is done "
-"to limit the effect of a failing &dpkg; call: If this option is disabled APT "
-"does treat an important package in the same way as an extra package: Between "
-"the unpacking of the important package A and his configuration can then be "
-"many other unpack or configuration calls, e.g. for package B which has no "
-"relation to A, but causes the dpkg call to fail (e.g. because maintainer "
-"script of package B generates an error) which results in a system state in "
-"which package A is unpacked but unconfigured - each package depending on A "
-"is now no longer guaranteed to work as their dependency on A is not longer "
-"satisfied. The immediate configuration marker is also applied to all "
-"dependencies which can generate a problem if the dependencies e.g. form a "
-"circle as a dependency with the immediate flag is comparable with a Pre-"
-"Dependency. So in theory it is possible that APT encounters a situation in "
-"which it is unable to perform immediate configuration, errors out and refers "
-"to this option so the user can deactivate the immediate configuration "
-"temporarily to be able to perform an install/upgrade again. Note the use of "
-"the word \"theory\" here as this problem was only encountered by now in real "
-"world a few times in non-stable distribution versions and was caused by "
-"wrong dependencies of the package in question or by a system in an already "
-"broken state, so you should not blindly disable this option as the mentioned "
-"scenario above is not the only problem immediate configuration can help to "
-"prevent in the first place.  Before a big operation like <literal>dist-"
-"upgrade</literal> is run with this option disabled it should be tried to "
-"explicitly <literal>install</literal> the package APT is unable to configure "
-"immediately, but please make sure to report your problem also to your "
-"distribution and to the APT team with the buglink below so they can work on "
-"improving or correcting the upgrade process."
-msgstr ""
-"standardmäßig »on«, wodurch APT veranlasst wird, »essential«- oder "
-"»important«-Pakete so schnell wie möglich in der »install«-/»upgrade«-"
-"Operation zu installieren. Dies wird getan, um den Effekt eines "
-"gescheiterterten &dpkg;-Aufrufs zu begrenzen: Wenn diese Option "
-"ausgeschaltet ist, behandelt APT ein »important«-Paket auf die gleiche Weise "
-"wie ein »extra«-Paket: Zwischen dem Entpacken des »important«-Pakets A und "
-"seiner Konfiguration können dann viele andere Entpack- oder "
-"Konfigurationsaufrufe liegen, z.B. für Paket B, das keine Beziehung zu A "
-"hat, aber den dpkg-Aufruf zum Scheitern bringt (z.B. weil das Betreuerskript "
-"von Paket B Fehler generiert), die als Ergebnis einen Systemstatus haben, in "
-"dem Paket A entpackt, aber nicht konfiguriert ist und für kein von A "
-"abhängendes Paket länger gewährleistet ist, dass es funktioniert, weil die "
-"Abhängigkeit zu A nicht länger befriedigt wird. Das unmittelbare "
-"Konfigurationskennzeichen wird außerdem auf alle Abhängigkeiten angewandt, "
-"was zu einem Problem führen könnten, falls die Abhängigkeiten z.B. einen "
-"Kreis bilden, so dass eine Abhängigkeit mit der Unmittelbarmarkierung mit "
-"einer Vorabhängigkeit vergleichbar ist. So ist es theoretisch möglich, dass "
-"APT einer Situation begegnet, in der keine unmittelbare Konfiguration "
-"durchgeführt, ein Fehler ausgegeben und sich auf diese Option bezogen werden "
-"kann, so dass der Anwender die unmittelbare Konfiguration zeitweise "
-"deaktivieren kann, um in der Lage zu sein, erneut ein »install«/»upgrade« "
-"durchzuführen. Beachten Sie, dass hier das Wort »theoretisch« benutzt wird, "
-"denn dieses Problem ist bis jetzt in der Realität nur ein paar mal in "
-"unstabilen Distributionsversionen aufgetreten und wurde durch falsche "
-"Abhängigkeiten des fraglichen Pakets ausgelöst oder durch ein System in "
-"bereits kaputtem Status, so dass Sie diese Option nicht unbesehen abschalten "
-"sollten, da das oben erwähnte Szenario nicht das einzige unmittelbare "
-"Problem ist, das die Konfiguration überhaupt verhindern sollte. Bevor eine "
-"große Operation wie <literal>dist-upgrade</literal> mit dieser "
-"ausgeschalteten Option ausgeführt wird, sollte explizit versucht werden, "
-"<literal>install</literal> des Pakets durchzuführen. APT ist nicht in der "
-"Lage unmittelbar zu konfigurieren, aber stellen Sie sicher, dass Sie Ihr "
-"Problem außerdem an Ihre Distribution und an das APT-Team berichten mit "
-"nachstehendem Fehlerverweis, so dass es am Verbessern oder Korrigieren des "
-"Upgrade-Prozesses arbeiten kann."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:208
-msgid ""
-"Never Enable this option unless you -really- know what you are doing. It "
-"permits APT to temporarily remove an essential package to break a Conflicts/"
-"Conflicts or Conflicts/Pre-Depend loop between two essential packages. SUCH "
-"A LOOP SHOULD NEVER EXIST AND IS A GRAVE BUG. This option will work if the "
-"essential packages are not tar, gzip, libc, dpkg, bash or anything that "
-"those packages depend on."
-msgstr ""
-"Schalten Sie diese Option niemals ein, außer wenn Sie -wirklich- wissen, was "
-"Sie tun. Es erlaubt APT temporär ein essentielles Paket zu entfernen, um "
-"eine Conflicts/Conflicts- oder Conflicts/Pre-Depend-Schleife zwischen zwei "
-"essentiellen Paketen zu unterbrechen. SOLCH EINE SCHLEIFE SOLLTE NIEMALS "
-"EXISTIEREN UND IST EIN SCHWERWIEGENDER FEHLER. Diese Option wird "
-"funktionieren, wenn die essentiellen Pakete nicht tar, gzip, libc, dpkg, "
-"bash oder etwas, was davon abhängt, sind."
-
-# FIXME s/These value/This value/

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:217
+#: apt.conf.5.xml:199
+msgid ""
+"Defaults to on, which will cause APT to install essential and important "
+"packages as soon as possible in an install/upgrade operation, in order to "
+"limit the effect of a failing &dpkg; call. If this option is disabled, APT "
+"treats an important package in the same way as an extra package: between the "
+"unpacking of the package A and its configuration there can be many other "
+"unpack or configuration calls for other unrelated packages B, C etc. If "
+"these cause the &dpkg; call to fail (e.g. because package B's maintainer "
+"scripts generate an error), this results in a system state in which package "
+"A is unpacked but unconfigured - so any package depending on A is now no "
+"longer guaranteed to work, as its dependency on A is no longer satisfied."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:211
+msgid ""
+"The immediate configuration marker is also applied in the potentially "
+"problematic case of circular dependencies, since a dependency with the "
+"immediate flag is equivalent to a Pre-Dependency. In theory this allows APT "
+"to recognise a situation in which it is unable to perform immediate "
+"configuration, abort, and suggest to the user that the option should be "
+"temporarily deactivated in order to allow the operation to proceed.  Note "
+"the use of the word \"theory\" here; in the real world this problem has "
+"rarely been encountered, in non-stable distribution versions, and was caused "
+"by wrong dependencies of the package in question or by a system in an "
+"already broken state; so you should not blindly disable this option, as the "
+"scenario mentioned above is not the only problem it can help to prevent in "
+"the first place."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:224
+msgid ""
+"Before a big operation like <literal>dist-upgrade</literal> is run with this "
+"option disabled you should try to explicitly <literal>install</literal> the "
+"package APT is unable to configure immediately; but please make sure you "
+"also report your problem to your distribution and to the APT team with the "
+"buglink below, so they can work on improving or correcting the upgrade "
+"process."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:235
+#, fuzzy
+#| msgid ""
+#| "Never Enable this option unless you -really- know what you are doing. It "
+#| "permits APT to temporarily remove an essential package to break a "
+#| "Conflicts/Conflicts or Conflicts/Pre-Depend loop between two essential "
+#| "packages. SUCH A LOOP SHOULD NEVER EXIST AND IS A GRAVE BUG. This option "
+#| "will work if the essential packages are not tar, gzip, libc, dpkg, bash "
+#| "or anything that those packages depend on."
+msgid ""
+"Never enable this option unless you <emphasis>really</emphasis> know what "
+"you are doing. It permits APT to temporarily remove an essential package to "
+"break a Conflicts/Conflicts or Conflicts/Pre-Depends loop between two "
+"essential packages. <emphasis>Such a loop should never exist and is a grave "
+"bug</emphasis>. This option will work if the essential packages are not "
+"<command>tar</command>, <command>gzip</command>, <command>libc</command>, "
+"<command>dpkg</command>, <command>dash</command> or anything that those "
+"packages depend on."
+msgstr ""
+"Schalten Sie diese Option niemals ein, außer wenn Sie <emphasis>wirklich</"
+"emphasis> wissen, was Sie tun. Es erlaubt APT temporär ein essentielles "
+"Paket zu entfernen, um eine Conflicts/Conflicts- oder Conflicts/Pre-Depends-"
+"Schleife zwischen zwei essentiellen Paketen zu unterbrechen. <emphasis>Solch "
+"eine Schleife sollte niemals existieren und ist ein schwerwiegender Fehler</"
+"emphasis>. Diese Option wird funktionieren, wenn die essentiellen Pakete "
+"nicht <command>tar</command>, <command>gzip</command>, <command>libc</"
+"command>, <command>dpkg</command>, <command>dash</command> oder etwas, was "
+"davon abhängt, sind."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:247
+#, fuzzy
+#| msgid ""
+#| "APT uses since version 0.7.26 a resizable memory mapped cache file to "
+#| "store the 'available' information. <literal>Cache-Start</literal> acts as "
+#| "a hint to which size the Cache will grow and is therefore the amount of "
+#| "memory APT will request at startup. The default value is 20971520 bytes "
+#| "(~20 MB). Note that this amount of space needs to be available for APT "
+#| "otherwise it will likely fail ungracefully, so for memory restricted "
+#| "devices this value should be lowered while on systems with a lot of "
+#| "configured sources it should be increased.  <literal>Cache-Grow</literal> "
+#| "defines in bytes with the default of 1048576 (~1 MB) how much the Cache "
+#| "size will be increased in the event the space defined by <literal>Cache-"
+#| "Start</literal> is not enough. These value will be applied again and "
+#| "again until either the cache is big enough to store all information or "
+#| "the size of the cache reaches the <literal>Cache-Limit</literal>.  The "
+#| "default of <literal>Cache-Limit</literal> is 0 which stands for no "
+#| "limit.  If <literal>Cache-Grow</literal> is set to 0 the automatic grow "
+#| "of the cache is disabled."
 msgid ""
 "APT uses since version 0.7.26 a resizable memory mapped cache file to store "
-"the 'available' information. <literal>Cache-Start</literal> acts as a hint "
-"to which size the Cache will grow and is therefore the amount of memory APT "
+"the available information. <literal>Cache-Start</literal> acts as a hint of "
+"the size the cache will grow to, and is therefore the amount of memory APT "
 "will request at startup. The default value is 20971520 bytes (~20 MB). Note "
-"that this amount of space needs to be available for APT otherwise it will "
+"that this amount of space needs to be available for APT; otherwise it will "
 "likely fail ungracefully, so for memory restricted devices this value should "
 "be lowered while on systems with a lot of configured sources it should be "
 "increased.  <literal>Cache-Grow</literal> defines in bytes with the default "
-"of 1048576 (~1 MB) how much the Cache size will be increased in the event "
-"the space defined by <literal>Cache-Start</literal> is not enough. These "
+"of 1048576 (~1 MB) how much the cache size will be increased in the event "
+"the space defined by <literal>Cache-Start</literal> is not enough. This "
 "value will be applied again and again until either the cache is big enough "
 "to store all information or the size of the cache reaches the <literal>Cache-"
 "Limit</literal>.  The default of <literal>Cache-Limit</literal> is 0 which "
 "stands for no limit.  If <literal>Cache-Grow</literal> is set to 0 the "
-"automatic grow of the cache is disabled."
+"automatic growth of the cache is disabled."
 msgstr ""
 "APT benutzt seit Version 0.7.26 eine Zwischenspeicherdatei für "
 "Speicherabbilder mit veränderlicher Größe um »verfügbare« Informationen zu "
@@ -3683,16 +3741,19 @@ msgstr ""
 "auf 0 gesetzt ist, kann der Zwischenspeicher nicht automatisch wachsen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:233
-msgid "Defines which package(s) are considered essential build dependencies."
+#: apt.conf.5.xml:263
+#, fuzzy
+#| msgid ""
+#| "Defines which package(s) are considered essential build dependencies."
+msgid "Defines which packages are considered essential build dependencies."
 msgstr ""
 "definiert, welche(s) Paket(e) als essentielle Bauabhängigkeiten betrachtet "
 "werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:237
+#: apt.conf.5.xml:267
 msgid ""
-"The Get subsection controls the &apt-get; tool, please see its documentation "
+"The Get subsection controls the &apt-get; tool; please see its documentation "
 "for more information about the options here."
 msgstr ""
 "Der Get-Unterabschnitt steuert das &apt-get;-Werkzeug. Lesen Sie bitte "
@@ -3700,9 +3761,9 @@ msgstr ""
 "erhalten."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:242
+#: apt.conf.5.xml:272
 msgid ""
-"The Cache subsection controls the &apt-cache; tool, please see its "
+"The Cache subsection controls the &apt-cache; tool; please see its "
 "documentation for more information about the options here."
 msgstr ""
 "Der Cache-Unterabschnitt steuert das &apt-cache;-Werkzeug. Lesen Sie bitte "
@@ -3710,9 +3771,9 @@ msgstr ""
 "erhalten."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:247
+#: apt.conf.5.xml:277
 msgid ""
-"The CDROM subsection controls the &apt-cdrom; tool, please see its "
+"The CDROM subsection controls the &apt-cdrom; tool; please see its "
 "documentation for more information about the options here."
 msgstr ""
 "Der CDROM-Unterabschnitt steuert das &apt-cdrom;-Werkzeug. Lesen Sie bitte "
@@ -3720,29 +3781,44 @@ msgstr ""
 "erhalten."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:253
+#: apt.conf.5.xml:283
 msgid "The Acquire Group"
 msgstr "Die Erwerbgruppe"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:254
+#: apt.conf.5.xml:284
+#, fuzzy
+#| msgid ""
+#| "The <literal>Acquire</literal> group of options controls the download of "
+#| "packages and the URI handlers."
 msgid ""
 "The <literal>Acquire</literal> group of options controls the download of "
-"packages and the URI handlers."
+"packages as well as the various \"acquire methods\" responsible for the "
+"download itself (see also &sources-list;)."
 msgstr ""
 "Die <literal>Acquire</literal>-Gruppe der Optionen steuert das Herunterladen "
 "von Paketen und die URI-Steuerprogramme."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:259
-msgid ""
-"Security related option defaulting to true as an expiring validation for a "
-"Release file prevents longtime replay attacks and can e.g. also help users "
-"to identify no longer updated mirrors - but the feature depends on the "
-"correctness of the time on the user system.  Archive maintainers are "
-"encouraged to create Release files with the <literal>Valid-Until</literal> "
-"header, but if they don't or a stricter value is volitional the following "
-"<literal>Max-ValidTime</literal> option can be used."
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:291
+#, fuzzy
+#| msgid ""
+#| "Security related option defaulting to true as an expiring validation for "
+#| "a Release file prevents longtime replay attacks and can e.g. also help "
+#| "users to identify no longer updated mirrors - but the feature depends on "
+#| "the correctness of the time on the user system.  Archive maintainers are "
+#| "encouraged to create Release files with the <literal>Valid-Until</"
+#| "literal> header, but if they don't or a stricter value is volitional the "
+#| "following <literal>Max-ValidTime</literal> option can be used."
+msgid ""
+"Security related option defaulting to true, as giving a Release file's "
+"validation an expiration date prevents replay attacks over a long timescale, "
+"and can also for example help users to identify mirrors that are no longer "
+"updated - but the feature depends on the correctness of the clock on the "
+"user system. Archive maintainers are encouraged to create Release files with "
+"the <literal>Valid-Until</literal> header, but if they don't or a stricter "
+"value is desired the <literal>Max-ValidTime</literal> option below can be "
+"used."
 msgstr ""
 "Die sicherheitsbezogene Option wird als »true« vorgegeben, da eine "
 "verfallende Überprüfung für eine Release-Datei langzeitige "
@@ -3754,15 +3830,25 @@ msgstr ""
 "ein strengerer Wert gewollt ist, kann die Option <literal>Max-ValidTime</"
 "literal> benutzt werden."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:270
-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 valid\".  Archive specific settings can "
-"be made by appending the label of the archive to the option name."
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:304
+#, fuzzy
+#| 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 valid\".  Archive "
+#| "specific settings can be made by appending the label of the archive to "
+#| "the option name."
+msgid ""
+"Maximum time (in seconds) after its creation (as indicated by the "
+"<literal>Date</literal> header) that the <filename>Release</filename> file "
+"should be considered valid.  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 \"valid forever\".  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 (angezeigt durch die Kopfzeile <literal>Date</literal>). "
@@ -3772,15 +3858,25 @@ msgstr ""
 "Archivspezifische Einstellungen können durch Anhängen des Archivetiketts an "
 "den Optionsnamen vorgenommen werden."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:281
-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."
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:316
+#, fuzzy
+#| 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."
+msgid ""
+"Minimum time (in seconds) after its creation (as indicated by the "
+"<literal>Date</literal> header) that the <filename>Release</filename> file "
+"should be considered valid.  Use this if you need to use a seldom updated "
+"(local) mirror of a more frequently 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 ""
 "minimale Anzahl der Sekunden, die die Release-Datei als gültig betrachtet "
 "werden sollte, nachdem sie erzeugt wurde (angezeigt durch die Kopfzeile "
@@ -3791,25 +3887,38 @@ msgstr ""
 "Einstellungen können und sollten durch Anhängen des Archivetiketts an den "
 "Optionsnamen vorgenommen werden."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:292
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:328
+#, fuzzy
+#| msgid ""
+#| "Try to download deltas called <literal>PDiffs</literal> for Packages or "
+#| "Sources files instead of downloading whole ones. True by default."
 msgid ""
-"Try to download deltas called <literal>PDiffs</literal> for Packages or "
-"Sources files instead of downloading whole ones. True by default."
+"Try to download deltas called <literal>PDiffs</literal> for indexes (like "
+"<filename>Packages</filename> files) instead of downloading whole ones. True "
+"by default."
 msgstr ""
 "versucht Deltas, die <literal>PDiffs</literal> genannt werden, für Paket- "
 "oder Quelldateien herunterzuladen, statt der kompletten Dateien. Vorgabe ist "
 "True."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:295
-msgid ""
-"Two sub-options to limit the use of PDiffs are also available: With "
-"<literal>FileLimit</literal> can be specified how many PDiff files are "
-"downloaded at most to update a file. <literal>SizeLimit</literal> on the "
-"other hand is the maximum percentage of the size of all patches compared to "
-"the size of the targeted file. If one of these limits is exceeded the "
-"complete file is downloaded instead of the patches."
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:331
+#, fuzzy
+#| msgid ""
+#| "Two sub-options to limit the use of PDiffs are also available: With "
+#| "<literal>FileLimit</literal> can be specified how many PDiff files are "
+#| "downloaded at most to update a file. <literal>SizeLimit</literal> on the "
+#| "other hand is the maximum percentage of the size of all patches compared "
+#| "to the size of the targeted file. If one of these limits is exceeded the "
+#| "complete file is downloaded instead of the patches."
+msgid ""
+"Two sub-options to limit the use of PDiffs are also available: "
+"<literal>FileLimit</literal> can be used to specify a maximum number of "
+"PDiff files should be downloaded to update a file. <literal>SizeLimit</"
+"literal> on the other hand is the maximum percentage of the size of all "
+"patches compared to the size of the targeted file. If one of these limits is "
+"exceeded the complete file is downloaded instead of the patches."
 msgstr ""
 "Es sind außerdem zwei Unteroptionen verfügbar, um die Benutzung von PDiffs "
 "zu begrenzen: Mit <literal>FileLimit</literal> kann angegeben werden, wie "
@@ -3819,8 +3928,8 @@ msgstr ""
 "dieser Begrenzungen überschritten wird, wird die komplette Datei anstelle "
 "der Patche heruntergeladen."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:305
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:341
 msgid ""
 "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
 "literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -3835,8 +3944,8 @@ msgstr ""
 "geöffnet wird, <literal>access</literal> bedeutet, dass eine Verbindung pro "
 "URI-Art geöffnet wird."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:313
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:349
 msgid ""
 "Number of retries to perform. If this is non-zero APT will retry failed "
 "files the given number of times."
@@ -3844,8 +3953,8 @@ msgstr ""
 "Anzahl der auszuführenden erneuten Versuche. Wenn dies nicht Null ist, wird "
 "APT fehlgeschlagene Dateien in der angegebenen Zahl erneut versuchen."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:318
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:354
 msgid ""
 "Use symlinks for source archives. If set to true then source archives will "
 "be symlinked when possible instead of copying. True is the default."
@@ -3854,15 +3963,24 @@ msgstr ""
 "ist, werden Quellarchive, wenn möglich, symbolisch verknüpft, anstatt "
 "kopiert zu werden. True ist die Vorgabe."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:323
-msgid ""
-"HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
-"standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per "
-"host proxies can also be specified by using the form <literal>http::Proxy::"
-"&lt;host&gt;</literal> with the special keyword <literal>DIRECT</literal> "
-"meaning to use no proxies. If no one of the above settings is specified, "
-"<envar>http_proxy</envar> environment variable will be used."
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:359
+#, fuzzy
+#| msgid ""
+#| "HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
+#| "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. "
+#| "Per host proxies can also be specified by using the form <literal>http::"
+#| "Proxy::&lt;host&gt;</literal> with the special keyword <literal>DIRECT</"
+#| "literal> meaning to use no proxies. If no one of the above settings is "
+#| "specified, <envar>http_proxy</envar> environment variable will be used."
+msgid ""
+"<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. "
+"It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</"
+"literal>.  Per host proxies can also be specified by using the form "
+"<literal>http::Proxy::&lt;host&gt;</literal> with the special keyword "
+"<literal>DIRECT</literal> meaning to use no proxies. If no one of the above "
+"settings is specified, <envar>http_proxy</envar> environment variable will "
+"be used."
 msgstr ""
 "HTTP-URIs; http::Proxy ist der zu benutzende Standard-HTTP-Proxy. Er wird "
 "standardmäßig in der Form <literal>http://[[Anwender][:Passwort]@]Host[:"
@@ -3872,18 +3990,27 @@ msgstr ""
 "benutzt werden. Falls keine der obigen Einstellungen angegeben wurde, wird "
 "die Umgebungsvariable <envar>http_proxy</envar> benutzt."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:331
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:367
+#, fuzzy
+#| msgid ""
+#| "Three settings are provided for cache control with HTTP/1.1 compliant "
+#| "proxy caches. <literal>No-Cache</literal> tells the proxy to not use its "
+#| "cached response under any circumstances, <literal>Max-Age</literal> is "
+#| "sent only for index files and tells the cache to refresh its object if it "
+#| "is older than the given number of seconds. Debian updates its index files "
+#| "daily so the default is 1 day. <literal>No-Store</literal> specifies that "
+#| "the cache should never store this request, it is only set for archive "
+#| "files. This may be useful to prevent polluting a proxy cache with very "
+#| "large .deb files. Note: Squid 2.0.2 does not support any of these options."
 msgid ""
 "Three settings are provided for cache control with HTTP/1.1 compliant proxy "
-"caches. <literal>No-Cache</literal> tells the proxy to not use its cached "
-"response under any circumstances, <literal>Max-Age</literal> is sent only "
-"for index files and tells the cache to refresh its object if it is older "
-"than the given number of seconds. Debian updates its index files daily so "
-"the default is 1 day. <literal>No-Store</literal> specifies that the cache "
-"should never store this request, it is only set for archive files. This may "
-"be useful to prevent polluting a proxy cache with very large .deb files. "
-"Note: Squid 2.0.2 does not support any of these options."
+"caches.  <literal>No-Cache</literal> tells the proxy not to use its cached "
+"response under any circumstances.  <literal>Max-Age</literal> sets the "
+"allowed maximum age (in seconds) of an index file in the cache of the "
+"proxy.  <literal>No-Store</literal> specifies that the proxy should not "
+"store the requested archive files in its cache, which can be used to prevent "
+"the proxy from polluting its cache with (big) .deb files."
 msgstr ""
 "Für die Steuerung des Zwischenspeichers mit HTTP/1.1-konformen Proxy-"
 "Zwischenspeichern stehen drei Einstellungen zur Verfügung. <literal>No-"
@@ -3898,23 +4025,27 @@ msgstr ""
 "mit sehr großen .deb-Dateien zu verhindern. Beachten Sie: Squid 2.0.2 "
 "unterstützt keine dieser Optionen."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:341 apt.conf.5.xml:407
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:377 apt.conf.5.xml:449
+#, fuzzy
+#| msgid ""
+#| "The option <literal>timeout</literal> sets the timeout timer used by the "
+#| "method; this applies to all things including connection timeout and data "
+#| "timeout."
 msgid ""
 "The option <literal>timeout</literal> sets the timeout timer used by the "
-"method, this applies to all things including connection timeout and data "
-"timeout."
+"method; this value applies to the connection as well as the data timeout."
 msgstr ""
 "Die Option <literal>timeout</literal> stellt den Zeitnehmer für die "
 "Zeitüberschreitung ein, die von der Methode benutzt wird. Dies wird auf alle "
 "Dinge, einschließlich Verbindungs- und Datenzeitüberschreitungen, angewandt."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:344
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:380
 msgid ""
 "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
-"enabled HTTP pipeling (RFC 2616 section 8.1.2.2) which can be beneficial e."
-"g. on high-latency connections. It specifies how many requests are send in a "
+"enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
+"g. on high-latency connections. It specifies how many requests are sent in a "
 "pipeline.  Previous APT versions had a default of 10 for this setting, but "
 "the default value is now 0 (= disabled) to avoid problems with the ever-"
 "growing amount of webservers and proxies which choose to not conform to the "
@@ -3929,23 +4060,30 @@ msgstr ""
 "anwachsenden Zahl von Webservern und Proxies zu vermeiden, die nicht der "
 "HTTP/1.1-Spezifikation entsprechen."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:351
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:387
 msgid ""
-"<literal>Acquire::http::AllowRedirect</literal> controls if APT will follow "
-"redirects, which is enabled by default."
+"<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
+"follow redirects, which is enabled by default."
 msgstr ""
 "<literal>Acquire::http::AllowRedirect</literal> steuert, ob APT Umleitungen "
 "folgen wird, was standardmäßig aktiviert ist."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:354
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:390
+#, fuzzy
+#| msgid ""
+#| "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
+#| "literal> which accepts integer values in kilobytes. The default value is "
+#| "0 which deactivates the limit and tries uses as much as possible of the "
+#| "bandwidth (Note that this option implicit deactivates the download from "
+#| "multiple servers at the same time.)"
 msgid ""
 "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
-"literal> which accepts integer values in kilobyte. The default value is 0 "
-"which deactivates the limit and tries uses as much as possible of the "
-"bandwidth (Note that this option implicit deactivates the download from "
-"multiple servers at the same time.)"
+"literal> which accepts integer values in kilobytes. The default value is 0 "
+"which deactivates the limit and tries to use all available bandwidth (note "
+"that this option implicitly disables downloading from multiple servers at "
+"the same time.)"
 msgstr ""
 "Die benutzte Bandbreite kann durch <literal>Acquire::http::Dl-Limit</"
 "literal> eingeschränkt werden, was Ganzzahlwerte in Kilobyte akzeptiert. Der "
@@ -3954,8 +4092,8 @@ msgstr ""
 "implizit das Herunterladen von mehreren Servern zur gleichen Zeit "
 "deaktiviert.)"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:359
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:395
 msgid ""
 "<literal>Acquire::http::User-Agent</literal> can be used to set a different "
 "User-Agent for the http download method as some proxies allow access for "
@@ -3966,14 +4104,22 @@ msgstr ""
 "einige Proxys den Clients nur dann Zugriff gewähren, wenn der Client einen "
 "bekannten Bezeichner verwendet."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:366
-msgid ""
-"HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
-"options are the same as for <literal>http</literal> method and will also "
-"default to the options from the <literal>http</literal> method if they are "
-"not explicitly set for https. <literal>Pipeline-Depth</literal> option is "
-"not supported yet."
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:403
+#, fuzzy
+#| msgid ""
+#| "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
+#| "options are the same as for <literal>http</literal> method and will also "
+#| "default to the options from the <literal>http</literal> method if they "
+#| "are not explicitly set for https. <literal>Pipeline-Depth</literal> "
+#| "option is not supported yet."
+msgid ""
+"The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
+"<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
+"<literal>proxy</literal> options work for HTTPS URIs in the same way as for "
+"the <literal>http</literal> method, and default to the same values if they "
+"are not explicitly set. The <literal>Pipeline-Depth</literal> option is not "
+"yet supported."
 msgstr ""
 "HTTPS-URIs. Zwischenspeichersteuerung-, Zeitüberschreitung-, AllowRedirect-, "
 "Dl-Limit- und Proxy-Optionen entsprechen denen der <literal>http</literal>-"
@@ -3981,25 +4127,44 @@ msgstr ""
 "vorgegeben, falls sie nicht explizit für HTTPS gesetzt sind. Die Option "
 "<literal>Pipeline-Depth</literal> wird noch nicht unterstützt."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:372
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:411
+#, fuzzy
+#| msgid ""
+#| "<literal>CaInfo</literal> suboption specifies place of file that holds "
+#| "info about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> "
+#| "is the corresponding per-host option.  <literal>Verify-Peer</literal> "
+#| "boolean suboption determines whether verify server's host certificate "
+#| "against trusted certificates or not.  <literal>&lt;host&gt;::Verify-Peer</"
+#| "literal> is the corresponding per-host option.  <literal>Verify-Host</"
+#| "literal> boolean suboption determines whether verify server's hostname or "
+#| "not.  <literal>&lt;host&gt;::Verify-Host</literal> is the corresponding "
+#| "per-host option.  <literal>SslCert</literal> determines what certificate "
+#| "to use for client authentication. <literal>&lt;host&gt;::SslCert</"
+#| "literal> is the corresponding per-host option.  <literal>SslKey</literal> "
+#| "determines what private key to use for client authentication. "
+#| "<literal>&lt;host&gt;::SslKey</literal> is the corresponding per-host "
+#| "option.  <literal>SslForceVersion</literal> overrides default SSL version "
+#| "to use.  Can contain 'TLSv1' or 'SSLv3' string.  <literal>&lt;host&gt;::"
+#| "SslForceVersion</literal> is the corresponding per-host option."
 msgid ""
 "<literal>CaInfo</literal> suboption specifies place of file that holds info "
-"about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is "
+"about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is the "
 "corresponding per-host option.  <literal>Verify-Peer</literal> boolean "
-"suboption determines whether verify server's host certificate against "
-"trusted certificates or not.  <literal>&lt;host&gt;::Verify-Peer</literal> "
-"is corresponding per-host option.  <literal>Verify-Host</literal> boolean "
-"suboption determines whether verify server's hostname or not.  <literal>&lt;"
-"host&gt;::Verify-Host</literal> is corresponding per-host option.  "
-"<literal>SslCert</literal> determines what certificate to use for client "
-"authentication. <literal>&lt;host&gt;::SslCert</literal> is corresponding "
-"per-host option.  <literal>SslKey</literal> determines what private key to "
-"use for client authentication. <literal>&lt;host&gt;::SslKey</literal> is "
-"corresponding per-host option.  <literal>SslForceVersion</literal> overrides "
-"default SSL version to use.  Can contain 'TLSv1' or 'SSLv3' string.  "
-"<literal>&lt;host&gt;::SslForceVersion</literal> is corresponding per-host "
-"option."
+"suboption determines whether or not the server's host certificate should be "
+"verified against trusted certificates.  <literal>&lt;host&gt;::Verify-Peer</"
+"literal> is the corresponding per-host option.  <literal>Verify-Host</"
+"literal> boolean suboption determines whether or not the server's hostname "
+"should be verified.  <literal>&lt;host&gt;::Verify-Host</literal> is the "
+"corresponding per-host option.  <literal>SslCert</literal> determines what "
+"certificate to use for client authentication. <literal>&lt;host&gt;::"
+"SslCert</literal> is the corresponding per-host option.  <literal>SslKey</"
+"literal> determines what private key to use for client authentication. "
+"<literal>&lt;host&gt;::SslKey</literal> is the corresponding per-host "
+"option.  <literal>SslForceVersion</literal> overrides default SSL version to "
+"use.  It can contain either of the strings '<literal>TLSv1</literal>' or "
+"'<literal>SSLv3</literal>'.  <literal>&lt;host&gt;::SslForceVersion</"
+"literal> is the corresponding per-host option."
 msgstr ""
 "Die Unteroption <literal>CaInfo</literal> gibt den Ort an, an dem "
 "Informationen über vertrauenswürdige Zertifikate bereitgehalten werden. "
@@ -4020,23 +4185,39 @@ msgstr ""
 "Zeichenketten »TLSv1« oder »SSLv3« enthalten. <literal>&lt;host&gt;::"
 "SslForceVersion</literal> ist die entsprechende per-Host-Option."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:391
-msgid ""
-"FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard "
-"form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host "
-"proxies can also be specified by using the form <literal>ftp::Proxy::&lt;"
-"host&gt;</literal> with the special keyword <literal>DIRECT</literal> "
-"meaning to use no proxies. If no one of the above settings is specified, "
-"<envar>ftp_proxy</envar> environment variable will be used. To use a ftp "
-"proxy you will have to set the <literal>ftp::ProxyLogin</literal> script in "
-"the configuration file. This entry specifies the commands to send to tell "
-"the proxy server what to connect to. Please see &configureindex; for an "
-"example of how to do this. The substitution variables available are <literal>"
-"$(PROXY_USER)</literal> <literal>$(PROXY_PASS)</literal> <literal>"
-"$(SITE_USER)</literal> <literal>$(SITE_PASS)</literal> <literal>$(SITE)</"
-"literal> and <literal>$(SITE_PORT)</literal> Each is taken from it's "
-"respective URI component."
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:432
+#, fuzzy
+#| msgid ""
+#| "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the "
+#| "standard form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. "
+#| "Per host proxies can also be specified by using the form <literal>ftp::"
+#| "Proxy::&lt;host&gt;</literal> with the special keyword <literal>DIRECT</"
+#| "literal> meaning to use no proxies. If no one of the above settings is "
+#| "specified, <envar>ftp_proxy</envar> environment variable will be used. To "
+#| "use a ftp proxy you will have to set the <literal>ftp::ProxyLogin</"
+#| "literal> script in the configuration file. This entry specifies the "
+#| "commands to send to tell the proxy server what to connect to. Please see "
+#| "&configureindex; for an example of how to do this. The substitution "
+#| "variables available are <literal>$(PROXY_USER)</literal> <literal>"
+#| "$(PROXY_PASS)</literal> <literal>$(SITE_USER)</literal> <literal>"
+#| "$(SITE_PASS)</literal> <literal>$(SITE)</literal> and <literal>"
+#| "$(SITE_PORT)</literal> Each is taken from it's respective URI component."
+msgid ""
+"<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs.  "
+"It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</"
+"literal>.  Per host proxies can also be specified by using the form "
+"<literal>ftp::Proxy::&lt;host&gt;</literal> with the special keyword "
+"<literal>DIRECT</literal> meaning to use no proxies. If no one of the above "
+"settings is specified, <envar>ftp_proxy</envar> environment variable will be "
+"used. To use an FTP proxy you will have to set the <literal>ftp::ProxyLogin</"
+"literal> script in the configuration file. This entry specifies the commands "
+"to send to tell the proxy server what to connect to. Please see "
+"&configureindex; for an example of how to do this. The substitution "
+"variables representing the corresponding URI component are <literal>"
+"$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, <literal>"
+"$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, <literal>$(SITE)</"
+"literal> and <literal>$(SITE_PORT)</literal>."
 msgstr ""
 "FTP-URIs; ftp::Proxy ist der zu benutzende Standard-FTP-Proxy. Er wird "
 "standardmäßig in der Form <literal>ftp://[[Anwender][:Passwort]@]Host[:Port]/"
@@ -4055,14 +4236,22 @@ msgstr ""
 "literal> und <literal>$(SITE_PORT)</literal>. Jede wird von ihrem "
 "entsprechenden URI-Bestandteil genommen."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:410
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:452
+#, fuzzy
+#| msgid ""
+#| "Several settings are provided to control passive mode. Generally it is "
+#| "safe to leave passive mode on; it works in nearly every environment.  "
+#| "However, some situations require that passive mode be disabled and port "
+#| "mode FTP used instead. This can be done globally, for connections that go "
+#| "through a proxy or for a specific host (See the sample config file for "
+#| "examples)."
 msgid ""
 "Several settings are provided to control passive mode. Generally it is safe "
-"to leave passive mode on, it works in nearly every environment.  However "
-"some situations require that passive mode be disabled and port mode ftp used "
-"instead. This can be done globally, for connections that go through a proxy "
-"or for a specific host (See the sample config file for examples)."
+"to leave passive mode on; it works in nearly every environment.  However, "
+"some situations require that passive mode be disabled and port mode FTP used "
+"instead. This can be done globally or for connections that go through a "
+"proxy or for a specific host (see the sample config file for examples)."
 msgstr ""
 "Mehrere Einstellungen werden zum Steuern des passiven Modus bereitgestellt. "
 "Generell ist es sicher, den passiven Modus eingeschaltet zu lassen, er "
@@ -4072,11 +4261,11 @@ msgstr ""
 "Proxy oder über einen bestimmten Host gehen (Lesen Sie die "
 "Beispielskonfiguration, um Beispiele zu erhalten)."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:417
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:459
 msgid ""
 "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
-"envar> environment variable to a http url - see the discussion of the http "
+"envar> environment variable to an HTTP URL - see the discussion of the http "
 "method above for syntax. You cannot set this in the configuration file and "
 "it is not recommended to use FTP over HTTP due to its low efficiency."
 msgstr ""
@@ -4086,8 +4275,8 @@ msgstr ""
 "nicht in der Konfigurationsdatei setzen und es wird wegen der geringen "
 "Effizienz nicht empfohlen FTP über HTTP zu benutzen."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:422
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:464
 msgid ""
 "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
 "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -4102,23 +4291,33 @@ msgstr ""
 "Benutzung selbst auf IPv4-Verbindungen. Beachten Sie, dass die wenigsten FTP-"
 "Server RFC2428 unterstützen."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:435
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
+#: apt.conf.5.xml:478
 #, no-wrap
 msgid "/cdrom/::Mount \"foo\";"
 msgstr "/cdrom/::Mount \"foo\";"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:430
-msgid ""
-"CD-ROM URIs; the only setting for CD-ROM URIs is the mount point, "
-"<literal>cdrom::Mount</literal> which must be the mount point for the CD-ROM "
-"drive as specified in <filename>/etc/fstab</filename>. It is possible to "
-"provide alternate mount and unmount commands if your mount point cannot be "
-"listed in the fstab (such as an SMB mount and old mount packages). The "
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:473
+#, fuzzy
+#| msgid ""
+#| "CD-ROM URIs; the only setting for CD-ROM URIs is the mount point, "
+#| "<literal>cdrom::Mount</literal> which must be the mount point for the CD-"
+#| "ROM drive as specified in <filename>/etc/fstab</filename>. It is possible "
+#| "to provide alternate mount and unmount commands if your mount point "
+#| "cannot be listed in the fstab (such as an SMB mount and old mount "
+#| "packages). The syntax is to put <placeholder type=\"literallayout\" id="
+#| "\"0\"/> within the cdrom block. It is important to have the trailing "
+#| "slash. Unmount commands can be specified using UMount."
+msgid ""
+"For URIs using the <literal>cdrom</literal> method, the only configurable "
+"option is the mount point, <literal>cdrom::Mount</literal>, which must be "
+"the mount point for the CD-ROM (or DVD, or whatever) drive as specified in "
+"<filename>/etc/fstab</filename>. It is possible to provide alternate mount "
+"and unmount commands if your mount point cannot be listed in the fstab.  The "
 "syntax is to put <placeholder type=\"literallayout\" id=\"0\"/> within the "
-"cdrom block. It is important to have the trailing slash. Unmount commands "
-"can be specified using UMount."
+"<literal>cdrom</literal> block. It is important to have the trailing slash.  "
+"Unmount commands can be specified using UMount."
 msgstr ""
 "CD-ROM-URIs; Die einzige Einstellung für CD-ROM-URIs ist der Einhängepunkt "
 "<literal>cdrom::Mount</literal>, der der Einhängepunkt des CD-ROM-Laufwerks "
@@ -4130,31 +4329,35 @@ msgstr ""
 "einzufügen. Der abschließende Schrägstrich ist wichtig. Aushängebefehle "
 "können per UMount angegeben werden."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:441
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:486
+#, fuzzy
+#| msgid ""
+#| "GPGV URIs; the only option for GPGV URIs is the option to pass additional "
+#| "parameters to gpgv.  <literal>gpgv::Options</literal> Additional options "
+#| "passed to gpgv."
 msgid ""
-"GPGV URIs; the only option for GPGV URIs is the option to pass additional "
-"parameters to gpgv.  <literal>gpgv::Options</literal> Additional options "
-"passed to gpgv."
+"For GPGV URIs the only configurable option is <literal>gpgv::Options</"
+"literal>, which passes additional parameters to gpgv."
 msgstr ""
 "GPGV-URIs; Die einzige Option für GPGV-URIs ist die Option zusätzliche "
 "Parameter an gpgv weiterzuleiten. <literal>gpgv::Options</literal> "
 "Zusätzliche Parameter werden an gpgv weitergeleitet."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:452
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
+#: apt.conf.5.xml:497
 #, no-wrap
 msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
 msgstr "Acquire::CompressionTypes::<replaceable>Dateierweiterung</replaceable> \"<replaceable>Methodenname</replaceable>\";"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:447
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:492
 msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "
-"compression formats.  Per default the acquire methods can decompress "
+"compression formats.  By default the acquire methods can decompress "
 "<command>bzip2</command>, <command>lzma</command> and <command>gzip</"
-"command> compressed files, with this setting more formats can be added on "
+"command> compressed files; with this setting more formats can be added on "
 "the fly or the used method can be changed. The syntax for this is: "
 "<placeholder type=\"synopsis\" id=\"0\"/>"
 msgstr ""
@@ -4167,33 +4370,49 @@ msgstr ""
 "Methode geändert werden. Die Syntax dafür lautet: <placeholder type="
 "\"synopsis\" id=\"0\"/>"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:457
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
+#: apt.conf.5.xml:502
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order:: \"gz\";"
 msgstr "Acquire::CompressionTypes::Order:: \"gz\";"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:460
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
+#: apt.conf.5.xml:505
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:453
-msgid ""
-"Also the <literal>Order</literal> subgroup can be used to define in which "
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:498
+#, fuzzy
+#| msgid ""
+#| "Also, the <literal>Order</literal> subgroup can be used to define in "
+#| "which order the acquire system will try to download the compressed files. "
+#| "The acquire system will try the first and proceed with the next "
+#| "compression type in this list on error, so to prefer one over the other "
+#| "type simply add the preferred type first - not already added default "
+#| "types will be added at run time to the end of the list, so e.g. "
+#| "<placeholder type=\"synopsis\" id=\"0\"/> can be used to prefer "
+#| "<command>gzip</command> compressed files over <command>bzip2</command> "
+#| "and <command>lzma</command>.  If <command>lzma</command> should be "
+#| "preferred over <command>gzip</command> and <command>bzip2</command> the "
+#| "configure setting should look like this <placeholder type=\"synopsis\" id="
+#| "\"1\"/> It is not needed to add <literal>bz2</literal> explicit to the "
+#| "list as it will be added automatic."
+msgid ""
+"Also, the <literal>Order</literal> subgroup can be used to define in which "
 "order the acquire system will try to download the compressed files. The "
 "acquire system will try the first and proceed with the next compression type "
-"in this list on error, so to prefer one over the other type simple add the "
-"preferred type at first - not already added default types will be added at "
-"run time to the end of the list, so e.g. <placeholder type=\"synopsis\" id="
+"in this list on error, so to prefer one over the other type simply add the "
+"preferred type first - default types not already added will be implicitly "
+"appended to the end of the list, so e.g. <placeholder type=\"synopsis\" id="
 "\"0\"/> can be used to prefer <command>gzip</command> compressed files over "
 "<command>bzip2</command> and <command>lzma</command>.  If <command>lzma</"
 "command> should be preferred over <command>gzip</command> and "
-"<command>bzip2</command> the configure setting should look like this "
+"<command>bzip2</command> the configure setting should look like this: "
 "<placeholder type=\"synopsis\" id=\"1\"/> It is not needed to add "
-"<literal>bz2</literal> explicit to the list as it will be added automatic."
+"<literal>bz2</literal> to the list explicitly as it will be added "
+"automatically."
 msgstr ""
 "Außerdem kann die Untergruppe <literal>Order</literal> benutzt werden, um zu "
 "definieren, in welcher Reihenfolge das »acquire«-System die komprimierten "
@@ -4210,25 +4429,37 @@ msgstr ""
 "type=\"synopsis\" id=\"1\"/>. Es ist nicht nötig <literal>bz2</literal> "
 "explizit zur Liste hinzuzufügen, da es automatisch hinzufügt wird."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:464
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
+#: apt.conf.5.xml:512
 #, no-wrap
 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:462
-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."
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:507
+#, 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 the <literal>Dir::Bin::<replaceable>Methodname</replaceable></"
+"literal> will be checked at run time. If this option has been set, the "
+"method will only be used if this file exists; e.g. for the <literal>bzip2</"
+"literal> 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."
 msgstr ""
 "Beachten Sie, dass <literal>Dir::Bin::<replaceable>Methodenname</"
 "replaceable></literal> zur Laufzeit geprüft wird: Falls diese Einstellung "
@@ -4242,8 +4473,8 @@ msgstr ""
 "nicht im Listenstil. Dies wird die definierte Liste nicht überschreiben, es "
 "wird diesen Typ nur vor die Liste setzen."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:469
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:517
 msgid ""
 "The special type <literal>uncompressed</literal> can be used to give "
 "uncompressed files a preference, but note that most archives don't provide "
@@ -4254,8 +4485,8 @@ msgstr ""
 "die meisten Archive keine unkomprimierten Dateien bereitstellen, so dass "
 "dies meist nur für lokale Spiegel benutzt werden kann."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:476
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:524
 msgid ""
 "When downloading <literal>gzip</literal> compressed indexes (Packages, "
 "Sources, or Translations), keep them gzip compressed locally instead of "
@@ -4268,17 +4499,26 @@ msgstr ""
 "CPU-Ressourcen bei der Erstellung des lokalen Paket-Caches. Vorgabe ist "
 "False."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:484
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:532
+#, fuzzy
+#| msgid ""
+#| "The Languages subsection controls which <filename>Translation</filename> "
+#| "files are downloaded and in which order APT tries to display the "
+#| "description-translations. APT will try to display the first available "
+#| "description in the language which is listed first. Languages can be "
+#| "defined with their short or long language codes. Note that not all "
+#| "archives provide <filename>Translation</filename> files for every "
+#| "Language - especially the long Languagecodes are rare, so please inform "
+#| "you which ones are available before you set here impossible values."
 msgid ""
 "The Languages subsection controls which <filename>Translation</filename> "
-"files are downloaded and in which order APT tries to display the Description-"
-"Translations. APT will try to display the first available Description in the "
-"Language which is listed at first. Languages can be defined with their short "
-"or long Languagecodes. Note that not all archives provide "
-"<filename>Translation</filename> files for every Language - especially the "
-"long Languagecodes are rare, so please inform you which ones are available "
-"before you set here impossible values."
+"files are downloaded and in which order APT tries to display the description-"
+"translations. APT will try to display the first available description in the "
+"language which is listed first. Languages can be defined with their short or "
+"long language codes. Note that not all archives provide "
+"<filename>Translation</filename> files for every language - the long "
+"language codes are especially rare."
 msgstr ""
 "Der Unterabschnitt Languages steuert welche <filename>Translation</filename>-"
 "Dateien heruntergeladen werden und in welcher Reihenfolge APT versucht, die "
@@ -4290,33 +4530,52 @@ msgstr ""
 "selten. Informieren Sie sich deshalb bitte welche verfügbar sind, bevor Sie "
 "hier unmögliche Werte einsetzen."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:500
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
+#: apt.conf.5.xml:549
 #, no-wrap
 msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:490
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:537
+#, fuzzy
+#| msgid ""
+#| "The default list includes \"environment\" and \"en\". "
+#| "\"<literal>environment</literal>\" has a special meaning here: It will be "
+#| "replaced at runtime with the languagecodes extracted from the "
+#| "<literal>LC_MESSAGES</literal> environment variable.  It will also ensure "
+#| "that these codes are not included twice in the list. If "
+#| "<literal>LC_MESSAGES</literal> is set to \"C\" only the "
+#| "<filename>Translation-en</filename> file (if available) will be used.  To "
+#| "force APT to use no Translation file use the setting <literal>Acquire::"
+#| "Languages=none</literal>. \"<literal>none</literal>\" is another special "
+#| "meaning code which will stop the search for a suitable "
+#| "<filename>Translation</filename> file.  This can be used by the system "
+#| "administrator to let APT know that it should download also this files "
+#| "without actually use them if the environment doesn't specify this "
+#| "languages. So the following example configuration will result in the "
+#| "order \"en, de\" in an english and in \"de, en\" in a german "
+#| "localization. Note that \"fr\" is downloaded, but not used if APT is not "
+#| "used in a french localization, in such an environment the order would be "
+#| "\"fr, de, en\".  <placeholder type=\"programlisting\" id=\"0\"/>"
 msgid ""
 "The default list includes \"environment\" and \"en\". "
-"\"<literal>environment</literal>\" has a special meaning here: It will be "
-"replaced at runtime with the languagecodes extracted from the "
+"\"<literal>environment</literal>\" has a special meaning here: it will be "
+"replaced at runtime with the language codes extracted from the "
 "<literal>LC_MESSAGES</literal> environment variable.  It will also ensure "
 "that these codes are not included twice in the list. If "
 "<literal>LC_MESSAGES</literal> is set to \"C\" only the "
 "<filename>Translation-en</filename> file (if available) will be used.  To "
-"force apt to use no Translation file use the setting <literal>Acquire::"
+"force APT to use no Translation file use the setting <literal>Acquire::"
 "Languages=none</literal>. \"<literal>none</literal>\" is another special "
-"meaning code which will stop the search for a fitting <filename>Translation</"
-"filename> file.  This can be used by the system administrator to let APT "
-"know that it should download also this files without actually use them if "
-"the environment doesn't specify this languages. So the following example "
-"configuration will result in the order \"en, de\" in an english and in \"de, "
-"en\" in a german localization. Note that \"fr\" is downloaded, but not used "
-"if APT is not used in a french localization, in such an environment the "
-"order would be \"fr, de, en\".  <placeholder type=\"programlisting\" id="
-"\"0\"/>"
+"meaning code which will stop the search for a suitable "
+"<filename>Translation</filename> file.  This tells APT to download these "
+"translations too, without actually using them unless the environment "
+"specifies the languages. So the following example configuration will result "
+"in the order \"en, de\" in an English locale or \"de, en\" in a German one. "
+"Note that \"fr\" is downloaded, but not used unless APT is used in a French "
+"locale (where the order would be \"fr, de, en\").  <placeholder type="
+"\"programlisting\" id=\"0\"/>"
 msgstr ""
 "Die Standardliste beinhaltet »environment« und »en«. »<literal>environment</"
 "literal>« hat hier eine besondere Bedeutung: Es wird zur Laufzeit durch die "
@@ -4338,8 +4597,8 @@ msgstr ""
 "französischen Lokalisierung benutzt wird. In einer solchen Umgebung wäre die "
 "Reihenfolge »fr, de, en«. <placeholder type=\"programlisting\" id=\"0\"/>"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:501
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:550
 msgid ""
 "Note: To prevent problems resulting from APT being executed in different "
 "environments (e.g. by different users or by other programs) all Translation "
@@ -4353,39 +4612,50 @@ msgstr ""
 "Liste hinzugefügt (nach einem impliziten »<literal>none</literal>«)."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:560
 msgid "Directories"
 msgstr "Verzeichnisse"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:514
+#: apt.conf.5.xml:562
 msgid ""
 "The <literal>Dir::State</literal> section has directories that pertain to "
 "local state information. <literal>lists</literal> is the directory to place "
 "downloaded package lists in and <literal>status</literal> is the name of the "
-"dpkg status file.  <literal>preferences</literal> is the name of the APT "
+"&dpkg; status file.  <literal>preferences</literal> is the name of the APT "
 "<filename>preferences</filename> file.  <literal>Dir::State</literal> "
-"contains the default directory to prefix on all sub items if they do not "
+"contains the default directory to prefix on all sub-items if they do not "
 "start with <filename>/</filename> or <filename>./</filename>."
 msgstr ""
 "Der <literal>Dir::State</literal>-Abschnitt hat Verzeichnisse, die zu "
 "lokalen Statusinformationen gehören. <literal>lists</literal> ist das "
 "Verzeichnis, in das heruntergeladene Paketlisten platziert werden und "
-"<literal>status</literal> ist der Name der Dpkg-Statusdatei. "
+"<literal>status</literal> ist der Name der &dpkg; Statusdatei. "
 "<literal>preferences</literal> ist der Name der APT-<filename>preferences</"
 "filename>-Datei. <literal>Dir::State</literal> enthält das "
 "Standardverzeichnis, das allen Unterelementen vorangestellt wird, falls sie "
 "nicht mit <filename>/</filename> oder <filename>./</filename> beginnen."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:521
+#: apt.conf.5.xml:569
+#, fuzzy
+#| msgid ""
+#| "<literal>Dir::Cache</literal> contains locations pertaining to local "
+#| "cache information, such as the two package caches <literal>srcpkgcache</"
+#| "literal> and <literal>pkgcache</literal> as well as the location to place "
+#| "downloaded archives, <literal>Dir::Cache::archives</literal>. Generation "
+#| "of caches can be turned off by setting their names to be blank. This will "
+#| "slow down startup but save disk space. It is probably preferable to turn "
+#| "off the pkgcache rather than the srcpkgcache. Like <literal>Dir::State</"
+#| "literal> the default directory is contained in <literal>Dir::Cache</"
+#| "literal>"
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
 "and <literal>pkgcache</literal> as well as the location to place downloaded "
 "archives, <literal>Dir::Cache::archives</literal>. Generation of caches can "
-"be turned off by setting their names to be blank. This will slow down "
-"startup but save disk space. It is probably preferred to turn off the "
+"be turned off by setting their names to the empty string. This will slow "
+"down startup but save disk space. It is probably preferable to turn off the "
 "pkgcache rather than the srcpkgcache. Like <literal>Dir::State</literal> the "
 "default directory is contained in <literal>Dir::Cache</literal>"
 msgstr ""
@@ -4401,7 +4671,7 @@ msgstr ""
 "in <literal>Dir::Cache</literal> enthalten."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:530
+#: apt.conf.5.xml:578
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4416,7 +4686,7 @@ msgstr ""
 "Konfigurationsdatei erfolgt)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:536
+#: apt.conf.5.xml:584
 msgid ""
 "The <literal>Dir::Parts</literal> setting reads in all the config fragments "
 "in lexical order from the directory specified. After this is done then the "
@@ -4428,7 +4698,7 @@ msgstr ""
 "geladen."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:540
+#: apt.conf.5.xml:588
 msgid ""
 "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
 "Bin::Methods</literal> specifies the location of the method handlers and "
@@ -4446,7 +4716,7 @@ msgstr ""
 "Programms an."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:548
+#: apt.conf.5.xml:596
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "
@@ -4466,7 +4736,7 @@ msgstr ""
 "<filename>/tmp/staging/var/lib/dpkg/status</filename> nachgesehen."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:561
+#: apt.conf.5.xml:609
 msgid ""
 "The <literal>Ignore-Files-Silently</literal> list can be used to specify "
 "which files APT should silently ignore while parsing the files in the "
@@ -4484,15 +4754,15 @@ msgstr ""
 "diese Muster verwandt werden."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:570
+#: apt.conf.5.xml:618
 msgid "APT in DSelect"
 msgstr "APT in DSelect"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:572
+#: apt.conf.5.xml:620
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
-"control the default behaviour. These are in the <literal>DSelect</literal> "
+"control the default behavior. These are in the <literal>DSelect</literal> "
 "section."
 msgstr ""
 "Wenn APT als eine &dselect;-Methode benutzt wird, steuern mehrere "
@@ -4500,43 +4770,48 @@ msgstr ""
 "<literal>DSelect</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:577
+#: apt.conf.5.xml:625
 msgid ""
-"Cache Clean mode; this value may be one of always, prompt, auto, pre-auto "
-"and never.  always and prompt will remove all packages from the cache after "
-"upgrading, prompt (the default) does so conditionally.  auto removes only "
-"those packages which are no longer downloadable (replaced with a new version "
-"for instance).  pre-auto performs this action before downloading new "
-"packages."
+"Cache Clean mode; this value may be one of <literal>always</literal>, "
+"<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
+"literal> and <literal>never</literal>.  <literal>always</literal> and "
+"<literal>prompt</literal> will remove all packages from the cache after "
+"upgrading, <literal>prompt</literal> (the default) does so conditionally.  "
+"<literal>auto</literal> removes only those packages which are no longer "
+"downloadable (replaced with a new version for instance).  <literal>pre-auto</"
+"literal> performs this action before downloading new packages."
 msgstr ""
-"Zwischenspeicherbereinigungsmodus; Dieser Wert kann entweder »always«, "
-"»prompt«, »auto«, »pre-auto« oder »never« sein. »always« und »prompt« "
-"werden, nachdem das Upgrade durchgeführt wurde, alle Pakete aus dem "
-"Zwischenspeicher entfernen, »prompt« (die Vorgabe) tut dies bedingt. »auto« "
-"entfernt nur jene Pakete, die nicht länger heruntergeladen werden können "
-"(zum Beispiel, weil sie durch eine neue Version ersetzt wurden). »pre-auto« "
-"führt diese Aktion vor dem Herunterladen neuer Pakete durch."
+"Zwischenspeicherbereinigungsmodus; Dieser Wert kann entweder "
+"»<literal>always</literal>«, »<literal>prompt</literal>«, »<literal>auto</"
+"literal>«, »<literal>pre-auto</literal>« oder »<literal>never</literal>« "
+"sein. »<literal>always</literal>« und »<literal>prompt</literal>« werden, "
+"nachdem das Upgrade durchgeführt wurde, alle Pakete aus dem Zwischenspeicher "
+"entfernen, »<literal>prompt</literal>« (die Vorgabe) tut dies bedingt. "
+"»<literal>auto</literal>« entfernt nur jene Pakete, die nicht länger "
+"heruntergeladen werden können (zum Beispiel, weil sie durch eine neue "
+"Version ersetzt wurden). »<literal>pre-auto</literal>« führt diese Aktion "
+"vor dem Herunterladen neuer Pakete durch."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:586
+#: apt.conf.5.xml:639
 msgid ""
-"The contents of this variable is passed to &apt-get; as command line options "
-"when it is run for the install phase."
+"The contents of this variable are passed to &apt-get; as command line "
+"options when it is run for the install phase."
 msgstr ""
 "Die Inhalte dieser Variablen werden als Befehlszeilenoptionen an &apt-get; "
 "übermittelt, wenn es für die Installationsphase durchlaufen wird."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:591
+#: apt.conf.5.xml:644
 msgid ""
-"The contents of this variable is passed to &apt-get; as command line options "
-"when it is run for the update phase."
+"The contents of this variable are passed to &apt-get; as command line "
+"options when it is run for the update phase."
 msgstr ""
 "Die Inhalte dieser Variable werden als Befehlszeilenoptionen an &apt-get; "
 "übermittelt, wenn es für die Aktualisierungsphase durchlaufen wird."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:596
+#: apt.conf.5.xml:649
 msgid ""
 "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
 "The default is to prompt only on error."
@@ -4545,12 +4820,12 @@ msgstr ""
 "nachfragen, um fortzufahren. Vorgabe ist es, nur bei Fehlern nachzufragen."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:602
-msgid "How APT calls dpkg"
-msgstr "Wie APT Dpkg aufruft"
+#: apt.conf.5.xml:655
+msgid "How APT calls &dpkg;"
+msgstr "Wie APT &dpkg; aufruft"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:603
+#: apt.conf.5.xml:656
 msgid ""
 "Several configuration directives control how APT invokes &dpkg;. These are "
 "in the <literal>DPkg</literal> section."
@@ -4559,22 +4834,22 @@ msgstr ""
 "stehen im Abschnitt <literal>DPkg</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:608
+#: apt.conf.5.xml:661
 msgid ""
-"This is a list of options to pass to dpkg. The options must be specified "
+"This is a list of options to pass to &dpkg;. The options must be specified "
 "using the list notation and each list item is passed as a single argument to "
 "&dpkg;."
 msgstr ""
-"Dies ist eine Liste von Optionen, die an Dpkg übermittelt werden. Die "
+"Dies ist eine Liste von Optionen, die an &dpkg; übermittelt werden. Die "
 "Optionen müssen unter Benutzung der Listenschreibweise angegeben werden und "
 "jedes Listenelement wird als einzelnes Argument an &dpkg; übermittelt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:614
+#: apt.conf.5.xml:667
 msgid ""
 "This is a list of shell commands to run before/after invoking &dpkg;.  Like "
 "<literal>options</literal> this must be specified in list notation. The "
-"commands are invoked in order using <filename>/bin/sh</filename>, should any "
+"commands are invoked in order using <filename>/bin/sh</filename>; should any "
 "fail APT will abort."
 msgstr ""
 "Dies ist eine Liste von Shell-Befehlen, die vor/nach dem Aufruf von &dpkg; "
@@ -4584,15 +4859,22 @@ msgstr ""
 "APT abgebrochen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:621
+#: apt.conf.5.xml:674
+#, fuzzy
+#| msgid ""
+#| "This is a list of shell commands to run before invoking &dpkg;. Like "
+#| "<literal>options</literal> this must be specified in list notation. The "
+#| "commands are invoked in order using <filename>/bin/sh</filename>; should "
+#| "any fail APT will abort. APT will pass to the commands on standard input "
+#| "the filenames of all .deb files it is going to install, one per line."
 msgid ""
-"This is a list of shell commands to run before invoking dpkg. Like "
+"This is a list of shell commands to run before invoking &dpkg;. Like "
 "<literal>options</literal> this must be specified in list notation. The "
-"commands are invoked in order using <filename>/bin/sh</filename>, should any "
-"fail APT will abort. APT will pass to the commands on standard input the "
-"filenames of all .deb files it is going to install, one per line."
+"commands are invoked in order using <filename>/bin/sh</filename>; should any "
+"fail APT will abort. APT will pass the filenames of all .deb files it is "
+"going to install to the commands, one per line on standard input."
 msgstr ""
-"Dies ist eine Liste von Shell-Befehlen, die vor dem Aufruf von Dpkg "
+"Dies ist eine Liste von Shell-Befehlen, die vor dem Aufruf von &dpkg; "
 "ausgeführt werden. Wie <literal>options</literal> muss dies in "
 "Listenschreibweise angegeben werden. Die Befehle werden der Reihenfolge nach "
 "mit <filename>/bin/sh</filename> aufgerufen, sollte einer fehlschlagen, wird "
@@ -4601,7 +4883,7 @@ msgstr ""
 "pro Zeile."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:627
+#: apt.conf.5.xml:680
 msgid ""
 "Version 2 of this protocol dumps more information, including the protocol "
 "version, the APT configuration space and the packages, files and versions "
@@ -4617,18 +4899,18 @@ msgstr ""
 "literal> gegeben wird."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:635
+#: apt.conf.5.xml:688
 msgid ""
-"APT chdirs to this directory before invoking dpkg, the default is <filename>/"
-"</filename>."
+"APT chdirs to this directory before invoking &dpkg;, the default is "
+"<filename>/</filename>."
 msgstr ""
-"APT wechselt mit chdir in dieses Verzeichnis, bevor Dpkg aufgerufen wird, "
+"APT wechselt mit chdir in dieses Verzeichnis, bevor &dpkg; aufgerufen wird, "
 "die Vorgabe ist <filename>/</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:640
+#: apt.conf.5.xml:693
 msgid ""
-"These options are passed to &dpkg-buildpackage; when compiling packages, the "
+"These options are passed to &dpkg-buildpackage; when compiling packages; the "
 "default is to disable signing and produce all binaries."
 msgstr ""
 "Diese Optionen werden an &dpkg-buildpackage; beim Kompilieren von Paketen "
@@ -4636,39 +4918,52 @@ msgstr ""
 "Programme werden erstellt."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:645
+#: apt.conf.5.xml:698
 msgid "dpkg trigger usage (and related options)"
 msgstr "Dpkd-Trigger-Benutzung (und zugehörige Optionen)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:646
-msgid ""
-"APT can call dpkg in a way so it can make aggressive use of triggers over "
-"multiple calls of dpkg. Without further options dpkg will use triggers only "
-"in between his own run. Activating these options can therefore decrease the "
-"time needed to perform the install / upgrade. Note that it is intended to "
-"activate these options per default in the future, but as it changes the way "
-"APT calling dpkg drastically it needs a lot more testing.  <emphasis>These "
-"options are therefore currently experimental and should not be used in "
-"productive environments.</emphasis> Also it breaks the progress reporting so "
-"all frontends will currently stay around half (or more) of the time in the "
-"100% state while it actually configures all packages."
-msgstr ""
-"APT kann Dpkg auf eine Art aufrufen, in der aggressiv Gebrauch von Triggern "
-"über mehrere Dpkg-Aufrufe hinweg gemacht wird. Ohne weitere Optionen wird "
-"Dpkg Trigger nur während seiner eigenen Ausführung benutzen. Diese Optionen "
-"zu benutzen, kann daher die zum Installieren/Upgrade benötigte Zeit "
-"verkürzen. Beachten Sie, dass geplant ist, diese Optionen in Zukunft "
-"standardmäßig zu aktivieren, aber da es die Art, wie APT Dpkg aufruft, "
-"drastisch ändert, benötigt es noch viele weitere Tests. <emphasis>Diese "
-"Optionen sind daher aktuell noch experimentell und sollten nicht in "
-"produktiven Umgebungen benutzt werden.</emphasis> Außerdem unterbricht es "
-"die Fortschrittsanzeige, so dass alle Oberflächen derzeit die halbe (oder "
-"mehr) Zeit auf dem Status 100% stehen, während tatsächlich alle Pakete "
-"konfiguriert werden."
+#: apt.conf.5.xml:699
+#, fuzzy
+#| msgid ""
+#| "APT can call &dpkg; in a way so it can make aggressive use of triggers "
+#| "over multiple calls of &dpkg;. Without further options &dpkg; will use "
+#| "triggers only in between his own run. Activating these options can "
+#| "therefore decrease the time needed to perform the install / upgrade. Note "
+#| "that it is intended to activate these options per default in the future, "
+#| "but as it changes the way APT calling &dpkg; drastically it needs a lot "
+#| "more testing.  <emphasis>These options are therefore currently "
+#| "experimental and should not be used in production environments.</"
+#| "emphasis> It also breaks progress reporting such that all frontends will "
+#| "currently stay around half (or more) of the time in the 100% state while "
+#| "it actually configures all packages."
+msgid ""
+"APT can call &dpkg; in such a way as to let it make aggressive use of "
+"triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
+"use triggers once each time it runs.  Activating these options can therefore "
+"decrease the time needed to perform the install or upgrade. Note that it is "
+"intended to activate these options per default in the future, but as it "
+"drastically changes the way APT calls &dpkg; it needs a lot more testing.  "
+"<emphasis>These options are therefore currently experimental and should not "
+"be used in production environments.</emphasis> It also breaks progress "
+"reporting such that all front-ends will currently stay around half (or more) "
+"of the time in the 100% state while it actually configures all packages."
+msgstr ""
+"APT kann &dpkg; auf eine Art aufrufen, in der aggressiv Gebrauch von "
+"Triggern über mehrere &dpkg; Aufrufe hinweg gemacht wird. Ohne weitere "
+"Optionen wird &dpkg; Trigger nur während seiner eigenen Ausführung benutzen. "
+"Diese Optionen zu benutzen, kann daher die zum Installieren/Upgrade "
+"benötigte Zeit verkürzen. Beachten Sie, dass geplant ist, diese Optionen in "
+"Zukunft standardmäßig zu aktivieren, aber da es die Art, wie APT &dpkg; "
+"aufruft, drastisch ändert, benötigt es noch viele weitere Tests. "
+"<emphasis>Diese Optionen sind daher aktuell noch experimentell und sollten "
+"nicht in produktiven Umgebungen benutzt werden.</emphasis> Außerdem "
+"unterbricht es die Fortschrittsanzeige, so dass alle Oberflächen derzeit die "
+"halbe (oder mehr) Zeit auf dem Status 100% stehen, während tatsächlich alle "
+"Pakete konfiguriert werden."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:661
+#: apt.conf.5.xml:714
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
@@ -4682,15 +4977,15 @@ msgstr ""
 "DPkg::TriggersPending \"true\";"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:655
+#: apt.conf.5.xml:708
 msgid ""
 "Note that it is not guaranteed that APT will support these options or that "
 "these options will not cause (big) trouble in the future. If you have "
 "understand the current risks and problems with these options, but are brave "
-"enough to help testing them create a new configuration file and test a "
+"enough to help testing them, create a new configuration file and test a "
 "combination of options. Please report any bugs, problems and improvements "
 "you encounter and make sure to note which options you have used in your "
-"reports. Asking dpkg for help could also be useful for debugging proposes, "
+"reports. Asking &dpkg; for help could also be useful for debugging proposes, "
 "see e.g. <command>dpkg --audit</command>. A defensive option combination "
 "would be <placeholder type=\"literallayout\" id=\"0\"/>"
 msgstr ""
@@ -4702,72 +4997,97 @@ msgstr ""
 "von Optionen. Bitte berichten Sie auf Englisch jegliche Fehler, Probleme und "
 "Verbesserungen, denen Sie begegnen und stellen Sie sicher, dass Sie alle von "
 "Ihnen benutzten Optionen in Ihren Berichten vermerken. Zum Zweck der "
-"Fehlersuche könnte es außerdem nützlich sein, Dpkg um Hilfe zu fragen. Lesen "
-"Sie z.B. <command>dpkg --audit</command>. Eine defensive Optionenkombination "
-"wäre <placeholder type=\"literallayout\" id=\"0\"/>"
+"Fehlersuche könnte es außerdem nützlich sein, &dpkg; um Hilfe zu fragen. "
+"Lesen Sie z.B. <command>dpkg --audit</command>. Eine defensive "
+"Optionenkombination wäre <placeholder type=\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:668
+#: apt.conf.5.xml:721
 msgid ""
-"Add the no triggers flag to all dpkg calls (except the ConfigurePending "
+"Add the no triggers flag to all &dpkg; calls (except the ConfigurePending "
 "call).  See &dpkg; if you are interested in what this actually means. In "
-"short: dpkg will not run the triggers when this flag is present unless it is "
-"explicitly called to do so in an extra call.  Note that this option exists "
-"(undocumented) also in older apt versions with a slightly different meaning: "
-"Previously these option only append --no-triggers to the configure calls to "
-"dpkg - now apt will add these flag also to the unpack and remove calls."
-msgstr ""
-"fügt die keine-Trigger-Markierung zu allen Dpkg-Aufrufen hinzu (ausgenommen "
-"den ConfigurePending-Aufruf). Siehe &dpkg;, wenn Sie interessiert sind, was "
-"dies tatsächlich bedeutet. In Kürze: Dpkg wird die Trigger nicht ausführen, "
-"dann ist diese Markierung vorhanden, außer sie wird explizit aufgerufen, um "
-"dies in einem gesonderten Aufruf zu tun. Beachten Sie, dass diese Option "
-"außerdem in älteren APT-Versionen mit einer geringfügig anderen Bedeutung "
-"existiert (nicht dokumentiert): Vorher hing diese Option nur --no-triggers "
-"an die Konfigurationsaufrufe für Dpkg an – nun wird APT diese Markierung "
-"außerdem an die »unpack«- und »remove«-Aufrufe anhängen."
+"short: &dpkg; will not run the triggers when this flag is present unless it "
+"is explicitly called to do so in an extra call.  Note that this option "
+"exists (undocumented) also in older APT versions with a slightly different "
+"meaning: Previously these option only append --no-triggers to the configure "
+"calls to &dpkg; - now APT will also add this flag to the unpack and remove "
+"calls."
+msgstr ""
+"fügt die keine-Trigger-Markierung zu allen &dpkg; Aufrufen hinzu "
+"(ausgenommen den ConfigurePending-Aufruf). Siehe &dpkg;, wenn Sie "
+"interessiert sind, was dies tatsächlich bedeutet. In Kürze: &dpkg; wird die "
+"Trigger nicht ausführen, dann ist diese Markierung vorhanden, außer sie wird "
+"explizit aufgerufen, um dies in einem gesonderten Aufruf zu tun. Beachten "
+"Sie, dass diese Option außerdem in älteren APT-Versionen mit einer "
+"geringfügig anderen Bedeutung existiert (nicht dokumentiert): Vorher hing "
+"diese Option nur --no-triggers an die Konfigurationsaufrufe für &dpkg; an – "
+"nun wird APT diese Markierung außerdem an die »unpack«- und »remove«-Aufrufe "
+"anhängen."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:676
+#: apt.conf.5.xml:729
+#, fuzzy
+#| msgid ""
+#| "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
+#| "and \"<literal>no</literal>\".  \"<literal>all</literal>\" is the default "
+#| "value and causes APT to configure all packages explicit.  The "
+#| "\"<literal>smart</literal>\" way is it to configure only packages which "
+#| "need to be configured before another package can be unpacked (Pre-"
+#| "Depends) and let the rest configure by &dpkg; with a call generated by "
+#| "the next option. \"<literal>no</literal>\" on the other hand will not "
+#| "configure anything and totally rely on &dpkg; for configuration (which "
+#| "will at the moment fail if a Pre-Depends is encountered).  Setting this "
+#| "option to another than the all value will implicitly activate also the "
+#| "next option per default as otherwise the system could end in an "
+#| "unconfigured status which could be unbootable!"
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
-"and \"<literal>no</literal>\".  \"<literal>all</literal>\" is the default "
-"value and causes APT to configure all packages explicit.  The "
-"\"<literal>smart</literal>\" way is it to configure only packages which need "
-"to be configured before another package can be unpacked (Pre-Depends) and "
-"let the rest configure by dpkg with a call generated by the next option. "
-"\"<literal>no</literal>\" on the other hand will not configure anything and "
-"totally rely on dpkg for configuration (which will at the moment fail if a "
-"Pre-Depends is encountered).  Setting this option to another than the all "
-"value will implicitly activate also the next option per default as otherwise "
-"the system could end in an unconfigured status which could be unbootable!"
+"and \"<literal>no</literal>\".  The default value is \"<literal>all</literal>"
+"\", which causes APT to configure all packages. The \"<literal>smart</"
+"literal>\" way is to configure only packages which need to be configured "
+"before another package can be unpacked (Pre-Depends), and let the rest be "
+"configured by &dpkg; with a call generated by the ConfigurePending option "
+"(see below). On the other hand, \"<literal>no</literal>\" will not configure "
+"anything, and totally relies on &dpkg; for configuration (which at the "
+"moment will fail if a Pre-Depends is encountered). Setting this option to "
+"any value other than <literal>all</literal> will implicitly also activate "
+"the next option by default, as otherwise the system could end in an "
+"unconfigured and potentially unbootable state."
 msgstr ""
 "Gültige Werte sind »<literal>all</literal>«, »<literal>smart</literal>« und "
 "»<literal>no</literal>«. »<literal>all</literal>« ist der Vorgabewert und "
 "veranlasst APT alle Pakete explizit zu konfigurieren. Die Art von "
 "»<literal>smart</literal>« ist es, nur die Pakete zu konfigurieren, die "
 "konfiguriert werden müssen, bevor eine anderes Paket entpackt (Pre-Depends) "
-"werden kann und den Rest von Dpkg mit einem Aufruf, der von der nächsten "
+"werden kann und den Rest von &dpkg; mit einem Aufruf, der von der nächsten "
 "Option generiert wurde, konfigurieren zu lassen. Im Gegensatz dazu wird "
 "»<literal>no</literal>« nicht konfigurieren und völlig die Konfiguration von "
-"Dpkg weitergeben (die in dem Moment fehlschlägt, in dem ein Pre-Depends "
+"&dpkg; weitergeben (die in dem Moment fehlschlägt, in dem ein Pre-Depends "
 "vorkommt). Diese Option auf etwas anderes als all zu setzen, wird außerdem "
 "implizit standardmäßig die nächste Option aktivieren, da das System "
 "anderenfalls in einem nicht konfigurierten Status enden könnte, der nicht "
 "mehr startbar sein könnte."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:687
-msgid ""
-"If this option is set apt will call <command>dpkg --configure --pending</"
-"command> to let dpkg handle all required configurations and triggers. This "
-"option is activated automatic per default if the previous option is not set "
-"to <literal>all</literal>, but deactivating could be useful if you want to "
-"run APT multiple times in a row - e.g. in an installer. In these sceneries "
-"you could deactivate this option in all but the last run."
+#: apt.conf.5.xml:744
+#, fuzzy
+#| msgid ""
+#| "If this option is set, APT will call <command>dpkg --configure --pending</"
+#| "command> to let &dpkg; handle all required configurations and triggers. "
+#| "This option is activated automatically per default if the previous option "
+#| "is not set to <literal>all</literal>, but deactivating it could be useful "
+#| "if you want to run APT multiple times in a row - e.g. in an installer. In "
+#| "these sceneries you could deactivate this option in all but the last run."
+msgid ""
+"If this option is set APT will call <command>dpkg --configure --pending</"
+"command> to let &dpkg; handle all required configurations and triggers. This "
+"option is activated automatically per default if the previous option is not "
+"set to <literal>all</literal>, but deactivating it could be useful if you "
+"want to run APT multiple times in a row - e.g. in an installer. In these "
+"sceneries you could deactivate this option in all but the last run."
 msgstr ""
 "Wenn diese Option gesetzt ist, wird APT <command>dpkg --configure --pending</"
-"command> aufrufen, um Dpkg alle benötigten Konfigurationen und Trigger "
+"command> aufrufen, um &dpkg; alle benötigten Konfigurationen und Trigger "
 "handhaben zu lassen. Diese Option ist als Vorgabe automatisch aktiviert, "
 "wenn die vorherige Option nicht auf <literal>all</literal> gesetzt ist, aber "
 "Deaktivieren könnte nützlich sein, wenn Sie APT mehrmals hintereinander "
@@ -4776,13 +5096,13 @@ msgstr ""
 "deaktivieren."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:694
+#: apt.conf.5.xml:751
 msgid ""
-"Useful for <literal>smart</literal> configuration as a package which has "
-"pending triggers is not considered as <literal>installed</literal> and dpkg "
-"treats them as <literal>unpacked</literal> currently which is a dealbreaker "
-"for Pre-Dependencies (see debbugs #526774). Note that this will process all "
-"triggers, not only the triggers needed to configure this package."
+"Useful for the <literal>smart</literal> configuration as a package which has "
+"pending triggers is not considered as <literal>installed</literal>, and "
+"&dpkg; treats them as <literal>unpacked</literal> currently which is a "
+"showstopper for Pre-Dependencies (see debbugs #526774). Note that this will "
+"process all triggers, not only the triggers needed to configure this package."
 msgstr ""
 "nützlich für <literal>smart</literal>-Konfiguration, da ein Paket mit "
 "ausstehenden Triggern nicht als <literal>installed</literal> angesehen wird "
@@ -4791,27 +5111,8 @@ msgstr ""
 "Trigger ausführt, nicht nur die Trigger, die zum Konfigurieren dieses Pakets "
 "benötigt werden."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:700
-msgid ""
-"As the configuration can be deferred to be done at the end by dpkg it can be "
-"tried to order the unpack series only by critical needs, e.g. by Pre-"
-"Depends. Default is true and therefore the \"old\" method of ordering in "
-"various steps by everything. While both method were present in earlier APT "
-"versions the <literal>OrderCritical</literal> method was unused, so this "
-"method is very experimental and needs further improvements before becoming "
-"really useful."
-msgstr ""
-"Da die Konfiguration an das Ende von Dpkg verschoben werden kann, kann "
-"versucht werden, nur die Entpackserien von kritischen Notwendigkeiten, z.B. "
-"von Pre-Depends, anzuweisen. Vorgabe ist true und daher die »alte« Methode "
-"zum Sortieren nach allem in mehreren Schritten. Obwohl in früheren Versionen "
-"von APT beide Methoden enthalten waren, wurde die <literal>OrderCritical</"
-"literal>-Methode nicht benutzt, so dass diese Methode sehr experimentell ist "
-"und weitere Verbesserungen benötigt, bevor sie wirklich nützlich wird."
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:715
+#: apt.conf.5.xml:764
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
@@ -4829,17 +5130,17 @@ msgstr ""
 "};"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:708
-msgid ""
-"Essential packages (and there dependencies) should be configured immediately "
-"after unpacking. It will be a good idea to do this quite early in the "
-"upgrade process as these these configure calls require currently also "
-"<literal>DPkg::TriggersPending</literal> which will run quite a few triggers "
-"(which maybe not needed). Essentials get per default a high score but the "
-"immediate flag is relatively low (a package which has a Pre-Depends is "
-"higher rated).  These option and the others in the same group can be used to "
-"change the scoring. The following example shows the settings with there "
-"default values.  <placeholder type=\"literallayout\" id=\"0\"/>"
+#: apt.conf.5.xml:757
+msgid ""
+"Essential packages (and their dependencies) should be configured immediately "
+"after unpacking. It is a good idea to do this quite early in the upgrade "
+"process as these configure calls also currently require <literal>DPkg::"
+"TriggersPending</literal> which will run quite a few triggers (which may not "
+"be needed). Essentials get per default a high score but the immediate flag "
+"is relatively low (a package which has a Pre-Depends is rated higher).  "
+"These option and the others in the same group can be used to change the "
+"scoring. The following example shows the settings with their default "
+"values.  <placeholder type=\"literallayout\" id=\"0\"/>"
 msgstr ""
 "Essentielle Pakete (und ihre Abhängigkeiten) sollten sofort nach dem "
 "Entpacken konfiguriert werden. Es ist eine gute Idee, dies ziemlich früh im "
@@ -4853,17 +5154,17 @@ msgstr ""
 "mit ihren Vorgabewerten. <placeholder type=\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:728
+#: apt.conf.5.xml:777
 msgid "Periodic and Archives options"
 msgstr "Periodische- und Archivoptionen"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:729
+#: apt.conf.5.xml:778
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
-"of options configure behavior of apt periodic updates, which is done by "
-"<literal>/etc/cron.daily/apt</literal> script. See header of this script for "
-"the brief documentation of these options."
+"of options configure behavior of apt periodic updates, which is done by the "
+"<literal>/etc/cron.daily/apt</literal> script. See the top of this script "
+"for the brief documentation of these options."
 msgstr ""
 "<literal>APT::Periodic</literal>- und <literal>APT::Archives</literal>-"
 "Gruppen von Optionen konfigurieren das Verhalten periodischer APT-"
@@ -4872,12 +5173,12 @@ msgstr ""
 "Dokumentation dieser Optionen zu erhalten."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:737
+#: apt.conf.5.xml:786
 msgid "Debug options"
 msgstr "Fehlersuchoptionen"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:739
+#: apt.conf.5.xml:788
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -4895,7 +5196,7 @@ msgstr ""
 "könnten es sein:"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:750
+#: apt.conf.5.xml:799
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -4906,7 +5207,7 @@ msgstr ""
 "getroffenen Entscheidungen ein."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:758
+#: apt.conf.5.xml:807
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s install</"
@@ -4917,7 +5218,7 @@ msgstr ""
 "<literal>apt-get -s install</literal>) als nicht root-Anwender auszuführen."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:767
+#: apt.conf.5.xml:816
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
@@ -4929,7 +5230,7 @@ msgstr ""
 #. 	   motivating example, except I haven't a clue why you'd want
 #. 	   to do this. 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:775
+#: apt.conf.5.xml:824
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
 "in CD-ROM IDs."
@@ -4938,12 +5239,12 @@ msgstr ""
 "Daten in CD-ROM-IDs aus."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:785
+#: apt.conf.5.xml:834
 msgid "A full list of debugging options to apt follows."
 msgstr "Eine vollständige Liste der Fehlersuchoptionen von APT folgt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:794
+#: apt.conf.5.xml:843
 msgid ""
 "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
@@ -4951,28 +5252,28 @@ msgstr ""
 "literal>-Quellen beziehen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:805
+#: apt.conf.5.xml:854
 msgid "Print information related to downloading packages using FTP."
 msgstr ""
 "gibt Informationen aus, die sich auf das Herunterladen von Paketen per FTP "
 "beziehen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:816
+#: apt.conf.5.xml:865
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 "gibt Informationen aus, die sich auf das Herunterladen von Paketen per HTTP "
 "beziehen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:827
+#: apt.conf.5.xml:876
 msgid "Print information related to downloading packages using HTTPS."
 msgstr ""
 "gibt Informationen aus, die sich auf das Herunterladen von Paketen per HTTPS "
 "beziehen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:838
+#: apt.conf.5.xml:887
 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
@@ -4981,7 +5282,7 @@ msgstr ""
 "mittels <literal>gpg</literal> beziehen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:849
+#: apt.conf.5.xml:898
 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
@@ -4990,13 +5291,13 @@ msgstr ""
 "CD-ROMs gespeichert sind."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:859
+#: apt.conf.5.xml:908
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr ""
 "beschreibt den Prozess der Auflösung von Bauabhängigkeiten in &apt-get;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:869
+#: apt.conf.5.xml:918
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
@@ -5005,7 +5306,7 @@ msgstr ""
 "Bibliotheken generiert wurde."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:879
+#: apt.conf.5.xml:928
 msgid ""
 "Do not include information from <literal>statfs</literal>, namely the number "
 "of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@ -5016,7 +5317,7 @@ msgstr ""
 "ID für eine CD-ROM generiert wird."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:890
+#: apt.conf.5.xml:939
 msgid ""
 "Disable all file locking.  For instance, this will allow two instances of "
 "<quote><literal>apt-get update</literal></quote> to run at the same time."
@@ -5026,14 +5327,14 @@ msgstr ""
 "gleichen Zeit laufen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:902
+#: apt.conf.5.xml:951
 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
 "protokolliert, wenn Elemente aus der globalen Warteschlange zum "
 "Herunterladen hinzugefügt oder entfernt werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:912
+#: apt.conf.5.xml:961
 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
@@ -5042,7 +5343,7 @@ msgstr ""
 "und kryptografischen Signaturen von heruntergeladenen Dateien beziehen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:922
+#: apt.conf.5.xml:971
 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."
@@ -5051,7 +5352,7 @@ msgstr ""
 "Diffs und Fehler, die die Paketindexlisten-Diffs betreffen, aus."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:934
+#: apt.conf.5.xml:983
 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."
@@ -5061,7 +5362,7 @@ msgstr ""
 "werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:945
+#: apt.conf.5.xml:994
 msgid ""
 "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
@@ -5069,7 +5370,7 @@ msgstr ""
 "durchführen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:956
+#: apt.conf.5.xml:1005
 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."
@@ -5079,7 +5380,7 @@ msgstr ""
 "beziehen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:966
+#: apt.conf.5.xml:1015
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
@@ -5095,20 +5396,21 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:980
+#: apt.conf.5.xml:1029
 msgid ""
-"Generate debug messages describing which package is marked as keep/install/"
+"Generate debug messages describing which packages are marked as keep/install/"
 "remove while the ProblemResolver does his work.  Each addition or deletion "
-"may trigger additional actions; they are shown indented two additional space "
-"under the original entry.  The format for each line is <literal>MarkKeep</"
-"literal>, <literal>MarkDelete</literal> or <literal>MarkInstall</literal> "
-"followed by <literal>package-name &lt;a.b.c -&gt; d.e.f | x.y.z&gt; (section)"
-"</literal> where <literal>a.b.c</literal> is the current version of the "
-"package, <literal>d.e.f</literal> is the version considered for installation "
-"and <literal>x.y.z</literal> is a newer version, but not considered for "
-"installation (because of a low pin score). The later two can be omitted if "
-"there is none or if it is the same version as the installed.  "
-"<literal>section</literal> is the name of the section the package appears in."
+"may trigger additional actions; they are shown indented two additional "
+"spaces under the original entry.  The format for each line is "
+"<literal>MarkKeep</literal>, <literal>MarkDelete</literal> or "
+"<literal>MarkInstall</literal> followed by <literal>package-name &lt;a.b.c -"
+"&gt; d.e.f | x.y.z&gt; (section)</literal> where <literal>a.b.c</literal> is "
+"the current version of the package, <literal>d.e.f</literal> is the version "
+"considered for installation and <literal>x.y.z</literal> is a newer version, "
+"but not considered for installation (because of a low pin score). The later "
+"two can be omitted if there is none or if it is the same as the installed "
+"version.  <literal>section</literal> is the name of the section the package "
+"appears in."
 msgstr ""
 "generiert Fehlersuchmeldungen, die beschreiben, welches Paket als "
 "»keep«/»install«/»remove« markiert ist, während der ProblemResolver seine "
@@ -5127,13 +5429,7 @@ msgstr ""
 "erscheint."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1002
-msgid "Dump the default configuration to standard error on startup."
-msgstr ""
-"gibt die Vorgabekonfiguration beim Start auf der Standardfehlerausgabe aus."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1012
+#: apt.conf.5.xml:1050
 msgid ""
 "When invoking &dpkg;, output the precise command line with which it is being "
 "invoked, with arguments separated by a single space character."
@@ -5143,7 +5439,7 @@ msgstr ""
 "sind, aus."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1023
+#: apt.conf.5.xml:1061
 msgid ""
 "Output all the data received from &dpkg; on the status file descriptor and "
 "any errors encountered while parsing it."
@@ -5152,7 +5448,7 @@ msgstr ""
 "und alle während deren Auswertung gefundenen Fehler aus."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1034
+#: apt.conf.5.xml:1072
 msgid ""
 "Generate a trace of the algorithm that decides the order in which "
 "<literal>apt</literal> should pass packages to &dpkg;."
@@ -5162,7 +5458,7 @@ msgstr ""
 "soll."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1046
+#: apt.conf.5.xml:1084
 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr ""
@@ -5170,12 +5466,12 @@ msgstr ""
 "von &dpkg; ausgeführt werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1057
+#: apt.conf.5.xml:1095
 msgid "Output the priority of each package list on startup."
 msgstr "gibt die Priorität jeder Paketliste beim Start aus."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1067
+#: apt.conf.5.xml:1105
 msgid ""
 "Trace the execution of the dependency resolver (this applies only to what "
 "happens when a complex dependency problem is encountered)."
@@ -5185,7 +5481,7 @@ msgstr ""
 "aufgetreten ist)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1078
+#: apt.conf.5.xml:1116
 msgid ""
 "Display a list of all installed packages with their calculated score used by "
 "the pkgProblemResolver. The description of the package is the same as "
@@ -5197,7 +5493,7 @@ msgstr ""
 "Marker</literal> beschrieben."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1090
+#: apt.conf.5.xml:1128
 msgid ""
 "Print information about the vendors read from <filename>/etc/apt/vendors."
 "list</filename>."
@@ -5206,13 +5502,13 @@ msgstr ""
 "filename> gelesenen Anbieter aus."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1112 apt_preferences.5.xml:545 sources.list.5.xml:211
+#: apt.conf.5.xml:1150 apt_preferences.5.xml:545 sources.list.5.xml:211
 #: apt-ftparchive.1.xml:596
 msgid "Examples"
 msgstr "Beispiele"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1113
+#: apt.conf.5.xml:1151
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
@@ -5222,7 +5518,7 @@ msgstr ""
 
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1125
+#: apt.conf.5.xml:1163
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
 
@@ -5332,7 +5628,7 @@ msgid ""
 "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, unless that file matches a pattern in the "
-"<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this "
+"<literal>Dir::Ignore-Files-Silently</literal> configuration list - in which "
 "case it will be silently ignored."
 msgstr ""
 "Beachten Sie, dass die Dateien im Verzeichnis <filename>/etc/apt/preferences."
@@ -6621,41 +6917,25 @@ msgid "Package resource list for APT"
 msgstr "Paketressourcenliste für APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:37
+#: sources.list.5.xml:38
 msgid ""
-"The package resource list is used to locate archives of the package "
-"distribution system in use on the system. At this time, this manual page "
-"documents only the packaging system used by the Debian system.  This control "
-"file is <filename>/etc/apt/sources.list</filename>."
+"The source list <filename>/etc/apt/sources.list</filename> is designed to "
+"support any number of active sources and a variety of source media. The file "
+"lists one source per line, with the most preferred source listed first. The "
+"information available from the configured sources is acquired by "
+"<command>apt-get update</command> (or by an equivalent command from another "
+"APT front-end)."
 msgstr ""
-"Die Paketquellenliste wird benutzt, um Archive des Paketverteilungssystems, "
-"das auf dem System benutzt wird, zu finden. Momentan dokumentiert diese "
-"Handbuchseite nur das vom Debian-GNU/Linux-System benutzte "
-"Paketierungssystem. Diese Steuerungsdatei ist <filename>/etc/apt/sources."
-"list</filename>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:42
-msgid ""
-"The source list is designed to support any number of active sources and a "
-"variety of source media. The file lists one source per line, with the most "
-"preferred source listed first. The format of each line is: <literal>type uri "
-"args</literal> The first item, <literal>type</literal> determines the format "
-"for <literal>args</literal>. <literal>uri</literal> is a Universal Resource "
-"Identifier (URI), which is a superset of the more specific and well-known "
-"Universal Resource Locator, or URL. The rest of the line can be marked as a "
-"comment by using a #."
-msgstr ""
-"Die Quellenliste wurde entworfen, um eine beliebige Anzahl von aktiven "
-"Quellen und eine Vielzahl von Quellmedien zu unterstützen. Die Datei listet "
-"eine Quelle pro Zeile auf, wobei die bevorzugten Quellen zuerst aufgelistet "
-"sind. Das Format jeder Zeile lautet: <literal>Typ URI Argumente</literal>. "
-"Das erste Element <literal>Typ</literal> legt das Format für "
-"<literal>Argumente</literal> fest. <literal>URI</literal> ist ein "
-"universeller Quellenbezeichner »Universal Resource Identifier« (URI), der "
-"eine Obermenge des spezielleren und besser bekannten Universal Resource "
-"Locator (URL) ist. Der Rest der Zeile kann unter Verwendung von # als "
-"Kommentar markiert werden."
+#: sources.list.5.xml:45
+msgid ""
+"Each line specifying a source starts with type (e.g. <literal>deb-src</"
+"literal>)  followed by options and arguments for this type.  Individual "
+"entries cannot be continued onto a following line. Empty lines are ignored, "
+"and a <literal>#</literal> character anywhere on a line marks the remainder "
+"of that line as a comment."
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: sources.list.5.xml:53
@@ -6672,7 +6952,7 @@ msgid ""
 "digits (0-9), underscore (_), hyphen (-) and period (.) characters.  "
 "Otherwise APT will print a notice that it has ignored a file, unless that "
 "file matches a pattern in the <literal>Dir::Ignore-Files-Silently</literal> "
-"configuration list - in this case it will be silently ignored."
+"configuration list - in which case it will be silently ignored."
 msgstr ""
 "Das Verzeichnis <filename>/etc/apt/sources.list.d</filename> stellt eine "
 "Möglichkeit bereit, sources.list-Einträge in separaten Dateien hinzuzufügen. "
@@ -6692,16 +6972,16 @@ msgstr "Die Typen deb und deb-src"
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:66
 msgid ""
-"The <literal>deb</literal> type describes a typical two-level Debian "
-"archive, <filename>distribution/component</filename>. Typically, "
-"<literal>distribution</literal> is generally an archivename like "
+"The <literal>deb</literal> type references a typical two-level Debian "
+"archive, <filename>distribution/component</filename>. The "
+"<literal>distribution</literal> is generally an archive name like "
 "<literal>stable</literal> or <literal>testing</literal> or a codename like "
 "<literal>&stable-codename;</literal> or <literal>&testing-codename;</"
-"literal> while component is one of <literal>main</literal> <literal>contrib</"
-"literal> or <literal>non-free</literal>. The <literal>deb-src</literal> type "
-"describes a debian distribution's source code in the same form as the "
-"<literal>deb</literal> type.  A <literal>deb-src</literal> line is required "
-"to fetch source indexes."
+"literal> while component is one of <literal>main</literal>, "
+"<literal>contrib</literal> or <literal>non-free</literal>. The <literal>deb-"
+"src</literal> type references a Debian distribution's source code in the "
+"same form as the <literal>deb</literal> type.  A <literal>deb-src</literal> "
+"line is required to fetch source indexes."
 msgstr ""
 "Der <literal>deb</literal>-Typ beschreibt ein typisches zweistufiges Debian-"
 "Archiv, <filename>Distribution/Komponente</filename>. <literal>Distribution</"
@@ -6736,32 +7016,42 @@ msgid ""
 "Debian distribution, from which APT will find the information it needs.  "
 "<literal>distribution</literal> can specify an exact path, in which case the "
 "components must be omitted and <literal>distribution</literal> must end with "
-"a slash (/). This is useful for when the case only a particular sub-section "
-"of the archive denoted by the URI is of interest.  If <literal>distribution</"
-"literal> does not specify an exact path, at least one <literal>component</"
-"literal> must be present."
+"a slash (<literal>/</literal>). This is useful for the case when only a "
+"particular sub-section of the archive denoted by the URI is of interest.  If "
+"<literal>distribution</literal> does not specify an exact path, at least one "
+"<literal>component</literal> must be present."
 msgstr ""
 "Die URI für den <literal>deb</literal>-Typ muss die Basis der Debian-"
 "Distribution angeben, wo APT die Informationen findet, die es benötigt. "
 "<literal>Distribution</literal> kann einen genauen Pfad angeben. In diesem "
 "Fall müssen die Komponenten weggelassen werden und <literal>Distribution</"
-"literal> muss mit einem Schrägstrich (/) enden. Dies ist nützlich, wenn nur "
-"ein bestimmter Unterabschnitt des von der URI angegebenen Archivs von "
-"Interesse ist. Wenn <literal>Distribution</literal> keinen genauen Pfad "
-"angibt, muss mindestens eine <literal>Komponente</literal> angegeben sein."
+"literal> muss mit einem Schrägstrich (<literal>/</literal>) enden. Dies ist "
+"nützlich, wenn nur ein bestimmter Unterabschnitt des von der URI angegebenen "
+"Archivs von Interesse ist. Wenn <literal>Distribution</literal> keinen "
+"genauen Pfad angibt, muss mindestens eine <literal>Komponente</literal> "
+"angegeben sein."
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:92
+#, fuzzy
+#| msgid ""
+#| "<literal>distribution</literal> may also contain a variable, <literal>"
+#| "$(ARCH)</literal> which expands to the Debian architecture (i386, amd64, "
+#| "powerpc, ...)  used on the system. This permits architecture-independent "
+#| "<filename>sources.list</filename> files to be used. In general this is "
+#| "only of interest when specifying an exact path, <literal>APT</literal> "
+#| "will automatically generate a URI with the current architecture otherwise."
 msgid ""
 "<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)"
-"</literal> which expands to the Debian architecture (i386, m68k, "
-"powerpc, ...)  used on the system. This permits architecture-independent "
-"<filename>sources.list</filename> files to be used. In general this is only "
-"of interest when specifying an exact path, <literal>APT</literal> will "
-"automatically generate a URI with the current architecture otherwise."
+"</literal> which expands to the Debian architecture (such as <literal>amd64</"
+"literal> or <literal>armel</literal>) used on the system. This permits "
+"architecture-independent <filename>sources.list</filename> files to be used. "
+"In general this is only of interest when specifying an exact path, "
+"<literal>APT</literal> will automatically generate a URI with the current "
+"architecture otherwise."
 msgstr ""
 "<literal>Distribution</literal> könnte außerdem eine Variable, <literal>"
-"$(ARCH)</literal>, enthalten, die zur Debian-Architektur (i386, m68k, "
+"$(ARCH)</literal>, enthalten, die zur Debian-Architektur (i386, amd64, "
 "powerpc, …) expandiert wird, die auf dem System benutzt wird. Dies erlaubt "
 "es, architekturabhängige <filename>sources.list</filename>-Dateien zu "
 "benutzen. Im Allgemeinen ist dies nur von Interesse, wenn ein genauer Pfad "
@@ -6798,12 +7088,12 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:112
 msgid ""
-"<literal>options</literal> is always optional and needs to be surounded by "
+"<literal>options</literal> is always optional and needs to be surrounded 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:"
+"following settings are supported by APT (note however that unsupported "
+"settings will be ignored silently):"
 msgstr ""
 "<literal>options</literal> ist immer optional und muss in eckige Klammern "
 "eingeschlossen werden. Es kann aus mehreren Einstellungen in der Form "
@@ -6818,7 +7108,7 @@ msgstr ""
 msgid ""
 "<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 "
+"information should be downloaded. If this option is not set all "
 "architectures defined by the <literal>APT::Architectures</literal> option "
 "will be downloaded."
 msgstr ""
@@ -6930,13 +7220,23 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml:172
+#, fuzzy
+#| msgid ""
+#| "The ftp scheme specifies an FTP server for the archive. APT's FTP "
+#| "behavior is highly configurable; for more information see the &apt-conf; "
+#| "manual page. Please note that a ftp proxy can be specified by using the "
+#| "<envar>ftp_proxy</envar> environment variable. It is possible to specify "
+#| "a http proxy (http proxy servers often understand ftp urls)  using this "
+#| "method and ONLY this method. ftp proxies using http specified in the "
+#| "configuration file will be ignored."
 msgid ""
 "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
 "is highly configurable; for more information see the &apt-conf; manual page. "
-"Please note that a ftp proxy can be specified by using the <envar>ftp_proxy</"
-"envar> environment variable. It is possible to specify a http proxy (http "
-"proxy servers often understand ftp urls)  using this method and ONLY this "
-"method. ftp proxies using http specified in the configuration file will be "
+"Please note that an FTP proxy can be specified by using the "
+"<envar>ftp_proxy</envar> environment variable. It is possible to specify an "
+"HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
+"environment variable and <emphasis>ONLY</emphasis> this environment "
+"variable. Proxies using HTTP specified in the configuration file will be "
 "ignored."
 msgstr ""
 "Das ftp-Schema gibt einen FTP-Server für das Archiv an. Das FTP-Verhalten "
@@ -6949,11 +7249,18 @@ msgstr ""
 "Konfigurationsdatei HTTP benutzen, werden ignoriert."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:183
+#: sources.list.5.xml:184
+#, fuzzy
+#| msgid ""
+#| "The copy scheme is identical to the file scheme except that packages are "
+#| "copied into the cache directory instead of used directly at their "
+#| "location.  This is useful for people using a zip disk to copy files "
+#| "around with APT."
 msgid ""
 "The copy scheme is identical to the file scheme except that packages are "
 "copied into the cache directory instead of used directly at their location.  "
-"This is useful for people using a zip disk to copy files around with APT."
+"This is useful for people using removable media to copy files around with "
+"APT."
 msgstr ""
 "Das copy-Schema ist identisch mit dem file-Schema, außer dass Pakete in das "
 "Zwischenspeicherverzeichnis kopiert werden, anstatt direkt von ihrem "
@@ -6961,13 +7268,19 @@ msgstr ""
 "Platte benutzen, um Dateien mit APT umherzukopieren."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:190
+#: sources.list.5.xml:191
+#, fuzzy
+#| msgid ""
+#| "The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given "
+#| "user and access the files. It is a good idea to do prior arrangements "
+#| "with RSA keys or rhosts.  Access to files on the remote uses standard "
+#| "<command>find</command> and <command>dd</command> commands to perform the "
+#| "file transfers from the remote."
 msgid ""
-"The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given "
-"user and access the files. It is a good idea to do prior arrangements with "
-"RSA keys or rhosts.  Access to files on the remote uses standard "
-"<command>find</command> and <command>dd</command> commands to perform the "
-"file transfers from the remote."
+"The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
+"the files as a given user. Prior configuration of rhosts or RSA keys is "
+"recommended. The standard <command>find</command> and <command>dd</command> "
+"commands are used to perform the file transfers from the remote host."
 msgstr ""
 "Die rsh/ssh-Methode ruft rsh/ssh auf, um sich als angegebener Benutzer mit "
 "einem Rechner in der Ferne zu verbinden und auf die Dateien zuzugreifen. Es "
@@ -6985,13 +7298,22 @@ msgstr "weitere erkennbare URI-Typen"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml:200
-msgid ""
-"APT can be extended with more methods shipped in other optional packages "
-"which should follow the nameing scheme <package>apt-transport-"
-"<replaceable>method</replaceable></package>.  The APT team e.g. maintains "
-"also the <package>apt-transport-https</package> package which provides "
-"access methods for https-URIs with features similar to the http method, but "
-"other methods for using e.g. debtorrent are also available, see &apt-"
+#, fuzzy
+#| msgid ""
+#| "APT can be extended with more methods shipped in other optional packages "
+#| "which should follow the nameing scheme <package>apt-transport-"
+#| "<replaceable>method</replaceable></package>.  The APT team e.g. maintains "
+#| "also the <package>apt-transport-https</package> package which provides "
+#| "access methods for https-URIs with features similar to the http method, "
+#| "but other methods for using e.g. debtorrent are also available, see &apt-"
+#| "transport-debtorrent;."
+msgid ""
+"APT can be extended with more methods shipped in other optional packages, "
+"which should follow the naming scheme <package>apt-transport-"
+"<replaceable>method</replaceable></package>.  For instance, the APT team "
+"also maintains the package <package>apt-transport-https</package>, which "
+"provides access methods for HTTPS URIs with features similar to the http "
+"method.  Methods for using e.g. debtorrent are also available - see &apt-"
 "transport-debtorrent;."
 msgstr ""
 "APT kann mit weiteren Methoden, die in anderen optionalen Paketen geliefert "
@@ -7233,7 +7555,10 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-sortpkgs.1.xml:45
-msgid "All output is sent to stdout, the input must be a seekable file."
+#, fuzzy
+#| msgid "All output is sent to stdout, the input must be a seekable file."
+msgid ""
+"All output is sent to standard output; the input must be a seekable file."
 msgstr ""
 "Alle Ausgaben werden an stdout gesendet, die Eingabe muss eine durchsuchbare "
 "Datei sein."
@@ -9919,6 +10244,151 @@ msgstr "  # apt-get -o dir::cache::archives=\"/Platte/\" dist-upgrade"
 msgid "Which will use the already fetched archives on the disc."
 msgstr "Es wird die bereits auf die Platte heruntergeladenen Archive benutzen."
 
+#~ msgid ""
+#~ "All Architectures the system supports. Processors implementing the "
+#~ "<literal>amd64</literal> (also called <literal>x86-64</literal>) "
+#~ "instruction set are e.g. also able to execute binaries compiled for the "
+#~ "<literal>i386</literal> (<literal>x86</literal>) instruction set; 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 ""
+#~ "alle Architekturen, die das System unterstützt. Prozessoren, die "
+#~ "<literal>amd64</literal>-Befehlssätze implementieren (auch "
+#~ "<literal>x86-64</literal> genannt) sind beispielsweise ebenso in der "
+#~ "Lage, Programme auszuführen, die für <literal>i386</literal>-Befehlssätzt "
+#~ "(<literal>x86</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 ""
+#~ "As the configuration can be deferred to be done at the end by &dpkg; it "
+#~ "can be tried to order the unpack series only by critical needs, e.g. by "
+#~ "Pre-Depends. Default is true and therefore the \"old\" method of ordering "
+#~ "in various steps by everything. While both method were present in earlier "
+#~ "APT versions the <literal>OrderCritical</literal> method was unused, so "
+#~ "this method is very experimental and needs further improvements before "
+#~ "becoming really useful."
+#~ msgstr ""
+#~ "Da die Konfiguration an das Ende von Dpkg verschoben werden kann, kann "
+#~ "versucht werden, nur die Entpackserien von kritischen Notwendigkeiten, z."
+#~ "B. von Pre-Depends, anzuweisen. Vorgabe ist true und daher die »alte« "
+#~ "Methode zum Sortieren nach allem in mehreren Schritten. Obwohl in "
+#~ "früheren Versionen von APT beide Methoden enthalten waren, wurde die "
+#~ "<literal>OrderCritical</literal>-Methode nicht benutzt, so dass diese "
+#~ "Methode sehr experimentell ist und weitere Verbesserungen benötigt, bevor "
+#~ "sie wirklich nützlich wird."
+
+#~ msgid "Dump the default configuration to standard error on startup."
+#~ msgstr ""
+#~ "gibt die Vorgabekonfiguration beim Start auf der Standardfehlerausgabe "
+#~ "aus."
+
+#~ msgid ""
+#~ "Defaults to on which will cause APT to install essential and important "
+#~ "packages as fast as possible in the install/upgrade operation. This is "
+#~ "done to limit the effect of a failing &dpkg; call: If this option is "
+#~ "disabled APT does treat an important package in the same way as an extra "
+#~ "package: Between the unpacking of the important package A and his "
+#~ "configuration can then be many other unpack or configuration calls, e.g. "
+#~ "for package B which has no relation to A, but causes the dpkg call to "
+#~ "fail (e.g. because maintainer script of package B generates an error) "
+#~ "which results in a system state in which package A is unpacked but "
+#~ "unconfigured - each package depending on A is now no longer guaranteed to "
+#~ "work as their dependency on A is not longer satisfied. The immediate "
+#~ "configuration marker is also applied to all dependencies which can "
+#~ "generate a problem if the dependencies e.g. form a circle as a dependency "
+#~ "with the immediate flag is comparable with a Pre-Dependency. So in theory "
+#~ "it is possible that APT encounters a situation in which it is unable to "
+#~ "perform immediate configuration, errors out and refers to this option so "
+#~ "the user can deactivate the immediate configuration temporarily to be "
+#~ "able to perform an install/upgrade again. Note the use of the word "
+#~ "\"theory\" here as this problem was only encountered by now in real world "
+#~ "a few times in non-stable distribution versions and was caused by wrong "
+#~ "dependencies of the package in question or by a system in an already "
+#~ "broken state, so you should not blindly disable this option as the "
+#~ "mentioned scenario above is not the only problem immediate configuration "
+#~ "can help to prevent in the first place.  Before a big operation like "
+#~ "<literal>dist-upgrade</literal> is run with this option disabled it "
+#~ "should be tried to explicitly <literal>install</literal> the package APT "
+#~ "is unable to configure immediately, but please make sure to report your "
+#~ "problem also to your distribution and to the APT team with the buglink "
+#~ "below so they can work on improving or correcting the upgrade process."
+#~ msgstr ""
+#~ "standardmäßig »on«, wodurch APT veranlasst wird, »essential«- oder "
+#~ "»important«-Pakete so schnell wie möglich in der »install«-/»upgrade«-"
+#~ "Operation zu installieren. Dies wird getan, um den Effekt eines "
+#~ "gescheiterterten &dpkg;-Aufrufs zu begrenzen: Wenn diese Option "
+#~ "ausgeschaltet ist, behandelt APT ein »important«-Paket auf die gleiche "
+#~ "Weise wie ein »extra«-Paket: Zwischen dem Entpacken des »important«-"
+#~ "Pakets A und seiner Konfiguration können dann viele andere Entpack- oder "
+#~ "Konfigurationsaufrufe liegen, z.B. für Paket B, das keine Beziehung zu A "
+#~ "hat, aber den dpkg-Aufruf zum Scheitern bringt (z.B. weil das "
+#~ "Betreuerskript von Paket B Fehler generiert), die als Ergebnis einen "
+#~ "Systemstatus haben, in dem Paket A entpackt, aber nicht konfiguriert ist "
+#~ "und für kein von A abhängendes Paket länger gewährleistet ist, dass es "
+#~ "funktioniert, weil die Abhängigkeit zu A nicht länger befriedigt wird. "
+#~ "Das unmittelbare Konfigurationskennzeichen wird außerdem auf alle "
+#~ "Abhängigkeiten angewandt, was zu einem Problem führen könnten, falls die "
+#~ "Abhängigkeiten z.B. einen Kreis bilden, so dass eine Abhängigkeit mit der "
+#~ "Unmittelbarmarkierung mit einer Vorabhängigkeit vergleichbar ist. So ist "
+#~ "es theoretisch möglich, dass APT einer Situation begegnet, in der keine "
+#~ "unmittelbare Konfiguration durchgeführt, ein Fehler ausgegeben und sich "
+#~ "auf diese Option bezogen werden kann, so dass der Anwender die "
+#~ "unmittelbare Konfiguration zeitweise deaktivieren kann, um in der Lage zu "
+#~ "sein, erneut ein »install«/»upgrade« durchzuführen. Beachten Sie, dass "
+#~ "hier das Wort »theoretisch« benutzt wird, denn dieses Problem ist bis "
+#~ "jetzt in der Realität nur ein paar mal in unstabilen "
+#~ "Distributionsversionen aufgetreten und wurde durch falsche Abhängigkeiten "
+#~ "des fraglichen Pakets ausgelöst oder durch ein System in bereits kaputtem "
+#~ "Status, so dass Sie diese Option nicht unbesehen abschalten sollten, da "
+#~ "das oben erwähnte Szenario nicht das einzige unmittelbare Problem ist, "
+#~ "das die Konfiguration überhaupt verhindern sollte. Bevor eine große "
+#~ "Operation wie <literal>dist-upgrade</literal> mit dieser ausgeschalteten "
+#~ "Option ausgeführt wird, sollte explizit versucht werden, "
+#~ "<literal>install</literal> des Pakets durchzuführen. APT ist nicht in der "
+#~ "Lage unmittelbar zu konfigurieren, aber stellen Sie sicher, dass Sie Ihr "
+#~ "Problem außerdem an Ihre Distribution und an das APT-Team berichten mit "
+#~ "nachstehendem Fehlerverweis, so dass es am Verbessern oder Korrigieren "
+#~ "des Upgrade-Prozesses arbeiten kann."
+
+#~ msgid ""
+#~ "The package resource list is used to locate archives of the package "
+#~ "distribution system in use on the system. At this time, this manual page "
+#~ "documents only the packaging system used by the Debian system.  This "
+#~ "control file is <filename>/etc/apt/sources.list</filename>."
+#~ msgstr ""
+#~ "Die Paketquellenliste wird benutzt, um Archive des "
+#~ "Paketverteilungssystems, das auf dem System benutzt wird, zu finden. "
+#~ "Momentan dokumentiert diese Handbuchseite nur das vom Debian-GNU/Linux-"
+#~ "System benutzte Paketierungssystem. Diese Steuerungsdatei ist <filename>/"
+#~ "etc/apt/sources.list</filename>."
+
+#~ msgid ""
+#~ "The source list is designed to support any number of active sources and a "
+#~ "variety of source media. The file lists one source per line, with the "
+#~ "most preferred source listed first. The format of each line is: "
+#~ "<literal>type uri args</literal> The first item, <literal>type</literal> "
+#~ "determines the format for <literal>args</literal>. <literal>uri</literal> "
+#~ "is a Universal Resource Identifier (URI), which is a superset of the more "
+#~ "specific and well-known Universal Resource Locator, or URL. The rest of "
+#~ "the line can be marked as a comment by using a #."
+#~ msgstr ""
+#~ "Die Quellenliste wurde entworfen, um eine beliebige Anzahl von aktiven "
+#~ "Quellen und eine Vielzahl von Quellmedien zu unterstützen. Die Datei "
+#~ "listet eine Quelle pro Zeile auf, wobei die bevorzugten Quellen zuerst "
+#~ "aufgelistet sind. Das Format jeder Zeile lautet: <literal>Typ URI "
+#~ "Argumente</literal>. Das erste Element <literal>Typ</literal> legt das "
+#~ "Format für <literal>Argumente</literal> fest. <literal>URI</literal> ist "
+#~ "ein universeller Quellenbezeichner »Universal Resource Identifier« (URI), "
+#~ "der eine Obermenge des spezielleren und besser bekannten Universal "
+#~ "Resource Locator (URL) ist. Der Rest der Zeile kann unter Verwendung von "
+#~ "# als Kommentar markiert werden."
+
 #, fuzzy
 #~ msgid ""
 #~ "The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, "
diff --git a/doc/po/es.po b/doc/po/es.po
index d0b0933f8..0df642f65 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -37,7 +37,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.25\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-06 23:46+0300\n"
+"POT-Creation-Date: 2012-06-09 19:12+0300\n"
 "PO-Revision-Date: 2010-08-25 03:25+0200\n"
 "Last-Translator: Omar Campagne <ocampagne@gmail.com>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -1629,14 +1629,14 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml:518 apt-cache.8.xml:343 apt-key.8.xml:174 apt-mark.8.xml:125
-#: apt.conf.5.xml:1118 apt_preferences.5.xml:698
+#: apt.conf.5.xml:1156 apt_preferences.5.xml:698
 msgid "Files"
 msgstr "Ficheros"
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131
 #: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109
-#: apt.conf.5.xml:1124 apt_preferences.5.xml:705 sources.list.5.xml:252
+#: apt.conf.5.xml:1162 apt_preferences.5.xml:705 sources.list.5.xml:252
 #: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63
 #: apt-ftparchive.1.xml:607
 msgid "See Also"
@@ -3236,11 +3236,17 @@ msgstr "Fichero de configuración de APT"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:42
+#, fuzzy
+#| msgid ""
+#| "<filename>apt.conf</filename> is the main configuration file for the APT "
+#| "suite of tools, but by far not the only place changes to options can be "
+#| "made. All tools therefore share the configuration files and also use a "
+#| "common command line parser to provide a uniform environment."
 msgid ""
-"<filename>apt.conf</filename> is the main configuration file for the APT "
-"suite of tools, but by far not the only place changes to options can be "
-"made. All tools therefore share the configuration files and also use a "
-"common command line parser to provide a uniform environment."
+"<filename>/etc/apt/apt.conf</filename> is the main configuration file shared "
+"by all the tools in the APT suite of tools, though it is by no means the "
+"only place options can be set. The suite also shares a common command line "
+"parser to provide a uniform environment."
 msgstr ""
 "<filename>apt.conf</filename> es el fichero de configuración principal del "
 "conjunto de herramientas APT, pero no es ni mucho menos donde se pueden "
@@ -3249,7 +3255,7 @@ msgstr ""
 "órdenes común para ofrecer un entorno uniforme."
 
 #. type: Content of: <refentry><refsect1><orderedlist><para>
-#: apt.conf.5.xml:47
+#: apt.conf.5.xml:48
 msgid ""
 "When an APT tool starts up it will read the configuration files in the "
 "following order:"
@@ -3258,7 +3264,7 @@ msgstr ""
 "en el siguiente orden:"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:49
+#: apt.conf.5.xml:50
 msgid ""
 "the file specified by the <envar>APT_CONFIG</envar> environment variable (if "
 "any)"
@@ -3267,7 +3273,7 @@ msgstr ""
 "existir)."
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:51
+#: apt.conf.5.xml:52
 #, fuzzy
 #| msgid ""
 #| "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
@@ -3280,8 +3286,8 @@ msgid ""
 "extension and which only contain alphanumeric, hyphen (-), underscore (_) "
 "and period (.) characters.  Otherwise APT will print a notice that it has "
 "ignored a file, unless that file matches a pattern in the <literal>Dir::"
-"Ignore-Files-Silently</literal> configuration list - in this case it will be "
-"silently ignored."
+"Ignore-Files-Silently</literal> configuration list - in which case it will "
+"be silently ignored."
 msgstr ""
 "Todos los ficheros en <literal>Dir::Etc::Parts</literal> en orden "
 "alfanumérico ascendente que no tienen extensión o la extensión "
@@ -3290,7 +3296,7 @@ msgstr ""
 "silenciosamente."
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:58
+#: apt.conf.5.xml:59
 msgid ""
 "the main configuration file specified by <literal>Dir::Etc::main</literal>"
 msgstr ""
@@ -3298,7 +3304,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:60
+#: apt.conf.5.xml:61
 msgid ""
 "the command line options are applied to override the configuration "
 "directives or to load even more configuration files."
@@ -3307,16 +3313,16 @@ msgstr ""
 "configuración o para cargar más ficheros de configuración."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:64
+#: apt.conf.5.xml:65
 msgid "Syntax"
 msgstr "Sintaxis"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:65
+#: apt.conf.5.xml:66
 msgid ""
 "The configuration file is organized in a tree with options organized into "
 "functional groups. Option specification is given with a double colon "
-"notation, for instance <literal>APT::Get::Assume-Yes</literal> is an option "
+"notation; for instance <literal>APT::Get::Assume-Yes</literal> is an option "
 "within the APT tool group, for the Get tool. Options do not inherit from "
 "their parent groups."
 msgstr ""
@@ -3327,19 +3333,31 @@ msgstr ""
 "APT. Las opciones no se heredan de sus grupos paternos."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:71
+#: apt.conf.5.xml:72
+#, fuzzy
+#| msgid ""
+#| "Syntactically the configuration language is modeled after what the ISC "
+#| "tools such as bind and dhcp use. Lines starting with <literal>//</"
+#| "literal> are treated as comments (ignored), as well as all text between "
+#| "<literal>/*</literal> and <literal>*/</literal>, just like C/C++ "
+#| "comments.  Each line is of the form <literal>APT::Get::Assume-Yes \"true"
+#| "\";</literal>. The trailing semicolon and the quotes are required. The "
+#| "value must be on one line, and there is no kind of string concatenation. "
+#| "It must not include inside quotes.  The behavior of the backslash \"\\\" "
+#| "and escaped characters inside a value is undefined and it should not be "
+#| "used. An option name may include alphanumerical characters and the \"/-:._"
+#| "+\" characters. A new scope can be opened with curly braces, like:"
 msgid ""
 "Syntactically the configuration language is modeled after what the ISC tools "
 "such as bind and dhcp use. Lines starting with <literal>//</literal> are "
 "treated as comments (ignored), as well as all text between <literal>/*</"
 "literal> and <literal>*/</literal>, just like C/C++ comments.  Each line is "
-"of the form <literal>APT::Get::Assume-Yes \"true\";</literal>. The trailing "
-"semicolon and the quotes are required. The value must be on one line, and "
-"there is no kind of string concatenation. It must not include inside "
-"quotes.  The behavior of the backslash \"\\\" and escaped characters inside "
-"a value is undefined and it should not be used. An option name may include "
-"alphanumerical characters and the \"/-:._+\" characters. A new scope can be "
-"opened with curly braces, like:"
+"of the form <literal>APT::Get::Assume-Yes \"true\";</literal>.  The "
+"quotation marks and trailing semicolon are required.  The value must be on "
+"one line, and there is no kind of string concatenation.  Values must not "
+"include backslashes or extra quotation marks.  Option names are made up of "
+"alphanumeric characters and the characters \"/-:._+\".  A new scope can be "
+"opened with curly braces, like this:"
 msgstr ""
 "Sintácticamente, el modelo del lenguaje de configuración es similar a las "
 "herramientas de ISC como pueden ser «bind» y «dhcp». Las líneas que "
@@ -3374,10 +3392,16 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:93
+#, fuzzy
+#| msgid ""
+#| "with newlines placed to make it more readable. Lists can be created by "
+#| "opening a scope and including a single string enclosed in quotes followed "
+#| "by a semicolon. Multiple entries can be included, each separated by a "
+#| "semicolon."
 msgid ""
 "with newlines placed to make it more readable. Lists can be created by "
 "opening a scope and including a single string enclosed in quotes followed by "
-"a semicolon. Multiple entries can be included, each separated by a semicolon."
+"a semicolon. Multiple entries can be included, separated by a semicolon."
 msgstr ""
 "con nuevas líneas ubicadas para hacerlo más legible. Las listas pueden "
 "crearse abriendo un nuevo ámbito e incluyendo una única cadena acotada entre "
@@ -3402,9 +3426,13 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:105
+#, fuzzy
+#| msgid ""
+#| "The names of the configuration items are not case-sensitive. So in the "
+#| "previous example you could use <literal>dpkg::pre-install-pkgs</literal>."
 msgid ""
-"The names of the configuration items are not case-sensitive. So in the "
-"previous example you could use <literal>dpkg::pre-install-pkgs</literal>."
+"Case is not significant in names of configuration items, so in the previous "
+"example you could use <literal>dpkg::pre-install-pkgs</literal>."
 msgstr ""
 "Los nombres de las opciones de configuración no diferencian mayúsculas de "
 "minúsculas. De modo que en el ejemplo anterior se podría haber usado "
@@ -3413,11 +3441,11 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:108
 msgid ""
-"Names for the configuration items are optional if a list is defined as it "
-"can be see in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. "
-"If you don't specify a name a new entry will simply add a new option to the "
-"list. If you specify a name you can override the option as every other "
-"option by reassigning a new value to the option."
+"Names for the configuration items are optional if a list is defined as can "
+"be seen in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. If "
+"you don't specify a name a new entry will simply add a new option to the "
+"list. If you specify a name you can override the option in the same way as "
+"any other option by reassigning a new value to the option."
 msgstr ""
 "Los nombres de las opciones de configuración son opcionales, si se define "
 "una lista como se puede ver en el ejemplo anterior de <literal>DPkg::Pre-"
@@ -3427,14 +3455,23 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:113
-msgid ""
-"Two specials are allowed, <literal>#include</literal> (which is deprecated "
-"and not supported by alternative implementations) and <literal>#clear</"
-"literal>: <literal>#include</literal> will include the given file, unless "
-"the filename ends in a slash, then the whole directory is included.  "
-"<literal>#clear</literal> is used to erase a part of the configuration tree. "
-"The specified element and all its descendants are erased.  (Note that these "
-"lines also need to end with a semicolon.)"
+#, fuzzy
+#| msgid ""
+#| "Two specials are allowed, <literal>#include</literal> (which is "
+#| "deprecated and not supported by alternative implementations) and "
+#| "<literal>#clear</literal>: <literal>#include</literal> will include the "
+#| "given file, unless the filename ends in a slash, then the whole directory "
+#| "is included.  <literal>#clear</literal> is used to erase a part of the "
+#| "configuration tree. The specified element and all its descendants are "
+#| "erased.  (Note that these lines also need to end with a semicolon.)"
+msgid ""
+"Two special commands are defined: <literal>#include</literal> (which is "
+"deprecated and not supported by alternative implementations) and "
+"<literal>#clear</literal>. <literal>#include</literal> will include the "
+"given file, unless the filename ends in a slash, in which case the whole "
+"directory is included.  <literal>#clear</literal> is used to erase a part of "
+"the configuration tree. The specified element and all its descendants are "
+"erased.  (Note that these lines also need to end with a semicolon.)"
 msgstr ""
 "Se permiten dos valores especiales, <literal>#include</literal> (ya obsoleto "
 "y no es compatible en implementaciones alternativas) y <literal>#clear</"
@@ -3446,13 +3483,20 @@ msgstr ""
 "necesitan acabar con punto y coma)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:121
-msgid ""
-"The #clear command is the only way to delete a list or a complete scope.  "
-"Reopening a scope or the ::-style described below will <emphasis>not</"
-"emphasis> override previously written entries. Only options can be "
-"overridden by addressing a new value to it - lists and scopes can't be "
-"overridden, only cleared."
+#: apt.conf.5.xml:123
+#, fuzzy
+#| msgid ""
+#| "The #clear command is the only way to delete a list or a complete scope.  "
+#| "Reopening a scope or the ::-style described below will <emphasis>not</"
+#| "emphasis> override previously written entries. Only options can be "
+#| "overridden by addressing a new value to it - lists and scopes can't be "
+#| "overridden, only cleared."
+msgid ""
+"The <literal>#clear</literal> command is the only way to delete a list or a "
+"complete scope. Reopening a scope (or using the syntax described below with "
+"an appended <literal>::</literal>) will <emphasis>not</emphasis> override "
+"previously written entries. Options can only be overridden by addressing a "
+"new value to them - lists and scopes can't be overridden, only cleared."
 msgstr ""
 "La orden #clear ofrece la única manera de borrar una lista o un ámbito "
 "completo. Reabrir un ámbito o el estilo de dos puntos dobles («::») descrito "
@@ -3461,33 +3505,34 @@ msgstr ""
 "valor, las listas y los ámbitos no se pueden redefinir, sólo eliminar."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:126
+#: apt.conf.5.xml:131
 #, fuzzy
 #| msgid ""
-#| "All of the APT tools take a -o option which allows an arbitrary "
+#| "All of the APT tools take an -o option which allows an arbitrary "
 #| "configuration directive to be specified on the command line. The syntax "
 #| "is a full option name (<literal>APT::Get::Assume-Yes</literal> for "
 #| "instance) followed by an equals sign then the new value of the option. "
 #| "Lists can be appended too by adding a trailing :: to the list name. (As "
 #| "you might suspect: The scope syntax can't be used on the command line.)"
 msgid ""
-"All of the APT tools take a -o option which allows an arbitrary "
+"All of the APT tools take an -o option which allows an arbitrary "
 "configuration directive to be specified on the command line. The syntax is a "
 "full option name (<literal>APT::Get::Assume-Yes</literal> for instance) "
 "followed by an equals sign then the new value of the option. To append a new "
-"element to a list, add a trailing :: to the name of the list. (As you might "
-"suspect: The scope syntax can't be used on the command line.)"
+"element to a list, add a trailing <literal>::</literal> to the name of the "
+"list.  (As you might suspect, the scope syntax can't be used on the command "
+"line.)"
 msgstr ""
 "Todas las herramientas de APT permiten la opción -o como una directriz "
 "arbitraria de configuración que se define en la línea de órdenes. La "
 "sintaxis es un nombre de opción completo (por ejemplo, <literal>APT::Get::"
 "Assume-Yes</literal>) seguido por signos de igualdad y el nuevo valor de la "
-"opción. También puede añadir listas añadiendo dos puntos dobles («::») al "
-"final del nombre de la lista. (Como ya podía imaginar, no puede usar la "
-"sintaxis de los ámbitos en la línea de órdenes)."
+"opción. También puede añadir listas añadiendo dos puntos dobles («<literal>::"
+"</literal>») al final del nombre de la lista. (Como ya podía imaginar, no "
+"puede usar la sintaxis de los ámbitos en la línea de órdenes)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:133
+#: apt.conf.5.xml:139
 #, fuzzy
 #| msgid ""
 #| "Note that you can use :: only for appending one item per line to a list "
@@ -3503,18 +3548,18 @@ msgstr ""
 #| "encounter this misuse, so please correct such statements now as long as "
 #| "APT doesn't complain explicit about them."
 msgid ""
-"Note that you can use :: only for appending one item per line to a list and "
-"that you should not use it in combination with the scope syntax.  (The scope "
-"syntax implicit insert ::) Using both syntaxes together will trigger a bug "
-"which some users unfortunately depend on: An option with the unusual name "
-"\"<literal>::</literal>\" which acts like every other option with a name. "
-"These introduces many problems including that a user who writes multiple "
-"lines in this <emphasis>wrong</emphasis> syntax in the hope to append to a "
-"list will gain the opposite as only the last assignment for this option "
-"\"<literal>::</literal>\" will be used. Upcoming APT versions will raise "
-"errors and will stop working if they encounter this misuse, so please "
-"correct such statements now as long as APT doesn't complain explicit about "
-"them."
+"Note that appending items to a list using <literal>::</literal> only works "
+"for one item per line, and that you should not use it in combination with "
+"the scope syntax (which adds <literal>::</literal> implicitly). Using both "
+"syntaxes together will trigger a bug which some users unfortunately depend "
+"on: an option with the unusual name \"<literal>::</literal>\" which acts "
+"like every other option with a name. This introduces many problems; for one "
+"thing, users who write multiple lines in this <emphasis>wrong</emphasis> "
+"syntax in the hope of appending to a list will achieve the opposite, as only "
+"the last assignment for this option \"<literal>::</literal>\" will be used. "
+"Future versions of APT will raise errors and stop working if they encounter "
+"this misuse, so please correct such statements now while APT doesn't "
+"explicitly complain about them."
 msgstr ""
 "Tenga en cuenta que puede usar los dos puntos dobles («::») sólo para añadir "
 "un elemento por línea a una lista, y que no debería usarlo en combinación "
@@ -3531,12 +3576,12 @@ msgstr ""
 "APT no se queja explícitamente de ellos."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:145
+#: apt.conf.5.xml:154
 msgid "The APT Group"
 msgstr "El grupo APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:146
+#: apt.conf.5.xml:155
 msgid ""
 "This group of options controls general APT behavior as well as holding the "
 "options for all of the tools."
@@ -3545,7 +3590,7 @@ msgstr ""
 "mantiene las opciones para todas las herramientas."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:151
+#: apt.conf.5.xml:160
 msgid ""
 "System Architecture; sets the architecture to use when fetching files and "
 "parsing package lists. The internal default is the architecture apt was "
@@ -3556,25 +3601,25 @@ msgstr ""
 "arquitectura para la que apt se compiló."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:157
+#: apt.conf.5.xml:167
 msgid ""
-"All Architectures the system supports. Processors implementing the "
-"<literal>amd64</literal> (also called <literal>x86-64</literal>) instruction "
-"set are e.g. also able to execute binaries compiled for the <literal>i386</"
-"literal> (<literal>x86</literal>) instruction set; 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>."
+"All Architectures the system supports. For instance, CPUs implementing the "
+"<literal>amd64</literal> (also called <literal>x86-64</literal>)  "
+"instruction set are also able to execute binaries compiled for the "
+"<literal>i386</literal> (<literal>x86</literal>) instruction set. This list "
+"is used when fetching files and parsing package lists. The initial default "
+"is always the system's native architecture (<literal>APT::Architecture</"
+"literal>), and foreign architectures are added to the default list when they "
+"are registered via <command>dpkg --add-architecture</command>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:167
+#: apt.conf.5.xml:180
 msgid ""
-"Default release to install packages from if more than one version available. "
-"Contains release name, codename or release version. Examples: 'stable', "
-"'testing', 'unstable', '&stable-codename;', '&testing-codename;', '4.0', "
-"'5.0*'. See also &apt-preferences;."
+"Default release to install packages from if more than one version is "
+"available. Contains release name, codename or release version. Examples: "
+"'stable', 'testing', 'unstable', '&stable-codename;', '&testing-codename;', "
+"'4.0', '5.0*'. See also &apt-preferences;."
 msgstr ""
 "La versión predeterminada de la que se instalarán los paquetes, si hay más "
 "de una versión disponible. Contiene el nombre de la versión, ya sea el "
@@ -3583,16 +3628,16 @@ msgstr ""
 "«5.0*». Vea también &apt-preferences;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:173
+#: apt.conf.5.xml:186
 msgid ""
-"Ignore Held packages; This global option causes the problem resolver to "
+"Ignore held packages; this global option causes the problem resolver to "
 "ignore held packages in its decision making."
 msgstr ""
 "Ignora paquetes retenidos, esta opción global causa que el solucionador de "
 "problemas ignore los paquetes retenidos en la toma de decisiones."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:178
+#: apt.conf.5.xml:191
 msgid ""
 "Defaults to on. When turned on the autoclean feature will remove any "
 "packages which can no longer be downloaded from the cache. If turned off "
@@ -3606,78 +3651,67 @@ msgstr ""
 "mecanismo directo para reinstalarlos."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:185
-msgid ""
-"Defaults to on which will cause APT to install essential and important "
-"packages as fast as possible in the install/upgrade operation. This is done "
-"to limit the effect of a failing &dpkg; call: If this option is disabled APT "
-"does treat an important package in the same way as an extra package: Between "
-"the unpacking of the important package A and his configuration can then be "
-"many other unpack or configuration calls, e.g. for package B which has no "
-"relation to A, but causes the dpkg call to fail (e.g. because maintainer "
-"script of package B generates an error) which results in a system state in "
-"which package A is unpacked but unconfigured - each package depending on A "
-"is now no longer guaranteed to work as their dependency on A is not longer "
-"satisfied. The immediate configuration marker is also applied to all "
-"dependencies which can generate a problem if the dependencies e.g. form a "
-"circle as a dependency with the immediate flag is comparable with a Pre-"
-"Dependency. So in theory it is possible that APT encounters a situation in "
-"which it is unable to perform immediate configuration, errors out and refers "
-"to this option so the user can deactivate the immediate configuration "
-"temporarily to be able to perform an install/upgrade again. Note the use of "
-"the word \"theory\" here as this problem was only encountered by now in real "
-"world a few times in non-stable distribution versions and was caused by "
-"wrong dependencies of the package in question or by a system in an already "
-"broken state, so you should not blindly disable this option as the mentioned "
-"scenario above is not the only problem immediate configuration can help to "
-"prevent in the first place.  Before a big operation like <literal>dist-"
-"upgrade</literal> is run with this option disabled it should be tried to "
-"explicitly <literal>install</literal> the package APT is unable to configure "
-"immediately, but please make sure to report your problem also to your "
-"distribution and to the APT team with the buglink below so they can work on "
-"improving or correcting the upgrade process."
-msgstr ""
-"Activo de forma predeterminada, hará que APT instale los paquetes esenciales "
-"e importantes tan rápido como le sea posible al instalar y/o actualizar. "
-"Esto se hace para limitar el efecto de un fallo en la ejecución de &dpkg;. "
-"Si esta opción está desactivada, APT trata los paquetes importantes del "
-"mismo modo que un paquete adicional: entre desempaquetar un paquete "
-"importante A y su configuración puede haber muchos otros desempaquetados y "
-"configuraciones. Por ejemplo, el paquete B que no tiene relación con A, pero "
-"que hace que la ejecución de dpkg falle (ya sea porque el script del "
-"mantenedor del paquete B genera un error) generará un estado del sistema en "
-"el que el paquete A está desempaquetado pero no configurado; no se garantiza "
-"el funcionamiento de cada paquete que depende de A ya que su dependencia con "
-"A no está satisfecha. El marcador de configuración inmediata se aplicará a "
-"todas las dependencias que puedan generar un problema si las dependencias, "
-"por ejemplo, forman un círculo vicioso como dependencia con la marca de "
-"configuración inmediata, lo cual lo califica casi como Pre-Dependencia. Así, "
-"en teoría es posible que APT encuentre una situación en la que es incapaz de "
-"llevar a cabo una configuración inmediata, devuelva un error y mencione esta "
-"opción para que así el usuario pueda desactivar la configuración inmediata "
-"temporalmente para llevar a cabo una vez más la instalación y/o "
-"actualización. Observe el uso de la expresión «en teoría», ya que esta "
-"situación sólo se ha visto algunas veces con versiones de distribución no "
-"estables, y causadas por dependencias incorrectas del paquete en cuestión o "
-"en un sistema ya roto. Por ello, no debería desactivar ciegamente esta "
-"opción ya que la situación mencionada anteriormente no es el único problema "
-"que la configuración inmediata puede resolver. Antes de llevar a cabo una "
-"operación grande como <literal>dist-upgrade</literal> con esta opción "
-"desactivada debería intentar un <literal>install</literal> con el paquete "
-"que APT es incapaz de configurar inmediatamente, pero asegúrese de informar "
-"del fallo a su distribución y al equipo de APT mediante el enlace a informes "
-"de fallo a continuación para que así puedan mejorar o corregir el proceso de "
-"actualización."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:208
-msgid ""
-"Never Enable this option unless you -really- know what you are doing. It "
-"permits APT to temporarily remove an essential package to break a Conflicts/"
-"Conflicts or Conflicts/Pre-Depend loop between two essential packages. SUCH "
-"A LOOP SHOULD NEVER EXIST AND IS A GRAVE BUG. This option will work if the "
-"essential packages are not tar, gzip, libc, dpkg, bash or anything that "
-"those packages depend on."
+#: apt.conf.5.xml:199
+msgid ""
+"Defaults to on, which will cause APT to install essential and important "
+"packages as soon as possible in an install/upgrade operation, in order to "
+"limit the effect of a failing &dpkg; call. If this option is disabled, APT "
+"treats an important package in the same way as an extra package: between the "
+"unpacking of the package A and its configuration there can be many other "
+"unpack or configuration calls for other unrelated packages B, C etc. If "
+"these cause the &dpkg; call to fail (e.g. because package B's maintainer "
+"scripts generate an error), this results in a system state in which package "
+"A is unpacked but unconfigured - so any package depending on A is now no "
+"longer guaranteed to work, as its dependency on A is no longer satisfied."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:211
+msgid ""
+"The immediate configuration marker is also applied in the potentially "
+"problematic case of circular dependencies, since a dependency with the "
+"immediate flag is equivalent to a Pre-Dependency. In theory this allows APT "
+"to recognise a situation in which it is unable to perform immediate "
+"configuration, abort, and suggest to the user that the option should be "
+"temporarily deactivated in order to allow the operation to proceed.  Note "
+"the use of the word \"theory\" here; in the real world this problem has "
+"rarely been encountered, in non-stable distribution versions, and was caused "
+"by wrong dependencies of the package in question or by a system in an "
+"already broken state; so you should not blindly disable this option, as the "
+"scenario mentioned above is not the only problem it can help to prevent in "
+"the first place."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:224
+msgid ""
+"Before a big operation like <literal>dist-upgrade</literal> is run with this "
+"option disabled you should try to explicitly <literal>install</literal> the "
+"package APT is unable to configure immediately; but please make sure you "
+"also report your problem to your distribution and to the APT team with the "
+"buglink below, so they can work on improving or correcting the upgrade "
+"process."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:235
+#, fuzzy
+#| msgid ""
+#| "Never Enable this option unless you -really- know what you are doing. It "
+#| "permits APT to temporarily remove an essential package to break a "
+#| "Conflicts/Conflicts or Conflicts/Pre-Depend loop between two essential "
+#| "packages. SUCH A LOOP SHOULD NEVER EXIST AND IS A GRAVE BUG. This option "
+#| "will work if the essential packages are not tar, gzip, libc, dpkg, bash "
+#| "or anything that those packages depend on."
+msgid ""
+"Never enable this option unless you <emphasis>really</emphasis> know what "
+"you are doing. It permits APT to temporarily remove an essential package to "
+"break a Conflicts/Conflicts or Conflicts/Pre-Depends loop between two "
+"essential packages. <emphasis>Such a loop should never exist and is a grave "
+"bug</emphasis>. This option will work if the essential packages are not "
+"<command>tar</command>, <command>gzip</command>, <command>libc</command>, "
+"<command>dpkg</command>, <command>dash</command> or anything that those "
+"packages depend on."
 msgstr ""
 "Nunca active esta opción a menos que usted (realmente) sepa lo que está "
 "haciendo. Esto permite a APT eliminar temporalmente un paquete esencial para "
@@ -3687,7 +3721,7 @@ msgstr ""
 "libc, ni dpkg, ni bash, ni cualquier otro del que dependan estos paquetes."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:217
+#: apt.conf.5.xml:247
 #, fuzzy
 #| msgid ""
 #| "APT uses since version 0.7.26 a resizable memory mapped cache file to "
@@ -3708,20 +3742,20 @@ msgstr ""
 #| "automatic grow of the cache is disabled."
 msgid ""
 "APT uses since version 0.7.26 a resizable memory mapped cache file to store "
-"the 'available' information. <literal>Cache-Start</literal> acts as a hint "
-"to which size the Cache will grow and is therefore the amount of memory APT "
+"the available information. <literal>Cache-Start</literal> acts as a hint of "
+"the size the cache will grow to, and is therefore the amount of memory APT "
 "will request at startup. The default value is 20971520 bytes (~20 MB). Note "
-"that this amount of space needs to be available for APT otherwise it will "
+"that this amount of space needs to be available for APT; otherwise it will "
 "likely fail ungracefully, so for memory restricted devices this value should "
 "be lowered while on systems with a lot of configured sources it should be "
 "increased.  <literal>Cache-Grow</literal> defines in bytes with the default "
-"of 1048576 (~1 MB) how much the Cache size will be increased in the event "
-"the space defined by <literal>Cache-Start</literal> is not enough. These "
+"of 1048576 (~1 MB) how much the cache size will be increased in the event "
+"the space defined by <literal>Cache-Start</literal> is not enough. This "
 "value will be applied again and again until either the cache is big enough "
 "to store all information or the size of the cache reaches the <literal>Cache-"
 "Limit</literal>.  The default of <literal>Cache-Limit</literal> is 0 which "
 "stands for no limit.  If <literal>Cache-Grow</literal> is set to 0 the "
-"automatic grow of the cache is disabled."
+"automatic growth of the cache is disabled."
 msgstr ""
 "A partir de la versión 0.7.26, APT usa un fichero de caché mapeado («mapped "
 "cache file») redimensionable para almacenar la información disponible. "
@@ -3742,62 +3776,80 @@ msgstr ""
 "crecimiento automático del cache."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:233
-msgid "Defines which package(s) are considered essential build dependencies."
+#: apt.conf.5.xml:263
+#, fuzzy
+#| msgid ""
+#| "Defines which package(s) are considered essential build dependencies."
+msgid "Defines which packages are considered essential build dependencies."
 msgstr ""
 "Define qué paquete(s) se consideran dependencias de creación esenciales."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:237
+#: apt.conf.5.xml:267
 msgid ""
-"The Get subsection controls the &apt-get; tool, please see its documentation "
+"The Get subsection controls the &apt-get; tool; please see its documentation "
 "for more information about the options here."
 msgstr ""
 "La subsección Get controla la herramienta &apt-get;, por favor, consulte la "
 "documentación para más información sobre esta opción."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:242
+#: apt.conf.5.xml:272
 msgid ""
-"The Cache subsection controls the &apt-cache; tool, please see its "
+"The Cache subsection controls the &apt-cache; tool; please see its "
 "documentation for more information about the options here."
 msgstr ""
 "La subsección Cache controla la herramienta &apt-cache;, por favor, consulte "
 "la documentación para más información sobre esta opción."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:247
+#: apt.conf.5.xml:277
 msgid ""
-"The CDROM subsection controls the &apt-cdrom; tool, please see its "
+"The CDROM subsection controls the &apt-cdrom; tool; please see its "
 "documentation for more information about the options here."
 msgstr ""
 "La subsección CDROM controla la herramienta &apt-cdrom;, por favor, consulte "
 "la documentación para más información sobre esta opción."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:253
+#: apt.conf.5.xml:283
 msgid "The Acquire Group"
 msgstr "El grupo Acquire"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:254
+#: apt.conf.5.xml:284
+#, fuzzy
+#| msgid ""
+#| "The <literal>Acquire</literal> group of options controls the download of "
+#| "packages and the URI handlers."
 msgid ""
 "The <literal>Acquire</literal> group of options controls the download of "
-"packages and the URI handlers."
+"packages as well as the various \"acquire methods\" responsible for the "
+"download itself (see also &sources-list;)."
 msgstr ""
 "El grupo de opciones <literal>Acquire</literal> controla la descarga de "
 "paquetes y los gestores de URI."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:259
-msgid ""
-"Security related option defaulting to true as an expiring validation for a "
-"Release file prevents longtime replay attacks and can e.g. also help users "
-"to identify no longer updated mirrors - but the feature depends on the "
-"correctness of the time on the user system.  Archive maintainers are "
-"encouraged to create Release files with the <literal>Valid-Until</literal> "
-"header, but if they don't or a stricter value is volitional the following "
-"<literal>Max-ValidTime</literal> option can be used."
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:291
+#, fuzzy
+#| msgid ""
+#| "Security related option defaulting to true as an expiring validation for "
+#| "a Release file prevents longtime replay attacks and can e.g. also help "
+#| "users to identify no longer updated mirrors - but the feature depends on "
+#| "the correctness of the time on the user system.  Archive maintainers are "
+#| "encouraged to create Release files with the <literal>Valid-Until</"
+#| "literal> header, but if they don't or a stricter value is volitional the "
+#| "following <literal>Max-ValidTime</literal> option can be used."
+msgid ""
+"Security related option defaulting to true, as giving a Release file's "
+"validation an expiration date prevents replay attacks over a long timescale, "
+"and can also for example help users to identify mirrors that are no longer "
+"updated - but the feature depends on the correctness of the clock on the "
+"user system. Archive maintainers are encouraged to create Release files with "
+"the <literal>Valid-Until</literal> header, but if they don't or a stricter "
+"value is desired the <literal>Max-ValidTime</literal> option below can be "
+"used."
 msgstr ""
 "Opción relacionada con la seguridad, cuyo valor predeterminado de «true», ya "
 "que una validación temporal para un fichero «Release» evita ataques "
@@ -3808,8 +3860,8 @@ msgstr ""
 "se hace, o si un valor más estricto es opcional, se puede usar la opción "
 "<literal>Max-ValidTime</literal>."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:270
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:304
 #, fuzzy
 #| msgid ""
 #| "Seconds the Release file should be considered valid after it was created. "
@@ -3822,12 +3874,13 @@ msgstr ""
 #| "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 valid\".  Archive specific settings can "
-"be made by appending the label of the archive to the option name."
+"Maximum time (in seconds) after its creation (as indicated by the "
+"<literal>Date</literal> header) that the <filename>Release</filename> file "
+"should be considered valid.  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 \"valid forever\".  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 "
@@ -3841,8 +3894,8 @@ msgstr ""
 "específicas al archivo añadiendo la etiqueta del archivo al nombre de la "
 "opción."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:281
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:316
 #, fuzzy
 #| msgid ""
 #| "Seconds the Release file should be considered valid after it was created. "
@@ -3855,12 +3908,13 @@ msgstr ""
 #| "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."
+"Minimum time (in seconds) after its creation (as indicated by the "
+"<literal>Date</literal> header) that the <filename>Release</filename> file "
+"should be considered valid.  Use this if you need to use a seldom updated "
+"(local) mirror of a more frequently 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 "
@@ -3874,18 +3928,23 @@ msgstr ""
 "específicas al archivo añadiendo la etiqueta del archivo al nombre de la "
 "opción."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:292
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:328
+#, fuzzy
+#| msgid ""
+#| "Try to download deltas called <literal>PDiffs</literal> for Packages or "
+#| "Sources files instead of downloading whole ones. True by default."
 msgid ""
-"Try to download deltas called <literal>PDiffs</literal> for Packages or "
-"Sources files instead of downloading whole ones. True by default."
+"Try to download deltas called <literal>PDiffs</literal> for indexes (like "
+"<filename>Packages</filename> files) instead of downloading whole ones. True "
+"by default."
 msgstr ""
 "Intenta descargar deltas llamados <literal>PDiffs</literal> de los ficheros "
 "«Packages» o «Sources» en lugar de descargarlos enteros. Es «true» de forma "
 "predeterminada"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:295
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:331
 #, fuzzy
 #| msgid ""
 #| "Two sub-options to limit the use of PDiffs are also available: With "
@@ -3895,12 +3954,12 @@ msgstr ""
 #| "to the size of the targeted file. If one of these limits is exceeded the "
 #| "complete file is downloaded instead of the patches."
 msgid ""
-"Two sub-options to limit the use of PDiffs are also available: With "
-"<literal>FileLimit</literal> can be specified how many PDiff files are "
-"downloaded at most to update a file. <literal>SizeLimit</literal> on the "
-"other hand is the maximum percentage of the size of all patches compared to "
-"the size of the targeted file. If one of these limits is exceeded the "
-"complete file is downloaded instead of the patches."
+"Two sub-options to limit the use of PDiffs are also available: "
+"<literal>FileLimit</literal> can be used to specify a maximum number of "
+"PDiff files should be downloaded to update a file. <literal>SizeLimit</"
+"literal> on the other hand is the maximum percentage of the size of all "
+"patches compared to the size of the targeted file. If one of these limits is "
+"exceeded the complete file is downloaded instead of the patches."
 msgstr ""
 "Se ofrecen dos opciones secundarias para limitar el uso de «PDiffs»: "
 "<literal>FileLimit</literal> permite definir cuántos ficheros «PDiff» como "
@@ -3909,8 +3968,8 @@ msgstr ""
 "parches comparados con el tamaño del fichero destino. Si se supera uno de "
 "estos límites, se descargará el fichero completo en lugar de los parches."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:305
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:341
 msgid ""
 "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
 "literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -3924,8 +3983,8 @@ msgstr ""
 "una conexión por máquina de destino, <literal>access</literal> significa que "
 "se abrirá una conexión por cada tipo de URI."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:313
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:349
 msgid ""
 "Number of retries to perform. If this is non-zero APT will retry failed "
 "files the given number of times."
@@ -3933,8 +3992,8 @@ msgstr ""
 "El número de reintentos a realizar. Si es distinto de cero APT volverá a "
 "intentar obtener los ficheros fallidos el número de veces proporcionado."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:318
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:354
 msgid ""
 "Use symlinks for source archives. If set to true then source archives will "
 "be symlinked when possible instead of copying. True is the default."
@@ -3943,15 +4002,24 @@ msgstr ""
 "fuente se enlazarán cuando sea posible, en vez de copiarse. Es «true» de "
 "forma predeterminada."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:323
-msgid ""
-"HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
-"standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per "
-"host proxies can also be specified by using the form <literal>http::Proxy::"
-"&lt;host&gt;</literal> with the special keyword <literal>DIRECT</literal> "
-"meaning to use no proxies. If no one of the above settings is specified, "
-"<envar>http_proxy</envar> environment variable will be used."
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:359
+#, fuzzy
+#| msgid ""
+#| "HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
+#| "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. "
+#| "Per host proxies can also be specified by using the form <literal>http::"
+#| "Proxy::&lt;host&gt;</literal> with the special keyword <literal>DIRECT</"
+#| "literal> meaning to use no proxies. If no one of the above settings is "
+#| "specified, <envar>http_proxy</envar> environment variable will be used."
+msgid ""
+"<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. "
+"It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</"
+"literal>.  Per host proxies can also be specified by using the form "
+"<literal>http::Proxy::&lt;host&gt;</literal> with the special keyword "
+"<literal>DIRECT</literal> meaning to use no proxies. If no one of the above "
+"settings is specified, <envar>http_proxy</envar> environment variable will "
+"be used."
 msgstr ""
 "HTTP URI, http::Proxy es el proxy http predeterminado a usar. Usa el formato "
 "estándar <literal>http://[[usuario][:contraseña]@]máquina[:puerto]/</"
@@ -3961,18 +4029,27 @@ msgstr ""
 "La variable de entorno <envar>http_proxy</envar> se usará en caso de no "
 "definir ninguna de las opciones anteriores."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:331
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:367
+#, fuzzy
+#| msgid ""
+#| "Three settings are provided for cache control with HTTP/1.1 compliant "
+#| "proxy caches. <literal>No-Cache</literal> tells the proxy to not use its "
+#| "cached response under any circumstances, <literal>Max-Age</literal> is "
+#| "sent only for index files and tells the cache to refresh its object if it "
+#| "is older than the given number of seconds. Debian updates its index files "
+#| "daily so the default is 1 day. <literal>No-Store</literal> specifies that "
+#| "the cache should never store this request, it is only set for archive "
+#| "files. This may be useful to prevent polluting a proxy cache with very "
+#| "large .deb files. Note: Squid 2.0.2 does not support any of these options."
 msgid ""
 "Three settings are provided for cache control with HTTP/1.1 compliant proxy "
-"caches. <literal>No-Cache</literal> tells the proxy to not use its cached "
-"response under any circumstances, <literal>Max-Age</literal> is sent only "
-"for index files and tells the cache to refresh its object if it is older "
-"than the given number of seconds. Debian updates its index files daily so "
-"the default is 1 day. <literal>No-Store</literal> specifies that the cache "
-"should never store this request, it is only set for archive files. This may "
-"be useful to prevent polluting a proxy cache with very large .deb files. "
-"Note: Squid 2.0.2 does not support any of these options."
+"caches.  <literal>No-Cache</literal> tells the proxy not to use its cached "
+"response under any circumstances.  <literal>Max-Age</literal> sets the "
+"allowed maximum age (in seconds) of an index file in the cache of the "
+"proxy.  <literal>No-Store</literal> specifies that the proxy should not "
+"store the requested archive files in its cache, which can be used to prevent "
+"the proxy from polluting its cache with (big) .deb files."
 msgstr ""
 "Para los proxies que cumplen con HTTP/1.1 se proporcionan tres opciones de "
 "configuración para el control de la caché. <literal>No-Cache</literal> dice "
@@ -3986,44 +4063,55 @@ msgstr ""
 "ser útil para prevenir que un proxy se contamine con ficheros «.deb» muy "
 "grandes. Aviso: Squid 2.0.2 no permite usar ninguna de estas opciones."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:341 apt.conf.5.xml:407
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:377 apt.conf.5.xml:449
+#, fuzzy
+#| msgid ""
+#| "The option <literal>timeout</literal> sets the timeout timer used by the "
+#| "method; this applies to all things including connection timeout and data "
+#| "timeout."
 msgid ""
 "The option <literal>timeout</literal> sets the timeout timer used by the "
-"method, this applies to all things including connection timeout and data "
-"timeout."
+"method; this value applies to the connection as well as the data timeout."
 msgstr ""
 "La opción <literal>timeout</literal> define el tiempo máximo de espera usado "
 "por el método, esto se aplica a todo, incluyendo el tiempo de espera para "
 "realizar la conexión y para recibir datos."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:344
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:380
 msgid ""
 "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
-"enabled HTTP pipeling (RFC 2616 section 8.1.2.2) which can be beneficial e."
-"g. on high-latency connections. It specifies how many requests are send in a "
+"enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
+"g. on high-latency connections. It specifies how many requests are sent in a "
 "pipeline.  Previous APT versions had a default of 10 for this setting, but "
 "the default value is now 0 (= disabled) to avoid problems with the ever-"
 "growing amount of webservers and proxies which choose to not conform to the "
 "HTTP/1.1 specification."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:351
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:387
 msgid ""
-"<literal>Acquire::http::AllowRedirect</literal> controls if APT will follow "
-"redirects, which is enabled by default."
+"<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
+"follow redirects, which is enabled by default."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:354
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:390
+#, fuzzy
+#| msgid ""
+#| "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
+#| "literal> which accepts integer values in kilobytes. The default value is "
+#| "0 which deactivates the limit and tries uses as much as possible of the "
+#| "bandwidth (Note that this option implicit deactivates the download from "
+#| "multiple servers at the same time.)"
 msgid ""
 "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
-"literal> which accepts integer values in kilobyte. The default value is 0 "
-"which deactivates the limit and tries uses as much as possible of the "
-"bandwidth (Note that this option implicit deactivates the download from "
-"multiple servers at the same time.)"
+"literal> which accepts integer values in kilobytes. The default value is 0 "
+"which deactivates the limit and tries to use all available bandwidth (note "
+"that this option implicitly disables downloading from multiple servers at "
+"the same time.)"
 msgstr ""
 "El ancho de banda usado se puede limitar mediante <literal>Acquire::http::Dl-"
 "Limit</literal>, que acepta valores enteros en kilobytes. El valor "
@@ -4031,8 +4119,8 @@ msgstr ""
 "posible del ancho de banda. (Tenga en cuenta que esta opción desactiva "
 "implícitamente la descarga simultánea desde varios servidores)."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:359
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:395
 msgid ""
 "<literal>Acquire::http::User-Agent</literal> can be used to set a different "
 "User-Agent for the http download method as some proxies allow access for "
@@ -4042,14 +4130,22 @@ msgstr ""
 "«User-Agent» distinto para la descarga http ya que algunos proxys sólo "
 "permiten el acceso para clientes que usan un identificador conocido."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:366
-msgid ""
-"HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
-"options are the same as for <literal>http</literal> method and will also "
-"default to the options from the <literal>http</literal> method if they are "
-"not explicitly set for https. <literal>Pipeline-Depth</literal> option is "
-"not supported yet."
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:403
+#, fuzzy
+#| msgid ""
+#| "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
+#| "options are the same as for <literal>http</literal> method and will also "
+#| "default to the options from the <literal>http</literal> method if they "
+#| "are not explicitly set for https. <literal>Pipeline-Depth</literal> "
+#| "option is not supported yet."
+msgid ""
+"The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
+"<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
+"<literal>proxy</literal> options work for HTTPS URIs in the same way as for "
+"the <literal>http</literal> method, and default to the same values if they "
+"are not explicitly set. The <literal>Pipeline-Depth</literal> option is not "
+"yet supported."
 msgstr ""
 "HTTPS URI. Las opciones de control de «Cache», «timeout», «AllowRedirect», "
 "«Dl-Limit» y del proxy son las mismas que para el método <literal>http</"
@@ -4057,25 +4153,44 @@ msgstr ""
 "<literal>http</literal> si no están explícitamente definidas para https. La "
 "opción <literal>Pipeline-Depth</literal> no se puede usar por ahora."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:372
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:411
+#, fuzzy
+#| msgid ""
+#| "<literal>CaInfo</literal> suboption specifies place of file that holds "
+#| "info about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> "
+#| "is the corresponding per-host option.  <literal>Verify-Peer</literal> "
+#| "boolean suboption determines whether verify server's host certificate "
+#| "against trusted certificates or not.  <literal>&lt;host&gt;::Verify-Peer</"
+#| "literal> is the corresponding per-host option.  <literal>Verify-Host</"
+#| "literal> boolean suboption determines whether verify server's hostname or "
+#| "not.  <literal>&lt;host&gt;::Verify-Host</literal> is the corresponding "
+#| "per-host option.  <literal>SslCert</literal> determines what certificate "
+#| "to use for client authentication. <literal>&lt;host&gt;::SslCert</"
+#| "literal> is the corresponding per-host option.  <literal>SslKey</literal> "
+#| "determines what private key to use for client authentication. "
+#| "<literal>&lt;host&gt;::SslKey</literal> is the corresponding per-host "
+#| "option.  <literal>SslForceVersion</literal> overrides default SSL version "
+#| "to use.  Can contain 'TLSv1' or 'SSLv3' string.  <literal>&lt;host&gt;::"
+#| "SslForceVersion</literal> is the corresponding per-host option."
 msgid ""
 "<literal>CaInfo</literal> suboption specifies place of file that holds info "
-"about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is "
+"about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is the "
 "corresponding per-host option.  <literal>Verify-Peer</literal> boolean "
-"suboption determines whether verify server's host certificate against "
-"trusted certificates or not.  <literal>&lt;host&gt;::Verify-Peer</literal> "
-"is corresponding per-host option.  <literal>Verify-Host</literal> boolean "
-"suboption determines whether verify server's hostname or not.  <literal>&lt;"
-"host&gt;::Verify-Host</literal> is corresponding per-host option.  "
-"<literal>SslCert</literal> determines what certificate to use for client "
-"authentication. <literal>&lt;host&gt;::SslCert</literal> is corresponding "
-"per-host option.  <literal>SslKey</literal> determines what private key to "
-"use for client authentication. <literal>&lt;host&gt;::SslKey</literal> is "
-"corresponding per-host option.  <literal>SslForceVersion</literal> overrides "
-"default SSL version to use.  Can contain 'TLSv1' or 'SSLv3' string.  "
-"<literal>&lt;host&gt;::SslForceVersion</literal> is corresponding per-host "
-"option."
+"suboption determines whether or not the server's host certificate should be "
+"verified against trusted certificates.  <literal>&lt;host&gt;::Verify-Peer</"
+"literal> is the corresponding per-host option.  <literal>Verify-Host</"
+"literal> boolean suboption determines whether or not the server's hostname "
+"should be verified.  <literal>&lt;host&gt;::Verify-Host</literal> is the "
+"corresponding per-host option.  <literal>SslCert</literal> determines what "
+"certificate to use for client authentication. <literal>&lt;host&gt;::"
+"SslCert</literal> is the corresponding per-host option.  <literal>SslKey</"
+"literal> determines what private key to use for client authentication. "
+"<literal>&lt;host&gt;::SslKey</literal> is the corresponding per-host "
+"option.  <literal>SslForceVersion</literal> overrides default SSL version to "
+"use.  It can contain either of the strings '<literal>TLSv1</literal>' or "
+"'<literal>SSLv3</literal>'.  <literal>&lt;host&gt;::SslForceVersion</"
+"literal> is the corresponding per-host option."
 msgstr ""
 "La sub-opción <literal>CaInfo</literal> define el lugar del fichero que "
 "contiene la información sobre los certificados de confianza. <literal>&lt;"
@@ -4094,23 +4209,39 @@ msgstr ""
 "ser «TLSv1» o «SSLv3». <literal>&lt;host&gt;::SslForceVersion</literal> "
 "corresponde a la opción por máquina."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:391
-msgid ""
-"FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard "
-"form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host "
-"proxies can also be specified by using the form <literal>ftp::Proxy::&lt;"
-"host&gt;</literal> with the special keyword <literal>DIRECT</literal> "
-"meaning to use no proxies. If no one of the above settings is specified, "
-"<envar>ftp_proxy</envar> environment variable will be used. To use a ftp "
-"proxy you will have to set the <literal>ftp::ProxyLogin</literal> script in "
-"the configuration file. This entry specifies the commands to send to tell "
-"the proxy server what to connect to. Please see &configureindex; for an "
-"example of how to do this. The substitution variables available are <literal>"
-"$(PROXY_USER)</literal> <literal>$(PROXY_PASS)</literal> <literal>"
-"$(SITE_USER)</literal> <literal>$(SITE_PASS)</literal> <literal>$(SITE)</"
-"literal> and <literal>$(SITE_PORT)</literal> Each is taken from it's "
-"respective URI component."
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:432
+#, fuzzy
+#| msgid ""
+#| "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the "
+#| "standard form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. "
+#| "Per host proxies can also be specified by using the form <literal>ftp::"
+#| "Proxy::&lt;host&gt;</literal> with the special keyword <literal>DIRECT</"
+#| "literal> meaning to use no proxies. If no one of the above settings is "
+#| "specified, <envar>ftp_proxy</envar> environment variable will be used. To "
+#| "use a ftp proxy you will have to set the <literal>ftp::ProxyLogin</"
+#| "literal> script in the configuration file. This entry specifies the "
+#| "commands to send to tell the proxy server what to connect to. Please see "
+#| "&configureindex; for an example of how to do this. The substitution "
+#| "variables available are <literal>$(PROXY_USER)</literal> <literal>"
+#| "$(PROXY_PASS)</literal> <literal>$(SITE_USER)</literal> <literal>"
+#| "$(SITE_PASS)</literal> <literal>$(SITE)</literal> and <literal>"
+#| "$(SITE_PORT)</literal> Each is taken from it's respective URI component."
+msgid ""
+"<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs.  "
+"It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</"
+"literal>.  Per host proxies can also be specified by using the form "
+"<literal>ftp::Proxy::&lt;host&gt;</literal> with the special keyword "
+"<literal>DIRECT</literal> meaning to use no proxies. If no one of the above "
+"settings is specified, <envar>ftp_proxy</envar> environment variable will be "
+"used. To use an FTP proxy you will have to set the <literal>ftp::ProxyLogin</"
+"literal> script in the configuration file. This entry specifies the commands "
+"to send to tell the proxy server what to connect to. Please see "
+"&configureindex; for an example of how to do this. The substitution "
+"variables representing the corresponding URI component are <literal>"
+"$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, <literal>"
+"$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, <literal>$(SITE)</"
+"literal> and <literal>$(SITE_PORT)</literal>."
 msgstr ""
 "FTP URI, ftp::Proxy es el proxy ftp predeterminado a usar. Usa el formato "
 "estándar <literal>ftp://[[usuario][:contraseña]@]máquina[:puerto]/</"
@@ -4128,14 +4259,22 @@ msgstr ""
 "$(SITE_PORT)</literal>, cada uno tomada de su respectivo componente de la "
 "URI."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:410
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:452
+#, fuzzy
+#| msgid ""
+#| "Several settings are provided to control passive mode. Generally it is "
+#| "safe to leave passive mode on; it works in nearly every environment.  "
+#| "However, some situations require that passive mode be disabled and port "
+#| "mode FTP used instead. This can be done globally, for connections that go "
+#| "through a proxy or for a specific host (See the sample config file for "
+#| "examples)."
 msgid ""
 "Several settings are provided to control passive mode. Generally it is safe "
-"to leave passive mode on, it works in nearly every environment.  However "
-"some situations require that passive mode be disabled and port mode ftp used "
-"instead. This can be done globally, for connections that go through a proxy "
-"or for a specific host (See the sample config file for examples)."
+"to leave passive mode on; it works in nearly every environment.  However, "
+"some situations require that passive mode be disabled and port mode FTP used "
+"instead. This can be done globally or for connections that go through a "
+"proxy or for a specific host (see the sample config file for examples)."
 msgstr ""
 "Puede controlar el modo pasivo a través de varias opciones. Generalmente es "
 "seguro dejar activado el modo pasivo, y funciona en casi todos los entornos. "
@@ -4144,11 +4283,11 @@ msgstr ""
 "conexiones a través de un proxy o para una máquina en concreto (vea el "
 "fichero de configuración de muestra para ver algunos ejemplos)."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:417
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:459
 msgid ""
 "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
-"envar> environment variable to a http url - see the discussion of the http "
+"envar> environment variable to an HTTP URL - see the discussion of the http "
 "method above for syntax. You cannot set this in the configuration file and "
 "it is not recommended to use FTP over HTTP due to its low efficiency."
 msgstr ""
@@ -4158,8 +4297,8 @@ msgstr ""
 "en el fichero de configuración y no se recomienda el uso de ftp por encima "
 "de http debido a su poca eficiencia."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:422
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:464
 msgid ""
 "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
 "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -4174,23 +4313,33 @@ msgstr ""
 "IPv4. Tenga en cuenta que la mayoría de los servidores de FTP no son "
 "compatibles con la RFC 2428."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:435
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
+#: apt.conf.5.xml:478
 #, no-wrap
 msgid "/cdrom/::Mount \"foo\";"
 msgstr "/cdrom/::Mount \"algo\";"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:430
-msgid ""
-"CD-ROM URIs; the only setting for CD-ROM URIs is the mount point, "
-"<literal>cdrom::Mount</literal> which must be the mount point for the CD-ROM "
-"drive as specified in <filename>/etc/fstab</filename>. It is possible to "
-"provide alternate mount and unmount commands if your mount point cannot be "
-"listed in the fstab (such as an SMB mount and old mount packages). The "
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:473
+#, fuzzy
+#| msgid ""
+#| "CD-ROM URIs; the only setting for CD-ROM URIs is the mount point, "
+#| "<literal>cdrom::Mount</literal> which must be the mount point for the CD-"
+#| "ROM drive as specified in <filename>/etc/fstab</filename>. It is possible "
+#| "to provide alternate mount and unmount commands if your mount point "
+#| "cannot be listed in the fstab (such as an SMB mount and old mount "
+#| "packages). The syntax is to put <placeholder type=\"literallayout\" id="
+#| "\"0\"/> within the cdrom block. It is important to have the trailing "
+#| "slash. Unmount commands can be specified using UMount."
+msgid ""
+"For URIs using the <literal>cdrom</literal> method, the only configurable "
+"option is the mount point, <literal>cdrom::Mount</literal>, which must be "
+"the mount point for the CD-ROM (or DVD, or whatever) drive as specified in "
+"<filename>/etc/fstab</filename>. It is possible to provide alternate mount "
+"and unmount commands if your mount point cannot be listed in the fstab.  The "
 "syntax is to put <placeholder type=\"literallayout\" id=\"0\"/> within the "
-"cdrom block. It is important to have the trailing slash. Unmount commands "
-"can be specified using UMount."
+"<literal>cdrom</literal> block. It is important to have the trailing slash.  "
+"Unmount commands can be specified using UMount."
 msgstr ""
 "CD-ROM URI, la única opción de configuración para las URI de CD-ROM es el "
 "punto de montaje. <literal>cdrom::Mount</literal> debe ser el punto de "
@@ -4202,31 +4351,35 @@ msgstr ""
 "cdrom. Es importante dejar una barra al final. Puede especificar órdenes "
 "para desmontar usando UMount."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:441
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:486
+#, fuzzy
+#| msgid ""
+#| "GPGV URIs; the only option for GPGV URIs is the option to pass additional "
+#| "parameters to gpgv.  <literal>gpgv::Options</literal> Additional options "
+#| "passed to gpgv."
 msgid ""
-"GPGV URIs; the only option for GPGV URIs is the option to pass additional "
-"parameters to gpgv.  <literal>gpgv::Options</literal> Additional options "
-"passed to gpgv."
+"For GPGV URIs the only configurable option is <literal>gpgv::Options</"
+"literal>, which passes additional parameters to gpgv."
 msgstr ""
 "GPGV URI, la única opción para las URI de GPGV es la entrega de parámetros "
 "adicionales a gpgv. <literal>gpgv::Options</literal> Parámetros adicionales "
 "introducidos a gpgv."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:452
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
+#: apt.conf.5.xml:497
 #, no-wrap
 msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
 msgstr "Acquire::CompressionTypes::<replaceable>extensión-del-fichero</replaceable> \"<replaceable>nombre-del-método</replaceable>\";"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:447
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:492
 msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "
-"compression formats.  Per default the acquire methods can decompress "
+"compression formats.  By default the acquire methods can decompress "
 "<command>bzip2</command>, <command>lzma</command> and <command>gzip</"
-"command> compressed files, with this setting more formats can be added on "
+"command> compressed files; with this setting more formats can be added on "
 "the fly or the used method can be changed. The syntax for this is: "
 "<placeholder type=\"synopsis\" id=\"0\"/>"
 msgstr ""
@@ -4239,33 +4392,49 @@ msgstr ""
 "método usado. La sintaxis para esto es: <placeholder type=\"synopsis\" id="
 "\"0\"/>"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:457
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
+#: apt.conf.5.xml:502
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order:: \"gz\";"
 msgstr "Acquire::CompressionTypes::Order:: \"gz\";"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:460
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
+#: apt.conf.5.xml:505
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:453
-msgid ""
-"Also the <literal>Order</literal> subgroup can be used to define in which "
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:498
+#, fuzzy
+#| msgid ""
+#| "Also, the <literal>Order</literal> subgroup can be used to define in "
+#| "which order the acquire system will try to download the compressed files. "
+#| "The acquire system will try the first and proceed with the next "
+#| "compression type in this list on error, so to prefer one over the other "
+#| "type simply add the preferred type first - not already added default "
+#| "types will be added at run time to the end of the list, so e.g. "
+#| "<placeholder type=\"synopsis\" id=\"0\"/> can be used to prefer "
+#| "<command>gzip</command> compressed files over <command>bzip2</command> "
+#| "and <command>lzma</command>.  If <command>lzma</command> should be "
+#| "preferred over <command>gzip</command> and <command>bzip2</command> the "
+#| "configure setting should look like this <placeholder type=\"synopsis\" id="
+#| "\"1\"/> It is not needed to add <literal>bz2</literal> explicit to the "
+#| "list as it will be added automatic."
+msgid ""
+"Also, the <literal>Order</literal> subgroup can be used to define in which "
 "order the acquire system will try to download the compressed files. The "
 "acquire system will try the first and proceed with the next compression type "
-"in this list on error, so to prefer one over the other type simple add the "
-"preferred type at first - not already added default types will be added at "
-"run time to the end of the list, so e.g. <placeholder type=\"synopsis\" id="
+"in this list on error, so to prefer one over the other type simply add the "
+"preferred type first - default types not already added will be implicitly "
+"appended to the end of the list, so e.g. <placeholder type=\"synopsis\" id="
 "\"0\"/> can be used to prefer <command>gzip</command> compressed files over "
 "<command>bzip2</command> and <command>lzma</command>.  If <command>lzma</"
 "command> should be preferred over <command>gzip</command> and "
-"<command>bzip2</command> the configure setting should look like this "
+"<command>bzip2</command> the configure setting should look like this: "
 "<placeholder type=\"synopsis\" id=\"1\"/> It is not needed to add "
-"<literal>bz2</literal> explicit to the list as it will be added automatic."
+"<literal>bz2</literal> to the list explicitly as it will be added "
+"automatically."
 msgstr ""
 "El subgrupo <literal>Order</literal> también se puede usar para definir en "
 "qué orden el sistema de «acquire» intentará descargar los ficheros "
@@ -4282,14 +4451,14 @@ msgstr ""
 "\"synopsis\" id=\"1\"/> No es necesario añadir <literal>bz2</literal> a la "
 "lista ya que se añadirá de forma automática."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:464
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
+#: apt.conf.5.xml:512
 #, no-wrap
 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:462
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:507
 #, fuzzy
 #| msgid ""
 #| "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
@@ -4300,19 +4469,19 @@ msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
 #| "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 "
 #| "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 "
+#| "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 "
-"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."
+"Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></"
+"literal> will be checked at run time. If this option has been set, the "
+"method will only be used if this file exists; e.g. for the <literal>bzip2</"
+"literal> 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."
 msgstr ""
 "Tenga en cuenta que durante la ejecución se comprobará la opción "
 "<literal>Dir::Bin::<replaceable>nombre-del-método</replaceable></literal>. "
@@ -4326,16 +4495,16 @@ msgstr ""
 "opción directamente (no en el formato de lista). Esto no sobrescribirá la "
 "lista definida, sólo añadirá este tipo  al principio de la lista."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:469
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:517
 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."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:476
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:524
 msgid ""
 "When downloading <literal>gzip</literal> compressed indexes (Packages, "
 "Sources, or Translations), keep them gzip compressed locally instead of "
@@ -4348,17 +4517,26 @@ msgstr ""
 "a costa de mayores requerimientos del procesador al generar los almacenes de "
 "paquetes locales. El valor predeterminado es «false»."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:484
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:532
+#, fuzzy
+#| msgid ""
+#| "The Languages subsection controls which <filename>Translation</filename> "
+#| "files are downloaded and in which order APT tries to display the "
+#| "description-translations. APT will try to display the first available "
+#| "description in the language which is listed first. Languages can be "
+#| "defined with their short or long language codes. Note that not all "
+#| "archives provide <filename>Translation</filename> files for every "
+#| "Language - especially the long Languagecodes are rare, so please inform "
+#| "you which ones are available before you set here impossible values."
 msgid ""
 "The Languages subsection controls which <filename>Translation</filename> "
-"files are downloaded and in which order APT tries to display the Description-"
-"Translations. APT will try to display the first available Description in the "
-"Language which is listed at first. Languages can be defined with their short "
-"or long Languagecodes. Note that not all archives provide "
-"<filename>Translation</filename> files for every Language - especially the "
-"long Languagecodes are rare, so please inform you which ones are available "
-"before you set here impossible values."
+"files are downloaded and in which order APT tries to display the description-"
+"translations. APT will try to display the first available description in the "
+"language which is listed first. Languages can be defined with their short or "
+"long language codes. Note that not all archives provide "
+"<filename>Translation</filename> files for every language - the long "
+"language codes are especially rare."
 msgstr ""
 "La subsección «Languages» controla qué ficheros <filename>Translation</"
 "filename> se descargan y en qué orden APT intentará mostrar las traducciones "
@@ -4369,33 +4547,52 @@ msgstr ""
 "idioma (especialmente para los códigos de idioma largos), por lo que debería "
 "informarse de cuales están disponibles antes de definir valores imposibles."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:500
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
+#: apt.conf.5.xml:549
 #, no-wrap
 msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; }"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:490
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:537
+#, fuzzy
+#| msgid ""
+#| "The default list includes \"environment\" and \"en\". "
+#| "\"<literal>environment</literal>\" has a special meaning here: It will be "
+#| "replaced at runtime with the languagecodes extracted from the "
+#| "<literal>LC_MESSAGES</literal> environment variable.  It will also ensure "
+#| "that these codes are not included twice in the list. If "
+#| "<literal>LC_MESSAGES</literal> is set to \"C\" only the "
+#| "<filename>Translation-en</filename> file (if available) will be used.  To "
+#| "force APT to use no Translation file use the setting <literal>Acquire::"
+#| "Languages=none</literal>. \"<literal>none</literal>\" is another special "
+#| "meaning code which will stop the search for a suitable "
+#| "<filename>Translation</filename> file.  This can be used by the system "
+#| "administrator to let APT know that it should download also this files "
+#| "without actually use them if the environment doesn't specify this "
+#| "languages. So the following example configuration will result in the "
+#| "order \"en, de\" in an english and in \"de, en\" in a german "
+#| "localization. Note that \"fr\" is downloaded, but not used if APT is not "
+#| "used in a french localization, in such an environment the order would be "
+#| "\"fr, de, en\".  <placeholder type=\"programlisting\" id=\"0\"/>"
 msgid ""
 "The default list includes \"environment\" and \"en\". "
-"\"<literal>environment</literal>\" has a special meaning here: It will be "
-"replaced at runtime with the languagecodes extracted from the "
+"\"<literal>environment</literal>\" has a special meaning here: it will be "
+"replaced at runtime with the language codes extracted from the "
 "<literal>LC_MESSAGES</literal> environment variable.  It will also ensure "
 "that these codes are not included twice in the list. If "
 "<literal>LC_MESSAGES</literal> is set to \"C\" only the "
 "<filename>Translation-en</filename> file (if available) will be used.  To "
-"force apt to use no Translation file use the setting <literal>Acquire::"
+"force APT to use no Translation file use the setting <literal>Acquire::"
 "Languages=none</literal>. \"<literal>none</literal>\" is another special "
-"meaning code which will stop the search for a fitting <filename>Translation</"
-"filename> file.  This can be used by the system administrator to let APT "
-"know that it should download also this files without actually use them if "
-"the environment doesn't specify this languages. So the following example "
-"configuration will result in the order \"en, de\" in an english and in \"de, "
-"en\" in a german localization. Note that \"fr\" is downloaded, but not used "
-"if APT is not used in a french localization, in such an environment the "
-"order would be \"fr, de, en\".  <placeholder type=\"programlisting\" id="
-"\"0\"/>"
+"meaning code which will stop the search for a suitable "
+"<filename>Translation</filename> file.  This tells APT to download these "
+"translations too, without actually using them unless the environment "
+"specifies the languages. So the following example configuration will result "
+"in the order \"en, de\" in an English locale or \"de, en\" in a German one. "
+"Note that \"fr\" is downloaded, but not used unless APT is used in a French "
+"locale (where the order would be \"fr, de, en\").  <placeholder type="
+"\"programlisting\" id=\"0\"/>"
 msgstr ""
 "La lista predeterminada incluye «environment» y «en». «<literal>environment</"
 "literal>» tiene un significado especial aquí; se reemplazará durante la "
@@ -4417,8 +4614,8 @@ msgstr ""
 "(«environment») sería «fr, de, en». <placeholder type=\"programlisting\" id="
 "\"0\"/>"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:501
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:550
 msgid ""
 "Note: To prevent problems resulting from APT being executed in different "
 "environments (e.g. by different users or by other programs) all Translation "
@@ -4427,48 +4624,59 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:560
 msgid "Directories"
 msgstr "Directorios"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:514
+#: apt.conf.5.xml:562
 #, fuzzy
 #| msgid ""
 #| "The <literal>Dir::State</literal> section has directories that pertain to "
 #| "local state information. <literal>lists</literal> is the directory to "
 #| "place downloaded package lists in and <literal>status</literal> is the "
-#| "name of the dpkg status file.  <literal>preferences</literal> is the name "
-#| "of the APT preferences file.  <literal>Dir::State</literal> contains the "
-#| "default directory to prefix on all sub items if they do not start with "
-#| "<filename>/</filename> or <filename>./</filename>."
+#| "name of the &dpkg; status file.  <literal>preferences</literal> is the "
+#| "name of the APT preferences file.  <literal>Dir::State</literal> contains "
+#| "the default directory to prefix on all sub-items if they do not start "
+#| "with <filename>/</filename> or <filename>./</filename>."
 msgid ""
 "The <literal>Dir::State</literal> section has directories that pertain to "
 "local state information. <literal>lists</literal> is the directory to place "
 "downloaded package lists in and <literal>status</literal> is the name of the "
-"dpkg status file.  <literal>preferences</literal> is the name of the APT "
+"&dpkg; status file.  <literal>preferences</literal> is the name of the APT "
 "<filename>preferences</filename> file.  <literal>Dir::State</literal> "
-"contains the default directory to prefix on all sub items if they do not "
+"contains the default directory to prefix on all sub-items if they do not "
 "start with <filename>/</filename> or <filename>./</filename>."
 msgstr ""
 "La sección <literal>Dir::State</literal> contiene directorios que afectan a "
 "la información de estado local. <literal>lists</literal> es el directorio en "
 "el que se almacenan las listas de los paquetes descargados y "
-"<literal>status</literal> es el nombre del fichero de estado de dpkg. "
+"<literal>status</literal> es el nombre del fichero de estado de &dpkg;. "
 "<literal>preferences</literal> es el nombre del fichero de preferencias de "
 "APT. <literal>Dir::State</literal> contiene el directorio que se usará como "
 "prefijo predeterminado en todos los elementos subordinados en caso de que no "
 "empiecen con <filename>/</filename> ó <filename>./</filename>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:521
+#: apt.conf.5.xml:569
+#, fuzzy
+#| msgid ""
+#| "<literal>Dir::Cache</literal> contains locations pertaining to local "
+#| "cache information, such as the two package caches <literal>srcpkgcache</"
+#| "literal> and <literal>pkgcache</literal> as well as the location to place "
+#| "downloaded archives, <literal>Dir::Cache::archives</literal>. Generation "
+#| "of caches can be turned off by setting their names to be blank. This will "
+#| "slow down startup but save disk space. It is probably preferable to turn "
+#| "off the pkgcache rather than the srcpkgcache. Like <literal>Dir::State</"
+#| "literal> the default directory is contained in <literal>Dir::Cache</"
+#| "literal>"
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
 "and <literal>pkgcache</literal> as well as the location to place downloaded "
 "archives, <literal>Dir::Cache::archives</literal>. Generation of caches can "
-"be turned off by setting their names to be blank. This will slow down "
-"startup but save disk space. It is probably preferred to turn off the "
+"be turned off by setting their names to the empty string. This will slow "
+"down startup but save disk space. It is probably preferable to turn off the "
 "pkgcache rather than the srcpkgcache. Like <literal>Dir::State</literal> the "
 "default directory is contained in <literal>Dir::Cache</literal>"
 msgstr ""
@@ -4483,7 +4691,7 @@ msgstr ""
 "predeterminado está en <literal>Dir::Cache</literal>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:530
+#: apt.conf.5.xml:578
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4499,7 +4707,7 @@ msgstr ""
 "<envar>APT_CONFIG</envar>)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:536
+#: apt.conf.5.xml:584
 msgid ""
 "The <literal>Dir::Parts</literal> setting reads in all the config fragments "
 "in lexical order from the directory specified. After this is done then the "
@@ -4510,7 +4718,7 @@ msgstr ""
 "Al finalizar este proceso carga el fichero de configuración principal."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:540
+#: apt.conf.5.xml:588
 msgid ""
 "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
 "Bin::Methods</literal> specifies the location of the method handlers and "
@@ -4527,7 +4735,7 @@ msgstr ""
 "literal> especifican la ubicación de sus respectivos programas."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:548
+#: apt.conf.5.xml:596
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "
@@ -4548,7 +4756,7 @@ msgstr ""
 "staging/var/lib/dpkg/status</filename>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:561
+#: apt.conf.5.xml:609
 msgid ""
 "The <literal>Ignore-Files-Silently</literal> list can be used to specify "
 "which files APT should silently ignore while parsing the files in the "
@@ -4566,15 +4774,15 @@ msgstr ""
 "de expresiones regulares."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:570
+#: apt.conf.5.xml:618
 msgid "APT in DSelect"
 msgstr "APT con DSelect"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:572
+#: apt.conf.5.xml:620
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
-"control the default behaviour. These are in the <literal>DSelect</literal> "
+"control the default behavior. These are in the <literal>DSelect</literal> "
 "section."
 msgstr ""
 "Varias directivas de configuración controlan el comportamiento "
@@ -4582,43 +4790,47 @@ msgstr ""
 "encuentran en la sección <literal>DSelect</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:577
+#: apt.conf.5.xml:625
 msgid ""
-"Cache Clean mode; this value may be one of always, prompt, auto, pre-auto "
-"and never.  always and prompt will remove all packages from the cache after "
-"upgrading, prompt (the default) does so conditionally.  auto removes only "
-"those packages which are no longer downloadable (replaced with a new version "
-"for instance).  pre-auto performs this action before downloading new "
-"packages."
+"Cache Clean mode; this value may be one of <literal>always</literal>, "
+"<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
+"literal> and <literal>never</literal>.  <literal>always</literal> and "
+"<literal>prompt</literal> will remove all packages from the cache after "
+"upgrading, <literal>prompt</literal> (the default) does so conditionally.  "
+"<literal>auto</literal> removes only those packages which are no longer "
+"downloadable (replaced with a new version for instance).  <literal>pre-auto</"
+"literal> performs this action before downloading new packages."
 msgstr ""
-"Modo de limpieza del almacén, este valor puede ser «always», «prompt», "
-"«auto», «pre-auto» y «never». Los valores «always» y «prompt» borrarán todos "
-"los paquetes del almacén después de actualizar, «prompt» (el valor "
-"predeterminado) preguntará primero. El valor «auto» borrará sólo aquellos "
-"paquetes que ya no se pueden descargar (por ejemplo, los reemplazados por "
-"otra versión). El valor «pre-auto» realiza esta última acción antes de "
-"descargar los paquetes nuevos."
+"Modo de limpieza del almacén, este valor puede ser «<literal>always</"
+"literal>», «<literal>prompt</literal>», «<literal>auto</literal>», "
+"«<literal>pre-auto</literal>» y «<literal>never</literal>». Los valores "
+"«<literal>always</literal>» y «<literal>prompt</literal>» borrarán todos los "
+"paquetes del almacén después de actualizar, «<literal>prompt</literal>» (el "
+"valor predeterminado) preguntará primero. El valor «<literal>auto</literal>» "
+"borrará sólo aquellos paquetes que ya no se pueden descargar (por ejemplo, "
+"los reemplazados por otra versión). El valor «<literal>pre-auto</literal>» "
+"realiza esta última acción antes de descargar los paquetes nuevos."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:586
+#: apt.conf.5.xml:639
 msgid ""
-"The contents of this variable is passed to &apt-get; as command line options "
-"when it is run for the install phase."
+"The contents of this variable are passed to &apt-get; as command line "
+"options when it is run for the install phase."
 msgstr ""
 "Los contenidos de esta variable se introducen a &apt-get; como opciones de "
 "la línea de ordenes al ejecutar la fase de instalación."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:591
+#: apt.conf.5.xml:644
 msgid ""
-"The contents of this variable is passed to &apt-get; as command line options "
-"when it is run for the update phase."
+"The contents of this variable are passed to &apt-get; as command line "
+"options when it is run for the update phase."
 msgstr ""
 "Los contenidos de esta variable se introducen a &apt-get; como opciones de "
 "la línea de ordenes al ejecutar la fase de actualización."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:596
+#: apt.conf.5.xml:649
 msgid ""
 "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
 "The default is to prompt only on error."
@@ -4628,12 +4840,12 @@ msgstr ""
 "preguntará en caso de error."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:602
-msgid "How APT calls dpkg"
-msgstr "Cómo invoca APT a dpkg"
+#: apt.conf.5.xml:655
+msgid "How APT calls &dpkg;"
+msgstr "Cómo invoca APT a &dpkg;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:603
+#: apt.conf.5.xml:656
 msgid ""
 "Several configuration directives control how APT invokes &dpkg;. These are "
 "in the <literal>DPkg</literal> section."
@@ -4642,22 +4854,22 @@ msgstr ""
 "se encuentran en la sección <literal>DPkg</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:608
+#: apt.conf.5.xml:661
 msgid ""
-"This is a list of options to pass to dpkg. The options must be specified "
+"This is a list of options to pass to &dpkg;. The options must be specified "
 "using the list notation and each list item is passed as a single argument to "
 "&dpkg;."
 msgstr ""
-"Es una lista de opciones que se introducen a dpkg. Las opciones se deben "
+"Es una lista de opciones que se introducen a &dpkg;. Las opciones se deben "
 "especificar usando la notación de lista y cada elemento de la lista se "
 "introduce a &dpkg; como un sólo argumento."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:614
+#: apt.conf.5.xml:667
 msgid ""
 "This is a list of shell commands to run before/after invoking &dpkg;.  Like "
 "<literal>options</literal> this must be specified in list notation. The "
-"commands are invoked in order using <filename>/bin/sh</filename>, should any "
+"commands are invoked in order using <filename>/bin/sh</filename>; should any "
 "fail APT will abort."
 msgstr ""
 "Es una lista de órdenes de la consola que se ejecutarán antes y/o después de "
@@ -4666,13 +4878,20 @@ msgstr ""
 "sh</filename>, y APT finalizará en caso de fallo."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:621
+#: apt.conf.5.xml:674
+#, fuzzy
+#| msgid ""
+#| "This is a list of shell commands to run before invoking &dpkg;. Like "
+#| "<literal>options</literal> this must be specified in list notation. The "
+#| "commands are invoked in order using <filename>/bin/sh</filename>; should "
+#| "any fail APT will abort. APT will pass to the commands on standard input "
+#| "the filenames of all .deb files it is going to install, one per line."
 msgid ""
-"This is a list of shell commands to run before invoking dpkg. Like "
+"This is a list of shell commands to run before invoking &dpkg;. Like "
 "<literal>options</literal> this must be specified in list notation. The "
-"commands are invoked in order using <filename>/bin/sh</filename>, should any "
-"fail APT will abort. APT will pass to the commands on standard input the "
-"filenames of all .deb files it is going to install, one per line."
+"commands are invoked in order using <filename>/bin/sh</filename>; should any "
+"fail APT will abort. APT will pass the filenames of all .deb files it is "
+"going to install to the commands, one per line on standard input."
 msgstr ""
 "Es una lista de órdenes de la consola que se ejecutarán antes de invocar a "
 "&dpkg;. Como <literal>options</literal>, se debe especificar con notación de "
@@ -4682,7 +4901,7 @@ msgstr ""
 "instalar, uno por línea."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:627
+#: apt.conf.5.xml:680
 msgid ""
 "Version 2 of this protocol dumps more information, including the protocol "
 "version, the APT configuration space and the packages, files and versions "
@@ -4698,18 +4917,18 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:635
+#: apt.conf.5.xml:688
 msgid ""
-"APT chdirs to this directory before invoking dpkg, the default is <filename>/"
-"</filename>."
+"APT chdirs to this directory before invoking &dpkg;, the default is "
+"<filename>/</filename>."
 msgstr ""
-"APT cambia a este directorio antes de invocar a dpkg, el valor "
+"APT cambia a este directorio antes de invocar a &dpkg;, el valor "
 "predeterminado es <filename>/</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:640
+#: apt.conf.5.xml:693
 msgid ""
-"These options are passed to &dpkg-buildpackage; when compiling packages, the "
+"These options are passed to &dpkg-buildpackage; when compiling packages; the "
 "default is to disable signing and produce all binaries."
 msgstr ""
 "Estas opciones se introducen a &dpkg-buildpackage; cuando compila paquetes, "
@@ -4717,51 +4936,51 @@ msgstr ""
 "paquetes y a producir todos los binarios."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:645
+#: apt.conf.5.xml:698
 msgid "dpkg trigger usage (and related options)"
 msgstr "Uso del disparador de dpkg (y de las opciones relacionadas)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:646
+#: apt.conf.5.xml:699
 #, fuzzy
 #| msgid ""
-#| "APT can call dpkg in a way so it can make aggressive use of triggers over "
-#| "multiply calls of dpkg. Without further options dpkg will use triggers "
-#| "only in between his own run. Activating these options can therefore "
-#| "decrease the time needed to perform the install / upgrade. Note that it "
-#| "is intended to activate these options per default in the future, but as "
-#| "it changes the way APT calling dpkg drastically it needs a lot more "
-#| "testing.  <emphasis>These options are therefore currently experimental "
-#| "and should not be used in productive environments.</emphasis> Also it "
-#| "breaks the progress reporting so all frontends will currently stay around "
-#| "half (or more) of the time in the 100% state while it actually configures "
-#| "all packages."
-msgid ""
-"APT can call dpkg in a way so it can make aggressive use of triggers over "
-"multiple calls of dpkg. Without further options dpkg will use triggers only "
-"in between his own run. Activating these options can therefore decrease the "
-"time needed to perform the install / upgrade. Note that it is intended to "
-"activate these options per default in the future, but as it changes the way "
-"APT calling dpkg drastically it needs a lot more testing.  <emphasis>These "
-"options are therefore currently experimental and should not be used in "
-"productive environments.</emphasis> Also it breaks the progress reporting so "
-"all frontends will currently stay around half (or more) of the time in the "
-"100% state while it actually configures all packages."
-msgstr ""
-"APT puede invocar a dpkg de forma que pueda hacer un uso agresivo de los "
-"disparadores mediante varias invocaciones a dpkg. Sin más opciones, dpkg "
+#| "APT can call &dpkg; in a way so it can make aggressive use of triggers "
+#| "over multiply calls of &dpkg;. Without further options &dpkg; will use "
+#| "triggers only in between his own run. Activating these options can "
+#| "therefore decrease the time needed to perform the install / upgrade. Note "
+#| "that it is intended to activate these options per default in the future, "
+#| "but as it changes the way APT calling &dpkg; drastically it needs a lot "
+#| "more testing.  <emphasis>These options are therefore currently "
+#| "experimental and should not be used in production environments.</"
+#| "emphasis> Also it breaks the progress reporting so all frontends will "
+#| "currently stay around half (or more) of the time in the 100% state while "
+#| "it actually configures all packages."
+msgid ""
+"APT can call &dpkg; in such a way as to let it make aggressive use of "
+"triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
+"use triggers once each time it runs.  Activating these options can therefore "
+"decrease the time needed to perform the install or upgrade. Note that it is "
+"intended to activate these options per default in the future, but as it "
+"drastically changes the way APT calls &dpkg; it needs a lot more testing.  "
+"<emphasis>These options are therefore currently experimental and should not "
+"be used in production environments.</emphasis> It also breaks progress "
+"reporting such that all front-ends will currently stay around half (or more) "
+"of the time in the 100% state while it actually configures all packages."
+msgstr ""
+"APT puede invocar a &dpkg; de forma que pueda hacer un uso agresivo de los "
+"disparadores mediante varias invocaciones a &dpkg;. Sin más opciones, &dpkg; "
 "usará los disparadores sólo en su propia ejecución. Activar estas opciones "
 "puede reducir el tiempo necesario para realizar la instalación o la "
 "actualización. Tenga en cuenta que está orientado a que estas opciones se "
 "activen de forma predeterminada en un futuro, necesita muchas pruebas pero "
-"la forma en que APT invoca a dpkg ha cambiado drásticamente. <emphasis>Estas "
-"opciones actualmente son experimentales, y no se deberían usar en entornos "
-"de producción.</emphasis> También rompe el informe del progreso ya que todas "
-"las interfaces estarán alrededor de la mitad (o más) del tiempo en el 100% "
-"mientras se están configurando todos los paquetes."
+"la forma en que APT invoca a &dpkg; ha cambiado drásticamente. "
+"<emphasis>Estas opciones actualmente son experimentales, y no se deberían "
+"usar en entornos de producción.</emphasis> También rompe el informe del "
+"progreso ya que todas las interfaces estarán alrededor de la mitad (o más) "
+"del tiempo en el 100% mientras se están configurando todos los paquetes."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:661
+#: apt.conf.5.xml:714
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
@@ -4775,15 +4994,15 @@ msgstr ""
 "DPkg::TriggersPending \"true\";"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:655
+#: apt.conf.5.xml:708
 msgid ""
 "Note that it is not guaranteed that APT will support these options or that "
 "these options will not cause (big) trouble in the future. If you have "
 "understand the current risks and problems with these options, but are brave "
-"enough to help testing them create a new configuration file and test a "
+"enough to help testing them, create a new configuration file and test a "
 "combination of options. Please report any bugs, problems and improvements "
 "you encounter and make sure to note which options you have used in your "
-"reports. Asking dpkg for help could also be useful for debugging proposes, "
+"reports. Asking &dpkg; for help could also be useful for debugging proposes, "
 "see e.g. <command>dpkg --audit</command>. A defensive option combination "
 "would be <placeholder type=\"literallayout\" id=\"0\"/>"
 msgstr ""
@@ -4793,117 +5012,121 @@ msgstr ""
 "suficientemente valiente para ayudar a probarlas, cree un nuevo fichero de "
 "configuración y pruebe una combinación de las opciones. Por favor, informe "
 "de cualquier error, problema o mejora que encuentre y asegúrese de apuntar "
-"en sus informes qué opciones ha usado. Pedir ayuda a dpkg también puede ser "
-"útil por motivos de depuración, véase por ejemplo: <command>dpkg --audit</"
-"command>. Una combinación de opciones defensivas sería <placeholder type="
-"\"literallayout\" id=\"0\"/>"
+"en sus informes qué opciones ha usado. Pedir ayuda a &dpkg; también puede "
+"ser útil por motivos de depuración, véase por ejemplo: <command>dpkg --"
+"audit</command>. Una combinación de opciones defensivas sería <placeholder "
+"type=\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:668
+#: apt.conf.5.xml:721
 msgid ""
-"Add the no triggers flag to all dpkg calls (except the ConfigurePending "
+"Add the no triggers flag to all &dpkg; calls (except the ConfigurePending "
 "call).  See &dpkg; if you are interested in what this actually means. In "
-"short: dpkg will not run the triggers when this flag is present unless it is "
-"explicitly called to do so in an extra call.  Note that this option exists "
-"(undocumented) also in older apt versions with a slightly different meaning: "
-"Previously these option only append --no-triggers to the configure calls to "
-"dpkg - now apt will add these flag also to the unpack and remove calls."
-msgstr ""
-"Añade a todas las llamadas a dpkg la opción sin disparadores («no "
+"short: &dpkg; will not run the triggers when this flag is present unless it "
+"is explicitly called to do so in an extra call.  Note that this option "
+"exists (undocumented) also in older APT versions with a slightly different "
+"meaning: Previously these option only append --no-triggers to the configure "
+"calls to &dpkg; - now APT will also add this flag to the unpack and remove "
+"calls."
+msgstr ""
+"Añade a todas las llamadas a &dpkg; la opción sin disparadores («no "
 "triggers»), excepto a la llamada a «ConfigurePending». Consulte &dpkg; si "
-"está interesado en saber qué significa esto. De forma breve: dpkg no "
+"está interesado en saber qué significa esto. De forma breve: &dpkg; no "
 "ejecutará los disparadores cuando está opción esté presente a menos que se "
 "ejecute explícitamente en una llamada adicional. Tenga en cuenta que esta "
 "opción también existe en versiones antiguas de apt (aunque sin documentar) "
 "con un significado diferente. Anteriormente sólo se añadía la opción «--no-"
-"triggers» a las llamadas de la configuración para dpkg, ahora apt también "
+"triggers» a las llamadas de la configuración para &dpkg;, ahora apt también "
 "añadirá esta opción a las llamadas de desempaquetado y borrado."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:676
+#: apt.conf.5.xml:729
+#, fuzzy
+#| msgid ""
+#| "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
+#| "and \"<literal>no</literal>\".  \"<literal>all</literal>\" is the default "
+#| "value and causes APT to configure all packages explicit.  The "
+#| "\"<literal>smart</literal>\" way is it to configure only packages which "
+#| "need to be configured before another package can be unpacked (Pre-"
+#| "Depends) and let the rest configure by &dpkg; with a call generated by "
+#| "the next option. \"<literal>no</literal>\" on the other hand will not "
+#| "configure anything and totally rely on &dpkg; for configuration (which "
+#| "will at the moment fail if a Pre-Depends is encountered).  Setting this "
+#| "option to another than the all value will implicitly activate also the "
+#| "next option per default as otherwise the system could end in an "
+#| "unconfigured status which could be unbootable!"
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
-"and \"<literal>no</literal>\".  \"<literal>all</literal>\" is the default "
-"value and causes APT to configure all packages explicit.  The "
-"\"<literal>smart</literal>\" way is it to configure only packages which need "
-"to be configured before another package can be unpacked (Pre-Depends) and "
-"let the rest configure by dpkg with a call generated by the next option. "
-"\"<literal>no</literal>\" on the other hand will not configure anything and "
-"totally rely on dpkg for configuration (which will at the moment fail if a "
-"Pre-Depends is encountered).  Setting this option to another than the all "
-"value will implicitly activate also the next option per default as otherwise "
-"the system could end in an unconfigured status which could be unbootable!"
+"and \"<literal>no</literal>\".  The default value is \"<literal>all</literal>"
+"\", which causes APT to configure all packages. The \"<literal>smart</"
+"literal>\" way is to configure only packages which need to be configured "
+"before another package can be unpacked (Pre-Depends), and let the rest be "
+"configured by &dpkg; with a call generated by the ConfigurePending option "
+"(see below). On the other hand, \"<literal>no</literal>\" will not configure "
+"anything, and totally relies on &dpkg; for configuration (which at the "
+"moment will fail if a Pre-Depends is encountered). Setting this option to "
+"any value other than <literal>all</literal> will implicitly also activate "
+"the next option by default, as otherwise the system could end in an "
+"unconfigured and potentially unbootable state."
 msgstr ""
 "Los valores válidos son «<literal>all</literal>»,  «<literal>smart</"
 "literal>» y «<literal>no</literal>». «<literal>all</literal>» es el valor "
 "predeterminado y hace que APT configure todos los paquetes de forma "
 "explícita. El valor «<literal>smart</literal>» sólo configura los paquetes "
 "que necesiten ser configurados antes de que otro paquete se desempaquete "
-"(pre-dependencia) y permite que dpkg configure los restantes con una llamada "
-"generada por la siguiente opción. El valor «<literal>no</literal>» no "
-"configurará nada y dependerá totalmente de dpkg para la configuración (que "
-"fallará si se encuentra una pre-dependencia). Definir esta opción a otro "
-"valor distinto a «all» activará implícitamente la siguiente opción de forma "
-"predeterminada, ya que de otro modo el sistema podría terminar en un estado "
-"mal configurado qué podría derivar en la imposibilidad de arrancar el "
+"(pre-dependencia) y permite que &dpkg; configure los restantes con una "
+"llamada generada por la siguiente opción. El valor «<literal>no</literal>» "
+"no configurará nada y dependerá totalmente de &dpkg; para la configuración "
+"(que fallará si se encuentra una pre-dependencia). Definir esta opción a "
+"otro valor distinto a «all» activará implícitamente la siguiente opción de "
+"forma predeterminada, ya que de otro modo el sistema podría terminar en un "
+"estado mal configurado qué podría derivar en la imposibilidad de arrancar el "
 "sistema. "
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:687
-msgid ""
-"If this option is set apt will call <command>dpkg --configure --pending</"
-"command> to let dpkg handle all required configurations and triggers. This "
-"option is activated automatic per default if the previous option is not set "
-"to <literal>all</literal>, but deactivating could be useful if you want to "
-"run APT multiple times in a row - e.g. in an installer. In these sceneries "
-"you could deactivate this option in all but the last run."
+#: apt.conf.5.xml:744
+#, fuzzy
+#| msgid ""
+#| "If this option is set, APT will call <command>dpkg --configure --pending</"
+#| "command> to let &dpkg; handle all required configurations and triggers. "
+#| "This option is activated automatically per default if the previous option "
+#| "is not set to <literal>all</literal>, but deactivating it could be useful "
+#| "if you want to run APT multiple times in a row - e.g. in an installer. In "
+#| "these sceneries you could deactivate this option in all but the last run."
+msgid ""
+"If this option is set APT will call <command>dpkg --configure --pending</"
+"command> to let &dpkg; handle all required configurations and triggers. This "
+"option is activated automatically per default if the previous option is not "
+"set to <literal>all</literal>, but deactivating it could be useful if you "
+"want to run APT multiple times in a row - e.g. in an installer. In these "
+"sceneries you could deactivate this option in all but the last run."
 msgstr ""
 "Si define esta opción, apt ejecutará <command>dpkg --configure --pending</"
-"command> para permitir a dpkg manejar todas las configuraciones necesarias y "
-"todos los disparadores. Esta opción se activa automáticamente de forma "
+"command> para permitir a &dpkg; manejar todas las configuraciones necesarias "
+"y todos los disparadores. Esta opción se activa automáticamente de forma "
 "predeterminada si la opción anterior no está definida como <literal>all</"
 "literal>, pero desactivarla podría ser útil si se quiere ejecutar APT varias "
 "veces seguidas, por ejemplo: en un instalador. En estas situaciones podría "
 "desactivar esta opción en todas las ejecuciones menos la última."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:694
+#: apt.conf.5.xml:751
 msgid ""
-"Useful for <literal>smart</literal> configuration as a package which has "
-"pending triggers is not considered as <literal>installed</literal> and dpkg "
-"treats them as <literal>unpacked</literal> currently which is a dealbreaker "
-"for Pre-Dependencies (see debbugs #526774). Note that this will process all "
-"triggers, not only the triggers needed to configure this package."
+"Useful for the <literal>smart</literal> configuration as a package which has "
+"pending triggers is not considered as <literal>installed</literal>, and "
+"&dpkg; treats them as <literal>unpacked</literal> currently which is a "
+"showstopper for Pre-Dependencies (see debbugs #526774). Note that this will "
+"process all triggers, not only the triggers needed to configure this package."
 msgstr ""
 "Útil para una configuración <literal>smart</literal> en la que un paquete "
 "que tiene disparadores pendientes no se considera como <literal>instalado</"
-"literal> y que dpkg lo trata como <literal>desempaquetado</literal>, lo cual "
-"rompe el sistema de pre-dependencias (véase debbugs #526774). Tenga en "
+"literal> y que &dpkg; lo trata como <literal>desempaquetado</literal>, lo "
+"cual rompe el sistema de pre-dependencias (véase debbugs #526774). Tenga en "
 "cuenta que esto procesará todos los disparadores, no sólo los disparadores "
 "necesarios para configurar este paquete."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:700
-msgid ""
-"As the configuration can be deferred to be done at the end by dpkg it can be "
-"tried to order the unpack series only by critical needs, e.g. by Pre-"
-"Depends. Default is true and therefore the \"old\" method of ordering in "
-"various steps by everything. While both method were present in earlier APT "
-"versions the <literal>OrderCritical</literal> method was unused, so this "
-"method is very experimental and needs further improvements before becoming "
-"really useful."
-msgstr ""
-"Ya que la configuración se puede aplazar para que dpkg la haga al final se "
-"puede intentar ordenar las series de desempaquetado por necesidades "
-"críticas, por ejemplo, mediante pre-dependencias. De forma predeterminada, "
-"es «true» y por tanto se usa el método «antiguo» de ordenación en varios "
-"pasos para todo. Mientras ambos métodos estén presentes en versiones "
-"anteriores de APT, el método <literal>OrderCritical</literal> no se usará, "
-"ya que este método es experimental y necesita más mejoras antes de llegar a "
-"ser realmente útil."
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:715
+#: apt.conf.5.xml:764
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
@@ -4921,17 +5144,17 @@ msgstr ""
 "};"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:708
-msgid ""
-"Essential packages (and there dependencies) should be configured immediately "
-"after unpacking. It will be a good idea to do this quite early in the "
-"upgrade process as these these configure calls require currently also "
-"<literal>DPkg::TriggersPending</literal> which will run quite a few triggers "
-"(which maybe not needed). Essentials get per default a high score but the "
-"immediate flag is relatively low (a package which has a Pre-Depends is "
-"higher rated).  These option and the others in the same group can be used to "
-"change the scoring. The following example shows the settings with there "
-"default values.  <placeholder type=\"literallayout\" id=\"0\"/>"
+#: apt.conf.5.xml:757
+msgid ""
+"Essential packages (and their dependencies) should be configured immediately "
+"after unpacking. It is a good idea to do this quite early in the upgrade "
+"process as these configure calls also currently require <literal>DPkg::"
+"TriggersPending</literal> which will run quite a few triggers (which may not "
+"be needed). Essentials get per default a high score but the immediate flag "
+"is relatively low (a package which has a Pre-Depends is rated higher).  "
+"These option and the others in the same group can be used to change the "
+"scoring. The following example shows the settings with their default "
+"values.  <placeholder type=\"literallayout\" id=\"0\"/>"
 msgstr ""
 "Los paquetes esenciales (y sus dependencias) se deberían configurar "
 "inmediatamente después de desempaquetarlos. Es una buena idea hacerlo lo más "
@@ -4946,17 +5169,17 @@ msgstr ""
 "\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:728
+#: apt.conf.5.xml:777
 msgid "Periodic and Archives options"
 msgstr "Las opciones «Periodic» y «Archives»"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:729
+#: apt.conf.5.xml:778
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
-"of options configure behavior of apt periodic updates, which is done by "
-"<literal>/etc/cron.daily/apt</literal> script. See header of this script for "
-"the brief documentation of these options."
+"of options configure behavior of apt periodic updates, which is done by the "
+"<literal>/etc/cron.daily/apt</literal> script. See the top of this script "
+"for the brief documentation of these options."
 msgstr ""
 "Los grupos de opciones <literal>APT::Periodic</literal> y <literal>APT::"
 "Archives</literal> configuran el comportamiento de las actualizaciones "
@@ -4965,12 +5188,12 @@ msgstr ""
 "documentación de estas opciones."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:737
+#: apt.conf.5.xml:786
 msgid "Debug options"
 msgstr "Opciones de depuración"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:739
+#: apt.conf.5.xml:788
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -4987,7 +5210,7 @@ msgstr ""
 "para un usuario normal, aunque unas cuantas sí son:"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:750
+#: apt.conf.5.xml:799
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -4998,7 +5221,7 @@ msgstr ""
 "purge</literal>."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:758
+#: apt.conf.5.xml:807
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s install</"
@@ -5009,7 +5232,7 @@ msgstr ""
 "<literal>apt-get -s install</literal>) como un usuario normal."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:767
+#: apt.conf.5.xml:816
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
@@ -5021,7 +5244,7 @@ msgstr ""
 #. 	   motivating example, except I haven't a clue why you'd want
 #. 	   to do this. 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:775
+#: apt.conf.5.xml:824
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
 "in CD-ROM IDs."
@@ -5030,14 +5253,14 @@ msgstr ""
 "statfs en los identificadores de los CD-ROM."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:785
+#: apt.conf.5.xml:834
 msgid "A full list of debugging options to apt follows."
 msgstr ""
 "A continuación, se muestra la lista completa de las opciones de depuración "
 "de apt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:794
+#: apt.conf.5.xml:843
 msgid ""
 "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
@@ -5045,26 +5268,26 @@ msgstr ""
 "<literal>cdrom://</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:805
+#: apt.conf.5.xml:854
 msgid "Print information related to downloading packages using FTP."
 msgstr ""
 "Muestra la información relacionada con la descarga de paquetes mediante FTP."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:816
+#: apt.conf.5.xml:865
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 "Muestra la información relacionada con la descarga de paquetes mediante HTTP."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:827
+#: apt.conf.5.xml:876
 msgid "Print information related to downloading packages using HTTPS."
 msgstr ""
 "Muestra la información relacionada con la descarga de paquetes mediante "
 "HTTPS."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:838
+#: apt.conf.5.xml:887
 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
@@ -5073,7 +5296,7 @@ msgstr ""
 "criptográficas mediante <literal>gpg</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:849
+#: apt.conf.5.xml:898
 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
@@ -5082,14 +5305,14 @@ msgstr ""
 "paquetes almacenadas en CD-ROM."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:859
+#: apt.conf.5.xml:908
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr ""
 "Describe el proceso de resolución de dependencias de compilación en &apt-"
 "get;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:869
+#: apt.conf.5.xml:918
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
@@ -5098,7 +5321,7 @@ msgstr ""
 "<literal>apt</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:879
+#: apt.conf.5.xml:928
 msgid ""
 "Do not include information from <literal>statfs</literal>, namely the number "
 "of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@ -5109,7 +5332,7 @@ msgstr ""
 "identificador de un CD-ROM."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:890
+#: apt.conf.5.xml:939
 msgid ""
 "Disable all file locking.  For instance, this will allow two instances of "
 "<quote><literal>apt-get update</literal></quote> to run at the same time."
@@ -5119,14 +5342,14 @@ msgstr ""
 "a la vez."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:902
+#: apt.conf.5.xml:951
 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
 "Registra los elementos que se añaden o se borran de la cola de descarga "
 "global."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:912
+#: apt.conf.5.xml:961
 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
@@ -5136,7 +5359,7 @@ msgstr ""
 "ficheros descargados."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:922
+#: apt.conf.5.xml:971
 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."
@@ -5145,7 +5368,7 @@ msgstr ""
 "lista de índices de paquetes, y los errores relacionados con éstos."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:934
+#: apt.conf.5.xml:983
 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."
@@ -5155,7 +5378,7 @@ msgstr ""
 "índices completos."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:945
+#: apt.conf.5.xml:994
 msgid ""
 "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
@@ -5163,7 +5386,7 @@ msgstr ""
 "descargas."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:956
+#: apt.conf.5.xml:1005
 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."
@@ -5172,7 +5395,7 @@ msgstr ""
 "de los paquetes y con la eliminación de los paquetes sin usar."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:966
+#: apt.conf.5.xml:1015
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
@@ -5187,20 +5410,21 @@ msgstr ""
 "<literal>apt</literal>. Véase <literal>Debug::pkgProblemResolver</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:980
+#: apt.conf.5.xml:1029
 msgid ""
-"Generate debug messages describing which package is marked as keep/install/"
+"Generate debug messages describing which packages are marked as keep/install/"
 "remove while the ProblemResolver does his work.  Each addition or deletion "
-"may trigger additional actions; they are shown indented two additional space "
-"under the original entry.  The format for each line is <literal>MarkKeep</"
-"literal>, <literal>MarkDelete</literal> or <literal>MarkInstall</literal> "
-"followed by <literal>package-name &lt;a.b.c -&gt; d.e.f | x.y.z&gt; (section)"
-"</literal> where <literal>a.b.c</literal> is the current version of the "
-"package, <literal>d.e.f</literal> is the version considered for installation "
-"and <literal>x.y.z</literal> is a newer version, but not considered for "
-"installation (because of a low pin score). The later two can be omitted if "
-"there is none or if it is the same version as the installed.  "
-"<literal>section</literal> is the name of the section the package appears in."
+"may trigger additional actions; they are shown indented two additional "
+"spaces under the original entry.  The format for each line is "
+"<literal>MarkKeep</literal>, <literal>MarkDelete</literal> or "
+"<literal>MarkInstall</literal> followed by <literal>package-name &lt;a.b.c -"
+"&gt; d.e.f | x.y.z&gt; (section)</literal> where <literal>a.b.c</literal> is "
+"the current version of the package, <literal>d.e.f</literal> is the version "
+"considered for installation and <literal>x.y.z</literal> is a newer version, "
+"but not considered for installation (because of a low pin score). The later "
+"two can be omitted if there is none or if it is the same as the installed "
+"version.  <literal>section</literal> is the name of the section the package "
+"appears in."
 msgstr ""
 "Genera los mensajes de depuración que describen qué paquete se marcará como "
 "mantener/instalar/borrar mientras el solucionador de problemas "
@@ -5217,14 +5441,7 @@ msgstr ""
 "la sección en la que aparece el paquete."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1002
-msgid "Dump the default configuration to standard error on startup."
-msgstr ""
-"Vuelca la configuración predeterminada a la salida estándar durante al "
-"iniciarse."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1012
+#: apt.conf.5.xml:1050
 msgid ""
 "When invoking &dpkg;, output the precise command line with which it is being "
 "invoked, with arguments separated by a single space character."
@@ -5233,7 +5450,7 @@ msgstr ""
 "invocó, con los argumentos separados por un espacio."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1023
+#: apt.conf.5.xml:1061
 msgid ""
 "Output all the data received from &dpkg; on the status file descriptor and "
 "any errors encountered while parsing it."
@@ -5242,7 +5459,7 @@ msgstr ""
 "estado y cualquier error encontrado durante el análisis."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1034
+#: apt.conf.5.xml:1072
 msgid ""
 "Generate a trace of the algorithm that decides the order in which "
 "<literal>apt</literal> should pass packages to &dpkg;."
@@ -5251,7 +5468,7 @@ msgstr ""
 "literal> debería entregar los paquetes a &dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1046
+#: apt.conf.5.xml:1084
 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr ""
@@ -5259,12 +5476,12 @@ msgstr ""
 "&dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1057
+#: apt.conf.5.xml:1095
 msgid "Output the priority of each package list on startup."
 msgstr "Muestra la prioridad de cada lista de paquetes al iniciarse."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1067
+#: apt.conf.5.xml:1105
 msgid ""
 "Trace the execution of the dependency resolver (this applies only to what "
 "happens when a complex dependency problem is encountered)."
@@ -5273,7 +5490,7 @@ msgstr ""
 "lo que ocurre cuando se encuentra un problema de dependencias complejo)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1078
+#: apt.conf.5.xml:1116
 msgid ""
 "Display a list of all installed packages with their calculated score used by "
 "the pkgProblemResolver. The description of the package is the same as "
@@ -5284,7 +5501,7 @@ msgstr ""
 "misma que la descrita en <literal>Debug::pkgDepCache::Marker</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1090
+#: apt.conf.5.xml:1128
 msgid ""
 "Print information about the vendors read from <filename>/etc/apt/vendors."
 "list</filename>."
@@ -5293,13 +5510,13 @@ msgstr ""
 "vendors.list</filename>."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1112 apt_preferences.5.xml:545 sources.list.5.xml:211
+#: apt.conf.5.xml:1150 apt_preferences.5.xml:545 sources.list.5.xml:211
 #: apt-ftparchive.1.xml:596
 msgid "Examples"
 msgstr "Ejemplos"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1113
+#: apt.conf.5.xml:1151
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
@@ -5309,7 +5526,7 @@ msgstr ""
 
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1125
+#: apt.conf.5.xml:1163
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
 
@@ -5426,7 +5643,7 @@ msgid ""
 "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, unless that file matches a pattern in the "
-"<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this "
+"<literal>Dir::Ignore-Files-Silently</literal> configuration list - in which "
 "case it will be silently ignored."
 msgstr ""
 "Tenga en cuenta los ficheros en el directorio <filename>/etc/apt/preferences."
@@ -6706,40 +6923,25 @@ msgid "Package resource list for APT"
 msgstr "Lista de los repositorios de paquetes para APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:37
+#: sources.list.5.xml:38
 msgid ""
-"The package resource list is used to locate archives of the package "
-"distribution system in use on the system. At this time, this manual page "
-"documents only the packaging system used by the Debian system.  This control "
-"file is <filename>/etc/apt/sources.list</filename>."
+"The source list <filename>/etc/apt/sources.list</filename> is designed to "
+"support any number of active sources and a variety of source media. The file "
+"lists one source per line, with the most preferred source listed first. The "
+"information available from the configured sources is acquired by "
+"<command>apt-get update</command> (or by an equivalent command from another "
+"APT front-end)."
 msgstr ""
-"La lista de los repositorios de paquetes se usa para ubicar los archivos de "
-"Debian del sistema de distribución de paquetes en uso en el sistema. A día "
-"de hoy, esta página del manual documenta sólo el sistema de paquetes que usa "
-"Debian. Este fichero de control está ubicado en <filename>/etc/apt/sources."
-"list</filename>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:42
-msgid ""
-"The source list is designed to support any number of active sources and a "
-"variety of source media. The file lists one source per line, with the most "
-"preferred source listed first. The format of each line is: <literal>type uri "
-"args</literal> The first item, <literal>type</literal> determines the format "
-"for <literal>args</literal>. <literal>uri</literal> is a Universal Resource "
-"Identifier (URI), which is a superset of the more specific and well-known "
-"Universal Resource Locator, or URL. The rest of the line can be marked as a "
-"comment by using a #."
-msgstr ""
-"La lista de los repositorios está diseñada para gestionar cualquier número "
-"de fuentes y distintos tipos de procedencias. El fichero lista una fuente "
-"por línea, con la fuente de mayor prioridad en la primera línea. El formato "
-"de cada línea es: <literal>tipo uri argumentos</literal>. El primer "
-"elemento, <literal>tipo</literal>, determina el formato de "
-"<literal>argumentos</literal>. <literal>uri</literal> es «Universal Resource "
-"Identifier» (Identificador Universal de Recursos), un superconjunto de la "
-"más específica y bien conocida «Universal Resource Locator» (URL). Se puede "
-"marcar el resto de la línea como comentario usando #."
+#: sources.list.5.xml:45
+msgid ""
+"Each line specifying a source starts with type (e.g. <literal>deb-src</"
+"literal>)  followed by options and arguments for this type.  Individual "
+"entries cannot be continued onto a following line. Empty lines are ignored, "
+"and a <literal>#</literal> character anywhere on a line marks the remainder "
+"of that line as a comment."
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: sources.list.5.xml:53
@@ -6764,7 +6966,7 @@ msgid ""
 "digits (0-9), underscore (_), hyphen (-) and period (.) characters.  "
 "Otherwise APT will print a notice that it has ignored a file, unless that "
 "file matches a pattern in the <literal>Dir::Ignore-Files-Silently</literal> "
-"configuration list - in this case it will be silently ignored."
+"configuration list - in which case it will be silently ignored."
 msgstr ""
 "El directorio <filename>/etc/apt/sources.list.d</filename> ofrece una manera "
 "de añadir entradas de «sources.list» en ficheros separados. El formato es "
@@ -6782,7 +6984,7 @@ msgstr "Los tipos «deb» y «deb-src»"
 #: sources.list.5.xml:66
 #, fuzzy
 #| msgid ""
-#| "The <literal>deb</literal> type describes a typical two-level Debian "
+#| "The <literal>deb</literal> type references a typical two-level Debian "
 #| "archive, <filename>distribution/component</filename>. Typically, "
 #| "<literal>distribution</literal> is generally one of <literal>stable</"
 #| "literal> <literal>unstable</literal> or <literal>testing</literal> while "
@@ -6792,16 +6994,16 @@ msgstr "Los tipos «deb» y «deb-src»"
 #| "code in the same form as the <literal>deb</literal> type.  A <literal>deb-"
 #| "src</literal> line is required to fetch source indexes."
 msgid ""
-"The <literal>deb</literal> type describes a typical two-level Debian "
-"archive, <filename>distribution/component</filename>. Typically, "
-"<literal>distribution</literal> is generally an archivename like "
+"The <literal>deb</literal> type references a typical two-level Debian "
+"archive, <filename>distribution/component</filename>. The "
+"<literal>distribution</literal> is generally an archive name like "
 "<literal>stable</literal> or <literal>testing</literal> or a codename like "
 "<literal>&stable-codename;</literal> or <literal>&testing-codename;</"
-"literal> while component is one of <literal>main</literal> <literal>contrib</"
-"literal> or <literal>non-free</literal>. The <literal>deb-src</literal> type "
-"describes a debian distribution's source code in the same form as the "
-"<literal>deb</literal> type.  A <literal>deb-src</literal> line is required "
-"to fetch source indexes."
+"literal> while component is one of <literal>main</literal>, "
+"<literal>contrib</literal> or <literal>non-free</literal>. The <literal>deb-"
+"src</literal> type references a Debian distribution's source code in the "
+"same form as the <literal>deb</literal> type.  A <literal>deb-src</literal> "
+"line is required to fetch source indexes."
 msgstr ""
 "El tipo <literal>deb</literal> hace referencia a un típico archivo de Debian "
 "de dos niveles, <filename>distribución/componente</filename>. Normalmente, "
@@ -6837,33 +7039,42 @@ msgid ""
 "Debian distribution, from which APT will find the information it needs.  "
 "<literal>distribution</literal> can specify an exact path, in which case the "
 "components must be omitted and <literal>distribution</literal> must end with "
-"a slash (/). This is useful for when the case only a particular sub-section "
-"of the archive denoted by the URI is of interest.  If <literal>distribution</"
-"literal> does not specify an exact path, at least one <literal>component</"
-"literal> must be present."
+"a slash (<literal>/</literal>). This is useful for the case when only a "
+"particular sub-section of the archive denoted by the URI is of interest.  If "
+"<literal>distribution</literal> does not specify an exact path, at least one "
+"<literal>component</literal> must be present."
 msgstr ""
 "La URI para el tipo <literal>deb</literal> debe especificar la base de la "
 "distribución de Debian desde la que APT encontrará la información que "
 "necesita. <literal>distribución</literal> puede definir una ruta exacta, en "
 "cuyo caso debe omitir los componentes y <literal>distribución</literal> debe "
-"finalizar con una barra (/). Esto es útil cuando sólo se quiere una sub-"
-"sección del archivo señalado por la URI. Al menos uno de los "
+"finalizar con una barra (<literal>/</literal>). Esto es útil cuando sólo se "
+"quiere una sub-sección del archivo señalado por la URI. Al menos uno de los "
 "<literal>componentes</literal> debe estar presente si <literal>distribución</"
 "literal> no define una ruta exacta."
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:92
+#, fuzzy
+#| msgid ""
+#| "<literal>distribution</literal> may also contain a variable, <literal>"
+#| "$(ARCH)</literal> which expands to the Debian architecture (i386, amd64, "
+#| "powerpc, ...)  used on the system. This permits architecture-independent "
+#| "<filename>sources.list</filename> files to be used. In general this is "
+#| "only of interest when specifying an exact path, <literal>APT</literal> "
+#| "will automatically generate a URI with the current architecture otherwise."
 msgid ""
 "<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)"
-"</literal> which expands to the Debian architecture (i386, m68k, "
-"powerpc, ...)  used on the system. This permits architecture-independent "
-"<filename>sources.list</filename> files to be used. In general this is only "
-"of interest when specifying an exact path, <literal>APT</literal> will "
-"automatically generate a URI with the current architecture otherwise."
+"</literal> which expands to the Debian architecture (such as <literal>amd64</"
+"literal> or <literal>armel</literal>) used on the system. This permits "
+"architecture-independent <filename>sources.list</filename> files to be used. "
+"In general this is only of interest when specifying an exact path, "
+"<literal>APT</literal> will automatically generate a URI with the current "
+"architecture otherwise."
 msgstr ""
 "<literal>distribución</literal> puede contener una variable, <literal>$(ARCH)"
 "</literal>, que se expandirá a la arquitectura de Debian usada en el sistema "
-"(i386, m68k, powerpc, ...). Esto permite que los ficheros <filename>sources."
+"(i386, amd64, powerpc, ...). Esto permite que los ficheros <filename>sources."
 "list</filename> sean independientes de la arquitectura. En general, esta "
 "característica sólo es de interés si se especifica una ruta completa, de lo "
 "contrario <literal>APT</literal> generará automáticamente la URI con la "
@@ -6898,12 +7109,12 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:112
 msgid ""
-"<literal>options</literal> is always optional and needs to be surounded by "
+"<literal>options</literal> is always optional and needs to be surrounded 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:"
+"following settings are supported by APT (note however that unsupported "
+"settings will be ignored silently):"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
@@ -6911,7 +7122,7 @@ msgstr ""
 msgid ""
 "<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 "
+"information should be downloaded. If this option is not set all "
 "architectures defined by the <literal>APT::Architectures</literal> option "
 "will be downloaded."
 msgstr ""
@@ -7009,13 +7220,23 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml:172
+#, fuzzy
+#| msgid ""
+#| "The ftp scheme specifies an FTP server for the archive. APT's FTP "
+#| "behavior is highly configurable; for more information see the &apt-conf; "
+#| "manual page. Please note that a ftp proxy can be specified by using the "
+#| "<envar>ftp_proxy</envar> environment variable. It is possible to specify "
+#| "a http proxy (http proxy servers often understand ftp urls)  using this "
+#| "method and ONLY this method. ftp proxies using http specified in the "
+#| "configuration file will be ignored."
 msgid ""
 "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
 "is highly configurable; for more information see the &apt-conf; manual page. "
-"Please note that a ftp proxy can be specified by using the <envar>ftp_proxy</"
-"envar> environment variable. It is possible to specify a http proxy (http "
-"proxy servers often understand ftp urls)  using this method and ONLY this "
-"method. ftp proxies using http specified in the configuration file will be "
+"Please note that an FTP proxy can be specified by using the "
+"<envar>ftp_proxy</envar> environment variable. It is possible to specify an "
+"HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
+"environment variable and <emphasis>ONLY</emphasis> this environment "
+"variable. Proxies using HTTP specified in the configuration file will be "
 "ignored."
 msgstr ""
 "El esquema «ftp» especifica un servidor FTP como archivo. El comportamiento "
@@ -7027,24 +7248,37 @@ msgstr ""
 "ignorarán proxies ftp definidos en el fichero de configuración que usen http."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:183
+#: sources.list.5.xml:184
+#, fuzzy
+#| msgid ""
+#| "The copy scheme is identical to the file scheme except that packages are "
+#| "copied into the cache directory instead of used directly at their "
+#| "location.  This is useful for people using a zip disk to copy files "
+#| "around with APT."
 msgid ""
 "The copy scheme is identical to the file scheme except that packages are "
 "copied into the cache directory instead of used directly at their location.  "
-"This is useful for people using a zip disk to copy files around with APT."
+"This is useful for people using removable media to copy files around with "
+"APT."
 msgstr ""
 "El esquema «copy» es idéntico a «file», pero los paquetes se copian al "
 "directorio almacén en vez de usarlos directamente en su ubicación original. "
 "Esto es útil para gente que use discos zip con APT."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:190
+#: sources.list.5.xml:191
+#, fuzzy
+#| msgid ""
+#| "The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given "
+#| "user and access the files. It is a good idea to do prior arrangements "
+#| "with RSA keys or rhosts.  Access to files on the remote uses standard "
+#| "<command>find</command> and <command>dd</command> commands to perform the "
+#| "file transfers from the remote."
 msgid ""
-"The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given "
-"user and access the files. It is a good idea to do prior arrangements with "
-"RSA keys or rhosts.  Access to files on the remote uses standard "
-"<command>find</command> and <command>dd</command> commands to perform the "
-"file transfers from the remote."
+"The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
+"the files as a given user. Prior configuration of rhosts or RSA keys is "
+"recommended. The standard <command>find</command> and <command>dd</command> "
+"commands are used to perform the file transfers from the remote host."
 msgstr ""
 "El método «rsh/ssh» invoca «rsh/ssh» para establecer conexiones con los "
 "servidores remotos como un usuario dado, y acceder a los ficheros. Es "
@@ -7072,12 +7306,12 @@ msgstr "Otros tipos de URI reconocidos."
 #| "<citerefentry> <refentrytitle><filename>apt-transport-debtorrent</"
 #| "filename></refentrytitle> <manvolnum>1</manvolnum></citerefentry>."
 msgid ""
-"APT can be extended with more methods shipped in other optional packages "
-"which should follow the nameing scheme <package>apt-transport-"
-"<replaceable>method</replaceable></package>.  The APT team e.g. maintains "
-"also the <package>apt-transport-https</package> package which provides "
-"access methods for https-URIs with features similar to the http method, but "
-"other methods for using e.g. debtorrent are also available, see &apt-"
+"APT can be extended with more methods shipped in other optional packages, "
+"which should follow the naming scheme <package>apt-transport-"
+"<replaceable>method</replaceable></package>.  For instance, the APT team "
+"also maintains the package <package>apt-transport-https</package>, which "
+"provides access methods for HTTPS URIs with features similar to the http "
+"method.  Methods for using e.g. debtorrent are also available - see &apt-"
 "transport-debtorrent;."
 msgstr ""
 "Puede extender APT con más métodos, proporcionados en otros paquetes "
@@ -7321,7 +7555,10 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-sortpkgs.1.xml:45
-msgid "All output is sent to stdout, the input must be a seekable file."
+#, fuzzy
+#| msgid "All output is sent to stdout, the input must be a seekable file."
+msgid ""
+"All output is sent to standard output; the input must be a seekable file."
 msgstr ""
 "Toda la salida se muestra por la salida estándar, la entrada debe ser un "
 "fichero ubicable."
@@ -9972,6 +10209,126 @@ msgid "Which will use the already fetched archives on the disc."
 msgstr "Ésto usará los archivos del disco previamente obtenidos."
 
 #~ msgid ""
+#~ "As the configuration can be deferred to be done at the end by &dpkg; it "
+#~ "can be tried to order the unpack series only by critical needs, e.g. by "
+#~ "Pre-Depends. Default is true and therefore the \"old\" method of ordering "
+#~ "in various steps by everything. While both method were present in earlier "
+#~ "APT versions the <literal>OrderCritical</literal> method was unused, so "
+#~ "this method is very experimental and needs further improvements before "
+#~ "becoming really useful."
+#~ msgstr ""
+#~ "Ya que la configuración se puede aplazar para que &dpkg; la haga al final "
+#~ "se puede intentar ordenar las series de desempaquetado por necesidades "
+#~ "críticas, por ejemplo, mediante pre-dependencias. De forma "
+#~ "predeterminada, es «true» y por tanto se usa el método «antiguo» de "
+#~ "ordenación en varios pasos para todo. Mientras ambos métodos estén "
+#~ "presentes en versiones anteriores de APT, el método "
+#~ "<literal>OrderCritical</literal> no se usará, ya que este método es "
+#~ "experimental y necesita más mejoras antes de llegar a ser realmente útil."
+
+#~ msgid "Dump the default configuration to standard error on startup."
+#~ msgstr ""
+#~ "Vuelca la configuración predeterminada a la salida estándar durante al "
+#~ "iniciarse."
+
+#~ msgid ""
+#~ "Defaults to on which will cause APT to install essential and important "
+#~ "packages as fast as possible in the install/upgrade operation. This is "
+#~ "done to limit the effect of a failing &dpkg; call: If this option is "
+#~ "disabled APT does treat an important package in the same way as an extra "
+#~ "package: Between the unpacking of the important package A and his "
+#~ "configuration can then be many other unpack or configuration calls, e.g. "
+#~ "for package B which has no relation to A, but causes the dpkg call to "
+#~ "fail (e.g. because maintainer script of package B generates an error) "
+#~ "which results in a system state in which package A is unpacked but "
+#~ "unconfigured - each package depending on A is now no longer guaranteed to "
+#~ "work as their dependency on A is not longer satisfied. The immediate "
+#~ "configuration marker is also applied to all dependencies which can "
+#~ "generate a problem if the dependencies e.g. form a circle as a dependency "
+#~ "with the immediate flag is comparable with a Pre-Dependency. So in theory "
+#~ "it is possible that APT encounters a situation in which it is unable to "
+#~ "perform immediate configuration, errors out and refers to this option so "
+#~ "the user can deactivate the immediate configuration temporarily to be "
+#~ "able to perform an install/upgrade again. Note the use of the word "
+#~ "\"theory\" here as this problem was only encountered by now in real world "
+#~ "a few times in non-stable distribution versions and was caused by wrong "
+#~ "dependencies of the package in question or by a system in an already "
+#~ "broken state, so you should not blindly disable this option as the "
+#~ "mentioned scenario above is not the only problem immediate configuration "
+#~ "can help to prevent in the first place.  Before a big operation like "
+#~ "<literal>dist-upgrade</literal> is run with this option disabled it "
+#~ "should be tried to explicitly <literal>install</literal> the package APT "
+#~ "is unable to configure immediately, but please make sure to report your "
+#~ "problem also to your distribution and to the APT team with the buglink "
+#~ "below so they can work on improving or correcting the upgrade process."
+#~ msgstr ""
+#~ "Activo de forma predeterminada, hará que APT instale los paquetes "
+#~ "esenciales e importantes tan rápido como le sea posible al instalar y/o "
+#~ "actualizar. Esto se hace para limitar el efecto de un fallo en la "
+#~ "ejecución de &dpkg;. Si esta opción está desactivada, APT trata los "
+#~ "paquetes importantes del mismo modo que un paquete adicional: entre "
+#~ "desempaquetar un paquete importante A y su configuración puede haber "
+#~ "muchos otros desempaquetados y configuraciones. Por ejemplo, el paquete B "
+#~ "que no tiene relación con A, pero que hace que la ejecución de dpkg falle "
+#~ "(ya sea porque el script del mantenedor del paquete B genera un error) "
+#~ "generará un estado del sistema en el que el paquete A está desempaquetado "
+#~ "pero no configurado; no se garantiza el funcionamiento de cada paquete "
+#~ "que depende de A ya que su dependencia con A no está satisfecha. El "
+#~ "marcador de configuración inmediata se aplicará a todas las dependencias "
+#~ "que puedan generar un problema si las dependencias, por ejemplo, forman "
+#~ "un círculo vicioso como dependencia con la marca de configuración "
+#~ "inmediata, lo cual lo califica casi como Pre-Dependencia. Así, en teoría "
+#~ "es posible que APT encuentre una situación en la que es incapaz de llevar "
+#~ "a cabo una configuración inmediata, devuelva un error y mencione esta "
+#~ "opción para que así el usuario pueda desactivar la configuración "
+#~ "inmediata temporalmente para llevar a cabo una vez más la instalación y/o "
+#~ "actualización. Observe el uso de la expresión «en teoría», ya que esta "
+#~ "situación sólo se ha visto algunas veces con versiones de distribución no "
+#~ "estables, y causadas por dependencias incorrectas del paquete en cuestión "
+#~ "o en un sistema ya roto. Por ello, no debería desactivar ciegamente esta "
+#~ "opción ya que la situación mencionada anteriormente no es el único "
+#~ "problema que la configuración inmediata puede resolver. Antes de llevar a "
+#~ "cabo una operación grande como <literal>dist-upgrade</literal> con esta "
+#~ "opción desactivada debería intentar un <literal>install</literal> con el "
+#~ "paquete que APT es incapaz de configurar inmediatamente, pero asegúrese "
+#~ "de informar del fallo a su distribución y al equipo de APT mediante el "
+#~ "enlace a informes de fallo a continuación para que así puedan mejorar o "
+#~ "corregir el proceso de actualización."
+
+#~ msgid ""
+#~ "The package resource list is used to locate archives of the package "
+#~ "distribution system in use on the system. At this time, this manual page "
+#~ "documents only the packaging system used by the Debian system.  This "
+#~ "control file is <filename>/etc/apt/sources.list</filename>."
+#~ msgstr ""
+#~ "La lista de los repositorios de paquetes se usa para ubicar los archivos "
+#~ "de Debian del sistema de distribución de paquetes en uso en el sistema. A "
+#~ "día de hoy, esta página del manual documenta sólo el sistema de paquetes "
+#~ "que usa Debian. Este fichero de control está ubicado en <filename>/etc/"
+#~ "apt/sources.list</filename>"
+
+#~ msgid ""
+#~ "The source list is designed to support any number of active sources and a "
+#~ "variety of source media. The file lists one source per line, with the "
+#~ "most preferred source listed first. The format of each line is: "
+#~ "<literal>type uri args</literal> The first item, <literal>type</literal> "
+#~ "determines the format for <literal>args</literal>. <literal>uri</literal> "
+#~ "is a Universal Resource Identifier (URI), which is a superset of the more "
+#~ "specific and well-known Universal Resource Locator, or URL. The rest of "
+#~ "the line can be marked as a comment by using a #."
+#~ msgstr ""
+#~ "La lista de los repositorios está diseñada para gestionar cualquier "
+#~ "número de fuentes y distintos tipos de procedencias. El fichero lista una "
+#~ "fuente por línea, con la fuente de mayor prioridad en la primera línea. "
+#~ "El formato de cada línea es: <literal>tipo uri argumentos</literal>. El "
+#~ "primer elemento, <literal>tipo</literal>, determina el formato de "
+#~ "<literal>argumentos</literal>. <literal>uri</literal> es «Universal "
+#~ "Resource Identifier» (Identificador Universal de Recursos), un "
+#~ "superconjunto de la más específica y bien conocida «Universal Resource "
+#~ "Locator» (URL). Se puede marcar el resto de la línea como comentario "
+#~ "usando #."
+
+#~ msgid ""
 #~ "<literal>gencaches</literal> performs the same operation as <command>apt-"
 #~ "get check</command>. It builds the source and package caches from the "
 #~ "sources in &sources-list; and from <filename>/var/lib/dpkg/status</"
diff --git a/doc/po/fr.po b/doc/po/fr.po
index 14d8e8062..aae0e6bb8 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-06 23:46+0300\n"
+"POT-Creation-Date: 2012-06-09 19:12+0300\n"
 "PO-Revision-Date: 2012-06-02 18:37+0200\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -1581,14 +1581,14 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml:518 apt-cache.8.xml:343 apt-key.8.xml:174 apt-mark.8.xml:125
-#: apt.conf.5.xml:1118 apt_preferences.5.xml:698
+#: apt.conf.5.xml:1156 apt_preferences.5.xml:698
 msgid "Files"
 msgstr "Fichiers"
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131
 #: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109
-#: apt.conf.5.xml:1124 apt_preferences.5.xml:705 sources.list.5.xml:252
+#: apt.conf.5.xml:1162 apt_preferences.5.xml:705 sources.list.5.xml:252
 #: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63
 #: apt-ftparchive.1.xml:607
 msgid "See Also"
@@ -3145,11 +3145,17 @@ msgstr "Fichier de configuration pour APT"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:42
+#, fuzzy
+#| msgid ""
+#| "<filename>apt.conf</filename> is the main configuration file for the APT "
+#| "suite of tools, but by far not the only place changes to options can be "
+#| "made. All tools therefore share the configuration files and also use a "
+#| "common command line parser to provide a uniform environment."
 msgid ""
-"<filename>apt.conf</filename> is the main configuration file for the APT "
-"suite of tools, but by far not the only place changes to options can be "
-"made. All tools therefore share the configuration files and also use a "
-"common command line parser to provide a uniform environment."
+"<filename>/etc/apt/apt.conf</filename> is the main configuration file shared "
+"by all the tools in the APT suite of tools, though it is by no means the "
+"only place options can be set. The suite also shares a common command line "
+"parser to provide a uniform environment."
 msgstr ""
 "Le fichier <filename>apt.conf</filename>  est le fichier de configuration "
 "principal du l'ensemble de programmes APT, mais n'est de loin pas le seul "
@@ -3159,7 +3165,7 @@ msgstr ""
 "d'utilisation uniforme."
 
 #. type: Content of: <refentry><refsect1><orderedlist><para>
-#: apt.conf.5.xml:47
+#: apt.conf.5.xml:48
 msgid ""
 "When an APT tool starts up it will read the configuration files in the "
 "following order:"
@@ -3168,7 +3174,7 @@ msgstr ""
 "configuration dans l'ordre suivant :"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:49
+#: apt.conf.5.xml:50
 msgid ""
 "the file specified by the <envar>APT_CONFIG</envar> environment variable (if "
 "any)"
@@ -3177,15 +3183,15 @@ msgstr ""
 "elle existe"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:51
+#: apt.conf.5.xml:52
 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, unless that file matches a pattern in the <literal>Dir::"
-"Ignore-Files-Silently</literal> configuration list - in this case it will be "
-"silently ignored."
+"Ignore-Files-Silently</literal> configuration list - in which 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>"
@@ -3198,14 +3204,14 @@ msgstr ""
 "configuration étant, eux, ignorés silencieusemennt)."
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:58
+#: apt.conf.5.xml:59
 msgid ""
 "the main configuration file specified by <literal>Dir::Etc::main</literal>"
 msgstr ""
 "le fichier de configuration défini par <literal>Dir::Etc::Main</literal>"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:60
+#: apt.conf.5.xml:61
 msgid ""
 "the command line options are applied to override the configuration "
 "directives or to load even more configuration files."
@@ -3215,16 +3221,16 @@ msgstr ""
 "configuration."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:64
+#: apt.conf.5.xml:65
 msgid "Syntax"
 msgstr "Syntaxe"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:65
+#: apt.conf.5.xml:66
 msgid ""
 "The configuration file is organized in a tree with options organized into "
 "functional groups. Option specification is given with a double colon "
-"notation, for instance <literal>APT::Get::Assume-Yes</literal> is an option "
+"notation; for instance <literal>APT::Get::Assume-Yes</literal> is an option "
 "within the APT tool group, for the Get tool. Options do not inherit from "
 "their parent groups."
 msgstr ""
@@ -3235,19 +3241,31 @@ msgstr ""
 "Get. Il n'y a pas d'héritage des options des groupes parents."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:71
+#: apt.conf.5.xml:72
+#, fuzzy
+#| msgid ""
+#| "Syntactically the configuration language is modeled after what the ISC "
+#| "tools such as bind and dhcp use. Lines starting with <literal>//</"
+#| "literal> are treated as comments (ignored), as well as all text between "
+#| "<literal>/*</literal> and <literal>*/</literal>, just like C/C++ "
+#| "comments.  Each line is of the form <literal>APT::Get::Assume-Yes \"true"
+#| "\";</literal>. The trailing semicolon and the quotes are required. The "
+#| "value must be on one line, and there is no kind of string concatenation. "
+#| "It must not include inside quotes.  The behavior of the backslash \"\\\" "
+#| "and escaped characters inside a value is undefined and it should not be "
+#| "used. An option name may include alphanumerical characters and the \"/-:._"
+#| "+\" characters. A new scope can be opened with curly braces, like:"
 msgid ""
 "Syntactically the configuration language is modeled after what the ISC tools "
 "such as bind and dhcp use. Lines starting with <literal>//</literal> are "
 "treated as comments (ignored), as well as all text between <literal>/*</"
 "literal> and <literal>*/</literal>, just like C/C++ comments.  Each line is "
-"of the form <literal>APT::Get::Assume-Yes \"true\";</literal>. The trailing "
-"semicolon and the quotes are required. The value must be on one line, and "
-"there is no kind of string concatenation. It must not include inside "
-"quotes.  The behavior of the backslash \"\\\" and escaped characters inside "
-"a value is undefined and it should not be used. An option name may include "
-"alphanumerical characters and the \"/-:._+\" characters. A new scope can be "
-"opened with curly braces, like:"
+"of the form <literal>APT::Get::Assume-Yes \"true\";</literal>.  The "
+"quotation marks and trailing semicolon are required.  The value must be on "
+"one line, and there is no kind of string concatenation.  Values must not "
+"include backslashes or extra quotation marks.  Option names are made up of "
+"alphanumeric characters and the characters \"/-:._+\".  A new scope can be "
+"opened with curly braces, like this:"
 msgstr ""
 "Syntaxiquement, le langage de configuration est conçu sur le même modèle que "
 "les langages utilisés par des outils ISC tels que bind et dhcp. Une ligne "
@@ -3284,10 +3302,16 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:93
+#, fuzzy
+#| msgid ""
+#| "with newlines placed to make it more readable. Lists can be created by "
+#| "opening a scope and including a single string enclosed in quotes followed "
+#| "by a semicolon. Multiple entries can be included, each separated by a "
+#| "semicolon."
 msgid ""
 "with newlines placed to make it more readable. Lists can be created by "
 "opening a scope and including a single string enclosed in quotes followed by "
-"a semicolon. Multiple entries can be included, each separated by a semicolon."
+"a semicolon. Multiple entries can be included, separated by a semicolon."
 msgstr ""
 "avec des retours à la ligne pour faciliter la lecture. On peut créer une "
 "liste en ouvrant un champ d'action et en y insérant une chaîne entre "
@@ -3311,9 +3335,13 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:105
+#, fuzzy
+#| msgid ""
+#| "The names of the configuration items are not case-sensitive. So in the "
+#| "previous example you could use <literal>dpkg::pre-install-pkgs</literal>."
 msgid ""
-"The names of the configuration items are not case-sensitive. So in the "
-"previous example you could use <literal>dpkg::pre-install-pkgs</literal>."
+"Case is not significant in names of configuration items, so in the previous "
+"example you could use <literal>dpkg::pre-install-pkgs</literal>."
 msgstr ""
 "Les identifiants des options de configuration ne sont pas sensibles à la "
 "casse.  Dans l'exemple précédent, on pourrait donc aussi bien utiliser "
@@ -3322,11 +3350,11 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:108
 msgid ""
-"Names for the configuration items are optional if a list is defined as it "
-"can be see in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. "
-"If you don't specify a name a new entry will simply add a new option to the "
-"list. If you specify a name you can override the option as every other "
-"option by reassigning a new value to the option."
+"Names for the configuration items are optional if a list is defined as can "
+"be seen in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. If "
+"you don't specify a name a new entry will simply add a new option to the "
+"list. If you specify a name you can override the option in the same way as "
+"any other option by reassigning a new value to the option."
 msgstr ""
 "Les noms des éléments de configuration sont optionnels si une liste est "
 "définie, comme cela peut se voir avec l'exemple <literal>DPkg::Pre-Install-"
@@ -3337,14 +3365,23 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:113
-msgid ""
-"Two specials are allowed, <literal>#include</literal> (which is deprecated "
-"and not supported by alternative implementations) and <literal>#clear</"
-"literal>: <literal>#include</literal> will include the given file, unless "
-"the filename ends in a slash, then the whole directory is included.  "
-"<literal>#clear</literal> is used to erase a part of the configuration tree. "
-"The specified element and all its descendants are erased.  (Note that these "
-"lines also need to end with a semicolon.)"
+#, fuzzy
+#| msgid ""
+#| "Two specials are allowed, <literal>#include</literal> (which is "
+#| "deprecated and not supported by alternative implementations) and "
+#| "<literal>#clear</literal>: <literal>#include</literal> will include the "
+#| "given file, unless the filename ends in a slash, then the whole directory "
+#| "is included.  <literal>#clear</literal> is used to erase a part of the "
+#| "configuration tree. The specified element and all its descendants are "
+#| "erased.  (Note that these lines also need to end with a semicolon.)"
+msgid ""
+"Two special commands are defined: <literal>#include</literal> (which is "
+"deprecated and not supported by alternative implementations) and "
+"<literal>#clear</literal>. <literal>#include</literal> will include the "
+"given file, unless the filename ends in a slash, in which case the whole "
+"directory is included.  <literal>#clear</literal> is used to erase a part of "
+"the configuration tree. The specified element and all its descendants are "
+"erased.  (Note that these lines also need to end with a semicolon.)"
 msgstr ""
 "Deux éléments spéciaux sont autorisés : <literal>#include</literal> (qui est "
 "obsolète et n'est plus géré par des implémentations alternatives) et "
@@ -3356,13 +3393,20 @@ msgstr ""
 "également se terminer avec un point-virgule."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:121
-msgid ""
-"The #clear command is the only way to delete a list or a complete scope.  "
-"Reopening a scope or the ::-style described below will <emphasis>not</"
-"emphasis> override previously written entries. Only options can be "
-"overridden by addressing a new value to it - lists and scopes can't be "
-"overridden, only cleared."
+#: apt.conf.5.xml:123
+#, fuzzy
+#| msgid ""
+#| "The #clear command is the only way to delete a list or a complete scope.  "
+#| "Reopening a scope or the ::-style described below will <emphasis>not</"
+#| "emphasis> override previously written entries. Only options can be "
+#| "overridden by addressing a new value to it - lists and scopes can't be "
+#| "overridden, only cleared."
+msgid ""
+"The <literal>#clear</literal> command is the only way to delete a list or a "
+"complete scope. Reopening a scope (or using the syntax described below with "
+"an appended <literal>::</literal>) will <emphasis>not</emphasis> override "
+"previously written entries. Options can only be overridden by addressing a "
+"new value to them - lists and scopes can't be overridden, only cleared."
 msgstr ""
 "La commande #clear est la seule façon de supprimer une liste ou un champ "
 "d'action (« scope »). La réouverture d'un scope ou le style « ::- » décrit "
@@ -3372,22 +3416,23 @@ msgstr ""
 "remplacés mais seulement effacés."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:126
+#: apt.conf.5.xml:131
 #, fuzzy
 #| msgid ""
-#| "All of the APT tools take a -o option which allows an arbitrary "
+#| "All of the APT tools take an -o option which allows an arbitrary "
 #| "configuration directive to be specified on the command line. The syntax "
 #| "is a full option name (<literal>APT::Get::Assume-Yes</literal> for "
 #| "instance) followed by an equals sign then the new value of the option. "
 #| "Lists can be appended too by adding a trailing :: to the list name. (As "
 #| "you might suspect: The scope syntax can't be used on the command line.)"
 msgid ""
-"All of the APT tools take a -o option which allows an arbitrary "
+"All of the APT tools take an -o option which allows an arbitrary "
 "configuration directive to be specified on the command line. The syntax is a "
 "full option name (<literal>APT::Get::Assume-Yes</literal> for instance) "
 "followed by an equals sign then the new value of the option. To append a new "
-"element to a list, add a trailing :: to the name of the list. (As you might "
-"suspect: The scope syntax can't be used on the command line.)"
+"element to a list, add a trailing <literal>::</literal> to the name of the "
+"list.  (As you might suspect, the scope syntax can't be used on the command "
+"line.)"
 msgstr ""
 "Tous les outils d'APT possèdent une option <option>-o</option> qui permet de "
 "spécifier une configuration quelconque depuis la ligne de commande. La "
@@ -3398,7 +3443,7 @@ msgstr ""
 "ne peut pas être indiquée à la ligne de commande."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:133
+#: apt.conf.5.xml:139
 #, fuzzy
 #| msgid ""
 #| "Note that you can use :: only for appending one item per line to a list "
@@ -3414,18 +3459,18 @@ msgstr ""
 #| "encounter this misuse, so please correct such statements now as long as "
 #| "APT doesn't complain explicit about them."
 msgid ""
-"Note that you can use :: only for appending one item per line to a list and "
-"that you should not use it in combination with the scope syntax.  (The scope "
-"syntax implicit insert ::) Using both syntaxes together will trigger a bug "
-"which some users unfortunately depend on: An option with the unusual name "
-"\"<literal>::</literal>\" which acts like every other option with a name. "
-"These introduces many problems including that a user who writes multiple "
-"lines in this <emphasis>wrong</emphasis> syntax in the hope to append to a "
-"list will gain the opposite as only the last assignment for this option "
-"\"<literal>::</literal>\" will be used. Upcoming APT versions will raise "
-"errors and will stop working if they encounter this misuse, so please "
-"correct such statements now as long as APT doesn't complain explicit about "
-"them."
+"Note that appending items to a list using <literal>::</literal> only works "
+"for one item per line, and that you should not use it in combination with "
+"the scope syntax (which adds <literal>::</literal> implicitly). Using both "
+"syntaxes together will trigger a bug which some users unfortunately depend "
+"on: an option with the unusual name \"<literal>::</literal>\" which acts "
+"like every other option with a name. This introduces many problems; for one "
+"thing, users who write multiple lines in this <emphasis>wrong</emphasis> "
+"syntax in the hope of appending to a list will achieve the opposite, as only "
+"the last assignment for this option \"<literal>::</literal>\" will be used. "
+"Future versions of APT will raise errors and stop working if they encounter "
+"this misuse, so please correct such statements now while APT doesn't "
+"explicitly complain about them."
 msgstr ""
 "Veuillez noter que vous ne pouvez utiliser « :: » que pour ajouter un "
 "élément par ligne à la liste et que cela ne devrait pas être utilisé en "
@@ -3443,12 +3488,12 @@ msgstr ""
 "tant qu'APT ne s'en plaint pas explicitement."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:145
+#: apt.conf.5.xml:154
 msgid "The APT Group"
 msgstr "Le groupe APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:146
+#: apt.conf.5.xml:155
 msgid ""
 "This group of options controls general APT behavior as well as holding the "
 "options for all of the tools."
@@ -3457,7 +3502,7 @@ msgstr ""
 "également des options communes à tous les outils."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:151
+#: apt.conf.5.xml:160
 msgid ""
 "System Architecture; sets the architecture to use when fetching files and "
 "parsing package lists. The internal default is the architecture apt was "
@@ -3468,25 +3513,25 @@ msgstr ""
 "valeur interne par défaut est l'architecture pour laquelle APT a été compilé."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:157
+#: apt.conf.5.xml:167
 msgid ""
-"All Architectures the system supports. Processors implementing the "
-"<literal>amd64</literal> (also called <literal>x86-64</literal>) instruction "
-"set are e.g. also able to execute binaries compiled for the <literal>i386</"
-"literal> (<literal>x86</literal>) instruction set; 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>."
+"All Architectures the system supports. For instance, CPUs implementing the "
+"<literal>amd64</literal> (also called <literal>x86-64</literal>)  "
+"instruction set are also able to execute binaries compiled for the "
+"<literal>i386</literal> (<literal>x86</literal>) instruction set. This list "
+"is used when fetching files and parsing package lists. The initial default "
+"is always the system's native architecture (<literal>APT::Architecture</"
+"literal>), and foreign architectures are added to the default list when they "
+"are registered via <command>dpkg --add-architecture</command>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:167
+#: apt.conf.5.xml:180
 msgid ""
-"Default release to install packages from if more than one version available. "
-"Contains release name, codename or release version. Examples: 'stable', "
-"'testing', 'unstable', '&stable-codename;', '&testing-codename;', '4.0', "
-"'5.0*'. See also &apt-preferences;."
+"Default release to install packages from if more than one version is "
+"available. Contains release name, codename or release version. Examples: "
+"'stable', 'testing', 'unstable', '&stable-codename;', '&testing-codename;', "
+"'4.0', '5.0*'. See also &apt-preferences;."
 msgstr ""
 "Indique la distribution à utiliser par défaut lors de l'installation d'un "
 "paquet si plusieurs versions sont disponibles. La valeur peut être un nom de "
@@ -3495,9 +3540,9 @@ msgstr ""
 "&apt-preferences;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:173
+#: apt.conf.5.xml:186
 msgid ""
-"Ignore Held packages; This global option causes the problem resolver to "
+"Ignore held packages; this global option causes the problem resolver to "
 "ignore held packages in its decision making."
 msgstr ""
 "Ignore les paquets « gelés » ; cette option globale indique au système de "
@@ -3505,7 +3550,7 @@ msgstr ""
 "décision."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:178
+#: apt.conf.5.xml:191
 msgid ""
 "Defaults to on. When turned on the autoclean feature will remove any "
 "packages which can no longer be downloaded from the cache. If turned off "
@@ -3519,78 +3564,67 @@ msgstr ""
 "direct pour les réinstaller."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:185
-msgid ""
-"Defaults to on which will cause APT to install essential and important "
-"packages as fast as possible in the install/upgrade operation. This is done "
-"to limit the effect of a failing &dpkg; call: If this option is disabled APT "
-"does treat an important package in the same way as an extra package: Between "
-"the unpacking of the important package A and his configuration can then be "
-"many other unpack or configuration calls, e.g. for package B which has no "
-"relation to A, but causes the dpkg call to fail (e.g. because maintainer "
-"script of package B generates an error) which results in a system state in "
-"which package A is unpacked but unconfigured - each package depending on A "
-"is now no longer guaranteed to work as their dependency on A is not longer "
-"satisfied. The immediate configuration marker is also applied to all "
-"dependencies which can generate a problem if the dependencies e.g. form a "
-"circle as a dependency with the immediate flag is comparable with a Pre-"
-"Dependency. So in theory it is possible that APT encounters a situation in "
-"which it is unable to perform immediate configuration, errors out and refers "
-"to this option so the user can deactivate the immediate configuration "
-"temporarily to be able to perform an install/upgrade again. Note the use of "
-"the word \"theory\" here as this problem was only encountered by now in real "
-"world a few times in non-stable distribution versions and was caused by "
-"wrong dependencies of the package in question or by a system in an already "
-"broken state, so you should not blindly disable this option as the mentioned "
-"scenario above is not the only problem immediate configuration can help to "
-"prevent in the first place.  Before a big operation like <literal>dist-"
-"upgrade</literal> is run with this option disabled it should be tried to "
-"explicitly <literal>install</literal> the package APT is unable to configure "
-"immediately, but please make sure to report your problem also to your "
-"distribution and to the APT team with the buglink below so they can work on "
-"improving or correcting the upgrade process."
-msgstr ""
-"La valeur par défaut de ce réglage est « on » ce qui conduira APT à "
-"installer les paquets essentiels et importants dès que possible pendant les "
-"opérations d'installation ou de mise à jour. Cela permet de limiter les "
-"conséquences de l'échec d'un appel à &dpkg; : si cette option est "
-"désactivée, APT gérera un paquet important de la même manière qu'un paquet "
-"« extra » ; entre le dépaquetage du paquet important A et sa configuration "
-"pourront prendre place de nombreux autres opérations de dépaquetage ou de "
-"configuration. Ainsi, si le paquet B, qui n'a pas de rapport avec A, "
-"provoque une erreur de &dpkg; (p. ex. en cas d'erreur dans les scripts du "
-"responsable), le paquet A sera alors dans l'état installé mais non configuré "
-"et chaque paquet qui en dépend ne fonctionnera plus nécessairement puisque "
-"sa dépendance n'est pas satisfaite. Le marqueur de configuration immédiate "
-"sera aussi utilisé pour toute dépendance qui peut créer un problème, par "
-"exemple les dépendances circulaires. En effet, utiliser le marqueur de "
-"configuration immédiate revient à gérer une pré-dépendance. Il est donc "
-"possible, en théorie, qu'APT rencontre une situation où il lui est "
-"impossible d'effectuer la configuration immédiate, qu'il se termine alors "
-"avec une erreur en faisant référence à cette option afin que l'utilisateur "
-"puisse la désactiver temporairement pour retenter l'opération d'installation "
-"ou de mise à jour. Il est à noter que « en théorie » indique ici que cette "
-"situation n'a été rencontrée que dans de rares cas, sur des versions "
-"instables de distributions, la cause étant des dépendances incorrectes ou un "
-"système déjà dans un état instable. Il est donc déconseillé de désactiver "
-"cette option sans réfléchir car la situation décrite précédemment n'est "
-"qu'un des cas où la configuration immédiate permet de résoudre des "
-"situations complexes. Avant de tenter une opération telle que <literal>dist-"
-"upgrade</literal> avec cette option désactivée, il est largement préférable "
-"d'essayer une opération <literal>install</literal> sur le paquet qu'APT ne "
-"peut configurer immédiatement. Il est également conseillé de signaler ce "
-"type de problème dans le système de suivi de bogues de la distribution "
-"utilisée afin qu'il soit étudié et corrigé."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:208
-msgid ""
-"Never Enable this option unless you -really- know what you are doing. It "
-"permits APT to temporarily remove an essential package to break a Conflicts/"
-"Conflicts or Conflicts/Pre-Depend loop between two essential packages. SUCH "
-"A LOOP SHOULD NEVER EXIST AND IS A GRAVE BUG. This option will work if the "
-"essential packages are not tar, gzip, libc, dpkg, bash or anything that "
-"those packages depend on."
+#: apt.conf.5.xml:199
+msgid ""
+"Defaults to on, which will cause APT to install essential and important "
+"packages as soon as possible in an install/upgrade operation, in order to "
+"limit the effect of a failing &dpkg; call. If this option is disabled, APT "
+"treats an important package in the same way as an extra package: between the "
+"unpacking of the package A and its configuration there can be many other "
+"unpack or configuration calls for other unrelated packages B, C etc. If "
+"these cause the &dpkg; call to fail (e.g. because package B's maintainer "
+"scripts generate an error), this results in a system state in which package "
+"A is unpacked but unconfigured - so any package depending on A is now no "
+"longer guaranteed to work, as its dependency on A is no longer satisfied."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:211
+msgid ""
+"The immediate configuration marker is also applied in the potentially "
+"problematic case of circular dependencies, since a dependency with the "
+"immediate flag is equivalent to a Pre-Dependency. In theory this allows APT "
+"to recognise a situation in which it is unable to perform immediate "
+"configuration, abort, and suggest to the user that the option should be "
+"temporarily deactivated in order to allow the operation to proceed.  Note "
+"the use of the word \"theory\" here; in the real world this problem has "
+"rarely been encountered, in non-stable distribution versions, and was caused "
+"by wrong dependencies of the package in question or by a system in an "
+"already broken state; so you should not blindly disable this option, as the "
+"scenario mentioned above is not the only problem it can help to prevent in "
+"the first place."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:224
+msgid ""
+"Before a big operation like <literal>dist-upgrade</literal> is run with this "
+"option disabled you should try to explicitly <literal>install</literal> the "
+"package APT is unable to configure immediately; but please make sure you "
+"also report your problem to your distribution and to the APT team with the "
+"buglink below, so they can work on improving or correcting the upgrade "
+"process."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:235
+#, fuzzy
+#| msgid ""
+#| "Never Enable this option unless you -really- know what you are doing. It "
+#| "permits APT to temporarily remove an essential package to break a "
+#| "Conflicts/Conflicts or Conflicts/Pre-Depend loop between two essential "
+#| "packages. SUCH A LOOP SHOULD NEVER EXIST AND IS A GRAVE BUG. This option "
+#| "will work if the essential packages are not tar, gzip, libc, dpkg, bash "
+#| "or anything that those packages depend on."
+msgid ""
+"Never enable this option unless you <emphasis>really</emphasis> know what "
+"you are doing. It permits APT to temporarily remove an essential package to "
+"break a Conflicts/Conflicts or Conflicts/Pre-Depends loop between two "
+"essential packages. <emphasis>Such a loop should never exist and is a grave "
+"bug</emphasis>. This option will work if the essential packages are not "
+"<command>tar</command>, <command>gzip</command>, <command>libc</command>, "
+"<command>dpkg</command>, <command>dash</command> or anything that those "
+"packages depend on."
 msgstr ""
 "Ne jamais activer cette option à moins que vous ne sachiez - réellement - ce "
 "que vous faites. Elle autorise APT à supprimer temporairement un paquet "
@@ -3601,7 +3635,7 @@ msgstr ""
 "les paquets dont ces paquets dépendent."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:217
+#: apt.conf.5.xml:247
 #, fuzzy
 #| msgid ""
 #| "APT uses since version 0.7.26 a resizable memory mapped cache file to "
@@ -3622,20 +3656,20 @@ msgstr ""
 #| "automatic grow of the cache is disabled."
 msgid ""
 "APT uses since version 0.7.26 a resizable memory mapped cache file to store "
-"the 'available' information. <literal>Cache-Start</literal> acts as a hint "
-"to which size the Cache will grow and is therefore the amount of memory APT "
+"the available information. <literal>Cache-Start</literal> acts as a hint of "
+"the size the cache will grow to, and is therefore the amount of memory APT "
 "will request at startup. The default value is 20971520 bytes (~20 MB). Note "
-"that this amount of space needs to be available for APT otherwise it will "
+"that this amount of space needs to be available for APT; otherwise it will "
 "likely fail ungracefully, so for memory restricted devices this value should "
 "be lowered while on systems with a lot of configured sources it should be "
 "increased.  <literal>Cache-Grow</literal> defines in bytes with the default "
-"of 1048576 (~1 MB) how much the Cache size will be increased in the event "
-"the space defined by <literal>Cache-Start</literal> is not enough. These "
+"of 1048576 (~1 MB) how much the cache size will be increased in the event "
+"the space defined by <literal>Cache-Start</literal> is not enough. This "
 "value will be applied again and again until either the cache is big enough "
 "to store all information or the size of the cache reaches the <literal>Cache-"
 "Limit</literal>.  The default of <literal>Cache-Limit</literal> is 0 which "
 "stands for no limit.  If <literal>Cache-Grow</literal> is set to 0 the "
-"automatic grow of the cache is disabled."
+"automatic growth of the cache is disabled."
 msgstr ""
 "À partir de la version 0.7.26, APT utilise un fichier de cache de taille "
 "variable indexé en mémoire (« resizable memory mapped cache file ») pour "
@@ -3659,16 +3693,19 @@ msgstr ""
 "l'augmentation automatique de la taille du cache est désactivée."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:233
-msgid "Defines which package(s) are considered essential build dependencies."
+#: apt.conf.5.xml:263
+#, fuzzy
+#| msgid ""
+#| "Defines which package(s) are considered essential build dependencies."
+msgid "Defines which packages are considered essential build dependencies."
 msgstr ""
 "Cette option définit les paquets qui sont considérés comme faisant partie "
 "des dépendances essentielles pour la construction de paquets."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:237
+#: apt.conf.5.xml:267
 msgid ""
-"The Get subsection controls the &apt-get; tool, please see its documentation "
+"The Get subsection controls the &apt-get; tool; please see its documentation "
 "for more information about the options here."
 msgstr ""
 "La sous-section <literal>Get</literal> contrôle l'outil &apt-get;, veuillez "
@@ -3676,9 +3713,9 @@ msgstr ""
 "question."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:242
+#: apt.conf.5.xml:272
 msgid ""
-"The Cache subsection controls the &apt-cache; tool, please see its "
+"The Cache subsection controls the &apt-cache; tool; please see its "
 "documentation for more information about the options here."
 msgstr ""
 "La sous-section <literal>Cache</literal> contrôle l'outil &apt-cache;, "
@@ -3686,9 +3723,9 @@ msgstr ""
 "options en question."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:247
+#: apt.conf.5.xml:277
 msgid ""
-"The CDROM subsection controls the &apt-cdrom; tool, please see its "
+"The CDROM subsection controls the &apt-cdrom; tool; please see its "
 "documentation for more information about the options here."
 msgstr ""
 "La sous-section <literal>CDROM</literal> contrôle l'outil &apt-cdrom;, "
@@ -3696,29 +3733,44 @@ msgstr ""
 "options en question."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:253
+#: apt.conf.5.xml:283
 msgid "The Acquire Group"
 msgstr "Le groupe Acquire"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:254
+#: apt.conf.5.xml:284
+#, fuzzy
+#| msgid ""
+#| "The <literal>Acquire</literal> group of options controls the download of "
+#| "packages and the URI handlers."
 msgid ""
 "The <literal>Acquire</literal> group of options controls the download of "
-"packages and the URI handlers."
+"packages as well as the various \"acquire methods\" responsible for the "
+"download itself (see also &sources-list;)."
 msgstr ""
 "Le groupe d'options <literal>Acquire</literal> contrôle le téléchargement "
 "des paquets et les gestionnaires d'URI."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:259
-msgid ""
-"Security related option defaulting to true as an expiring validation for a "
-"Release file prevents longtime replay attacks and can e.g. also help users "
-"to identify no longer updated mirrors - but the feature depends on the "
-"correctness of the time on the user system.  Archive maintainers are "
-"encouraged to create Release files with the <literal>Valid-Until</literal> "
-"header, but if they don't or a stricter value is volitional the following "
-"<literal>Max-ValidTime</literal> option can be used."
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:291
+#, fuzzy
+#| msgid ""
+#| "Security related option defaulting to true as an expiring validation for "
+#| "a Release file prevents longtime replay attacks and can e.g. also help "
+#| "users to identify no longer updated mirrors - but the feature depends on "
+#| "the correctness of the time on the user system.  Archive maintainers are "
+#| "encouraged to create Release files with the <literal>Valid-Until</"
+#| "literal> header, but if they don't or a stricter value is volitional the "
+#| "following <literal>Max-ValidTime</literal> option can be used."
+msgid ""
+"Security related option defaulting to true, as giving a Release file's "
+"validation an expiration date prevents replay attacks over a long timescale, "
+"and can also for example help users to identify mirrors that are no longer "
+"updated - but the feature depends on the correctness of the clock on the "
+"user system. Archive maintainers are encouraged to create Release files with "
+"the <literal>Valid-Until</literal> header, but if they don't or a stricter "
+"value is desired the <literal>Max-ValidTime</literal> option below can be "
+"used."
 msgstr ""
 "L'activation de l'option de sécurité qui permet de mettre une limite "
 "temporelle de validité au fichier Release permet d'éviter des attaques de "
@@ -3729,8 +3781,8 @@ msgstr ""
 "Cependant, si cet en-tête est absent, la valeur du paramètre <literal>Max-"
 "ValidTime</literal> est alors utilisée."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:270
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:304
 #, fuzzy
 #| msgid ""
 #| "Seconds the Release file should be considered valid after it was created. "
@@ -3743,12 +3795,13 @@ msgstr ""
 #| "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 valid\".  Archive specific settings can "
-"be made by appending the label of the archive to the option name."
+"Maximum time (in seconds) after its creation (as indicated by the "
+"<literal>Date</literal> header) that the <filename>Release</filename> file "
+"should be considered valid.  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 \"valid forever\".  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 "
@@ -3761,8 +3814,8 @@ msgstr ""
 "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."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:281
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:316
 #, fuzzy
 #| msgid ""
 #| "Seconds the Release file should be considered valid after it was created. "
@@ -3775,12 +3828,13 @@ msgstr ""
 #| "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."
+"Minimum time (in seconds) after its creation (as indicated by the "
+"<literal>Date</literal> header) that the <filename>Release</filename> file "
+"should be considered valid.  Use this if you need to use a seldom updated "
+"(local) mirror of a more frequently 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 "
@@ -3793,18 +3847,23 @@ msgstr ""
 "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."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:292
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:328
+#, fuzzy
+#| msgid ""
+#| "Try to download deltas called <literal>PDiffs</literal> for Packages or "
+#| "Sources files instead of downloading whole ones. True by default."
 msgid ""
-"Try to download deltas called <literal>PDiffs</literal> for Packages or "
-"Sources files instead of downloading whole ones. True by default."
+"Try to download deltas called <literal>PDiffs</literal> for indexes (like "
+"<filename>Packages</filename> files) instead of downloading whole ones. True "
+"by default."
 msgstr ""
 "Essayer de télécharger les fichiers différentiels appelés <literal>PDiffs</"
 "literal> pour les paquets ou les fichiers sources, plutôt que de les "
 "télécharger entièrement. Par défaut à « true »."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:295
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:331
 #, fuzzy
 #| msgid ""
 #| "Two sub-options to limit the use of PDiffs are also available: With "
@@ -3814,12 +3873,12 @@ msgstr ""
 #| "to the size of the targeted file. If one of these limits is exceeded the "
 #| "complete file is downloaded instead of the patches."
 msgid ""
-"Two sub-options to limit the use of PDiffs are also available: With "
-"<literal>FileLimit</literal> can be specified how many PDiff files are "
-"downloaded at most to update a file. <literal>SizeLimit</literal> on the "
-"other hand is the maximum percentage of the size of all patches compared to "
-"the size of the targeted file. If one of these limits is exceeded the "
-"complete file is downloaded instead of the patches."
+"Two sub-options to limit the use of PDiffs are also available: "
+"<literal>FileLimit</literal> can be used to specify a maximum number of "
+"PDiff files should be downloaded to update a file. <literal>SizeLimit</"
+"literal> on the other hand is the maximum percentage of the size of all "
+"patches compared to the size of the targeted file. If one of these limits is "
+"exceeded the complete file is downloaded instead of the patches."
 msgstr ""
 "Deux sous-options permettant de limite l'utilisation de fichiers « pdiff » "
 "sont également disponibles. <literal>FileLimit</literal> permet d'indiquer "
@@ -3830,8 +3889,8 @@ msgstr ""
 "dépassée, le fichier complet est téléchargé au lieu de télécharger les "
 "fichiers de différences."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:305
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:341
 msgid ""
 "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
 "literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -3846,8 +3905,8 @@ msgstr ""
 "<literal>access</literal> signifie qu'une connexion par type d'URI sera "
 "initiée."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:313
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:349
 msgid ""
 "Number of retries to perform. If this is non-zero APT will retry failed "
 "files the given number of times."
@@ -3856,8 +3915,8 @@ msgstr ""
 "récupérer, le nombre donné de fois, les fichiers dont la récupération a "
 "échoué."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:318
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:354
 msgid ""
 "Use symlinks for source archives. If set to true then source archives will "
 "be symlinked when possible instead of copying. True is the default."
@@ -3866,15 +3925,24 @@ msgstr ""
 "« true », cette option crée si possible des liens symboliques vers les "
 "archives de sources au lieu de les copier.  Par défaut à « true »."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:323
-msgid ""
-"HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
-"standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per "
-"host proxies can also be specified by using the form <literal>http::Proxy::"
-"&lt;host&gt;</literal> with the special keyword <literal>DIRECT</literal> "
-"meaning to use no proxies. If no one of the above settings is specified, "
-"<envar>http_proxy</envar> environment variable will be used."
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:359
+#, fuzzy
+#| msgid ""
+#| "HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
+#| "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. "
+#| "Per host proxies can also be specified by using the form <literal>http::"
+#| "Proxy::&lt;host&gt;</literal> with the special keyword <literal>DIRECT</"
+#| "literal> meaning to use no proxies. If no one of the above settings is "
+#| "specified, <envar>http_proxy</envar> environment variable will be used."
+msgid ""
+"<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. "
+"It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</"
+"literal>.  Per host proxies can also be specified by using the form "
+"<literal>http::Proxy::&lt;host&gt;</literal> with the special keyword "
+"<literal>DIRECT</literal> meaning to use no proxies. If no one of the above "
+"settings is specified, <envar>http_proxy</envar> environment variable will "
+"be used."
 msgstr ""
 "URI HTTP ; http::Proxy est le mandataire (proxy) HTTP à utiliser par "
 "défaut.  Il se présente sous la forme standard : <literal>http://"
@@ -3886,18 +3954,27 @@ msgstr ""
 "d'environnement <envar>http_proxy</envar> annule et remplace toutes les "
 "options de mandataire HTTP."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:331
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:367
+#, fuzzy
+#| msgid ""
+#| "Three settings are provided for cache control with HTTP/1.1 compliant "
+#| "proxy caches. <literal>No-Cache</literal> tells the proxy to not use its "
+#| "cached response under any circumstances, <literal>Max-Age</literal> is "
+#| "sent only for index files and tells the cache to refresh its object if it "
+#| "is older than the given number of seconds. Debian updates its index files "
+#| "daily so the default is 1 day. <literal>No-Store</literal> specifies that "
+#| "the cache should never store this request, it is only set for archive "
+#| "files. This may be useful to prevent polluting a proxy cache with very "
+#| "large .deb files. Note: Squid 2.0.2 does not support any of these options."
 msgid ""
 "Three settings are provided for cache control with HTTP/1.1 compliant proxy "
-"caches. <literal>No-Cache</literal> tells the proxy to not use its cached "
-"response under any circumstances, <literal>Max-Age</literal> is sent only "
-"for index files and tells the cache to refresh its object if it is older "
-"than the given number of seconds. Debian updates its index files daily so "
-"the default is 1 day. <literal>No-Store</literal> specifies that the cache "
-"should never store this request, it is only set for archive files. This may "
-"be useful to prevent polluting a proxy cache with very large .deb files. "
-"Note: Squid 2.0.2 does not support any of these options."
+"caches.  <literal>No-Cache</literal> tells the proxy not to use its cached "
+"response under any circumstances.  <literal>Max-Age</literal> sets the "
+"allowed maximum age (in seconds) of an index file in the cache of the "
+"proxy.  <literal>No-Store</literal> specifies that the proxy should not "
+"store the requested archive files in its cache, which can be used to prevent "
+"the proxy from polluting its cache with (big) .deb files."
 msgstr ""
 "Trois options de configuration sont fournies pour le contrôle des caches "
 "compatibles avec HTTP/1.1. <literal>No-Cache</literal> signifie que le "
@@ -3911,44 +3988,55 @@ msgstr ""
 "mandataire avec des fichiers .deb très grands. Note : Squid 2.0.2 ne prend "
 "en compte aucune de ces options."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:341 apt.conf.5.xml:407
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:377 apt.conf.5.xml:449
+#, fuzzy
+#| msgid ""
+#| "The option <literal>timeout</literal> sets the timeout timer used by the "
+#| "method; this applies to all things including connection timeout and data "
+#| "timeout."
 msgid ""
 "The option <literal>timeout</literal> sets the timeout timer used by the "
-"method, this applies to all things including connection timeout and data "
-"timeout."
+"method; this value applies to the connection as well as the data timeout."
 msgstr ""
 "L'option <literal>timeout</literal> positionne le compteur d'expiration du "
 "délai (timeout) utilisé par la méthode. Cela vaut pour tout, connexion et "
 "données."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:344
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:380
 msgid ""
 "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
-"enabled HTTP pipeling (RFC 2616 section 8.1.2.2) which can be beneficial e."
-"g. on high-latency connections. It specifies how many requests are send in a "
+"enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
+"g. on high-latency connections. It specifies how many requests are sent in a "
 "pipeline.  Previous APT versions had a default of 10 for this setting, but "
 "the default value is now 0 (= disabled) to avoid problems with the ever-"
 "growing amount of webservers and proxies which choose to not conform to the "
 "HTTP/1.1 specification."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:351
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:387
 msgid ""
-"<literal>Acquire::http::AllowRedirect</literal> controls if APT will follow "
-"redirects, which is enabled by default."
+"<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
+"follow redirects, which is enabled by default."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:354
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:390
+#, fuzzy
+#| msgid ""
+#| "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
+#| "literal> which accepts integer values in kilobytes. The default value is "
+#| "0 which deactivates the limit and tries uses as much as possible of the "
+#| "bandwidth (Note that this option implicit deactivates the download from "
+#| "multiple servers at the same time.)"
 msgid ""
 "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
-"literal> which accepts integer values in kilobyte. The default value is 0 "
-"which deactivates the limit and tries uses as much as possible of the "
-"bandwidth (Note that this option implicit deactivates the download from "
-"multiple servers at the same time.)"
+"literal> which accepts integer values in kilobytes. The default value is 0 "
+"which deactivates the limit and tries to use all available bandwidth (note "
+"that this option implicitly disables downloading from multiple servers at "
+"the same time.)"
 msgstr ""
 "La bande passante utilisée peut être limité avec <literal>Acquire::http::Dl-"
 "Limit</literal> qui peut prendre une valeur entière, l'unité utilisée étant "
@@ -3956,8 +4044,8 @@ msgstr ""
 "limitation de bande passante. Veuillez noter que cette option désactive "
 "implicitement le téléchargement simultané depuis plusieurs serveurs."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:359
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:395
 msgid ""
 "<literal>Acquire::http::User-Agent</literal> can be used to set a different "
 "User-Agent for the http download method as some proxies allow access for "
@@ -3968,14 +4056,22 @@ msgstr ""
 "ce qui peut par exemple être utile avec certains mandataires HTTP qui "
 "n'autorisent l'accès qu'aux client s'identifiant de manière spécifique.."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:366
-msgid ""
-"HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
-"options are the same as for <literal>http</literal> method and will also "
-"default to the options from the <literal>http</literal> method if they are "
-"not explicitly set for https. <literal>Pipeline-Depth</literal> option is "
-"not supported yet."
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:403
+#, fuzzy
+#| msgid ""
+#| "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
+#| "options are the same as for <literal>http</literal> method and will also "
+#| "default to the options from the <literal>http</literal> method if they "
+#| "are not explicitly set for https. <literal>Pipeline-Depth</literal> "
+#| "option is not supported yet."
+msgid ""
+"The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
+"<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
+"<literal>proxy</literal> options work for HTTPS URIs in the same way as for "
+"the <literal>http</literal> method, and default to the same values if they "
+"are not explicitly set. The <literal>Pipeline-Depth</literal> option is not "
+"yet supported."
 msgstr ""
 "URI HTTPS. Les options de contrôle de cache, de délai limite, d'autorisation "
 "de redirection, de Dl-Limit et de mandataire (proxy) sont les mêmes que pour "
@@ -3984,25 +4080,44 @@ msgstr ""
 "https sont indiquées. L'option <literal>Pipeline-Depth</literal> n'est pas "
 "encore gérée."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:372
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:411
+#, fuzzy
+#| msgid ""
+#| "<literal>CaInfo</literal> suboption specifies place of file that holds "
+#| "info about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> "
+#| "is the corresponding per-host option.  <literal>Verify-Peer</literal> "
+#| "boolean suboption determines whether verify server's host certificate "
+#| "against trusted certificates or not.  <literal>&lt;host&gt;::Verify-Peer</"
+#| "literal> is the corresponding per-host option.  <literal>Verify-Host</"
+#| "literal> boolean suboption determines whether verify server's hostname or "
+#| "not.  <literal>&lt;host&gt;::Verify-Host</literal> is the corresponding "
+#| "per-host option.  <literal>SslCert</literal> determines what certificate "
+#| "to use for client authentication. <literal>&lt;host&gt;::SslCert</"
+#| "literal> is the corresponding per-host option.  <literal>SslKey</literal> "
+#| "determines what private key to use for client authentication. "
+#| "<literal>&lt;host&gt;::SslKey</literal> is the corresponding per-host "
+#| "option.  <literal>SslForceVersion</literal> overrides default SSL version "
+#| "to use.  Can contain 'TLSv1' or 'SSLv3' string.  <literal>&lt;host&gt;::"
+#| "SslForceVersion</literal> is the corresponding per-host option."
 msgid ""
 "<literal>CaInfo</literal> suboption specifies place of file that holds info "
-"about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is "
+"about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is the "
 "corresponding per-host option.  <literal>Verify-Peer</literal> boolean "
-"suboption determines whether verify server's host certificate against "
-"trusted certificates or not.  <literal>&lt;host&gt;::Verify-Peer</literal> "
-"is corresponding per-host option.  <literal>Verify-Host</literal> boolean "
-"suboption determines whether verify server's hostname or not.  <literal>&lt;"
-"host&gt;::Verify-Host</literal> is corresponding per-host option.  "
-"<literal>SslCert</literal> determines what certificate to use for client "
-"authentication. <literal>&lt;host&gt;::SslCert</literal> is corresponding "
-"per-host option.  <literal>SslKey</literal> determines what private key to "
-"use for client authentication. <literal>&lt;host&gt;::SslKey</literal> is "
-"corresponding per-host option.  <literal>SslForceVersion</literal> overrides "
-"default SSL version to use.  Can contain 'TLSv1' or 'SSLv3' string.  "
-"<literal>&lt;host&gt;::SslForceVersion</literal> is corresponding per-host "
-"option."
+"suboption determines whether or not the server's host certificate should be "
+"verified against trusted certificates.  <literal>&lt;host&gt;::Verify-Peer</"
+"literal> is the corresponding per-host option.  <literal>Verify-Host</"
+"literal> boolean suboption determines whether or not the server's hostname "
+"should be verified.  <literal>&lt;host&gt;::Verify-Host</literal> is the "
+"corresponding per-host option.  <literal>SslCert</literal> determines what "
+"certificate to use for client authentication. <literal>&lt;host&gt;::"
+"SslCert</literal> is the corresponding per-host option.  <literal>SslKey</"
+"literal> determines what private key to use for client authentication. "
+"<literal>&lt;host&gt;::SslKey</literal> is the corresponding per-host "
+"option.  <literal>SslForceVersion</literal> overrides default SSL version to "
+"use.  It can contain either of the strings '<literal>TLSv1</literal>' or "
+"'<literal>SSLv3</literal>'.  <literal>&lt;host&gt;::SslForceVersion</"
+"literal> is the corresponding per-host option."
 msgstr ""
 "La sous-option <literal>CaInfo</literal> spécifie le fichier contenant les "
 "informations sur les certificats de confiance. La sous-option booléenne "
@@ -4016,23 +4131,39 @@ msgstr ""
 "pour la version de SSL à utiliser et peut contenir l'une des chaînes 'TLSv1' "
 "ou 'SSLv3'."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:391
-msgid ""
-"FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard "
-"form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host "
-"proxies can also be specified by using the form <literal>ftp::Proxy::&lt;"
-"host&gt;</literal> with the special keyword <literal>DIRECT</literal> "
-"meaning to use no proxies. If no one of the above settings is specified, "
-"<envar>ftp_proxy</envar> environment variable will be used. To use a ftp "
-"proxy you will have to set the <literal>ftp::ProxyLogin</literal> script in "
-"the configuration file. This entry specifies the commands to send to tell "
-"the proxy server what to connect to. Please see &configureindex; for an "
-"example of how to do this. The substitution variables available are <literal>"
-"$(PROXY_USER)</literal> <literal>$(PROXY_PASS)</literal> <literal>"
-"$(SITE_USER)</literal> <literal>$(SITE_PASS)</literal> <literal>$(SITE)</"
-"literal> and <literal>$(SITE_PORT)</literal> Each is taken from it's "
-"respective URI component."
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:432
+#, fuzzy
+#| msgid ""
+#| "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the "
+#| "standard form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. "
+#| "Per host proxies can also be specified by using the form <literal>ftp::"
+#| "Proxy::&lt;host&gt;</literal> with the special keyword <literal>DIRECT</"
+#| "literal> meaning to use no proxies. If no one of the above settings is "
+#| "specified, <envar>ftp_proxy</envar> environment variable will be used. To "
+#| "use a ftp proxy you will have to set the <literal>ftp::ProxyLogin</"
+#| "literal> script in the configuration file. This entry specifies the "
+#| "commands to send to tell the proxy server what to connect to. Please see "
+#| "&configureindex; for an example of how to do this. The substitution "
+#| "variables available are <literal>$(PROXY_USER)</literal> <literal>"
+#| "$(PROXY_PASS)</literal> <literal>$(SITE_USER)</literal> <literal>"
+#| "$(SITE_PASS)</literal> <literal>$(SITE)</literal> and <literal>"
+#| "$(SITE_PORT)</literal> Each is taken from it's respective URI component."
+msgid ""
+"<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs.  "
+"It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</"
+"literal>.  Per host proxies can also be specified by using the form "
+"<literal>ftp::Proxy::&lt;host&gt;</literal> with the special keyword "
+"<literal>DIRECT</literal> meaning to use no proxies. If no one of the above "
+"settings is specified, <envar>ftp_proxy</envar> environment variable will be "
+"used. To use an FTP proxy you will have to set the <literal>ftp::ProxyLogin</"
+"literal> script in the configuration file. This entry specifies the commands "
+"to send to tell the proxy server what to connect to. Please see "
+"&configureindex; for an example of how to do this. The substitution "
+"variables representing the corresponding URI component are <literal>"
+"$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, <literal>"
+"$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, <literal>$(SITE)</"
+"literal> and <literal>$(SITE_PORT)</literal>."
 msgstr ""
 "URI FTP ; ftp::Proxy est le mandataire (proxy) FTP à utiliser par défaut.  "
 "Il se présente sous la forme standard : <literal>ftp://[[user][:pass]@]host[:"
@@ -4051,14 +4182,22 @@ msgstr ""
 "<literal>$(SITE)</literal> et <literal>$(SITE_PORT)</literal>. Chacune "
 "correspond à l'élément respectif de l'URI."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:410
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:452
+#, fuzzy
+#| msgid ""
+#| "Several settings are provided to control passive mode. Generally it is "
+#| "safe to leave passive mode on; it works in nearly every environment.  "
+#| "However, some situations require that passive mode be disabled and port "
+#| "mode FTP used instead. This can be done globally, for connections that go "
+#| "through a proxy or for a specific host (See the sample config file for "
+#| "examples)."
 msgid ""
 "Several settings are provided to control passive mode. Generally it is safe "
-"to leave passive mode on, it works in nearly every environment.  However "
-"some situations require that passive mode be disabled and port mode ftp used "
-"instead. This can be done globally, for connections that go through a proxy "
-"or for a specific host (See the sample config file for examples)."
+"to leave passive mode on; it works in nearly every environment.  However, "
+"some situations require that passive mode be disabled and port mode FTP used "
+"instead. This can be done globally or for connections that go through a "
+"proxy or for a specific host (see the sample config file for examples)."
 msgstr ""
 "Plusieurs options de configuration sont fournies pour contrôler le mode "
 "passif. Il est généralement plus sûr d'activer le mode passif et cela marche "
@@ -4068,11 +4207,11 @@ msgstr ""
 "qui passent par un mandataire ou pour une machine spécifique (examinez le "
 "modèle de fichier de configuration)."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:417
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:459
 msgid ""
 "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
-"envar> environment variable to a http url - see the discussion of the http "
+"envar> environment variable to an HTTP URL - see the discussion of the http "
 "method above for syntax. You cannot set this in the configuration file and "
 "it is not recommended to use FTP over HTTP due to its low efficiency."
 msgstr ""
@@ -4083,8 +4222,8 @@ msgstr ""
 "recommandé d'utiliser FTP au travers de HTTP en raison de la faible "
 "efficacité de cette méthode."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:422
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:464
 msgid ""
 "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
 "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -4099,23 +4238,33 @@ msgstr ""
 "« true », on les utilise même si la connexion est de type IPv4. La plupart "
 "des serveurs FTP ne suivent pas la RFC 2428."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:435
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
+#: apt.conf.5.xml:478
 #, no-wrap
 msgid "/cdrom/::Mount \"foo\";"
 msgstr "/cdrom/::Mount \"foo\";"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:430
-msgid ""
-"CD-ROM URIs; the only setting for CD-ROM URIs is the mount point, "
-"<literal>cdrom::Mount</literal> which must be the mount point for the CD-ROM "
-"drive as specified in <filename>/etc/fstab</filename>. It is possible to "
-"provide alternate mount and unmount commands if your mount point cannot be "
-"listed in the fstab (such as an SMB mount and old mount packages). The "
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:473
+#, fuzzy
+#| msgid ""
+#| "CD-ROM URIs; the only setting for CD-ROM URIs is the mount point, "
+#| "<literal>cdrom::Mount</literal> which must be the mount point for the CD-"
+#| "ROM drive as specified in <filename>/etc/fstab</filename>. It is possible "
+#| "to provide alternate mount and unmount commands if your mount point "
+#| "cannot be listed in the fstab (such as an SMB mount and old mount "
+#| "packages). The syntax is to put <placeholder type=\"literallayout\" id="
+#| "\"0\"/> within the cdrom block. It is important to have the trailing "
+#| "slash. Unmount commands can be specified using UMount."
+msgid ""
+"For URIs using the <literal>cdrom</literal> method, the only configurable "
+"option is the mount point, <literal>cdrom::Mount</literal>, which must be "
+"the mount point for the CD-ROM (or DVD, or whatever) drive as specified in "
+"<filename>/etc/fstab</filename>. It is possible to provide alternate mount "
+"and unmount commands if your mount point cannot be listed in the fstab.  The "
 "syntax is to put <placeholder type=\"literallayout\" id=\"0\"/> within the "
-"cdrom block. It is important to have the trailing slash. Unmount commands "
-"can be specified using UMount."
+"<literal>cdrom</literal> block. It is important to have the trailing slash.  "
+"Unmount commands can be specified using UMount."
 msgstr ""
 "URI CD ; la seule option de configuration pour les URI de CD est le point de "
 "montage : <literal>cdrom::Mount</literal> ; il doit représenter le point de "
@@ -4127,31 +4276,35 @@ msgstr ""
 "oblique finale est importante. Les commandes de démontage peuvent être "
 "spécifiées en utilisant <literal>UMount</literal>."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:441
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:486
+#, fuzzy
+#| msgid ""
+#| "GPGV URIs; the only option for GPGV URIs is the option to pass additional "
+#| "parameters to gpgv.  <literal>gpgv::Options</literal> Additional options "
+#| "passed to gpgv."
 msgid ""
-"GPGV URIs; the only option for GPGV URIs is the option to pass additional "
-"parameters to gpgv.  <literal>gpgv::Options</literal> Additional options "
-"passed to gpgv."
+"For GPGV URIs the only configurable option is <literal>gpgv::Options</"
+"literal>, which passes additional parameters to gpgv."
 msgstr ""
 "URI GPGV ; la seule option pour les URI GPGV est celle qui permet de passer "
 "des paramètres à gpgv.  <literal>gpgv::Options</literal> : options "
 "supplémentaires passées à gpgv."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:452
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
+#: apt.conf.5.xml:497
 #, no-wrap
 msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
 msgstr "Acquire::CompressionTypes::<replaceable>ExtensionFichier</replaceable> \"<replaceable>NomMethode</replaceable>\";"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:447
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:492
 msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "
-"compression formats.  Per default the acquire methods can decompress "
+"compression formats.  By default the acquire methods can decompress "
 "<command>bzip2</command>, <command>lzma</command> and <command>gzip</"
-"command> compressed files, with this setting more formats can be added on "
+"command> compressed files; with this setting more formats can be added on "
 "the fly or the used method can be changed. The syntax for this is: "
 "<placeholder type=\"synopsis\" id=\"0\"/>"
 msgstr ""
@@ -4164,33 +4317,49 @@ msgstr ""
 "ou de modifier la méthode utilisée. La syntaxe à utiliser est : <placeholder "
 "type=\"synopsis\" id=\"0\"/>"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:457
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
+#: apt.conf.5.xml:502
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order:: \"gz\";"
 msgstr "Acquire::CompressionTypes::Order:: \"gz\";"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:460
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
+#: apt.conf.5.xml:505
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:453
-msgid ""
-"Also the <literal>Order</literal> subgroup can be used to define in which "
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:498
+#, fuzzy
+#| msgid ""
+#| "Also, the <literal>Order</literal> subgroup can be used to define in "
+#| "which order the acquire system will try to download the compressed files. "
+#| "The acquire system will try the first and proceed with the next "
+#| "compression type in this list on error, so to prefer one over the other "
+#| "type simply add the preferred type first - not already added default "
+#| "types will be added at run time to the end of the list, so e.g. "
+#| "<placeholder type=\"synopsis\" id=\"0\"/> can be used to prefer "
+#| "<command>gzip</command> compressed files over <command>bzip2</command> "
+#| "and <command>lzma</command>.  If <command>lzma</command> should be "
+#| "preferred over <command>gzip</command> and <command>bzip2</command> the "
+#| "configure setting should look like this <placeholder type=\"synopsis\" id="
+#| "\"1\"/> It is not needed to add <literal>bz2</literal> explicit to the "
+#| "list as it will be added automatic."
+msgid ""
+"Also, the <literal>Order</literal> subgroup can be used to define in which "
 "order the acquire system will try to download the compressed files. The "
 "acquire system will try the first and proceed with the next compression type "
-"in this list on error, so to prefer one over the other type simple add the "
-"preferred type at first - not already added default types will be added at "
-"run time to the end of the list, so e.g. <placeholder type=\"synopsis\" id="
+"in this list on error, so to prefer one over the other type simply add the "
+"preferred type first - default types not already added will be implicitly "
+"appended to the end of the list, so e.g. <placeholder type=\"synopsis\" id="
 "\"0\"/> can be used to prefer <command>gzip</command> compressed files over "
 "<command>bzip2</command> and <command>lzma</command>.  If <command>lzma</"
 "command> should be preferred over <command>gzip</command> and "
-"<command>bzip2</command> the configure setting should look like this "
+"<command>bzip2</command> the configure setting should look like this: "
 "<placeholder type=\"synopsis\" id=\"1\"/> It is not needed to add "
-"<literal>bz2</literal> explicit to the list as it will be added automatic."
+"<literal>bz2</literal> to the list explicitly as it will be added "
+"automatically."
 msgstr ""
 "Le sous-groupe <literal>Order</literal> peut être également utilisé pour "
 "définir l'ordre dans lequel le système d'acquisition tentera de télécharger "
@@ -4207,14 +4376,14 @@ msgstr ""
 "\"synopsis\" id=\"1\"/>. Il est inutile d'ajouter explicitement "
 "<literal>bz2</literal> à liste car il sera ajouté automatiquement."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:464
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
+#: apt.conf.5.xml:512
 #, no-wrap
 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:462
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:507
 #, fuzzy
 #| msgid ""
 #| "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
@@ -4225,19 +4394,19 @@ msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
 #| "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 "
+#| "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 "
-"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."
+"Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></"
+"literal> will be checked at run time. If this option has been set, the "
+"method will only be used if this file exists; e.g. for the <literal>bzip2</"
+"literal> 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."
 msgstr ""
 "Veuillez noter qu'à l'exécution, <literal>Dir::Bin::<replaceable>Methodname</"
 "replaceable></literal> sera vérifié : si ce réglage existe, la méthode ne "
@@ -4251,8 +4420,8 @@ msgstr ""
 "pas sous forme de liste. Cela ne remplacera pas la liste par défaut mais "
 "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:469
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:517
 msgid ""
 "The special type <literal>uncompressed</literal> can be used to give "
 "uncompressed files a preference, but note that most archives don't provide "
@@ -4263,8 +4432,8 @@ msgstr ""
 "archives ne fournissent pas de fichiers non compressés, donc ce réglage est "
 "surtout destiné aux miroirs locaux."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:476
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:524
 msgid ""
 "When downloading <literal>gzip</literal> compressed indexes (Packages, "
 "Sources, or Translations), keep them gzip compressed locally instead of "
@@ -4278,17 +4447,26 @@ msgstr ""
 "processeur lorsque les caches locaux sont créés. Valeur par défaut : Faux "
 "(« False »)."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:484
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:532
+#, fuzzy
+#| msgid ""
+#| "The Languages subsection controls which <filename>Translation</filename> "
+#| "files are downloaded and in which order APT tries to display the "
+#| "description-translations. APT will try to display the first available "
+#| "description in the language which is listed first. Languages can be "
+#| "defined with their short or long language codes. Note that not all "
+#| "archives provide <filename>Translation</filename> files for every "
+#| "Language - especially the long Languagecodes are rare, so please inform "
+#| "you which ones are available before you set here impossible values."
 msgid ""
 "The Languages subsection controls which <filename>Translation</filename> "
-"files are downloaded and in which order APT tries to display the Description-"
-"Translations. APT will try to display the first available Description in the "
-"Language which is listed at first. Languages can be defined with their short "
-"or long Languagecodes. Note that not all archives provide "
-"<filename>Translation</filename> files for every Language - especially the "
-"long Languagecodes are rare, so please inform you which ones are available "
-"before you set here impossible values."
+"files are downloaded and in which order APT tries to display the description-"
+"translations. APT will try to display the first available description in the "
+"language which is listed first. Languages can be defined with their short or "
+"long language codes. Note that not all archives provide "
+"<filename>Translation</filename> files for every language - the long "
+"language codes are especially rare."
 msgstr ""
 "La sous-section « Languages » contrôle quels fichiers <filename>Translation</"
 "filename> sont téléchargés et dans quel ordre APT les utilisera pour "
@@ -4300,33 +4478,52 @@ msgstr ""
 "pour les codes rarement utilisés. Il est donc conseillé de vous renseigner "
 "sur ce qui est disponible avant d'établir des réglages impossibles."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:500
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
+#: apt.conf.5.xml:549
 #, no-wrap
 msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 msgstr "Acquire::Languages { \"environment\"; \"fr\"; \"en\"; \"none\"; \"de\"; };"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:490
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:537
+#, fuzzy
+#| msgid ""
+#| "The default list includes \"environment\" and \"en\". "
+#| "\"<literal>environment</literal>\" has a special meaning here: It will be "
+#| "replaced at runtime with the languagecodes extracted from the "
+#| "<literal>LC_MESSAGES</literal> environment variable.  It will also ensure "
+#| "that these codes are not included twice in the list. If "
+#| "<literal>LC_MESSAGES</literal> is set to \"C\" only the "
+#| "<filename>Translation-en</filename> file (if available) will be used.  To "
+#| "force APT to use no Translation file use the setting <literal>Acquire::"
+#| "Languages=none</literal>. \"<literal>none</literal>\" is another special "
+#| "meaning code which will stop the search for a suitable "
+#| "<filename>Translation</filename> file.  This can be used by the system "
+#| "administrator to let APT know that it should download also this files "
+#| "without actually use them if the environment doesn't specify this "
+#| "languages. So the following example configuration will result in the "
+#| "order \"en, de\" in an english and in \"de, en\" in a german "
+#| "localization. Note that \"fr\" is downloaded, but not used if APT is not "
+#| "used in a french localization, in such an environment the order would be "
+#| "\"fr, de, en\".  <placeholder type=\"programlisting\" id=\"0\"/>"
 msgid ""
 "The default list includes \"environment\" and \"en\". "
-"\"<literal>environment</literal>\" has a special meaning here: It will be "
-"replaced at runtime with the languagecodes extracted from the "
+"\"<literal>environment</literal>\" has a special meaning here: it will be "
+"replaced at runtime with the language codes extracted from the "
 "<literal>LC_MESSAGES</literal> environment variable.  It will also ensure "
 "that these codes are not included twice in the list. If "
 "<literal>LC_MESSAGES</literal> is set to \"C\" only the "
 "<filename>Translation-en</filename> file (if available) will be used.  To "
-"force apt to use no Translation file use the setting <literal>Acquire::"
+"force APT to use no Translation file use the setting <literal>Acquire::"
 "Languages=none</literal>. \"<literal>none</literal>\" is another special "
-"meaning code which will stop the search for a fitting <filename>Translation</"
-"filename> file.  This can be used by the system administrator to let APT "
-"know that it should download also this files without actually use them if "
-"the environment doesn't specify this languages. So the following example "
-"configuration will result in the order \"en, de\" in an english and in \"de, "
-"en\" in a german localization. Note that \"fr\" is downloaded, but not used "
-"if APT is not used in a french localization, in such an environment the "
-"order would be \"fr, de, en\".  <placeholder type=\"programlisting\" id="
-"\"0\"/>"
+"meaning code which will stop the search for a suitable "
+"<filename>Translation</filename> file.  This tells APT to download these "
+"translations too, without actually using them unless the environment "
+"specifies the languages. So the following example configuration will result "
+"in the order \"en, de\" in an English locale or \"de, en\" in a German one. "
+"Note that \"fr\" is downloaded, but not used unless APT is used in a French "
+"locale (where the order would be \"fr, de, en\").  <placeholder type="
+"\"programlisting\" id=\"0\"/>"
 msgstr ""
 "La liste par défaut contient « environment » and « en ». La valeur "
 "« environment » a une signification spéciale : elle sera remplacée, à "
@@ -4348,8 +4545,8 @@ msgstr ""
 "dernier cas, l'ordre est alors « de, fr, en ». <placeholder type="
 "\"programlisting\" id=\"0\"/>"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:501
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:550
 msgid ""
 "Note: To prevent problems resulting from APT being executed in different "
 "environments (e.g. by different users or by other programs) all Translation "
@@ -4358,28 +4555,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:560
 msgid "Directories"
 msgstr "Les répertoires"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:514
+#: apt.conf.5.xml:562
 #, fuzzy
 #| msgid ""
 #| "The <literal>Dir::State</literal> section has directories that pertain to "
 #| "local state information. <literal>lists</literal> is the directory to "
 #| "place downloaded package lists in and <literal>status</literal> is the "
-#| "name of the dpkg status file.  <literal>preferences</literal> is the name "
-#| "of the APT preferences file.  <literal>Dir::State</literal> contains the "
-#| "default directory to prefix on all sub items if they do not start with "
-#| "<filename>/</filename> or <filename>./</filename>."
+#| "name of the &dpkg; status file.  <literal>preferences</literal> is the "
+#| "name of the APT preferences file.  <literal>Dir::State</literal> contains "
+#| "the default directory to prefix on all sub-items if they do not start "
+#| "with <filename>/</filename> or <filename>./</filename>."
 msgid ""
 "The <literal>Dir::State</literal> section has directories that pertain to "
 "local state information. <literal>lists</literal> is the directory to place "
 "downloaded package lists in and <literal>status</literal> is the name of the "
-"dpkg status file.  <literal>preferences</literal> is the name of the APT "
+"&dpkg; status file.  <literal>preferences</literal> is the name of the APT "
 "<filename>preferences</filename> file.  <literal>Dir::State</literal> "
-"contains the default directory to prefix on all sub items if they do not "
+"contains the default directory to prefix on all sub-items if they do not "
 "start with <filename>/</filename> or <filename>./</filename>."
 msgstr ""
 "Les répertoires de la section <literal>Dir::State</literal> concernent le "
@@ -4392,14 +4589,25 @@ msgstr ""
 "filename>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:521
+#: apt.conf.5.xml:569
+#, fuzzy
+#| msgid ""
+#| "<literal>Dir::Cache</literal> contains locations pertaining to local "
+#| "cache information, such as the two package caches <literal>srcpkgcache</"
+#| "literal> and <literal>pkgcache</literal> as well as the location to place "
+#| "downloaded archives, <literal>Dir::Cache::archives</literal>. Generation "
+#| "of caches can be turned off by setting their names to be blank. This will "
+#| "slow down startup but save disk space. It is probably preferable to turn "
+#| "off the pkgcache rather than the srcpkgcache. Like <literal>Dir::State</"
+#| "literal> the default directory is contained in <literal>Dir::Cache</"
+#| "literal>"
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
 "and <literal>pkgcache</literal> as well as the location to place downloaded "
 "archives, <literal>Dir::Cache::archives</literal>. Generation of caches can "
-"be turned off by setting their names to be blank. This will slow down "
-"startup but save disk space. It is probably preferred to turn off the "
+"be turned off by setting their names to the empty string. This will slow "
+"down startup but save disk space. It is probably preferable to turn off the "
 "pkgcache rather than the srcpkgcache. Like <literal>Dir::State</literal> the "
 "default directory is contained in <literal>Dir::Cache</literal>"
 msgstr ""
@@ -4415,7 +4623,7 @@ msgstr ""
 "Cache</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:530
+#: apt.conf.5.xml:578
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4430,7 +4638,7 @@ msgstr ""
 "fichier de configuration indiqué par la variable <envar>APT_CONFIG</envar>)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:536
+#: apt.conf.5.xml:584
 msgid ""
 "The <literal>Dir::Parts</literal> setting reads in all the config fragments "
 "in lexical order from the directory specified. After this is done then the "
@@ -4441,7 +4649,7 @@ msgstr ""
 "configuration est chargé."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:540
+#: apt.conf.5.xml:588
 msgid ""
 "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
 "Bin::Methods</literal> specifies the location of the method handlers and "
@@ -4459,7 +4667,7 @@ msgstr ""
 "programmes correspondants."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:548
+#: apt.conf.5.xml:596
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "
@@ -4481,7 +4689,7 @@ msgstr ""
 "staging/var/lib/dpkg/status</filename>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:561
+#: apt.conf.5.xml:609
 msgid ""
 "The <literal>Ignore-Files-Silently</literal> list can be used to specify "
 "which files APT should silently ignore while parsing the files in the "
@@ -4499,15 +4707,15 @@ msgstr ""
 "est possible d'utiliser la syntaxe des expressions rationnelles."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:570
+#: apt.conf.5.xml:618
 msgid "APT in DSelect"
 msgstr "APT et DSelect"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:572
+#: apt.conf.5.xml:620
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
-"control the default behaviour. These are in the <literal>DSelect</literal> "
+"control the default behavior. These are in the <literal>DSelect</literal> "
 "section."
 msgstr ""
 "Quand APT est utilisé comme une méthode de &dselect;, plusieurs directives "
@@ -4515,43 +4723,48 @@ msgstr ""
 "<literal>DSelect</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:577
+#: apt.conf.5.xml:625
 msgid ""
-"Cache Clean mode; this value may be one of always, prompt, auto, pre-auto "
-"and never.  always and prompt will remove all packages from the cache after "
-"upgrading, prompt (the default) does so conditionally.  auto removes only "
-"those packages which are no longer downloadable (replaced with a new version "
-"for instance).  pre-auto performs this action before downloading new "
-"packages."
+"Cache Clean mode; this value may be one of <literal>always</literal>, "
+"<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
+"literal> and <literal>never</literal>.  <literal>always</literal> and "
+"<literal>prompt</literal> will remove all packages from the cache after "
+"upgrading, <literal>prompt</literal> (the default) does so conditionally.  "
+"<literal>auto</literal> removes only those packages which are no longer "
+"downloadable (replaced with a new version for instance).  <literal>pre-auto</"
+"literal> performs this action before downloading new packages."
 msgstr ""
 "Mode de nettoyage du cache ; cette variable peut prendre l'une des valeurs "
-"suivantes : « always », « prompt », « auto », « pre-auto » et « never ».  "
-"« always » et « prompt » suppriment tous les paquets du cache après la mise "
-"à niveau ; « prompt » (valeur par défaut)  les supprime après une demande et "
-"« auto » ne supprime que les archives qui ne peuvent plus être téléchargées "
-"(remplacées, par exemple, par une nouvelle version). « pre-auto » les "
-"supprime avant de récupérer de nouveaux paquets."
+"suivantes : « <literal>always</literal> », « <literal>prompt</literal> », "
+"« <literal>auto</literal> », « <literal>pre-auto</literal> » et "
+"« <literal>never</literal> ».  « <literal>always</literal> » et "
+"« <literal>prompt</literal> » suppriment tous les paquets du cache après la "
+"mise à niveau ; « <literal>prompt</literal> » (valeur par défaut)  les "
+"supprime après une demande et « <literal>auto</literal> » ne supprime que "
+"les archives qui ne peuvent plus être téléchargées (remplacées, par exemple, "
+"par une nouvelle version). « <literal>pre-auto</literal> » les supprime "
+"avant de récupérer de nouveaux paquets."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:586
+#: apt.conf.5.xml:639
 msgid ""
-"The contents of this variable is passed to &apt-get; as command line options "
-"when it is run for the install phase."
+"The contents of this variable are passed to &apt-get; as command line "
+"options when it is run for the install phase."
 msgstr ""
 "Le contenu de cette variable est passé comme options de ligne de commande à "
 "&apt-get; lors de la phase d'installation."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:591
+#: apt.conf.5.xml:644
 msgid ""
-"The contents of this variable is passed to &apt-get; as command line options "
-"when it is run for the update phase."
+"The contents of this variable are passed to &apt-get; as command line "
+"options when it is run for the update phase."
 msgstr ""
 "Le contenu de cette variable est passé comme options de ligne de commande à "
 "&apt-get; lors de la phase de mise à jour."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:596
+#: apt.conf.5.xml:649
 msgid ""
 "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
 "The default is to prompt only on error."
@@ -4561,12 +4774,12 @@ msgstr ""
 "d'erreur que l'on propose à l'utilisateur d'intervenir."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:602
-msgid "How APT calls dpkg"
+#: apt.conf.5.xml:655
+msgid "How APT calls &dpkg;"
 msgstr "Méthode d'appel de &dpkg; par APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:603
+#: apt.conf.5.xml:656
 msgid ""
 "Several configuration directives control how APT invokes &dpkg;. These are "
 "in the <literal>DPkg</literal> section."
@@ -4575,9 +4788,9 @@ msgstr ""
 "&dpkg; : elles figurent dans la section <literal>DPkg</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:608
+#: apt.conf.5.xml:661
 msgid ""
-"This is a list of options to pass to dpkg. The options must be specified "
+"This is a list of options to pass to &dpkg;. The options must be specified "
 "using the list notation and each list item is passed as a single argument to "
 "&dpkg;."
 msgstr ""
@@ -4586,11 +4799,11 @@ msgstr ""
 "est passé comme un seul paramètre à &dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:614
+#: apt.conf.5.xml:667
 msgid ""
 "This is a list of shell commands to run before/after invoking &dpkg;.  Like "
 "<literal>options</literal> this must be specified in list notation. The "
-"commands are invoked in order using <filename>/bin/sh</filename>, should any "
+"commands are invoked in order using <filename>/bin/sh</filename>; should any "
 "fail APT will abort."
 msgstr ""
 "Il s'agit d'une liste de commandes shell à exécuter avant ou après l'appel "
@@ -4599,13 +4812,20 @@ msgstr ""
 "<filename>/bin/sh</filename> : APT s'arrête dès que l'une d'elles échoue."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:621
+#: apt.conf.5.xml:674
+#, fuzzy
+#| msgid ""
+#| "This is a list of shell commands to run before invoking &dpkg;. Like "
+#| "<literal>options</literal> this must be specified in list notation. The "
+#| "commands are invoked in order using <filename>/bin/sh</filename>; should "
+#| "any fail APT will abort. APT will pass to the commands on standard input "
+#| "the filenames of all .deb files it is going to install, one per line."
 msgid ""
-"This is a list of shell commands to run before invoking dpkg. Like "
+"This is a list of shell commands to run before invoking &dpkg;. Like "
 "<literal>options</literal> this must be specified in list notation. The "
-"commands are invoked in order using <filename>/bin/sh</filename>, should any "
-"fail APT will abort. APT will pass to the commands on standard input the "
-"filenames of all .deb files it is going to install, one per line."
+"commands are invoked in order using <filename>/bin/sh</filename>; should any "
+"fail APT will abort. APT will pass the filenames of all .deb files it is "
+"going to install to the commands, one per line on standard input."
 msgstr ""
 "Il s'agit d'une liste de commandes shell à exécuter avant d'appeler &dpkg;.  "
 "Tout comme pour <literal>Options</literal>, on doit utiliser la notation de "
@@ -4615,7 +4835,7 @@ msgstr ""
 "qu'il va installer, à raison d'un par ligne."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:627
+#: apt.conf.5.xml:680
 msgid ""
 "Version 2 of this protocol dumps more information, including the protocol "
 "version, the APT configuration space and the packages, files and versions "
@@ -4631,18 +4851,18 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:635
+#: apt.conf.5.xml:688
 msgid ""
-"APT chdirs to this directory before invoking dpkg, the default is <filename>/"
-"</filename>."
+"APT chdirs to this directory before invoking &dpkg;, the default is "
+"<filename>/</filename>."
 msgstr ""
 "APT se place dans ce répertoire avant d'appeler &dpkg; ; par défaut, c'est "
 "le répertoire <filename>/</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:640
+#: apt.conf.5.xml:693
 msgid ""
-"These options are passed to &dpkg-buildpackage; when compiling packages, the "
+"These options are passed to &dpkg-buildpackage; when compiling packages; the "
 "default is to disable signing and produce all binaries."
 msgstr ""
 "Ces options sont passées à &dpkg-buildpackage; lors de la compilation des "
@@ -4650,41 +4870,54 @@ msgstr ""
 "créés."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:645
+#: apt.conf.5.xml:698
 msgid "dpkg trigger usage (and related options)"
 msgstr ""
 "utilisation des actions différées (« triggers ») de dpkg (et options "
 "associées)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:646
-msgid ""
-"APT can call dpkg in a way so it can make aggressive use of triggers over "
-"multiple calls of dpkg. Without further options dpkg will use triggers only "
-"in between his own run. Activating these options can therefore decrease the "
-"time needed to perform the install / upgrade. Note that it is intended to "
-"activate these options per default in the future, but as it changes the way "
-"APT calling dpkg drastically it needs a lot more testing.  <emphasis>These "
-"options are therefore currently experimental and should not be used in "
-"productive environments.</emphasis> Also it breaks the progress reporting so "
-"all frontends will currently stay around half (or more) of the time in the "
-"100% state while it actually configures all packages."
-msgstr ""
-"APT peut lancer dpkg pour utiliser les actions différées de manière "
-"agressive entre les appels successifs à dpkg. Sans options supplémentaires, "
-"dpkg n'utilisera les actions différées que dans le cadre de sa propre "
-"exécution. Si ces options sont utilisées, le temps d'exécution peut diminuer "
-"fortement dans les actions d'installation ou de mise à jour. Il est prévu de "
-"les activer par défaut dans le futur mais étant donné qu'elles changent "
-"notablement la méthode qu'utilise APT pour lancer dpkg, elles ont besoin "
-"d'importantes validations. <emphasis>Ces options sont donc expérimentales et "
-"ne devraient pas être utilisées avec des environnements de production.</"
-"emphasis>. Elles modifient également le suivi de progression et toutes les "
-"interfaces passeront la moitié du temps à un état terminé à 100% pendant la "
-"configuration des paquets."
+#: apt.conf.5.xml:699
+#, fuzzy
+#| msgid ""
+#| "APT can call &dpkg; in a way so it can make aggressive use of triggers "
+#| "over multiple calls of &dpkg;. Without further options &dpkg; will use "
+#| "triggers only in between his own run. Activating these options can "
+#| "therefore decrease the time needed to perform the install / upgrade. Note "
+#| "that it is intended to activate these options per default in the future, "
+#| "but as it changes the way APT calling &dpkg; drastically it needs a lot "
+#| "more testing.  <emphasis>These options are therefore currently "
+#| "experimental and should not be used in production environments.</"
+#| "emphasis> It also breaks progress reporting such that all frontends will "
+#| "currently stay around half (or more) of the time in the 100% state while "
+#| "it actually configures all packages."
+msgid ""
+"APT can call &dpkg; in such a way as to let it make aggressive use of "
+"triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
+"use triggers once each time it runs.  Activating these options can therefore "
+"decrease the time needed to perform the install or upgrade. Note that it is "
+"intended to activate these options per default in the future, but as it "
+"drastically changes the way APT calls &dpkg; it needs a lot more testing.  "
+"<emphasis>These options are therefore currently experimental and should not "
+"be used in production environments.</emphasis> It also breaks progress "
+"reporting such that all front-ends will currently stay around half (or more) "
+"of the time in the 100% state while it actually configures all packages."
+msgstr ""
+"APT peut lancer &dpkg; pour utiliser les actions différées de manière "
+"agressive entre les appels successifs à &dpkg;. Sans options "
+"supplémentaires, &dpkg; n'utilisera les actions différées que dans le cadre "
+"de sa propre exécution. Si ces options sont utilisées, le temps d'exécution "
+"peut diminuer fortement dans les actions d'installation ou de mise à jour. "
+"Il est prévu de les activer par défaut dans le futur mais étant donné "
+"qu'elles changent notablement la méthode qu'utilise APT pour lancer &dpkg;, "
+"elles ont besoin d'importantes validations. <emphasis>Ces options sont donc "
+"expérimentales et ne devraient pas être utilisées avec des environnements de "
+"production.</emphasis>. Elles modifient également le suivi de progression et "
+"toutes les interfaces passeront la moitié du temps à un état terminé à 100% "
+"pendant la configuration des paquets."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:661
+#: apt.conf.5.xml:714
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
@@ -4698,15 +4931,15 @@ msgstr ""
 "DPkg::TriggersPending \"true\";"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:655
+#: apt.conf.5.xml:708
 msgid ""
 "Note that it is not guaranteed that APT will support these options or that "
 "these options will not cause (big) trouble in the future. If you have "
 "understand the current risks and problems with these options, but are brave "
-"enough to help testing them create a new configuration file and test a "
+"enough to help testing them, create a new configuration file and test a "
 "combination of options. Please report any bugs, problems and improvements "
 "you encounter and make sure to note which options you have used in your "
-"reports. Asking dpkg for help could also be useful for debugging proposes, "
+"reports. Asking &dpkg; for help could also be useful for debugging proposes, "
 "see e.g. <command>dpkg --audit</command>. A defensive option combination "
 "would be <placeholder type=\"literallayout\" id=\"0\"/>"
 msgstr ""
@@ -4716,47 +4949,63 @@ msgstr ""
 "essayer ces options, il vous est donc possible de créer un nouveau fichier "
 "de configuration et essayer une combinaison de ces options. Veuillez "
 "signaler tout bogue, problèmes ou suggestions d'amélioration en prenant soin "
-"de mentionner les options utilisées. Utiliser l'aide apportée par dpkg peut "
-"également être utile pour le débogage, par exemple <command>dpkg --audit</"
-"command>. Une combinaison intéressante d'options pourrait être <placeholder "
-"type=\"literallayout\" id=\"0\"/>."
+"de mentionner les options utilisées. Utiliser l'aide apportée par &dpkg; "
+"peut également être utile pour le débogage, par exemple <command>dpkg --"
+"audit</command>. Une combinaison intéressante d'options pourrait être "
+"<placeholder type=\"literallayout\" id=\"0\"/>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:668
+#: apt.conf.5.xml:721
 msgid ""
-"Add the no triggers flag to all dpkg calls (except the ConfigurePending "
+"Add the no triggers flag to all &dpkg; calls (except the ConfigurePending "
 "call).  See &dpkg; if you are interested in what this actually means. In "
-"short: dpkg will not run the triggers when this flag is present unless it is "
-"explicitly called to do so in an extra call.  Note that this option exists "
-"(undocumented) also in older apt versions with a slightly different meaning: "
-"Previously these option only append --no-triggers to the configure calls to "
-"dpkg - now apt will add these flag also to the unpack and remove calls."
-msgstr ""
-"Ajoute l'option « no-triggers » à tous les appels à dpkg (hormis l'appel "
+"short: &dpkg; will not run the triggers when this flag is present unless it "
+"is explicitly called to do so in an extra call.  Note that this option "
+"exists (undocumented) also in older APT versions with a slightly different "
+"meaning: Previously these option only append --no-triggers to the configure "
+"calls to &dpkg; - now APT will also add this flag to the unpack and remove "
+"calls."
+msgstr ""
+"Ajoute l'option « no-triggers » à tous les appels à &dpkg; (hormis l'appel "
 "« ConfigurePending »). Voir &dpkg; pour plus d'informations sur la "
-"signification de cette option. En résumé, dpkg n'effectuera pas les actions "
-"différées (« triggers ») si cette option est utilisée sauf si cela est "
-"demandé explicitement dans une invocation supplémentaire. Cette option "
+"signification de cette option. En résumé, &dpkg; n'effectuera pas les "
+"actions différées (« triggers ») si cette option est utilisée sauf si cela "
+"est demandé explicitement dans une invocation supplémentaire. Cette option "
 "existe en fait déjà (mais n'est pas documentée) dans de plus anciennes "
 "version d'APT avec une signification légèrement différente : elle n'ajoutait "
-"l'option « --no-triggers » qu'aux appels de dpkg avec « configure » alors "
-"que cela sera désormais utilisé également avec les appels à dpkg avec les "
+"l'option « --no-triggers » qu'aux appels de &dpkg; avec « configure » alors "
+"que cela sera désormais utilisé également avec les appels à &dpkg; avec les "
 "options « unpack » et « remove »."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:676
+#: apt.conf.5.xml:729
+#, fuzzy
+#| msgid ""
+#| "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
+#| "and \"<literal>no</literal>\".  \"<literal>all</literal>\" is the default "
+#| "value and causes APT to configure all packages explicit.  The "
+#| "\"<literal>smart</literal>\" way is it to configure only packages which "
+#| "need to be configured before another package can be unpacked (Pre-"
+#| "Depends) and let the rest configure by &dpkg; with a call generated by "
+#| "the next option. \"<literal>no</literal>\" on the other hand will not "
+#| "configure anything and totally rely on &dpkg; for configuration (which "
+#| "will at the moment fail if a Pre-Depends is encountered).  Setting this "
+#| "option to another than the all value will implicitly activate also the "
+#| "next option per default as otherwise the system could end in an "
+#| "unconfigured status which could be unbootable!"
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
-"and \"<literal>no</literal>\".  \"<literal>all</literal>\" is the default "
-"value and causes APT to configure all packages explicit.  The "
-"\"<literal>smart</literal>\" way is it to configure only packages which need "
-"to be configured before another package can be unpacked (Pre-Depends) and "
-"let the rest configure by dpkg with a call generated by the next option. "
-"\"<literal>no</literal>\" on the other hand will not configure anything and "
-"totally rely on dpkg for configuration (which will at the moment fail if a "
-"Pre-Depends is encountered).  Setting this option to another than the all "
-"value will implicitly activate also the next option per default as otherwise "
-"the system could end in an unconfigured status which could be unbootable!"
+"and \"<literal>no</literal>\".  The default value is \"<literal>all</literal>"
+"\", which causes APT to configure all packages. The \"<literal>smart</"
+"literal>\" way is to configure only packages which need to be configured "
+"before another package can be unpacked (Pre-Depends), and let the rest be "
+"configured by &dpkg; with a call generated by the ConfigurePending option "
+"(see below). On the other hand, \"<literal>no</literal>\" will not configure "
+"anything, and totally relies on &dpkg; for configuration (which at the "
+"moment will fail if a Pre-Depends is encountered). Setting this option to "
+"any value other than <literal>all</literal> will implicitly also activate "
+"the next option by default, as otherwise the system could end in an "
+"unconfigured and potentially unbootable state."
 msgstr ""
 "Les valeurs possibles sont « <literal>all</literal> », « <literal>smart</"
 "literal> » et « <literal>no</literal> ». La valeur par défaut est "
@@ -4764,25 +5013,33 @@ msgstr ""
 "La valeur « <literal>smart</literal> » permet de ne configurer que les "
 "paquets qui ont besoin de l'être avant la décompaction d'un autre paquet (à "
 "cause d'une pré-dépendance) ; les autres configurations sont laissées pour "
-"un appel ultérieur à dpkg. L'option « <literal>no</literal> » ne provoquera "
-"aucune configuration et s'en remettra totalement à dpkg pour ces opérations "
-"(ce qui échouera en cas de pré-dépendances). Si cette option est définie sur "
-"une valeur différente de « <literal>all</literal> », l'option suivante sera "
-"activée par défaut pour éviter de placer le système dans un état non "
-"configuré et donc éventuellement non amorçable."
+"un appel ultérieur à &dpkg;. L'option « <literal>no</literal> » ne "
+"provoquera aucune configuration et s'en remettra totalement à &dpkg; pour "
+"ces opérations (ce qui échouera en cas de pré-dépendances). Si cette option "
+"est définie sur une valeur différente de « <literal>all</literal> », "
+"l'option suivante sera activée par défaut pour éviter de placer le système "
+"dans un état non configuré et donc éventuellement non amorçable."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:687
-msgid ""
-"If this option is set apt will call <command>dpkg --configure --pending</"
-"command> to let dpkg handle all required configurations and triggers. This "
-"option is activated automatic per default if the previous option is not set "
-"to <literal>all</literal>, but deactivating could be useful if you want to "
-"run APT multiple times in a row - e.g. in an installer. In these sceneries "
-"you could deactivate this option in all but the last run."
+#: apt.conf.5.xml:744
+#, fuzzy
+#| msgid ""
+#| "If this option is set, APT will call <command>dpkg --configure --pending</"
+#| "command> to let &dpkg; handle all required configurations and triggers. "
+#| "This option is activated automatically per default if the previous option "
+#| "is not set to <literal>all</literal>, but deactivating it could be useful "
+#| "if you want to run APT multiple times in a row - e.g. in an installer. In "
+#| "these sceneries you could deactivate this option in all but the last run."
+msgid ""
+"If this option is set APT will call <command>dpkg --configure --pending</"
+"command> to let &dpkg; handle all required configurations and triggers. This "
+"option is activated automatically per default if the previous option is not "
+"set to <literal>all</literal>, but deactivating it could be useful if you "
+"want to run APT multiple times in a row - e.g. in an installer. In these "
+"sceneries you could deactivate this option in all but the last run."
 msgstr ""
 "Si cette option est choisie, APT lancera <command>dpkg --configure --"
-"pending</command> pour laisser dpkg gérer les configurations de paquets et "
+"pending</command> pour laisser &dpkg; gérer les configurations de paquets et "
 "les actions différées. Cette option est automatiquement activée si l'option "
 "précédente a une valeur différente de « <literal>all</literal> ». Il peut "
 "par contre être utile de la désactiver pour lancer APT plusieurs fois "
@@ -4791,50 +5048,25 @@ msgstr ""
 "peut conserver l'option active."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:694
+#: apt.conf.5.xml:751
 msgid ""
-"Useful for <literal>smart</literal> configuration as a package which has "
-"pending triggers is not considered as <literal>installed</literal> and dpkg "
-"treats them as <literal>unpacked</literal> currently which is a dealbreaker "
-"for Pre-Dependencies (see debbugs #526774). Note that this will process all "
-"triggers, not only the triggers needed to configure this package."
+"Useful for the <literal>smart</literal> configuration as a package which has "
+"pending triggers is not considered as <literal>installed</literal>, and "
+"&dpkg; treats them as <literal>unpacked</literal> currently which is a "
+"showstopper for Pre-Dependencies (see debbugs #526774). Note that this will "
+"process all triggers, not only the triggers needed to configure this package."
 msgstr ""
 "Cette option est utile pour la configuration en mode « <literal>smart</"
 "literal> ». En effet, un paquet qui a des actions différées (« triggers ») "
 "en attente n'est pas considéré comme installé (état « <literal>installed</"
-"literal> ») et dpkg le considère actuellement comme simplement décompacté "
+"literal> ») et &dpkg; le considère actuellement comme simplement décompacté "
 "(état « <literal>unpacked</literal> ») ce qui empêche une gestion correcte "
 "des pré-dépendances (voir le bogue Debian #526774). Veuillez noter que cette "
 "option provoquera la gestion de toutes les actions différées, pas seulement "
 "celles concernant le paquet en cours de traitement."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:700
-msgid ""
-"As the configuration can be deferred to be done at the end by dpkg it can be "
-"tried to order the unpack series only by critical needs, e.g. by Pre-"
-"Depends. Default is true and therefore the \"old\" method of ordering in "
-"various steps by everything. While both method were present in earlier APT "
-"versions the <literal>OrderCritical</literal> method was unused, so this "
-"method is very experimental and needs further improvements before becoming "
-"really useful."
-msgstr ""
-"Cette option permet de ne trier les opérations de décompactage qu'en "
-"fonction de leur criticité (c'est à dire en ne considérant que les pré-"
-"dépendances) dans le cas où la configuration des paquets est différée pour "
-"n'être effectuée qu'à la fin par dpkg. Cette option est active par défaut, "
-"ce qui revient à la méthode traditionnelle où les opérations ont lieu en "
-"plusieurs étapes, selon l'ensemble des critères de tri. Bien que les deux "
-"méthodes existent même dans les versions, la méthode "
-"« <literal>OrderCritical</literal> » n'était pas utilisée. Elle doit donc "
-"être considérée comme très expérimentale et a besoin de nombreuses "
-"améliorations avant de devenir réellement utile. (Note du traducteur : la "
-"version originale de cette partie des pages de manuel est très confuse. Il "
-"est donc conseillé de s'y reporter en cas de doute car le contresens de "
-"traduction n'est pas exclu...)."
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:715
+#: apt.conf.5.xml:764
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
@@ -4852,17 +5084,17 @@ msgstr ""
 "};"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:708
-msgid ""
-"Essential packages (and there dependencies) should be configured immediately "
-"after unpacking. It will be a good idea to do this quite early in the "
-"upgrade process as these these configure calls require currently also "
-"<literal>DPkg::TriggersPending</literal> which will run quite a few triggers "
-"(which maybe not needed). Essentials get per default a high score but the "
-"immediate flag is relatively low (a package which has a Pre-Depends is "
-"higher rated).  These option and the others in the same group can be used to "
-"change the scoring. The following example shows the settings with there "
-"default values.  <placeholder type=\"literallayout\" id=\"0\"/>"
+#: apt.conf.5.xml:757
+msgid ""
+"Essential packages (and their dependencies) should be configured immediately "
+"after unpacking. It is a good idea to do this quite early in the upgrade "
+"process as these configure calls also currently require <literal>DPkg::"
+"TriggersPending</literal> which will run quite a few triggers (which may not "
+"be needed). Essentials get per default a high score but the immediate flag "
+"is relatively low (a package which has a Pre-Depends is rated higher).  "
+"These option and the others in the same group can be used to change the "
+"scoring. The following example shows the settings with their default "
+"values.  <placeholder type=\"literallayout\" id=\"0\"/>"
 msgstr ""
 "Les paquets essentiels (et leurs dépendances) devraient être configurés "
 "après avoir été décompressés. Il est conseillé que cette opération ait lieu "
@@ -4878,29 +5110,29 @@ msgstr ""
 "id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:728
+#: apt.conf.5.xml:777
 msgid "Periodic and Archives options"
 msgstr "Options « Periodic » et « Archive »"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:729
+#: apt.conf.5.xml:778
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
-"of options configure behavior of apt periodic updates, which is done by "
-"<literal>/etc/cron.daily/apt</literal> script. See header of this script for "
-"the brief documentation of these options."
+"of options configure behavior of apt periodic updates, which is done by the "
+"<literal>/etc/cron.daily/apt</literal> script. See the top of this script "
+"for the brief documentation of these options."
 msgstr ""
 "Les groupes d'options <literal>APT::Periodic</literal> et <literal>APT::"
 "Archive</literal> configurent les comportements périodiques réalisés par le "
 "script <literal>/etc/cron.daily/apt</literal>, lancé quotidiennement."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:737
+#: apt.conf.5.xml:786
 msgid "Debug options"
 msgstr "Les options de débogage"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:739
+#: apt.conf.5.xml:788
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -4918,7 +5150,7 @@ msgstr ""
 "peuvent tout de même être utiles :"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:750
+#: apt.conf.5.xml:799
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -4929,7 +5161,7 @@ msgstr ""
 "upgrade, upgrade, install, remove et purge</literal>."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:758
+#: apt.conf.5.xml:807
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s install</"
@@ -4941,7 +5173,7 @@ msgstr ""
 "superutilisateur."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:767
+#: apt.conf.5.xml:816
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
@@ -4953,7 +5185,7 @@ msgstr ""
 #. 	   motivating example, except I haven't a clue why you'd want
 #. 	   to do this. 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:775
+#: apt.conf.5.xml:824
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
 "in CD-ROM IDs."
@@ -4962,12 +5194,12 @@ msgstr ""
 "type statfs dans les identifiants de CD."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:785
+#: apt.conf.5.xml:834
 msgid "A full list of debugging options to apt follows."
 msgstr "Liste complète des options de débogage de APT :"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:794
+#: apt.conf.5.xml:843
 msgid ""
 "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
@@ -4975,24 +5207,24 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:805
+#: apt.conf.5.xml:854
 msgid "Print information related to downloading packages using FTP."
 msgstr ""
 "Affiche les informations concernant le téléchargement de paquets par FTP."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:816
+#: apt.conf.5.xml:865
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 "Affiche les informations concernant le téléchargement de paquets par HTTP."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:827
+#: apt.conf.5.xml:876
 msgid "Print information related to downloading packages using HTTPS."
 msgstr "Print information related to downloading packages using HTTPS."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:838
+#: apt.conf.5.xml:887
 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
@@ -5001,7 +5233,7 @@ msgstr ""
 "cryptographiques avec <literal>gpg</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:849
+#: apt.conf.5.xml:898
 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
@@ -5010,14 +5242,14 @@ msgstr ""
 "stockées sur CD."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:859
+#: apt.conf.5.xml:908
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr ""
 "Décrit le processus de résolution des dépendances pour la construction de "
 "paquets source ( « build-dependencies » ) par &apt-get;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:869
+#: apt.conf.5.xml:918
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
@@ -5026,7 +5258,7 @@ msgstr ""
 "librairies d'<literal>apt</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:879
+#: apt.conf.5.xml:928
 msgid ""
 "Do not include information from <literal>statfs</literal>, namely the number "
 "of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@ -5037,7 +5269,7 @@ msgstr ""
 "utilisés sur le système de fichier du CD."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:890
+#: apt.conf.5.xml:939
 msgid ""
 "Disable all file locking.  For instance, this will allow two instances of "
 "<quote><literal>apt-get update</literal></quote> to run at the same time."
@@ -5047,14 +5279,14 @@ msgstr ""
 "temps."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:902
+#: apt.conf.5.xml:951
 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
 "Trace les ajouts et suppressions d'éléments de la queue globale de "
 "téléchargement."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:912
+#: apt.conf.5.xml:961
 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
@@ -5064,7 +5296,7 @@ msgstr ""
 "éventuelles."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:922
+#: apt.conf.5.xml:971
 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."
@@ -5074,7 +5306,7 @@ msgstr ""
 "éventuelles."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:934
+#: apt.conf.5.xml:983
 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."
@@ -5084,7 +5316,7 @@ msgstr ""
 "place des fichiers complets."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:945
+#: apt.conf.5.xml:994
 msgid ""
 "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
@@ -5092,7 +5324,7 @@ msgstr ""
 "effectivement des téléchargements."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:956
+#: apt.conf.5.xml:1005
 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."
@@ -5101,7 +5333,7 @@ msgstr ""
 "automatiquement, et la suppression des paquets inutiles."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:966
+#: apt.conf.5.xml:1015
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
@@ -5116,20 +5348,21 @@ msgstr ""
 "de APT ; voir <literal>Debug::pkgProblemResolver</literal> pour ce dernier."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:980
+#: apt.conf.5.xml:1029
 msgid ""
-"Generate debug messages describing which package is marked as keep/install/"
+"Generate debug messages describing which packages are marked as keep/install/"
 "remove while the ProblemResolver does his work.  Each addition or deletion "
-"may trigger additional actions; they are shown indented two additional space "
-"under the original entry.  The format for each line is <literal>MarkKeep</"
-"literal>, <literal>MarkDelete</literal> or <literal>MarkInstall</literal> "
-"followed by <literal>package-name &lt;a.b.c -&gt; d.e.f | x.y.z&gt; (section)"
-"</literal> where <literal>a.b.c</literal> is the current version of the "
-"package, <literal>d.e.f</literal> is the version considered for installation "
-"and <literal>x.y.z</literal> is a newer version, but not considered for "
-"installation (because of a low pin score). The later two can be omitted if "
-"there is none or if it is the same version as the installed.  "
-"<literal>section</literal> is the name of the section the package appears in."
+"may trigger additional actions; they are shown indented two additional "
+"spaces under the original entry.  The format for each line is "
+"<literal>MarkKeep</literal>, <literal>MarkDelete</literal> or "
+"<literal>MarkInstall</literal> followed by <literal>package-name &lt;a.b.c -"
+"&gt; d.e.f | x.y.z&gt; (section)</literal> where <literal>a.b.c</literal> is "
+"the current version of the package, <literal>d.e.f</literal> is the version "
+"considered for installation and <literal>x.y.z</literal> is a newer version, "
+"but not considered for installation (because of a low pin score). The later "
+"two can be omitted if there is none or if it is the same as the installed "
+"version.  <literal>section</literal> is the name of the section the package "
+"appears in."
 msgstr ""
 "Crée les informations de débogage décrivant quels paquets sont gardés/"
 "installés/supprimés pendant le travail de l'outil de résolution de "
@@ -5151,14 +5384,7 @@ msgstr ""
 "de APT ; voir <literal>Debug::pkgProblemResolver</literal> pour ce dernier."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1002
-msgid "Dump the default configuration to standard error on startup."
-msgstr ""
-"Affiche, au lancement, l'ensemble de la configuration sur la sortie d'erreur "
-"standard."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1012
+#: apt.conf.5.xml:1050
 msgid ""
 "When invoking &dpkg;, output the precise command line with which it is being "
 "invoked, with arguments separated by a single space character."
@@ -5167,7 +5393,7 @@ msgstr ""
 "paramètres sont séparés par des espaces."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1023
+#: apt.conf.5.xml:1061
 msgid ""
 "Output all the data received from &dpkg; on the status file descriptor and "
 "any errors encountered while parsing it."
@@ -5177,7 +5403,7 @@ msgstr ""
 "fichier."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1034
+#: apt.conf.5.xml:1072
 msgid ""
 "Generate a trace of the algorithm that decides the order in which "
 "<literal>apt</literal> should pass packages to &dpkg;."
@@ -5186,18 +5412,18 @@ msgstr ""
 "<literal>apt</literal> passe les paquets à &dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1046
+#: apt.conf.5.xml:1084
 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr "Affiche le détail des opérations liées à l'invocation de &dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1057
+#: apt.conf.5.xml:1095
 msgid "Output the priority of each package list on startup."
 msgstr "Affiche, au lancement, la priorité de chaque liste de paquets."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1067
+#: apt.conf.5.xml:1105
 msgid ""
 "Trace the execution of the dependency resolver (this applies only to what "
 "happens when a complex dependency problem is encountered)."
@@ -5206,7 +5432,7 @@ msgstr ""
 "concerne que les cas où un problème de dépendances complexe se présente)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1078
+#: apt.conf.5.xml:1116
 msgid ""
 "Display a list of all installed packages with their calculated score used by "
 "the pkgProblemResolver. The description of the package is the same as "
@@ -5217,7 +5443,7 @@ msgstr ""
 "est décrite dans <literal>Debug::pkgDepCache::Marker</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1090
+#: apt.conf.5.xml:1128
 msgid ""
 "Print information about the vendors read from <filename>/etc/apt/vendors."
 "list</filename>."
@@ -5226,13 +5452,13 @@ msgstr ""
 "list</filename>."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1112 apt_preferences.5.xml:545 sources.list.5.xml:211
+#: apt.conf.5.xml:1150 apt_preferences.5.xml:545 sources.list.5.xml:211
 #: apt-ftparchive.1.xml:596
 msgid "Examples"
 msgstr "Exemples"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1113
+#: apt.conf.5.xml:1151
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
@@ -5242,7 +5468,7 @@ msgstr ""
 
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1125
+#: apt.conf.5.xml:1163
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
 
@@ -5348,7 +5574,7 @@ msgid ""
 "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, unless that file matches a pattern in the "
-"<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this "
+"<literal>Dir::Ignore-Files-Silently</literal> configuration list - in which "
 "case it will be silently ignored."
 msgstr ""
 "Veuillez noter que les fichiers du répertoire <filename>/etc/apt/preferences."
@@ -6616,39 +6842,25 @@ msgid "Package resource list for APT"
 msgstr "Liste des sources de paquets"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:37
+#: sources.list.5.xml:38
 msgid ""
-"The package resource list is used to locate archives of the package "
-"distribution system in use on the system. At this time, this manual page "
-"documents only the packaging system used by the Debian system.  This control "
-"file is <filename>/etc/apt/sources.list</filename>."
+"The source list <filename>/etc/apt/sources.list</filename> is designed to "
+"support any number of active sources and a variety of source media. The file "
+"lists one source per line, with the most preferred source listed first. The "
+"information available from the configured sources is acquired by "
+"<command>apt-get update</command> (or by an equivalent command from another "
+"APT front-end)."
 msgstr ""
-"La liste des sources de paquets indique où trouver les archives du système "
-"de distribution de paquets utilisé. Pour l'instant, cette page de manuel ne "
-"documente que le système d'empaquetage utilisé par le système Debian GNU/"
-"Linux. Ce fichier de contrôle est <filename>/etc/apt/sources.list</filename>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:42
-msgid ""
-"The source list is designed to support any number of active sources and a "
-"variety of source media. The file lists one source per line, with the most "
-"preferred source listed first. The format of each line is: <literal>type uri "
-"args</literal> The first item, <literal>type</literal> determines the format "
-"for <literal>args</literal>. <literal>uri</literal> is a Universal Resource "
-"Identifier (URI), which is a superset of the more specific and well-known "
-"Universal Resource Locator, or URL. The rest of the line can be marked as a "
-"comment by using a #."
-msgstr ""
-"La liste des sources est conçue pour gérer un nombre quelconque de sources "
-"actives et différents média. Le fichier présente une source par ligne et la "
-"source préférée apparaît en premier. Le format de chaque ligne est : "
-"<literal>type uri paramètres</literal>. Le premier élément, <literal>type</"
-"literal>, détermine le format des <literal>paramètres</literal>.  "
-"<literal>uri</literal> est un identificateur universel de ressources (URI), "
-"qui est un sur-ensemble du plus spécifique et bien connu repère universel de "
-"ressources, ou URL. La fin de la ligne peut être un commentaire commençant "
-"par un caractère #."
+#: sources.list.5.xml:45
+msgid ""
+"Each line specifying a source starts with type (e.g. <literal>deb-src</"
+"literal>)  followed by options and arguments for this type.  Individual "
+"entries cannot be continued onto a following line. Empty lines are ignored, "
+"and a <literal>#</literal> character anywhere on a line marks the remainder "
+"of that line as a comment."
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: sources.list.5.xml:53
@@ -6665,7 +6877,7 @@ msgid ""
 "digits (0-9), underscore (_), hyphen (-) and period (.) characters.  "
 "Otherwise APT will print a notice that it has ignored a file, unless that "
 "file matches a pattern in the <literal>Dir::Ignore-Files-Silently</literal> "
-"configuration list - in this case it will be silently ignored."
+"configuration list - in which case it will be silently ignored."
 msgstr ""
 "Le répertoire <filename>/etc/apt/sources.list.d</filename> permet de "
 "spécifier des sources de paquets dans des fichiers distincts qui se "
@@ -6687,16 +6899,16 @@ msgstr "Les types deb et deb-src."
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:66
 msgid ""
-"The <literal>deb</literal> type describes a typical two-level Debian "
-"archive, <filename>distribution/component</filename>. Typically, "
-"<literal>distribution</literal> is generally an archivename like "
+"The <literal>deb</literal> type references a typical two-level Debian "
+"archive, <filename>distribution/component</filename>. The "
+"<literal>distribution</literal> is generally an archive name like "
 "<literal>stable</literal> or <literal>testing</literal> or a codename like "
 "<literal>&stable-codename;</literal> or <literal>&testing-codename;</"
-"literal> while component is one of <literal>main</literal> <literal>contrib</"
-"literal> or <literal>non-free</literal>. The <literal>deb-src</literal> type "
-"describes a debian distribution's source code in the same form as the "
-"<literal>deb</literal> type.  A <literal>deb-src</literal> line is required "
-"to fetch source indexes."
+"literal> while component is one of <literal>main</literal>, "
+"<literal>contrib</literal> or <literal>non-free</literal>. The <literal>deb-"
+"src</literal> type references a Debian distribution's source code in the "
+"same form as the <literal>deb</literal> type.  A <literal>deb-src</literal> "
+"line is required to fetch source indexes."
 msgstr ""
 "Le type <literal>deb</literal> décrit une archive Debian classique à deux "
 "niveaux, <filename>distribution/composant</filename>. <literal>distribution</"
@@ -6728,42 +6940,62 @@ msgstr "deb uri distribution [composant1] [composant2] [...]"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:83
+#, fuzzy
+#| msgid ""
+#| "The URI for the <literal>deb</literal> type must specify the base of the "
+#| "Debian distribution, from which APT will find the information it needs.  "
+#| "<literal>distribution</literal> can specify an exact path, in which case "
+#| "the components must be omitted and <literal>distribution</literal> must "
+#| "end with a slash (<literal>/</literal>). This is useful for the case when "
+#| "only a particular sub-section of the archive denoted by the URI is of "
+#| "interest. If <literal>distribution</literal> does not specify an exact "
+#| "path, at least one <literal>component</literal> must be present."
 msgid ""
 "The URI for the <literal>deb</literal> type must specify the base of the "
 "Debian distribution, from which APT will find the information it needs.  "
 "<literal>distribution</literal> can specify an exact path, in which case the "
 "components must be omitted and <literal>distribution</literal> must end with "
-"a slash (/). This is useful for when the case only a particular sub-section "
-"of the archive denoted by the URI is of interest.  If <literal>distribution</"
-"literal> does not specify an exact path, at least one <literal>component</"
-"literal> must be present."
+"a slash (<literal>/</literal>). This is useful for the case when only a "
+"particular sub-section of the archive denoted by the URI is of interest.  If "
+"<literal>distribution</literal> does not specify an exact path, at least one "
+"<literal>component</literal> must be present."
 msgstr ""
 "L'URI de type <literal>deb</literal> doit indiquer la base de la "
 "distribution Debian dans laquelle APT trouvera les informations dont il a "
 "besoin.  <literal>distribution</literal> peut spécifier le chemin exact : "
 "dans ce cas, on doit omettre les composants et <literal>distribution</"
-"literal> doit se terminer par une barre oblique (/). C'est utile quand seule "
-"une sous-section particulière de l'archive décrite par cet URI est "
-"intéressante. Quand <literal>distribution</literal> n'indique pas un chemin "
-"exact, un <literal>composant</literal> au moins doit être présent."
+"literal> doit se terminer par une barre oblique (<literal>/</literal>). "
+"C'est utile quand seule une sous-section particulière de l'archive décrite "
+"par cet URI est intéressante. Quand <literal>distribution</literal> "
+"n'indique pas un chemin exact, un <literal>composant</literal> au moins doit "
+"être présent."
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:92
+#, fuzzy
+#| msgid ""
+#| "<literal>distribution</literal> may also contain a variable, <literal>"
+#| "$(ARCH)</literal> which expands to the Debian architecture (i386, amd64, "
+#| "powerpc, ...)  used on the system. This permits architecture-independent "
+#| "<filename>sources.list</filename> files to be used. In general this is "
+#| "only of interest when specifying an exact path, <literal>APT</literal> "
+#| "will automatically generate a URI with the current architecture otherwise."
 msgid ""
 "<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)"
-"</literal> which expands to the Debian architecture (i386, m68k, "
-"powerpc, ...)  used on the system. This permits architecture-independent "
-"<filename>sources.list</filename> files to be used. In general this is only "
-"of interest when specifying an exact path, <literal>APT</literal> will "
-"automatically generate a URI with the current architecture otherwise."
+"</literal> which expands to the Debian architecture (such as <literal>amd64</"
+"literal> or <literal>armel</literal>) used on the system. This permits "
+"architecture-independent <filename>sources.list</filename> files to be used. "
+"In general this is only of interest when specifying an exact path, "
+"<literal>APT</literal> will automatically generate a URI with the current "
+"architecture otherwise."
 msgstr ""
 "<literal>distribution</literal> peut aussi contenir une variable <literal>"
-"$(ARCH)</literal>, qui sera remplacée par l'architecture Debian (i386, m68k, "
-"powerpc, ...)  sur laquelle s'exécute le système. On peut ainsi utiliser un "
-"fichier <filename>sources.list</filename> qui ne dépend pas d'une "
-"architecture. En général, ce n'est intéressant que si l'on indique un chemin "
-"exact ; sinon <literal>APT</literal> crée automatiquement un URI en fonction "
-"de l'architecture effective."
+"$(ARCH)</literal>, qui sera remplacée par l'architecture Debian (i386, "
+"amd64, powerpc, ...)  sur laquelle s'exécute le système. On peut ainsi "
+"utiliser un fichier <filename>sources.list</filename> qui ne dépend pas "
+"d'une architecture. En général, ce n'est intéressant que si l'on indique un "
+"chemin exact ; sinon <literal>APT</literal> crée automatiquement un URI en "
+"fonction de l'architecture effective."
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:100
@@ -6794,12 +7026,12 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:112
 msgid ""
-"<literal>options</literal> is always optional and needs to be surounded by "
+"<literal>options</literal> is always optional and needs to be surrounded 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:"
+"following settings are supported by APT (note however that unsupported "
+"settings will be ignored silently):"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
@@ -6807,7 +7039,7 @@ msgstr ""
 msgid ""
 "<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 "
+"information should be downloaded. If this option is not set all "
 "architectures defined by the <literal>APT::Architectures</literal> option "
 "will be downloaded."
 msgstr ""
@@ -6905,13 +7137,23 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml:172
+#, fuzzy
+#| msgid ""
+#| "The ftp scheme specifies an FTP server for the archive. APT's FTP "
+#| "behavior is highly configurable; for more information see the &apt-conf; "
+#| "manual page. Please note that a ftp proxy can be specified by using the "
+#| "<envar>ftp_proxy</envar> environment variable. It is possible to specify "
+#| "a http proxy (http proxy servers often understand ftp urls)  using this "
+#| "method and ONLY this method. ftp proxies using http specified in the "
+#| "configuration file will be ignored."
 msgid ""
 "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
 "is highly configurable; for more information see the &apt-conf; manual page. "
-"Please note that a ftp proxy can be specified by using the <envar>ftp_proxy</"
-"envar> environment variable. It is possible to specify a http proxy (http "
-"proxy servers often understand ftp urls)  using this method and ONLY this "
-"method. ftp proxies using http specified in the configuration file will be "
+"Please note that an FTP proxy can be specified by using the "
+"<envar>ftp_proxy</envar> environment variable. It is possible to specify an "
+"HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
+"environment variable and <emphasis>ONLY</emphasis> this environment "
+"variable. Proxies using HTTP specified in the configuration file will be "
 "ignored."
 msgstr ""
 "Le procédé <literal>ftp</literal> indique un serveur FTP comme archive. Le "
@@ -6924,11 +7166,18 @@ msgstr ""
 "et qui sont spécifiés dans le fichier de configuration seront ignorés."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:183
+#: sources.list.5.xml:184
+#, fuzzy
+#| msgid ""
+#| "The copy scheme is identical to the file scheme except that packages are "
+#| "copied into the cache directory instead of used directly at their "
+#| "location.  This is useful for people using a zip disk to copy files "
+#| "around with APT."
 msgid ""
 "The copy scheme is identical to the file scheme except that packages are "
 "copied into the cache directory instead of used directly at their location.  "
-"This is useful for people using a zip disk to copy files around with APT."
+"This is useful for people using removable media to copy files around with "
+"APT."
 msgstr ""
 "Le procédé <literal>copy</literal> est identique au procédé <literal>file</"
 "literal> excepté que les paquets sont copiés dans le cache du répertoire au "
@@ -6936,13 +7185,19 @@ msgstr ""
 "gens qui utilisent un disque zip pour recopier des fichiers avec APT."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:190
+#: sources.list.5.xml:191
+#, fuzzy
+#| msgid ""
+#| "The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given "
+#| "user and access the files. It is a good idea to do prior arrangements "
+#| "with RSA keys or rhosts.  Access to files on the remote uses standard "
+#| "<command>find</command> and <command>dd</command> commands to perform the "
+#| "file transfers from the remote."
 msgid ""
-"The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given "
-"user and access the files. It is a good idea to do prior arrangements with "
-"RSA keys or rhosts.  Access to files on the remote uses standard "
-"<command>find</command> and <command>dd</command> commands to perform the "
-"file transfers from the remote."
+"The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
+"the files as a given user. Prior configuration of rhosts or RSA keys is "
+"recommended. The standard <command>find</command> and <command>dd</command> "
+"commands are used to perform the file transfers from the remote host."
 msgstr ""
 "Le procédé rsh/ssh utilise rsh/ssh pour se connecter à une machine distante "
 "en tant qu'un certain utilisateur et pour accéder aux fichiers. Il est "
@@ -6959,13 +7214,22 @@ msgstr "plus de types d'URI simples à reconnaître"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml:200
-msgid ""
-"APT can be extended with more methods shipped in other optional packages "
-"which should follow the nameing scheme <package>apt-transport-"
-"<replaceable>method</replaceable></package>.  The APT team e.g. maintains "
-"also the <package>apt-transport-https</package> package which provides "
-"access methods for https-URIs with features similar to the http method, but "
-"other methods for using e.g. debtorrent are also available, see &apt-"
+#, fuzzy
+#| msgid ""
+#| "APT can be extended with more methods shipped in other optional packages "
+#| "which should follow the nameing scheme <package>apt-transport-"
+#| "<replaceable>method</replaceable></package>.  The APT team e.g. maintains "
+#| "also the <package>apt-transport-https</package> package which provides "
+#| "access methods for https-URIs with features similar to the http method, "
+#| "but other methods for using e.g. debtorrent are also available, see &apt-"
+#| "transport-debtorrent;."
+msgid ""
+"APT can be extended with more methods shipped in other optional packages, "
+"which should follow the naming scheme <package>apt-transport-"
+"<replaceable>method</replaceable></package>.  For instance, the APT team "
+"also maintains the package <package>apt-transport-https</package>, which "
+"provides access methods for HTTPS URIs with features similar to the http "
+"method.  Methods for using e.g. debtorrent are also available - see &apt-"
 "transport-debtorrent;."
 msgstr ""
 "APT peut être complété avec des méthodes supplémentaires fournies par des "
@@ -7202,7 +7466,10 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-sortpkgs.1.xml:45
-msgid "All output is sent to stdout, the input must be a seekable file."
+#, fuzzy
+#| msgid "All output is sent to stdout, the input must be a seekable file."
+msgid ""
+"All output is sent to standard output; the input must be a seekable file."
 msgstr ""
 "Le résultat est envoyé sur la sortie standard ; l'entrée doit être un "
 "fichier analysable."
@@ -9904,6 +10171,130 @@ msgid "Which will use the already fetched archives on the disc."
 msgstr "Cette commande utilisera les fichiers récupérés sur le disque."
 
 #~ msgid ""
+#~ "As the configuration can be deferred to be done at the end by &dpkg; it "
+#~ "can be tried to order the unpack series only by critical needs, e.g. by "
+#~ "Pre-Depends. Default is true and therefore the \"old\" method of ordering "
+#~ "in various steps by everything. While both method were present in earlier "
+#~ "APT versions the <literal>OrderCritical</literal> method was unused, so "
+#~ "this method is very experimental and needs further improvements before "
+#~ "becoming really useful."
+#~ msgstr ""
+#~ "Cette option permet de ne trier les opérations de décompactage qu'en "
+#~ "fonction de leur criticité (c'est à dire en ne considérant que les pré-"
+#~ "dépendances) dans le cas où la configuration des paquets est différée "
+#~ "pour n'être effectuée qu'à la fin par &dpkg;. Cette option est active par "
+#~ "défaut, ce qui revient à la méthode traditionnelle où les opérations ont "
+#~ "lieu en plusieurs étapes, selon l'ensemble des critères de tri. Bien que "
+#~ "les deux méthodes existent même dans les versions, la méthode "
+#~ "« <literal>OrderCritical</literal> » n'était pas utilisée. Elle doit donc "
+#~ "être considérée comme très expérimentale et a besoin de nombreuses "
+#~ "améliorations avant de devenir réellement utile. (Note du traducteur : la "
+#~ "version originale de cette partie des pages de manuel est très confuse. "
+#~ "Il est donc conseillé de s'y reporter en cas de doute car le contresens "
+#~ "de traduction n'est pas exclu...)."
+
+#~ msgid "Dump the default configuration to standard error on startup."
+#~ msgstr ""
+#~ "Affiche, au lancement, l'ensemble de la configuration sur la sortie "
+#~ "d'erreur standard."
+
+#~ msgid ""
+#~ "Defaults to on which will cause APT to install essential and important "
+#~ "packages as fast as possible in the install/upgrade operation. This is "
+#~ "done to limit the effect of a failing &dpkg; call: If this option is "
+#~ "disabled APT does treat an important package in the same way as an extra "
+#~ "package: Between the unpacking of the important package A and his "
+#~ "configuration can then be many other unpack or configuration calls, e.g. "
+#~ "for package B which has no relation to A, but causes the dpkg call to "
+#~ "fail (e.g. because maintainer script of package B generates an error) "
+#~ "which results in a system state in which package A is unpacked but "
+#~ "unconfigured - each package depending on A is now no longer guaranteed to "
+#~ "work as their dependency on A is not longer satisfied. The immediate "
+#~ "configuration marker is also applied to all dependencies which can "
+#~ "generate a problem if the dependencies e.g. form a circle as a dependency "
+#~ "with the immediate flag is comparable with a Pre-Dependency. So in theory "
+#~ "it is possible that APT encounters a situation in which it is unable to "
+#~ "perform immediate configuration, errors out and refers to this option so "
+#~ "the user can deactivate the immediate configuration temporarily to be "
+#~ "able to perform an install/upgrade again. Note the use of the word "
+#~ "\"theory\" here as this problem was only encountered by now in real world "
+#~ "a few times in non-stable distribution versions and was caused by wrong "
+#~ "dependencies of the package in question or by a system in an already "
+#~ "broken state, so you should not blindly disable this option as the "
+#~ "mentioned scenario above is not the only problem immediate configuration "
+#~ "can help to prevent in the first place.  Before a big operation like "
+#~ "<literal>dist-upgrade</literal> is run with this option disabled it "
+#~ "should be tried to explicitly <literal>install</literal> the package APT "
+#~ "is unable to configure immediately, but please make sure to report your "
+#~ "problem also to your distribution and to the APT team with the buglink "
+#~ "below so they can work on improving or correcting the upgrade process."
+#~ msgstr ""
+#~ "La valeur par défaut de ce réglage est « on » ce qui conduira APT à "
+#~ "installer les paquets essentiels et importants dès que possible pendant "
+#~ "les opérations d'installation ou de mise à jour. Cela permet de limiter "
+#~ "les conséquences de l'échec d'un appel à &dpkg; : si cette option est "
+#~ "désactivée, APT gérera un paquet important de la même manière qu'un "
+#~ "paquet « extra » ; entre le dépaquetage du paquet important A et sa "
+#~ "configuration pourront prendre place de nombreux autres opérations de "
+#~ "dépaquetage ou de configuration. Ainsi, si le paquet B, qui n'a pas de "
+#~ "rapport avec A, provoque une erreur de &dpkg; (p. ex. en cas d'erreur "
+#~ "dans les scripts du responsable), le paquet A sera alors dans l'état "
+#~ "installé mais non configuré et chaque paquet qui en dépend ne "
+#~ "fonctionnera plus nécessairement puisque sa dépendance n'est pas "
+#~ "satisfaite. Le marqueur de configuration immédiate sera aussi utilisé "
+#~ "pour toute dépendance qui peut créer un problème, par exemple les "
+#~ "dépendances circulaires. En effet, utiliser le marqueur de configuration "
+#~ "immédiate revient à gérer une pré-dépendance. Il est donc possible, en "
+#~ "théorie, qu'APT rencontre une situation où il lui est impossible "
+#~ "d'effectuer la configuration immédiate, qu'il se termine alors avec une "
+#~ "erreur en faisant référence à cette option afin que l'utilisateur puisse "
+#~ "la désactiver temporairement pour retenter l'opération d'installation ou "
+#~ "de mise à jour. Il est à noter que « en théorie » indique ici que cette "
+#~ "situation n'a été rencontrée que dans de rares cas, sur des versions "
+#~ "instables de distributions, la cause étant des dépendances incorrectes ou "
+#~ "un système déjà dans un état instable. Il est donc déconseillé de "
+#~ "désactiver cette option sans réfléchir car la situation décrite "
+#~ "précédemment n'est qu'un des cas où la configuration immédiate permet de "
+#~ "résoudre des situations complexes. Avant de tenter une opération telle "
+#~ "que <literal>dist-upgrade</literal> avec cette option désactivée, il est "
+#~ "largement préférable d'essayer une opération <literal>install</literal> "
+#~ "sur le paquet qu'APT ne peut configurer immédiatement. Il est également "
+#~ "conseillé de signaler ce type de problème dans le système de suivi de "
+#~ "bogues de la distribution utilisée afin qu'il soit étudié et corrigé."
+
+#~ msgid ""
+#~ "The package resource list is used to locate archives of the package "
+#~ "distribution system in use on the system. At this time, this manual page "
+#~ "documents only the packaging system used by the Debian system.  This "
+#~ "control file is <filename>/etc/apt/sources.list</filename>."
+#~ msgstr ""
+#~ "La liste des sources de paquets indique où trouver les archives du "
+#~ "système de distribution de paquets utilisé. Pour l'instant, cette page de "
+#~ "manuel ne documente que le système d'empaquetage utilisé par le système "
+#~ "Debian GNU/Linux. Ce fichier de contrôle est <filename>/etc/apt/sources."
+#~ "list</filename>."
+
+#~ msgid ""
+#~ "The source list is designed to support any number of active sources and a "
+#~ "variety of source media. The file lists one source per line, with the "
+#~ "most preferred source listed first. The format of each line is: "
+#~ "<literal>type uri args</literal> The first item, <literal>type</literal> "
+#~ "determines the format for <literal>args</literal>. <literal>uri</literal> "
+#~ "is a Universal Resource Identifier (URI), which is a superset of the more "
+#~ "specific and well-known Universal Resource Locator, or URL. The rest of "
+#~ "the line can be marked as a comment by using a #."
+#~ msgstr ""
+#~ "La liste des sources est conçue pour gérer un nombre quelconque de "
+#~ "sources actives et différents média. Le fichier présente une source par "
+#~ "ligne et la source préférée apparaît en premier. Le format de chaque "
+#~ "ligne est : <literal>type uri paramètres</literal>. Le premier élément, "
+#~ "<literal>type</literal>, détermine le format des <literal>paramètres</"
+#~ "literal>.  <literal>uri</literal> est un identificateur universel de "
+#~ "ressources (URI), qui est un sur-ensemble du plus spécifique et bien "
+#~ "connu repère universel de ressources, ou URL. La fin de la ligne peut "
+#~ "être un commentaire commençant par un caractère #."
+
+#~ msgid ""
 #~ "<literal>gencaches</literal> performs the same operation as <command>apt-"
 #~ "get check</command>. It builds the source and package caches from the "
 #~ "sources in &sources-list; and from <filename>/var/lib/dpkg/status</"
diff --git a/doc/po/it.po b/doc/po/it.po
index cad478a8e..a5096e849 100644
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-07 00:01+0300\n"
+"POT-Creation-Date: 2012-06-09 19:12+0300\n"
 "PO-Revision-Date: 2003-04-26 23:26+0100\n"
 "Last-Translator: Traduzione di Eugenia Franzoni <eugenia@linuxcare.com>\n"
 "Language-Team: <debian-l10n-italian@lists.debian.org>\n"
@@ -1066,14 +1066,14 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml:518 apt-cache.8.xml:343 apt-key.8.xml:174 apt-mark.8.xml:125
-#: apt.conf.5.xml:1118 apt_preferences.5.xml:698
+#: apt.conf.5.xml:1156 apt_preferences.5.xml:698
 msgid "Files"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131
 #: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109
-#: apt.conf.5.xml:1124 apt_preferences.5.xml:705 sources.list.5.xml:252
+#: apt.conf.5.xml:1162 apt_preferences.5.xml:705 sources.list.5.xml:252
 #: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63
 #: apt-ftparchive.1.xml:607
 msgid "See Also"
@@ -2197,80 +2197,79 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:42
 msgid ""
-"<filename>apt.conf</filename> is the main configuration file for the APT "
-"suite of tools, but by far not the only place changes to options can be "
-"made. All tools therefore share the configuration files and also use a "
-"common command line parser to provide a uniform environment."
+"<filename>/etc/apt/apt.conf</filename> is the main configuration file shared "
+"by all the tools in the APT suite of tools, though it is by no means the "
+"only place options can be set. The suite also shares a common command line "
+"parser to provide a uniform environment."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><orderedlist><para>
-#: apt.conf.5.xml:47
+#: apt.conf.5.xml:48
 msgid ""
 "When an APT tool starts up it will read the configuration files in the "
 "following order:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:49
+#: apt.conf.5.xml:50
 msgid ""
 "the file specified by the <envar>APT_CONFIG</envar> environment variable (if "
 "any)"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:51
+#: apt.conf.5.xml:52
 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, unless that file matches a pattern in the <literal>Dir::"
-"Ignore-Files-Silently</literal> configuration list - in this case it will be "
-"silently ignored."
+"Ignore-Files-Silently</literal> configuration list - in which case it will "
+"be silently ignored."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:58
+#: apt.conf.5.xml:59
 msgid ""
 "the main configuration file specified by <literal>Dir::Etc::main</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:60
+#: apt.conf.5.xml:61
 msgid ""
 "the command line options are applied to override the configuration "
 "directives or to load even more configuration files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:64
+#: apt.conf.5.xml:65
 msgid "Syntax"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:65
+#: apt.conf.5.xml:66
 msgid ""
 "The configuration file is organized in a tree with options organized into "
 "functional groups. Option specification is given with a double colon "
-"notation, for instance <literal>APT::Get::Assume-Yes</literal> is an option "
+"notation; for instance <literal>APT::Get::Assume-Yes</literal> is an option "
 "within the APT tool group, for the Get tool. Options do not inherit from "
 "their parent groups."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:71
+#: apt.conf.5.xml:72
 msgid ""
 "Syntactically the configuration language is modeled after what the ISC tools "
 "such as bind and dhcp use. Lines starting with <literal>//</literal> are "
 "treated as comments (ignored), as well as all text between <literal>/*</"
 "literal> and <literal>*/</literal>, just like C/C++ comments.  Each line is "
-"of the form <literal>APT::Get::Assume-Yes \"true\";</literal>. The trailing "
-"semicolon and the quotes are required. The value must be on one line, and "
-"there is no kind of string concatenation. It must not include inside "
-"quotes.  The behavior of the backslash \"\\\" and escaped characters inside "
-"a value is undefined and it should not be used. An option name may include "
-"alphanumerical characters and the \"/-:._+\" characters. A new scope can be "
-"opened with curly braces, like:"
+"of the form <literal>APT::Get::Assume-Yes \"true\";</literal>.  The "
+"quotation marks and trailing semicolon are required.  The value must be on "
+"one line, and there is no kind of string concatenation.  Values must not "
+"include backslashes or extra quotation marks.  Option names are made up of "
+"alphanumeric characters and the characters \"/-:._+\".  A new scope can be "
+"opened with curly braces, like this:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
@@ -2290,7 +2289,7 @@ msgstr ""
 msgid ""
 "with newlines placed to make it more readable. Lists can be created by "
 "opening a scope and including a single string enclosed in quotes followed by "
-"a semicolon. Multiple entries can be included, each separated by a semicolon."
+"a semicolon. Multiple entries can be included, separated by a semicolon."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
@@ -2309,84 +2308,85 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:105
 msgid ""
-"The names of the configuration items are not case-sensitive. So in the "
-"previous example you could use <literal>dpkg::pre-install-pkgs</literal>."
+"Case is not significant in names of configuration items, so in the previous "
+"example you could use <literal>dpkg::pre-install-pkgs</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:108
 msgid ""
-"Names for the configuration items are optional if a list is defined as it "
-"can be see in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. "
-"If you don't specify a name a new entry will simply add a new option to the "
-"list. If you specify a name you can override the option as every other "
-"option by reassigning a new value to the option."
+"Names for the configuration items are optional if a list is defined as can "
+"be seen in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. If "
+"you don't specify a name a new entry will simply add a new option to the "
+"list. If you specify a name you can override the option in the same way as "
+"any other option by reassigning a new value to the option."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:113
 msgid ""
-"Two specials are allowed, <literal>#include</literal> (which is deprecated "
-"and not supported by alternative implementations) and <literal>#clear</"
-"literal>: <literal>#include</literal> will include the given file, unless "
-"the filename ends in a slash, then the whole directory is included.  "
-"<literal>#clear</literal> is used to erase a part of the configuration tree. "
-"The specified element and all its descendants are erased.  (Note that these "
-"lines also need to end with a semicolon.)"
+"Two special commands are defined: <literal>#include</literal> (which is "
+"deprecated and not supported by alternative implementations) and "
+"<literal>#clear</literal>. <literal>#include</literal> will include the "
+"given file, unless the filename ends in a slash, in which case the whole "
+"directory is included.  <literal>#clear</literal> is used to erase a part of "
+"the configuration tree. The specified element and all its descendants are "
+"erased.  (Note that these lines also need to end with a semicolon.)"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:121
+#: apt.conf.5.xml:123
 msgid ""
-"The #clear command is the only way to delete a list or a complete scope.  "
-"Reopening a scope or the ::-style described below will <emphasis>not</"
-"emphasis> override previously written entries. Only options can be "
-"overridden by addressing a new value to it - lists and scopes can't be "
-"overridden, only cleared."
+"The <literal>#clear</literal> command is the only way to delete a list or a "
+"complete scope. Reopening a scope (or using the syntax described below with "
+"an appended <literal>::</literal>) will <emphasis>not</emphasis> override "
+"previously written entries. Options can only be overridden by addressing a "
+"new value to them - lists and scopes can't be overridden, only cleared."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:126
+#: apt.conf.5.xml:131
 msgid ""
-"All of the APT tools take a -o option which allows an arbitrary "
+"All of the APT tools take an -o option which allows an arbitrary "
 "configuration directive to be specified on the command line. The syntax is a "
 "full option name (<literal>APT::Get::Assume-Yes</literal> for instance) "
 "followed by an equals sign then the new value of the option. To append a new "
-"element to a list, add a trailing :: to the name of the list. (As you might "
-"suspect: The scope syntax can't be used on the command line.)"
+"element to a list, add a trailing <literal>::</literal> to the name of the "
+"list.  (As you might suspect, the scope syntax can't be used on the command "
+"line.)"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:133
-msgid ""
-"Note that you can use :: only for appending one item per line to a list and "
-"that you should not use it in combination with the scope syntax.  (The scope "
-"syntax implicit insert ::) Using both syntaxes together will trigger a bug "
-"which some users unfortunately depend on: An option with the unusual name "
-"\"<literal>::</literal>\" which acts like every other option with a name. "
-"These introduces many problems including that a user who writes multiple "
-"lines in this <emphasis>wrong</emphasis> syntax in the hope to append to a "
-"list will gain the opposite as only the last assignment for this option "
-"\"<literal>::</literal>\" will be used. Upcoming APT versions will raise "
-"errors and will stop working if they encounter this misuse, so please "
-"correct such statements now as long as APT doesn't complain explicit about "
-"them."
+#: apt.conf.5.xml:139
+msgid ""
+"Note that appending items to a list using <literal>::</literal> only works "
+"for one item per line, and that you should not use it in combination with "
+"the scope syntax (which adds <literal>::</literal> implicitly). Using both "
+"syntaxes together will trigger a bug which some users unfortunately depend "
+"on: an option with the unusual name \"<literal>::</literal>\" which acts "
+"like every other option with a name. This introduces many problems; for one "
+"thing, users who write multiple lines in this <emphasis>wrong</emphasis> "
+"syntax in the hope of appending to a list will achieve the opposite, as only "
+"the last assignment for this option \"<literal>::</literal>\" will be used. "
+"Future versions of APT will raise errors and stop working if they encounter "
+"this misuse, so please correct such statements now while APT doesn't "
+"explicitly complain about them."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:145
+#: apt.conf.5.xml:154
 msgid "The APT Group"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:146
+#: apt.conf.5.xml:155
 msgid ""
 "This group of options controls general APT behavior as well as holding the "
 "options for all of the tools."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:151
+#: apt.conf.5.xml:160
 msgid ""
 "System Architecture; sets the architecture to use when fetching files and "
 "parsing package lists. The internal default is the architecture apt was "
@@ -2394,36 +2394,36 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:157
+#: apt.conf.5.xml:167
 msgid ""
-"All Architectures the system supports. Processors implementing the "
-"<literal>amd64</literal> (also called <literal>x86-64</literal>) instruction "
-"set are e.g. also able to execute binaries compiled for the <literal>i386</"
-"literal> (<literal>x86</literal>) instruction set; 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>."
+"All Architectures the system supports. For instance, CPUs implementing the "
+"<literal>amd64</literal> (also called <literal>x86-64</literal>)  "
+"instruction set are also able to execute binaries compiled for the "
+"<literal>i386</literal> (<literal>x86</literal>) instruction set. This list "
+"is used when fetching files and parsing package lists. The initial default "
+"is always the system's native architecture (<literal>APT::Architecture</"
+"literal>), and foreign architectures are added to the default list when they "
+"are registered via <command>dpkg --add-architecture</command>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:167
+#: apt.conf.5.xml:180
 msgid ""
-"Default release to install packages from if more than one version available. "
-"Contains release name, codename or release version. Examples: 'stable', "
-"'testing', 'unstable', '&stable-codename;', '&testing-codename;', '4.0', "
-"'5.0*'. See also &apt-preferences;."
+"Default release to install packages from if more than one version is "
+"available. Contains release name, codename or release version. Examples: "
+"'stable', 'testing', 'unstable', '&stable-codename;', '&testing-codename;', "
+"'4.0', '5.0*'. See also &apt-preferences;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:173
+#: apt.conf.5.xml:186
 msgid ""
-"Ignore Held packages; This global option causes the problem resolver to "
+"Ignore held packages; this global option causes the problem resolver to "
 "ignore held packages in its decision making."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:178
+#: apt.conf.5.xml:191
 msgid ""
 "Defaults to on. When turned on the autoclean feature will remove any "
 "packages which can no longer be downloaded from the cache. If turned off "
@@ -2432,161 +2432,178 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:185
+#: apt.conf.5.xml:199
+msgid ""
+"Defaults to on, which will cause APT to install essential and important "
+"packages as soon as possible in an install/upgrade operation, in order to "
+"limit the effect of a failing &dpkg; call. If this option is disabled, APT "
+"treats an important package in the same way as an extra package: between the "
+"unpacking of the package A and its configuration there can be many other "
+"unpack or configuration calls for other unrelated packages B, C etc. If "
+"these cause the &dpkg; call to fail (e.g. because package B's maintainer "
+"scripts generate an error), this results in a system state in which package "
+"A is unpacked but unconfigured - so any package depending on A is now no "
+"longer guaranteed to work, as its dependency on A is no longer satisfied."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:211
 msgid ""
-"Defaults to on which will cause APT to install essential and important "
-"packages as fast as possible in the install/upgrade operation. This is done "
-"to limit the effect of a failing &dpkg; call: If this option is disabled APT "
-"does treat an important package in the same way as an extra package: Between "
-"the unpacking of the important package A and his configuration can then be "
-"many other unpack or configuration calls, e.g. for package B which has no "
-"relation to A, but causes the dpkg call to fail (e.g. because maintainer "
-"script of package B generates an error) which results in a system state in "
-"which package A is unpacked but unconfigured - each package depending on A "
-"is now no longer guaranteed to work as their dependency on A is not longer "
-"satisfied. The immediate configuration marker is also applied to all "
-"dependencies which can generate a problem if the dependencies e.g. form a "
-"circle as a dependency with the immediate flag is comparable with a Pre-"
-"Dependency. So in theory it is possible that APT encounters a situation in "
-"which it is unable to perform immediate configuration, errors out and refers "
-"to this option so the user can deactivate the immediate configuration "
-"temporarily to be able to perform an install/upgrade again. Note the use of "
-"the word \"theory\" here as this problem was only encountered by now in real "
-"world a few times in non-stable distribution versions and was caused by "
-"wrong dependencies of the package in question or by a system in an already "
-"broken state, so you should not blindly disable this option as the mentioned "
-"scenario above is not the only problem immediate configuration can help to "
-"prevent in the first place.  Before a big operation like <literal>dist-"
-"upgrade</literal> is run with this option disabled it should be tried to "
-"explicitly <literal>install</literal> the package APT is unable to configure "
-"immediately, but please make sure to report your problem also to your "
-"distribution and to the APT team with the buglink below so they can work on "
-"improving or correcting the upgrade process."
+"The immediate configuration marker is also applied in the potentially "
+"problematic case of circular dependencies, since a dependency with the "
+"immediate flag is equivalent to a Pre-Dependency. In theory this allows APT "
+"to recognise a situation in which it is unable to perform immediate "
+"configuration, abort, and suggest to the user that the option should be "
+"temporarily deactivated in order to allow the operation to proceed.  Note "
+"the use of the word \"theory\" here; in the real world this problem has "
+"rarely been encountered, in non-stable distribution versions, and was caused "
+"by wrong dependencies of the package in question or by a system in an "
+"already broken state; so you should not blindly disable this option, as the "
+"scenario mentioned above is not the only problem it can help to prevent in "
+"the first place."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:208
+#: apt.conf.5.xml:224
 msgid ""
-"Never Enable this option unless you -really- know what you are doing. It "
-"permits APT to temporarily remove an essential package to break a Conflicts/"
-"Conflicts or Conflicts/Pre-Depend loop between two essential packages. SUCH "
-"A LOOP SHOULD NEVER EXIST AND IS A GRAVE BUG. This option will work if the "
-"essential packages are not tar, gzip, libc, dpkg, bash or anything that "
-"those packages depend on."
+"Before a big operation like <literal>dist-upgrade</literal> is run with this "
+"option disabled you should try to explicitly <literal>install</literal> the "
+"package APT is unable to configure immediately; but please make sure you "
+"also report your problem to your distribution and to the APT team with the "
+"buglink below, so they can work on improving or correcting the upgrade "
+"process."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:217
+#: apt.conf.5.xml:235
+msgid ""
+"Never enable this option unless you <emphasis>really</emphasis> know what "
+"you are doing. It permits APT to temporarily remove an essential package to "
+"break a Conflicts/Conflicts or Conflicts/Pre-Depends loop between two "
+"essential packages. <emphasis>Such a loop should never exist and is a grave "
+"bug</emphasis>. This option will work if the essential packages are not "
+"<command>tar</command>, <command>gzip</command>, <command>libc</command>, "
+"<command>dpkg</command>, <command>dash</command> or anything that those "
+"packages depend on."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:247
 msgid ""
 "APT uses since version 0.7.26 a resizable memory mapped cache file to store "
-"the 'available' information. <literal>Cache-Start</literal> acts as a hint "
-"to which size the Cache will grow and is therefore the amount of memory APT "
+"the available information. <literal>Cache-Start</literal> acts as a hint of "
+"the size the cache will grow to, and is therefore the amount of memory APT "
 "will request at startup. The default value is 20971520 bytes (~20 MB). Note "
-"that this amount of space needs to be available for APT otherwise it will "
+"that this amount of space needs to be available for APT; otherwise it will "
 "likely fail ungracefully, so for memory restricted devices this value should "
 "be lowered while on systems with a lot of configured sources it should be "
 "increased.  <literal>Cache-Grow</literal> defines in bytes with the default "
-"of 1048576 (~1 MB) how much the Cache size will be increased in the event "
-"the space defined by <literal>Cache-Start</literal> is not enough. These "
+"of 1048576 (~1 MB) how much the cache size will be increased in the event "
+"the space defined by <literal>Cache-Start</literal> is not enough. This "
 "value will be applied again and again until either the cache is big enough "
 "to store all information or the size of the cache reaches the <literal>Cache-"
 "Limit</literal>.  The default of <literal>Cache-Limit</literal> is 0 which "
 "stands for no limit.  If <literal>Cache-Grow</literal> is set to 0 the "
-"automatic grow of the cache is disabled."
+"automatic growth of the cache is disabled."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:233
-msgid "Defines which package(s) are considered essential build dependencies."
+#: apt.conf.5.xml:263
+msgid "Defines which packages are considered essential build dependencies."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:237
+#: apt.conf.5.xml:267
 msgid ""
-"The Get subsection controls the &apt-get; tool, please see its documentation "
+"The Get subsection controls the &apt-get; tool; please see its documentation "
 "for more information about the options here."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:242
+#: apt.conf.5.xml:272
 msgid ""
-"The Cache subsection controls the &apt-cache; tool, please see its "
+"The Cache subsection controls the &apt-cache; tool; please see its "
 "documentation for more information about the options here."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:247
+#: apt.conf.5.xml:277
 msgid ""
-"The CDROM subsection controls the &apt-cdrom; tool, please see its "
+"The CDROM subsection controls the &apt-cdrom; tool; please see its "
 "documentation for more information about the options here."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:253
+#: apt.conf.5.xml:283
 msgid "The Acquire Group"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:254
+#: apt.conf.5.xml:284
 msgid ""
 "The <literal>Acquire</literal> group of options controls the download of "
-"packages and the URI handlers."
+"packages as well as the various \"acquire methods\" responsible for the "
+"download itself (see also &sources-list;)."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:259
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:291
 msgid ""
-"Security related option defaulting to true as an expiring validation for a "
-"Release file prevents longtime replay attacks and can e.g. also help users "
-"to identify no longer updated mirrors - but the feature depends on the "
-"correctness of the time on the user system.  Archive maintainers are "
-"encouraged to create Release files with the <literal>Valid-Until</literal> "
-"header, but if they don't or a stricter value is volitional the following "
-"<literal>Max-ValidTime</literal> option can be used."
+"Security related option defaulting to true, as giving a Release file's "
+"validation an expiration date prevents replay attacks over a long timescale, "
+"and can also for example help users to identify mirrors that are no longer "
+"updated - but the feature depends on the correctness of the clock on the "
+"user system. Archive maintainers are encouraged to create Release files with "
+"the <literal>Valid-Until</literal> header, but if they don't or a stricter "
+"value is desired the <literal>Max-ValidTime</literal> option below can be "
+"used."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:270
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:304
 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 valid\".  Archive specific settings can "
-"be made by appending the label of the archive to the option name."
+"Maximum time (in seconds) after its creation (as indicated by the "
+"<literal>Date</literal> header) that the <filename>Release</filename> file "
+"should be considered valid.  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 \"valid forever\".  Archive specific settings can be made by appending "
+"the label of the archive to the option name."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:281
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:316
 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."
+"Minimum time (in seconds) after its creation (as indicated by the "
+"<literal>Date</literal> header) that the <filename>Release</filename> file "
+"should be considered valid.  Use this if you need to use a seldom updated "
+"(local) mirror of a more frequently 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 ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:292
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:328
 msgid ""
-"Try to download deltas called <literal>PDiffs</literal> for Packages or "
-"Sources files instead of downloading whole ones. True by default."
+"Try to download deltas called <literal>PDiffs</literal> for indexes (like "
+"<filename>Packages</filename> files) instead of downloading whole ones. True "
+"by default."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:295
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:331
 msgid ""
-"Two sub-options to limit the use of PDiffs are also available: With "
-"<literal>FileLimit</literal> can be specified how many PDiff files are "
-"downloaded at most to update a file. <literal>SizeLimit</literal> on the "
-"other hand is the maximum percentage of the size of all patches compared to "
-"the size of the targeted file. If one of these limits is exceeded the "
-"complete file is downloaded instead of the patches."
+"Two sub-options to limit the use of PDiffs are also available: "
+"<literal>FileLimit</literal> can be used to specify a maximum number of "
+"PDiff files should be downloaded to update a file. <literal>SizeLimit</"
+"literal> on the other hand is the maximum percentage of the size of all "
+"patches compared to the size of the targeted file. If one of these limits is "
+"exceeded the complete file is downloaded instead of the patches."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:305
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:341
 msgid ""
 "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
 "literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -2595,161 +2612,161 @@ msgid ""
 "connection per URI type will be opened."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:313
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:349
 msgid ""
 "Number of retries to perform. If this is non-zero APT will retry failed "
 "files the given number of times."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:318
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:354
 msgid ""
 "Use symlinks for source archives. If set to true then source archives will "
 "be symlinked when possible instead of copying. True is the default."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:323
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:359
 msgid ""
-"HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
-"standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per "
-"host proxies can also be specified by using the form <literal>http::Proxy::"
-"&lt;host&gt;</literal> with the special keyword <literal>DIRECT</literal> "
-"meaning to use no proxies. If no one of the above settings is specified, "
-"<envar>http_proxy</envar> environment variable will be used."
+"<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. "
+"It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</"
+"literal>.  Per host proxies can also be specified by using the form "
+"<literal>http::Proxy::&lt;host&gt;</literal> with the special keyword "
+"<literal>DIRECT</literal> meaning to use no proxies. If no one of the above "
+"settings is specified, <envar>http_proxy</envar> environment variable will "
+"be used."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:331
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:367
 msgid ""
 "Three settings are provided for cache control with HTTP/1.1 compliant proxy "
-"caches. <literal>No-Cache</literal> tells the proxy to not use its cached "
-"response under any circumstances, <literal>Max-Age</literal> is sent only "
-"for index files and tells the cache to refresh its object if it is older "
-"than the given number of seconds. Debian updates its index files daily so "
-"the default is 1 day. <literal>No-Store</literal> specifies that the cache "
-"should never store this request, it is only set for archive files. This may "
-"be useful to prevent polluting a proxy cache with very large .deb files. "
-"Note: Squid 2.0.2 does not support any of these options."
+"caches.  <literal>No-Cache</literal> tells the proxy not to use its cached "
+"response under any circumstances.  <literal>Max-Age</literal> sets the "
+"allowed maximum age (in seconds) of an index file in the cache of the "
+"proxy.  <literal>No-Store</literal> specifies that the proxy should not "
+"store the requested archive files in its cache, which can be used to prevent "
+"the proxy from polluting its cache with (big) .deb files."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:341 apt.conf.5.xml:407
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:377 apt.conf.5.xml:449
 msgid ""
 "The option <literal>timeout</literal> sets the timeout timer used by the "
-"method, this applies to all things including connection timeout and data "
-"timeout."
+"method; this value applies to the connection as well as the data timeout."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:344
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:380
 msgid ""
 "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
-"enabled HTTP pipeling (RFC 2616 section 8.1.2.2) which can be beneficial e."
-"g. on high-latency connections. It specifies how many requests are send in a "
+"enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
+"g. on high-latency connections. It specifies how many requests are sent in a "
 "pipeline.  Previous APT versions had a default of 10 for this setting, but "
 "the default value is now 0 (= disabled) to avoid problems with the ever-"
 "growing amount of webservers and proxies which choose to not conform to the "
 "HTTP/1.1 specification."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:351
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:387
 msgid ""
-"<literal>Acquire::http::AllowRedirect</literal> controls if APT will follow "
-"redirects, which is enabled by default."
+"<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
+"follow redirects, which is enabled by default."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:354
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:390
 msgid ""
 "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
-"literal> which accepts integer values in kilobyte. The default value is 0 "
-"which deactivates the limit and tries uses as much as possible of the "
-"bandwidth (Note that this option implicit deactivates the download from "
-"multiple servers at the same time.)"
+"literal> which accepts integer values in kilobytes. The default value is 0 "
+"which deactivates the limit and tries to use all available bandwidth (note "
+"that this option implicitly disables downloading from multiple servers at "
+"the same time.)"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:359
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:395
 msgid ""
 "<literal>Acquire::http::User-Agent</literal> can be used to set a different "
 "User-Agent for the http download method as some proxies allow access for "
 "clients only if the client uses a known identifier."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:366
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:403
 msgid ""
-"HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
-"options are the same as for <literal>http</literal> method and will also "
-"default to the options from the <literal>http</literal> method if they are "
-"not explicitly set for https. <literal>Pipeline-Depth</literal> option is "
-"not supported yet."
+"The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
+"<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
+"<literal>proxy</literal> options work for HTTPS URIs in the same way as for "
+"the <literal>http</literal> method, and default to the same values if they "
+"are not explicitly set. The <literal>Pipeline-Depth</literal> option is not "
+"yet supported."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:372
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:411
 msgid ""
 "<literal>CaInfo</literal> suboption specifies place of file that holds info "
-"about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is "
+"about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is the "
 "corresponding per-host option.  <literal>Verify-Peer</literal> boolean "
-"suboption determines whether verify server's host certificate against "
-"trusted certificates or not.  <literal>&lt;host&gt;::Verify-Peer</literal> "
-"is corresponding per-host option.  <literal>Verify-Host</literal> boolean "
-"suboption determines whether verify server's hostname or not.  <literal>&lt;"
-"host&gt;::Verify-Host</literal> is corresponding per-host option.  "
-"<literal>SslCert</literal> determines what certificate to use for client "
-"authentication. <literal>&lt;host&gt;::SslCert</literal> is corresponding "
-"per-host option.  <literal>SslKey</literal> determines what private key to "
-"use for client authentication. <literal>&lt;host&gt;::SslKey</literal> is "
-"corresponding per-host option.  <literal>SslForceVersion</literal> overrides "
-"default SSL version to use.  Can contain 'TLSv1' or 'SSLv3' string.  "
-"<literal>&lt;host&gt;::SslForceVersion</literal> is corresponding per-host "
-"option."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:391
-msgid ""
-"FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard "
-"form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host "
-"proxies can also be specified by using the form <literal>ftp::Proxy::&lt;"
-"host&gt;</literal> with the special keyword <literal>DIRECT</literal> "
-"meaning to use no proxies. If no one of the above settings is specified, "
-"<envar>ftp_proxy</envar> environment variable will be used. To use a ftp "
-"proxy you will have to set the <literal>ftp::ProxyLogin</literal> script in "
-"the configuration file. This entry specifies the commands to send to tell "
-"the proxy server what to connect to. Please see &configureindex; for an "
-"example of how to do this. The substitution variables available are <literal>"
-"$(PROXY_USER)</literal> <literal>$(PROXY_PASS)</literal> <literal>"
-"$(SITE_USER)</literal> <literal>$(SITE_PASS)</literal> <literal>$(SITE)</"
-"literal> and <literal>$(SITE_PORT)</literal> Each is taken from it's "
-"respective URI component."
+"suboption determines whether or not the server's host certificate should be "
+"verified against trusted certificates.  <literal>&lt;host&gt;::Verify-Peer</"
+"literal> is the corresponding per-host option.  <literal>Verify-Host</"
+"literal> boolean suboption determines whether or not the server's hostname "
+"should be verified.  <literal>&lt;host&gt;::Verify-Host</literal> is the "
+"corresponding per-host option.  <literal>SslCert</literal> determines what "
+"certificate to use for client authentication. <literal>&lt;host&gt;::"
+"SslCert</literal> is the corresponding per-host option.  <literal>SslKey</"
+"literal> determines what private key to use for client authentication. "
+"<literal>&lt;host&gt;::SslKey</literal> is the corresponding per-host "
+"option.  <literal>SslForceVersion</literal> overrides default SSL version to "
+"use.  It can contain either of the strings '<literal>TLSv1</literal>' or "
+"'<literal>SSLv3</literal>'.  <literal>&lt;host&gt;::SslForceVersion</"
+"literal> is the corresponding per-host option."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:432
+msgid ""
+"<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs.  "
+"It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</"
+"literal>.  Per host proxies can also be specified by using the form "
+"<literal>ftp::Proxy::&lt;host&gt;</literal> with the special keyword "
+"<literal>DIRECT</literal> meaning to use no proxies. If no one of the above "
+"settings is specified, <envar>ftp_proxy</envar> environment variable will be "
+"used. To use an FTP proxy you will have to set the <literal>ftp::ProxyLogin</"
+"literal> script in the configuration file. This entry specifies the commands "
+"to send to tell the proxy server what to connect to. Please see "
+"&configureindex; for an example of how to do this. The substitution "
+"variables representing the corresponding URI component are <literal>"
+"$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, <literal>"
+"$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, <literal>$(SITE)</"
+"literal> and <literal>$(SITE_PORT)</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:410
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:452
 msgid ""
 "Several settings are provided to control passive mode. Generally it is safe "
-"to leave passive mode on, it works in nearly every environment.  However "
-"some situations require that passive mode be disabled and port mode ftp used "
-"instead. This can be done globally, for connections that go through a proxy "
-"or for a specific host (See the sample config file for examples)."
+"to leave passive mode on; it works in nearly every environment.  However, "
+"some situations require that passive mode be disabled and port mode FTP used "
+"instead. This can be done globally or for connections that go through a "
+"proxy or for a specific host (see the sample config file for examples)."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:417
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:459
 msgid ""
 "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
-"envar> environment variable to a http url - see the discussion of the http "
+"envar> environment variable to an HTTP URL - see the discussion of the http "
 "method above for syntax. You cannot set this in the configuration file and "
 "it is not recommended to use FTP over HTTP due to its low efficiency."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:422
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:464
 msgid ""
 "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
 "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -2758,111 +2775,111 @@ msgid ""
 "that most FTP servers do not support RFC2428."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:435
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
+#: apt.conf.5.xml:478
 #, no-wrap
 msgid "/cdrom/::Mount \"foo\";"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:430
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:473
 msgid ""
-"CD-ROM URIs; the only setting for CD-ROM URIs is the mount point, "
-"<literal>cdrom::Mount</literal> which must be the mount point for the CD-ROM "
-"drive as specified in <filename>/etc/fstab</filename>. It is possible to "
-"provide alternate mount and unmount commands if your mount point cannot be "
-"listed in the fstab (such as an SMB mount and old mount packages). The "
+"For URIs using the <literal>cdrom</literal> method, the only configurable "
+"option is the mount point, <literal>cdrom::Mount</literal>, which must be "
+"the mount point for the CD-ROM (or DVD, or whatever) drive as specified in "
+"<filename>/etc/fstab</filename>. It is possible to provide alternate mount "
+"and unmount commands if your mount point cannot be listed in the fstab.  The "
 "syntax is to put <placeholder type=\"literallayout\" id=\"0\"/> within the "
-"cdrom block. It is important to have the trailing slash. Unmount commands "
-"can be specified using UMount."
+"<literal>cdrom</literal> block. It is important to have the trailing slash.  "
+"Unmount commands can be specified using UMount."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:441
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:486
 msgid ""
-"GPGV URIs; the only option for GPGV URIs is the option to pass additional "
-"parameters to gpgv.  <literal>gpgv::Options</literal> Additional options "
-"passed to gpgv."
+"For GPGV URIs the only configurable option is <literal>gpgv::Options</"
+"literal>, which passes additional parameters to gpgv."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:452
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
+#: apt.conf.5.xml:497
 #, no-wrap
 msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:447
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:492
 msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "
-"compression formats.  Per default the acquire methods can decompress "
+"compression formats.  By default the acquire methods can decompress "
 "<command>bzip2</command>, <command>lzma</command> and <command>gzip</"
-"command> compressed files, with this setting more formats can be added on "
+"command> compressed files; with this setting more formats can be added on "
 "the fly or the used method can be changed. The syntax for this is: "
 "<placeholder type=\"synopsis\" id=\"0\"/>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:457
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
+#: apt.conf.5.xml:502
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order:: \"gz\";"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:460
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
+#: apt.conf.5.xml:505
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:453
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:498
 msgid ""
-"Also the <literal>Order</literal> subgroup can be used to define in which "
+"Also, the <literal>Order</literal> subgroup can be used to define in which "
 "order the acquire system will try to download the compressed files. The "
 "acquire system will try the first and proceed with the next compression type "
-"in this list on error, so to prefer one over the other type simple add the "
-"preferred type at first - not already added default types will be added at "
-"run time to the end of the list, so e.g. <placeholder type=\"synopsis\" id="
+"in this list on error, so to prefer one over the other type simply add the "
+"preferred type first - default types not already added will be implicitly "
+"appended to the end of the list, so e.g. <placeholder type=\"synopsis\" id="
 "\"0\"/> can be used to prefer <command>gzip</command> compressed files over "
 "<command>bzip2</command> and <command>lzma</command>.  If <command>lzma</"
 "command> should be preferred over <command>gzip</command> and "
-"<command>bzip2</command> the configure setting should look like this "
+"<command>bzip2</command> the configure setting should look like this: "
 "<placeholder type=\"synopsis\" id=\"1\"/> It is not needed to add "
-"<literal>bz2</literal> explicit to the list as it will be added automatic."
+"<literal>bz2</literal> to the list explicitly as it will be added "
+"automatically."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:464
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
+#: apt.conf.5.xml:512
 #, no-wrap
 msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:462
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:507
 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."
+"Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></"
+"literal> will be checked at run time. If this option has been set, the "
+"method will only be used if this file exists; e.g. for the <literal>bzip2</"
+"literal> 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."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:469
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:517
 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."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:476
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:524
 msgid ""
 "When downloading <literal>gzip</literal> compressed indexes (Packages, "
 "Sources, or Translations), keep them gzip compressed locally instead of "
@@ -2870,50 +2887,48 @@ msgid ""
 "CPU requirements when building the local package caches. False by default."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:484
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:532
 msgid ""
 "The Languages subsection controls which <filename>Translation</filename> "
-"files are downloaded and in which order APT tries to display the Description-"
-"Translations. APT will try to display the first available Description in the "
-"Language which is listed at first. Languages can be defined with their short "
-"or long Languagecodes. Note that not all archives provide "
-"<filename>Translation</filename> files for every Language - especially the "
-"long Languagecodes are rare, so please inform you which ones are available "
-"before you set here impossible values."
+"files are downloaded and in which order APT tries to display the description-"
+"translations. APT will try to display the first available description in the "
+"language which is listed first. Languages can be defined with their short or "
+"long language codes. Note that not all archives provide "
+"<filename>Translation</filename> files for every language - the long "
+"language codes are especially rare."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:500
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
+#: apt.conf.5.xml:549
 #, no-wrap
 msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:490
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:537
 msgid ""
 "The default list includes \"environment\" and \"en\". "
-"\"<literal>environment</literal>\" has a special meaning here: It will be "
-"replaced at runtime with the languagecodes extracted from the "
+"\"<literal>environment</literal>\" has a special meaning here: it will be "
+"replaced at runtime with the language codes extracted from the "
 "<literal>LC_MESSAGES</literal> environment variable.  It will also ensure "
 "that these codes are not included twice in the list. If "
 "<literal>LC_MESSAGES</literal> is set to \"C\" only the "
 "<filename>Translation-en</filename> file (if available) will be used.  To "
-"force apt to use no Translation file use the setting <literal>Acquire::"
+"force APT to use no Translation file use the setting <literal>Acquire::"
 "Languages=none</literal>. \"<literal>none</literal>\" is another special "
-"meaning code which will stop the search for a fitting <filename>Translation</"
-"filename> file.  This can be used by the system administrator to let APT "
-"know that it should download also this files without actually use them if "
-"the environment doesn't specify this languages. So the following example "
-"configuration will result in the order \"en, de\" in an english and in \"de, "
-"en\" in a german localization. Note that \"fr\" is downloaded, but not used "
-"if APT is not used in a french localization, in such an environment the "
-"order would be \"fr, de, en\".  <placeholder type=\"programlisting\" id="
-"\"0\"/>"
+"meaning code which will stop the search for a suitable "
+"<filename>Translation</filename> file.  This tells APT to download these "
+"translations too, without actually using them unless the environment "
+"specifies the languages. So the following example configuration will result "
+"in the order \"en, de\" in an English locale or \"de, en\" in a German one. "
+"Note that \"fr\" is downloaded, but not used unless APT is used in a French "
+"locale (where the order would be \"fr, de, en\").  <placeholder type="
+"\"programlisting\" id=\"0\"/>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:501
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:550
 msgid ""
 "Note: To prevent problems resulting from APT being executed in different "
 "environments (e.g. by different users or by other programs) all Translation "
@@ -2922,37 +2937,37 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:560
 msgid "Directories"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:514
+#: apt.conf.5.xml:562
 msgid ""
 "The <literal>Dir::State</literal> section has directories that pertain to "
 "local state information. <literal>lists</literal> is the directory to place "
 "downloaded package lists in and <literal>status</literal> is the name of the "
-"dpkg status file.  <literal>preferences</literal> is the name of the APT "
+"&dpkg; status file.  <literal>preferences</literal> is the name of the APT "
 "<filename>preferences</filename> file.  <literal>Dir::State</literal> "
-"contains the default directory to prefix on all sub items if they do not "
+"contains the default directory to prefix on all sub-items if they do not "
 "start with <filename>/</filename> or <filename>./</filename>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:521
+#: apt.conf.5.xml:569
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
 "and <literal>pkgcache</literal> as well as the location to place downloaded "
 "archives, <literal>Dir::Cache::archives</literal>. Generation of caches can "
-"be turned off by setting their names to be blank. This will slow down "
-"startup but save disk space. It is probably preferred to turn off the "
+"be turned off by setting their names to the empty string. This will slow "
+"down startup but save disk space. It is probably preferable to turn off the "
 "pkgcache rather than the srcpkgcache. Like <literal>Dir::State</literal> the "
 "default directory is contained in <literal>Dir::Cache</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:530
+#: apt.conf.5.xml:578
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -2962,7 +2977,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:536
+#: apt.conf.5.xml:584
 msgid ""
 "The <literal>Dir::Parts</literal> setting reads in all the config fragments "
 "in lexical order from the directory specified. After this is done then the "
@@ -2970,7 +2985,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:540
+#: apt.conf.5.xml:588
 msgid ""
 "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
 "Bin::Methods</literal> specifies the location of the method handlers and "
@@ -2981,7 +2996,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:548
+#: apt.conf.5.xml:596
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "
@@ -2994,7 +3009,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:561
+#: apt.conf.5.xml:609
 msgid ""
 "The <literal>Ignore-Files-Silently</literal> list can be used to specify "
 "which files APT should silently ignore while parsing the files in the "
@@ -3005,92 +3020,94 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:570
+#: apt.conf.5.xml:618
 #, fuzzy
 msgid "APT in DSelect"
 msgstr "DSelect"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:572
+#: apt.conf.5.xml:620
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
-"control the default behaviour. These are in the <literal>DSelect</literal> "
+"control the default behavior. These are in the <literal>DSelect</literal> "
 "section."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:577
+#: apt.conf.5.xml:625
 msgid ""
-"Cache Clean mode; this value may be one of always, prompt, auto, pre-auto "
-"and never.  always and prompt will remove all packages from the cache after "
-"upgrading, prompt (the default) does so conditionally.  auto removes only "
-"those packages which are no longer downloadable (replaced with a new version "
-"for instance).  pre-auto performs this action before downloading new "
-"packages."
+"Cache Clean mode; this value may be one of <literal>always</literal>, "
+"<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
+"literal> and <literal>never</literal>.  <literal>always</literal> and "
+"<literal>prompt</literal> will remove all packages from the cache after "
+"upgrading, <literal>prompt</literal> (the default) does so conditionally.  "
+"<literal>auto</literal> removes only those packages which are no longer "
+"downloadable (replaced with a new version for instance).  <literal>pre-auto</"
+"literal> performs this action before downloading new packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:586
+#: apt.conf.5.xml:639
 msgid ""
-"The contents of this variable is passed to &apt-get; as command line options "
-"when it is run for the install phase."
+"The contents of this variable are passed to &apt-get; as command line "
+"options when it is run for the install phase."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:591
+#: apt.conf.5.xml:644
 msgid ""
-"The contents of this variable is passed to &apt-get; as command line options "
-"when it is run for the update phase."
+"The contents of this variable are passed to &apt-get; as command line "
+"options when it is run for the update phase."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:596
+#: apt.conf.5.xml:649
 msgid ""
 "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
 "The default is to prompt only on error."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:602
-msgid "How APT calls dpkg"
+#: apt.conf.5.xml:655
+msgid "How APT calls &dpkg;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:603
+#: apt.conf.5.xml:656
 msgid ""
 "Several configuration directives control how APT invokes &dpkg;. These are "
 "in the <literal>DPkg</literal> section."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:608
+#: apt.conf.5.xml:661
 msgid ""
-"This is a list of options to pass to dpkg. The options must be specified "
+"This is a list of options to pass to &dpkg;. The options must be specified "
 "using the list notation and each list item is passed as a single argument to "
 "&dpkg;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:614
+#: apt.conf.5.xml:667
 msgid ""
 "This is a list of shell commands to run before/after invoking &dpkg;.  Like "
 "<literal>options</literal> this must be specified in list notation. The "
-"commands are invoked in order using <filename>/bin/sh</filename>, should any "
+"commands are invoked in order using <filename>/bin/sh</filename>; should any "
 "fail APT will abort."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:621
+#: apt.conf.5.xml:674
 msgid ""
-"This is a list of shell commands to run before invoking dpkg. Like "
+"This is a list of shell commands to run before invoking &dpkg;. Like "
 "<literal>options</literal> this must be specified in list notation. The "
-"commands are invoked in order using <filename>/bin/sh</filename>, should any "
-"fail APT will abort. APT will pass to the commands on standard input the "
-"filenames of all .deb files it is going to install, one per line."
+"commands are invoked in order using <filename>/bin/sh</filename>; should any "
+"fail APT will abort. APT will pass the filenames of all .deb files it is "
+"going to install to the commands, one per line on standard input."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:627
+#: apt.conf.5.xml:680
 msgid ""
 "Version 2 of this protocol dumps more information, including the protocol "
 "version, the APT configuration space and the packages, files and versions "
@@ -3100,41 +3117,41 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:635
+#: apt.conf.5.xml:688
 msgid ""
-"APT chdirs to this directory before invoking dpkg, the default is <filename>/"
-"</filename>."
+"APT chdirs to this directory before invoking &dpkg;, the default is "
+"<filename>/</filename>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:640
+#: apt.conf.5.xml:693
 msgid ""
-"These options are passed to &dpkg-buildpackage; when compiling packages, the "
+"These options are passed to &dpkg-buildpackage; when compiling packages; the "
 "default is to disable signing and produce all binaries."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:645
+#: apt.conf.5.xml:698
 msgid "dpkg trigger usage (and related options)"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:646
+#: apt.conf.5.xml:699
 msgid ""
-"APT can call dpkg in a way so it can make aggressive use of triggers over "
-"multiple calls of dpkg. Without further options dpkg will use triggers only "
-"in between his own run. Activating these options can therefore decrease the "
-"time needed to perform the install / upgrade. Note that it is intended to "
-"activate these options per default in the future, but as it changes the way "
-"APT calling dpkg drastically it needs a lot more testing.  <emphasis>These "
-"options are therefore currently experimental and should not be used in "
-"productive environments.</emphasis> Also it breaks the progress reporting so "
-"all frontends will currently stay around half (or more) of the time in the "
-"100% state while it actually configures all packages."
+"APT can call &dpkg; in such a way as to let it make aggressive use of "
+"triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
+"use triggers once each time it runs.  Activating these options can therefore "
+"decrease the time needed to perform the install or upgrade. Note that it is "
+"intended to activate these options per default in the future, but as it "
+"drastically changes the way APT calls &dpkg; it needs a lot more testing.  "
+"<emphasis>These options are therefore currently experimental and should not "
+"be used in production environments.</emphasis> It also breaks progress "
+"reporting such that all front-ends will currently stay around half (or more) "
+"of the time in the 100% state while it actually configures all packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:661
+#: apt.conf.5.xml:714
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
@@ -3144,82 +3161,72 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:655
+#: apt.conf.5.xml:708
 msgid ""
 "Note that it is not guaranteed that APT will support these options or that "
 "these options will not cause (big) trouble in the future. If you have "
 "understand the current risks and problems with these options, but are brave "
-"enough to help testing them create a new configuration file and test a "
+"enough to help testing them, create a new configuration file and test a "
 "combination of options. Please report any bugs, problems and improvements "
 "you encounter and make sure to note which options you have used in your "
-"reports. Asking dpkg for help could also be useful for debugging proposes, "
+"reports. Asking &dpkg; for help could also be useful for debugging proposes, "
 "see e.g. <command>dpkg --audit</command>. A defensive option combination "
 "would be <placeholder type=\"literallayout\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:668
+#: apt.conf.5.xml:721
 msgid ""
-"Add the no triggers flag to all dpkg calls (except the ConfigurePending "
+"Add the no triggers flag to all &dpkg; calls (except the ConfigurePending "
 "call).  See &dpkg; if you are interested in what this actually means. In "
-"short: dpkg will not run the triggers when this flag is present unless it is "
-"explicitly called to do so in an extra call.  Note that this option exists "
-"(undocumented) also in older apt versions with a slightly different meaning: "
-"Previously these option only append --no-triggers to the configure calls to "
-"dpkg - now apt will add these flag also to the unpack and remove calls."
+"short: &dpkg; will not run the triggers when this flag is present unless it "
+"is explicitly called to do so in an extra call.  Note that this option "
+"exists (undocumented) also in older APT versions with a slightly different "
+"meaning: Previously these option only append --no-triggers to the configure "
+"calls to &dpkg; - now APT will also add this flag to the unpack and remove "
+"calls."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:676
+#: apt.conf.5.xml:729
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
-"and \"<literal>no</literal>\".  \"<literal>all</literal>\" is the default "
-"value and causes APT to configure all packages explicit.  The "
-"\"<literal>smart</literal>\" way is it to configure only packages which need "
-"to be configured before another package can be unpacked (Pre-Depends) and "
-"let the rest configure by dpkg with a call generated by the next option. "
-"\"<literal>no</literal>\" on the other hand will not configure anything and "
-"totally rely on dpkg for configuration (which will at the moment fail if a "
-"Pre-Depends is encountered).  Setting this option to another than the all "
-"value will implicitly activate also the next option per default as otherwise "
-"the system could end in an unconfigured status which could be unbootable!"
+"and \"<literal>no</literal>\".  The default value is \"<literal>all</literal>"
+"\", which causes APT to configure all packages. The \"<literal>smart</"
+"literal>\" way is to configure only packages which need to be configured "
+"before another package can be unpacked (Pre-Depends), and let the rest be "
+"configured by &dpkg; with a call generated by the ConfigurePending option "
+"(see below). On the other hand, \"<literal>no</literal>\" will not configure "
+"anything, and totally relies on &dpkg; for configuration (which at the "
+"moment will fail if a Pre-Depends is encountered). Setting this option to "
+"any value other than <literal>all</literal> will implicitly also activate "
+"the next option by default, as otherwise the system could end in an "
+"unconfigured and potentially unbootable state."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:687
+#: apt.conf.5.xml:744
 msgid ""
-"If this option is set apt will call <command>dpkg --configure --pending</"
-"command> to let dpkg handle all required configurations and triggers. This "
-"option is activated automatic per default if the previous option is not set "
-"to <literal>all</literal>, but deactivating could be useful if you want to "
-"run APT multiple times in a row - e.g. in an installer. In these sceneries "
-"you could deactivate this option in all but the last run."
+"If this option is set APT will call <command>dpkg --configure --pending</"
+"command> to let &dpkg; handle all required configurations and triggers. This "
+"option is activated automatically per default if the previous option is not "
+"set to <literal>all</literal>, but deactivating it could be useful if you "
+"want to run APT multiple times in a row - e.g. in an installer. In these "
+"sceneries you could deactivate this option in all but the last run."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:694
+#: apt.conf.5.xml:751
 msgid ""
-"Useful for <literal>smart</literal> configuration as a package which has "
-"pending triggers is not considered as <literal>installed</literal> and dpkg "
-"treats them as <literal>unpacked</literal> currently which is a dealbreaker "
-"for Pre-Dependencies (see debbugs #526774). Note that this will process all "
-"triggers, not only the triggers needed to configure this package."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:700
-msgid ""
-"As the configuration can be deferred to be done at the end by dpkg it can be "
-"tried to order the unpack series only by critical needs, e.g. by Pre-"
-"Depends. Default is true and therefore the \"old\" method of ordering in "
-"various steps by everything. While both method were present in earlier APT "
-"versions the <literal>OrderCritical</literal> method was unused, so this "
-"method is very experimental and needs further improvements before becoming "
-"really useful."
+"Useful for the <literal>smart</literal> configuration as a package which has "
+"pending triggers is not considered as <literal>installed</literal>, and "
+"&dpkg; treats them as <literal>unpacked</literal> currently which is a "
+"showstopper for Pre-Dependencies (see debbugs #526774). Note that this will "
+"process all triggers, not only the triggers needed to configure this package."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:715
+#: apt.conf.5.xml:764
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
@@ -3231,40 +3238,40 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:708
+#: apt.conf.5.xml:757
 msgid ""
-"Essential packages (and there dependencies) should be configured immediately "
-"after unpacking. It will be a good idea to do this quite early in the "
-"upgrade process as these these configure calls require currently also "
-"<literal>DPkg::TriggersPending</literal> which will run quite a few triggers "
-"(which maybe not needed). Essentials get per default a high score but the "
-"immediate flag is relatively low (a package which has a Pre-Depends is "
-"higher rated).  These option and the others in the same group can be used to "
-"change the scoring. The following example shows the settings with there "
-"default values.  <placeholder type=\"literallayout\" id=\"0\"/>"
+"Essential packages (and their dependencies) should be configured immediately "
+"after unpacking. It is a good idea to do this quite early in the upgrade "
+"process as these configure calls also currently require <literal>DPkg::"
+"TriggersPending</literal> which will run quite a few triggers (which may not "
+"be needed). Essentials get per default a high score but the immediate flag "
+"is relatively low (a package which has a Pre-Depends is rated higher).  "
+"These option and the others in the same group can be used to change the "
+"scoring. The following example shows the settings with their default "
+"values.  <placeholder type=\"literallayout\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:728
+#: apt.conf.5.xml:777
 msgid "Periodic and Archives options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:729
+#: apt.conf.5.xml:778
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
-"of options configure behavior of apt periodic updates, which is done by "
-"<literal>/etc/cron.daily/apt</literal> script. See header of this script for "
-"the brief documentation of these options."
+"of options configure behavior of apt periodic updates, which is done by the "
+"<literal>/etc/cron.daily/apt</literal> script. See the top of this script "
+"for the brief documentation of these options."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:737
+#: apt.conf.5.xml:786
 msgid "Debug options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:739
+#: apt.conf.5.xml:788
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -3275,7 +3282,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:750
+#: apt.conf.5.xml:799
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -3283,7 +3290,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:758
+#: apt.conf.5.xml:807
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s install</"
@@ -3291,7 +3298,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:767
+#: apt.conf.5.xml:816
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
@@ -3301,66 +3308,66 @@ msgstr ""
 #. 	   motivating example, except I haven't a clue why you'd want
 #. 	   to do this. 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:775
+#: apt.conf.5.xml:824
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
 "in CD-ROM IDs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:785
+#: apt.conf.5.xml:834
 msgid "A full list of debugging options to apt follows."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:794
+#: apt.conf.5.xml:843
 msgid ""
 "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:805
+#: apt.conf.5.xml:854
 msgid "Print information related to downloading packages using FTP."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:816
+#: apt.conf.5.xml:865
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:827
+#: apt.conf.5.xml:876
 msgid "Print information related to downloading packages using HTTPS."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:838
+#: apt.conf.5.xml:887
 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:849
+#: apt.conf.5.xml:898
 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:859
+#: apt.conf.5.xml:908
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:869
+#: apt.conf.5.xml:918
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:879
+#: apt.conf.5.xml:928
 msgid ""
 "Do not include information from <literal>statfs</literal>, namely the number "
 "of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@ -3368,53 +3375,53 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:890
+#: apt.conf.5.xml:939
 msgid ""
 "Disable all file locking.  For instance, this will allow two instances of "
 "<quote><literal>apt-get update</literal></quote> to run at the same time."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:902
+#: apt.conf.5.xml:951
 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:912
+#: apt.conf.5.xml:961
 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:922
+#: apt.conf.5.xml:971
 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:934
+#: apt.conf.5.xml:983
 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:945
+#: apt.conf.5.xml:994
 msgid ""
 "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:956
+#: apt.conf.5.xml:1005
 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:966
+#: apt.conf.5.xml:1015
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
@@ -3424,68 +3431,64 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:980
+#: apt.conf.5.xml:1029
 msgid ""
-"Generate debug messages describing which package is marked as keep/install/"
+"Generate debug messages describing which packages are marked as keep/install/"
 "remove while the ProblemResolver does his work.  Each addition or deletion "
-"may trigger additional actions; they are shown indented two additional space "
-"under the original entry.  The format for each line is <literal>MarkKeep</"
-"literal>, <literal>MarkDelete</literal> or <literal>MarkInstall</literal> "
-"followed by <literal>package-name &lt;a.b.c -&gt; d.e.f | x.y.z&gt; (section)"
-"</literal> where <literal>a.b.c</literal> is the current version of the "
-"package, <literal>d.e.f</literal> is the version considered for installation "
-"and <literal>x.y.z</literal> is a newer version, but not considered for "
-"installation (because of a low pin score). The later two can be omitted if "
-"there is none or if it is the same version as the installed.  "
-"<literal>section</literal> is the name of the section the package appears in."
+"may trigger additional actions; they are shown indented two additional "
+"spaces under the original entry.  The format for each line is "
+"<literal>MarkKeep</literal>, <literal>MarkDelete</literal> or "
+"<literal>MarkInstall</literal> followed by <literal>package-name &lt;a.b.c -"
+"&gt; d.e.f | x.y.z&gt; (section)</literal> where <literal>a.b.c</literal> is "
+"the current version of the package, <literal>d.e.f</literal> is the version "
+"considered for installation and <literal>x.y.z</literal> is a newer version, "
+"but not considered for installation (because of a low pin score). The later "
+"two can be omitted if there is none or if it is the same as the installed "
+"version.  <literal>section</literal> is the name of the section the package "
+"appears in."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1002
-msgid "Dump the default configuration to standard error on startup."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1012
+#: apt.conf.5.xml:1050
 msgid ""
 "When invoking &dpkg;, output the precise command line with which it is being "
 "invoked, with arguments separated by a single space character."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1023
+#: apt.conf.5.xml:1061
 msgid ""
 "Output all the data received from &dpkg; on the status file descriptor and "
 "any errors encountered while parsing it."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1034
+#: apt.conf.5.xml:1072
 msgid ""
 "Generate a trace of the algorithm that decides the order in which "
 "<literal>apt</literal> should pass packages to &dpkg;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1046
+#: apt.conf.5.xml:1084
 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1057
+#: apt.conf.5.xml:1095
 msgid "Output the priority of each package list on startup."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1067
+#: apt.conf.5.xml:1105
 msgid ""
 "Trace the execution of the dependency resolver (this applies only to what "
 "happens when a complex dependency problem is encountered)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1078
+#: apt.conf.5.xml:1116
 msgid ""
 "Display a list of all installed packages with their calculated score used by "
 "the pkgProblemResolver. The description of the package is the same as "
@@ -3493,20 +3496,20 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1090
+#: apt.conf.5.xml:1128
 msgid ""
 "Print information about the vendors read from <filename>/etc/apt/vendors."
 "list</filename>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1112 apt_preferences.5.xml:545 sources.list.5.xml:211
+#: apt.conf.5.xml:1150 apt_preferences.5.xml:545 sources.list.5.xml:211
 #: apt-ftparchive.1.xml:596
 msgid "Examples"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1113
+#: apt.conf.5.xml:1151
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
@@ -3514,7 +3517,7 @@ msgstr ""
 
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1125
+#: apt.conf.5.xml:1163
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr ""
 
@@ -3578,7 +3581,7 @@ msgid ""
 "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, unless that file matches a pattern in the "
-"<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this "
+"<literal>Dir::Ignore-Files-Silently</literal> configuration list - in which "
 "case it will be silently ignored."
 msgstr ""
 
@@ -4505,25 +4508,24 @@ msgid "Package resource list for APT"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:37
+#: sources.list.5.xml:38
 msgid ""
-"The package resource list is used to locate archives of the package "
-"distribution system in use on the system. At this time, this manual page "
-"documents only the packaging system used by the Debian system.  This control "
-"file is <filename>/etc/apt/sources.list</filename>."
+"The source list <filename>/etc/apt/sources.list</filename> is designed to "
+"support any number of active sources and a variety of source media. The file "
+"lists one source per line, with the most preferred source listed first. The "
+"information available from the configured sources is acquired by "
+"<command>apt-get update</command> (or by an equivalent command from another "
+"APT front-end)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:42
+#: sources.list.5.xml:45
 msgid ""
-"The source list is designed to support any number of active sources and a "
-"variety of source media. The file lists one source per line, with the most "
-"preferred source listed first. The format of each line is: <literal>type uri "
-"args</literal> The first item, <literal>type</literal> determines the format "
-"for <literal>args</literal>. <literal>uri</literal> is a Universal Resource "
-"Identifier (URI), which is a superset of the more specific and well-known "
-"Universal Resource Locator, or URL. The rest of the line can be marked as a "
-"comment by using a #."
+"Each line specifying a source starts with type (e.g. <literal>deb-src</"
+"literal>)  followed by options and arguments for this type.  Individual "
+"entries cannot be continued onto a following line. Empty lines are ignored, "
+"and a <literal>#</literal> character anywhere on a line marks the remainder "
+"of that line as a comment."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
@@ -4541,7 +4543,7 @@ msgid ""
 "digits (0-9), underscore (_), hyphen (-) and period (.) characters.  "
 "Otherwise APT will print a notice that it has ignored a file, unless that "
 "file matches a pattern in the <literal>Dir::Ignore-Files-Silently</literal> "
-"configuration list - in this case it will be silently ignored."
+"configuration list - in which case it will be silently ignored."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
@@ -4552,16 +4554,16 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:66
 msgid ""
-"The <literal>deb</literal> type describes a typical two-level Debian "
-"archive, <filename>distribution/component</filename>. Typically, "
-"<literal>distribution</literal> is generally an archivename like "
+"The <literal>deb</literal> type references a typical two-level Debian "
+"archive, <filename>distribution/component</filename>. The "
+"<literal>distribution</literal> is generally an archive name like "
 "<literal>stable</literal> or <literal>testing</literal> or a codename like "
 "<literal>&stable-codename;</literal> or <literal>&testing-codename;</"
-"literal> while component is one of <literal>main</literal> <literal>contrib</"
-"literal> or <literal>non-free</literal>. The <literal>deb-src</literal> type "
-"describes a debian distribution's source code in the same form as the "
-"<literal>deb</literal> type.  A <literal>deb-src</literal> line is required "
-"to fetch source indexes."
+"literal> while component is one of <literal>main</literal>, "
+"<literal>contrib</literal> or <literal>non-free</literal>. The <literal>deb-"
+"src</literal> type references a Debian distribution's source code in the "
+"same form as the <literal>deb</literal> type.  A <literal>deb-src</literal> "
+"line is required to fetch source indexes."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -4584,21 +4586,22 @@ msgid ""
 "Debian distribution, from which APT will find the information it needs.  "
 "<literal>distribution</literal> can specify an exact path, in which case the "
 "components must be omitted and <literal>distribution</literal> must end with "
-"a slash (/). This is useful for when the case only a particular sub-section "
-"of the archive denoted by the URI is of interest.  If <literal>distribution</"
-"literal> does not specify an exact path, at least one <literal>component</"
-"literal> must be present."
+"a slash (<literal>/</literal>). This is useful for the case when only a "
+"particular sub-section of the archive denoted by the URI is of interest.  If "
+"<literal>distribution</literal> does not specify an exact path, at least one "
+"<literal>component</literal> must be present."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:92
 msgid ""
 "<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)"
-"</literal> which expands to the Debian architecture (i386, m68k, "
-"powerpc, ...)  used on the system. This permits architecture-independent "
-"<filename>sources.list</filename> files to be used. In general this is only "
-"of interest when specifying an exact path, <literal>APT</literal> will "
-"automatically generate a URI with the current architecture otherwise."
+"</literal> which expands to the Debian architecture (such as <literal>amd64</"
+"literal> or <literal>armel</literal>) used on the system. This permits "
+"architecture-independent <filename>sources.list</filename> files to be used. "
+"In general this is only of interest when specifying an exact path, "
+"<literal>APT</literal> will automatically generate a URI with the current "
+"architecture otherwise."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -4619,12 +4622,12 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:112
 msgid ""
-"<literal>options</literal> is always optional and needs to be surounded by "
+"<literal>options</literal> is always optional and needs to be surrounded 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:"
+"following settings are supported by APT (note however that unsupported "
+"settings will be ignored silently):"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
@@ -4632,7 +4635,7 @@ msgstr ""
 msgid ""
 "<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 "
+"information should be downloaded. If this option is not set all "
 "architectures defined by the <literal>APT::Architectures</literal> option "
 "will be downloaded."
 msgstr ""
@@ -4712,29 +4715,30 @@ msgstr ""
 msgid ""
 "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
 "is highly configurable; for more information see the &apt-conf; manual page. "
-"Please note that a ftp proxy can be specified by using the <envar>ftp_proxy</"
-"envar> environment variable. It is possible to specify a http proxy (http "
-"proxy servers often understand ftp urls)  using this method and ONLY this "
-"method. ftp proxies using http specified in the configuration file will be "
+"Please note that an FTP proxy can be specified by using the "
+"<envar>ftp_proxy</envar> environment variable. It is possible to specify an "
+"HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
+"environment variable and <emphasis>ONLY</emphasis> this environment "
+"variable. Proxies using HTTP specified in the configuration file will be "
 "ignored."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:183
+#: sources.list.5.xml:184
 msgid ""
 "The copy scheme is identical to the file scheme except that packages are "
 "copied into the cache directory instead of used directly at their location.  "
-"This is useful for people using a zip disk to copy files around with APT."
+"This is useful for people using removable media to copy files around with "
+"APT."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:190
+#: sources.list.5.xml:191
 msgid ""
-"The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given "
-"user and access the files. It is a good idea to do prior arrangements with "
-"RSA keys or rhosts.  Access to files on the remote uses standard "
-"<command>find</command> and <command>dd</command> commands to perform the "
-"file transfers from the remote."
+"The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
+"the files as a given user. Prior configuration of rhosts or RSA keys is "
+"recommended. The standard <command>find</command> and <command>dd</command> "
+"commands are used to perform the file transfers from the remote host."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
@@ -4745,12 +4749,12 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml:200
 msgid ""
-"APT can be extended with more methods shipped in other optional packages "
-"which should follow the nameing scheme <package>apt-transport-"
-"<replaceable>method</replaceable></package>.  The APT team e.g. maintains "
-"also the <package>apt-transport-https</package> package which provides "
-"access methods for https-URIs with features similar to the http method, but "
-"other methods for using e.g. debtorrent are also available, see &apt-"
+"APT can be extended with more methods shipped in other optional packages, "
+"which should follow the naming scheme <package>apt-transport-"
+"<replaceable>method</replaceable></package>.  For instance, the APT team "
+"also maintains the package <package>apt-transport-https</package>, which "
+"provides access methods for HTTPS URIs with features similar to the http "
+"method.  Methods for using e.g. debtorrent are also available - see &apt-"
 "transport-debtorrent;."
 msgstr ""
 
@@ -4937,7 +4941,8 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-sortpkgs.1.xml:45
-msgid "All output is sent to stdout, the input must be a seekable file."
+msgid ""
+"All output is sent to standard output; the input must be a seekable file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
diff --git a/doc/po/ja.po b/doc/po/ja.po
index 50c42b851..c846f8c34 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.25.3\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-06 23:46+0300\n"
+"POT-Creation-Date: 2012-06-09 19:12+0300\n"
 "PO-Revision-Date: 2010-09-07 07:38+0900\n"
 "Last-Translator: KURASAWA Nozomu <nabetaro@caldron.jp>\n"
 "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@ -1600,7 +1600,7 @@ msgstr ""
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml:518 apt-cache.8.xml:343 apt-key.8.xml:174 apt-mark.8.xml:125
-#: apt.conf.5.xml:1118 apt_preferences.5.xml:698
+#: apt.conf.5.xml:1156 apt_preferences.5.xml:698
 msgid "Files"
 msgstr "ファイル"
 
@@ -1608,7 +1608,7 @@ msgstr "ファイル"
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131
 #: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109
-#: apt.conf.5.xml:1124 apt_preferences.5.xml:705 sources.list.5.xml:252
+#: apt.conf.5.xml:1162 apt_preferences.5.xml:705 sources.list.5.xml:252
 #: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63
 #: apt-ftparchive.1.xml:607
 msgid "See Also"
@@ -3297,11 +3297,17 @@ msgstr "APT の設定ファイル"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:42
+#, fuzzy
+#| msgid ""
+#| "<filename>apt.conf</filename> is the main configuration file for the APT "
+#| "suite of tools, but by far not the only place changes to options can be "
+#| "made. All tools therefore share the configuration files and also use a "
+#| "common command line parser to provide a uniform environment."
 msgid ""
-"<filename>apt.conf</filename> is the main configuration file for the APT "
-"suite of tools, but by far not the only place changes to options can be "
-"made. All tools therefore share the configuration files and also use a "
-"common command line parser to provide a uniform environment."
+"<filename>/etc/apt/apt.conf</filename> is the main configuration file shared "
+"by all the tools in the APT suite of tools, though it is by no means the "
+"only place options can be set. The suite also shares a common command line "
+"parser to provide a uniform environment."
 msgstr ""
 "<filename>apt.conf</filename> は、APT ツールスイートのメイン設定ファイルです"
 "が、間違いなくオプションの変更を指定するだけの場所などではありません。そのた"
@@ -3309,21 +3315,21 @@ msgstr ""
 "ンドラインパーサも使用します。"
 
 #. type: Content of: <refentry><refsect1><orderedlist><para>
-#: apt.conf.5.xml:47
+#: apt.conf.5.xml:48
 msgid ""
 "When an APT tool starts up it will read the configuration files in the "
 "following order:"
 msgstr "APT ツールの起動時に、設定ファイルを以下の順番で読み込みます。"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:49
+#: apt.conf.5.xml:50
 msgid ""
 "the file specified by the <envar>APT_CONFIG</envar> environment variable (if "
 "any)"
 msgstr "<envar>APT_CONFIG</envar> 環境変数で指定したファイル (存在する場合)"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:51
+#: apt.conf.5.xml:52
 #, fuzzy
 #| msgid ""
 #| "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
@@ -3336,8 +3342,8 @@ msgid ""
 "extension and which only contain alphanumeric, hyphen (-), underscore (_) "
 "and period (.) characters.  Otherwise APT will print a notice that it has "
 "ignored a file, unless that file matches a pattern in the <literal>Dir::"
-"Ignore-Files-Silently</literal> configuration list - in this case it will be "
-"silently ignored."
+"Ignore-Files-Silently</literal> configuration list - in which case it will "
+"be silently ignored."
 msgstr ""
 "<literal>Dir::Etc::Parts</literal> にあるすべてのファイルを英数字の昇順に。"
 "ファイル名には拡張子がないか、\"<literal>conf</literal>\" となっており、英数"
@@ -3346,13 +3352,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:58
+#: apt.conf.5.xml:59
 msgid ""
 "the main configuration file specified by <literal>Dir::Etc::main</literal>"
 msgstr "<literal>Dir::Etc::Main</literal> で指定される、メイン設定ファイル"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:60
+#: apt.conf.5.xml:61
 msgid ""
 "the command line options are applied to override the configuration "
 "directives or to load even more configuration files."
@@ -3361,17 +3367,17 @@ msgstr ""
 "加読み込みができます。"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:64
+#: apt.conf.5.xml:65
 msgid "Syntax"
 msgstr "構文"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:65
+#: apt.conf.5.xml:66
 msgid ""
 "The configuration file is organized in a tree with options organized into "
 "functional groups. Option specification is given with a double colon "
-"notation, for instance <literal>APT::Get::Assume-Yes</literal> is an option "
+"notation; for instance <literal>APT::Get::Assume-Yes</literal> is an option "
 "within the APT tool group, for the Get tool. Options do not inherit from "
 "their parent groups."
 msgstr ""
@@ -3382,19 +3388,31 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:71
+#: apt.conf.5.xml:72
+#, fuzzy
+#| msgid ""
+#| "Syntactically the configuration language is modeled after what the ISC "
+#| "tools such as bind and dhcp use. Lines starting with <literal>//</"
+#| "literal> are treated as comments (ignored), as well as all text between "
+#| "<literal>/*</literal> and <literal>*/</literal>, just like C/C++ "
+#| "comments.  Each line is of the form <literal>APT::Get::Assume-Yes \"true"
+#| "\";</literal>. The trailing semicolon and the quotes are required. The "
+#| "value must be on one line, and there is no kind of string concatenation. "
+#| "It must not include inside quotes.  The behavior of the backslash \"\\\" "
+#| "and escaped characters inside a value is undefined and it should not be "
+#| "used. An option name may include alphanumerical characters and the \"/-:._"
+#| "+\" characters. A new scope can be opened with curly braces, like:"
 msgid ""
 "Syntactically the configuration language is modeled after what the ISC tools "
 "such as bind and dhcp use. Lines starting with <literal>//</literal> are "
 "treated as comments (ignored), as well as all text between <literal>/*</"
 "literal> and <literal>*/</literal>, just like C/C++ comments.  Each line is "
-"of the form <literal>APT::Get::Assume-Yes \"true\";</literal>. The trailing "
-"semicolon and the quotes are required. The value must be on one line, and "
-"there is no kind of string concatenation. It must not include inside "
-"quotes.  The behavior of the backslash \"\\\" and escaped characters inside "
-"a value is undefined and it should not be used. An option name may include "
-"alphanumerical characters and the \"/-:._+\" characters. A new scope can be "
-"opened with curly braces, like:"
+"of the form <literal>APT::Get::Assume-Yes \"true\";</literal>.  The "
+"quotation marks and trailing semicolon are required.  The value must be on "
+"one line, and there is no kind of string concatenation.  Values must not "
+"include backslashes or extra quotation marks.  Option names are made up of "
+"alphanumeric characters and the characters \"/-:._+\".  A new scope can be "
+"opened with curly braces, like this:"
 msgstr ""
 "設定言語の構文は、bind や dhcp のような ISC ツールをモデルにしています。"
 "<literal>//</literal> で始まる行はコメントとして扱われます (無視)。同様に C/C"
@@ -3428,10 +3446,16 @@ msgstr ""
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:93
+#, fuzzy
+#| msgid ""
+#| "with newlines placed to make it more readable. Lists can be created by "
+#| "opening a scope and including a single string enclosed in quotes followed "
+#| "by a semicolon. Multiple entries can be included, each separated by a "
+#| "semicolon."
 msgid ""
 "with newlines placed to make it more readable. Lists can be created by "
 "opening a scope and including a single string enclosed in quotes followed by "
-"a semicolon. Multiple entries can be included, each separated by a semicolon."
+"a semicolon. Multiple entries can be included, separated by a semicolon."
 msgstr ""
 "また適宜改行することで、より読みやすくなります。リストは、開いたスコープ、"
 "クォートで囲まれた 1 単語、そしてセミコロンと続けることで作成できます。セミコ"
@@ -3458,9 +3482,13 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:105
+#, fuzzy
+#| msgid ""
+#| "The names of the configuration items are not case-sensitive. So in the "
+#| "previous example you could use <literal>dpkg::pre-install-pkgs</literal>."
 msgid ""
-"The names of the configuration items are not case-sensitive. So in the "
-"previous example you could use <literal>dpkg::pre-install-pkgs</literal>."
+"Case is not significant in names of configuration items, so in the previous "
+"example you could use <literal>dpkg::pre-install-pkgs</literal>."
 msgstr ""
 "設定項目の名前は、文字の大小を区別しません。そのため、前述の例を "
 "<literal>dpkg::pre-install-pkgs</literal> とできます。"
@@ -3468,11 +3496,11 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:108
 msgid ""
-"Names for the configuration items are optional if a list is defined as it "
-"can be see in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. "
-"If you don't specify a name a new entry will simply add a new option to the "
-"list. If you specify a name you can override the option as every other "
-"option by reassigning a new value to the option."
+"Names for the configuration items are optional if a list is defined as can "
+"be seen in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. If "
+"you don't specify a name a new entry will simply add a new option to the "
+"list. If you specify a name you can override the option in the same way as "
+"any other option by reassigning a new value to the option."
 msgstr ""
 "前述した <literal>DPkg::Pre-Install-Pkgs</literal> の例で見られるように、リス"
 "トを定義した場合、設定項目名はオプションになります。名前を指定しない場合、新"
@@ -3483,14 +3511,23 @@ msgstr ""
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:113
-msgid ""
-"Two specials are allowed, <literal>#include</literal> (which is deprecated "
-"and not supported by alternative implementations) and <literal>#clear</"
-"literal>: <literal>#include</literal> will include the given file, unless "
-"the filename ends in a slash, then the whole directory is included.  "
-"<literal>#clear</literal> is used to erase a part of the configuration tree. "
-"The specified element and all its descendants are erased.  (Note that these "
-"lines also need to end with a semicolon.)"
+#, fuzzy
+#| msgid ""
+#| "Two specials are allowed, <literal>#include</literal> (which is "
+#| "deprecated and not supported by alternative implementations) and "
+#| "<literal>#clear</literal>: <literal>#include</literal> will include the "
+#| "given file, unless the filename ends in a slash, then the whole directory "
+#| "is included.  <literal>#clear</literal> is used to erase a part of the "
+#| "configuration tree. The specified element and all its descendants are "
+#| "erased.  (Note that these lines also need to end with a semicolon.)"
+msgid ""
+"Two special commands are defined: <literal>#include</literal> (which is "
+"deprecated and not supported by alternative implementations) and "
+"<literal>#clear</literal>. <literal>#include</literal> will include the "
+"given file, unless the filename ends in a slash, in which case the whole "
+"directory is included.  <literal>#clear</literal> is used to erase a part of "
+"the configuration tree. The specified element and all its descendants are "
+"erased.  (Note that these lines also need to end with a semicolon.)"
 msgstr ""
 "<literal>#include</literal> (これは廃止予定でサポートしない他の実装もありま"
 "す) と <literal>#clear</literal> の 2 つの特別な記法があります。"
@@ -3501,13 +3538,20 @@ msgstr ""
 "があることに注意してください)。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:121
-msgid ""
-"The #clear command is the only way to delete a list or a complete scope.  "
-"Reopening a scope or the ::-style described below will <emphasis>not</"
-"emphasis> override previously written entries. Only options can be "
-"overridden by addressing a new value to it - lists and scopes can't be "
-"overridden, only cleared."
+#: apt.conf.5.xml:123
+#, fuzzy
+#| msgid ""
+#| "The #clear command is the only way to delete a list or a complete scope.  "
+#| "Reopening a scope or the ::-style described below will <emphasis>not</"
+#| "emphasis> override previously written entries. Only options can be "
+#| "overridden by addressing a new value to it - lists and scopes can't be "
+#| "overridden, only cleared."
+msgid ""
+"The <literal>#clear</literal> command is the only way to delete a list or a "
+"complete scope. Reopening a scope (or using the syntax described below with "
+"an appended <literal>::</literal>) will <emphasis>not</emphasis> override "
+"previously written entries. Options can only be overridden by addressing a "
+"new value to them - lists and scopes can't be overridden, only cleared."
 msgstr ""
 "#clear コマンドは、リストや完全なスコープを削除する唯一の方法です。スコープの"
 "再オープンや後述する :: スタイルは、それまで書いたエントリを<emphasis>上書き"
@@ -3516,22 +3560,23 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:126
+#: apt.conf.5.xml:131
 #, fuzzy
 #| msgid ""
-#| "All of the APT tools take a -o option which allows an arbitrary "
+#| "All of the APT tools take an -o option which allows an arbitrary "
 #| "configuration directive to be specified on the command line. The syntax "
 #| "is a full option name (<literal>APT::Get::Assume-Yes</literal> for "
 #| "instance) followed by an equals sign then the new value of the option. "
 #| "Lists can be appended too by adding a trailing :: to the list name. (As "
 #| "you might suspect: The scope syntax can't be used on the command line.)"
 msgid ""
-"All of the APT tools take a -o option which allows an arbitrary "
+"All of the APT tools take an -o option which allows an arbitrary "
 "configuration directive to be specified on the command line. The syntax is a "
 "full option name (<literal>APT::Get::Assume-Yes</literal> for instance) "
 "followed by an equals sign then the new value of the option. To append a new "
-"element to a list, add a trailing :: to the name of the list. (As you might "
-"suspect: The scope syntax can't be used on the command line.)"
+"element to a list, add a trailing <literal>::</literal> to the name of the "
+"list.  (As you might suspect, the scope syntax can't be used on the command "
+"line.)"
 msgstr ""
 "すべての APT ツールで、コマンドラインで任意の設定ディレクティブを指定できる -"
 "o オプションが使用できます。構文は、完全なオプション名 (例: <literal>APT::"
@@ -3540,7 +3585,7 @@ msgstr ""
 "コープ構文はコマンドラインで使用できません)。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:133
+#: apt.conf.5.xml:139
 #, fuzzy
 #| msgid ""
 #| "Note that you can use :: only for appending one item per line to a list "
@@ -3556,18 +3601,18 @@ msgstr ""
 #| "encounter this misuse, so please correct such statements now as long as "
 #| "APT doesn't complain explicit about them."
 msgid ""
-"Note that you can use :: only for appending one item per line to a list and "
-"that you should not use it in combination with the scope syntax.  (The scope "
-"syntax implicit insert ::) Using both syntaxes together will trigger a bug "
-"which some users unfortunately depend on: An option with the unusual name "
-"\"<literal>::</literal>\" which acts like every other option with a name. "
-"These introduces many problems including that a user who writes multiple "
-"lines in this <emphasis>wrong</emphasis> syntax in the hope to append to a "
-"list will gain the opposite as only the last assignment for this option "
-"\"<literal>::</literal>\" will be used. Upcoming APT versions will raise "
-"errors and will stop working if they encounter this misuse, so please "
-"correct such statements now as long as APT doesn't complain explicit about "
-"them."
+"Note that appending items to a list using <literal>::</literal> only works "
+"for one item per line, and that you should not use it in combination with "
+"the scope syntax (which adds <literal>::</literal> implicitly). Using both "
+"syntaxes together will trigger a bug which some users unfortunately depend "
+"on: an option with the unusual name \"<literal>::</literal>\" which acts "
+"like every other option with a name. This introduces many problems; for one "
+"thing, users who write multiple lines in this <emphasis>wrong</emphasis> "
+"syntax in the hope of appending to a list will achieve the opposite, as only "
+"the last assignment for this option \"<literal>::</literal>\" will be used. "
+"Future versions of APT will raise errors and stop working if they encounter "
+"this misuse, so please correct such statements now while APT doesn't "
+"explicitly complain about them."
 msgstr ""
 "1 行で 1 項目の場合にのみ :: は使用でき、スコープ構文と組み合わせるべきではな"
 "いことに注意してください (スコープ構文には暗黙で :: が挿入されます)。両方の構"
@@ -3582,13 +3627,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:145
+#: apt.conf.5.xml:154
 msgid "The APT Group"
 msgstr "APT グループ"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:146
+#: apt.conf.5.xml:155
 msgid ""
 "This group of options controls general APT behavior as well as holding the "
 "options for all of the tools."
@@ -3598,7 +3643,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:151
+#: apt.conf.5.xml:160
 msgid ""
 "System Architecture; sets the architecture to use when fetching files and "
 "parsing package lists. The internal default is the architecture apt was "
@@ -3609,25 +3654,25 @@ msgstr ""
 "ルしたアーキテクチャです。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:157
+#: apt.conf.5.xml:167
 msgid ""
-"All Architectures the system supports. Processors implementing the "
-"<literal>amd64</literal> (also called <literal>x86-64</literal>) instruction "
-"set are e.g. also able to execute binaries compiled for the <literal>i386</"
-"literal> (<literal>x86</literal>) instruction set; 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>."
+"All Architectures the system supports. For instance, CPUs implementing the "
+"<literal>amd64</literal> (also called <literal>x86-64</literal>)  "
+"instruction set are also able to execute binaries compiled for the "
+"<literal>i386</literal> (<literal>x86</literal>) instruction set. This list "
+"is used when fetching files and parsing package lists. The initial default "
+"is always the system's native architecture (<literal>APT::Architecture</"
+"literal>), and foreign architectures are added to the default list when they "
+"are registered via <command>dpkg --add-architecture</command>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:167
+#: apt.conf.5.xml:180
 msgid ""
-"Default release to install packages from if more than one version available. "
-"Contains release name, codename or release version. Examples: 'stable', "
-"'testing', 'unstable', '&stable-codename;', '&testing-codename;', '4.0', "
-"'5.0*'. See also &apt-preferences;."
+"Default release to install packages from if more than one version is "
+"available. Contains release name, codename or release version. Examples: "
+"'stable', 'testing', 'unstable', '&stable-codename;', '&testing-codename;', "
+"'4.0', '5.0*'. See also &apt-preferences;."
 msgstr ""
 "ひとつ以上のバージョンがある場合に、パッケージをインストールを行うデフォルト"
 "リリースです。リリース名や、コード名、リリースバージョンがあります。例えば "
@@ -3636,9 +3681,9 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:173
+#: apt.conf.5.xml:186
 msgid ""
-"Ignore Held packages; This global option causes the problem resolver to "
+"Ignore held packages; this global option causes the problem resolver to "
 "ignore held packages in its decision making."
 msgstr ""
 "保留パッケージの無視 - このグローバルオプションは、問題解決器に保留と指定した"
@@ -3646,7 +3691,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:178
+#: apt.conf.5.xml:191
 msgid ""
 "Defaults to on. When turned on the autoclean feature will remove any "
 "packages which can no longer be downloaded from the cache. If turned off "
@@ -3660,71 +3705,68 @@ msgstr ""
 "ださい。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:185
-msgid ""
-"Defaults to on which will cause APT to install essential and important "
-"packages as fast as possible in the install/upgrade operation. This is done "
-"to limit the effect of a failing &dpkg; call: If this option is disabled APT "
-"does treat an important package in the same way as an extra package: Between "
-"the unpacking of the important package A and his configuration can then be "
-"many other unpack or configuration calls, e.g. for package B which has no "
-"relation to A, but causes the dpkg call to fail (e.g. because maintainer "
-"script of package B generates an error) which results in a system state in "
-"which package A is unpacked but unconfigured - each package depending on A "
-"is now no longer guaranteed to work as their dependency on A is not longer "
-"satisfied. The immediate configuration marker is also applied to all "
-"dependencies which can generate a problem if the dependencies e.g. form a "
-"circle as a dependency with the immediate flag is comparable with a Pre-"
-"Dependency. So in theory it is possible that APT encounters a situation in "
-"which it is unable to perform immediate configuration, errors out and refers "
-"to this option so the user can deactivate the immediate configuration "
-"temporarily to be able to perform an install/upgrade again. Note the use of "
-"the word \"theory\" here as this problem was only encountered by now in real "
-"world a few times in non-stable distribution versions and was caused by "
-"wrong dependencies of the package in question or by a system in an already "
-"broken state, so you should not blindly disable this option as the mentioned "
-"scenario above is not the only problem immediate configuration can help to "
-"prevent in the first place.  Before a big operation like <literal>dist-"
-"upgrade</literal> is run with this option disabled it should be tried to "
-"explicitly <literal>install</literal> the package APT is unable to configure "
-"immediately, but please make sure to report your problem also to your "
-"distribution and to the APT team with the buglink below so they can work on "
-"improving or correcting the upgrade process."
-msgstr ""
-"デフォルトで有効で、インストールやアップグレード処理中に、APT が不可欠パッ"
-"ケージや重要パッケージのインストールを、可能な限り早く行うようになります。"
-"&dpkg; の呼び出す際の失敗回数に制限があるため、このようなオプションがありま"
-"す。このオプションが無効の場合、APT は重要パッケージを、特別パッケージと同様"
-"に扱うようになります。重要パッケージ A を展開していて、その設定中に他の展開や"
-"設定をたくさん呼び出すと、パッケージ B は A とはなんの関係もないにもかかわら"
-"ず、dpkg の呼び出しが失敗します (つまり B のメンテナスクリプトがエラーを返し"
-"ます)。この結果、システムの状態として、パッケージ A は展開済みで未設定となり"
-"ます。A に依存するパッケージは、動作の保証がなくなり、A に対する依存関係は、"
-"もう満たせなくなります。 即時設定マーカは、たとえば環状の依存関係といった問題"
-"が発生しそうな、すべての依存関係に先行依存と同等の即時フラグを適用します。そ"
-"のため理論上では、APT が即時設定できない、エラーが発生する、このオプションを"
-"参照するといった状況になる可能性があるのは、ユーザが即時設定を一時的に無効に"
-"して、インストールやアップグレードを行った場合です。「理論上」と言う単語を"
-"使ったのは、現在現実世界でこの問題に遭遇したのは、不安定版を使用しており、問"
-"題になっていたパッケージの間違った依存関係が原因だったり、システムが既に破損"
-"状態であったりした数回だけだからです。前述のシナリオが、即時設定が主に回避す"
-"る問題のすべてというわけではないため、このオプションを闇雲に無効にするべきで"
-"はありません。<literal>dist-upgrade</literal> のような大きな操作を、このオプ"
-"ションを無効にして行う前に、APT がすぐに設定できないパッケージを、明示的に "
-"<literal>install</literal> してみてください。ですが、アップグレードプロセスの"
-"改善のため、バグのリンクにあるディストリビューションと APT チームにも、問題の"
-"レポートをおねがいします。"
-
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:208
-msgid ""
-"Never Enable this option unless you -really- know what you are doing. It "
-"permits APT to temporarily remove an essential package to break a Conflicts/"
-"Conflicts or Conflicts/Pre-Depend loop between two essential packages. SUCH "
-"A LOOP SHOULD NEVER EXIST AND IS A GRAVE BUG. This option will work if the "
-"essential packages are not tar, gzip, libc, dpkg, bash or anything that "
-"those packages depend on."
+#: apt.conf.5.xml:199
+msgid ""
+"Defaults to on, which will cause APT to install essential and important "
+"packages as soon as possible in an install/upgrade operation, in order to "
+"limit the effect of a failing &dpkg; call. If this option is disabled, APT "
+"treats an important package in the same way as an extra package: between the "
+"unpacking of the package A and its configuration there can be many other "
+"unpack or configuration calls for other unrelated packages B, C etc. If "
+"these cause the &dpkg; call to fail (e.g. because package B's maintainer "
+"scripts generate an error), this results in a system state in which package "
+"A is unpacked but unconfigured - so any package depending on A is now no "
+"longer guaranteed to work, as its dependency on A is no longer satisfied."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:211
+msgid ""
+"The immediate configuration marker is also applied in the potentially "
+"problematic case of circular dependencies, since a dependency with the "
+"immediate flag is equivalent to a Pre-Dependency. In theory this allows APT "
+"to recognise a situation in which it is unable to perform immediate "
+"configuration, abort, and suggest to the user that the option should be "
+"temporarily deactivated in order to allow the operation to proceed.  Note "
+"the use of the word \"theory\" here; in the real world this problem has "
+"rarely been encountered, in non-stable distribution versions, and was caused "
+"by wrong dependencies of the package in question or by a system in an "
+"already broken state; so you should not blindly disable this option, as the "
+"scenario mentioned above is not the only problem it can help to prevent in "
+"the first place."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:224
+msgid ""
+"Before a big operation like <literal>dist-upgrade</literal> is run with this "
+"option disabled you should try to explicitly <literal>install</literal> the "
+"package APT is unable to configure immediately; but please make sure you "
+"also report your problem to your distribution and to the APT team with the "
+"buglink below, so they can work on improving or correcting the upgrade "
+"process."
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:235
+#, fuzzy
+#| msgid ""
+#| "Never Enable this option unless you -really- know what you are doing. It "
+#| "permits APT to temporarily remove an essential package to break a "
+#| "Conflicts/Conflicts or Conflicts/Pre-Depend loop between two essential "
+#| "packages. SUCH A LOOP SHOULD NEVER EXIST AND IS A GRAVE BUG. This option "
+#| "will work if the essential packages are not tar, gzip, libc, dpkg, bash "
+#| "or anything that those packages depend on."
+msgid ""
+"Never enable this option unless you <emphasis>really</emphasis> know what "
+"you are doing. It permits APT to temporarily remove an essential package to "
+"break a Conflicts/Conflicts or Conflicts/Pre-Depends loop between two "
+"essential packages. <emphasis>Such a loop should never exist and is a grave "
+"bug</emphasis>. This option will work if the essential packages are not "
+"<command>tar</command>, <command>gzip</command>, <command>libc</command>, "
+"<command>dpkg</command>, <command>dash</command> or anything that those "
+"packages depend on."
 msgstr ""
 "何をしようとしているのか「本当に」判っているのでなければ、絶対にこのオプショ"
 "ンを有効にしないでください。不可欠 (essential) パッケージ同士で、競合 "
@@ -3735,36 +3777,39 @@ msgstr ""
 "不可欠パッケージで動作します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:217
+#: apt.conf.5.xml:247
 msgid ""
 "APT uses since version 0.7.26 a resizable memory mapped cache file to store "
-"the 'available' information. <literal>Cache-Start</literal> acts as a hint "
-"to which size the Cache will grow and is therefore the amount of memory APT "
+"the available information. <literal>Cache-Start</literal> acts as a hint of "
+"the size the cache will grow to, and is therefore the amount of memory APT "
 "will request at startup. The default value is 20971520 bytes (~20 MB). Note "
-"that this amount of space needs to be available for APT otherwise it will "
+"that this amount of space needs to be available for APT; otherwise it will "
 "likely fail ungracefully, so for memory restricted devices this value should "
 "be lowered while on systems with a lot of configured sources it should be "
 "increased.  <literal>Cache-Grow</literal> defines in bytes with the default "
-"of 1048576 (~1 MB) how much the Cache size will be increased in the event "
-"the space defined by <literal>Cache-Start</literal> is not enough. These "
+"of 1048576 (~1 MB) how much the cache size will be increased in the event "
+"the space defined by <literal>Cache-Start</literal> is not enough. This "
 "value will be applied again and again until either the cache is big enough "
 "to store all information or the size of the cache reaches the <literal>Cache-"
 "Limit</literal>.  The default of <literal>Cache-Limit</literal> is 0 which "
 "stands for no limit.  If <literal>Cache-Grow</literal> is set to 0 the "
-"automatic grow of the cache is disabled."
+"automatic growth of the cache is disabled."
 msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:233
-msgid "Defines which package(s) are considered essential build dependencies."
+#: apt.conf.5.xml:263
+#, fuzzy
+#| msgid ""
+#| "Defines which package(s) are considered essential build dependencies."
+msgid "Defines which packages are considered essential build dependencies."
 msgstr "構築依存関係で不可欠なパッケージを定義します。"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:237
+#: apt.conf.5.xml:267
 msgid ""
-"The Get subsection controls the &apt-get; tool, please see its documentation "
+"The Get subsection controls the &apt-get; tool; please see its documentation "
 "for more information about the options here."
 msgstr ""
 "Get サブセクションは &apt-get; ツールを制御します。このオプションの詳細は "
@@ -3772,9 +3817,9 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:242
+#: apt.conf.5.xml:272
 msgid ""
-"The Cache subsection controls the &apt-cache; tool, please see its "
+"The Cache subsection controls the &apt-cache; tool; please see its "
 "documentation for more information about the options here."
 msgstr ""
 "Cache サブセクションは &apt-cache; ツールを制御します。このオプションの詳細"
@@ -3782,9 +3827,9 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:247
+#: apt.conf.5.xml:277
 msgid ""
-"The CDROM subsection controls the &apt-cdrom; tool, please see its "
+"The CDROM subsection controls the &apt-cdrom; tool; please see its "
 "documentation for more information about the options here."
 msgstr ""
 "CDROM サブセクションは &apt-cdrom; ツールを制御します。このオプションの詳細"
@@ -3792,13 +3837,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:253
+#: apt.conf.5.xml:283
 msgid "The Acquire Group"
 msgstr "Acquire グループ"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:254
+#: apt.conf.5.xml:284
 #, fuzzy
 #| msgid ""
 #| "The <literal>Acquire</literal> group of options controls the download of "
@@ -3806,58 +3851,67 @@ msgstr "Acquire グループ"
 #| "\"0\"/>"
 msgid ""
 "The <literal>Acquire</literal> group of options controls the download of "
-"packages and the URI handlers."
+"packages as well as the various \"acquire methods\" responsible for the "
+"download itself (see also &sources-list;)."
 msgstr ""
 "オプションの <literal>Acquire</literal> グループは、パッケージのダウンロード"
 "や URI ハンドラの制御を行います。<placeholder type=\"variablelist\" id=\"0\"/"
 ">"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:259
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:291
 msgid ""
-"Security related option defaulting to true as an expiring validation for a "
-"Release file prevents longtime replay attacks and can e.g. also help users "
-"to identify no longer updated mirrors - but the feature depends on the "
-"correctness of the time on the user system.  Archive maintainers are "
-"encouraged to create Release files with the <literal>Valid-Until</literal> "
-"header, but if they don't or a stricter value is volitional the following "
-"<literal>Max-ValidTime</literal> option can be used."
+"Security related option defaulting to true, as giving a Release file's "
+"validation an expiration date prevents replay attacks over a long timescale, "
+"and can also for example help users to identify mirrors that are no longer "
+"updated - but the feature depends on the correctness of the clock on the "
+"user system. Archive maintainers are encouraged to create Release files with "
+"the <literal>Valid-Until</literal> header, but if they don't or a stricter "
+"value is desired the <literal>Max-ValidTime</literal> option below can be "
+"used."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:270
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:304
 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 valid\".  Archive specific settings can "
-"be made by appending the label of the archive to the option name."
+"Maximum time (in seconds) after its creation (as indicated by the "
+"<literal>Date</literal> header) that the <filename>Release</filename> file "
+"should be considered valid.  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 \"valid forever\".  Archive specific settings can be made by appending "
+"the label of the archive to the option name."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:281
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:316
 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."
+"Minimum time (in seconds) after its creation (as indicated by the "
+"<literal>Date</literal> header) that the <filename>Release</filename> file "
+"should be considered valid.  Use this if you need to use a seldom updated "
+"(local) mirror of a more frequently 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 ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:292
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:328
+#, fuzzy
+#| msgid ""
+#| "Try to download deltas called <literal>PDiffs</literal> for Packages or "
+#| "Sources files instead of downloading whole ones. True by default."
 msgid ""
-"Try to download deltas called <literal>PDiffs</literal> for Packages or "
-"Sources files instead of downloading whole ones. True by default."
+"Try to download deltas called <literal>PDiffs</literal> for indexes (like "
+"<filename>Packages</filename> files) instead of downloading whole ones. True "
+"by default."
 msgstr ""
 "Packages ファイルや Sources ファイルの全体をダウンロードするのではなく、"
 "<literal>PDiffs</literal> と呼ばれる差分をダウンロードしようとします。デフォ"
 "ルトでは True です。"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:295
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:331
 #, fuzzy
 #| msgid ""
 #| "Two sub-options to limit the use of PDiffs are also available: With "
@@ -3867,12 +3921,12 @@ msgstr ""
 #| "to the size of the targeted file. If one of these limits is exceeded the "
 #| "complete file is downloaded instead of the patches."
 msgid ""
-"Two sub-options to limit the use of PDiffs are also available: With "
-"<literal>FileLimit</literal> can be specified how many PDiff files are "
-"downloaded at most to update a file. <literal>SizeLimit</literal> on the "
-"other hand is the maximum percentage of the size of all patches compared to "
-"the size of the targeted file. If one of these limits is exceeded the "
-"complete file is downloaded instead of the patches."
+"Two sub-options to limit the use of PDiffs are also available: "
+"<literal>FileLimit</literal> can be used to specify a maximum number of "
+"PDiff files should be downloaded to update a file. <literal>SizeLimit</"
+"literal> on the other hand is the maximum percentage of the size of all "
+"patches compared to the size of the targeted file. If one of these limits is "
+"exceeded the complete file is downloaded instead of the patches."
 msgstr ""
 "PDiffs の使用を制限するふたつのサブオプションがあります。<literal>FileLimit</"
 "literal> では、PDiff ファイルをいくつダウンロードしてパッチを当てるかを指定し"
@@ -3881,8 +3935,8 @@ msgstr ""
 "をダウンロードする代わりに、完全なファイルをダウンロードします。"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:305
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:341
 msgid ""
 "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
 "literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -3896,8 +3950,8 @@ msgstr ""
 "<literal>access</literal> は、URI タイプごとに 1 接続を開きます。"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:313
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:349
 msgid ""
 "Number of retries to perform. If this is non-zero APT will retry failed "
 "files the given number of times."
@@ -3906,8 +3960,8 @@ msgstr ""
 "えられた回数だけリトライを行います。"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:318
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:354
 msgid ""
 "Use symlinks for source archives. If set to true then source archives will "
 "be symlinked when possible instead of copying. True is the default."
@@ -3917,15 +3971,24 @@ msgstr ""
 "す。"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:323
-msgid ""
-"HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
-"standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per "
-"host proxies can also be specified by using the form <literal>http::Proxy::"
-"&lt;host&gt;</literal> with the special keyword <literal>DIRECT</literal> "
-"meaning to use no proxies. If no one of the above settings is specified, "
-"<envar>http_proxy</envar> environment variable will be used."
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:359
+#, fuzzy
+#| msgid ""
+#| "HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
+#| "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. "
+#| "Per host proxies can also be specified by using the form <literal>http::"
+#| "Proxy::&lt;host&gt;</literal> with the special keyword <literal>DIRECT</"
+#| "literal> meaning to use no proxies. If no one of the above settings is "
+#| "specified, <envar>http_proxy</envar> environment variable will be used."
+msgid ""
+"<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. "
+"It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</"
+"literal>.  Per host proxies can also be specified by using the form "
+"<literal>http::Proxy::&lt;host&gt;</literal> with the special keyword "
+"<literal>DIRECT</literal> meaning to use no proxies. If no one of the above "
+"settings is specified, <envar>http_proxy</envar> environment variable will "
+"be used."
 msgstr ""
 "HTTP URI - http::Proxy は、デフォルトで使用する http プロキシです。"
 "<literal>http://[[user][:pass]@]host[:port]/</literal> という標準形で表しま"
@@ -3935,18 +3998,27 @@ msgstr ""
 "も指定しないと、環境変数 <envar>http_proxy</envar> を使用します。"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:331
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:367
+#, fuzzy
+#| msgid ""
+#| "Three settings are provided for cache control with HTTP/1.1 compliant "
+#| "proxy caches. <literal>No-Cache</literal> tells the proxy to not use its "
+#| "cached response under any circumstances, <literal>Max-Age</literal> is "
+#| "sent only for index files and tells the cache to refresh its object if it "
+#| "is older than the given number of seconds. Debian updates its index files "
+#| "daily so the default is 1 day. <literal>No-Store</literal> specifies that "
+#| "the cache should never store this request, it is only set for archive "
+#| "files. This may be useful to prevent polluting a proxy cache with very "
+#| "large .deb files. Note: Squid 2.0.2 does not support any of these options."
 msgid ""
 "Three settings are provided for cache control with HTTP/1.1 compliant proxy "
-"caches. <literal>No-Cache</literal> tells the proxy to not use its cached "
-"response under any circumstances, <literal>Max-Age</literal> is sent only "
-"for index files and tells the cache to refresh its object if it is older "
-"than the given number of seconds. Debian updates its index files daily so "
-"the default is 1 day. <literal>No-Store</literal> specifies that the cache "
-"should never store this request, it is only set for archive files. This may "
-"be useful to prevent polluting a proxy cache with very large .deb files. "
-"Note: Squid 2.0.2 does not support any of these options."
+"caches.  <literal>No-Cache</literal> tells the proxy not to use its cached "
+"response under any circumstances.  <literal>Max-Age</literal> sets the "
+"allowed maximum age (in seconds) of an index file in the cache of the "
+"proxy.  <literal>No-Store</literal> specifies that the proxy should not "
+"store the requested archive files in its cache, which can be used to prevent "
+"the proxy from polluting its cache with (big) .deb files."
 msgstr ""
 "HTTP/1.1 準拠のプロキシキャッシュの制御について 3 種類の設定があります。"
 "<literal>No-Cache</literal> はプロキシに対して、いかなる時もキャッシュを使用"
@@ -3960,52 +4032,63 @@ msgstr ""
 "トしていません。"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:341 apt.conf.5.xml:407
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:377 apt.conf.5.xml:449
+#, fuzzy
+#| msgid ""
+#| "The option <literal>timeout</literal> sets the timeout timer used by the "
+#| "method; this applies to all things including connection timeout and data "
+#| "timeout."
 msgid ""
 "The option <literal>timeout</literal> sets the timeout timer used by the "
-"method, this applies to all things including connection timeout and data "
-"timeout."
+"method; this value applies to the connection as well as the data timeout."
 msgstr ""
 "<literal>timeout</literal> オプションは、この方法でのタイムアウトまでの時間を"
 "設定します。これには、接続のタイムアウトとデータのタイムアウトが含まれていま"
 "す。"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:344
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:380
 msgid ""
 "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
-"enabled HTTP pipeling (RFC 2616 section 8.1.2.2) which can be beneficial e."
-"g. on high-latency connections. It specifies how many requests are send in a "
+"enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
+"g. on high-latency connections. It specifies how many requests are sent in a "
 "pipeline.  Previous APT versions had a default of 10 for this setting, but "
 "the default value is now 0 (= disabled) to avoid problems with the ever-"
 "growing amount of webservers and proxies which choose to not conform to the "
 "HTTP/1.1 specification."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:351
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:387
 msgid ""
-"<literal>Acquire::http::AllowRedirect</literal> controls if APT will follow "
-"redirects, which is enabled by default."
+"<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
+"follow redirects, which is enabled by default."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:354
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:390
+#, fuzzy
+#| msgid ""
+#| "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
+#| "literal> which accepts integer values in kilobytes. The default value is "
+#| "0 which deactivates the limit and tries uses as much as possible of the "
+#| "bandwidth (Note that this option implicit deactivates the download from "
+#| "multiple servers at the same time.)"
 msgid ""
 "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
-"literal> which accepts integer values in kilobyte. The default value is 0 "
-"which deactivates the limit and tries uses as much as possible of the "
-"bandwidth (Note that this option implicit deactivates the download from "
-"multiple servers at the same time.)"
+"literal> which accepts integer values in kilobytes. The default value is 0 "
+"which deactivates the limit and tries to use all available bandwidth (note "
+"that this option implicitly disables downloading from multiple servers at "
+"the same time.)"
 msgstr ""
 "使用する帯域を制限するには、<literal>Acquire::http::Dl-Limit</literal> にキロ"
 "バイトで整数値を与えます。デフォルト値は 0 で、制限を解除し、使用できる帯域を"
 "すべて使おうとします (このオプションは暗黙的に、同時に複数のサーバからダウン"
 "ロードしなくなることに注意してください)。"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:359
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:395
 msgid ""
 "<literal>Acquire::http::User-Agent</literal> can be used to set a different "
 "User-Agent for the http download method as some proxies allow access for "
@@ -4015,14 +4098,22 @@ msgstr ""
 "場合、<literal>Acquire::http::User-Agent</literal> を使用して、http でダウン"
 "ロードするための、異なる User-Agent を設定できます。"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:366
-msgid ""
-"HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
-"options are the same as for <literal>http</literal> method and will also "
-"default to the options from the <literal>http</literal> method if they are "
-"not explicitly set for https. <literal>Pipeline-Depth</literal> option is "
-"not supported yet."
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:403
+#, fuzzy
+#| msgid ""
+#| "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
+#| "options are the same as for <literal>http</literal> method and will also "
+#| "default to the options from the <literal>http</literal> method if they "
+#| "are not explicitly set for https. <literal>Pipeline-Depth</literal> "
+#| "option is not supported yet."
+msgid ""
+"The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
+"<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
+"<literal>proxy</literal> options work for HTTPS URIs in the same way as for "
+"the <literal>http</literal> method, and default to the same values if they "
+"are not explicitly set. The <literal>Pipeline-Depth</literal> option is not "
+"yet supported."
 msgstr ""
 "HTTPS URI - キャッシュ制御、タイムアウト、AllowRedirect、Dl-Limit、プロキシオ"
 "プションは <literal>http</literal> メソッドと同様です。また、https 用に明示的"
@@ -4030,25 +4121,44 @@ msgstr ""
 "ドと同じです。<literal>Pipeline-Depth</literal> オプションはまだサポートして"
 "いません。"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:372
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:411
+#, fuzzy
+#| msgid ""
+#| "<literal>CaInfo</literal> suboption specifies place of file that holds "
+#| "info about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> "
+#| "is the corresponding per-host option.  <literal>Verify-Peer</literal> "
+#| "boolean suboption determines whether verify server's host certificate "
+#| "against trusted certificates or not.  <literal>&lt;host&gt;::Verify-Peer</"
+#| "literal> is the corresponding per-host option.  <literal>Verify-Host</"
+#| "literal> boolean suboption determines whether verify server's hostname or "
+#| "not.  <literal>&lt;host&gt;::Verify-Host</literal> is the corresponding "
+#| "per-host option.  <literal>SslCert</literal> determines what certificate "
+#| "to use for client authentication. <literal>&lt;host&gt;::SslCert</"
+#| "literal> is the corresponding per-host option.  <literal>SslKey</literal> "
+#| "determines what private key to use for client authentication. "
+#| "<literal>&lt;host&gt;::SslKey</literal> is the corresponding per-host "
+#| "option.  <literal>SslForceVersion</literal> overrides default SSL version "
+#| "to use.  Can contain 'TLSv1' or 'SSLv3' string.  <literal>&lt;host&gt;::"
+#| "SslForceVersion</literal> is the corresponding per-host option."
 msgid ""
 "<literal>CaInfo</literal> suboption specifies place of file that holds info "
-"about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is "
+"about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is the "
 "corresponding per-host option.  <literal>Verify-Peer</literal> boolean "
-"suboption determines whether verify server's host certificate against "
-"trusted certificates or not.  <literal>&lt;host&gt;::Verify-Peer</literal> "
-"is corresponding per-host option.  <literal>Verify-Host</literal> boolean "
-"suboption determines whether verify server's hostname or not.  <literal>&lt;"
-"host&gt;::Verify-Host</literal> is corresponding per-host option.  "
-"<literal>SslCert</literal> determines what certificate to use for client "
-"authentication. <literal>&lt;host&gt;::SslCert</literal> is corresponding "
-"per-host option.  <literal>SslKey</literal> determines what private key to "
-"use for client authentication. <literal>&lt;host&gt;::SslKey</literal> is "
-"corresponding per-host option.  <literal>SslForceVersion</literal> overrides "
-"default SSL version to use.  Can contain 'TLSv1' or 'SSLv3' string.  "
-"<literal>&lt;host&gt;::SslForceVersion</literal> is corresponding per-host "
-"option."
+"suboption determines whether or not the server's host certificate should be "
+"verified against trusted certificates.  <literal>&lt;host&gt;::Verify-Peer</"
+"literal> is the corresponding per-host option.  <literal>Verify-Host</"
+"literal> boolean suboption determines whether or not the server's hostname "
+"should be verified.  <literal>&lt;host&gt;::Verify-Host</literal> is the "
+"corresponding per-host option.  <literal>SslCert</literal> determines what "
+"certificate to use for client authentication. <literal>&lt;host&gt;::"
+"SslCert</literal> is the corresponding per-host option.  <literal>SslKey</"
+"literal> determines what private key to use for client authentication. "
+"<literal>&lt;host&gt;::SslKey</literal> is the corresponding per-host "
+"option.  <literal>SslForceVersion</literal> overrides default SSL version to "
+"use.  It can contain either of the strings '<literal>TLSv1</literal>' or "
+"'<literal>SSLv3</literal>'.  <literal>&lt;host&gt;::SslForceVersion</"
+"literal> is the corresponding per-host option."
 msgstr ""
 "<literal>CaInfo</literal> サブオプションは、信頼済み証明書情報の保持場所を指"
 "定します。<literal>&lt;host&gt;::CaInfo</literal> は、対応するホストごとのオ"
@@ -4067,23 +4177,39 @@ msgstr ""
 "host&gt;::SslForceVersion</literal> は、対応するホストごとのオプションです。"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:391
-msgid ""
-"FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard "
-"form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host "
-"proxies can also be specified by using the form <literal>ftp::Proxy::&lt;"
-"host&gt;</literal> with the special keyword <literal>DIRECT</literal> "
-"meaning to use no proxies. If no one of the above settings is specified, "
-"<envar>ftp_proxy</envar> environment variable will be used. To use a ftp "
-"proxy you will have to set the <literal>ftp::ProxyLogin</literal> script in "
-"the configuration file. This entry specifies the commands to send to tell "
-"the proxy server what to connect to. Please see &configureindex; for an "
-"example of how to do this. The substitution variables available are <literal>"
-"$(PROXY_USER)</literal> <literal>$(PROXY_PASS)</literal> <literal>"
-"$(SITE_USER)</literal> <literal>$(SITE_PASS)</literal> <literal>$(SITE)</"
-"literal> and <literal>$(SITE_PORT)</literal> Each is taken from it's "
-"respective URI component."
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:432
+#, fuzzy
+#| msgid ""
+#| "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the "
+#| "standard form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. "
+#| "Per host proxies can also be specified by using the form <literal>ftp::"
+#| "Proxy::&lt;host&gt;</literal> with the special keyword <literal>DIRECT</"
+#| "literal> meaning to use no proxies. If no one of the above settings is "
+#| "specified, <envar>ftp_proxy</envar> environment variable will be used. To "
+#| "use a ftp proxy you will have to set the <literal>ftp::ProxyLogin</"
+#| "literal> script in the configuration file. This entry specifies the "
+#| "commands to send to tell the proxy server what to connect to. Please see "
+#| "&configureindex; for an example of how to do this. The substitution "
+#| "variables available are <literal>$(PROXY_USER)</literal> <literal>"
+#| "$(PROXY_PASS)</literal> <literal>$(SITE_USER)</literal> <literal>"
+#| "$(SITE_PASS)</literal> <literal>$(SITE)</literal> and <literal>"
+#| "$(SITE_PORT)</literal> Each is taken from it's respective URI component."
+msgid ""
+"<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs.  "
+"It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</"
+"literal>.  Per host proxies can also be specified by using the form "
+"<literal>ftp::Proxy::&lt;host&gt;</literal> with the special keyword "
+"<literal>DIRECT</literal> meaning to use no proxies. If no one of the above "
+"settings is specified, <envar>ftp_proxy</envar> environment variable will be "
+"used. To use an FTP proxy you will have to set the <literal>ftp::ProxyLogin</"
+"literal> script in the configuration file. This entry specifies the commands "
+"to send to tell the proxy server what to connect to. Please see "
+"&configureindex; for an example of how to do this. The substitution "
+"variables representing the corresponding URI component are <literal>"
+"$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, <literal>"
+"$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, <literal>$(SITE)</"
+"literal> and <literal>$(SITE_PORT)</literal>."
 msgstr ""
 "FTP URI - ftp::Proxy は、デフォルトで使用するプロキシサーバです。"
 "<literal>ftp://[[user][:pass]@]host[:port]/</literal> という標準形で表しま"
@@ -4100,14 +4226,22 @@ msgstr ""
 "です。いずれも、それぞれ URI を構成するトークンです。"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:410
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:452
+#, fuzzy
+#| msgid ""
+#| "Several settings are provided to control passive mode. Generally it is "
+#| "safe to leave passive mode on; it works in nearly every environment.  "
+#| "However, some situations require that passive mode be disabled and port "
+#| "mode FTP used instead. This can be done globally, for connections that go "
+#| "through a proxy or for a specific host (See the sample config file for "
+#| "examples)."
 msgid ""
 "Several settings are provided to control passive mode. Generally it is safe "
-"to leave passive mode on, it works in nearly every environment.  However "
-"some situations require that passive mode be disabled and port mode ftp used "
-"instead. This can be done globally, for connections that go through a proxy "
-"or for a specific host (See the sample config file for examples)."
+"to leave passive mode on; it works in nearly every environment.  However, "
+"some situations require that passive mode be disabled and port mode FTP used "
+"instead. This can be done globally or for connections that go through a "
+"proxy or for a specific host (see the sample config file for examples)."
 msgstr ""
 "設定のいくつかは、パッシブモードを制御するものです。一般的に、パッシブモード"
 "のままにしておく方が安全で、ほぼどんな環境でも動作します。しかしある状況下で"
@@ -4116,11 +4250,11 @@ msgstr ""
 "定例はサンプル設定ファイルを参照してください)。"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:417
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:459
 msgid ""
 "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
-"envar> environment variable to a http url - see the discussion of the http "
+"envar> environment variable to an HTTP URL - see the discussion of the http "
 "method above for syntax. You cannot set this in the configuration file and "
 "it is not recommended to use FTP over HTTP due to its low efficiency."
 msgstr ""
@@ -4130,8 +4264,8 @@ msgstr ""
 "over HTTP を使用するのは推奨しません。"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:422
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:464
 msgid ""
 "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
 "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -4146,24 +4280,34 @@ msgstr ""
 "このコマンドを使用します。ほとんどの FTP サーバは RFC2428 をサポートしていな"
 "いことに注意してください。"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:435
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
+#: apt.conf.5.xml:478
 #, no-wrap
 msgid "/cdrom/::Mount \"foo\";"
 msgstr "/cdrom/::Mount \"foo\";"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:430
-msgid ""
-"CD-ROM URIs; the only setting for CD-ROM URIs is the mount point, "
-"<literal>cdrom::Mount</literal> which must be the mount point for the CD-ROM "
-"drive as specified in <filename>/etc/fstab</filename>. It is possible to "
-"provide alternate mount and unmount commands if your mount point cannot be "
-"listed in the fstab (such as an SMB mount and old mount packages). The "
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:473
+#, fuzzy
+#| msgid ""
+#| "CD-ROM URIs; the only setting for CD-ROM URIs is the mount point, "
+#| "<literal>cdrom::Mount</literal> which must be the mount point for the CD-"
+#| "ROM drive as specified in <filename>/etc/fstab</filename>. It is possible "
+#| "to provide alternate mount and unmount commands if your mount point "
+#| "cannot be listed in the fstab (such as an SMB mount and old mount "
+#| "packages). The syntax is to put <placeholder type=\"literallayout\" id="
+#| "\"0\"/> within the cdrom block. It is important to have the trailing "
+#| "slash. Unmount commands can be specified using UMount."
+msgid ""
+"For URIs using the <literal>cdrom</literal> method, the only configurable "
+"option is the mount point, <literal>cdrom::Mount</literal>, which must be "
+"the mount point for the CD-ROM (or DVD, or whatever) drive as specified in "
+"<filename>/etc/fstab</filename>. It is possible to provide alternate mount "
+"and unmount commands if your mount point cannot be listed in the fstab.  The "
 "syntax is to put <placeholder type=\"literallayout\" id=\"0\"/> within the "
-"cdrom block. It is important to have the trailing slash. Unmount commands "
-"can be specified using UMount."
+"<literal>cdrom</literal> block. It is important to have the trailing slash.  "
+"Unmount commands can be specified using UMount."
 msgstr ""
 "CD-ROM URI - CD-ROM URI はマウントポイントの設定のみを行います。<filename>/"
 "etc/fstab</filename> で設定されているように、CD-ROM ドライブのマウントポイン"
@@ -4175,31 +4319,35 @@ msgstr ""
 "できます。"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:441
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:486
+#, fuzzy
+#| msgid ""
+#| "GPGV URIs; the only option for GPGV URIs is the option to pass additional "
+#| "parameters to gpgv.  <literal>gpgv::Options</literal> Additional options "
+#| "passed to gpgv."
 msgid ""
-"GPGV URIs; the only option for GPGV URIs is the option to pass additional "
-"parameters to gpgv.  <literal>gpgv::Options</literal> Additional options "
-"passed to gpgv."
+"For GPGV URIs the only configurable option is <literal>gpgv::Options</"
+"literal>, which passes additional parameters to gpgv."
 msgstr ""
 "GPGV URI - GPGV URI 用の唯一のオプションは、gpgv に渡す追加パラメータのオプ"
 "ションです。<literal>gpgv::Options</literal> が gpgv に渡す追加オプションで"
 "す。"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:452
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
+#: apt.conf.5.xml:497
 #, no-wrap
 msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
 msgstr "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:447
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:492
 msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "
-"compression formats.  Per default the acquire methods can decompress "
+"compression formats.  By default the acquire methods can decompress "
 "<command>bzip2</command>, <command>lzma</command> and <command>gzip</"
-"command> compressed files, with this setting more formats can be added on "
+"command> compressed files; with this setting more formats can be added on "
 "the fly or the used method can be changed. The syntax for this is: "
 "<placeholder type=\"synopsis\" id=\"0\"/>"
 msgstr ""
@@ -4210,33 +4358,49 @@ msgstr ""
 "り多くの形式を、オンザフライで追加したり、使用するメソッドで変更したりできま"
 "す。構文は以下のようになります。<placeholder type=\"synopsis\" id=\"0\"/>"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:457
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
+#: apt.conf.5.xml:502
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order:: \"gz\";"
 msgstr "Acquire::CompressionTypes::Order:: \"gz\";"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:460
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
+#: apt.conf.5.xml:505
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:453
-msgid ""
-"Also the <literal>Order</literal> subgroup can be used to define in which "
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:498
+#, fuzzy
+#| msgid ""
+#| "Also, the <literal>Order</literal> subgroup can be used to define in "
+#| "which order the acquire system will try to download the compressed files. "
+#| "The acquire system will try the first and proceed with the next "
+#| "compression type in this list on error, so to prefer one over the other "
+#| "type simply add the preferred type first - not already added default "
+#| "types will be added at run time to the end of the list, so e.g. "
+#| "<placeholder type=\"synopsis\" id=\"0\"/> can be used to prefer "
+#| "<command>gzip</command> compressed files over <command>bzip2</command> "
+#| "and <command>lzma</command>.  If <command>lzma</command> should be "
+#| "preferred over <command>gzip</command> and <command>bzip2</command> the "
+#| "configure setting should look like this <placeholder type=\"synopsis\" id="
+#| "\"1\"/> It is not needed to add <literal>bz2</literal> explicit to the "
+#| "list as it will be added automatic."
+msgid ""
+"Also, the <literal>Order</literal> subgroup can be used to define in which "
 "order the acquire system will try to download the compressed files. The "
 "acquire system will try the first and proceed with the next compression type "
-"in this list on error, so to prefer one over the other type simple add the "
-"preferred type at first - not already added default types will be added at "
-"run time to the end of the list, so e.g. <placeholder type=\"synopsis\" id="
+"in this list on error, so to prefer one over the other type simply add the "
+"preferred type first - default types not already added will be implicitly "
+"appended to the end of the list, so e.g. <placeholder type=\"synopsis\" id="
 "\"0\"/> can be used to prefer <command>gzip</command> compressed files over "
 "<command>bzip2</command> and <command>lzma</command>.  If <command>lzma</"
 "command> should be preferred over <command>gzip</command> and "
-"<command>bzip2</command> the configure setting should look like this "
+"<command>bzip2</command> the configure setting should look like this: "
 "<placeholder type=\"synopsis\" id=\"1\"/> It is not needed to add "
-"<literal>bz2</literal> explicit to the list as it will be added automatic."
+"<literal>bz2</literal> to the list explicitly as it will be added "
+"automatically."
 msgstr ""
 "また、<literal>Order</literal> サブグループを使用して、取得システムが圧縮ファ"
 "イルのダウンロードを試みる順番を、定義できます。取得システムは先頭のものを試"
@@ -4250,14 +4414,14 @@ msgstr ""
 "設定を以下のようにしてください。<placeholder type=\"synopsis\" id=\"1\"/> "
 "<literal>bz2</literal> は自動的に追加されるため、明示する必要はありません。"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:464
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
+#: apt.conf.5.xml:512
 #, no-wrap
 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:462
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:507
 #, fuzzy
 #| msgid ""
 #| "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
@@ -4268,19 +4432,19 @@ msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
 #| "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 "
 #| "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 "
+#| "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 "
-"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."
+"Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></"
+"literal> will be checked at run time. If this option has been set, the "
+"method will only be used if this file exists; e.g. for the <literal>bzip2</"
+"literal> 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."
 msgstr ""
 "実行時に <literal>Dir::Bin::<replaceable>Methodname</replaceable></literal> "
 "をチェックすることに注意してください。この設定があると、ファイルがある場合"
@@ -4292,16 +4456,16 @@ msgstr ""
 "ださい。これにより定義された一覧が上書きされ、このタイプのもののみ定義されま"
 "す。"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:469
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:517
 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."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:476
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:524
 msgid ""
 "When downloading <literal>gzip</literal> compressed indexes (Packages, "
 "Sources, or Translations), keep them gzip compressed locally instead of "
@@ -4309,50 +4473,48 @@ msgid ""
 "CPU requirements when building the local package caches. False by default."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:484
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:532
 msgid ""
 "The Languages subsection controls which <filename>Translation</filename> "
-"files are downloaded and in which order APT tries to display the Description-"
-"Translations. APT will try to display the first available Description in the "
-"Language which is listed at first. Languages can be defined with their short "
-"or long Languagecodes. Note that not all archives provide "
-"<filename>Translation</filename> files for every Language - especially the "
-"long Languagecodes are rare, so please inform you which ones are available "
-"before you set here impossible values."
+"files are downloaded and in which order APT tries to display the description-"
+"translations. APT will try to display the first available description in the "
+"language which is listed first. Languages can be defined with their short or "
+"long language codes. Note that not all archives provide "
+"<filename>Translation</filename> files for every language - the long "
+"language codes are especially rare."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:500
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
+#: apt.conf.5.xml:549
 #, no-wrap
 msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:490
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:537
 msgid ""
 "The default list includes \"environment\" and \"en\". "
-"\"<literal>environment</literal>\" has a special meaning here: It will be "
-"replaced at runtime with the languagecodes extracted from the "
+"\"<literal>environment</literal>\" has a special meaning here: it will be "
+"replaced at runtime with the language codes extracted from the "
 "<literal>LC_MESSAGES</literal> environment variable.  It will also ensure "
 "that these codes are not included twice in the list. If "
 "<literal>LC_MESSAGES</literal> is set to \"C\" only the "
 "<filename>Translation-en</filename> file (if available) will be used.  To "
-"force apt to use no Translation file use the setting <literal>Acquire::"
+"force APT to use no Translation file use the setting <literal>Acquire::"
 "Languages=none</literal>. \"<literal>none</literal>\" is another special "
-"meaning code which will stop the search for a fitting <filename>Translation</"
-"filename> file.  This can be used by the system administrator to let APT "
-"know that it should download also this files without actually use them if "
-"the environment doesn't specify this languages. So the following example "
-"configuration will result in the order \"en, de\" in an english and in \"de, "
-"en\" in a german localization. Note that \"fr\" is downloaded, but not used "
-"if APT is not used in a french localization, in such an environment the "
-"order would be \"fr, de, en\".  <placeholder type=\"programlisting\" id="
-"\"0\"/>"
+"meaning code which will stop the search for a suitable "
+"<filename>Translation</filename> file.  This tells APT to download these "
+"translations too, without actually using them unless the environment "
+"specifies the languages. So the following example configuration will result "
+"in the order \"en, de\" in an English locale or \"de, en\" in a German one. "
+"Note that \"fr\" is downloaded, but not used unless APT is used in a French "
+"locale (where the order would be \"fr, de, en\").  <placeholder type="
+"\"programlisting\" id=\"0\"/>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:501
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:550
 msgid ""
 "Note: To prevent problems resulting from APT being executed in different "
 "environments (e.g. by different users or by other programs) all Translation "
@@ -4362,49 +4524,60 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:560
 msgid "Directories"
 msgstr "ディレクトリ"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:514
+#: apt.conf.5.xml:562
 #, fuzzy
 #| msgid ""
 #| "The <literal>Dir::State</literal> section has directories that pertain to "
 #| "local state information. <literal>lists</literal> is the directory to "
 #| "place downloaded package lists in and <literal>status</literal> is the "
-#| "name of the dpkg status file.  <literal>preferences</literal> is the name "
-#| "of the APT preferences file.  <literal>Dir::State</literal> contains the "
-#| "default directory to prefix on all sub items if they do not start with "
-#| "<filename>/</filename> or <filename>./</filename>."
+#| "name of the &dpkg; status file.  <literal>preferences</literal> is the "
+#| "name of the APT preferences file.  <literal>Dir::State</literal> contains "
+#| "the default directory to prefix on all sub-items if they do not start "
+#| "with <filename>/</filename> or <filename>./</filename>."
 msgid ""
 "The <literal>Dir::State</literal> section has directories that pertain to "
 "local state information. <literal>lists</literal> is the directory to place "
 "downloaded package lists in and <literal>status</literal> is the name of the "
-"dpkg status file.  <literal>preferences</literal> is the name of the APT "
+"&dpkg; status file.  <literal>preferences</literal> is the name of the APT "
 "<filename>preferences</filename> file.  <literal>Dir::State</literal> "
-"contains the default directory to prefix on all sub items if they do not "
+"contains the default directory to prefix on all sub-items if they do not "
 "start with <filename>/</filename> or <filename>./</filename>."
 msgstr ""
 "<literal>Dir::State</literal> セクションは、ローカル状態情報に関するディレク"
 "トリを保持します。<literal>lists</literal> は、ダウンロードしたパッケージ一覧"
-"を格納するディレクトリで、<literal>status</literal> は dpkg の状態ファイルの"
-"名前を表します。<literal>preferences</literal> は APT の 設定ファイルの名前で"
-"す。<literal>Dir::State</literal> には、<filename>/</filename> や "
+"を格納するディレクトリで、<literal>status</literal> は &dpkg; の状態ファイル"
+"の名前を表します。<literal>preferences</literal> は APT の 設定ファイルの名前"
+"です。<literal>Dir::State</literal> には、<filename>/</filename> や "
 "<filename>./</filename> で始まらないサブアイテムすべてに、前に付加するデフォ"
 "ルトディレクトリを含んでいます。"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:521
+#: apt.conf.5.xml:569
+#, fuzzy
+#| msgid ""
+#| "<literal>Dir::Cache</literal> contains locations pertaining to local "
+#| "cache information, such as the two package caches <literal>srcpkgcache</"
+#| "literal> and <literal>pkgcache</literal> as well as the location to place "
+#| "downloaded archives, <literal>Dir::Cache::archives</literal>. Generation "
+#| "of caches can be turned off by setting their names to be blank. This will "
+#| "slow down startup but save disk space. It is probably preferable to turn "
+#| "off the pkgcache rather than the srcpkgcache. Like <literal>Dir::State</"
+#| "literal> the default directory is contained in <literal>Dir::Cache</"
+#| "literal>"
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
 "and <literal>pkgcache</literal> as well as the location to place downloaded "
 "archives, <literal>Dir::Cache::archives</literal>. Generation of caches can "
-"be turned off by setting their names to be blank. This will slow down "
-"startup but save disk space. It is probably preferred to turn off the "
+"be turned off by setting their names to the empty string. This will slow "
+"down startup but save disk space. It is probably preferable to turn off the "
 "pkgcache rather than the srcpkgcache. Like <literal>Dir::State</literal> the "
 "default directory is contained in <literal>Dir::Cache</literal>"
 msgstr ""
@@ -4419,7 +4592,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:530
+#: apt.conf.5.xml:578
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4434,7 +4607,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:536
+#: apt.conf.5.xml:584
 msgid ""
 "The <literal>Dir::Parts</literal> setting reads in all the config fragments "
 "in lexical order from the directory specified. After this is done then the "
@@ -4446,7 +4619,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:540
+#: apt.conf.5.xml:588
 msgid ""
 "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
 "Bin::Methods</literal> specifies the location of the method handlers and "
@@ -4464,7 +4637,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:548
+#: apt.conf.5.xml:596
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "
@@ -4484,7 +4657,7 @@ msgstr ""
 "<filename>/tmp/staging/var/lib/dpkg/status</filename> から探します。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:561
+#: apt.conf.5.xml:609
 msgid ""
 "The <literal>Ignore-Files-Silently</literal> list can be used to specify "
 "which files APT should silently ignore while parsing the files in the "
@@ -4496,16 +4669,16 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:570
+#: apt.conf.5.xml:618
 msgid "APT in DSelect"
 msgstr "DSelect での APT"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:572
+#: apt.conf.5.xml:620
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
-"control the default behaviour. These are in the <literal>DSelect</literal> "
+"control the default behavior. These are in the <literal>DSelect</literal> "
 "section."
 msgstr ""
 "&dselect; 上で APT を使用する際、<literal>DSelect</literal> セクション以下の"
@@ -4513,44 +4686,49 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:577
+#: apt.conf.5.xml:625
 msgid ""
-"Cache Clean mode; this value may be one of always, prompt, auto, pre-auto "
-"and never.  always and prompt will remove all packages from the cache after "
-"upgrading, prompt (the default) does so conditionally.  auto removes only "
-"those packages which are no longer downloadable (replaced with a new version "
-"for instance).  pre-auto performs this action before downloading new "
-"packages."
+"Cache Clean mode; this value may be one of <literal>always</literal>, "
+"<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
+"literal> and <literal>never</literal>.  <literal>always</literal> and "
+"<literal>prompt</literal> will remove all packages from the cache after "
+"upgrading, <literal>prompt</literal> (the default) does so conditionally.  "
+"<literal>auto</literal> removes only those packages which are no longer "
+"downloadable (replaced with a new version for instance).  <literal>pre-auto</"
+"literal> performs this action before downloading new packages."
 msgstr ""
-"キャッシュクリーンモード - この値は always, prompt, auto, pre-auto, never の"
-"うちひとつを取ります。always と prompt は更新後、全パッケージをキャッシュから"
-"削除します。prompt (デフォルト) では条件付きで削除します。auto はダウンロード"
-"不能パッケージ (例えば新バージョンで置き換えられたもの) を削除します。pre-"
-"auto はこの動作を、新パッケージをダウンロードする直前に行います。"
+"キャッシュクリーンモード - この値は <literal>always</literal>, "
+"<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
+"literal>, <literal>never</literal> のうちひとつを取ります。<literal>always</"
+"literal> と <literal>prompt</literal> は更新後、全パッケージをキャッシュから"
+"削除します。<literal>prompt</literal> (デフォルト) では条件付きで削除します。"
+"<literal>auto</literal> はダウンロード不能パッケージ (例えば新バージョンで置"
+"き換えられたもの) を削除します。<literal>pre-auto</literal> はこの動作を、新"
+"パッケージをダウンロードする直前に行います。"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:586
+#: apt.conf.5.xml:639
 msgid ""
-"The contents of this variable is passed to &apt-get; as command line options "
-"when it is run for the install phase."
+"The contents of this variable are passed to &apt-get; as command line "
+"options when it is run for the install phase."
 msgstr ""
 "この変数の内容は、install 時のコマンドラインオプションと同様に &apt-get; に渡"
 "されます。"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:591
+#: apt.conf.5.xml:644
 msgid ""
-"The contents of this variable is passed to &apt-get; as command line options "
-"when it is run for the update phase."
+"The contents of this variable are passed to &apt-get; as command line "
+"options when it is run for the update phase."
 msgstr ""
 "この変数の内容は、update 時のコマンドラインオプションと同様に &apt-get; に渡"
 "されます。"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:596
+#: apt.conf.5.xml:649
 msgid ""
 "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
 "The default is to prompt only on error."
@@ -4560,13 +4738,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:602
-msgid "How APT calls dpkg"
-msgstr "APT が dpkg を呼ぶ方法"
+#: apt.conf.5.xml:655
+msgid "How APT calls &dpkg;"
+msgstr "APT が &dpkg; を呼ぶ方法"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:603
+#: apt.conf.5.xml:656
 msgid ""
 "Several configuration directives control how APT invokes &dpkg;. These are "
 "in the <literal>DPkg</literal> section."
@@ -4576,22 +4754,22 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:608
+#: apt.conf.5.xml:661
 msgid ""
-"This is a list of options to pass to dpkg. The options must be specified "
+"This is a list of options to pass to &dpkg;. The options must be specified "
 "using the list notation and each list item is passed as a single argument to "
 "&dpkg;."
 msgstr ""
-"dpkg に渡すオプションのリストです。オプションは、リスト記法を使用して指定しな"
-"ければなりません。また、各リストは単一の引数として &dpkg; に渡されます。"
+"&dpkg; に渡すオプションのリストです。オプションは、リスト記法を使用して指定し"
+"なければなりません。また、各リストは単一の引数として &dpkg; に渡されます。"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:614
+#: apt.conf.5.xml:667
 msgid ""
 "This is a list of shell commands to run before/after invoking &dpkg;.  Like "
 "<literal>options</literal> this must be specified in list notation. The "
-"commands are invoked in order using <filename>/bin/sh</filename>, should any "
+"commands are invoked in order using <filename>/bin/sh</filename>; should any "
 "fail APT will abort."
 msgstr ""
 "&dpkg; を呼び出す前後で実行するシェルコマンドのリストです。<literal>options</"
@@ -4601,13 +4779,20 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:621
+#: apt.conf.5.xml:674
+#, fuzzy
+#| msgid ""
+#| "This is a list of shell commands to run before invoking &dpkg;. Like "
+#| "<literal>options</literal> this must be specified in list notation. The "
+#| "commands are invoked in order using <filename>/bin/sh</filename>; should "
+#| "any fail APT will abort. APT will pass to the commands on standard input "
+#| "the filenames of all .deb files it is going to install, one per line."
 msgid ""
-"This is a list of shell commands to run before invoking dpkg. Like "
+"This is a list of shell commands to run before invoking &dpkg;. Like "
 "<literal>options</literal> this must be specified in list notation. The "
-"commands are invoked in order using <filename>/bin/sh</filename>, should any "
-"fail APT will abort. APT will pass to the commands on standard input the "
-"filenames of all .deb files it is going to install, one per line."
+"commands are invoked in order using <filename>/bin/sh</filename>; should any "
+"fail APT will abort. APT will pass the filenames of all .deb files it is "
+"going to install to the commands, one per line on standard input."
 msgstr ""
 "&dpkg; を呼び出す前に実行するシェルコマンドのリストです。<literal>options</"
 "literal> のようにリスト記法で指定しなければなりません。コマンドは <filename>/"
@@ -4617,7 +4802,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:627
+#: apt.conf.5.xml:680
 msgid ""
 "Version 2 of this protocol dumps more information, including the protocol "
 "version, the APT configuration space and the packages, files and versions "
@@ -4633,46 +4818,46 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:635
+#: apt.conf.5.xml:688
 msgid ""
-"APT chdirs to this directory before invoking dpkg, the default is <filename>/"
-"</filename>."
+"APT chdirs to this directory before invoking &dpkg;, the default is "
+"<filename>/</filename>."
 msgstr ""
-"APT は dpkg を呼び出す前にこのディレクトリに移動します。デフォルトは "
+"APT は &dpkg; を呼び出す前にこのディレクトリに移動します。デフォルトは "
 "<filename>/</filename> です。"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:640
+#: apt.conf.5.xml:693
 msgid ""
-"These options are passed to &dpkg-buildpackage; when compiling packages, the "
+"These options are passed to &dpkg-buildpackage; when compiling packages; the "
 "default is to disable signing and produce all binaries."
 msgstr ""
 "これらのオプションは、パッケージのコンパイル時に &dpkg-buildpackage; に渡され"
 "ます。デフォルトでは署名を無効にし、全バイナリを生成します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:645
+#: apt.conf.5.xml:698
 msgid "dpkg trigger usage (and related options)"
 msgstr "dpkg トリガの使い方 (および関連オプション)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:646
+#: apt.conf.5.xml:699
 msgid ""
-"APT can call dpkg in a way so it can make aggressive use of triggers over "
-"multiple calls of dpkg. Without further options dpkg will use triggers only "
-"in between his own run. Activating these options can therefore decrease the "
-"time needed to perform the install / upgrade. Note that it is intended to "
-"activate these options per default in the future, but as it changes the way "
-"APT calling dpkg drastically it needs a lot more testing.  <emphasis>These "
-"options are therefore currently experimental and should not be used in "
-"productive environments.</emphasis> Also it breaks the progress reporting so "
-"all frontends will currently stay around half (or more) of the time in the "
-"100% state while it actually configures all packages."
+"APT can call &dpkg; in such a way as to let it make aggressive use of "
+"triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
+"use triggers once each time it runs.  Activating these options can therefore "
+"decrease the time needed to perform the install or upgrade. Note that it is "
+"intended to activate these options per default in the future, but as it "
+"drastically changes the way APT calls &dpkg; it needs a lot more testing.  "
+"<emphasis>These options are therefore currently experimental and should not "
+"be used in production environments.</emphasis> It also breaks progress "
+"reporting such that all front-ends will currently stay around half (or more) "
+"of the time in the 100% state while it actually configures all packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:661
+#: apt.conf.5.xml:714
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
@@ -4686,82 +4871,72 @@ msgstr ""
 "DPkg::TriggersPending \"true\";"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:655
+#: apt.conf.5.xml:708
 msgid ""
 "Note that it is not guaranteed that APT will support these options or that "
 "these options will not cause (big) trouble in the future. If you have "
 "understand the current risks and problems with these options, but are brave "
-"enough to help testing them create a new configuration file and test a "
+"enough to help testing them, create a new configuration file and test a "
 "combination of options. Please report any bugs, problems and improvements "
 "you encounter and make sure to note which options you have used in your "
-"reports. Asking dpkg for help could also be useful for debugging proposes, "
+"reports. Asking &dpkg; for help could also be useful for debugging proposes, "
 "see e.g. <command>dpkg --audit</command>. A defensive option combination "
 "would be <placeholder type=\"literallayout\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:668
+#: apt.conf.5.xml:721
 msgid ""
-"Add the no triggers flag to all dpkg calls (except the ConfigurePending "
+"Add the no triggers flag to all &dpkg; calls (except the ConfigurePending "
 "call).  See &dpkg; if you are interested in what this actually means. In "
-"short: dpkg will not run the triggers when this flag is present unless it is "
-"explicitly called to do so in an extra call.  Note that this option exists "
-"(undocumented) also in older apt versions with a slightly different meaning: "
-"Previously these option only append --no-triggers to the configure calls to "
-"dpkg - now apt will add these flag also to the unpack and remove calls."
+"short: &dpkg; will not run the triggers when this flag is present unless it "
+"is explicitly called to do so in an extra call.  Note that this option "
+"exists (undocumented) also in older APT versions with a slightly different "
+"meaning: Previously these option only append --no-triggers to the configure "
+"calls to &dpkg; - now APT will also add this flag to the unpack and remove "
+"calls."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:676
+#: apt.conf.5.xml:729
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
-"and \"<literal>no</literal>\".  \"<literal>all</literal>\" is the default "
-"value and causes APT to configure all packages explicit.  The "
-"\"<literal>smart</literal>\" way is it to configure only packages which need "
-"to be configured before another package can be unpacked (Pre-Depends) and "
-"let the rest configure by dpkg with a call generated by the next option. "
-"\"<literal>no</literal>\" on the other hand will not configure anything and "
-"totally rely on dpkg for configuration (which will at the moment fail if a "
-"Pre-Depends is encountered).  Setting this option to another than the all "
-"value will implicitly activate also the next option per default as otherwise "
-"the system could end in an unconfigured status which could be unbootable!"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:687
-msgid ""
-"If this option is set apt will call <command>dpkg --configure --pending</"
-"command> to let dpkg handle all required configurations and triggers. This "
-"option is activated automatic per default if the previous option is not set "
-"to <literal>all</literal>, but deactivating could be useful if you want to "
-"run APT multiple times in a row - e.g. in an installer. In these sceneries "
-"you could deactivate this option in all but the last run."
+"and \"<literal>no</literal>\".  The default value is \"<literal>all</literal>"
+"\", which causes APT to configure all packages. The \"<literal>smart</"
+"literal>\" way is to configure only packages which need to be configured "
+"before another package can be unpacked (Pre-Depends), and let the rest be "
+"configured by &dpkg; with a call generated by the ConfigurePending option "
+"(see below). On the other hand, \"<literal>no</literal>\" will not configure "
+"anything, and totally relies on &dpkg; for configuration (which at the "
+"moment will fail if a Pre-Depends is encountered). Setting this option to "
+"any value other than <literal>all</literal> will implicitly also activate "
+"the next option by default, as otherwise the system could end in an "
+"unconfigured and potentially unbootable state."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:694
+#: apt.conf.5.xml:744
 msgid ""
-"Useful for <literal>smart</literal> configuration as a package which has "
-"pending triggers is not considered as <literal>installed</literal> and dpkg "
-"treats them as <literal>unpacked</literal> currently which is a dealbreaker "
-"for Pre-Dependencies (see debbugs #526774). Note that this will process all "
-"triggers, not only the triggers needed to configure this package."
+"If this option is set APT will call <command>dpkg --configure --pending</"
+"command> to let &dpkg; handle all required configurations and triggers. This "
+"option is activated automatically per default if the previous option is not "
+"set to <literal>all</literal>, but deactivating it could be useful if you "
+"want to run APT multiple times in a row - e.g. in an installer. In these "
+"sceneries you could deactivate this option in all but the last run."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:700
+#: apt.conf.5.xml:751
 msgid ""
-"As the configuration can be deferred to be done at the end by dpkg it can be "
-"tried to order the unpack series only by critical needs, e.g. by Pre-"
-"Depends. Default is true and therefore the \"old\" method of ordering in "
-"various steps by everything. While both method were present in earlier APT "
-"versions the <literal>OrderCritical</literal> method was unused, so this "
-"method is very experimental and needs further improvements before becoming "
-"really useful."
+"Useful for the <literal>smart</literal> configuration as a package which has "
+"pending triggers is not considered as <literal>installed</literal>, and "
+"&dpkg; treats them as <literal>unpacked</literal> currently which is a "
+"showstopper for Pre-Dependencies (see debbugs #526774). Note that this will "
+"process all triggers, not only the triggers needed to configure this package."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:715
+#: apt.conf.5.xml:764
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
@@ -4779,31 +4954,31 @@ msgstr ""
 "};"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:708
+#: apt.conf.5.xml:757
 msgid ""
-"Essential packages (and there dependencies) should be configured immediately "
-"after unpacking. It will be a good idea to do this quite early in the "
-"upgrade process as these these configure calls require currently also "
-"<literal>DPkg::TriggersPending</literal> which will run quite a few triggers "
-"(which maybe not needed). Essentials get per default a high score but the "
-"immediate flag is relatively low (a package which has a Pre-Depends is "
-"higher rated).  These option and the others in the same group can be used to "
-"change the scoring. The following example shows the settings with there "
-"default values.  <placeholder type=\"literallayout\" id=\"0\"/>"
+"Essential packages (and their dependencies) should be configured immediately "
+"after unpacking. It is a good idea to do this quite early in the upgrade "
+"process as these configure calls also currently require <literal>DPkg::"
+"TriggersPending</literal> which will run quite a few triggers (which may not "
+"be needed). Essentials get per default a high score but the immediate flag "
+"is relatively low (a package which has a Pre-Depends is rated higher).  "
+"These option and the others in the same group can be used to change the "
+"scoring. The following example shows the settings with their default "
+"values.  <placeholder type=\"literallayout\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:728
+#: apt.conf.5.xml:777
 msgid "Periodic and Archives options"
 msgstr "Periodic オプションと Archives オプション"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:729
+#: apt.conf.5.xml:778
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
-"of options configure behavior of apt periodic updates, which is done by "
-"<literal>/etc/cron.daily/apt</literal> script. See header of this script for "
-"the brief documentation of these options."
+"of options configure behavior of apt periodic updates, which is done by the "
+"<literal>/etc/cron.daily/apt</literal> script. See the top of this script "
+"for the brief documentation of these options."
 msgstr ""
 "オプションの <literal>APT::Periodic</literal> グループと <literal>APT::"
 "Archives</literal> グループは、<literal>/etc/cron.daily/apt</literal> スクリ"
@@ -4812,12 +4987,12 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:737
+#: apt.conf.5.xml:786
 msgid "Debug options"
 msgstr "デバッグオプション"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:739
+#: apt.conf.5.xml:788
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -4828,7 +5003,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:750
+#: apt.conf.5.xml:799
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -4839,7 +5014,7 @@ msgstr ""
 "にします。"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:758
+#: apt.conf.5.xml:807
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s install</"
@@ -4850,7 +5025,7 @@ msgstr ""
 "literal>) を行う場合に使用します。"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:767
+#: apt.conf.5.xml:816
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
@@ -4862,7 +5037,7 @@ msgstr ""
 #. 	   motivating example, except I haven't a clue why you'd want
 #. 	   to do this. 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:775
+#: apt.conf.5.xml:824
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
 "in CD-ROM IDs."
@@ -4871,34 +5046,34 @@ msgstr ""
 "gainを無効にします。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:785
+#: apt.conf.5.xml:834
 msgid "A full list of debugging options to apt follows."
 msgstr "以下は apt に対するデバッグオプションのすべてです。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:794
+#: apt.conf.5.xml:843
 msgid ""
 "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
 "<literal>cdrom://</literal> ソースへのアクセスに関する情報を出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:805
+#: apt.conf.5.xml:854
 msgid "Print information related to downloading packages using FTP."
 msgstr "FTP を用いたパッケージのダウンロードに関する情報を出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:816
+#: apt.conf.5.xml:865
 msgid "Print information related to downloading packages using HTTP."
 msgstr "HTTP を用いたパッケージのダウンロードに関する情報を出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:827
+#: apt.conf.5.xml:876
 msgid "Print information related to downloading packages using HTTPS."
 msgstr "HTTPS を用いたパッケージのダウンロードに関する情報を出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:838
+#: apt.conf.5.xml:887
 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
@@ -4906,7 +5081,7 @@ msgstr ""
 "<literal>gpg</literal> を用いた暗号署名の検証に関する情報を出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:849
+#: apt.conf.5.xml:898
 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
@@ -4915,12 +5090,12 @@ msgstr ""
 "します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:859
+#: apt.conf.5.xml:908
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr "&apt-get; での構築依存関係解決のプロセスを説明します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:869
+#: apt.conf.5.xml:918
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
@@ -4928,7 +5103,7 @@ msgstr ""
 "<literal>apt</literal> ライブラリが生成した、暗号化ハッシュを出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:879
+#: apt.conf.5.xml:928
 msgid ""
 "Do not include information from <literal>statfs</literal>, namely the number "
 "of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@ -4938,7 +5113,7 @@ msgstr ""
 "システムにある使用済・未使用ブロックの数からの情報を含めないようにします。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:890
+#: apt.conf.5.xml:939
 msgid ""
 "Disable all file locking.  For instance, this will allow two instances of "
 "<quote><literal>apt-get update</literal></quote> to run at the same time."
@@ -4947,13 +5122,13 @@ msgstr ""
 "<quote><literal>apt-get update</literal></quote> を実行できるようになります。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:902
+#: apt.conf.5.xml:951
 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
 "グローバルダウンロードキューに対する項目の追加・削除の際にログを出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:912
+#: apt.conf.5.xml:961
 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
@@ -4962,7 +5137,7 @@ msgstr ""
 "ジやエラーを出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:922
+#: apt.conf.5.xml:971
 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."
@@ -4971,7 +5146,7 @@ msgstr ""
 "します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:934
+#: apt.conf.5.xml:983
 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."
@@ -4980,14 +5155,14 @@ msgstr ""
 "リストへのパッチ適用に関する情報を出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:945
+#: apt.conf.5.xml:994
 msgid ""
 "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
 "実際のダウンロードを行う際の、サブプロセスとのやりとりをログに出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:956
+#: apt.conf.5.xml:1005
 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."
@@ -4996,7 +5171,7 @@ msgstr ""
 "に出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:966
+#: apt.conf.5.xml:1015
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
@@ -5011,29 +5186,25 @@ msgstr ""
 "路に対応しています。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:980
+#: apt.conf.5.xml:1029
 msgid ""
-"Generate debug messages describing which package is marked as keep/install/"
+"Generate debug messages describing which packages are marked as keep/install/"
 "remove while the ProblemResolver does his work.  Each addition or deletion "
-"may trigger additional actions; they are shown indented two additional space "
-"under the original entry.  The format for each line is <literal>MarkKeep</"
-"literal>, <literal>MarkDelete</literal> or <literal>MarkInstall</literal> "
-"followed by <literal>package-name &lt;a.b.c -&gt; d.e.f | x.y.z&gt; (section)"
-"</literal> where <literal>a.b.c</literal> is the current version of the "
-"package, <literal>d.e.f</literal> is the version considered for installation "
-"and <literal>x.y.z</literal> is a newer version, but not considered for "
-"installation (because of a low pin score). The later two can be omitted if "
-"there is none or if it is the same version as the installed.  "
-"<literal>section</literal> is the name of the section the package appears in."
+"may trigger additional actions; they are shown indented two additional "
+"spaces under the original entry.  The format for each line is "
+"<literal>MarkKeep</literal>, <literal>MarkDelete</literal> or "
+"<literal>MarkInstall</literal> followed by <literal>package-name &lt;a.b.c -"
+"&gt; d.e.f | x.y.z&gt; (section)</literal> where <literal>a.b.c</literal> is "
+"the current version of the package, <literal>d.e.f</literal> is the version "
+"considered for installation and <literal>x.y.z</literal> is a newer version, "
+"but not considered for installation (because of a low pin score). The later "
+"two can be omitted if there is none or if it is the same as the installed "
+"version.  <literal>section</literal> is the name of the section the package "
+"appears in."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1002
-msgid "Dump the default configuration to standard error on startup."
-msgstr "起動時に、標準エラー出力へデフォルト設定を出力します。"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1012
+#: apt.conf.5.xml:1050
 msgid ""
 "When invoking &dpkg;, output the precise command line with which it is being "
 "invoked, with arguments separated by a single space character."
@@ -5042,7 +5213,7 @@ msgstr ""
 "切られます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1023
+#: apt.conf.5.xml:1061
 msgid ""
 "Output all the data received from &dpkg; on the status file descriptor and "
 "any errors encountered while parsing it."
@@ -5051,7 +5222,7 @@ msgstr ""
 "を解析中に発生したエラーを出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1034
+#: apt.conf.5.xml:1072
 msgid ""
 "Generate a trace of the algorithm that decides the order in which "
 "<literal>apt</literal> should pass packages to &dpkg;."
@@ -5060,18 +5231,18 @@ msgstr ""
 "のトレースを生成します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1046
+#: apt.conf.5.xml:1084
 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr "&dpkg; を呼び出す際に、実行手順を追跡した状態メッセージを出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1057
+#: apt.conf.5.xml:1095
 msgid "Output the priority of each package list on startup."
 msgstr "起動時の各パッケージの優先度を表示します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1067
+#: apt.conf.5.xml:1105
 msgid ""
 "Trace the execution of the dependency resolver (this applies only to what "
 "happens when a complex dependency problem is encountered)."
@@ -5080,7 +5251,7 @@ msgstr ""
 "した場合にのみ、適用されます)。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1078
+#: apt.conf.5.xml:1116
 msgid ""
 "Display a list of all installed packages with their calculated score used by "
 "the pkgProblemResolver. The description of the package is the same as "
@@ -5088,7 +5259,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1090
+#: apt.conf.5.xml:1128
 msgid ""
 "Print information about the vendors read from <filename>/etc/apt/vendors."
 "list</filename>."
@@ -5098,14 +5269,14 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1112 apt_preferences.5.xml:545 sources.list.5.xml:211
+#: apt.conf.5.xml:1150 apt_preferences.5.xml:545 sources.list.5.xml:211
 #: apt-ftparchive.1.xml:596
 msgid "Examples"
 msgstr "サンプル"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1113
+#: apt.conf.5.xml:1151
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
@@ -5116,7 +5287,7 @@ msgstr ""
 # type: Content of: <refentry><refsect1><para>
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1125
+#: apt.conf.5.xml:1163
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
 
@@ -5225,7 +5396,7 @@ msgid ""
 "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, unless that file matches a pattern in the "
-"<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this "
+"<literal>Dir::Ignore-Files-Silently</literal> configuration list - in which "
 "case it will be silently ignored."
 msgstr ""
 "<filename>/etc/apt/preferences.d</filename> ディレクトリにあるファイルは、英"
@@ -6564,40 +6735,26 @@ msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 msgid "Package resource list for APT"
 msgstr "APT 用パッケージリソースリスト"
 
-# type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:37
+#: sources.list.5.xml:38
 msgid ""
-"The package resource list is used to locate archives of the package "
-"distribution system in use on the system. At this time, this manual page "
-"documents only the packaging system used by the Debian system.  This control "
-"file is <filename>/etc/apt/sources.list</filename>."
+"The source list <filename>/etc/apt/sources.list</filename> is designed to "
+"support any number of active sources and a variety of source media. The file "
+"lists one source per line, with the most preferred source listed first. The "
+"information available from the configured sources is acquired by "
+"<command>apt-get update</command> (or by an equivalent command from another "
+"APT front-end)."
 msgstr ""
-"このパッケージリソースリストは、システムで使用するパッケージの保管場所を特定"
-"するのに使用されます。今回このマニュアルページには、Debian システムで使用する"
-"パッケージシステムについてのみ記述します。この制御ファイルは、<filename>/etc/"
-"apt/sources.list</filename> にあります。"
 
-# type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:42
-msgid ""
-"The source list is designed to support any number of active sources and a "
-"variety of source media. The file lists one source per line, with the most "
-"preferred source listed first. The format of each line is: <literal>type uri "
-"args</literal> The first item, <literal>type</literal> determines the format "
-"for <literal>args</literal>. <literal>uri</literal> is a Universal Resource "
-"Identifier (URI), which is a superset of the more specific and well-known "
-"Universal Resource Locator, or URL. The rest of the line can be marked as a "
-"comment by using a #."
-msgstr ""
-"ソースリストは複数の有効な取得元と、様々な取得メディアをサポートしています。"
-"ファイルには 1 行ごと取得元を列挙し、上の方にあるものから使用します。行の"
-"フォーマットは、<literal>タイプ uri 引数</literal> となります。先頭の "
-"<literal>タイプ</literal> で、<literal>引数</literal> のフォーマットを決定し"
-"ます。<literal>uri</literal> は Universal Resource Identifier (URI) で、よく"
-"知られた Universal Resource Locator (URL) のスーパーセットです。行の残りに # "
-"を付けて、コメントにできます。"
+#: sources.list.5.xml:45
+msgid ""
+"Each line specifying a source starts with type (e.g. <literal>deb-src</"
+"literal>)  followed by options and arguments for this type.  Individual "
+"entries cannot be continued onto a following line. Empty lines are ignored, "
+"and a <literal>#</literal> character anywhere on a line marks the remainder "
+"of that line as a comment."
+msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
@@ -6624,7 +6781,7 @@ msgid ""
 "digits (0-9), underscore (_), hyphen (-) and period (.) characters.  "
 "Otherwise APT will print a notice that it has ignored a file, unless that "
 "file matches a pattern in the <literal>Dir::Ignore-Files-Silently</literal> "
-"configuration list - in this case it will be silently ignored."
+"configuration list - in which case it will be silently ignored."
 msgstr ""
 "<filename>/etc/apt/sources.list.d</filename> ディレクトリは、個別ファイルで追"
 "加 source.list エントリを提供します。フォーマットは、通常の "
@@ -6644,7 +6801,7 @@ msgstr "deb タイプと deb-src タイプ"
 #: sources.list.5.xml:66
 #, fuzzy
 #| msgid ""
-#| "The <literal>deb</literal> type describes a typical two-level Debian "
+#| "The <literal>deb</literal> type references a typical two-level Debian "
 #| "archive, <filename>distribution/component</filename>. Typically, "
 #| "<literal>distribution</literal> is generally one of <literal>stable</"
 #| "literal> <literal>unstable</literal> or <literal>testing</literal> while "
@@ -6654,16 +6811,16 @@ msgstr "deb タイプと deb-src タイプ"
 #| "code in the same form as the <literal>deb</literal> type.  A <literal>deb-"
 #| "src</literal> line is required to fetch source indexes."
 msgid ""
-"The <literal>deb</literal> type describes a typical two-level Debian "
-"archive, <filename>distribution/component</filename>. Typically, "
-"<literal>distribution</literal> is generally an archivename like "
+"The <literal>deb</literal> type references a typical two-level Debian "
+"archive, <filename>distribution/component</filename>. The "
+"<literal>distribution</literal> is generally an archive name like "
 "<literal>stable</literal> or <literal>testing</literal> or a codename like "
 "<literal>&stable-codename;</literal> or <literal>&testing-codename;</"
-"literal> while component is one of <literal>main</literal> <literal>contrib</"
-"literal> or <literal>non-free</literal>. The <literal>deb-src</literal> type "
-"describes a debian distribution's source code in the same form as the "
-"<literal>deb</literal> type.  A <literal>deb-src</literal> line is required "
-"to fetch source indexes."
+"literal> while component is one of <literal>main</literal>, "
+"<literal>contrib</literal> or <literal>non-free</literal>. The <literal>deb-"
+"src</literal> type references a Debian distribution's source code in the "
+"same form as the <literal>deb</literal> type.  A <literal>deb-src</literal> "
+"line is required to fetch source indexes."
 msgstr ""
 "<literal>deb</literal> タイプでは典型的な 2 段階の Debian アーカイブ "
 "<filename>distribution/component</filename> を記述します。よくあるケースで"
@@ -6696,39 +6853,58 @@ msgstr "deb uri distribution [component1] [component2] [...]"
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:83
+#, fuzzy
+#| msgid ""
+#| "The URI for the <literal>deb</literal> type must specify the base of the "
+#| "Debian distribution, from which APT will find the information it needs.  "
+#| "<literal>distribution</literal> can specify an exact path, in which case "
+#| "the components must be omitted and <literal>distribution</literal> must "
+#| "end with a slash (<literal>/</literal>). This is useful for the case when "
+#| "only a particular sub-section of the archive denoted by the URI is of "
+#| "interest. If <literal>distribution</literal> does not specify an exact "
+#| "path, at least one <literal>component</literal> must be present."
 msgid ""
 "The URI for the <literal>deb</literal> type must specify the base of the "
 "Debian distribution, from which APT will find the information it needs.  "
 "<literal>distribution</literal> can specify an exact path, in which case the "
 "components must be omitted and <literal>distribution</literal> must end with "
-"a slash (/). This is useful for when the case only a particular sub-section "
-"of the archive denoted by the URI is of interest.  If <literal>distribution</"
-"literal> does not specify an exact path, at least one <literal>component</"
-"literal> must be present."
+"a slash (<literal>/</literal>). This is useful for the case when only a "
+"particular sub-section of the archive denoted by the URI is of interest.  If "
+"<literal>distribution</literal> does not specify an exact path, at least one "
+"<literal>component</literal> must be present."
 msgstr ""
 "<literal>deb</literal> タイプの URI は、APT が必要な情報を見つけられるよう"
 "に、Debian ディストリビューションの基底を指定しなければなりません。"
 "<literal>distribution</literal> には正確なパスを指定できます。その場合 "
-"component を省略し、<literal>distribution</literal> はスラッシュ (/) で終わら"
-"なくてはなりません。これは URL で指定されたアーカイブの、特定のサブセクション"
-"のみに関心があるときに役に立ちます。<literal>distribution</literal> に正確な"
-"パスを指定しないのなら、少なくともひとつは <literal>component</literal> を指"
-"定しなければなりません。"
+"component を省略し、<literal>distribution</literal> はスラッシュ (<literal>/"
+"</literal>) で終わらなくてはなりません。これは URL で指定されたアーカイブの、"
+"特定のサブセクションのみに関心があるときに役に立ちます。"
+"<literal>distribution</literal> に正確なパスを指定しないのなら、少なくともひ"
+"とつは <literal>component</literal> を指定しなければなりません。"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:92
+#, fuzzy
+#| msgid ""
+#| "<literal>distribution</literal> may also contain a variable, <literal>"
+#| "$(ARCH)</literal> which expands to the Debian architecture (i386, amd64, "
+#| "powerpc, ...)  used on the system. This permits architecture-independent "
+#| "<filename>sources.list</filename> files to be used. In general this is "
+#| "only of interest when specifying an exact path, <literal>APT</literal> "
+#| "will automatically generate a URI with the current architecture otherwise."
 msgid ""
 "<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)"
-"</literal> which expands to the Debian architecture (i386, m68k, "
-"powerpc, ...)  used on the system. This permits architecture-independent "
-"<filename>sources.list</filename> files to be used. In general this is only "
-"of interest when specifying an exact path, <literal>APT</literal> will "
-"automatically generate a URI with the current architecture otherwise."
+"</literal> which expands to the Debian architecture (such as <literal>amd64</"
+"literal> or <literal>armel</literal>) used on the system. This permits "
+"architecture-independent <filename>sources.list</filename> files to be used. "
+"In general this is only of interest when specifying an exact path, "
+"<literal>APT</literal> will automatically generate a URI with the current "
+"architecture otherwise."
 msgstr ""
 "<literal>distribution</literal> は、<literal>$(ARCH)</literal> 変数を含む場合"
 "があります。<literal>$(ARCH)</literal> 変数は、システムで使用している Debian "
-"アーキテクチャ (i386, m68k, powerpc, ...) に展開されます。これにより、アーキ"
+"アーキテクチャ (i386, amd64, powerpc, ...) に展開されます。これにより、アーキ"
 "テクチャに依存しない <filename>sources.list</filename> ファイルを使用できま"
 "す。一般的に、これは正しいパスを指定するときに気にするだけです。そうでない場"
 "合は、<literal>APT</literal> は現在のアーキテクチャで URI を自動的に生成しま"
@@ -6761,12 +6937,12 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:112
 msgid ""
-"<literal>options</literal> is always optional and needs to be surounded by "
+"<literal>options</literal> is always optional and needs to be surrounded 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:"
+"following settings are supported by APT (note however that unsupported "
+"settings will be ignored silently):"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
@@ -6774,7 +6950,7 @@ msgstr ""
 msgid ""
 "<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 "
+"information should be downloaded. If this option is not set all "
 "architectures defined by the <literal>APT::Architectures</literal> option "
 "will be downloaded."
 msgstr ""
@@ -6877,13 +7053,23 @@ msgstr ""
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml:172
+#, fuzzy
+#| msgid ""
+#| "The ftp scheme specifies an FTP server for the archive. APT's FTP "
+#| "behavior is highly configurable; for more information see the &apt-conf; "
+#| "manual page. Please note that a ftp proxy can be specified by using the "
+#| "<envar>ftp_proxy</envar> environment variable. It is possible to specify "
+#| "a http proxy (http proxy servers often understand ftp urls)  using this "
+#| "method and ONLY this method. ftp proxies using http specified in the "
+#| "configuration file will be ignored."
 msgid ""
 "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
 "is highly configurable; for more information see the &apt-conf; manual page. "
-"Please note that a ftp proxy can be specified by using the <envar>ftp_proxy</"
-"envar> environment variable. It is possible to specify a http proxy (http "
-"proxy servers often understand ftp urls)  using this method and ONLY this "
-"method. ftp proxies using http specified in the configuration file will be "
+"Please note that an FTP proxy can be specified by using the "
+"<envar>ftp_proxy</envar> environment variable. It is possible to specify an "
+"HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
+"environment variable and <emphasis>ONLY</emphasis> this environment "
+"variable. Proxies using HTTP specified in the configuration file will be "
 "ignored."
 msgstr ""
 "ftp スキームは、アーカイブに FTP サーバを指定します。APT の FTP の振る舞い"
@@ -6896,11 +7082,18 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:183
+#: sources.list.5.xml:184
+#, fuzzy
+#| msgid ""
+#| "The copy scheme is identical to the file scheme except that packages are "
+#| "copied into the cache directory instead of used directly at their "
+#| "location.  This is useful for people using a zip disk to copy files "
+#| "around with APT."
 msgid ""
 "The copy scheme is identical to the file scheme except that packages are "
 "copied into the cache directory instead of used directly at their location.  "
-"This is useful for people using a zip disk to copy files around with APT."
+"This is useful for people using removable media to copy files around with "
+"APT."
 msgstr ""
 "copy スキームは、file スキームと同様ですが、パッケージをその場で使用せず、"
 "キャッシュディレクトリにコピーするところが違います。zip ディスクを使用してい"
@@ -6908,13 +7101,19 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:190
+#: sources.list.5.xml:191
+#, fuzzy
+#| msgid ""
+#| "The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given "
+#| "user and access the files. It is a good idea to do prior arrangements "
+#| "with RSA keys or rhosts.  Access to files on the remote uses standard "
+#| "<command>find</command> and <command>dd</command> commands to perform the "
+#| "file transfers from the remote."
 msgid ""
-"The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given "
-"user and access the files. It is a good idea to do prior arrangements with "
-"RSA keys or rhosts.  Access to files on the remote uses standard "
-"<command>find</command> and <command>dd</command> commands to perform the "
-"file transfers from the remote."
+"The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
+"the files as a given user. Prior configuration of rhosts or RSA keys is "
+"recommended. The standard <command>find</command> and <command>dd</command> "
+"commands are used to perform the file transfers from the remote host."
 msgstr ""
 "rsh/ssh メソッドは、与えられたユーザでリモートホストに接続し、ファイルにアク"
 "セスするのに rsh/ssh を使用します。あらかじめ RSA キーや rhosts の配置してお"
@@ -6932,12 +7131,12 @@ msgstr "さらに認識できる URI タイプ"
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml:200
 msgid ""
-"APT can be extended with more methods shipped in other optional packages "
-"which should follow the nameing scheme <package>apt-transport-"
-"<replaceable>method</replaceable></package>.  The APT team e.g. maintains "
-"also the <package>apt-transport-https</package> package which provides "
-"access methods for https-URIs with features similar to the http method, but "
-"other methods for using e.g. debtorrent are also available, see &apt-"
+"APT can be extended with more methods shipped in other optional packages, "
+"which should follow the naming scheme <package>apt-transport-"
+"<replaceable>method</replaceable></package>.  For instance, the APT team "
+"also maintains the package <package>apt-transport-https</package>, which "
+"provides access methods for HTTPS URIs with features similar to the http "
+"method.  Methods for using e.g. debtorrent are also available - see &apt-"
 "transport-debtorrent;."
 msgstr ""
 
@@ -7199,7 +7398,10 @@ msgstr ""
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 #: apt-sortpkgs.1.xml:45
-msgid "All output is sent to stdout, the input must be a seekable file."
+#, fuzzy
+#| msgid "All output is sent to stdout, the input must be a seekable file."
+msgid ""
+"All output is sent to standard output; the input must be a seekable file."
 msgstr ""
 "出力はすべて標準出力に送られ、入力は検索できるファイルでなければなりません。"
 
@@ -9566,6 +9768,95 @@ msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
 msgid "Which will use the already fetched archives on the disc."
 msgstr "これで、disc にある取得済みのアーカイブを使用するようになります。"
 
+#~ msgid "Dump the default configuration to standard error on startup."
+#~ msgstr "起動時に、標準エラー出力へデフォルト設定を出力します。"
+
+#~ msgid ""
+#~ "Defaults to on which will cause APT to install essential and important "
+#~ "packages as fast as possible in the install/upgrade operation. This is "
+#~ "done to limit the effect of a failing &dpkg; call: If this option is "
+#~ "disabled APT does treat an important package in the same way as an extra "
+#~ "package: Between the unpacking of the important package A and his "
+#~ "configuration can then be many other unpack or configuration calls, e.g. "
+#~ "for package B which has no relation to A, but causes the dpkg call to "
+#~ "fail (e.g. because maintainer script of package B generates an error) "
+#~ "which results in a system state in which package A is unpacked but "
+#~ "unconfigured - each package depending on A is now no longer guaranteed to "
+#~ "work as their dependency on A is not longer satisfied. The immediate "
+#~ "configuration marker is also applied to all dependencies which can "
+#~ "generate a problem if the dependencies e.g. form a circle as a dependency "
+#~ "with the immediate flag is comparable with a Pre-Dependency. So in theory "
+#~ "it is possible that APT encounters a situation in which it is unable to "
+#~ "perform immediate configuration, errors out and refers to this option so "
+#~ "the user can deactivate the immediate configuration temporarily to be "
+#~ "able to perform an install/upgrade again. Note the use of the word "
+#~ "\"theory\" here as this problem was only encountered by now in real world "
+#~ "a few times in non-stable distribution versions and was caused by wrong "
+#~ "dependencies of the package in question or by a system in an already "
+#~ "broken state, so you should not blindly disable this option as the "
+#~ "mentioned scenario above is not the only problem immediate configuration "
+#~ "can help to prevent in the first place.  Before a big operation like "
+#~ "<literal>dist-upgrade</literal> is run with this option disabled it "
+#~ "should be tried to explicitly <literal>install</literal> the package APT "
+#~ "is unable to configure immediately, but please make sure to report your "
+#~ "problem also to your distribution and to the APT team with the buglink "
+#~ "below so they can work on improving or correcting the upgrade process."
+#~ msgstr ""
+#~ "デフォルトで有効で、インストールやアップグレード処理中に、APT が不可欠パッ"
+#~ "ケージや重要パッケージのインストールを、可能な限り早く行うようになります。"
+#~ "&dpkg; の呼び出す際の失敗回数に制限があるため、このようなオプションがあり"
+#~ "ます。このオプションが無効の場合、APT は重要パッケージを、特別パッケージと"
+#~ "同様に扱うようになります。重要パッケージ A を展開していて、その設定中に他"
+#~ "の展開や設定をたくさん呼び出すと、パッケージ B は A とはなんの関係もないに"
+#~ "もかかわらず、dpkg の呼び出しが失敗します (つまり B のメンテナスクリプトが"
+#~ "エラーを返します)。この結果、システムの状態として、パッケージ A は展開済み"
+#~ "で未設定となります。A に依存するパッケージは、動作の保証がなくなり、A に対"
+#~ "する依存関係は、もう満たせなくなります。 即時設定マーカは、たとえば環状の"
+#~ "依存関係といった問題が発生しそうな、すべての依存関係に先行依存と同等の即時"
+#~ "フラグを適用します。そのため理論上では、APT が即時設定できない、エラーが発"
+#~ "生する、このオプションを参照するといった状況になる可能性があるのは、ユーザ"
+#~ "が即時設定を一時的に無効にして、インストールやアップグレードを行った場合で"
+#~ "す。「理論上」と言う単語を使ったのは、現在現実世界でこの問題に遭遇したの"
+#~ "は、不安定版を使用しており、問題になっていたパッケージの間違った依存関係が"
+#~ "原因だったり、システムが既に破損状態であったりした数回だけだからです。前述"
+#~ "のシナリオが、即時設定が主に回避する問題のすべてというわけではないため、こ"
+#~ "のオプションを闇雲に無効にするべきではありません。<literal>dist-upgrade</"
+#~ "literal> のような大きな操作を、このオプションを無効にして行う前に、APT が"
+#~ "すぐに設定できないパッケージを、明示的に <literal>install</literal> してみ"
+#~ "てください。ですが、アップグレードプロセスの改善のため、バグのリンクにある"
+#~ "ディストリビューションと APT チームにも、問題のレポートをおねがいします。"
+
+# type: Content of: <refentry><refsect1><para>
+#~ msgid ""
+#~ "The package resource list is used to locate archives of the package "
+#~ "distribution system in use on the system. At this time, this manual page "
+#~ "documents only the packaging system used by the Debian system.  This "
+#~ "control file is <filename>/etc/apt/sources.list</filename>."
+#~ msgstr ""
+#~ "このパッケージリソースリストは、システムで使用するパッケージの保管場所を特"
+#~ "定するのに使用されます。今回このマニュアルページには、Debian システムで使"
+#~ "用するパッケージシステムについてのみ記述します。この制御ファイルは、"
+#~ "<filename>/etc/apt/sources.list</filename> にあります。"
+
+# type: Content of: <refentry><refsect1><para>
+#~ msgid ""
+#~ "The source list is designed to support any number of active sources and a "
+#~ "variety of source media. The file lists one source per line, with the "
+#~ "most preferred source listed first. The format of each line is: "
+#~ "<literal>type uri args</literal> The first item, <literal>type</literal> "
+#~ "determines the format for <literal>args</literal>. <literal>uri</literal> "
+#~ "is a Universal Resource Identifier (URI), which is a superset of the more "
+#~ "specific and well-known Universal Resource Locator, or URL. The rest of "
+#~ "the line can be marked as a comment by using a #."
+#~ msgstr ""
+#~ "ソースリストは複数の有効な取得元と、様々な取得メディアをサポートしていま"
+#~ "す。ファイルには 1 行ごと取得元を列挙し、上の方にあるものから使用します。"
+#~ "行のフォーマットは、<literal>タイプ uri 引数</literal> となります。先頭の "
+#~ "<literal>タイプ</literal> で、<literal>引数</literal> のフォーマットを決定"
+#~ "します。<literal>uri</literal> は Universal Resource Identifier (URI) で、"
+#~ "よく知られた Universal Resource Locator (URL) のスーパーセットです。行の残"
+#~ "りに # を付けて、コメントにできます。"
+
 # type: Content of: <refentry><refsect1><para>
 #~ msgid "&apt-commonoptions;"
 #~ msgstr "&apt-commonoptions;"
diff --git a/doc/po/pl.po b/doc/po/pl.po
index 65c88d55e..a43d8bd64 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.9.5.1\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-06 23:46+0300\n"
+"POT-Creation-Date: 2012-06-09 19:12+0300\n"
 "PO-Revision-Date: 2012-06-02 11:31+0200\n"
 "Last-Translator: Robert Luberda <robert@debian.org>\n"
 "Language-Team: Polish <manpages-pl-list@lists.sourceforge.net>\n"
@@ -1660,14 +1660,14 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml:518 apt-cache.8.xml:343 apt-key.8.xml:174 apt-mark.8.xml:125
-#: apt.conf.5.xml:1118 apt_preferences.5.xml:698
+#: apt.conf.5.xml:1156 apt_preferences.5.xml:698
 msgid "Files"
 msgstr "Pliki"
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131
 #: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109
-#: apt.conf.5.xml:1124 apt_preferences.5.xml:705 sources.list.5.xml:252
+#: apt.conf.5.xml:1162 apt_preferences.5.xml:705 sources.list.5.xml:252
 #: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63
 #: apt-ftparchive.1.xml:607
 msgid "See Also"
@@ -3295,11 +3295,17 @@ msgstr "Plik konfiguracyjny dla APT"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:42
+#, fuzzy
+#| msgid ""
+#| "<filename>apt.conf</filename> is the main configuration file for the APT "
+#| "suite of tools, but by far not the only place changes to options can be "
+#| "made. All tools therefore share the configuration files and also use a "
+#| "common command line parser to provide a uniform environment."
 msgid ""
-"<filename>apt.conf</filename> is the main configuration file for the APT "
-"suite of tools, but by far not the only place changes to options can be "
-"made. All tools therefore share the configuration files and also use a "
-"common command line parser to provide a uniform environment."
+"<filename>/etc/apt/apt.conf</filename> is the main configuration file shared "
+"by all the tools in the APT suite of tools, though it is by no means the "
+"only place options can be set. The suite also shares a common command line "
+"parser to provide a uniform environment."
 msgstr ""
 "<filename>apt.conf</filename> jest głównym plikiem konfiguracyjnym dla "
 "pakietu narzędzi APT. ale nie jest jedynym miejscem, w którym mogą być "
@@ -3308,7 +3314,7 @@ msgstr ""
 "jednolite środowisko pracy."
 
 #. type: Content of: <refentry><refsect1><orderedlist><para>
-#: apt.conf.5.xml:47
+#: apt.conf.5.xml:48
 msgid ""
 "When an APT tool starts up it will read the configuration files in the "
 "following order:"
@@ -3317,7 +3323,7 @@ msgstr ""
 "następującym porządku:"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:49
+#: apt.conf.5.xml:50
 msgid ""
 "the file specified by the <envar>APT_CONFIG</envar> environment variable (if "
 "any)"
@@ -3326,7 +3332,7 @@ msgstr ""
 "ustawiona)."
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:51
+#: apt.conf.5.xml:52
 #, fuzzy
 #| msgid ""
 #| "The <filename>/etc/apt/sources.list.d</filename> directory provides a way "
@@ -3341,8 +3347,8 @@ msgid ""
 "extension and which only contain alphanumeric, hyphen (-), underscore (_) "
 "and period (.) characters.  Otherwise APT will print a notice that it has "
 "ignored a file, unless that file matches a pattern in the <literal>Dir::"
-"Ignore-Files-Silently</literal> configuration list - in this case it will be "
-"silently ignored."
+"Ignore-Files-Silently</literal> configuration list - in which 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 "
@@ -3352,14 +3358,14 @@ msgstr ""
 "(_), pauzy (-) i kropki (.). Inne pliki zostaną zignorowane."
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:58
+#: apt.conf.5.xml:59
 msgid ""
 "the main configuration file specified by <literal>Dir::Etc::main</literal>"
 msgstr ""
 "główny plik konfiguracyjny określony przez <literal>Dir::Etc::main</literal>."
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:60
+#: apt.conf.5.xml:61
 #, fuzzy
 msgid ""
 "the command line options are applied to override the configuration "
@@ -3369,34 +3375,33 @@ msgstr ""
 "pomocą załadować kolejne pliki konfiguracyjne"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:64
+#: apt.conf.5.xml:65
 msgid "Syntax"
 msgstr "Składnia"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:65
+#: apt.conf.5.xml:66
 msgid ""
 "The configuration file is organized in a tree with options organized into "
 "functional groups. Option specification is given with a double colon "
-"notation, for instance <literal>APT::Get::Assume-Yes</literal> is an option "
+"notation; for instance <literal>APT::Get::Assume-Yes</literal> is an option "
 "within the APT tool group, for the Get tool. Options do not inherit from "
 "their parent groups."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:71
+#: apt.conf.5.xml:72
 msgid ""
 "Syntactically the configuration language is modeled after what the ISC tools "
 "such as bind and dhcp use. Lines starting with <literal>//</literal> are "
 "treated as comments (ignored), as well as all text between <literal>/*</"
 "literal> and <literal>*/</literal>, just like C/C++ comments.  Each line is "
-"of the form <literal>APT::Get::Assume-Yes \"true\";</literal>. The trailing "
-"semicolon and the quotes are required. The value must be on one line, and "
-"there is no kind of string concatenation. It must not include inside "
-"quotes.  The behavior of the backslash \"\\\" and escaped characters inside "
-"a value is undefined and it should not be used. An option name may include "
-"alphanumerical characters and the \"/-:._+\" characters. A new scope can be "
-"opened with curly braces, like:"
+"of the form <literal>APT::Get::Assume-Yes \"true\";</literal>.  The "
+"quotation marks and trailing semicolon are required.  The value must be on "
+"one line, and there is no kind of string concatenation.  Values must not "
+"include backslashes or extra quotation marks.  Option names are made up of "
+"alphanumeric characters and the characters \"/-:._+\".  A new scope can be "
+"opened with curly braces, like this:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
@@ -3422,7 +3427,7 @@ msgstr ""
 msgid ""
 "with newlines placed to make it more readable. Lists can be created by "
 "opening a scope and including a single string enclosed in quotes followed by "
-"a semicolon. Multiple entries can be included, each separated by a semicolon."
+"a semicolon. Multiple entries can be included, separated by a semicolon."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
@@ -3441,84 +3446,85 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:105
 msgid ""
-"The names of the configuration items are not case-sensitive. So in the "
-"previous example you could use <literal>dpkg::pre-install-pkgs</literal>."
+"Case is not significant in names of configuration items, so in the previous "
+"example you could use <literal>dpkg::pre-install-pkgs</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:108
 msgid ""
-"Names for the configuration items are optional if a list is defined as it "
-"can be see in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. "
-"If you don't specify a name a new entry will simply add a new option to the "
-"list. If you specify a name you can override the option as every other "
-"option by reassigning a new value to the option."
+"Names for the configuration items are optional if a list is defined as can "
+"be seen in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. If "
+"you don't specify a name a new entry will simply add a new option to the "
+"list. If you specify a name you can override the option in the same way as "
+"any other option by reassigning a new value to the option."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:113
 msgid ""
-"Two specials are allowed, <literal>#include</literal> (which is deprecated "
-"and not supported by alternative implementations) and <literal>#clear</"
-"literal>: <literal>#include</literal> will include the given file, unless "
-"the filename ends in a slash, then the whole directory is included.  "
-"<literal>#clear</literal> is used to erase a part of the configuration tree. "
-"The specified element and all its descendants are erased.  (Note that these "
-"lines also need to end with a semicolon.)"
+"Two special commands are defined: <literal>#include</literal> (which is "
+"deprecated and not supported by alternative implementations) and "
+"<literal>#clear</literal>. <literal>#include</literal> will include the "
+"given file, unless the filename ends in a slash, in which case the whole "
+"directory is included.  <literal>#clear</literal> is used to erase a part of "
+"the configuration tree. The specified element and all its descendants are "
+"erased.  (Note that these lines also need to end with a semicolon.)"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:121
+#: apt.conf.5.xml:123
 msgid ""
-"The #clear command is the only way to delete a list or a complete scope.  "
-"Reopening a scope or the ::-style described below will <emphasis>not</"
-"emphasis> override previously written entries. Only options can be "
-"overridden by addressing a new value to it - lists and scopes can't be "
-"overridden, only cleared."
+"The <literal>#clear</literal> command is the only way to delete a list or a "
+"complete scope. Reopening a scope (or using the syntax described below with "
+"an appended <literal>::</literal>) will <emphasis>not</emphasis> override "
+"previously written entries. Options can only be overridden by addressing a "
+"new value to them - lists and scopes can't be overridden, only cleared."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:126
+#: apt.conf.5.xml:131
 msgid ""
-"All of the APT tools take a -o option which allows an arbitrary "
+"All of the APT tools take an -o option which allows an arbitrary "
 "configuration directive to be specified on the command line. The syntax is a "
 "full option name (<literal>APT::Get::Assume-Yes</literal> for instance) "
 "followed by an equals sign then the new value of the option. To append a new "
-"element to a list, add a trailing :: to the name of the list. (As you might "
-"suspect: The scope syntax can't be used on the command line.)"
+"element to a list, add a trailing <literal>::</literal> to the name of the "
+"list.  (As you might suspect, the scope syntax can't be used on the command "
+"line.)"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:133
-msgid ""
-"Note that you can use :: only for appending one item per line to a list and "
-"that you should not use it in combination with the scope syntax.  (The scope "
-"syntax implicit insert ::) Using both syntaxes together will trigger a bug "
-"which some users unfortunately depend on: An option with the unusual name "
-"\"<literal>::</literal>\" which acts like every other option with a name. "
-"These introduces many problems including that a user who writes multiple "
-"lines in this <emphasis>wrong</emphasis> syntax in the hope to append to a "
-"list will gain the opposite as only the last assignment for this option "
-"\"<literal>::</literal>\" will be used. Upcoming APT versions will raise "
-"errors and will stop working if they encounter this misuse, so please "
-"correct such statements now as long as APT doesn't complain explicit about "
-"them."
+#: apt.conf.5.xml:139
+msgid ""
+"Note that appending items to a list using <literal>::</literal> only works "
+"for one item per line, and that you should not use it in combination with "
+"the scope syntax (which adds <literal>::</literal> implicitly). Using both "
+"syntaxes together will trigger a bug which some users unfortunately depend "
+"on: an option with the unusual name \"<literal>::</literal>\" which acts "
+"like every other option with a name. This introduces many problems; for one "
+"thing, users who write multiple lines in this <emphasis>wrong</emphasis> "
+"syntax in the hope of appending to a list will achieve the opposite, as only "
+"the last assignment for this option \"<literal>::</literal>\" will be used. "
+"Future versions of APT will raise errors and stop working if they encounter "
+"this misuse, so please correct such statements now while APT doesn't "
+"explicitly complain about them."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:145
+#: apt.conf.5.xml:154
 msgid "The APT Group"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:146
+#: apt.conf.5.xml:155
 msgid ""
 "This group of options controls general APT behavior as well as holding the "
 "options for all of the tools."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:151
+#: apt.conf.5.xml:160
 msgid ""
 "System Architecture; sets the architecture to use when fetching files and "
 "parsing package lists. The internal default is the architecture apt was "
@@ -3526,36 +3532,36 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:157
+#: apt.conf.5.xml:167
 msgid ""
-"All Architectures the system supports. Processors implementing the "
-"<literal>amd64</literal> (also called <literal>x86-64</literal>) instruction "
-"set are e.g. also able to execute binaries compiled for the <literal>i386</"
-"literal> (<literal>x86</literal>) instruction set; 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>."
+"All Architectures the system supports. For instance, CPUs implementing the "
+"<literal>amd64</literal> (also called <literal>x86-64</literal>)  "
+"instruction set are also able to execute binaries compiled for the "
+"<literal>i386</literal> (<literal>x86</literal>) instruction set. This list "
+"is used when fetching files and parsing package lists. The initial default "
+"is always the system's native architecture (<literal>APT::Architecture</"
+"literal>), and foreign architectures are added to the default list when they "
+"are registered via <command>dpkg --add-architecture</command>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:167
+#: apt.conf.5.xml:180
 msgid ""
-"Default release to install packages from if more than one version available. "
-"Contains release name, codename or release version. Examples: 'stable', "
-"'testing', 'unstable', '&stable-codename;', '&testing-codename;', '4.0', "
-"'5.0*'. See also &apt-preferences;."
+"Default release to install packages from if more than one version is "
+"available. Contains release name, codename or release version. Examples: "
+"'stable', 'testing', 'unstable', '&stable-codename;', '&testing-codename;', "
+"'4.0', '5.0*'. See also &apt-preferences;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:173
+#: apt.conf.5.xml:186
 msgid ""
-"Ignore Held packages; This global option causes the problem resolver to "
+"Ignore held packages; this global option causes the problem resolver to "
 "ignore held packages in its decision making."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:178
+#: apt.conf.5.xml:191
 msgid ""
 "Defaults to on. When turned on the autoclean feature will remove any "
 "packages which can no longer be downloaded from the cache. If turned off "
@@ -3564,161 +3570,178 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:185
+#: apt.conf.5.xml:199
+msgid ""
+"Defaults to on, which will cause APT to install essential and important "
+"packages as soon as possible in an install/upgrade operation, in order to "
+"limit the effect of a failing &dpkg; call. If this option is disabled, APT "
+"treats an important package in the same way as an extra package: between the "
+"unpacking of the package A and its configuration there can be many other "
+"unpack or configuration calls for other unrelated packages B, C etc. If "
+"these cause the &dpkg; call to fail (e.g. because package B's maintainer "
+"scripts generate an error), this results in a system state in which package "
+"A is unpacked but unconfigured - so any package depending on A is now no "
+"longer guaranteed to work, as its dependency on A is no longer satisfied."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:211
 msgid ""
-"Defaults to on which will cause APT to install essential and important "
-"packages as fast as possible in the install/upgrade operation. This is done "
-"to limit the effect of a failing &dpkg; call: If this option is disabled APT "
-"does treat an important package in the same way as an extra package: Between "
-"the unpacking of the important package A and his configuration can then be "
-"many other unpack or configuration calls, e.g. for package B which has no "
-"relation to A, but causes the dpkg call to fail (e.g. because maintainer "
-"script of package B generates an error) which results in a system state in "
-"which package A is unpacked but unconfigured - each package depending on A "
-"is now no longer guaranteed to work as their dependency on A is not longer "
-"satisfied. The immediate configuration marker is also applied to all "
-"dependencies which can generate a problem if the dependencies e.g. form a "
-"circle as a dependency with the immediate flag is comparable with a Pre-"
-"Dependency. So in theory it is possible that APT encounters a situation in "
-"which it is unable to perform immediate configuration, errors out and refers "
-"to this option so the user can deactivate the immediate configuration "
-"temporarily to be able to perform an install/upgrade again. Note the use of "
-"the word \"theory\" here as this problem was only encountered by now in real "
-"world a few times in non-stable distribution versions and was caused by "
-"wrong dependencies of the package in question or by a system in an already "
-"broken state, so you should not blindly disable this option as the mentioned "
-"scenario above is not the only problem immediate configuration can help to "
-"prevent in the first place.  Before a big operation like <literal>dist-"
-"upgrade</literal> is run with this option disabled it should be tried to "
-"explicitly <literal>install</literal> the package APT is unable to configure "
-"immediately, but please make sure to report your problem also to your "
-"distribution and to the APT team with the buglink below so they can work on "
-"improving or correcting the upgrade process."
+"The immediate configuration marker is also applied in the potentially "
+"problematic case of circular dependencies, since a dependency with the "
+"immediate flag is equivalent to a Pre-Dependency. In theory this allows APT "
+"to recognise a situation in which it is unable to perform immediate "
+"configuration, abort, and suggest to the user that the option should be "
+"temporarily deactivated in order to allow the operation to proceed.  Note "
+"the use of the word \"theory\" here; in the real world this problem has "
+"rarely been encountered, in non-stable distribution versions, and was caused "
+"by wrong dependencies of the package in question or by a system in an "
+"already broken state; so you should not blindly disable this option, as the "
+"scenario mentioned above is not the only problem it can help to prevent in "
+"the first place."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:208
+#: apt.conf.5.xml:224
 msgid ""
-"Never Enable this option unless you -really- know what you are doing. It "
-"permits APT to temporarily remove an essential package to break a Conflicts/"
-"Conflicts or Conflicts/Pre-Depend loop between two essential packages. SUCH "
-"A LOOP SHOULD NEVER EXIST AND IS A GRAVE BUG. This option will work if the "
-"essential packages are not tar, gzip, libc, dpkg, bash or anything that "
-"those packages depend on."
+"Before a big operation like <literal>dist-upgrade</literal> is run with this "
+"option disabled you should try to explicitly <literal>install</literal> the "
+"package APT is unable to configure immediately; but please make sure you "
+"also report your problem to your distribution and to the APT team with the "
+"buglink below, so they can work on improving or correcting the upgrade "
+"process."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:217
+#: apt.conf.5.xml:235
+msgid ""
+"Never enable this option unless you <emphasis>really</emphasis> know what "
+"you are doing. It permits APT to temporarily remove an essential package to "
+"break a Conflicts/Conflicts or Conflicts/Pre-Depends loop between two "
+"essential packages. <emphasis>Such a loop should never exist and is a grave "
+"bug</emphasis>. This option will work if the essential packages are not "
+"<command>tar</command>, <command>gzip</command>, <command>libc</command>, "
+"<command>dpkg</command>, <command>dash</command> or anything that those "
+"packages depend on."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:247
 msgid ""
 "APT uses since version 0.7.26 a resizable memory mapped cache file to store "
-"the 'available' information. <literal>Cache-Start</literal> acts as a hint "
-"to which size the Cache will grow and is therefore the amount of memory APT "
+"the available information. <literal>Cache-Start</literal> acts as a hint of "
+"the size the cache will grow to, and is therefore the amount of memory APT "
 "will request at startup. The default value is 20971520 bytes (~20 MB). Note "
-"that this amount of space needs to be available for APT otherwise it will "
+"that this amount of space needs to be available for APT; otherwise it will "
 "likely fail ungracefully, so for memory restricted devices this value should "
 "be lowered while on systems with a lot of configured sources it should be "
 "increased.  <literal>Cache-Grow</literal> defines in bytes with the default "
-"of 1048576 (~1 MB) how much the Cache size will be increased in the event "
-"the space defined by <literal>Cache-Start</literal> is not enough. These "
+"of 1048576 (~1 MB) how much the cache size will be increased in the event "
+"the space defined by <literal>Cache-Start</literal> is not enough. This "
 "value will be applied again and again until either the cache is big enough "
 "to store all information or the size of the cache reaches the <literal>Cache-"
 "Limit</literal>.  The default of <literal>Cache-Limit</literal> is 0 which "
 "stands for no limit.  If <literal>Cache-Grow</literal> is set to 0 the "
-"automatic grow of the cache is disabled."
+"automatic growth of the cache is disabled."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:233
-msgid "Defines which package(s) are considered essential build dependencies."
+#: apt.conf.5.xml:263
+msgid "Defines which packages are considered essential build dependencies."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:237
+#: apt.conf.5.xml:267
 msgid ""
-"The Get subsection controls the &apt-get; tool, please see its documentation "
+"The Get subsection controls the &apt-get; tool; please see its documentation "
 "for more information about the options here."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:242
+#: apt.conf.5.xml:272
 msgid ""
-"The Cache subsection controls the &apt-cache; tool, please see its "
+"The Cache subsection controls the &apt-cache; tool; please see its "
 "documentation for more information about the options here."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:247
+#: apt.conf.5.xml:277
 msgid ""
-"The CDROM subsection controls the &apt-cdrom; tool, please see its "
+"The CDROM subsection controls the &apt-cdrom; tool; please see its "
 "documentation for more information about the options here."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:253
+#: apt.conf.5.xml:283
 msgid "The Acquire Group"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:254
+#: apt.conf.5.xml:284
 msgid ""
 "The <literal>Acquire</literal> group of options controls the download of "
-"packages and the URI handlers."
+"packages as well as the various \"acquire methods\" responsible for the "
+"download itself (see also &sources-list;)."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:259
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:291
 msgid ""
-"Security related option defaulting to true as an expiring validation for a "
-"Release file prevents longtime replay attacks and can e.g. also help users "
-"to identify no longer updated mirrors - but the feature depends on the "
-"correctness of the time on the user system.  Archive maintainers are "
-"encouraged to create Release files with the <literal>Valid-Until</literal> "
-"header, but if they don't or a stricter value is volitional the following "
-"<literal>Max-ValidTime</literal> option can be used."
+"Security related option defaulting to true, as giving a Release file's "
+"validation an expiration date prevents replay attacks over a long timescale, "
+"and can also for example help users to identify mirrors that are no longer "
+"updated - but the feature depends on the correctness of the clock on the "
+"user system. Archive maintainers are encouraged to create Release files with "
+"the <literal>Valid-Until</literal> header, but if they don't or a stricter "
+"value is desired the <literal>Max-ValidTime</literal> option below can be "
+"used."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:270
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:304
 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 valid\".  Archive specific settings can "
-"be made by appending the label of the archive to the option name."
+"Maximum time (in seconds) after its creation (as indicated by the "
+"<literal>Date</literal> header) that the <filename>Release</filename> file "
+"should be considered valid.  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 \"valid forever\".  Archive specific settings can be made by appending "
+"the label of the archive to the option name."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:281
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:316
 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."
+"Minimum time (in seconds) after its creation (as indicated by the "
+"<literal>Date</literal> header) that the <filename>Release</filename> file "
+"should be considered valid.  Use this if you need to use a seldom updated "
+"(local) mirror of a more frequently 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 ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:292
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:328
 msgid ""
-"Try to download deltas called <literal>PDiffs</literal> for Packages or "
-"Sources files instead of downloading whole ones. True by default."
+"Try to download deltas called <literal>PDiffs</literal> for indexes (like "
+"<filename>Packages</filename> files) instead of downloading whole ones. True "
+"by default."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:295
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:331
 msgid ""
-"Two sub-options to limit the use of PDiffs are also available: With "
-"<literal>FileLimit</literal> can be specified how many PDiff files are "
-"downloaded at most to update a file. <literal>SizeLimit</literal> on the "
-"other hand is the maximum percentage of the size of all patches compared to "
-"the size of the targeted file. If one of these limits is exceeded the "
-"complete file is downloaded instead of the patches."
+"Two sub-options to limit the use of PDiffs are also available: "
+"<literal>FileLimit</literal> can be used to specify a maximum number of "
+"PDiff files should be downloaded to update a file. <literal>SizeLimit</"
+"literal> on the other hand is the maximum percentage of the size of all "
+"patches compared to the size of the targeted file. If one of these limits is "
+"exceeded the complete file is downloaded instead of the patches."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:305
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:341
 msgid ""
 "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
 "literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -3727,161 +3750,161 @@ msgid ""
 "connection per URI type will be opened."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:313
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:349
 msgid ""
 "Number of retries to perform. If this is non-zero APT will retry failed "
 "files the given number of times."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:318
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:354
 msgid ""
 "Use symlinks for source archives. If set to true then source archives will "
 "be symlinked when possible instead of copying. True is the default."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:323
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:359
 msgid ""
-"HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
-"standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per "
-"host proxies can also be specified by using the form <literal>http::Proxy::"
-"&lt;host&gt;</literal> with the special keyword <literal>DIRECT</literal> "
-"meaning to use no proxies. If no one of the above settings is specified, "
-"<envar>http_proxy</envar> environment variable will be used."
+"<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. "
+"It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</"
+"literal>.  Per host proxies can also be specified by using the form "
+"<literal>http::Proxy::&lt;host&gt;</literal> with the special keyword "
+"<literal>DIRECT</literal> meaning to use no proxies. If no one of the above "
+"settings is specified, <envar>http_proxy</envar> environment variable will "
+"be used."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:331
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:367
 msgid ""
 "Three settings are provided for cache control with HTTP/1.1 compliant proxy "
-"caches. <literal>No-Cache</literal> tells the proxy to not use its cached "
-"response under any circumstances, <literal>Max-Age</literal> is sent only "
-"for index files and tells the cache to refresh its object if it is older "
-"than the given number of seconds. Debian updates its index files daily so "
-"the default is 1 day. <literal>No-Store</literal> specifies that the cache "
-"should never store this request, it is only set for archive files. This may "
-"be useful to prevent polluting a proxy cache with very large .deb files. "
-"Note: Squid 2.0.2 does not support any of these options."
+"caches.  <literal>No-Cache</literal> tells the proxy not to use its cached "
+"response under any circumstances.  <literal>Max-Age</literal> sets the "
+"allowed maximum age (in seconds) of an index file in the cache of the "
+"proxy.  <literal>No-Store</literal> specifies that the proxy should not "
+"store the requested archive files in its cache, which can be used to prevent "
+"the proxy from polluting its cache with (big) .deb files."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:341 apt.conf.5.xml:407
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:377 apt.conf.5.xml:449
 msgid ""
 "The option <literal>timeout</literal> sets the timeout timer used by the "
-"method, this applies to all things including connection timeout and data "
-"timeout."
+"method; this value applies to the connection as well as the data timeout."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:344
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:380
 msgid ""
 "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
-"enabled HTTP pipeling (RFC 2616 section 8.1.2.2) which can be beneficial e."
-"g. on high-latency connections. It specifies how many requests are send in a "
+"enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
+"g. on high-latency connections. It specifies how many requests are sent in a "
 "pipeline.  Previous APT versions had a default of 10 for this setting, but "
 "the default value is now 0 (= disabled) to avoid problems with the ever-"
 "growing amount of webservers and proxies which choose to not conform to the "
 "HTTP/1.1 specification."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:351
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:387
 msgid ""
-"<literal>Acquire::http::AllowRedirect</literal> controls if APT will follow "
-"redirects, which is enabled by default."
+"<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
+"follow redirects, which is enabled by default."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:354
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:390
 msgid ""
 "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
-"literal> which accepts integer values in kilobyte. The default value is 0 "
-"which deactivates the limit and tries uses as much as possible of the "
-"bandwidth (Note that this option implicit deactivates the download from "
-"multiple servers at the same time.)"
+"literal> which accepts integer values in kilobytes. The default value is 0 "
+"which deactivates the limit and tries to use all available bandwidth (note "
+"that this option implicitly disables downloading from multiple servers at "
+"the same time.)"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:359
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:395
 msgid ""
 "<literal>Acquire::http::User-Agent</literal> can be used to set a different "
 "User-Agent for the http download method as some proxies allow access for "
 "clients only if the client uses a known identifier."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:366
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:403
 msgid ""
-"HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
-"options are the same as for <literal>http</literal> method and will also "
-"default to the options from the <literal>http</literal> method if they are "
-"not explicitly set for https. <literal>Pipeline-Depth</literal> option is "
-"not supported yet."
+"The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
+"<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
+"<literal>proxy</literal> options work for HTTPS URIs in the same way as for "
+"the <literal>http</literal> method, and default to the same values if they "
+"are not explicitly set. The <literal>Pipeline-Depth</literal> option is not "
+"yet supported."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:372
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:411
 msgid ""
 "<literal>CaInfo</literal> suboption specifies place of file that holds info "
-"about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is "
+"about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is the "
 "corresponding per-host option.  <literal>Verify-Peer</literal> boolean "
-"suboption determines whether verify server's host certificate against "
-"trusted certificates or not.  <literal>&lt;host&gt;::Verify-Peer</literal> "
-"is corresponding per-host option.  <literal>Verify-Host</literal> boolean "
-"suboption determines whether verify server's hostname or not.  <literal>&lt;"
-"host&gt;::Verify-Host</literal> is corresponding per-host option.  "
-"<literal>SslCert</literal> determines what certificate to use for client "
-"authentication. <literal>&lt;host&gt;::SslCert</literal> is corresponding "
-"per-host option.  <literal>SslKey</literal> determines what private key to "
-"use for client authentication. <literal>&lt;host&gt;::SslKey</literal> is "
-"corresponding per-host option.  <literal>SslForceVersion</literal> overrides "
-"default SSL version to use.  Can contain 'TLSv1' or 'SSLv3' string.  "
-"<literal>&lt;host&gt;::SslForceVersion</literal> is corresponding per-host "
-"option."
+"suboption determines whether or not the server's host certificate should be "
+"verified against trusted certificates.  <literal>&lt;host&gt;::Verify-Peer</"
+"literal> is the corresponding per-host option.  <literal>Verify-Host</"
+"literal> boolean suboption determines whether or not the server's hostname "
+"should be verified.  <literal>&lt;host&gt;::Verify-Host</literal> is the "
+"corresponding per-host option.  <literal>SslCert</literal> determines what "
+"certificate to use for client authentication. <literal>&lt;host&gt;::"
+"SslCert</literal> is the corresponding per-host option.  <literal>SslKey</"
+"literal> determines what private key to use for client authentication. "
+"<literal>&lt;host&gt;::SslKey</literal> is the corresponding per-host "
+"option.  <literal>SslForceVersion</literal> overrides default SSL version to "
+"use.  It can contain either of the strings '<literal>TLSv1</literal>' or "
+"'<literal>SSLv3</literal>'.  <literal>&lt;host&gt;::SslForceVersion</"
+"literal> is the corresponding per-host option."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:432
+msgid ""
+"<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs.  "
+"It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</"
+"literal>.  Per host proxies can also be specified by using the form "
+"<literal>ftp::Proxy::&lt;host&gt;</literal> with the special keyword "
+"<literal>DIRECT</literal> meaning to use no proxies. If no one of the above "
+"settings is specified, <envar>ftp_proxy</envar> environment variable will be "
+"used. To use an FTP proxy you will have to set the <literal>ftp::ProxyLogin</"
+"literal> script in the configuration file. This entry specifies the commands "
+"to send to tell the proxy server what to connect to. Please see "
+"&configureindex; for an example of how to do this. The substitution "
+"variables representing the corresponding URI component are <literal>"
+"$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, <literal>"
+"$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, <literal>$(SITE)</"
+"literal> and <literal>$(SITE_PORT)</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:391
-msgid ""
-"FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard "
-"form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host "
-"proxies can also be specified by using the form <literal>ftp::Proxy::&lt;"
-"host&gt;</literal> with the special keyword <literal>DIRECT</literal> "
-"meaning to use no proxies. If no one of the above settings is specified, "
-"<envar>ftp_proxy</envar> environment variable will be used. To use a ftp "
-"proxy you will have to set the <literal>ftp::ProxyLogin</literal> script in "
-"the configuration file. This entry specifies the commands to send to tell "
-"the proxy server what to connect to. Please see &configureindex; for an "
-"example of how to do this. The substitution variables available are <literal>"
-"$(PROXY_USER)</literal> <literal>$(PROXY_PASS)</literal> <literal>"
-"$(SITE_USER)</literal> <literal>$(SITE_PASS)</literal> <literal>$(SITE)</"
-"literal> and <literal>$(SITE_PORT)</literal> Each is taken from it's "
-"respective URI component."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:410
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:452
 msgid ""
 "Several settings are provided to control passive mode. Generally it is safe "
-"to leave passive mode on, it works in nearly every environment.  However "
-"some situations require that passive mode be disabled and port mode ftp used "
-"instead. This can be done globally, for connections that go through a proxy "
-"or for a specific host (See the sample config file for examples)."
+"to leave passive mode on; it works in nearly every environment.  However, "
+"some situations require that passive mode be disabled and port mode FTP used "
+"instead. This can be done globally or for connections that go through a "
+"proxy or for a specific host (see the sample config file for examples)."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:417
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:459
 msgid ""
 "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
-"envar> environment variable to a http url - see the discussion of the http "
+"envar> environment variable to an HTTP URL - see the discussion of the http "
 "method above for syntax. You cannot set this in the configuration file and "
 "it is not recommended to use FTP over HTTP due to its low efficiency."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:422
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:464
 msgid ""
 "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
 "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -3890,111 +3913,111 @@ msgid ""
 "that most FTP servers do not support RFC2428."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:435
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
+#: apt.conf.5.xml:478
 #, no-wrap
 msgid "/cdrom/::Mount \"foo\";"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:430
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:473
 msgid ""
-"CD-ROM URIs; the only setting for CD-ROM URIs is the mount point, "
-"<literal>cdrom::Mount</literal> which must be the mount point for the CD-ROM "
-"drive as specified in <filename>/etc/fstab</filename>. It is possible to "
-"provide alternate mount and unmount commands if your mount point cannot be "
-"listed in the fstab (such as an SMB mount and old mount packages). The "
+"For URIs using the <literal>cdrom</literal> method, the only configurable "
+"option is the mount point, <literal>cdrom::Mount</literal>, which must be "
+"the mount point for the CD-ROM (or DVD, or whatever) drive as specified in "
+"<filename>/etc/fstab</filename>. It is possible to provide alternate mount "
+"and unmount commands if your mount point cannot be listed in the fstab.  The "
 "syntax is to put <placeholder type=\"literallayout\" id=\"0\"/> within the "
-"cdrom block. It is important to have the trailing slash. Unmount commands "
-"can be specified using UMount."
+"<literal>cdrom</literal> block. It is important to have the trailing slash.  "
+"Unmount commands can be specified using UMount."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:441
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:486
 msgid ""
-"GPGV URIs; the only option for GPGV URIs is the option to pass additional "
-"parameters to gpgv.  <literal>gpgv::Options</literal> Additional options "
-"passed to gpgv."
+"For GPGV URIs the only configurable option is <literal>gpgv::Options</"
+"literal>, which passes additional parameters to gpgv."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:452
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
+#: apt.conf.5.xml:497
 #, no-wrap
 msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:447
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:492
 msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "
-"compression formats.  Per default the acquire methods can decompress "
+"compression formats.  By default the acquire methods can decompress "
 "<command>bzip2</command>, <command>lzma</command> and <command>gzip</"
-"command> compressed files, with this setting more formats can be added on "
+"command> compressed files; with this setting more formats can be added on "
 "the fly or the used method can be changed. The syntax for this is: "
 "<placeholder type=\"synopsis\" id=\"0\"/>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:457
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
+#: apt.conf.5.xml:502
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order:: \"gz\";"
 msgstr "Acquire::CompressionTypes::Order:: \"gz\";"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:460
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
+#: apt.conf.5.xml:505
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:453
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:498
 msgid ""
-"Also the <literal>Order</literal> subgroup can be used to define in which "
+"Also, the <literal>Order</literal> subgroup can be used to define in which "
 "order the acquire system will try to download the compressed files. The "
 "acquire system will try the first and proceed with the next compression type "
-"in this list on error, so to prefer one over the other type simple add the "
-"preferred type at first - not already added default types will be added at "
-"run time to the end of the list, so e.g. <placeholder type=\"synopsis\" id="
+"in this list on error, so to prefer one over the other type simply add the "
+"preferred type first - default types not already added will be implicitly "
+"appended to the end of the list, so e.g. <placeholder type=\"synopsis\" id="
 "\"0\"/> can be used to prefer <command>gzip</command> compressed files over "
 "<command>bzip2</command> and <command>lzma</command>.  If <command>lzma</"
 "command> should be preferred over <command>gzip</command> and "
-"<command>bzip2</command> the configure setting should look like this "
+"<command>bzip2</command> the configure setting should look like this: "
 "<placeholder type=\"synopsis\" id=\"1\"/> It is not needed to add "
-"<literal>bz2</literal> explicit to the list as it will be added automatic."
+"<literal>bz2</literal> to the list explicitly as it will be added "
+"automatically."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:464
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
+#: apt.conf.5.xml:512
 #, no-wrap
 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:462
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:507
 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."
+"Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></"
+"literal> will be checked at run time. If this option has been set, the "
+"method will only be used if this file exists; e.g. for the <literal>bzip2</"
+"literal> 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."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:469
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:517
 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."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:476
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:524
 msgid ""
 "When downloading <literal>gzip</literal> compressed indexes (Packages, "
 "Sources, or Translations), keep them gzip compressed locally instead of "
@@ -4002,50 +4025,48 @@ msgid ""
 "CPU requirements when building the local package caches. False by default."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:484
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:532
 msgid ""
 "The Languages subsection controls which <filename>Translation</filename> "
-"files are downloaded and in which order APT tries to display the Description-"
-"Translations. APT will try to display the first available Description in the "
-"Language which is listed at first. Languages can be defined with their short "
-"or long Languagecodes. Note that not all archives provide "
-"<filename>Translation</filename> files for every Language - especially the "
-"long Languagecodes are rare, so please inform you which ones are available "
-"before you set here impossible values."
+"files are downloaded and in which order APT tries to display the description-"
+"translations. APT will try to display the first available description in the "
+"language which is listed first. Languages can be defined with their short or "
+"long language codes. Note that not all archives provide "
+"<filename>Translation</filename> files for every language - the long "
+"language codes are especially rare."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:500
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
+#: apt.conf.5.xml:549
 #, no-wrap
 msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:490
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:537
 msgid ""
 "The default list includes \"environment\" and \"en\". "
-"\"<literal>environment</literal>\" has a special meaning here: It will be "
-"replaced at runtime with the languagecodes extracted from the "
+"\"<literal>environment</literal>\" has a special meaning here: it will be "
+"replaced at runtime with the language codes extracted from the "
 "<literal>LC_MESSAGES</literal> environment variable.  It will also ensure "
 "that these codes are not included twice in the list. If "
 "<literal>LC_MESSAGES</literal> is set to \"C\" only the "
 "<filename>Translation-en</filename> file (if available) will be used.  To "
-"force apt to use no Translation file use the setting <literal>Acquire::"
+"force APT to use no Translation file use the setting <literal>Acquire::"
 "Languages=none</literal>. \"<literal>none</literal>\" is another special "
-"meaning code which will stop the search for a fitting <filename>Translation</"
-"filename> file.  This can be used by the system administrator to let APT "
-"know that it should download also this files without actually use them if "
-"the environment doesn't specify this languages. So the following example "
-"configuration will result in the order \"en, de\" in an english and in \"de, "
-"en\" in a german localization. Note that \"fr\" is downloaded, but not used "
-"if APT is not used in a french localization, in such an environment the "
-"order would be \"fr, de, en\".  <placeholder type=\"programlisting\" id="
-"\"0\"/>"
+"meaning code which will stop the search for a suitable "
+"<filename>Translation</filename> file.  This tells APT to download these "
+"translations too, without actually using them unless the environment "
+"specifies the languages. So the following example configuration will result "
+"in the order \"en, de\" in an English locale or \"de, en\" in a German one. "
+"Note that \"fr\" is downloaded, but not used unless APT is used in a French "
+"locale (where the order would be \"fr, de, en\").  <placeholder type="
+"\"programlisting\" id=\"0\"/>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:501
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:550
 msgid ""
 "Note: To prevent problems resulting from APT being executed in different "
 "environments (e.g. by different users or by other programs) all Translation "
@@ -4054,37 +4075,37 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:560
 msgid "Directories"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:514
+#: apt.conf.5.xml:562
 msgid ""
 "The <literal>Dir::State</literal> section has directories that pertain to "
 "local state information. <literal>lists</literal> is the directory to place "
 "downloaded package lists in and <literal>status</literal> is the name of the "
-"dpkg status file.  <literal>preferences</literal> is the name of the APT "
+"&dpkg; status file.  <literal>preferences</literal> is the name of the APT "
 "<filename>preferences</filename> file.  <literal>Dir::State</literal> "
-"contains the default directory to prefix on all sub items if they do not "
+"contains the default directory to prefix on all sub-items if they do not "
 "start with <filename>/</filename> or <filename>./</filename>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:521
+#: apt.conf.5.xml:569
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
 "and <literal>pkgcache</literal> as well as the location to place downloaded "
 "archives, <literal>Dir::Cache::archives</literal>. Generation of caches can "
-"be turned off by setting their names to be blank. This will slow down "
-"startup but save disk space. It is probably preferred to turn off the "
+"be turned off by setting their names to the empty string. This will slow "
+"down startup but save disk space. It is probably preferable to turn off the "
 "pkgcache rather than the srcpkgcache. Like <literal>Dir::State</literal> the "
 "default directory is contained in <literal>Dir::Cache</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:530
+#: apt.conf.5.xml:578
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4094,7 +4115,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:536
+#: apt.conf.5.xml:584
 msgid ""
 "The <literal>Dir::Parts</literal> setting reads in all the config fragments "
 "in lexical order from the directory specified. After this is done then the "
@@ -4102,7 +4123,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:540
+#: apt.conf.5.xml:588
 msgid ""
 "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
 "Bin::Methods</literal> specifies the location of the method handlers and "
@@ -4113,7 +4134,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:548
+#: apt.conf.5.xml:596
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "
@@ -4126,7 +4147,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:561
+#: apt.conf.5.xml:609
 msgid ""
 "The <literal>Ignore-Files-Silently</literal> list can be used to specify "
 "which files APT should silently ignore while parsing the files in the "
@@ -4137,91 +4158,93 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:570
+#: apt.conf.5.xml:618
 msgid "APT in DSelect"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:572
+#: apt.conf.5.xml:620
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
-"control the default behaviour. These are in the <literal>DSelect</literal> "
+"control the default behavior. These are in the <literal>DSelect</literal> "
 "section."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:577
+#: apt.conf.5.xml:625
 msgid ""
-"Cache Clean mode; this value may be one of always, prompt, auto, pre-auto "
-"and never.  always and prompt will remove all packages from the cache after "
-"upgrading, prompt (the default) does so conditionally.  auto removes only "
-"those packages which are no longer downloadable (replaced with a new version "
-"for instance).  pre-auto performs this action before downloading new "
-"packages."
+"Cache Clean mode; this value may be one of <literal>always</literal>, "
+"<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
+"literal> and <literal>never</literal>.  <literal>always</literal> and "
+"<literal>prompt</literal> will remove all packages from the cache after "
+"upgrading, <literal>prompt</literal> (the default) does so conditionally.  "
+"<literal>auto</literal> removes only those packages which are no longer "
+"downloadable (replaced with a new version for instance).  <literal>pre-auto</"
+"literal> performs this action before downloading new packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:586
+#: apt.conf.5.xml:639
 msgid ""
-"The contents of this variable is passed to &apt-get; as command line options "
-"when it is run for the install phase."
+"The contents of this variable are passed to &apt-get; as command line "
+"options when it is run for the install phase."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:591
+#: apt.conf.5.xml:644
 msgid ""
-"The contents of this variable is passed to &apt-get; as command line options "
-"when it is run for the update phase."
+"The contents of this variable are passed to &apt-get; as command line "
+"options when it is run for the update phase."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:596
+#: apt.conf.5.xml:649
 msgid ""
 "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
 "The default is to prompt only on error."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:602
-msgid "How APT calls dpkg"
+#: apt.conf.5.xml:655
+msgid "How APT calls &dpkg;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:603
+#: apt.conf.5.xml:656
 msgid ""
 "Several configuration directives control how APT invokes &dpkg;. These are "
 "in the <literal>DPkg</literal> section."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:608
+#: apt.conf.5.xml:661
 msgid ""
-"This is a list of options to pass to dpkg. The options must be specified "
+"This is a list of options to pass to &dpkg;. The options must be specified "
 "using the list notation and each list item is passed as a single argument to "
 "&dpkg;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:614
+#: apt.conf.5.xml:667
 msgid ""
 "This is a list of shell commands to run before/after invoking &dpkg;.  Like "
 "<literal>options</literal> this must be specified in list notation. The "
-"commands are invoked in order using <filename>/bin/sh</filename>, should any "
+"commands are invoked in order using <filename>/bin/sh</filename>; should any "
 "fail APT will abort."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:621
+#: apt.conf.5.xml:674
 msgid ""
-"This is a list of shell commands to run before invoking dpkg. Like "
+"This is a list of shell commands to run before invoking &dpkg;. Like "
 "<literal>options</literal> this must be specified in list notation. The "
-"commands are invoked in order using <filename>/bin/sh</filename>, should any "
-"fail APT will abort. APT will pass to the commands on standard input the "
-"filenames of all .deb files it is going to install, one per line."
+"commands are invoked in order using <filename>/bin/sh</filename>; should any "
+"fail APT will abort. APT will pass the filenames of all .deb files it is "
+"going to install to the commands, one per line on standard input."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:627
+#: apt.conf.5.xml:680
 msgid ""
 "Version 2 of this protocol dumps more information, including the protocol "
 "version, the APT configuration space and the packages, files and versions "
@@ -4231,41 +4254,41 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:635
+#: apt.conf.5.xml:688
 msgid ""
-"APT chdirs to this directory before invoking dpkg, the default is <filename>/"
-"</filename>."
+"APT chdirs to this directory before invoking &dpkg;, the default is "
+"<filename>/</filename>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:640
+#: apt.conf.5.xml:693
 msgid ""
-"These options are passed to &dpkg-buildpackage; when compiling packages, the "
+"These options are passed to &dpkg-buildpackage; when compiling packages; the "
 "default is to disable signing and produce all binaries."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:645
+#: apt.conf.5.xml:698
 msgid "dpkg trigger usage (and related options)"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:646
+#: apt.conf.5.xml:699
 msgid ""
-"APT can call dpkg in a way so it can make aggressive use of triggers over "
-"multiple calls of dpkg. Without further options dpkg will use triggers only "
-"in between his own run. Activating these options can therefore decrease the "
-"time needed to perform the install / upgrade. Note that it is intended to "
-"activate these options per default in the future, but as it changes the way "
-"APT calling dpkg drastically it needs a lot more testing.  <emphasis>These "
-"options are therefore currently experimental and should not be used in "
-"productive environments.</emphasis> Also it breaks the progress reporting so "
-"all frontends will currently stay around half (or more) of the time in the "
-"100% state while it actually configures all packages."
+"APT can call &dpkg; in such a way as to let it make aggressive use of "
+"triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
+"use triggers once each time it runs.  Activating these options can therefore "
+"decrease the time needed to perform the install or upgrade. Note that it is "
+"intended to activate these options per default in the future, but as it "
+"drastically changes the way APT calls &dpkg; it needs a lot more testing.  "
+"<emphasis>These options are therefore currently experimental and should not "
+"be used in production environments.</emphasis> It also breaks progress "
+"reporting such that all front-ends will currently stay around half (or more) "
+"of the time in the 100% state while it actually configures all packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:661
+#: apt.conf.5.xml:714
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
@@ -4279,82 +4302,72 @@ msgstr ""
 "DPkg::TriggersPending \"true\";"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:655
+#: apt.conf.5.xml:708
 msgid ""
 "Note that it is not guaranteed that APT will support these options or that "
 "these options will not cause (big) trouble in the future. If you have "
 "understand the current risks and problems with these options, but are brave "
-"enough to help testing them create a new configuration file and test a "
+"enough to help testing them, create a new configuration file and test a "
 "combination of options. Please report any bugs, problems and improvements "
 "you encounter and make sure to note which options you have used in your "
-"reports. Asking dpkg for help could also be useful for debugging proposes, "
+"reports. Asking &dpkg; for help could also be useful for debugging proposes, "
 "see e.g. <command>dpkg --audit</command>. A defensive option combination "
 "would be <placeholder type=\"literallayout\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:668
+#: apt.conf.5.xml:721
 msgid ""
-"Add the no triggers flag to all dpkg calls (except the ConfigurePending "
+"Add the no triggers flag to all &dpkg; calls (except the ConfigurePending "
 "call).  See &dpkg; if you are interested in what this actually means. In "
-"short: dpkg will not run the triggers when this flag is present unless it is "
-"explicitly called to do so in an extra call.  Note that this option exists "
-"(undocumented) also in older apt versions with a slightly different meaning: "
-"Previously these option only append --no-triggers to the configure calls to "
-"dpkg - now apt will add these flag also to the unpack and remove calls."
+"short: &dpkg; will not run the triggers when this flag is present unless it "
+"is explicitly called to do so in an extra call.  Note that this option "
+"exists (undocumented) also in older APT versions with a slightly different "
+"meaning: Previously these option only append --no-triggers to the configure "
+"calls to &dpkg; - now APT will also add this flag to the unpack and remove "
+"calls."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:676
+#: apt.conf.5.xml:729
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
-"and \"<literal>no</literal>\".  \"<literal>all</literal>\" is the default "
-"value and causes APT to configure all packages explicit.  The "
-"\"<literal>smart</literal>\" way is it to configure only packages which need "
-"to be configured before another package can be unpacked (Pre-Depends) and "
-"let the rest configure by dpkg with a call generated by the next option. "
-"\"<literal>no</literal>\" on the other hand will not configure anything and "
-"totally rely on dpkg for configuration (which will at the moment fail if a "
-"Pre-Depends is encountered).  Setting this option to another than the all "
-"value will implicitly activate also the next option per default as otherwise "
-"the system could end in an unconfigured status which could be unbootable!"
+"and \"<literal>no</literal>\".  The default value is \"<literal>all</literal>"
+"\", which causes APT to configure all packages. The \"<literal>smart</"
+"literal>\" way is to configure only packages which need to be configured "
+"before another package can be unpacked (Pre-Depends), and let the rest be "
+"configured by &dpkg; with a call generated by the ConfigurePending option "
+"(see below). On the other hand, \"<literal>no</literal>\" will not configure "
+"anything, and totally relies on &dpkg; for configuration (which at the "
+"moment will fail if a Pre-Depends is encountered). Setting this option to "
+"any value other than <literal>all</literal> will implicitly also activate "
+"the next option by default, as otherwise the system could end in an "
+"unconfigured and potentially unbootable state."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:687
+#: apt.conf.5.xml:744
 msgid ""
-"If this option is set apt will call <command>dpkg --configure --pending</"
-"command> to let dpkg handle all required configurations and triggers. This "
-"option is activated automatic per default if the previous option is not set "
-"to <literal>all</literal>, but deactivating could be useful if you want to "
-"run APT multiple times in a row - e.g. in an installer. In these sceneries "
-"you could deactivate this option in all but the last run."
+"If this option is set APT will call <command>dpkg --configure --pending</"
+"command> to let &dpkg; handle all required configurations and triggers. This "
+"option is activated automatically per default if the previous option is not "
+"set to <literal>all</literal>, but deactivating it could be useful if you "
+"want to run APT multiple times in a row - e.g. in an installer. In these "
+"sceneries you could deactivate this option in all but the last run."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:694
+#: apt.conf.5.xml:751
 msgid ""
-"Useful for <literal>smart</literal> configuration as a package which has "
-"pending triggers is not considered as <literal>installed</literal> and dpkg "
-"treats them as <literal>unpacked</literal> currently which is a dealbreaker "
-"for Pre-Dependencies (see debbugs #526774). Note that this will process all "
-"triggers, not only the triggers needed to configure this package."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:700
-msgid ""
-"As the configuration can be deferred to be done at the end by dpkg it can be "
-"tried to order the unpack series only by critical needs, e.g. by Pre-"
-"Depends. Default is true and therefore the \"old\" method of ordering in "
-"various steps by everything. While both method were present in earlier APT "
-"versions the <literal>OrderCritical</literal> method was unused, so this "
-"method is very experimental and needs further improvements before becoming "
-"really useful."
+"Useful for the <literal>smart</literal> configuration as a package which has "
+"pending triggers is not considered as <literal>installed</literal>, and "
+"&dpkg; treats them as <literal>unpacked</literal> currently which is a "
+"showstopper for Pre-Dependencies (see debbugs #526774). Note that this will "
+"process all triggers, not only the triggers needed to configure this package."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:715
+#: apt.conf.5.xml:764
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
@@ -4372,41 +4385,41 @@ msgstr ""
 "};"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:708
+#: apt.conf.5.xml:757
 msgid ""
-"Essential packages (and there dependencies) should be configured immediately "
-"after unpacking. It will be a good idea to do this quite early in the "
-"upgrade process as these these configure calls require currently also "
-"<literal>DPkg::TriggersPending</literal> which will run quite a few triggers "
-"(which maybe not needed). Essentials get per default a high score but the "
-"immediate flag is relatively low (a package which has a Pre-Depends is "
-"higher rated).  These option and the others in the same group can be used to "
-"change the scoring. The following example shows the settings with there "
-"default values.  <placeholder type=\"literallayout\" id=\"0\"/>"
+"Essential packages (and their dependencies) should be configured immediately "
+"after unpacking. It is a good idea to do this quite early in the upgrade "
+"process as these configure calls also currently require <literal>DPkg::"
+"TriggersPending</literal> which will run quite a few triggers (which may not "
+"be needed). Essentials get per default a high score but the immediate flag "
+"is relatively low (a package which has a Pre-Depends is rated higher).  "
+"These option and the others in the same group can be used to change the "
+"scoring. The following example shows the settings with their default "
+"values.  <placeholder type=\"literallayout\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:728
+#: apt.conf.5.xml:777
 msgid "Periodic and Archives options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:729
+#: apt.conf.5.xml:778
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
-"of options configure behavior of apt periodic updates, which is done by "
-"<literal>/etc/cron.daily/apt</literal> script. See header of this script for "
-"the brief documentation of these options."
+"of options configure behavior of apt periodic updates, which is done by the "
+"<literal>/etc/cron.daily/apt</literal> script. See the top of this script "
+"for the brief documentation of these options."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:737
+#: apt.conf.5.xml:786
 #, fuzzy
 msgid "Debug options"
 msgstr "opcje"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:739
+#: apt.conf.5.xml:788
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -4417,7 +4430,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:750
+#: apt.conf.5.xml:799
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -4425,7 +4438,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:758
+#: apt.conf.5.xml:807
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s install</"
@@ -4433,7 +4446,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:767
+#: apt.conf.5.xml:816
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
@@ -4443,7 +4456,7 @@ msgstr ""
 #. 	   motivating example, except I haven't a clue why you'd want
 #. 	   to do this. 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:775
+#: apt.conf.5.xml:824
 #, fuzzy
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
@@ -4453,59 +4466,59 @@ msgstr ""
 "in CDROM IDs."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:785
+#: apt.conf.5.xml:834
 msgid "A full list of debugging options to apt follows."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:794
+#: apt.conf.5.xml:843
 msgid ""
 "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:805
+#: apt.conf.5.xml:854
 msgid "Print information related to downloading packages using FTP."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:816
+#: apt.conf.5.xml:865
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:827
+#: apt.conf.5.xml:876
 msgid "Print information related to downloading packages using HTTPS."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:838
+#: apt.conf.5.xml:887
 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:849
+#: apt.conf.5.xml:898
 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:859
+#: apt.conf.5.xml:908
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:869
+#: apt.conf.5.xml:918
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:879
+#: apt.conf.5.xml:928
 msgid ""
 "Do not include information from <literal>statfs</literal>, namely the number "
 "of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@ -4513,53 +4526,53 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:890
+#: apt.conf.5.xml:939
 msgid ""
 "Disable all file locking.  For instance, this will allow two instances of "
 "<quote><literal>apt-get update</literal></quote> to run at the same time."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:902
+#: apt.conf.5.xml:951
 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:912
+#: apt.conf.5.xml:961
 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:922
+#: apt.conf.5.xml:971
 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:934
+#: apt.conf.5.xml:983
 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:945
+#: apt.conf.5.xml:994
 msgid ""
 "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:956
+#: apt.conf.5.xml:1005
 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:966
+#: apt.conf.5.xml:1015
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
@@ -4569,68 +4582,64 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:980
+#: apt.conf.5.xml:1029
 msgid ""
-"Generate debug messages describing which package is marked as keep/install/"
+"Generate debug messages describing which packages are marked as keep/install/"
 "remove while the ProblemResolver does his work.  Each addition or deletion "
-"may trigger additional actions; they are shown indented two additional space "
-"under the original entry.  The format for each line is <literal>MarkKeep</"
-"literal>, <literal>MarkDelete</literal> or <literal>MarkInstall</literal> "
-"followed by <literal>package-name &lt;a.b.c -&gt; d.e.f | x.y.z&gt; (section)"
-"</literal> where <literal>a.b.c</literal> is the current version of the "
-"package, <literal>d.e.f</literal> is the version considered for installation "
-"and <literal>x.y.z</literal> is a newer version, but not considered for "
-"installation (because of a low pin score). The later two can be omitted if "
-"there is none or if it is the same version as the installed.  "
-"<literal>section</literal> is the name of the section the package appears in."
+"may trigger additional actions; they are shown indented two additional "
+"spaces under the original entry.  The format for each line is "
+"<literal>MarkKeep</literal>, <literal>MarkDelete</literal> or "
+"<literal>MarkInstall</literal> followed by <literal>package-name &lt;a.b.c -"
+"&gt; d.e.f | x.y.z&gt; (section)</literal> where <literal>a.b.c</literal> is "
+"the current version of the package, <literal>d.e.f</literal> is the version "
+"considered for installation and <literal>x.y.z</literal> is a newer version, "
+"but not considered for installation (because of a low pin score). The later "
+"two can be omitted if there is none or if it is the same as the installed "
+"version.  <literal>section</literal> is the name of the section the package "
+"appears in."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1002
-msgid "Dump the default configuration to standard error on startup."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1012
+#: apt.conf.5.xml:1050
 msgid ""
 "When invoking &dpkg;, output the precise command line with which it is being "
 "invoked, with arguments separated by a single space character."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1023
+#: apt.conf.5.xml:1061
 msgid ""
 "Output all the data received from &dpkg; on the status file descriptor and "
 "any errors encountered while parsing it."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1034
+#: apt.conf.5.xml:1072
 msgid ""
 "Generate a trace of the algorithm that decides the order in which "
 "<literal>apt</literal> should pass packages to &dpkg;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1046
+#: apt.conf.5.xml:1084
 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1057
+#: apt.conf.5.xml:1095
 msgid "Output the priority of each package list on startup."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1067
+#: apt.conf.5.xml:1105
 msgid ""
 "Trace the execution of the dependency resolver (this applies only to what "
 "happens when a complex dependency problem is encountered)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1078
+#: apt.conf.5.xml:1116
 msgid ""
 "Display a list of all installed packages with their calculated score used by "
 "the pkgProblemResolver. The description of the package is the same as "
@@ -4638,20 +4647,20 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1090
+#: apt.conf.5.xml:1128
 msgid ""
 "Print information about the vendors read from <filename>/etc/apt/vendors."
 "list</filename>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1112 apt_preferences.5.xml:545 sources.list.5.xml:211
+#: apt.conf.5.xml:1150 apt_preferences.5.xml:545 sources.list.5.xml:211
 #: apt-ftparchive.1.xml:596
 msgid "Examples"
 msgstr "Przykłady"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1113
+#: apt.conf.5.xml:1151
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
@@ -4659,7 +4668,7 @@ msgstr ""
 
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1125
+#: apt.conf.5.xml:1163
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
 
@@ -4768,7 +4777,7 @@ msgid ""
 "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, unless that file matches a pattern in the "
-"<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this "
+"<literal>Dir::Ignore-Files-Silently</literal> configuration list - in which "
 "case it will be silently ignored."
 msgstr ""
 "Proszę zauważyć, że pliki w katalogu <filename>/etc/apt/preferences.d</"
@@ -5042,7 +5051,7 @@ msgstr ""
 "większej liczby podanych pakietów i podanych wersji lub zakresów wersji. Na "
 "przykład następujący rekord ustawia wysoki priorytet wszystkim wersjom "
 "pakietu <filename>perl</filename>, których numer wersji zaczyna się od "
-"\"<literal>&good-bad;</literal>\". Można podać wiele nazw pakietów, "
+"\"<literal>&good-perl;</literal>\". Można podać wiele nazw pakietów, "
 "rozdzielając je od siebie spacjami."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
@@ -6045,40 +6054,25 @@ msgid "Package resource list for APT"
 msgstr "Lista zasobów pakietów dla APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:37
+#: sources.list.5.xml:38
 msgid ""
-"The package resource list is used to locate archives of the package "
-"distribution system in use on the system. At this time, this manual page "
-"documents only the packaging system used by the Debian system.  This control "
-"file is <filename>/etc/apt/sources.list</filename>."
+"The source list <filename>/etc/apt/sources.list</filename> is designed to "
+"support any number of active sources and a variety of source media. The file "
+"lists one source per line, with the most preferred source listed first. The "
+"information available from the configured sources is acquired by "
+"<command>apt-get update</command> (or by an equivalent command from another "
+"APT front-end)."
 msgstr ""
-"Lista zasobów pakietów jest używana do zlokalizowania archiwów pakietów "
-"używanego systemu dystrybucji pakietów. Obecnie ta strona podręcznika "
-"opisuje tylko system pakietów używany w systemie Debian. Plikiem kontrolnym "
-"jest <filename>/etc/apt/sources.list</filename>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:42
-msgid ""
-"The source list is designed to support any number of active sources and a "
-"variety of source media. The file lists one source per line, with the most "
-"preferred source listed first. The format of each line is: <literal>type uri "
-"args</literal> The first item, <literal>type</literal> determines the format "
-"for <literal>args</literal>. <literal>uri</literal> is a Universal Resource "
-"Identifier (URI), which is a superset of the more specific and well-known "
-"Universal Resource Locator, or URL. The rest of the line can be marked as a "
-"comment by using a #."
-msgstr ""
-"Listę źródeł zaprojektowano tak, aby obsługiwała dowolną liczbę aktywnych "
-"źródeł i różnorodne lokalizacje źródeł. Każde źródło jest wymienione w "
-"osobnej linii, zaczynając od źródeł najbardziej preferowanych. Format każdej "
-"linii jest następujący: <literal>typ uri argumenty</literal>. Pierwsza "
-"pozycja, <literal>typ</literal>, wyznacza format <literal>argumentów</"
-"literal>. <literal>uri</literal> jest uniwersalnym identyfikatorem zasobu "
-"(ang. Universal Resource Identifier - URI), który jest nadzbiorem dobrze "
-"znanego uniwersalnego lokalizatora zasobu (ang. Universal Resource Locator - "
-"URL). Pozostała część linii może być komentarzem, jeśli zaczyna się od znaku "
-"\"#\"."
+#: sources.list.5.xml:45
+msgid ""
+"Each line specifying a source starts with type (e.g. <literal>deb-src</"
+"literal>)  followed by options and arguments for this type.  Individual "
+"entries cannot be continued onto a following line. Empty lines are ignored, "
+"and a <literal>#</literal> character anywhere on a line marks the remainder "
+"of that line as a comment."
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: sources.list.5.xml:53
@@ -6095,7 +6089,7 @@ msgid ""
 "digits (0-9), underscore (_), hyphen (-) and period (.) characters.  "
 "Otherwise APT will print a notice that it has ignored a file, unless that "
 "file matches a pattern in the <literal>Dir::Ignore-Files-Silently</literal> "
-"configuration list - in this case it will be silently ignored."
+"configuration list - in which 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 "
@@ -6115,16 +6109,16 @@ msgstr "Typy deb i deb-src"
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:66
 msgid ""
-"The <literal>deb</literal> type describes a typical two-level Debian "
-"archive, <filename>distribution/component</filename>. Typically, "
-"<literal>distribution</literal> is generally an archivename like "
+"The <literal>deb</literal> type references a typical two-level Debian "
+"archive, <filename>distribution/component</filename>. The "
+"<literal>distribution</literal> is generally an archive name like "
 "<literal>stable</literal> or <literal>testing</literal> or a codename like "
 "<literal>&stable-codename;</literal> or <literal>&testing-codename;</"
-"literal> while component is one of <literal>main</literal> <literal>contrib</"
-"literal> or <literal>non-free</literal>. The <literal>deb-src</literal> type "
-"describes a debian distribution's source code in the same form as the "
-"<literal>deb</literal> type.  A <literal>deb-src</literal> line is required "
-"to fetch source indexes."
+"literal> while component is one of <literal>main</literal>, "
+"<literal>contrib</literal> or <literal>non-free</literal>. The <literal>deb-"
+"src</literal> type references a Debian distribution's source code in the "
+"same form as the <literal>deb</literal> type.  A <literal>deb-src</literal> "
+"line is required to fetch source indexes."
 msgstr ""
 "Typ <literal>deb</literal> opisuje typowe dwupoziomowe archiwum Debiana: "
 "<filename>dystrybucja/komponent</filename>. Zazwyczaj <literal>dystrybucja</"
@@ -6155,37 +6149,56 @@ msgstr "deb [ opcje ] uri dystrybucja [komponent1] [komponent2] [...]"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:83
+#, fuzzy
+#| msgid ""
+#| "The URI for the <literal>deb</literal> type must specify the base of the "
+#| "Debian distribution, from which APT will find the information it needs.  "
+#| "<literal>distribution</literal> can specify an exact path, in which case "
+#| "the components must be omitted and <literal>distribution</literal> must "
+#| "end with a slash (<literal>/</literal>). This is useful for the case when "
+#| "only a particular sub-section of the archive denoted by the URI is of "
+#| "interest. If <literal>distribution</literal> does not specify an exact "
+#| "path, at least one <literal>component</literal> must be present."
 msgid ""
 "The URI for the <literal>deb</literal> type must specify the base of the "
 "Debian distribution, from which APT will find the information it needs.  "
 "<literal>distribution</literal> can specify an exact path, in which case the "
 "components must be omitted and <literal>distribution</literal> must end with "
-"a slash (/). This is useful for when the case only a particular sub-section "
-"of the archive denoted by the URI is of interest.  If <literal>distribution</"
-"literal> does not specify an exact path, at least one <literal>component</"
-"literal> must be present."
+"a slash (<literal>/</literal>). This is useful for the case when only a "
+"particular sub-section of the archive denoted by the URI is of interest.  If "
+"<literal>distribution</literal> does not specify an exact path, at least one "
+"<literal>component</literal> must be present."
 msgstr ""
 "URI typu <literal>deb</literal> musi podawać bazową lokalizację dystrybucji "
 "Debiana, w której APT znajdzie potrzebne informacje. <literal>Dystrybucja</"
 "literal> może być dokładną ścieżką - w takim przypadku komponenty trzeba "
 "pominąć, a <literal>dystrybucja</literal> musi się kończyć znakiem ukośnika "
-"(\"/\"). Jest to użyteczne, gdy interesuje nas szczególna pod-sekcja "
-"archiwum, podana jako URI. Jeśli <literal>dystrybucja</literal> nie podaje "
-"dokładnej ścieżki, to musi być obecny przynajmniej jeden <literal>komponent</"
-"literal>."
+"(\"<literal>/</literal>\"). Jest to użyteczne, gdy interesuje nas szczególna "
+"pod-sekcja archiwum, podana jako URI. Jeśli <literal>dystrybucja</literal> "
+"nie podaje dokładnej ścieżki, to musi być obecny przynajmniej jeden "
+"<literal>komponent</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:92
+#, fuzzy
+#| msgid ""
+#| "<literal>distribution</literal> may also contain a variable, <literal>"
+#| "$(ARCH)</literal> which expands to the Debian architecture (i386, amd64, "
+#| "powerpc, ...)  used on the system. This permits architecture-independent "
+#| "<filename>sources.list</filename> files to be used. In general this is "
+#| "only of interest when specifying an exact path, <literal>APT</literal> "
+#| "will automatically generate a URI with the current architecture otherwise."
 msgid ""
 "<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)"
-"</literal> which expands to the Debian architecture (i386, m68k, "
-"powerpc, ...)  used on the system. This permits architecture-independent "
-"<filename>sources.list</filename> files to be used. In general this is only "
-"of interest when specifying an exact path, <literal>APT</literal> will "
-"automatically generate a URI with the current architecture otherwise."
+"</literal> which expands to the Debian architecture (such as <literal>amd64</"
+"literal> or <literal>armel</literal>) used on the system. This permits "
+"architecture-independent <filename>sources.list</filename> files to be used. "
+"In general this is only of interest when specifying an exact path, "
+"<literal>APT</literal> will automatically generate a URI with the current "
+"architecture otherwise."
 msgstr ""
 "<literal>Dystrybucja</literal> może zawierać także zmienną <literal>$(ARCH)</"
-"literal>, która zostanie rozwinięta do architektury Debiana (i386, m68k, "
+"literal>, która zostanie rozwinięta do architektury Debiana (i386, amd64, "
 "powerpc, ...) używanej w systemie. Pozwala to na używanie plików "
 "<filename>sources.list</filename> niezależnych od architektury. W ogólności "
 "jest to interesujące tylko wtedy, gdy podaje się dokładną ścieżkę, w innym "
@@ -6223,12 +6236,12 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:112
 msgid ""
-"<literal>options</literal> is always optional and needs to be surounded by "
+"<literal>options</literal> is always optional and needs to be surrounded 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:"
+"following settings are supported by APT (note however that unsupported "
+"settings will be ignored silently):"
 msgstr ""
 "<literal>opcje</literal> nigdy nie są wymagane i powinny być otoczone przez "
 "nawiasy kwadratowe. Mogą się składać z wielu ustawień w formacie "
@@ -6242,7 +6255,7 @@ msgstr ""
 msgid ""
 "<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 "
+"information should be downloaded. If this option is not set all "
 "architectures defined by the <literal>APT::Architectures</literal> option "
 "will be downloaded."
 msgstr ""
@@ -6351,13 +6364,23 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml:172
+#, fuzzy
+#| msgid ""
+#| "The ftp scheme specifies an FTP server for the archive. APT's FTP "
+#| "behavior is highly configurable; for more information see the &apt-conf; "
+#| "manual page. Please note that a ftp proxy can be specified by using the "
+#| "<envar>ftp_proxy</envar> environment variable. It is possible to specify "
+#| "a http proxy (http proxy servers often understand ftp urls)  using this "
+#| "method and ONLY this method. ftp proxies using http specified in the "
+#| "configuration file will be ignored."
 msgid ""
 "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
 "is highly configurable; for more information see the &apt-conf; manual page. "
-"Please note that a ftp proxy can be specified by using the <envar>ftp_proxy</"
-"envar> environment variable. It is possible to specify a http proxy (http "
-"proxy servers often understand ftp urls)  using this method and ONLY this "
-"method. ftp proxies using http specified in the configuration file will be "
+"Please note that an FTP proxy can be specified by using the "
+"<envar>ftp_proxy</envar> environment variable. It is possible to specify an "
+"HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
+"environment variable and <emphasis>ONLY</emphasis> this environment "
+"variable. Proxies using HTTP specified in the configuration file will be "
 "ignored."
 msgstr ""
 "Schemat ftp opisuje serwer FTP archiwum. Zachowanie modułu FTP można "
@@ -6369,11 +6392,18 @@ msgstr ""
 "używające http zostaną zignorowane."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:183
+#: sources.list.5.xml:184
+#, fuzzy
+#| msgid ""
+#| "The copy scheme is identical to the file scheme except that packages are "
+#| "copied into the cache directory instead of used directly at their "
+#| "location.  This is useful for people using a zip disk to copy files "
+#| "around with APT."
 msgid ""
 "The copy scheme is identical to the file scheme except that packages are "
 "copied into the cache directory instead of used directly at their location.  "
-"This is useful for people using a zip disk to copy files around with APT."
+"This is useful for people using removable media to copy files around with "
+"APT."
 msgstr ""
 "Schemat copy jest identyczny ze schematem file, z tym wyjątkiem, że pakiety "
 "nie są używane bezpośrednio z podanej lokalizacji, tylko są kopiowane do "
@@ -6381,13 +6411,19 @@ msgstr ""
 "skopiowania plików przy użyciu APT."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:190
+#: sources.list.5.xml:191
+#, fuzzy
+#| msgid ""
+#| "The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given "
+#| "user and access the files. It is a good idea to do prior arrangements "
+#| "with RSA keys or rhosts.  Access to files on the remote uses standard "
+#| "<command>find</command> and <command>dd</command> commands to perform the "
+#| "file transfers from the remote."
 msgid ""
-"The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given "
-"user and access the files. It is a good idea to do prior arrangements with "
-"RSA keys or rhosts.  Access to files on the remote uses standard "
-"<command>find</command> and <command>dd</command> commands to perform the "
-"file transfers from the remote."
+"The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
+"the files as a given user. Prior configuration of rhosts or RSA keys is "
+"recommended. The standard <command>find</command> and <command>dd</command> "
+"commands are used to perform the file transfers from the remote host."
 msgstr ""
 "Metoda rsh/ssh uruchamia rsh/ssh do połączenia się ze zdalnym komputerem "
 "jako podany użytkownik i uzyskania dostępu do plików. Dobrym pomysłem jest "
@@ -6403,13 +6439,22 @@ msgstr "dodawanie innych rozpoznawanych typów URI"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml:200
-msgid ""
-"APT can be extended with more methods shipped in other optional packages "
-"which should follow the nameing scheme <package>apt-transport-"
-"<replaceable>method</replaceable></package>.  The APT team e.g. maintains "
-"also the <package>apt-transport-https</package> package which provides "
-"access methods for https-URIs with features similar to the http method, but "
-"other methods for using e.g. debtorrent are also available, see &apt-"
+#, fuzzy
+#| msgid ""
+#| "APT can be extended with more methods shipped in other optional packages "
+#| "which should follow the nameing scheme <package>apt-transport-"
+#| "<replaceable>method</replaceable></package>.  The APT team e.g. maintains "
+#| "also the <package>apt-transport-https</package> package which provides "
+#| "access methods for https-URIs with features similar to the http method, "
+#| "but other methods for using e.g. debtorrent are also available, see &apt-"
+#| "transport-debtorrent;."
+msgid ""
+"APT can be extended with more methods shipped in other optional packages, "
+"which should follow the naming scheme <package>apt-transport-"
+"<replaceable>method</replaceable></package>.  For instance, the APT team "
+"also maintains the package <package>apt-transport-https</package>, which "
+"provides access methods for HTTPS URIs with features similar to the http "
+"method.  Methods for using e.g. debtorrent are also available - see &apt-"
 "transport-debtorrent;."
 msgstr ""
 "APT może być rozszerzone o więcej metod, pochodzących z innych opcjonalnych "
@@ -6647,7 +6692,10 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-sortpkgs.1.xml:45
-msgid "All output is sent to stdout, the input must be a seekable file."
+#, fuzzy
+#| msgid "All output is sent to stdout, the input must be a seekable file."
+msgid ""
+"All output is sent to standard output; the input must be a seekable file."
 msgstr ""
 "Wyjście programu jest wypisywane na standardowe wyjście, wejście musi "
 "pochodzić z pliku."
@@ -9110,6 +9158,38 @@ msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
 msgid "Which will use the already fetched archives on the disc."
 msgstr "Które użyje pobranych uprzednio archiwów z dysku."
 
+#~ msgid ""
+#~ "The package resource list is used to locate archives of the package "
+#~ "distribution system in use on the system. At this time, this manual page "
+#~ "documents only the packaging system used by the Debian system.  This "
+#~ "control file is <filename>/etc/apt/sources.list</filename>."
+#~ msgstr ""
+#~ "Lista zasobów pakietów jest używana do zlokalizowania archiwów pakietów "
+#~ "używanego systemu dystrybucji pakietów. Obecnie ta strona podręcznika "
+#~ "opisuje tylko system pakietów używany w systemie Debian. Plikiem "
+#~ "kontrolnym jest <filename>/etc/apt/sources.list</filename>."
+
+#~ msgid ""
+#~ "The source list is designed to support any number of active sources and a "
+#~ "variety of source media. The file lists one source per line, with the "
+#~ "most preferred source listed first. The format of each line is: "
+#~ "<literal>type uri args</literal> The first item, <literal>type</literal> "
+#~ "determines the format for <literal>args</literal>. <literal>uri</literal> "
+#~ "is a Universal Resource Identifier (URI), which is a superset of the more "
+#~ "specific and well-known Universal Resource Locator, or URL. The rest of "
+#~ "the line can be marked as a comment by using a #."
+#~ msgstr ""
+#~ "Listę źródeł zaprojektowano tak, aby obsługiwała dowolną liczbę aktywnych "
+#~ "źródeł i różnorodne lokalizacje źródeł. Każde źródło jest wymienione w "
+#~ "osobnej linii, zaczynając od źródeł najbardziej preferowanych. Format "
+#~ "każdej linii jest następujący: <literal>typ uri argumenty</literal>. "
+#~ "Pierwsza pozycja, <literal>typ</literal>, wyznacza format "
+#~ "<literal>argumentów</literal>. <literal>uri</literal> jest uniwersalnym "
+#~ "identyfikatorem zasobu (ang. Universal Resource Identifier - URI), który "
+#~ "jest nadzbiorem dobrze znanego uniwersalnego lokalizatora zasobu (ang. "
+#~ "Universal Resource Locator - URL). Pozostała część linii może być "
+#~ "komentarzem, jeśli zaczyna się od znaku \"#\"."
+
 #
 #~ msgid ""
 #~ "<literal>gencaches</literal> performs the same operation as <command>apt-"
diff --git a/doc/po/pt.po b/doc/po/pt.po
index b3339907a..5a3b53fb2 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.8.0~pre1\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-06 23:46+0300\n"
+"POT-Creation-Date: 2012-06-09 19:12+0300\n"
 "PO-Revision-Date: 2010-08-25 23:07+0100\n"
 "Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -1577,14 +1577,14 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml:518 apt-cache.8.xml:343 apt-key.8.xml:174 apt-mark.8.xml:125
-#: apt.conf.5.xml:1118 apt_preferences.5.xml:698
+#: apt.conf.5.xml:1156 apt_preferences.5.xml:698
 msgid "Files"
 msgstr "Ficheiros"
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131
 #: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109
-#: apt.conf.5.xml:1124 apt_preferences.5.xml:705 sources.list.5.xml:252
+#: apt.conf.5.xml:1162 apt_preferences.5.xml:705 sources.list.5.xml:252
 #: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63
 #: apt-ftparchive.1.xml:607
 msgid "See Also"
@@ -3198,11 +3198,17 @@ msgstr "Ficheiro de configuração para o APT"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:42
+#, fuzzy
+#| msgid ""
+#| "<filename>apt.conf</filename> is the main configuration file for the APT "
+#| "suite of tools, but by far not the only place changes to options can be "
+#| "made. All tools therefore share the configuration files and also use a "
+#| "common command line parser to provide a uniform environment."
 msgid ""
-"<filename>apt.conf</filename> is the main configuration file for the APT "
-"suite of tools, but by far not the only place changes to options can be "
-"made. All tools therefore share the configuration files and also use a "
-"common command line parser to provide a uniform environment."
+"<filename>/etc/apt/apt.conf</filename> is the main configuration file shared "
+"by all the tools in the APT suite of tools, though it is by no means the "
+"only place options can be set. The suite also shares a common command line "
+"parser to provide a uniform environment."
 msgstr ""
 "<filename>apt.conf</filename> é o ficheiro de configuração principal para a "
 "suite de ferramentas do APT, as não é o único lugar onde se podem fazer "
@@ -3211,7 +3217,7 @@ msgstr ""
 "disponibilizar um ambiente uniforme."
 
 #. type: Content of: <refentry><refsect1><orderedlist><para>
-#: apt.conf.5.xml:47
+#: apt.conf.5.xml:48
 msgid ""
 "When an APT tool starts up it will read the configuration files in the "
 "following order:"
@@ -3220,7 +3226,7 @@ msgstr ""
 "seguinte ordem:"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:49
+#: apt.conf.5.xml:50
 msgid ""
 "the file specified by the <envar>APT_CONFIG</envar> environment variable (if "
 "any)"
@@ -3229,7 +3235,7 @@ msgstr ""
 "(se existir)"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:51
+#: apt.conf.5.xml:52
 #, fuzzy
 #| msgid ""
 #| "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
@@ -3242,8 +3248,8 @@ msgid ""
 "extension and which only contain alphanumeric, hyphen (-), underscore (_) "
 "and period (.) characters.  Otherwise APT will print a notice that it has "
 "ignored a file, unless that file matches a pattern in the <literal>Dir::"
-"Ignore-Files-Silently</literal> configuration list - in this case it will be "
-"silently ignored."
+"Ignore-Files-Silently</literal> configuration list - in which case it will "
+"be silently ignored."
 msgstr ""
 "todos os ficheiros em <literal>Dir::Etc::Parts</literal> em ordem ascendente "
 "alfanumérica sem extensão ou com \"<literal>conf</literal>\" como extensão "
@@ -3251,7 +3257,7 @@ msgstr ""
 "underscore (_) e ponto (.) - caso contrário serão ignorados em silêncio."
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:58
+#: apt.conf.5.xml:59
 msgid ""
 "the main configuration file specified by <literal>Dir::Etc::main</literal>"
 msgstr ""
@@ -3259,7 +3265,7 @@ msgstr ""
 "main</literal>"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:60
+#: apt.conf.5.xml:61
 msgid ""
 "the command line options are applied to override the configuration "
 "directives or to load even more configuration files."
@@ -3268,16 +3274,16 @@ msgstr ""
 "configuração ou para carregar mais ficheiros de configuração."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:64
+#: apt.conf.5.xml:65
 msgid "Syntax"
 msgstr "Sintaxe"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:65
+#: apt.conf.5.xml:66
 msgid ""
 "The configuration file is organized in a tree with options organized into "
 "functional groups. Option specification is given with a double colon "
-"notation, for instance <literal>APT::Get::Assume-Yes</literal> is an option "
+"notation; for instance <literal>APT::Get::Assume-Yes</literal> is an option "
 "within the APT tool group, for the Get tool. Options do not inherit from "
 "their parent groups."
 msgstr ""
@@ -3288,19 +3294,31 @@ msgstr ""
 "ferramenta Get. A opções não herdam dos seus grupos parentes."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:71
+#: apt.conf.5.xml:72
+#, fuzzy
+#| msgid ""
+#| "Syntactically the configuration language is modeled after what the ISC "
+#| "tools such as bind and dhcp use. Lines starting with <literal>//</"
+#| "literal> are treated as comments (ignored), as well as all text between "
+#| "<literal>/*</literal> and <literal>*/</literal>, just like C/C++ "
+#| "comments.  Each line is of the form <literal>APT::Get::Assume-Yes \"true"
+#| "\";</literal>. The trailing semicolon and the quotes are required. The "
+#| "value must be on one line, and there is no kind of string concatenation. "
+#| "It must not include inside quotes.  The behavior of the backslash \"\\\" "
+#| "and escaped characters inside a value is undefined and it should not be "
+#| "used. An option name may include alphanumerical characters and the \"/-:._"
+#| "+\" characters. A new scope can be opened with curly braces, like:"
 msgid ""
 "Syntactically the configuration language is modeled after what the ISC tools "
 "such as bind and dhcp use. Lines starting with <literal>//</literal> are "
 "treated as comments (ignored), as well as all text between <literal>/*</"
 "literal> and <literal>*/</literal>, just like C/C++ comments.  Each line is "
-"of the form <literal>APT::Get::Assume-Yes \"true\";</literal>. The trailing "
-"semicolon and the quotes are required. The value must be on one line, and "
-"there is no kind of string concatenation. It must not include inside "
-"quotes.  The behavior of the backslash \"\\\" and escaped characters inside "
-"a value is undefined and it should not be used. An option name may include "
-"alphanumerical characters and the \"/-:._+\" characters. A new scope can be "
-"opened with curly braces, like:"
+"of the form <literal>APT::Get::Assume-Yes \"true\";</literal>.  The "
+"quotation marks and trailing semicolon are required.  The value must be on "
+"one line, and there is no kind of string concatenation.  Values must not "
+"include backslashes or extra quotation marks.  Option names are made up of "
+"alphanumeric characters and the characters \"/-:._+\".  A new scope can be "
+"opened with curly braces, like this:"
 msgstr ""
 "Sintacticamente a linguagem de configuração é modelada após o que as "
 "ferramentas ISC usam, como o bind e o dhcp. As linhas que começam com "
@@ -3334,10 +3352,16 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:93
+#, fuzzy
+#| msgid ""
+#| "with newlines placed to make it more readable. Lists can be created by "
+#| "opening a scope and including a single string enclosed in quotes followed "
+#| "by a semicolon. Multiple entries can be included, each separated by a "
+#| "semicolon."
 msgid ""
 "with newlines placed to make it more readable. Lists can be created by "
 "opening a scope and including a single string enclosed in quotes followed by "
-"a semicolon. Multiple entries can be included, each separated by a semicolon."
+"a semicolon. Multiple entries can be included, separated by a semicolon."
 msgstr ""
 "com novas linhas colocadas para o tornar mais legível. As listas podem ser "
 "criadas ao abrir um scope e incluindo uma string única entre aspas seguida "
@@ -3361,9 +3385,13 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:105
+#, fuzzy
+#| msgid ""
+#| "The names of the configuration items are not case-sensitive. So in the "
+#| "previous example you could use <literal>dpkg::pre-install-pkgs</literal>."
 msgid ""
-"The names of the configuration items are not case-sensitive. So in the "
-"previous example you could use <literal>dpkg::pre-install-pkgs</literal>."
+"Case is not significant in names of configuration items, so in the previous "
+"example you could use <literal>dpkg::pre-install-pkgs</literal>."
 msgstr ""
 "Os nomes dos items de configuração não são sensíveis a maiúsculas/"
 "minúsculas. Portanto no exemplo prévio você poderia usar <literal>dpkg::pre-"
@@ -3372,11 +3400,11 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:108
 msgid ""
-"Names for the configuration items are optional if a list is defined as it "
-"can be see in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. "
-"If you don't specify a name a new entry will simply add a new option to the "
-"list. If you specify a name you can override the option as every other "
-"option by reassigning a new value to the option."
+"Names for the configuration items are optional if a list is defined as can "
+"be seen in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. If "
+"you don't specify a name a new entry will simply add a new option to the "
+"list. If you specify a name you can override the option in the same way as "
+"any other option by reassigning a new value to the option."
 msgstr ""
 "Os nomes dos items de configuração são opcionais se uma lista for definida "
 "com pode ser vista no exemplo <literal>DPkg::Pre-Install-Pkgs</literal> "
@@ -3387,14 +3415,23 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:113
-msgid ""
-"Two specials are allowed, <literal>#include</literal> (which is deprecated "
-"and not supported by alternative implementations) and <literal>#clear</"
-"literal>: <literal>#include</literal> will include the given file, unless "
-"the filename ends in a slash, then the whole directory is included.  "
-"<literal>#clear</literal> is used to erase a part of the configuration tree. "
-"The specified element and all its descendants are erased.  (Note that these "
-"lines also need to end with a semicolon.)"
+#, fuzzy
+#| msgid ""
+#| "Two specials are allowed, <literal>#include</literal> (which is "
+#| "deprecated and not supported by alternative implementations) and "
+#| "<literal>#clear</literal>: <literal>#include</literal> will include the "
+#| "given file, unless the filename ends in a slash, then the whole directory "
+#| "is included.  <literal>#clear</literal> is used to erase a part of the "
+#| "configuration tree. The specified element and all its descendants are "
+#| "erased.  (Note that these lines also need to end with a semicolon.)"
+msgid ""
+"Two special commands are defined: <literal>#include</literal> (which is "
+"deprecated and not supported by alternative implementations) and "
+"<literal>#clear</literal>. <literal>#include</literal> will include the "
+"given file, unless the filename ends in a slash, in which case the whole "
+"directory is included.  <literal>#clear</literal> is used to erase a part of "
+"the configuration tree. The specified element and all its descendants are "
+"erased.  (Note that these lines also need to end with a semicolon.)"
 msgstr ""
 "São permitidas duas especiais, <literal>#include</literal> (a qual está "
 "obsoleta e não é suportada por implementações alternativas) e "
@@ -3406,13 +3443,20 @@ msgstr ""
 "acabar com um 'ponto e vírgula' (;) .)"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:121
-msgid ""
-"The #clear command is the only way to delete a list or a complete scope.  "
-"Reopening a scope or the ::-style described below will <emphasis>not</"
-"emphasis> override previously written entries. Only options can be "
-"overridden by addressing a new value to it - lists and scopes can't be "
-"overridden, only cleared."
+#: apt.conf.5.xml:123
+#, fuzzy
+#| msgid ""
+#| "The #clear command is the only way to delete a list or a complete scope.  "
+#| "Reopening a scope or the ::-style described below will <emphasis>not</"
+#| "emphasis> override previously written entries. Only options can be "
+#| "overridden by addressing a new value to it - lists and scopes can't be "
+#| "overridden, only cleared."
+msgid ""
+"The <literal>#clear</literal> command is the only way to delete a list or a "
+"complete scope. Reopening a scope (or using the syntax described below with "
+"an appended <literal>::</literal>) will <emphasis>not</emphasis> override "
+"previously written entries. Options can only be overridden by addressing a "
+"new value to them - lists and scopes can't be overridden, only cleared."
 msgstr ""
 "O comando #clear é a única maneira de apagar uma lista ou um scope completo. "
 "Reabrindo um scope ou o  ::-style descrito abaixo <emphasis>não</emphasis> "
@@ -3421,22 +3465,23 @@ msgstr ""
 "sobrepostos, apenas limpos."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:126
+#: apt.conf.5.xml:131
 #, fuzzy
 #| msgid ""
-#| "All of the APT tools take a -o option which allows an arbitrary "
+#| "All of the APT tools take an -o option which allows an arbitrary "
 #| "configuration directive to be specified on the command line. The syntax "
 #| "is a full option name (<literal>APT::Get::Assume-Yes</literal> for "
 #| "instance) followed by an equals sign then the new value of the option. "
 #| "Lists can be appended too by adding a trailing :: to the list name. (As "
 #| "you might suspect: The scope syntax can't be used on the command line.)"
 msgid ""
-"All of the APT tools take a -o option which allows an arbitrary "
+"All of the APT tools take an -o option which allows an arbitrary "
 "configuration directive to be specified on the command line. The syntax is a "
 "full option name (<literal>APT::Get::Assume-Yes</literal> for instance) "
 "followed by an equals sign then the new value of the option. To append a new "
-"element to a list, add a trailing :: to the name of the list. (As you might "
-"suspect: The scope syntax can't be used on the command line.)"
+"element to a list, add a trailing <literal>::</literal> to the name of the "
+"list.  (As you might suspect, the scope syntax can't be used on the command "
+"line.)"
 msgstr ""
 "Todas as ferramentas do APT recebem uma opção -o que permite uma directiva "
 "de configuração arbitrária para ser especificada na linha de comandos. A "
@@ -3447,7 +3492,7 @@ msgstr ""
 "usada na linha de comandos.)"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:133
+#: apt.conf.5.xml:139
 #, fuzzy
 #| msgid ""
 #| "Note that you can use :: only for appending one item per line to a list "
@@ -3463,18 +3508,18 @@ msgstr ""
 #| "encounter this misuse, so please correct such statements now as long as "
 #| "APT doesn't complain explicit about them."
 msgid ""
-"Note that you can use :: only for appending one item per line to a list and "
-"that you should not use it in combination with the scope syntax.  (The scope "
-"syntax implicit insert ::) Using both syntaxes together will trigger a bug "
-"which some users unfortunately depend on: An option with the unusual name "
-"\"<literal>::</literal>\" which acts like every other option with a name. "
-"These introduces many problems including that a user who writes multiple "
-"lines in this <emphasis>wrong</emphasis> syntax in the hope to append to a "
-"list will gain the opposite as only the last assignment for this option "
-"\"<literal>::</literal>\" will be used. Upcoming APT versions will raise "
-"errors and will stop working if they encounter this misuse, so please "
-"correct such statements now as long as APT doesn't complain explicit about "
-"them."
+"Note that appending items to a list using <literal>::</literal> only works "
+"for one item per line, and that you should not use it in combination with "
+"the scope syntax (which adds <literal>::</literal> implicitly). Using both "
+"syntaxes together will trigger a bug which some users unfortunately depend "
+"on: an option with the unusual name \"<literal>::</literal>\" which acts "
+"like every other option with a name. This introduces many problems; for one "
+"thing, users who write multiple lines in this <emphasis>wrong</emphasis> "
+"syntax in the hope of appending to a list will achieve the opposite, as only "
+"the last assignment for this option \"<literal>::</literal>\" will be used. "
+"Future versions of APT will raise errors and stop working if they encounter "
+"this misuse, so please correct such statements now while APT doesn't "
+"explicitly complain about them."
 msgstr ""
 "Note que você apenas pode usar :: para acrescentar um item por linha a uma "
 "lista e não o deve usar em combinação com a sintaxe scope. (A sintaxe scope "
@@ -3490,12 +3535,12 @@ msgstr ""
 "declarações agora enquanto o APT não se queixa explicitamente acerca delas."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:145
+#: apt.conf.5.xml:154
 msgid "The APT Group"
 msgstr "O Grupo APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:146
+#: apt.conf.5.xml:155
 msgid ""
 "This group of options controls general APT behavior as well as holding the "
 "options for all of the tools."
@@ -3504,7 +3549,7 @@ msgstr ""
 "as opções para todas as ferramentas."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:151
+#: apt.conf.5.xml:160
 msgid ""
 "System Architecture; sets the architecture to use when fetching files and "
 "parsing package lists. The internal default is the architecture apt was "
@@ -3515,25 +3560,25 @@ msgstr ""
 "qual o APT foi compilado."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:157
+#: apt.conf.5.xml:167
 msgid ""
-"All Architectures the system supports. Processors implementing the "
-"<literal>amd64</literal> (also called <literal>x86-64</literal>) instruction "
-"set are e.g. also able to execute binaries compiled for the <literal>i386</"
-"literal> (<literal>x86</literal>) instruction set; 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>."
+"All Architectures the system supports. For instance, CPUs implementing the "
+"<literal>amd64</literal> (also called <literal>x86-64</literal>)  "
+"instruction set are also able to execute binaries compiled for the "
+"<literal>i386</literal> (<literal>x86</literal>) instruction set. This list "
+"is used when fetching files and parsing package lists. The initial default "
+"is always the system's native architecture (<literal>APT::Architecture</"
+"literal>), and foreign architectures are added to the default list when they "
+"are registered via <command>dpkg --add-architecture</command>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:167
+#: apt.conf.5.xml:180
 msgid ""
-"Default release to install packages from if more than one version available. "
-"Contains release name, codename or release version. Examples: 'stable', "
-"'testing', 'unstable', '&stable-codename;', '&testing-codename;', '4.0', "
-"'5.0*'. See also &apt-preferences;."
+"Default release to install packages from if more than one version is "
+"available. Contains release name, codename or release version. Examples: "
+"'stable', 'testing', 'unstable', '&stable-codename;', '&testing-codename;', "
+"'4.0', '5.0*'. See also &apt-preferences;."
 msgstr ""
 "Lançamento predefinido de onde instalar pacotes se existir mais de uma "
 "versão disponível. Contém o nome do lançamento, nome de código ou versão de "
@@ -3541,16 +3586,16 @@ msgstr ""
 "'&testing-codename;', '4.0', '5.0*'. Veja também &apt-preferences;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:173
+#: apt.conf.5.xml:186
 msgid ""
-"Ignore Held packages; This global option causes the problem resolver to "
+"Ignore held packages; this global option causes the problem resolver to "
 "ignore held packages in its decision making."
 msgstr ""
 "Ignore Held packages; Esta opção global faz com que ao resolver problemas, "
 "os pacotes segurados sejam ignorados na sua decisão de marcação."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:178
+#: apt.conf.5.xml:191
 msgid ""
 "Defaults to on. When turned on the autoclean feature will remove any "
 "packages which can no longer be downloaded from the cache. If turned off "
@@ -3564,78 +3609,67 @@ msgstr ""
 "directo de os reinstalar."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:185
-msgid ""
-"Defaults to on which will cause APT to install essential and important "
-"packages as fast as possible in the install/upgrade operation. This is done "
-"to limit the effect of a failing &dpkg; call: If this option is disabled APT "
-"does treat an important package in the same way as an extra package: Between "
-"the unpacking of the important package A and his configuration can then be "
-"many other unpack or configuration calls, e.g. for package B which has no "
-"relation to A, but causes the dpkg call to fail (e.g. because maintainer "
-"script of package B generates an error) which results in a system state in "
-"which package A is unpacked but unconfigured - each package depending on A "
-"is now no longer guaranteed to work as their dependency on A is not longer "
-"satisfied. The immediate configuration marker is also applied to all "
-"dependencies which can generate a problem if the dependencies e.g. form a "
-"circle as a dependency with the immediate flag is comparable with a Pre-"
-"Dependency. So in theory it is possible that APT encounters a situation in "
-"which it is unable to perform immediate configuration, errors out and refers "
-"to this option so the user can deactivate the immediate configuration "
-"temporarily to be able to perform an install/upgrade again. Note the use of "
-"the word \"theory\" here as this problem was only encountered by now in real "
-"world a few times in non-stable distribution versions and was caused by "
-"wrong dependencies of the package in question or by a system in an already "
-"broken state, so you should not blindly disable this option as the mentioned "
-"scenario above is not the only problem immediate configuration can help to "
-"prevent in the first place.  Before a big operation like <literal>dist-"
-"upgrade</literal> is run with this option disabled it should be tried to "
-"explicitly <literal>install</literal> the package APT is unable to configure "
-"immediately, but please make sure to report your problem also to your "
-"distribution and to the APT team with the buglink below so they can work on "
-"improving or correcting the upgrade process."
-msgstr ""
-"A predefinição é ligado o que irá fazer com que o APT instale pacotes "
-"essenciais e importantes o mais rápido possível na operação de instalar/"
-"actualizar. Isto é feito para limitar o efeito de uma chamada falhada do "
-"&dpkg;. Se esta opção for desactivada, o APT trata um pacote importante do "
-"mesmo modo que um pacote extra: Entre o desempacotamento do pacote "
-"importante A e a sua configuração podem acontecer muitas outras chamadas de "
-"desempacotamento e configuração, exemplo, para o pacote B que não tem "
-"nenhuma relação com A, mas causa uma falha na chamada ao dpkg (ex, porque o "
-"script do responsável do pacote B gera um erro) o qual resulta num estado do "
-"sistema em que o pacote A está desempacotado mas ainda não configurado - já "
-"não se garante o funcionamento de cada pacote que depende de A porque a sua "
-"dependência já não está satisfeita. O marcador de configuração imediata é "
-"também aplicado a todas as dependências que possam gerar um problema se as "
-"dependências, ex, formam um círculo como uma dependência com a marca de "
-"imediato a ser comparável com uma Pré-Dependência. Portanto, em teoria, é "
-"possível que o APT encontre uma situação na qual é incapaz de executar "
-"configuração imediata, entre em erro e refira esta opção para que o "
-"utilizador possa desactivar temporariamente a configuração imediata para ser "
-"capaz de executar uma instalação/actualização outra vez. Note o uso da "
-"palavra \"teoria\" aqui pois este problema foi poucas vezes encontrado até "
-"agora no mundo real em versões de distribuição não-estáveis e causados por "
-"dependências erradas do pacote em questão ou por um sistema já num estado "
-"corrompido, portanto você não deve desactivar esta opção às cegas porque, em "
-"primeiro lugar, o cenário mencionado acima não é o único problema que a "
-"configuração imediata pode ajudar a prevenir. Antes de uma grande operação "
-"como <literal>dist-upgrade</literal> ser corrida com esta opção desactivada, "
-"deve ser tentado primeiro fazer um <literal>install</literal> explicito ao "
-"pacote que o APT é incapaz de configurar imediatamente, mas por favor "
-"certifique-se de também relatar o seu problema à sua distribuição e à equipa "
-"do APT com o link de bug abaixo para que possam trabalhar na melhoria ou "
-"correcção do processo de actualização."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:208
-msgid ""
-"Never Enable this option unless you -really- know what you are doing. It "
-"permits APT to temporarily remove an essential package to break a Conflicts/"
-"Conflicts or Conflicts/Pre-Depend loop between two essential packages. SUCH "
-"A LOOP SHOULD NEVER EXIST AND IS A GRAVE BUG. This option will work if the "
-"essential packages are not tar, gzip, libc, dpkg, bash or anything that "
-"those packages depend on."
+#: apt.conf.5.xml:199
+msgid ""
+"Defaults to on, which will cause APT to install essential and important "
+"packages as soon as possible in an install/upgrade operation, in order to "
+"limit the effect of a failing &dpkg; call. If this option is disabled, APT "
+"treats an important package in the same way as an extra package: between the "
+"unpacking of the package A and its configuration there can be many other "
+"unpack or configuration calls for other unrelated packages B, C etc. If "
+"these cause the &dpkg; call to fail (e.g. because package B's maintainer "
+"scripts generate an error), this results in a system state in which package "
+"A is unpacked but unconfigured - so any package depending on A is now no "
+"longer guaranteed to work, as its dependency on A is no longer satisfied."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:211
+msgid ""
+"The immediate configuration marker is also applied in the potentially "
+"problematic case of circular dependencies, since a dependency with the "
+"immediate flag is equivalent to a Pre-Dependency. In theory this allows APT "
+"to recognise a situation in which it is unable to perform immediate "
+"configuration, abort, and suggest to the user that the option should be "
+"temporarily deactivated in order to allow the operation to proceed.  Note "
+"the use of the word \"theory\" here; in the real world this problem has "
+"rarely been encountered, in non-stable distribution versions, and was caused "
+"by wrong dependencies of the package in question or by a system in an "
+"already broken state; so you should not blindly disable this option, as the "
+"scenario mentioned above is not the only problem it can help to prevent in "
+"the first place."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:224
+msgid ""
+"Before a big operation like <literal>dist-upgrade</literal> is run with this "
+"option disabled you should try to explicitly <literal>install</literal> the "
+"package APT is unable to configure immediately; but please make sure you "
+"also report your problem to your distribution and to the APT team with the "
+"buglink below, so they can work on improving or correcting the upgrade "
+"process."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:235
+#, fuzzy
+#| msgid ""
+#| "Never Enable this option unless you -really- know what you are doing. It "
+#| "permits APT to temporarily remove an essential package to break a "
+#| "Conflicts/Conflicts or Conflicts/Pre-Depend loop between two essential "
+#| "packages. SUCH A LOOP SHOULD NEVER EXIST AND IS A GRAVE BUG. This option "
+#| "will work if the essential packages are not tar, gzip, libc, dpkg, bash "
+#| "or anything that those packages depend on."
+msgid ""
+"Never enable this option unless you <emphasis>really</emphasis> know what "
+"you are doing. It permits APT to temporarily remove an essential package to "
+"break a Conflicts/Conflicts or Conflicts/Pre-Depends loop between two "
+"essential packages. <emphasis>Such a loop should never exist and is a grave "
+"bug</emphasis>. This option will work if the essential packages are not "
+"<command>tar</command>, <command>gzip</command>, <command>libc</command>, "
+"<command>dpkg</command>, <command>dash</command> or anything that those "
+"packages depend on."
 msgstr ""
 "Nunca Active esta opção a menos que saiba -realmente- o que está a fazer. "
 "Permite ao APT remover temporariamente um pacote essencial para interromper "
@@ -3645,7 +3679,7 @@ msgstr ""
 "tar, gzip, libc, dpkg, bash ou qualquer coisa de que estes dependem."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:217
+#: apt.conf.5.xml:247
 #, fuzzy
 #| msgid ""
 #| "APT uses since version 0.7.26 a resizable memory mapped cache file to "
@@ -3666,20 +3700,20 @@ msgstr ""
 #| "automatic grow of the cache is disabled."
 msgid ""
 "APT uses since version 0.7.26 a resizable memory mapped cache file to store "
-"the 'available' information. <literal>Cache-Start</literal> acts as a hint "
-"to which size the Cache will grow and is therefore the amount of memory APT "
+"the available information. <literal>Cache-Start</literal> acts as a hint of "
+"the size the cache will grow to, and is therefore the amount of memory APT "
 "will request at startup. The default value is 20971520 bytes (~20 MB). Note "
-"that this amount of space needs to be available for APT otherwise it will "
+"that this amount of space needs to be available for APT; otherwise it will "
 "likely fail ungracefully, so for memory restricted devices this value should "
 "be lowered while on systems with a lot of configured sources it should be "
 "increased.  <literal>Cache-Grow</literal> defines in bytes with the default "
-"of 1048576 (~1 MB) how much the Cache size will be increased in the event "
-"the space defined by <literal>Cache-Start</literal> is not enough. These "
+"of 1048576 (~1 MB) how much the cache size will be increased in the event "
+"the space defined by <literal>Cache-Start</literal> is not enough. This "
 "value will be applied again and again until either the cache is big enough "
 "to store all information or the size of the cache reaches the <literal>Cache-"
 "Limit</literal>.  The default of <literal>Cache-Limit</literal> is 0 which "
 "stands for no limit.  If <literal>Cache-Grow</literal> is set to 0 the "
-"automatic grow of the cache is disabled."
+"automatic growth of the cache is disabled."
 msgstr ""
 "O APT usa desde a versão 0.7.26 um ficheiro de cache com mapa de memória de "
 "tamanho ajustável para armazenar a informação disponível. <literal>Cache-"
@@ -3700,46 +3734,49 @@ msgstr ""
 "da cache é desactivado."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:233
-msgid "Defines which package(s) are considered essential build dependencies."
+#: apt.conf.5.xml:263
+#, fuzzy
+#| msgid ""
+#| "Defines which package(s) are considered essential build dependencies."
+msgid "Defines which packages are considered essential build dependencies."
 msgstr ""
 "Define quais pacote(s) são considerados dependências essenciais de "
 "compilação."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:237
+#: apt.conf.5.xml:267
 msgid ""
-"The Get subsection controls the &apt-get; tool, please see its documentation "
+"The Get subsection controls the &apt-get; tool; please see its documentation "
 "for more information about the options here."
 msgstr ""
 "A subsecção Get controla a ferramenta &apt-get;, por favor veja a sua "
 "documentação para mais informação acerca das opções daqui."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:242
+#: apt.conf.5.xml:272
 msgid ""
-"The Cache subsection controls the &apt-cache; tool, please see its "
+"The Cache subsection controls the &apt-cache; tool; please see its "
 "documentation for more information about the options here."
 msgstr ""
 "A subsecção Cache controla a ferramenta &apt-cache;, por favor veja a sua "
 "documentação para mais informação acerca das opções daqui."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:247
+#: apt.conf.5.xml:277
 msgid ""
-"The CDROM subsection controls the &apt-cdrom; tool, please see its "
+"The CDROM subsection controls the &apt-cdrom; tool; please see its "
 "documentation for more information about the options here."
 msgstr ""
 "A subsecção CDROM controla a ferramenta &apt-cdrom;, por favor veja a sua "
 "documentação para mais informação acerca das opções de aqui."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:253
+#: apt.conf.5.xml:283
 msgid "The Acquire Group"
 msgstr "O Grupo Acquire"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:254
+#: apt.conf.5.xml:284
 #, fuzzy
 #| msgid ""
 #| "The <literal>Acquire</literal> group of options controls the download of "
@@ -3747,21 +3784,32 @@ msgstr "O Grupo Acquire"
 #| "\"0\"/>"
 msgid ""
 "The <literal>Acquire</literal> group of options controls the download of "
-"packages and the URI handlers."
+"packages as well as the various \"acquire methods\" responsible for the "
+"download itself (see also &sources-list;)."
 msgstr ""
 "O grupo de opções <literal>Acquire</literal> controla a descarga de pacotes "
 "e os manipuladores de URI. <placeholder type=\"variablelist\" id=\"0\"/>"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:259
-msgid ""
-"Security related option defaulting to true as an expiring validation for a "
-"Release file prevents longtime replay attacks and can e.g. also help users "
-"to identify no longer updated mirrors - but the feature depends on the "
-"correctness of the time on the user system.  Archive maintainers are "
-"encouraged to create Release files with the <literal>Valid-Until</literal> "
-"header, but if they don't or a stricter value is volitional the following "
-"<literal>Max-ValidTime</literal> option can be used."
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:291
+#, fuzzy
+#| msgid ""
+#| "Security related option defaulting to true as an expiring validation for "
+#| "a Release file prevents longtime replay attacks and can e.g. also help "
+#| "users to identify no longer updated mirrors - but the feature depends on "
+#| "the correctness of the time on the user system.  Archive maintainers are "
+#| "encouraged to create Release files with the <literal>Valid-Until</"
+#| "literal> header, but if they don't or a stricter value is volitional the "
+#| "following <literal>Max-ValidTime</literal> option can be used."
+msgid ""
+"Security related option defaulting to true, as giving a Release file's "
+"validation an expiration date prevents replay attacks over a long timescale, "
+"and can also for example help users to identify mirrors that are no longer "
+"updated - but the feature depends on the correctness of the clock on the "
+"user system. Archive maintainers are encouraged to create Release files with "
+"the <literal>Valid-Until</literal> header, but if they don't or a stricter "
+"value is desired the <literal>Max-ValidTime</literal> option below can be "
+"used."
 msgstr ""
 "Opção relacionada com segurança com predefinição a 'verdadeiro' como uma "
 "validação expirada para um ficheiro Release previne ataques repetidos "
@@ -3773,8 +3821,8 @@ msgstr ""
 "preferir-se um valor mais rigoroso pode-se usar a opção <literal>Max-"
 "ValidTime</literal> seguinte."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:270
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:304
 #, fuzzy
 #| msgid ""
 #| "Seconds the Release file should be considered valid after it was created. "
@@ -3787,12 +3835,13 @@ msgstr ""
 #| "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 valid\".  Archive specific settings can "
-"be made by appending the label of the archive to the option name."
+"Maximum time (in seconds) after its creation (as indicated by the "
+"<literal>Date</literal> header) that the <filename>Release</filename> file "
+"should be considered valid.  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 \"valid forever\".  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 "
@@ -3804,8 +3853,8 @@ msgstr ""
 "Definições específicas do Arquivo podem ser feitas ao adicionar a etiqueta "
 "do arquivo ao nome da opção. "
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:281
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:316
 #, fuzzy
 #| msgid ""
 #| "Seconds the Release file should be considered valid after it was created. "
@@ -3818,12 +3867,13 @@ msgstr ""
 #| "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."
+"Minimum time (in seconds) after its creation (as indicated by the "
+"<literal>Date</literal> header) that the <filename>Release</filename> file "
+"should be considered valid.  Use this if you need to use a seldom updated "
+"(local) mirror of a more frequently 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 "
@@ -3835,18 +3885,23 @@ msgstr ""
 "Definições específicas do Arquivo podem ser feitas ao adicionar a etiqueta "
 "do arquivo ao nome da opção. "
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:292
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:328
+#, fuzzy
+#| msgid ""
+#| "Try to download deltas called <literal>PDiffs</literal> for Packages or "
+#| "Sources files instead of downloading whole ones. True by default."
 msgid ""
-"Try to download deltas called <literal>PDiffs</literal> for Packages or "
-"Sources files instead of downloading whole ones. True by default."
+"Try to download deltas called <literal>PDiffs</literal> for indexes (like "
+"<filename>Packages</filename> files) instead of downloading whole ones. True "
+"by default."
 msgstr ""
 "Tenta descarregar deltas chamados <literal>PDiffs</literal> para Pacotes ou "
 "ficheiros Fonte em vez de os descarregar por inteiro. Verdadeiro por "
 "predefinição."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:295
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:331
 #, fuzzy
 #| msgid ""
 #| "Two sub-options to limit the use of PDiffs are also available: With "
@@ -3856,12 +3911,12 @@ msgstr ""
 #| "to the size of the targeted file. If one of these limits is exceeded the "
 #| "complete file is downloaded instead of the patches."
 msgid ""
-"Two sub-options to limit the use of PDiffs are also available: With "
-"<literal>FileLimit</literal> can be specified how many PDiff files are "
-"downloaded at most to update a file. <literal>SizeLimit</literal> on the "
-"other hand is the maximum percentage of the size of all patches compared to "
-"the size of the targeted file. If one of these limits is exceeded the "
-"complete file is downloaded instead of the patches."
+"Two sub-options to limit the use of PDiffs are also available: "
+"<literal>FileLimit</literal> can be used to specify a maximum number of "
+"PDiff files should be downloaded to update a file. <literal>SizeLimit</"
+"literal> on the other hand is the maximum percentage of the size of all "
+"patches compared to the size of the targeted file. If one of these limits is "
+"exceeded the complete file is downloaded instead of the patches."
 msgstr ""
 "Estão também disponíveis duas sub-opções para limitar o uso de PDiffs: Com "
 "<literal>FileLimit</literal> pode ser especificado quantos ficheiros PDiff "
@@ -3870,8 +3925,8 @@ msgstr ""
 "as patches comparadas com o tamanho do ficheiro de destino. Se um destes "
 "limites for excedido, é descarregado o ficheiro completo em vez das patches."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:305
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:341
 msgid ""
 "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
 "literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -3885,8 +3940,8 @@ msgstr ""
 "ligação por máquina destino, <literal>access</literal> significa que será "
 "aberta uma ligação por tipo de URI."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:313
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:349
 msgid ""
 "Number of retries to perform. If this is non-zero APT will retry failed "
 "files the given number of times."
@@ -3894,8 +3949,8 @@ msgstr ""
 "Número de tentativas a executar. Se isto for diferente de zero o APT irá "
 "tentar, no número fornecido de vezes, obter ficheiros falhados."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:318
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:354
 msgid ""
 "Use symlinks for source archives. If set to true then source archives will "
 "be symlinked when possible instead of copying. True is the default."
@@ -3904,15 +3959,24 @@ msgstr ""
 "os arquivos fonte serão links simbólicos, quando possível, em vez de cópias. "
 "A predefinição é verdadeiro."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:323
-msgid ""
-"HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
-"standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per "
-"host proxies can also be specified by using the form <literal>http::Proxy::"
-"&lt;host&gt;</literal> with the special keyword <literal>DIRECT</literal> "
-"meaning to use no proxies. If no one of the above settings is specified, "
-"<envar>http_proxy</envar> environment variable will be used."
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:359
+#, fuzzy
+#| msgid ""
+#| "HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
+#| "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. "
+#| "Per host proxies can also be specified by using the form <literal>http::"
+#| "Proxy::&lt;host&gt;</literal> with the special keyword <literal>DIRECT</"
+#| "literal> meaning to use no proxies. If no one of the above settings is "
+#| "specified, <envar>http_proxy</envar> environment variable will be used."
+msgid ""
+"<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. "
+"It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</"
+"literal>.  Per host proxies can also be specified by using the form "
+"<literal>http::Proxy::&lt;host&gt;</literal> with the special keyword "
+"<literal>DIRECT</literal> meaning to use no proxies. If no one of the above "
+"settings is specified, <envar>http_proxy</envar> environment variable will "
+"be used."
 msgstr ""
 "HTTP URIs; http::Proxy é o proxy http predefinido a usar. Está no formato "
 "standard de <literal>http://[[user][:pass]@]host[:port]/</literal>. Também "
@@ -3921,18 +3985,27 @@ msgstr ""
 "literal> que significa não usar proxies. Se nenhuma das definições acima for "
 "especificada, será usada a variável de ambiente <envar>http_proxy</envar>."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:331
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:367
+#, fuzzy
+#| msgid ""
+#| "Three settings are provided for cache control with HTTP/1.1 compliant "
+#| "proxy caches. <literal>No-Cache</literal> tells the proxy to not use its "
+#| "cached response under any circumstances, <literal>Max-Age</literal> is "
+#| "sent only for index files and tells the cache to refresh its object if it "
+#| "is older than the given number of seconds. Debian updates its index files "
+#| "daily so the default is 1 day. <literal>No-Store</literal> specifies that "
+#| "the cache should never store this request, it is only set for archive "
+#| "files. This may be useful to prevent polluting a proxy cache with very "
+#| "large .deb files. Note: Squid 2.0.2 does not support any of these options."
 msgid ""
 "Three settings are provided for cache control with HTTP/1.1 compliant proxy "
-"caches. <literal>No-Cache</literal> tells the proxy to not use its cached "
-"response under any circumstances, <literal>Max-Age</literal> is sent only "
-"for index files and tells the cache to refresh its object if it is older "
-"than the given number of seconds. Debian updates its index files daily so "
-"the default is 1 day. <literal>No-Store</literal> specifies that the cache "
-"should never store this request, it is only set for archive files. This may "
-"be useful to prevent polluting a proxy cache with very large .deb files. "
-"Note: Squid 2.0.2 does not support any of these options."
+"caches.  <literal>No-Cache</literal> tells the proxy not to use its cached "
+"response under any circumstances.  <literal>Max-Age</literal> sets the "
+"allowed maximum age (in seconds) of an index file in the cache of the "
+"proxy.  <literal>No-Store</literal> specifies that the proxy should not "
+"store the requested archive files in its cache, which can be used to prevent "
+"the proxy from polluting its cache with (big) .deb files."
 msgstr ""
 "São disponibilizadas três definições para controle de cache como caches de "
 "proxy compatíveis com HTTP/1.1. <literal>No-Cache</literal> diz ao proxy "
@@ -3946,44 +4019,55 @@ msgstr ""
 "cache proxy com ficheiros .deb muito grandes. Nota: o Squid 2.0.2 não "
 "suporta nenhuma destas opções."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:341 apt.conf.5.xml:407
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:377 apt.conf.5.xml:449
+#, fuzzy
+#| msgid ""
+#| "The option <literal>timeout</literal> sets the timeout timer used by the "
+#| "method; this applies to all things including connection timeout and data "
+#| "timeout."
 msgid ""
 "The option <literal>timeout</literal> sets the timeout timer used by the "
-"method, this applies to all things including connection timeout and data "
-"timeout."
+"method; this value applies to the connection as well as the data timeout."
 msgstr ""
 "A opção <literal>timeout</literal> define o tempo limite usado por este "
 "método, isto aplica-se a todas as coisas incluindo tempos limite de ligação "
 "e tempos limite de dados."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:344
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:380
 msgid ""
 "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
-"enabled HTTP pipeling (RFC 2616 section 8.1.2.2) which can be beneficial e."
-"g. on high-latency connections. It specifies how many requests are send in a "
+"enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
+"g. on high-latency connections. It specifies how many requests are sent in a "
 "pipeline.  Previous APT versions had a default of 10 for this setting, but "
 "the default value is now 0 (= disabled) to avoid problems with the ever-"
 "growing amount of webservers and proxies which choose to not conform to the "
 "HTTP/1.1 specification."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:351
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:387
 msgid ""
-"<literal>Acquire::http::AllowRedirect</literal> controls if APT will follow "
-"redirects, which is enabled by default."
+"<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
+"follow redirects, which is enabled by default."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:354
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:390
+#, fuzzy
+#| msgid ""
+#| "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
+#| "literal> which accepts integer values in kilobytes. The default value is "
+#| "0 which deactivates the limit and tries uses as much as possible of the "
+#| "bandwidth (Note that this option implicit deactivates the download from "
+#| "multiple servers at the same time.)"
 msgid ""
 "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
-"literal> which accepts integer values in kilobyte. The default value is 0 "
-"which deactivates the limit and tries uses as much as possible of the "
-"bandwidth (Note that this option implicit deactivates the download from "
-"multiple servers at the same time.)"
+"literal> which accepts integer values in kilobytes. The default value is 0 "
+"which deactivates the limit and tries to use all available bandwidth (note "
+"that this option implicitly disables downloading from multiple servers at "
+"the same time.)"
 msgstr ""
 "A largura de banda usada pode ser limitada com <literal>Acquire::http::Dl-"
 "Limit</literal> que aceita valores inteiros em kilobytes. O valor "
@@ -3991,8 +4075,8 @@ msgstr ""
 "largura de banda (Note que esta opção implícita desactiva a descarga de "
 "múltiplos servidores ao mesmo tempo.)"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:359
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:395
 msgid ""
 "<literal>Acquire::http::User-Agent</literal> can be used to set a different "
 "User-Agent for the http download method as some proxies allow access for "
@@ -4003,14 +4087,22 @@ msgstr ""
 "alguns proxies apenas permitem acesso a clientes se o cliente usar um "
 "identificador conhecido."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:366
-msgid ""
-"HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
-"options are the same as for <literal>http</literal> method and will also "
-"default to the options from the <literal>http</literal> method if they are "
-"not explicitly set for https. <literal>Pipeline-Depth</literal> option is "
-"not supported yet."
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:403
+#, fuzzy
+#| msgid ""
+#| "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
+#| "options are the same as for <literal>http</literal> method and will also "
+#| "default to the options from the <literal>http</literal> method if they "
+#| "are not explicitly set for https. <literal>Pipeline-Depth</literal> "
+#| "option is not supported yet."
+msgid ""
+"The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
+"<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
+"<literal>proxy</literal> options work for HTTPS URIs in the same way as for "
+"the <literal>http</literal> method, and default to the same values if they "
+"are not explicitly set. The <literal>Pipeline-Depth</literal> option is not "
+"yet supported."
 msgstr ""
 "HTTPS URIs. as opções Cache-control, Timeout, AllowRedirect, Dl-Limit e "
 "proxy são as mesmas para o método <literal>http</literal> e irá também usar "
@@ -4018,25 +4110,44 @@ msgstr ""
 "explicitamente definidas para https. A opção <literal>Pipeline-Depth</"
 "literal> ainda não é suportada."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:372
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:411
+#, fuzzy
+#| msgid ""
+#| "<literal>CaInfo</literal> suboption specifies place of file that holds "
+#| "info about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> "
+#| "is the corresponding per-host option.  <literal>Verify-Peer</literal> "
+#| "boolean suboption determines whether verify server's host certificate "
+#| "against trusted certificates or not.  <literal>&lt;host&gt;::Verify-Peer</"
+#| "literal> is the corresponding per-host option.  <literal>Verify-Host</"
+#| "literal> boolean suboption determines whether verify server's hostname or "
+#| "not.  <literal>&lt;host&gt;::Verify-Host</literal> is the corresponding "
+#| "per-host option.  <literal>SslCert</literal> determines what certificate "
+#| "to use for client authentication. <literal>&lt;host&gt;::SslCert</"
+#| "literal> is the corresponding per-host option.  <literal>SslKey</literal> "
+#| "determines what private key to use for client authentication. "
+#| "<literal>&lt;host&gt;::SslKey</literal> is the corresponding per-host "
+#| "option.  <literal>SslForceVersion</literal> overrides default SSL version "
+#| "to use.  Can contain 'TLSv1' or 'SSLv3' string.  <literal>&lt;host&gt;::"
+#| "SslForceVersion</literal> is the corresponding per-host option."
 msgid ""
 "<literal>CaInfo</literal> suboption specifies place of file that holds info "
-"about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is "
+"about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is the "
 "corresponding per-host option.  <literal>Verify-Peer</literal> boolean "
-"suboption determines whether verify server's host certificate against "
-"trusted certificates or not.  <literal>&lt;host&gt;::Verify-Peer</literal> "
-"is corresponding per-host option.  <literal>Verify-Host</literal> boolean "
-"suboption determines whether verify server's hostname or not.  <literal>&lt;"
-"host&gt;::Verify-Host</literal> is corresponding per-host option.  "
-"<literal>SslCert</literal> determines what certificate to use for client "
-"authentication. <literal>&lt;host&gt;::SslCert</literal> is corresponding "
-"per-host option.  <literal>SslKey</literal> determines what private key to "
-"use for client authentication. <literal>&lt;host&gt;::SslKey</literal> is "
-"corresponding per-host option.  <literal>SslForceVersion</literal> overrides "
-"default SSL version to use.  Can contain 'TLSv1' or 'SSLv3' string.  "
-"<literal>&lt;host&gt;::SslForceVersion</literal> is corresponding per-host "
-"option."
+"suboption determines whether or not the server's host certificate should be "
+"verified against trusted certificates.  <literal>&lt;host&gt;::Verify-Peer</"
+"literal> is the corresponding per-host option.  <literal>Verify-Host</"
+"literal> boolean suboption determines whether or not the server's hostname "
+"should be verified.  <literal>&lt;host&gt;::Verify-Host</literal> is the "
+"corresponding per-host option.  <literal>SslCert</literal> determines what "
+"certificate to use for client authentication. <literal>&lt;host&gt;::"
+"SslCert</literal> is the corresponding per-host option.  <literal>SslKey</"
+"literal> determines what private key to use for client authentication. "
+"<literal>&lt;host&gt;::SslKey</literal> is the corresponding per-host "
+"option.  <literal>SslForceVersion</literal> overrides default SSL version to "
+"use.  It can contain either of the strings '<literal>TLSv1</literal>' or "
+"'<literal>SSLv3</literal>'.  <literal>&lt;host&gt;::SslForceVersion</"
+"literal> is the corresponding per-host option."
 msgstr ""
 "A sub-opção <literal>CaInfo</literal> especifica o lugar do ficheiro que "
 "contém informação acerca de certificados de confiança. <literal>&lt;"
@@ -4055,23 +4166,39 @@ msgstr ""
 "predefinida a usar. Pode conter strings 'TLSv1' ou 'SSLv3'. <literal>&lt;"
 "host&gt;::SslForceVersion</literal> é a opção po máquina correspondente."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:391
-msgid ""
-"FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard "
-"form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host "
-"proxies can also be specified by using the form <literal>ftp::Proxy::&lt;"
-"host&gt;</literal> with the special keyword <literal>DIRECT</literal> "
-"meaning to use no proxies. If no one of the above settings is specified, "
-"<envar>ftp_proxy</envar> environment variable will be used. To use a ftp "
-"proxy you will have to set the <literal>ftp::ProxyLogin</literal> script in "
-"the configuration file. This entry specifies the commands to send to tell "
-"the proxy server what to connect to. Please see &configureindex; for an "
-"example of how to do this. The substitution variables available are <literal>"
-"$(PROXY_USER)</literal> <literal>$(PROXY_PASS)</literal> <literal>"
-"$(SITE_USER)</literal> <literal>$(SITE_PASS)</literal> <literal>$(SITE)</"
-"literal> and <literal>$(SITE_PORT)</literal> Each is taken from it's "
-"respective URI component."
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:432
+#, fuzzy
+#| msgid ""
+#| "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the "
+#| "standard form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. "
+#| "Per host proxies can also be specified by using the form <literal>ftp::"
+#| "Proxy::&lt;host&gt;</literal> with the special keyword <literal>DIRECT</"
+#| "literal> meaning to use no proxies. If no one of the above settings is "
+#| "specified, <envar>ftp_proxy</envar> environment variable will be used. To "
+#| "use a ftp proxy you will have to set the <literal>ftp::ProxyLogin</"
+#| "literal> script in the configuration file. This entry specifies the "
+#| "commands to send to tell the proxy server what to connect to. Please see "
+#| "&configureindex; for an example of how to do this. The substitution "
+#| "variables available are <literal>$(PROXY_USER)</literal> <literal>"
+#| "$(PROXY_PASS)</literal> <literal>$(SITE_USER)</literal> <literal>"
+#| "$(SITE_PASS)</literal> <literal>$(SITE)</literal> and <literal>"
+#| "$(SITE_PORT)</literal> Each is taken from it's respective URI component."
+msgid ""
+"<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs.  "
+"It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</"
+"literal>.  Per host proxies can also be specified by using the form "
+"<literal>ftp::Proxy::&lt;host&gt;</literal> with the special keyword "
+"<literal>DIRECT</literal> meaning to use no proxies. If no one of the above "
+"settings is specified, <envar>ftp_proxy</envar> environment variable will be "
+"used. To use an FTP proxy you will have to set the <literal>ftp::ProxyLogin</"
+"literal> script in the configuration file. This entry specifies the commands "
+"to send to tell the proxy server what to connect to. Please see "
+"&configureindex; for an example of how to do this. The substitution "
+"variables representing the corresponding URI component are <literal>"
+"$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, <literal>"
+"$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, <literal>$(SITE)</"
+"literal> and <literal>$(SITE_PORT)</literal>."
 msgstr ""
 "URIs FTP; ftp::Proxy é o proxy ftp predefinido a usar. Está no formato "
 "standard de <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Os "
@@ -4088,14 +4215,22 @@ msgstr ""
 "<literal>$(SITE_PASS)</literal> <literal>$(SITE)</literal> e <literal>"
 "$(SITE_PORT)</literal>. Cada uma é tirada do seu componente URI respectivo."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:410
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:452
+#, fuzzy
+#| msgid ""
+#| "Several settings are provided to control passive mode. Generally it is "
+#| "safe to leave passive mode on; it works in nearly every environment.  "
+#| "However, some situations require that passive mode be disabled and port "
+#| "mode FTP used instead. This can be done globally, for connections that go "
+#| "through a proxy or for a specific host (See the sample config file for "
+#| "examples)."
 msgid ""
 "Several settings are provided to control passive mode. Generally it is safe "
-"to leave passive mode on, it works in nearly every environment.  However "
-"some situations require that passive mode be disabled and port mode ftp used "
-"instead. This can be done globally, for connections that go through a proxy "
-"or for a specific host (See the sample config file for examples)."
+"to leave passive mode on; it works in nearly every environment.  However, "
+"some situations require that passive mode be disabled and port mode FTP used "
+"instead. This can be done globally or for connections that go through a "
+"proxy or for a specific host (see the sample config file for examples)."
 msgstr ""
 "São disponibilizadas várias definições para controlar o modo passivo. "
 "Geralmente é seguro deixar o modo passivo ligado, funciona em quase todos "
@@ -4104,22 +4239,22 @@ msgstr ""
 "globalmente, para ligações que passam por um proxy ou para uma máquina "
 "específica (Veja a amostra de ficheiro de configuração para exemplos)."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:417
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:459
 msgid ""
 "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
-"envar> environment variable to a http url - see the discussion of the http "
+"envar> environment variable to an HTTP URL - see the discussion of the http "
 "method above for syntax. You cannot set this in the configuration file and "
 "it is not recommended to use FTP over HTTP due to its low efficiency."
 msgstr ""
 "É possível usar proxy FTP sobre HTTP ao definir a variável de ambiente "
-"<envar>ftp_proxy</envar> para um url http - veja a discussão do método http "
+"<envar>ftp_proxy</envar> para um URL HTTP - veja a discussão do método http "
 "em cima para a sintaxe. Você não pode definir isto no ficheiro de "
 "configuração e não é recomendado usar FTP sobre HTTP devido à sua baixa "
 "eficiência."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:422
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:464
 msgid ""
 "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
 "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -4133,23 +4268,33 @@ msgstr ""
 "controle for IPv6. Definir isto para verdadeiro força o seu uso mesmo em "
 "ligações IPv4. Note que a maioria dos servidores FTP não suporta RFC2428."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:435
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
+#: apt.conf.5.xml:478
 #, no-wrap
 msgid "/cdrom/::Mount \"foo\";"
 msgstr "/cdrom/::Mount \"foo\";"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:430
-msgid ""
-"CD-ROM URIs; the only setting for CD-ROM URIs is the mount point, "
-"<literal>cdrom::Mount</literal> which must be the mount point for the CD-ROM "
-"drive as specified in <filename>/etc/fstab</filename>. It is possible to "
-"provide alternate mount and unmount commands if your mount point cannot be "
-"listed in the fstab (such as an SMB mount and old mount packages). The "
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:473
+#, fuzzy
+#| msgid ""
+#| "CD-ROM URIs; the only setting for CD-ROM URIs is the mount point, "
+#| "<literal>cdrom::Mount</literal> which must be the mount point for the CD-"
+#| "ROM drive as specified in <filename>/etc/fstab</filename>. It is possible "
+#| "to provide alternate mount and unmount commands if your mount point "
+#| "cannot be listed in the fstab (such as an SMB mount and old mount "
+#| "packages). The syntax is to put <placeholder type=\"literallayout\" id="
+#| "\"0\"/> within the cdrom block. It is important to have the trailing "
+#| "slash. Unmount commands can be specified using UMount."
+msgid ""
+"For URIs using the <literal>cdrom</literal> method, the only configurable "
+"option is the mount point, <literal>cdrom::Mount</literal>, which must be "
+"the mount point for the CD-ROM (or DVD, or whatever) drive as specified in "
+"<filename>/etc/fstab</filename>. It is possible to provide alternate mount "
+"and unmount commands if your mount point cannot be listed in the fstab.  The "
 "syntax is to put <placeholder type=\"literallayout\" id=\"0\"/> within the "
-"cdrom block. It is important to have the trailing slash. Unmount commands "
-"can be specified using UMount."
+"<literal>cdrom</literal> block. It is important to have the trailing slash.  "
+"Unmount commands can be specified using UMount."
 msgstr ""
 "CD-ROM URIs; a única definição para URIs de CD-ROM é o ponto de montagem, "
 "<literal>cdrom::Mount</literal> que deve ser o ponto de montagem para a "
@@ -4160,31 +4305,35 @@ msgstr ""
 "\" id=\"0\"/> dentro do bloco cdrom. É importante ter a barra final. "
 "Comandos para desmontar podem ser especificados usando UMount."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:441
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:486
+#, fuzzy
+#| msgid ""
+#| "GPGV URIs; the only option for GPGV URIs is the option to pass additional "
+#| "parameters to gpgv.  <literal>gpgv::Options</literal> Additional options "
+#| "passed to gpgv."
 msgid ""
-"GPGV URIs; the only option for GPGV URIs is the option to pass additional "
-"parameters to gpgv.  <literal>gpgv::Options</literal> Additional options "
-"passed to gpgv."
+"For GPGV URIs the only configurable option is <literal>gpgv::Options</"
+"literal>, which passes additional parameters to gpgv."
 msgstr ""
 "GPGV URIs;a única opção para GPGV URIs é a opção para passar parâmetros "
 "adicionais ao gpgv. <literal>gpgv::Options</literal> Opções adicionais "
 "passadas ao gpgv."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:452
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
+#: apt.conf.5.xml:497
 #, no-wrap
 msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
 msgstr "Acquire::CompressionTypes::<replaceable>Extensão de Ficheiro</replaceable> \"<replaceable>Nome de método</replaceable>\";"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:447
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:492
 msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "
-"compression formats.  Per default the acquire methods can decompress "
+"compression formats.  By default the acquire methods can decompress "
 "<command>bzip2</command>, <command>lzma</command> and <command>gzip</"
-"command> compressed files, with this setting more formats can be added on "
+"command> compressed files; with this setting more formats can be added on "
 "the fly or the used method can be changed. The syntax for this is: "
 "<placeholder type=\"synopsis\" id=\"0\"/>"
 msgstr ""
@@ -4196,33 +4345,49 @@ msgstr ""
 "podem ser adicionados na hora com esta definição ou o método usado pode ser "
 "alterado. A sintaxe para isto é: <placeholder type=\"synopsis\" id=\"0\"/>"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:457
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
+#: apt.conf.5.xml:502
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order:: \"gz\";"
 msgstr "Acquire::CompressionTypes::Order:: \"gz\";"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:460
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
+#: apt.conf.5.xml:505
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:453
-msgid ""
-"Also the <literal>Order</literal> subgroup can be used to define in which "
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:498
+#, fuzzy
+#| msgid ""
+#| "Also, the <literal>Order</literal> subgroup can be used to define in "
+#| "which order the acquire system will try to download the compressed files. "
+#| "The acquire system will try the first and proceed with the next "
+#| "compression type in this list on error, so to prefer one over the other "
+#| "type simply add the preferred type first - not already added default "
+#| "types will be added at run time to the end of the list, so e.g. "
+#| "<placeholder type=\"synopsis\" id=\"0\"/> can be used to prefer "
+#| "<command>gzip</command> compressed files over <command>bzip2</command> "
+#| "and <command>lzma</command>.  If <command>lzma</command> should be "
+#| "preferred over <command>gzip</command> and <command>bzip2</command> the "
+#| "configure setting should look like this <placeholder type=\"synopsis\" id="
+#| "\"1\"/> It is not needed to add <literal>bz2</literal> explicit to the "
+#| "list as it will be added automatic."
+msgid ""
+"Also, the <literal>Order</literal> subgroup can be used to define in which "
 "order the acquire system will try to download the compressed files. The "
 "acquire system will try the first and proceed with the next compression type "
-"in this list on error, so to prefer one over the other type simple add the "
-"preferred type at first - not already added default types will be added at "
-"run time to the end of the list, so e.g. <placeholder type=\"synopsis\" id="
+"in this list on error, so to prefer one over the other type simply add the "
+"preferred type first - default types not already added will be implicitly "
+"appended to the end of the list, so e.g. <placeholder type=\"synopsis\" id="
 "\"0\"/> can be used to prefer <command>gzip</command> compressed files over "
 "<command>bzip2</command> and <command>lzma</command>.  If <command>lzma</"
 "command> should be preferred over <command>gzip</command> and "
-"<command>bzip2</command> the configure setting should look like this "
+"<command>bzip2</command> the configure setting should look like this: "
 "<placeholder type=\"synopsis\" id=\"1\"/> It is not needed to add "
-"<literal>bz2</literal> explicit to the list as it will be added automatic."
+"<literal>bz2</literal> to the list explicitly as it will be added "
+"automatically."
 msgstr ""
 "Também o subgrupo <literal>Order</literal> pode ser usado para definir em "
 "que ordem o sistema de aquisição irá tentar descarregar os ficheiros "
@@ -4239,14 +4404,14 @@ msgstr ""
 "\"1\"/>. Não é necessário adicionar explicitamente <literal>bz2</literal> à "
 "lista pois será adicionado automaticamente."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:464
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
+#: apt.conf.5.xml:512
 #, no-wrap
 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:462
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:507
 #, fuzzy
 #| msgid ""
 #| "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
@@ -4257,19 +4422,19 @@ msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
 #| "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 "
 #| "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 "
+#| "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 "
-"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."
+"Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></"
+"literal> will be checked at run time. If this option has been set, the "
+"method will only be used if this file exists; e.g. for the <literal>bzip2</"
+"literal> 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."
 msgstr ""
 "Note que em tempo de execução será verificado o <literal>Dir::Bin::"
 "<replaceable>nome de método</replaceable></literal>: se esta definição "
@@ -4282,16 +4447,16 @@ msgstr ""
 "pode definir a opção directamente - não em estilo de lista. Isto não irá "
 "sobrepor a lista definida, irá apenas prefixar a lista com este tipo."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:469
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:517
 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."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:476
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:524
 msgid ""
 "When downloading <literal>gzip</literal> compressed indexes (Packages, "
 "Sources, or Translations), keep them gzip compressed locally instead of "
@@ -4303,17 +4468,26 @@ msgstr ""
 "desempacotar. Isto poupa imenso espaço no disco à custa de mais pedidos à "
 "CPU quando constrói as caches de pacotes locais. Falso por predefinição."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:484
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:532
+#, fuzzy
+#| msgid ""
+#| "The Languages subsection controls which <filename>Translation</filename> "
+#| "files are downloaded and in which order APT tries to display the "
+#| "description-translations. APT will try to display the first available "
+#| "description in the language which is listed first. Languages can be "
+#| "defined with their short or long language codes. Note that not all "
+#| "archives provide <filename>Translation</filename> files for every "
+#| "Language - especially the long Languagecodes are rare, so please inform "
+#| "you which ones are available before you set here impossible values."
 msgid ""
 "The Languages subsection controls which <filename>Translation</filename> "
-"files are downloaded and in which order APT tries to display the Description-"
-"Translations. APT will try to display the first available Description in the "
-"Language which is listed at first. Languages can be defined with their short "
-"or long Languagecodes. Note that not all archives provide "
-"<filename>Translation</filename> files for every Language - especially the "
-"long Languagecodes are rare, so please inform you which ones are available "
-"before you set here impossible values."
+"files are downloaded and in which order APT tries to display the description-"
+"translations. APT will try to display the first available description in the "
+"language which is listed first. Languages can be defined with their short or "
+"long language codes. Note that not all archives provide "
+"<filename>Translation</filename> files for every language - the long "
+"language codes are especially rare."
 msgstr ""
 "A subsecção Languages controla quais ficheiros <filename>Translation</"
 "filename> são descarregados e em que ordem o APT tenta mostrar as Traduções "
@@ -4325,33 +4499,52 @@ msgstr ""
 "raros, portanto por favor informe-se sobre os quais estão disponíveis antes "
 "de definir aqui valores impossíveis."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:500
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
+#: apt.conf.5.xml:549
 #, no-wrap
 msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:490
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:537
+#, fuzzy
+#| msgid ""
+#| "The default list includes \"environment\" and \"en\". "
+#| "\"<literal>environment</literal>\" has a special meaning here: It will be "
+#| "replaced at runtime with the languagecodes extracted from the "
+#| "<literal>LC_MESSAGES</literal> environment variable.  It will also ensure "
+#| "that these codes are not included twice in the list. If "
+#| "<literal>LC_MESSAGES</literal> is set to \"C\" only the "
+#| "<filename>Translation-en</filename> file (if available) will be used.  To "
+#| "force APT to use no Translation file use the setting <literal>Acquire::"
+#| "Languages=none</literal>. \"<literal>none</literal>\" is another special "
+#| "meaning code which will stop the search for a suitable "
+#| "<filename>Translation</filename> file.  This can be used by the system "
+#| "administrator to let APT know that it should download also this files "
+#| "without actually use them if the environment doesn't specify this "
+#| "languages. So the following example configuration will result in the "
+#| "order \"en, de\" in an english and in \"de, en\" in a german "
+#| "localization. Note that \"fr\" is downloaded, but not used if APT is not "
+#| "used in a french localization, in such an environment the order would be "
+#| "\"fr, de, en\".  <placeholder type=\"programlisting\" id=\"0\"/>"
 msgid ""
 "The default list includes \"environment\" and \"en\". "
-"\"<literal>environment</literal>\" has a special meaning here: It will be "
-"replaced at runtime with the languagecodes extracted from the "
+"\"<literal>environment</literal>\" has a special meaning here: it will be "
+"replaced at runtime with the language codes extracted from the "
 "<literal>LC_MESSAGES</literal> environment variable.  It will also ensure "
 "that these codes are not included twice in the list. If "
 "<literal>LC_MESSAGES</literal> is set to \"C\" only the "
 "<filename>Translation-en</filename> file (if available) will be used.  To "
-"force apt to use no Translation file use the setting <literal>Acquire::"
+"force APT to use no Translation file use the setting <literal>Acquire::"
 "Languages=none</literal>. \"<literal>none</literal>\" is another special "
-"meaning code which will stop the search for a fitting <filename>Translation</"
-"filename> file.  This can be used by the system administrator to let APT "
-"know that it should download also this files without actually use them if "
-"the environment doesn't specify this languages. So the following example "
-"configuration will result in the order \"en, de\" in an english and in \"de, "
-"en\" in a german localization. Note that \"fr\" is downloaded, but not used "
-"if APT is not used in a french localization, in such an environment the "
-"order would be \"fr, de, en\".  <placeholder type=\"programlisting\" id="
-"\"0\"/>"
+"meaning code which will stop the search for a suitable "
+"<filename>Translation</filename> file.  This tells APT to download these "
+"translations too, without actually using them unless the environment "
+"specifies the languages. So the following example configuration will result "
+"in the order \"en, de\" in an English locale or \"de, en\" in a German one. "
+"Note that \"fr\" is downloaded, but not used unless APT is used in a French "
+"locale (where the order would be \"fr, de, en\").  <placeholder type="
+"\"programlisting\" id=\"0\"/>"
 msgstr ""
 "A lista predefinida inclui \"environment\" e \"en\". \"<literal>environment</"
 "literal>\" tem um significado especial aqui: será substituída em tempo de "
@@ -4371,8 +4564,8 @@ msgstr ""
 "APT não for usado num ambiente em francês, em tal ambiente a ordem deveria "
 "ser \"fr, de, en\".  <placeholder type=\"programlisting\" id=\"0\"/>"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:501
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:550
 msgid ""
 "Note: To prevent problems resulting from APT being executed in different "
 "environments (e.g. by different users or by other programs) all Translation "
@@ -4381,47 +4574,58 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:560
 msgid "Directories"
 msgstr "Directories"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:514
+#: apt.conf.5.xml:562
 #, fuzzy
 #| msgid ""
 #| "The <literal>Dir::State</literal> section has directories that pertain to "
 #| "local state information. <literal>lists</literal> is the directory to "
 #| "place downloaded package lists in and <literal>status</literal> is the "
-#| "name of the dpkg status file.  <literal>preferences</literal> is the name "
-#| "of the APT preferences file.  <literal>Dir::State</literal> contains the "
-#| "default directory to prefix on all sub items if they do not start with "
-#| "<filename>/</filename> or <filename>./</filename>."
+#| "name of the &dpkg; status file.  <literal>preferences</literal> is the "
+#| "name of the APT preferences file.  <literal>Dir::State</literal> contains "
+#| "the default directory to prefix on all sub items if they do not start "
+#| "with <filename>/</filename> or <filename>./</filename>."
 msgid ""
 "The <literal>Dir::State</literal> section has directories that pertain to "
 "local state information. <literal>lists</literal> is the directory to place "
 "downloaded package lists in and <literal>status</literal> is the name of the "
-"dpkg status file.  <literal>preferences</literal> is the name of the APT "
+"&dpkg; status file.  <literal>preferences</literal> is the name of the APT "
 "<filename>preferences</filename> file.  <literal>Dir::State</literal> "
-"contains the default directory to prefix on all sub items if they do not "
+"contains the default directory to prefix on all sub-items if they do not "
 "start with <filename>/</filename> or <filename>./</filename>."
 msgstr ""
 "A secção <literal>Dir::State</literal> tem directórios que pertencem à "
 "informação de estado local. <literal>lists</literal> é o directório para "
 "colocar listas de pacotes descarregadas e <literal>status</literal> é o nome "
-"do ficheiro de estado do dpkg. <literal>preferences</literal> é o nome do "
+"do ficheiro de estado do &dpkg;. <literal>preferences</literal> é o nome do "
 "ficheiro de preferências do APT. <literal>Dir::State</literal> contém o "
 "directório predefinido para pré-fixar em todos os sub items que não começam "
 "com <filename>/</filename> ou <filename>./</filename>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:521
+#: apt.conf.5.xml:569
+#, fuzzy
+#| msgid ""
+#| "<literal>Dir::Cache</literal> contains locations pertaining to local "
+#| "cache information, such as the two package caches <literal>srcpkgcache</"
+#| "literal> and <literal>pkgcache</literal> as well as the location to place "
+#| "downloaded archives, <literal>Dir::Cache::archives</literal>. Generation "
+#| "of caches can be turned off by setting their names to be blank. This will "
+#| "slow down startup but save disk space. It is probably preferable to turn "
+#| "off the pkgcache rather than the srcpkgcache. Like <literal>Dir::State</"
+#| "literal> the default directory is contained in <literal>Dir::Cache</"
+#| "literal>"
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
 "and <literal>pkgcache</literal> as well as the location to place downloaded "
 "archives, <literal>Dir::Cache::archives</literal>. Generation of caches can "
-"be turned off by setting their names to be blank. This will slow down "
-"startup but save disk space. It is probably preferred to turn off the "
+"be turned off by setting their names to the empty string. This will slow "
+"down startup but save disk space. It is probably preferable to turn off the "
 "pkgcache rather than the srcpkgcache. Like <literal>Dir::State</literal> the "
 "default directory is contained in <literal>Dir::Cache</literal>"
 msgstr ""
@@ -4435,7 +4639,7 @@ msgstr ""
 "literal> o directório predefinido é contido em <literal>Dir::Cache</literal>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:530
+#: apt.conf.5.xml:578
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4450,7 +4654,7 @@ msgstr ""
 "ficheiro de configuração especificado por <envar>APT_CONFIG</envar>)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:536
+#: apt.conf.5.xml:584
 msgid ""
 "The <literal>Dir::Parts</literal> setting reads in all the config fragments "
 "in lexical order from the directory specified. After this is done then the "
@@ -4461,7 +4665,7 @@ msgstr ""
 "estar feito então é carregado o ficheiro de configuração principal."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:540
+#: apt.conf.5.xml:588
 msgid ""
 "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
 "Bin::Methods</literal> specifies the location of the method handlers and "
@@ -4479,7 +4683,7 @@ msgstr ""
 "respectivos programas."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:548
+#: apt.conf.5.xml:596
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "
@@ -4500,7 +4704,7 @@ msgstr ""
 "procurado em <filename>/tmp/staging/var/lib/dpkg/status</filename>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:561
+#: apt.conf.5.xml:609
 msgid ""
 "The <literal>Ignore-Files-Silently</literal> list can be used to specify "
 "which files APT should silently ignore while parsing the files in the "
@@ -4518,15 +4722,15 @@ msgstr ""
 "expressão regular."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:570
+#: apt.conf.5.xml:618
 msgid "APT in DSelect"
 msgstr "APT em DSelect"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:572
+#: apt.conf.5.xml:620
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
-"control the default behaviour. These are in the <literal>DSelect</literal> "
+"control the default behavior. These are in the <literal>DSelect</literal> "
 "section."
 msgstr ""
 "Quando o APT é usado com um método &dselect;, várias directivas de "
@@ -4534,42 +4738,47 @@ msgstr ""
 "<literal>DSelect</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:577
-msgid ""
-"Cache Clean mode; this value may be one of always, prompt, auto, pre-auto "
-"and never.  always and prompt will remove all packages from the cache after "
-"upgrading, prompt (the default) does so conditionally.  auto removes only "
-"those packages which are no longer downloadable (replaced with a new version "
-"for instance).  pre-auto performs this action before downloading new "
-"packages."
-msgstr ""
-"Modo Cache Clean: este valor deve ser um de always, prompt, auto, pre-auto e "
-"never. always e prompt irão remover todos os pacotes da cache após a "
-"actualização, prompt (a predefinição) fá-lo condicionalmente. auto remove "
-"apenas aqueles pacotes que já não podem ser descarregados (por exemplo, "
-"substituídos por uma nova versão). pre-auto executa esta acção antes de "
-"descarregar novos pacotes."
+#: apt.conf.5.xml:625
+msgid ""
+"Cache Clean mode; this value may be one of <literal>always</literal>, "
+"<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
+"literal> and <literal>never</literal>.  <literal>always</literal> and "
+"<literal>prompt</literal> will remove all packages from the cache after "
+"upgrading, <literal>prompt</literal> (the default) does so conditionally.  "
+"<literal>auto</literal> removes only those packages which are no longer "
+"downloadable (replaced with a new version for instance).  <literal>pre-auto</"
+"literal> performs this action before downloading new packages."
+msgstr ""
+"Modo Cache Clean: este valor deve ser um de <literal>always</literal>, "
+"<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
+"literal> e <literal>never</literal>. <literal>always</literal> e "
+"<literal>prompt</literal> irão remover todos os pacotes da cache após a "
+"actualização, <literal>prompt</literal> (a predefinição) fá-lo "
+"condicionalmente. <literal>auto</literal> apenas aqueles pacotes que já não "
+"podem ser descarregados (por exemplo, substituídos por uma nova versão). "
+"<literal>pre-auto</literal> executa esta acção antes de descarregar novos "
+"pacotes."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:586
+#: apt.conf.5.xml:639
 msgid ""
-"The contents of this variable is passed to &apt-get; as command line options "
-"when it is run for the install phase."
+"The contents of this variable are passed to &apt-get; as command line "
+"options when it is run for the install phase."
 msgstr ""
 "O conteúdo desta variável é passado ao &apt-get; como opções de linha de "
 "comandos quando é corrido para a fase de instalação."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:591
+#: apt.conf.5.xml:644
 msgid ""
-"The contents of this variable is passed to &apt-get; as command line options "
-"when it is run for the update phase."
+"The contents of this variable are passed to &apt-get; as command line "
+"options when it is run for the update phase."
 msgstr ""
 "O conteúdo desta variável é passado ao &apt-get; como opções de linha de "
 "comandos quando é executado para a fase de actualização."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:596
+#: apt.conf.5.xml:649
 msgid ""
 "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
 "The default is to prompt only on error."
@@ -4578,12 +4787,12 @@ msgstr ""
 "continuar. A predefinição é avisar apenas em caso de erro."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:602
-msgid "How APT calls dpkg"
-msgstr "Como o APT chama o dpkg"
+#: apt.conf.5.xml:655
+msgid "How APT calls &dpkg;"
+msgstr "Como o APT chama o &dpkg;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:603
+#: apt.conf.5.xml:656
 msgid ""
 "Several configuration directives control how APT invokes &dpkg;. These are "
 "in the <literal>DPkg</literal> section."
@@ -4592,22 +4801,22 @@ msgstr ""
 "&dpkg;. Estas estão na secção <literal>DPkg</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:608
+#: apt.conf.5.xml:661
 msgid ""
-"This is a list of options to pass to dpkg. The options must be specified "
+"This is a list of options to pass to &dpkg;. The options must be specified "
 "using the list notation and each list item is passed as a single argument to "
 "&dpkg;."
 msgstr ""
-"Isto é uma lista de opções para passar ao dpkg. As opções têm de ser "
+"Isto é uma lista de opções para passar ao &dpkg;. As opções têm de ser "
 "especificadas usando a notação de lista e cada item da lista é passado como "
 "um argumento único ao &dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:614
+#: apt.conf.5.xml:667
 msgid ""
 "This is a list of shell commands to run before/after invoking &dpkg;.  Like "
 "<literal>options</literal> this must be specified in list notation. The "
-"commands are invoked in order using <filename>/bin/sh</filename>, should any "
+"commands are invoked in order using <filename>/bin/sh</filename>; should any "
 "fail APT will abort."
 msgstr ""
 "Isto é uma lista de comandos shell para executar antes/após invocar o "
@@ -4616,13 +4825,20 @@ msgstr ""
 "bin/sh</filename>, caso algum deles falhe, o APT irá abortar."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:621
+#: apt.conf.5.xml:674
+#, fuzzy
+#| msgid ""
+#| "This is a list of shell commands to run before invoking &dpkg;. Like "
+#| "<literal>options</literal> this must be specified in list notation. The "
+#| "commands are invoked in order using <filename>/bin/sh</filename>; should "
+#| "any fail APT will abort. APT will pass to the commands on standard input "
+#| "the filenames of all .deb files it is going to install, one per line."
 msgid ""
-"This is a list of shell commands to run before invoking dpkg. Like "
+"This is a list of shell commands to run before invoking &dpkg;. Like "
 "<literal>options</literal> this must be specified in list notation. The "
-"commands are invoked in order using <filename>/bin/sh</filename>, should any "
-"fail APT will abort. APT will pass to the commands on standard input the "
-"filenames of all .deb files it is going to install, one per line."
+"commands are invoked in order using <filename>/bin/sh</filename>; should any "
+"fail APT will abort. APT will pass the filenames of all .deb files it is "
+"going to install to the commands, one per line on standard input."
 msgstr ""
 "Isto é uma lista de comandos shell para executar antes de invocar o &dpkg;. "
 "Tal como as <literal>opções</literal> isto tem que ser especificado em "
@@ -4632,7 +4848,7 @@ msgstr ""
 "deb que vai instalar, um por cada linha."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:627
+#: apt.conf.5.xml:680
 msgid ""
 "Version 2 of this protocol dumps more information, including the protocol "
 "version, the APT configuration space and the packages, files and versions "
@@ -4647,61 +4863,61 @@ msgstr ""
 "dado ao <literal>Pre-Install-Pkgs</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:635
+#: apt.conf.5.xml:688
 msgid ""
-"APT chdirs to this directory before invoking dpkg, the default is <filename>/"
-"</filename>."
+"APT chdirs to this directory before invoking &dpkg;, the default is "
+"<filename>/</filename>."
 msgstr ""
-"O APT muda para este directório (chdir) antes de invocar o dpkg, a "
+"O APT muda para este directório (chdir) antes de invocar o &dpkg;, a "
 "predefinição é <filename>/</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:640
+#: apt.conf.5.xml:693
 msgid ""
-"These options are passed to &dpkg-buildpackage; when compiling packages, the "
+"These options are passed to &dpkg-buildpackage; when compiling packages; the "
 "default is to disable signing and produce all binaries."
 msgstr ""
 "Estas opções são passadas ao &dpkg-buildpackage; quando compila pacotes, a "
 "predefinição é desactivar a assinatura e produzir todos os binários."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:645
+#: apt.conf.5.xml:698
 msgid "dpkg trigger usage (and related options)"
 msgstr "Utilização trigger do dpkg (e opções relacionadas)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:646
+#: apt.conf.5.xml:699
 #, fuzzy
 #| msgid ""
-#| "APT can call dpkg in a way so it can make aggressive use of triggers over "
-#| "multiply calls of dpkg. Without further options dpkg will use triggers "
-#| "only in between his own run. Activating these options can therefore "
-#| "decrease the time needed to perform the install / upgrade. Note that it "
-#| "is intended to activate these options per default in the future, but as "
-#| "it changes the way APT calling dpkg drastically it needs a lot more "
-#| "testing.  <emphasis>These options are therefore currently experimental "
-#| "and should not be used in productive environments.</emphasis> Also it "
-#| "breaks the progress reporting so all frontends will currently stay around "
-#| "half (or more) of the time in the 100% state while it actually configures "
-#| "all packages."
-msgid ""
-"APT can call dpkg in a way so it can make aggressive use of triggers over "
-"multiple calls of dpkg. Without further options dpkg will use triggers only "
-"in between his own run. Activating these options can therefore decrease the "
-"time needed to perform the install / upgrade. Note that it is intended to "
-"activate these options per default in the future, but as it changes the way "
-"APT calling dpkg drastically it needs a lot more testing.  <emphasis>These "
-"options are therefore currently experimental and should not be used in "
-"productive environments.</emphasis> Also it breaks the progress reporting so "
-"all frontends will currently stay around half (or more) of the time in the "
-"100% state while it actually configures all packages."
-msgstr ""
-"APT pode chamar o dpkg num modo que faz uso agressivo dos triggers sobre "
-"múltiplas chamadas do dpkg. Sem mais opções o dpkg irá usar triggers apenas "
-"entre a sua própria execução. Activando estas opções pode portanto diminuir "
-"o tempo necessário para executar a instalação / actualização. Note que é "
-"intenção futura activar estas opções por predefinição, mas como muda "
-"drasticamente a maneira como o APT chama o dpkg, precisa de muitos mais "
+#| "APT can call &dpkg; in a way so it can make aggressive use of triggers "
+#| "over multiply calls of &dpkg;. Without further options &dpkg; will use "
+#| "triggers only in between his own run. Activating these options can "
+#| "therefore decrease the time needed to perform the install / upgrade. Note "
+#| "that it is intended to activate these options per default in the future, "
+#| "but as it changes the way APT calling &dpkg; drastically it needs a lot "
+#| "more testing.  <emphasis>These options are therefore currently "
+#| "experimental and should not be used in production environments.</"
+#| "emphasis> Also it breaks the progress reporting so all frontends will "
+#| "currently stay around half (or more) of the time in the 100% state while "
+#| "it actually configures all packages."
+msgid ""
+"APT can call &dpkg; in such a way as to let it make aggressive use of "
+"triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
+"use triggers once each time it runs.  Activating these options can therefore "
+"decrease the time needed to perform the install or upgrade. Note that it is "
+"intended to activate these options per default in the future, but as it "
+"drastically changes the way APT calls &dpkg; it needs a lot more testing.  "
+"<emphasis>These options are therefore currently experimental and should not "
+"be used in production environments.</emphasis> It also breaks progress "
+"reporting such that all front-ends will currently stay around half (or more) "
+"of the time in the 100% state while it actually configures all packages."
+msgstr ""
+"APT pode chamar o &dpkg; num modo que faz uso agressivo dos triggers sobre "
+"múltiplas chamadas do &dpkg;. Sem mais opções o &dpkg; irá usar triggers "
+"apenas entre a sua própria execução. Activando estas opções pode portanto "
+"diminuir o tempo necessário para executar a instalação / actualização. Note "
+"que é intenção futura activar estas opções por predefinição, mas como muda "
+"drasticamente a maneira como o APT chama o &dpkg;, precisa de muitos mais "
 "testes. <emphasis>Estas opções são portanto experimentais e não deve ser "
 "usadas em ambientes produtivos.</emphasis> Também interrompe o relatório de "
 "progresso, então todos os frontends irão permanecer a cerca de metade (ou "
@@ -4709,7 +4925,7 @@ msgstr ""
 "todos os pacotes."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:661
+#: apt.conf.5.xml:714
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
@@ -4723,15 +4939,15 @@ msgstr ""
 "DPkg::TriggersPending \"true\";"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:655
+#: apt.conf.5.xml:708
 msgid ""
 "Note that it is not guaranteed that APT will support these options or that "
 "these options will not cause (big) trouble in the future. If you have "
 "understand the current risks and problems with these options, but are brave "
-"enough to help testing them create a new configuration file and test a "
+"enough to help testing them, create a new configuration file and test a "
 "combination of options. Please report any bugs, problems and improvements "
 "you encounter and make sure to note which options you have used in your "
-"reports. Asking dpkg for help could also be useful for debugging proposes, "
+"reports. Asking &dpkg; for help could also be useful for debugging proposes, "
 "see e.g. <command>dpkg --audit</command>. A defensive option combination "
 "would be <placeholder type=\"literallayout\" id=\"0\"/>"
 msgstr ""
@@ -4741,115 +4957,120 @@ msgstr ""
 "ajudar a testá-la, crie um novo ficheiro de configuração e teste uma "
 "combinação de opções. Por favor reporte quaisquer bugs, problemas e "
 "melhoramentos que encontre e certifique-se de anotar nos seus relatórios "
-"quais as opções que usou. Pedir ajuda ao dpkg também pode ser útil para "
+"quais as opções que usou. Pedir ajuda ao &dpkg; também pode ser útil para "
 "propósitos de depuração, veja ex. <command>dpkg --audit</command>. Uma "
 "combinação de opções defensiva seria <placeholder type=\"literallayout\" id="
 "\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:668
+#: apt.conf.5.xml:721
 msgid ""
-"Add the no triggers flag to all dpkg calls (except the ConfigurePending "
+"Add the no triggers flag to all &dpkg; calls (except the ConfigurePending "
 "call).  See &dpkg; if you are interested in what this actually means. In "
-"short: dpkg will not run the triggers when this flag is present unless it is "
-"explicitly called to do so in an extra call.  Note that this option exists "
-"(undocumented) also in older apt versions with a slightly different meaning: "
-"Previously these option only append --no-triggers to the configure calls to "
-"dpkg - now apt will add these flag also to the unpack and remove calls."
-msgstr ""
-"Adiciona a bandeira 'no triggers' a todas as chamadas do dpkg (excepto a "
+"short: &dpkg; will not run the triggers when this flag is present unless it "
+"is explicitly called to do so in an extra call.  Note that this option "
+"exists (undocumented) also in older APT versions with a slightly different "
+"meaning: Previously these option only append --no-triggers to the configure "
+"calls to &dpkg; - now APT will also add this flag to the unpack and remove "
+"calls."
+msgstr ""
+"Adiciona a bandeira 'no triggers' a todas as chamadas do &dpkg; (excepto a "
 "chamada ConfigurePending). Veja &dpkg; se está interessado no que isto "
-"realmente representa. Em resumo: o  dpkg não irá correr os triggers quando "
+"realmente representa. Em resumo: o  &dpkg; não irá correr os triggers quando "
 "esta bandeira está presente a menos que seja explicitamente chamado a fazê-"
 "lo numa chamada extra. Note que esta opção existe (não documentada) também "
-"em versões mais antigas do apt com um significado ligeiramente diferente: "
+"em versões mais antigas do APT com um significado ligeiramente diferente: "
 "Anteriormente esta opção apenas acrescentava --no-triggers às chamadas "
-"configure para o dpkg - agora o apt irá adicionar esta bandeira também às "
+"configure para o &dpkg; - agora o APT irá adicionar esta bandeira também às "
 "chamadas unpack e remove."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:676
+#: apt.conf.5.xml:729
+#, fuzzy
+#| msgid ""
+#| "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
+#| "and \"<literal>no</literal>\".  \"<literal>all</literal>\" is the default "
+#| "value and causes APT to configure all packages explicit.  The "
+#| "\"<literal>smart</literal>\" way is it to configure only packages which "
+#| "need to be configured before another package can be unpacked (Pre-"
+#| "Depends) and let the rest configure by &dpkg; with a call generated by "
+#| "the next option. \"<literal>no</literal>\" on the other hand will not "
+#| "configure anything and totally rely on &dpkg; for configuration (which "
+#| "will at the moment fail if a Pre-Depends is encountered).  Setting this "
+#| "option to another than the all value will implicitly activate also the "
+#| "next option per default as otherwise the system could end in an "
+#| "unconfigured status which could be unbootable!"
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
-"and \"<literal>no</literal>\".  \"<literal>all</literal>\" is the default "
-"value and causes APT to configure all packages explicit.  The "
-"\"<literal>smart</literal>\" way is it to configure only packages which need "
-"to be configured before another package can be unpacked (Pre-Depends) and "
-"let the rest configure by dpkg with a call generated by the next option. "
-"\"<literal>no</literal>\" on the other hand will not configure anything and "
-"totally rely on dpkg for configuration (which will at the moment fail if a "
-"Pre-Depends is encountered).  Setting this option to another than the all "
-"value will implicitly activate also the next option per default as otherwise "
-"the system could end in an unconfigured status which could be unbootable!"
+"and \"<literal>no</literal>\".  The default value is \"<literal>all</literal>"
+"\", which causes APT to configure all packages. The \"<literal>smart</"
+"literal>\" way is to configure only packages which need to be configured "
+"before another package can be unpacked (Pre-Depends), and let the rest be "
+"configured by &dpkg; with a call generated by the ConfigurePending option "
+"(see below). On the other hand, \"<literal>no</literal>\" will not configure "
+"anything, and totally relies on &dpkg; for configuration (which at the "
+"moment will fail if a Pre-Depends is encountered). Setting this option to "
+"any value other than <literal>all</literal> will implicitly also activate "
+"the next option by default, as otherwise the system could end in an "
+"unconfigured and potentially unbootable state."
 msgstr ""
 "Valores válidos são \"<literal>all</literal>\", \"<literal>smart</literal>\" "
 "e \"<literal>no</literal>\".  \"<literal>all</literal>\" é o valor "
 "predefinido e faz com que o APT configure todos os pacotes explícitos. O "
 "modo \"<literal>smart</literal>\" serve para configurar apenas pacotes que "
 "precisam de ser configurados antes que outro pacote possa ser desempacotado "
-"(pré-dependências) e o resto configurado pelo dpkg com uma chamada gerada "
+"(pré-dependências) e o resto configurado pelo &dpkg; com uma chamada gerada "
 "pela próxima opção. \"<literal>no</literal>\" por outro lado não irá "
-"configurar nada e confiar no dpkg para configurações (o qual irá falhar se "
+"configurar nada e confiar no &dpkg; para configurações (o qual irá falhar se "
 "encontrar uma pré-dependência). Definir esta opção para outra que não seja o "
 "valor all irá implicitamente activar também a próxima opção predefinida, "
 "caso contrário o sistema poderia acabar num estado não configurado o qual "
 "poderia não arrancar!"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:687
-msgid ""
-"If this option is set apt will call <command>dpkg --configure --pending</"
-"command> to let dpkg handle all required configurations and triggers. This "
-"option is activated automatic per default if the previous option is not set "
-"to <literal>all</literal>, but deactivating could be useful if you want to "
-"run APT multiple times in a row - e.g. in an installer. In these sceneries "
-"you could deactivate this option in all but the last run."
-msgstr ""
-"Se esta opção for definida, o apt irá chamar <command>dpkg --configure --"
-"pending</command> para permitir ao dpkg lidar como todas as configurações e "
-"triggers requisitados. Esta opção é activada automaticamente por "
+#: apt.conf.5.xml:744
+#, fuzzy
+#| msgid ""
+#| "If this option is set, APT will call <command>dpkg --configure --pending</"
+#| "command> to let &dpkg; handle all required configurations and triggers. "
+#| "This option is activated automatically per default if the previous option "
+#| "is not set to <literal>all</literal>, but deactivating it could be useful "
+#| "if you want to run APT multiple times in a row - e.g. in an installer. In "
+#| "these sceneries you could deactivate this option in all but the last run."
+msgid ""
+"If this option is set APT will call <command>dpkg --configure --pending</"
+"command> to let &dpkg; handle all required configurations and triggers. This "
+"option is activated automatically per default if the previous option is not "
+"set to <literal>all</literal>, but deactivating it could be useful if you "
+"want to run APT multiple times in a row - e.g. in an installer. In these "
+"sceneries you could deactivate this option in all but the last run."
+msgstr ""
+"Se esta opção for definida, o APT irá chamar <command>dpkg --configure --"
+"pending</command> para permitir ao &dpkg; lidar como todas as configurações "
+"e triggers requisitados. Esta opção é activada automaticamente por "
 "predefinição se a opção anterior não for definida para  <literal>all</"
 "literal>, mas desactivá-la pode ser útil se deseja correr o APT múltiplas "
 "vezes numa fila - ex. numa instalação. Nestes cenários você pode desactivar "
 "esta opção em todas excepto na última execução."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:694
+#: apt.conf.5.xml:751
 msgid ""
-"Useful for <literal>smart</literal> configuration as a package which has "
-"pending triggers is not considered as <literal>installed</literal> and dpkg "
-"treats them as <literal>unpacked</literal> currently which is a dealbreaker "
-"for Pre-Dependencies (see debbugs #526774). Note that this will process all "
-"triggers, not only the triggers needed to configure this package."
+"Useful for the <literal>smart</literal> configuration as a package which has "
+"pending triggers is not considered as <literal>installed</literal>, and "
+"&dpkg; treats them as <literal>unpacked</literal> currently which is a "
+"showstopper for Pre-Dependencies (see debbugs #526774). Note that this will "
+"process all triggers, not only the triggers needed to configure this package."
 msgstr ""
 "Útil para configuração <literal>smart</literal>, pois um pacote que tenha "
 "triggers pendentes não é considerado como <literal>installed</literal> e o "
-"dpkg trata-o como actualmente <literal>unpacked</literal> o que é um modo de "
-"lidar com pré-dependências (veja debbugs #526774). Note que isto irá "
+"&dpkg; trata-o como actualmente <literal>unpacked</literal> o que é um modo "
+"de lidar com pré-dependências (veja debbugs #526774). Note que isto irá "
 "processar todos os triggers, e não apenas os triggers necessários para "
 "configurar este pacote."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:700
-msgid ""
-"As the configuration can be deferred to be done at the end by dpkg it can be "
-"tried to order the unpack series only by critical needs, e.g. by Pre-"
-"Depends. Default is true and therefore the \"old\" method of ordering in "
-"various steps by everything. While both method were present in earlier APT "
-"versions the <literal>OrderCritical</literal> method was unused, so this "
-"method is very experimental and needs further improvements before becoming "
-"really useful."
-msgstr ""
-"Como a configuração pode ser diferida a ser feita no final pelo dpkg, pode "
-"ser tentada a ordenar a série de desempacotamento apenas por necessidades "
-"críticas, ex. por pré-dependências. A predefinição é verdadeiro e então o "
-"método \"antigo\" de ordenar em vários passos por tudo. Enquanto ambos os "
-"métodos estão presentes em versões jovens do APT, o método "
-"<literal>OrderCritical</literal> não foi usado, portanto este método é muito "
-"experimental e necessita de mais melhorias antes de se tornar realmente útil."
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:715
+#: apt.conf.5.xml:764
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
@@ -4867,17 +5088,17 @@ msgstr ""
 "};"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:708
-msgid ""
-"Essential packages (and there dependencies) should be configured immediately "
-"after unpacking. It will be a good idea to do this quite early in the "
-"upgrade process as these these configure calls require currently also "
-"<literal>DPkg::TriggersPending</literal> which will run quite a few triggers "
-"(which maybe not needed). Essentials get per default a high score but the "
-"immediate flag is relatively low (a package which has a Pre-Depends is "
-"higher rated).  These option and the others in the same group can be used to "
-"change the scoring. The following example shows the settings with there "
-"default values.  <placeholder type=\"literallayout\" id=\"0\"/>"
+#: apt.conf.5.xml:757
+msgid ""
+"Essential packages (and their dependencies) should be configured immediately "
+"after unpacking. It is a good idea to do this quite early in the upgrade "
+"process as these configure calls also currently require <literal>DPkg::"
+"TriggersPending</literal> which will run quite a few triggers (which may not "
+"be needed). Essentials get per default a high score but the immediate flag "
+"is relatively low (a package which has a Pre-Depends is rated higher).  "
+"These option and the others in the same group can be used to change the "
+"scoring. The following example shows the settings with their default "
+"values.  <placeholder type=\"literallayout\" id=\"0\"/>"
 msgstr ""
 "Os pacotes essenciais ( e as suas dependências) deve ser configurados "
 "imediatamente após a descompactação. Será uma boa ideia fazer isto bem cedo "
@@ -4891,17 +5112,17 @@ msgstr ""
 "predefinidos. <placeholder type=\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:728
+#: apt.conf.5.xml:777
 msgid "Periodic and Archives options"
 msgstr "Opções Periodic e Archives"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:729
+#: apt.conf.5.xml:778
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
-"of options configure behavior of apt periodic updates, which is done by "
-"<literal>/etc/cron.daily/apt</literal> script. See header of this script for "
-"the brief documentation of these options."
+"of options configure behavior of apt periodic updates, which is done by the "
+"<literal>/etc/cron.daily/apt</literal> script. See the top of this script "
+"for the brief documentation of these options."
 msgstr ""
 "Os grupos de opções <literal>APT::Periodic</literal> e <literal>APT::"
 "Archives</literal> configuram o comportamento das actualizações periódicas "
@@ -4909,12 +5130,12 @@ msgstr ""
 "Veja o cabeçalho deste script para uma breve documentação das suas opções."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:737
+#: apt.conf.5.xml:786
 msgid "Debug options"
 msgstr "Opções de depuração"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:739
+#: apt.conf.5.xml:788
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -4931,7 +5152,7 @@ msgstr ""
 "interesse para o utilizador normal, mas algumas podem ter:"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:750
+#: apt.conf.5.xml:799
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -4942,7 +5163,7 @@ msgstr ""
 "remove, purge</literal>."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:758
+#: apt.conf.5.xml:807
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s install</"
@@ -4953,7 +5174,7 @@ msgstr ""
 "<literal>apt-get -s install</literal>) como um utilizador não root."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:767
+#: apt.conf.5.xml:816
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
@@ -4965,7 +5186,7 @@ msgstr ""
 #. 	   motivating example, except I haven't a clue why you'd want
 #. 	   to do this. 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:775
+#: apt.conf.5.xml:824
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
 "in CD-ROM IDs."
@@ -4974,12 +5195,12 @@ msgstr ""
 "IDs de CD-ROM."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:785
+#: apt.conf.5.xml:834
 msgid "A full list of debugging options to apt follows."
 msgstr "Segue-se uma lista completa de opções de depuração para o apt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:794
+#: apt.conf.5.xml:843
 msgid ""
 "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
@@ -4987,25 +5208,25 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:805
+#: apt.conf.5.xml:854
 msgid "Print information related to downloading packages using FTP."
 msgstr ""
 "Escreve informação relacionada com o descarregamento de pacotes usando FTP."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:816
+#: apt.conf.5.xml:865
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 "Escreve informação relacionada com o descarregamento de pacotes usando HTTP."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:827
+#: apt.conf.5.xml:876
 msgid "Print information related to downloading packages using HTTPS."
 msgstr ""
 "Escreve informação relacionada com o descarregamento de pacotes usando HTTPS."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:838
+#: apt.conf.5.xml:887
 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
@@ -5014,7 +5235,7 @@ msgstr ""
 "criptográficas usando <literal>gpg</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:849
+#: apt.conf.5.xml:898
 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
@@ -5023,13 +5244,13 @@ msgstr ""
 "armazenados em CD-ROMs."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:859
+#: apt.conf.5.xml:908
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr ""
 "Descreve os processos de resolver dependências de compilação no &apt-get;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:869
+#: apt.conf.5.xml:918
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
@@ -5038,7 +5259,7 @@ msgstr ""
 "<literal>apt</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:879
+#: apt.conf.5.xml:928
 msgid ""
 "Do not include information from <literal>statfs</literal>, namely the number "
 "of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@ -5049,7 +5270,7 @@ msgstr ""
 "para um CD-ROM."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:890
+#: apt.conf.5.xml:939
 msgid ""
 "Disable all file locking.  For instance, this will allow two instances of "
 "<quote><literal>apt-get update</literal></quote> to run at the same time."
@@ -5059,14 +5280,14 @@ msgstr ""
 "literal></quote> ao mesmo tempo."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:902
+#: apt.conf.5.xml:951
 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
 "Regista no log quando os items são adicionados ou removidos da fila de "
 "download global."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:912
+#: apt.conf.5.xml:961
 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
@@ -5075,7 +5296,7 @@ msgstr ""
 "checksums e assinaturas criptográficas dos ficheiros descarregados."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:922
+#: apt.conf.5.xml:971
 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."
@@ -5085,7 +5306,7 @@ msgstr ""
 "pacote."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:934
+#: apt.conf.5.xml:983
 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."
@@ -5094,7 +5315,7 @@ msgstr ""
 "do apt quando se descarrega diffs de índice em vez de índices completos."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:945
+#: apt.conf.5.xml:994
 msgid ""
 "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
@@ -5102,7 +5323,7 @@ msgstr ""
 "downloads."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:956
+#: apt.conf.5.xml:1005
 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."
@@ -5111,7 +5332,7 @@ msgstr ""
 "de pacotes e com a remoção de pacotes não utilizados."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:966
+#: apt.conf.5.xml:1015
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
@@ -5126,20 +5347,21 @@ msgstr ""
 "literal>; veja <literal>Debug::pkgProblemResolver</literal> para isso."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:980
+#: apt.conf.5.xml:1029
 msgid ""
-"Generate debug messages describing which package is marked as keep/install/"
+"Generate debug messages describing which packages are marked as keep/install/"
 "remove while the ProblemResolver does his work.  Each addition or deletion "
-"may trigger additional actions; they are shown indented two additional space "
-"under the original entry.  The format for each line is <literal>MarkKeep</"
-"literal>, <literal>MarkDelete</literal> or <literal>MarkInstall</literal> "
-"followed by <literal>package-name &lt;a.b.c -&gt; d.e.f | x.y.z&gt; (section)"
-"</literal> where <literal>a.b.c</literal> is the current version of the "
-"package, <literal>d.e.f</literal> is the version considered for installation "
-"and <literal>x.y.z</literal> is a newer version, but not considered for "
-"installation (because of a low pin score). The later two can be omitted if "
-"there is none or if it is the same version as the installed.  "
-"<literal>section</literal> is the name of the section the package appears in."
+"may trigger additional actions; they are shown indented two additional "
+"spaces under the original entry.  The format for each line is "
+"<literal>MarkKeep</literal>, <literal>MarkDelete</literal> or "
+"<literal>MarkInstall</literal> followed by <literal>package-name &lt;a.b.c -"
+"&gt; d.e.f | x.y.z&gt; (section)</literal> where <literal>a.b.c</literal> is "
+"the current version of the package, <literal>d.e.f</literal> is the version "
+"considered for installation and <literal>x.y.z</literal> is a newer version, "
+"but not considered for installation (because of a low pin score). The later "
+"two can be omitted if there is none or if it is the same as the installed "
+"version.  <literal>section</literal> is the name of the section the package "
+"appears in."
 msgstr ""
 "Gera mensagens de depuração descrevendo qual pacote está marcado como manter/"
 "instalar/remover enquanto o \"solucionador-de-problemas\" faz o seu "
@@ -5156,12 +5378,7 @@ msgstr ""
 "pacote aparece."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1002
-msgid "Dump the default configuration to standard error on startup."
-msgstr "Despeja a configuração predefinida para o erro standard no arranque."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1012
+#: apt.conf.5.xml:1050
 msgid ""
 "When invoking &dpkg;, output the precise command line with which it is being "
 "invoked, with arguments separated by a single space character."
@@ -5171,7 +5388,7 @@ msgstr ""
 "único."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1023
+#: apt.conf.5.xml:1061
 msgid ""
 "Output all the data received from &dpkg; on the status file descriptor and "
 "any errors encountered while parsing it."
@@ -5180,7 +5397,7 @@ msgstr ""
 "estado e quaisquer erros encontrados enquanto os analisa."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1034
+#: apt.conf.5.xml:1072
 msgid ""
 "Generate a trace of the algorithm that decides the order in which "
 "<literal>apt</literal> should pass packages to &dpkg;."
@@ -5189,7 +5406,7 @@ msgstr ""
 "literal> deve passar os pacotes ao &dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1046
+#: apt.conf.5.xml:1084
 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr ""
@@ -5197,12 +5414,12 @@ msgstr ""
 "&dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1057
+#: apt.conf.5.xml:1095
 msgid "Output the priority of each package list on startup."
 msgstr "Escreve a prioridade da cada lista de pacote no arranque."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1067
+#: apt.conf.5.xml:1105
 msgid ""
 "Trace the execution of the dependency resolver (this applies only to what "
 "happens when a complex dependency problem is encountered)."
@@ -5211,7 +5428,7 @@ msgstr ""
 "acontece quando é encontrado um problema de dependências complexo)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1078
+#: apt.conf.5.xml:1116
 msgid ""
 "Display a list of all installed packages with their calculated score used by "
 "the pkgProblemResolver. The description of the package is the same as "
@@ -5222,7 +5439,7 @@ msgstr ""
 "mesma que é descrita em <literal>Debug::pkgDepCache::Marker</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1090
+#: apt.conf.5.xml:1128
 msgid ""
 "Print information about the vendors read from <filename>/etc/apt/vendors."
 "list</filename>."
@@ -5231,13 +5448,13 @@ msgstr ""
 "vendors.list</filename>."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1112 apt_preferences.5.xml:545 sources.list.5.xml:211
+#: apt.conf.5.xml:1150 apt_preferences.5.xml:545 sources.list.5.xml:211
 #: apt-ftparchive.1.xml:596
 msgid "Examples"
 msgstr "Examples"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1113
+#: apt.conf.5.xml:1151
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
@@ -5247,7 +5464,7 @@ msgstr ""
 
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1125
+#: apt.conf.5.xml:1163
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
 
@@ -5364,7 +5581,7 @@ msgid ""
 "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, unless that file matches a pattern in the "
-"<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this "
+"<literal>Dir::Ignore-Files-Silently</literal> configuration list - in which "
 "case it will be silently ignored."
 msgstr ""
 "Note que os ficheiros no directório <filename>/etc/apt/preferences.d</"
@@ -6670,39 +6887,25 @@ msgid "Package resource list for APT"
 msgstr "Lista de recursos de pacote para APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:37
+#: sources.list.5.xml:38
 msgid ""
-"The package resource list is used to locate archives of the package "
-"distribution system in use on the system. At this time, this manual page "
-"documents only the packaging system used by the Debian system.  This control "
-"file is <filename>/etc/apt/sources.list</filename>."
+"The source list <filename>/etc/apt/sources.list</filename> is designed to "
+"support any number of active sources and a variety of source media. The file "
+"lists one source per line, with the most preferred source listed first. The "
+"information available from the configured sources is acquired by "
+"<command>apt-get update</command> (or by an equivalent command from another "
+"APT front-end)."
 msgstr ""
-"A lista de recursos de pacote é usada para localizar arquivos do sistema de "
-"distribuição de pacotes usado no sistema. Neste momento, este manual "
-"documenta apenas o sistema de pacotes usado pelo sistema Debian. Este "
-"ficheiro de controle é <filename>/etc/apt/sources.list</filename>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:42
-msgid ""
-"The source list is designed to support any number of active sources and a "
-"variety of source media. The file lists one source per line, with the most "
-"preferred source listed first. The format of each line is: <literal>type uri "
-"args</literal> The first item, <literal>type</literal> determines the format "
-"for <literal>args</literal>. <literal>uri</literal> is a Universal Resource "
-"Identifier (URI), which is a superset of the more specific and well-known "
-"Universal Resource Locator, or URL. The rest of the line can be marked as a "
-"comment by using a #."
-msgstr ""
-"A lista de fontes é desenhada para suportar qualquer número de fontes "
-"activas e uma variedade de médias fonte. O ficheiro lista uma fonte por "
-"linha, com a fonte mais preferida listada em primeiro lugar. O formato para "
-"cada linha é: <literal>tipo uri argumentos</literal>. O primeiro item, "
-"<literal>tipo</literal> determina o formato para <literal>argumentos</"
-"literal>. <literal>uri</literal> é um Universal Resource Identifier (URI), o "
-"que é um super-conjunto para o mais específico e conhecido Universal "
-"Resource Locator, ou URL. O resto da linha pode ser marcado como um "
-"comentário usando um #."
+#: sources.list.5.xml:45
+msgid ""
+"Each line specifying a source starts with type (e.g. <literal>deb-src</"
+"literal>)  followed by options and arguments for this type.  Individual "
+"entries cannot be continued onto a following line. Empty lines are ignored, "
+"and a <literal>#</literal> character anywhere on a line marks the remainder "
+"of that line as a comment."
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: sources.list.5.xml:53
@@ -6727,7 +6930,7 @@ msgid ""
 "digits (0-9), underscore (_), hyphen (-) and period (.) characters.  "
 "Otherwise APT will print a notice that it has ignored a file, unless that "
 "file matches a pattern in the <literal>Dir::Ignore-Files-Silently</literal> "
-"configuration list - in this case it will be silently ignored."
+"configuration list - in which case it will be silently ignored."
 msgstr ""
 "O directório <filename>/etc/apt/sources.list.d</filename> disponibiliza um "
 "modo de adicionar entradas na sources.list em ficheiros separados. O formato "
@@ -6745,7 +6948,7 @@ msgstr "Os tipos deb e deb-src"
 #: sources.list.5.xml:66
 #, fuzzy
 #| msgid ""
-#| "The <literal>deb</literal> type describes a typical two-level Debian "
+#| "The <literal>deb</literal> type references a typical two-level Debian "
 #| "archive, <filename>distribution/component</filename>. Typically, "
 #| "<literal>distribution</literal> is generally one of <literal>stable</"
 #| "literal> <literal>unstable</literal> or <literal>testing</literal> while "
@@ -6755,16 +6958,16 @@ msgstr "Os tipos deb e deb-src"
 #| "code in the same form as the <literal>deb</literal> type.  A <literal>deb-"
 #| "src</literal> line is required to fetch source indexes."
 msgid ""
-"The <literal>deb</literal> type describes a typical two-level Debian "
-"archive, <filename>distribution/component</filename>. Typically, "
-"<literal>distribution</literal> is generally an archivename like "
+"The <literal>deb</literal> type references a typical two-level Debian "
+"archive, <filename>distribution/component</filename>. The "
+"<literal>distribution</literal> is generally an archive name like "
 "<literal>stable</literal> or <literal>testing</literal> or a codename like "
 "<literal>&stable-codename;</literal> or <literal>&testing-codename;</"
-"literal> while component is one of <literal>main</literal> <literal>contrib</"
-"literal> or <literal>non-free</literal>. The <literal>deb-src</literal> type "
-"describes a debian distribution's source code in the same form as the "
-"<literal>deb</literal> type.  A <literal>deb-src</literal> line is required "
-"to fetch source indexes."
+"literal> while component is one of <literal>main</literal>, "
+"<literal>contrib</literal> or <literal>non-free</literal>. The <literal>deb-"
+"src</literal> type references a Debian distribution's source code in the "
+"same form as the <literal>deb</literal> type.  A <literal>deb-src</literal> "
+"line is required to fetch source indexes."
 msgstr ""
 "O tipo <literal>deb</literal> descreve um arquivo Debian típico de dois "
 "níveis, <filename>distribution/component</filename>. Tipicamente "
@@ -6794,37 +6997,57 @@ msgstr "deb uri distribuição [componente1] [componente2] [...]"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:83
+#, fuzzy
+#| msgid ""
+#| "The URI for the <literal>deb</literal> type must specify the base of the "
+#| "Debian distribution, from which APT will find the information it needs.  "
+#| "<literal>distribution</literal> can specify an exact path, in which case "
+#| "the components must be omitted and <literal>distribution</literal> must "
+#| "end with a slash (<literal>/</literal>). This is useful for the case when "
+#| "only a particular sub-section of the archive denoted by the URI is of "
+#| "interest. If <literal>distribution</literal> does not specify an exact "
+#| "path, at least one <literal>component</literal> must be present."
 msgid ""
 "The URI for the <literal>deb</literal> type must specify the base of the "
 "Debian distribution, from which APT will find the information it needs.  "
 "<literal>distribution</literal> can specify an exact path, in which case the "
 "components must be omitted and <literal>distribution</literal> must end with "
-"a slash (/). This is useful for when the case only a particular sub-section "
-"of the archive denoted by the URI is of interest.  If <literal>distribution</"
-"literal> does not specify an exact path, at least one <literal>component</"
-"literal> must be present."
+"a slash (<literal>/</literal>). This is useful for the case when only a "
+"particular sub-section of the archive denoted by the URI is of interest.  If "
+"<literal>distribution</literal> does not specify an exact path, at least one "
+"<literal>component</literal> must be present."
 msgstr ""
 "O URI para o tipo <literal>deb</literal> tem de especificar a base da "
 "distribuição Debian, a partir do qual o APT irá encontrar a informação que "
 "precisa. <literal>distribution</literal> pode especificar um caminho exacto, "
 "que no caso os componente têm de ser omitidos e <literal>distribution</"
-"literal> deve terminar com uma barra (/). Isto é útil para o caso de apenas "
-"ser de interesse uma sub-secção particular do arquivo denotado pelo URI. Se "
-"<literal>distribution</literal> não especificar um caminho exacto, pelo "
-"menos um <literal>component</literal> tem de estar presente."
+"literal> deve terminar com uma barra (<literal>/</literal>). Isto é útil "
+"para o caso de apenas ser de interesse uma sub-secção particular do arquivo "
+"denotado pelo URI. Se <literal>distribution</literal> não especificar um "
+"caminho exacto, pelo menos um <literal>component</literal> tem de estar "
+"presente."
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:92
+#, fuzzy
+#| msgid ""
+#| "<literal>distribution</literal> may also contain a variable, <literal>"
+#| "$(ARCH)</literal> which expands to the Debian architecture (i386, amd64, "
+#| "powerpc, ...)  used on the system. This permits architecture-independent "
+#| "<filename>sources.list</filename> files to be used. In general this is "
+#| "only of interest when specifying an exact path, <literal>APT</literal> "
+#| "will automatically generate a URI with the current architecture otherwise."
 msgid ""
 "<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)"
-"</literal> which expands to the Debian architecture (i386, m68k, "
-"powerpc, ...)  used on the system. This permits architecture-independent "
-"<filename>sources.list</filename> files to be used. In general this is only "
-"of interest when specifying an exact path, <literal>APT</literal> will "
-"automatically generate a URI with the current architecture otherwise."
+"</literal> which expands to the Debian architecture (such as <literal>amd64</"
+"literal> or <literal>armel</literal>) used on the system. This permits "
+"architecture-independent <filename>sources.list</filename> files to be used. "
+"In general this is only of interest when specifying an exact path, "
+"<literal>APT</literal> will automatically generate a URI with the current "
+"architecture otherwise."
 msgstr ""
 "<literal>distribution</literal> também pode conter uma variável. <literal>"
-"$(ARCH)</literal> a qual se expande à arquitectura Debian (i386, m68k, "
+"$(ARCH)</literal> a qual se expande à arquitectura Debian (i386, amd64, "
 "powerpc, ...) usada no sistema. Isto permite que seja usados ficheiros "
 "<filename>sources.list</filename> independentes da arquitectura. Em geral, "
 "isto é apenas de interesse quando se especifica um caminho exacto. De outro "
@@ -6860,12 +7083,12 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:112
 msgid ""
-"<literal>options</literal> is always optional and needs to be surounded by "
+"<literal>options</literal> is always optional and needs to be surrounded 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:"
+"following settings are supported by APT (note however that unsupported "
+"settings will be ignored silently):"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
@@ -6873,7 +7096,7 @@ msgstr ""
 msgid ""
 "<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 "
+"information should be downloaded. If this option is not set all "
 "architectures defined by the <literal>APT::Architectures</literal> option "
 "will be downloaded."
 msgstr ""
@@ -6972,13 +7195,23 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml:172
+#, fuzzy
+#| msgid ""
+#| "The ftp scheme specifies an FTP server for the archive. APT's FTP "
+#| "behavior is highly configurable; for more information see the &apt-conf; "
+#| "manual page. Please note that a ftp proxy can be specified by using the "
+#| "<envar>ftp_proxy</envar> environment variable. It is possible to specify "
+#| "a http proxy (http proxy servers often understand ftp urls)  using this "
+#| "method and ONLY this method. ftp proxies using http specified in the "
+#| "configuration file will be ignored."
 msgid ""
 "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
 "is highly configurable; for more information see the &apt-conf; manual page. "
-"Please note that a ftp proxy can be specified by using the <envar>ftp_proxy</"
-"envar> environment variable. It is possible to specify a http proxy (http "
-"proxy servers often understand ftp urls)  using this method and ONLY this "
-"method. ftp proxies using http specified in the configuration file will be "
+"Please note that an FTP proxy can be specified by using the "
+"<envar>ftp_proxy</envar> environment variable. It is possible to specify an "
+"HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
+"environment variable and <emphasis>ONLY</emphasis> this environment "
+"variable. Proxies using HTTP specified in the configuration file will be "
 "ignored."
 msgstr ""
 "O esquema ftp especifica um servidor FTP para o arquivo. o comportamento FTP "
@@ -6990,11 +7223,18 @@ msgstr ""
 "especificados no ficheiro de configuração serão ignorados."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:183
+#: sources.list.5.xml:184
+#, fuzzy
+#| msgid ""
+#| "The copy scheme is identical to the file scheme except that packages are "
+#| "copied into the cache directory instead of used directly at their "
+#| "location.  This is useful for people using a zip disk to copy files "
+#| "around with APT."
 msgid ""
 "The copy scheme is identical to the file scheme except that packages are "
 "copied into the cache directory instead of used directly at their location.  "
-"This is useful for people using a zip disk to copy files around with APT."
+"This is useful for people using removable media to copy files around with "
+"APT."
 msgstr ""
 "O esquema copy é idêntico ao esquema file com a excepção que os pacotes são "
 "copiados para o directório cache em vez serem usados directamente da sua "
@@ -7002,13 +7242,19 @@ msgstr ""
 "com o APT."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:190
+#: sources.list.5.xml:191
+#, fuzzy
+#| msgid ""
+#| "The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given "
+#| "user and access the files. It is a good idea to do prior arrangements "
+#| "with RSA keys or rhosts.  Access to files on the remote uses standard "
+#| "<command>find</command> and <command>dd</command> commands to perform the "
+#| "file transfers from the remote."
 msgid ""
-"The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given "
-"user and access the files. It is a good idea to do prior arrangements with "
-"RSA keys or rhosts.  Access to files on the remote uses standard "
-"<command>find</command> and <command>dd</command> commands to perform the "
-"file transfers from the remote."
+"The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
+"the files as a given user. Prior configuration of rhosts or RSA keys is "
+"recommended. The standard <command>find</command> and <command>dd</command> "
+"commands are used to perform the file transfers from the remote host."
 msgstr ""
 "O método rsh/ssh invoca rsh/ssh a ligar a uma máquina remota como um "
 "utilizador fornecido e acede aos ficheiros. É uma boa ideia fazer "
@@ -7036,12 +7282,12 @@ msgstr "tipos de URI mais reconhecíveis"
 #| "<citerefentry> <refentrytitle><filename>apt-transport-debtorrent</"
 #| "filename></refentrytitle> <manvolnum>1</manvolnum></citerefentry>."
 msgid ""
-"APT can be extended with more methods shipped in other optional packages "
-"which should follow the nameing scheme <package>apt-transport-"
-"<replaceable>method</replaceable></package>.  The APT team e.g. maintains "
-"also the <package>apt-transport-https</package> package which provides "
-"access methods for https-URIs with features similar to the http method, but "
-"other methods for using e.g. debtorrent are also available, see &apt-"
+"APT can be extended with more methods shipped in other optional packages, "
+"which should follow the naming scheme <package>apt-transport-"
+"<replaceable>method</replaceable></package>.  For instance, the APT team "
+"also maintains the package <package>apt-transport-https</package>, which "
+"provides access methods for HTTPS URIs with features similar to the http "
+"method.  Methods for using e.g. debtorrent are also available - see &apt-"
 "transport-debtorrent;."
 msgstr ""
 "O APT pode ser estendido com mais métodos lançados em outros pacotes "
@@ -7285,7 +7531,10 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-sortpkgs.1.xml:45
-msgid "All output is sent to stdout, the input must be a seekable file."
+#, fuzzy
+#| msgid "All output is sent to stdout, the input must be a seekable file."
+msgid ""
+"All output is sent to standard output; the input must be a seekable file."
 msgstr ""
 "Todas as saídas são enviadas para o stdout, a entrada tem de ser um ficheiro "
 "pesquisável."
@@ -9929,6 +10178,123 @@ msgid "Which will use the already fetched archives on the disc."
 msgstr "O qual irá usar os arquivos já obtidos e que estão no disco."
 
 #~ msgid ""
+#~ "As the configuration can be deferred to be done at the end by &dpkg; it "
+#~ "can be tried to order the unpack series only by critical needs, e.g. by "
+#~ "Pre-Depends. Default is true and therefore the \"old\" method of ordering "
+#~ "in various steps by everything. While both method were present in earlier "
+#~ "APT versions the <literal>OrderCritical</literal> method was unused, so "
+#~ "this method is very experimental and needs further improvements before "
+#~ "becoming really useful."
+#~ msgstr ""
+#~ "Como a configuração pode ser diferida a ser feita no final pelo &dpkg;, "
+#~ "pode ser tentada a ordenar a série de desempacotamento apenas por "
+#~ "necessidades críticas, ex. por pré-dependências. A predefinição é "
+#~ "verdadeiro e então o método \"antigo\" de ordenar em vários passos por "
+#~ "tudo. Enquanto ambos os métodos estão presentes em versões jovens do APT, "
+#~ "o método <literal>OrderCritical</literal> não foi usado, portanto este "
+#~ "método é muito experimental e necessita de mais melhorias antes de se "
+#~ "tornar realmente útil."
+
+#~ msgid "Dump the default configuration to standard error on startup."
+#~ msgstr ""
+#~ "Despeja a configuração predefinida para o erro standard no arranque."
+
+#~ msgid ""
+#~ "Defaults to on which will cause APT to install essential and important "
+#~ "packages as fast as possible in the install/upgrade operation. This is "
+#~ "done to limit the effect of a failing &dpkg; call: If this option is "
+#~ "disabled APT does treat an important package in the same way as an extra "
+#~ "package: Between the unpacking of the important package A and his "
+#~ "configuration can then be many other unpack or configuration calls, e.g. "
+#~ "for package B which has no relation to A, but causes the dpkg call to "
+#~ "fail (e.g. because maintainer script of package B generates an error) "
+#~ "which results in a system state in which package A is unpacked but "
+#~ "unconfigured - each package depending on A is now no longer guaranteed to "
+#~ "work as their dependency on A is not longer satisfied. The immediate "
+#~ "configuration marker is also applied to all dependencies which can "
+#~ "generate a problem if the dependencies e.g. form a circle as a dependency "
+#~ "with the immediate flag is comparable with a Pre-Dependency. So in theory "
+#~ "it is possible that APT encounters a situation in which it is unable to "
+#~ "perform immediate configuration, errors out and refers to this option so "
+#~ "the user can deactivate the immediate configuration temporarily to be "
+#~ "able to perform an install/upgrade again. Note the use of the word "
+#~ "\"theory\" here as this problem was only encountered by now in real world "
+#~ "a few times in non-stable distribution versions and was caused by wrong "
+#~ "dependencies of the package in question or by a system in an already "
+#~ "broken state, so you should not blindly disable this option as the "
+#~ "mentioned scenario above is not the only problem immediate configuration "
+#~ "can help to prevent in the first place.  Before a big operation like "
+#~ "<literal>dist-upgrade</literal> is run with this option disabled it "
+#~ "should be tried to explicitly <literal>install</literal> the package APT "
+#~ "is unable to configure immediately, but please make sure to report your "
+#~ "problem also to your distribution and to the APT team with the buglink "
+#~ "below so they can work on improving or correcting the upgrade process."
+#~ msgstr ""
+#~ "A predefinição é ligado o que irá fazer com que o APT instale pacotes "
+#~ "essenciais e importantes o mais rápido possível na operação de instalar/"
+#~ "actualizar. Isto é feito para limitar o efeito de uma chamada falhada do "
+#~ "&dpkg;. Se esta opção for desactivada, o APT trata um pacote importante "
+#~ "do mesmo modo que um pacote extra: Entre o desempacotamento do pacote "
+#~ "importante A e a sua configuração podem acontecer muitas outras chamadas "
+#~ "de desempacotamento e configuração, exemplo, para o pacote B que não tem "
+#~ "nenhuma relação com A, mas causa uma falha na chamada ao dpkg (ex, porque "
+#~ "o script do responsável do pacote B gera um erro) o qual resulta num "
+#~ "estado do sistema em que o pacote A está desempacotado mas ainda não "
+#~ "configurado - já não se garante o funcionamento de cada pacote que "
+#~ "depende de A porque a sua dependência já não está satisfeita. O marcador "
+#~ "de configuração imediata é também aplicado a todas as dependências que "
+#~ "possam gerar um problema se as dependências, ex, formam um círculo como "
+#~ "uma dependência com a marca de imediato a ser comparável com uma Pré-"
+#~ "Dependência. Portanto, em teoria, é possível que o APT encontre uma "
+#~ "situação na qual é incapaz de executar configuração imediata, entre em "
+#~ "erro e refira esta opção para que o utilizador possa desactivar "
+#~ "temporariamente a configuração imediata para ser capaz de executar uma "
+#~ "instalação/actualização outra vez. Note o uso da palavra \"teoria\" aqui "
+#~ "pois este problema foi poucas vezes encontrado até agora no mundo real em "
+#~ "versões de distribuição não-estáveis e causados por dependências erradas "
+#~ "do pacote em questão ou por um sistema já num estado corrompido, portanto "
+#~ "você não deve desactivar esta opção às cegas porque, em primeiro lugar, o "
+#~ "cenário mencionado acima não é o único problema que a configuração "
+#~ "imediata pode ajudar a prevenir. Antes de uma grande operação como "
+#~ "<literal>dist-upgrade</literal> ser corrida com esta opção desactivada, "
+#~ "deve ser tentado primeiro fazer um <literal>install</literal> explicito "
+#~ "ao pacote que o APT é incapaz de configurar imediatamente, mas por favor "
+#~ "certifique-se de também relatar o seu problema à sua distribuição e à "
+#~ "equipa do APT com o link de bug abaixo para que possam trabalhar na "
+#~ "melhoria ou correcção do processo de actualização."
+
+#~ msgid ""
+#~ "The package resource list is used to locate archives of the package "
+#~ "distribution system in use on the system. At this time, this manual page "
+#~ "documents only the packaging system used by the Debian system.  This "
+#~ "control file is <filename>/etc/apt/sources.list</filename>."
+#~ msgstr ""
+#~ "A lista de recursos de pacote é usada para localizar arquivos do sistema "
+#~ "de distribuição de pacotes usado no sistema. Neste momento, este manual "
+#~ "documenta apenas o sistema de pacotes usado pelo sistema Debian. Este "
+#~ "ficheiro de controle é <filename>/etc/apt/sources.list</filename>."
+
+#~ msgid ""
+#~ "The source list is designed to support any number of active sources and a "
+#~ "variety of source media. The file lists one source per line, with the "
+#~ "most preferred source listed first. The format of each line is: "
+#~ "<literal>type uri args</literal> The first item, <literal>type</literal> "
+#~ "determines the format for <literal>args</literal>. <literal>uri</literal> "
+#~ "is a Universal Resource Identifier (URI), which is a superset of the more "
+#~ "specific and well-known Universal Resource Locator, or URL. The rest of "
+#~ "the line can be marked as a comment by using a #."
+#~ msgstr ""
+#~ "A lista de fontes é desenhada para suportar qualquer número de fontes "
+#~ "activas e uma variedade de médias fonte. O ficheiro lista uma fonte por "
+#~ "linha, com a fonte mais preferida listada em primeiro lugar. O formato "
+#~ "para cada linha é: <literal>tipo uri argumentos</literal>. O primeiro "
+#~ "item, <literal>tipo</literal> determina o formato para "
+#~ "<literal>argumentos</literal>. <literal>uri</literal> é um Universal "
+#~ "Resource Identifier (URI), o que é um super-conjunto para o mais "
+#~ "específico e conhecido Universal Resource Locator, ou URL. O resto da "
+#~ "linha pode ser marcado como um comentário usando um #."
+
+#~ msgid ""
 #~ "<literal>gencaches</literal> performs the same operation as <command>apt-"
 #~ "get check</command>. It builds the source and package caches from the "
 #~ "sources in &sources-list; and from <filename>/var/lib/dpkg/status</"
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index b6cb3c5d3..e3bb0f227 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-07 00:01+0300\n"
+"POT-Creation-Date: 2012-06-09 19:12+0300\n"
 "PO-Revision-Date: 2004-09-20 17:02+0000\n"
 "Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
 "Language-Team: <debian-l10n-portuguese@lists.debian.org>\n"
@@ -1091,14 +1091,14 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml:518 apt-cache.8.xml:343 apt-key.8.xml:174 apt-mark.8.xml:125
-#: apt.conf.5.xml:1118 apt_preferences.5.xml:698
+#: apt.conf.5.xml:1156 apt_preferences.5.xml:698
 msgid "Files"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131
 #: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109
-#: apt.conf.5.xml:1124 apt_preferences.5.xml:705 sources.list.5.xml:252
+#: apt.conf.5.xml:1162 apt_preferences.5.xml:705 sources.list.5.xml:252
 #: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63
 #: apt-ftparchive.1.xml:607
 #, fuzzy
@@ -2236,80 +2236,79 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:42
 msgid ""
-"<filename>apt.conf</filename> is the main configuration file for the APT "
-"suite of tools, but by far not the only place changes to options can be "
-"made. All tools therefore share the configuration files and also use a "
-"common command line parser to provide a uniform environment."
+"<filename>/etc/apt/apt.conf</filename> is the main configuration file shared "
+"by all the tools in the APT suite of tools, though it is by no means the "
+"only place options can be set. The suite also shares a common command line "
+"parser to provide a uniform environment."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><orderedlist><para>
-#: apt.conf.5.xml:47
+#: apt.conf.5.xml:48
 msgid ""
 "When an APT tool starts up it will read the configuration files in the "
 "following order:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:49
+#: apt.conf.5.xml:50
 msgid ""
 "the file specified by the <envar>APT_CONFIG</envar> environment variable (if "
 "any)"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:51
+#: apt.conf.5.xml:52
 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, unless that file matches a pattern in the <literal>Dir::"
-"Ignore-Files-Silently</literal> configuration list - in this case it will be "
-"silently ignored."
+"Ignore-Files-Silently</literal> configuration list - in which case it will "
+"be silently ignored."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:58
+#: apt.conf.5.xml:59
 msgid ""
 "the main configuration file specified by <literal>Dir::Etc::main</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:60
+#: apt.conf.5.xml:61
 msgid ""
 "the command line options are applied to override the configuration "
 "directives or to load even more configuration files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:64
+#: apt.conf.5.xml:65
 msgid "Syntax"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:65
+#: apt.conf.5.xml:66
 msgid ""
 "The configuration file is organized in a tree with options organized into "
 "functional groups. Option specification is given with a double colon "
-"notation, for instance <literal>APT::Get::Assume-Yes</literal> is an option "
+"notation; for instance <literal>APT::Get::Assume-Yes</literal> is an option "
 "within the APT tool group, for the Get tool. Options do not inherit from "
 "their parent groups."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:71
+#: apt.conf.5.xml:72
 msgid ""
 "Syntactically the configuration language is modeled after what the ISC tools "
 "such as bind and dhcp use. Lines starting with <literal>//</literal> are "
 "treated as comments (ignored), as well as all text between <literal>/*</"
 "literal> and <literal>*/</literal>, just like C/C++ comments.  Each line is "
-"of the form <literal>APT::Get::Assume-Yes \"true\";</literal>. The trailing "
-"semicolon and the quotes are required. The value must be on one line, and "
-"there is no kind of string concatenation. It must not include inside "
-"quotes.  The behavior of the backslash \"\\\" and escaped characters inside "
-"a value is undefined and it should not be used. An option name may include "
-"alphanumerical characters and the \"/-:._+\" characters. A new scope can be "
-"opened with curly braces, like:"
+"of the form <literal>APT::Get::Assume-Yes \"true\";</literal>.  The "
+"quotation marks and trailing semicolon are required.  The value must be on "
+"one line, and there is no kind of string concatenation.  Values must not "
+"include backslashes or extra quotation marks.  Option names are made up of "
+"alphanumeric characters and the characters \"/-:._+\".  A new scope can be "
+"opened with curly braces, like this:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
@@ -2329,7 +2328,7 @@ msgstr ""
 msgid ""
 "with newlines placed to make it more readable. Lists can be created by "
 "opening a scope and including a single string enclosed in quotes followed by "
-"a semicolon. Multiple entries can be included, each separated by a semicolon."
+"a semicolon. Multiple entries can be included, separated by a semicolon."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
@@ -2348,84 +2347,85 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:105
 msgid ""
-"The names of the configuration items are not case-sensitive. So in the "
-"previous example you could use <literal>dpkg::pre-install-pkgs</literal>."
+"Case is not significant in names of configuration items, so in the previous "
+"example you could use <literal>dpkg::pre-install-pkgs</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:108
 msgid ""
-"Names for the configuration items are optional if a list is defined as it "
-"can be see in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. "
-"If you don't specify a name a new entry will simply add a new option to the "
-"list. If you specify a name you can override the option as every other "
-"option by reassigning a new value to the option."
+"Names for the configuration items are optional if a list is defined as can "
+"be seen in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. If "
+"you don't specify a name a new entry will simply add a new option to the "
+"list. If you specify a name you can override the option in the same way as "
+"any other option by reassigning a new value to the option."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:113
 msgid ""
-"Two specials are allowed, <literal>#include</literal> (which is deprecated "
-"and not supported by alternative implementations) and <literal>#clear</"
-"literal>: <literal>#include</literal> will include the given file, unless "
-"the filename ends in a slash, then the whole directory is included.  "
-"<literal>#clear</literal> is used to erase a part of the configuration tree. "
-"The specified element and all its descendants are erased.  (Note that these "
-"lines also need to end with a semicolon.)"
+"Two special commands are defined: <literal>#include</literal> (which is "
+"deprecated and not supported by alternative implementations) and "
+"<literal>#clear</literal>. <literal>#include</literal> will include the "
+"given file, unless the filename ends in a slash, in which case the whole "
+"directory is included.  <literal>#clear</literal> is used to erase a part of "
+"the configuration tree. The specified element and all its descendants are "
+"erased.  (Note that these lines also need to end with a semicolon.)"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:121
+#: apt.conf.5.xml:123
 msgid ""
-"The #clear command is the only way to delete a list or a complete scope.  "
-"Reopening a scope or the ::-style described below will <emphasis>not</"
-"emphasis> override previously written entries. Only options can be "
-"overridden by addressing a new value to it - lists and scopes can't be "
-"overridden, only cleared."
+"The <literal>#clear</literal> command is the only way to delete a list or a "
+"complete scope. Reopening a scope (or using the syntax described below with "
+"an appended <literal>::</literal>) will <emphasis>not</emphasis> override "
+"previously written entries. Options can only be overridden by addressing a "
+"new value to them - lists and scopes can't be overridden, only cleared."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:126
+#: apt.conf.5.xml:131
 msgid ""
-"All of the APT tools take a -o option which allows an arbitrary "
+"All of the APT tools take an -o option which allows an arbitrary "
 "configuration directive to be specified on the command line. The syntax is a "
 "full option name (<literal>APT::Get::Assume-Yes</literal> for instance) "
 "followed by an equals sign then the new value of the option. To append a new "
-"element to a list, add a trailing :: to the name of the list. (As you might "
-"suspect: The scope syntax can't be used on the command line.)"
+"element to a list, add a trailing <literal>::</literal> to the name of the "
+"list.  (As you might suspect, the scope syntax can't be used on the command "
+"line.)"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:133
-msgid ""
-"Note that you can use :: only for appending one item per line to a list and "
-"that you should not use it in combination with the scope syntax.  (The scope "
-"syntax implicit insert ::) Using both syntaxes together will trigger a bug "
-"which some users unfortunately depend on: An option with the unusual name "
-"\"<literal>::</literal>\" which acts like every other option with a name. "
-"These introduces many problems including that a user who writes multiple "
-"lines in this <emphasis>wrong</emphasis> syntax in the hope to append to a "
-"list will gain the opposite as only the last assignment for this option "
-"\"<literal>::</literal>\" will be used. Upcoming APT versions will raise "
-"errors and will stop working if they encounter this misuse, so please "
-"correct such statements now as long as APT doesn't complain explicit about "
-"them."
+#: apt.conf.5.xml:139
+msgid ""
+"Note that appending items to a list using <literal>::</literal> only works "
+"for one item per line, and that you should not use it in combination with "
+"the scope syntax (which adds <literal>::</literal> implicitly). Using both "
+"syntaxes together will trigger a bug which some users unfortunately depend "
+"on: an option with the unusual name \"<literal>::</literal>\" which acts "
+"like every other option with a name. This introduces many problems; for one "
+"thing, users who write multiple lines in this <emphasis>wrong</emphasis> "
+"syntax in the hope of appending to a list will achieve the opposite, as only "
+"the last assignment for this option \"<literal>::</literal>\" will be used. "
+"Future versions of APT will raise errors and stop working if they encounter "
+"this misuse, so please correct such statements now while APT doesn't "
+"explicitly complain about them."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:145
+#: apt.conf.5.xml:154
 msgid "The APT Group"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:146
+#: apt.conf.5.xml:155
 msgid ""
 "This group of options controls general APT behavior as well as holding the "
 "options for all of the tools."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:151
+#: apt.conf.5.xml:160
 msgid ""
 "System Architecture; sets the architecture to use when fetching files and "
 "parsing package lists. The internal default is the architecture apt was "
@@ -2433,36 +2433,36 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:157
+#: apt.conf.5.xml:167
 msgid ""
-"All Architectures the system supports. Processors implementing the "
-"<literal>amd64</literal> (also called <literal>x86-64</literal>) instruction "
-"set are e.g. also able to execute binaries compiled for the <literal>i386</"
-"literal> (<literal>x86</literal>) instruction set; 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>."
+"All Architectures the system supports. For instance, CPUs implementing the "
+"<literal>amd64</literal> (also called <literal>x86-64</literal>)  "
+"instruction set are also able to execute binaries compiled for the "
+"<literal>i386</literal> (<literal>x86</literal>) instruction set. This list "
+"is used when fetching files and parsing package lists. The initial default "
+"is always the system's native architecture (<literal>APT::Architecture</"
+"literal>), and foreign architectures are added to the default list when they "
+"are registered via <command>dpkg --add-architecture</command>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:167
+#: apt.conf.5.xml:180
 msgid ""
-"Default release to install packages from if more than one version available. "
-"Contains release name, codename or release version. Examples: 'stable', "
-"'testing', 'unstable', '&stable-codename;', '&testing-codename;', '4.0', "
-"'5.0*'. See also &apt-preferences;."
+"Default release to install packages from if more than one version is "
+"available. Contains release name, codename or release version. Examples: "
+"'stable', 'testing', 'unstable', '&stable-codename;', '&testing-codename;', "
+"'4.0', '5.0*'. See also &apt-preferences;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:173
+#: apt.conf.5.xml:186
 msgid ""
-"Ignore Held packages; This global option causes the problem resolver to "
+"Ignore held packages; this global option causes the problem resolver to "
 "ignore held packages in its decision making."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:178
+#: apt.conf.5.xml:191
 msgid ""
 "Defaults to on. When turned on the autoclean feature will remove any "
 "packages which can no longer be downloaded from the cache. If turned off "
@@ -2471,161 +2471,178 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:185
+#: apt.conf.5.xml:199
+msgid ""
+"Defaults to on, which will cause APT to install essential and important "
+"packages as soon as possible in an install/upgrade operation, in order to "
+"limit the effect of a failing &dpkg; call. If this option is disabled, APT "
+"treats an important package in the same way as an extra package: between the "
+"unpacking of the package A and its configuration there can be many other "
+"unpack or configuration calls for other unrelated packages B, C etc. If "
+"these cause the &dpkg; call to fail (e.g. because package B's maintainer "
+"scripts generate an error), this results in a system state in which package "
+"A is unpacked but unconfigured - so any package depending on A is now no "
+"longer guaranteed to work, as its dependency on A is no longer satisfied."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:211
 msgid ""
-"Defaults to on which will cause APT to install essential and important "
-"packages as fast as possible in the install/upgrade operation. This is done "
-"to limit the effect of a failing &dpkg; call: If this option is disabled APT "
-"does treat an important package in the same way as an extra package: Between "
-"the unpacking of the important package A and his configuration can then be "
-"many other unpack or configuration calls, e.g. for package B which has no "
-"relation to A, but causes the dpkg call to fail (e.g. because maintainer "
-"script of package B generates an error) which results in a system state in "
-"which package A is unpacked but unconfigured - each package depending on A "
-"is now no longer guaranteed to work as their dependency on A is not longer "
-"satisfied. The immediate configuration marker is also applied to all "
-"dependencies which can generate a problem if the dependencies e.g. form a "
-"circle as a dependency with the immediate flag is comparable with a Pre-"
-"Dependency. So in theory it is possible that APT encounters a situation in "
-"which it is unable to perform immediate configuration, errors out and refers "
-"to this option so the user can deactivate the immediate configuration "
-"temporarily to be able to perform an install/upgrade again. Note the use of "
-"the word \"theory\" here as this problem was only encountered by now in real "
-"world a few times in non-stable distribution versions and was caused by "
-"wrong dependencies of the package in question or by a system in an already "
-"broken state, so you should not blindly disable this option as the mentioned "
-"scenario above is not the only problem immediate configuration can help to "
-"prevent in the first place.  Before a big operation like <literal>dist-"
-"upgrade</literal> is run with this option disabled it should be tried to "
-"explicitly <literal>install</literal> the package APT is unable to configure "
-"immediately, but please make sure to report your problem also to your "
-"distribution and to the APT team with the buglink below so they can work on "
-"improving or correcting the upgrade process."
+"The immediate configuration marker is also applied in the potentially "
+"problematic case of circular dependencies, since a dependency with the "
+"immediate flag is equivalent to a Pre-Dependency. In theory this allows APT "
+"to recognise a situation in which it is unable to perform immediate "
+"configuration, abort, and suggest to the user that the option should be "
+"temporarily deactivated in order to allow the operation to proceed.  Note "
+"the use of the word \"theory\" here; in the real world this problem has "
+"rarely been encountered, in non-stable distribution versions, and was caused "
+"by wrong dependencies of the package in question or by a system in an "
+"already broken state; so you should not blindly disable this option, as the "
+"scenario mentioned above is not the only problem it can help to prevent in "
+"the first place."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:208
+#: apt.conf.5.xml:224
 msgid ""
-"Never Enable this option unless you -really- know what you are doing. It "
-"permits APT to temporarily remove an essential package to break a Conflicts/"
-"Conflicts or Conflicts/Pre-Depend loop between two essential packages. SUCH "
-"A LOOP SHOULD NEVER EXIST AND IS A GRAVE BUG. This option will work if the "
-"essential packages are not tar, gzip, libc, dpkg, bash or anything that "
-"those packages depend on."
+"Before a big operation like <literal>dist-upgrade</literal> is run with this "
+"option disabled you should try to explicitly <literal>install</literal> the "
+"package APT is unable to configure immediately; but please make sure you "
+"also report your problem to your distribution and to the APT team with the "
+"buglink below, so they can work on improving or correcting the upgrade "
+"process."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:217
+#: apt.conf.5.xml:235
+msgid ""
+"Never enable this option unless you <emphasis>really</emphasis> know what "
+"you are doing. It permits APT to temporarily remove an essential package to "
+"break a Conflicts/Conflicts or Conflicts/Pre-Depends loop between two "
+"essential packages. <emphasis>Such a loop should never exist and is a grave "
+"bug</emphasis>. This option will work if the essential packages are not "
+"<command>tar</command>, <command>gzip</command>, <command>libc</command>, "
+"<command>dpkg</command>, <command>dash</command> or anything that those "
+"packages depend on."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:247
 msgid ""
 "APT uses since version 0.7.26 a resizable memory mapped cache file to store "
-"the 'available' information. <literal>Cache-Start</literal> acts as a hint "
-"to which size the Cache will grow and is therefore the amount of memory APT "
+"the available information. <literal>Cache-Start</literal> acts as a hint of "
+"the size the cache will grow to, and is therefore the amount of memory APT "
 "will request at startup. The default value is 20971520 bytes (~20 MB). Note "
-"that this amount of space needs to be available for APT otherwise it will "
+"that this amount of space needs to be available for APT; otherwise it will "
 "likely fail ungracefully, so for memory restricted devices this value should "
 "be lowered while on systems with a lot of configured sources it should be "
 "increased.  <literal>Cache-Grow</literal> defines in bytes with the default "
-"of 1048576 (~1 MB) how much the Cache size will be increased in the event "
-"the space defined by <literal>Cache-Start</literal> is not enough. These "
+"of 1048576 (~1 MB) how much the cache size will be increased in the event "
+"the space defined by <literal>Cache-Start</literal> is not enough. This "
 "value will be applied again and again until either the cache is big enough "
 "to store all information or the size of the cache reaches the <literal>Cache-"
 "Limit</literal>.  The default of <literal>Cache-Limit</literal> is 0 which "
 "stands for no limit.  If <literal>Cache-Grow</literal> is set to 0 the "
-"automatic grow of the cache is disabled."
+"automatic growth of the cache is disabled."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:233
-msgid "Defines which package(s) are considered essential build dependencies."
+#: apt.conf.5.xml:263
+msgid "Defines which packages are considered essential build dependencies."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:237
+#: apt.conf.5.xml:267
 msgid ""
-"The Get subsection controls the &apt-get; tool, please see its documentation "
+"The Get subsection controls the &apt-get; tool; please see its documentation "
 "for more information about the options here."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:242
+#: apt.conf.5.xml:272
 msgid ""
-"The Cache subsection controls the &apt-cache; tool, please see its "
+"The Cache subsection controls the &apt-cache; tool; please see its "
 "documentation for more information about the options here."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:247
+#: apt.conf.5.xml:277
 msgid ""
-"The CDROM subsection controls the &apt-cdrom; tool, please see its "
+"The CDROM subsection controls the &apt-cdrom; tool; please see its "
 "documentation for more information about the options here."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:253
+#: apt.conf.5.xml:283
 msgid "The Acquire Group"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:254
+#: apt.conf.5.xml:284
 msgid ""
 "The <literal>Acquire</literal> group of options controls the download of "
-"packages and the URI handlers."
+"packages as well as the various \"acquire methods\" responsible for the "
+"download itself (see also &sources-list;)."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:259
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:291
 msgid ""
-"Security related option defaulting to true as an expiring validation for a "
-"Release file prevents longtime replay attacks and can e.g. also help users "
-"to identify no longer updated mirrors - but the feature depends on the "
-"correctness of the time on the user system.  Archive maintainers are "
-"encouraged to create Release files with the <literal>Valid-Until</literal> "
-"header, but if they don't or a stricter value is volitional the following "
-"<literal>Max-ValidTime</literal> option can be used."
+"Security related option defaulting to true, as giving a Release file's "
+"validation an expiration date prevents replay attacks over a long timescale, "
+"and can also for example help users to identify mirrors that are no longer "
+"updated - but the feature depends on the correctness of the clock on the "
+"user system. Archive maintainers are encouraged to create Release files with "
+"the <literal>Valid-Until</literal> header, but if they don't or a stricter "
+"value is desired the <literal>Max-ValidTime</literal> option below can be "
+"used."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:270
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:304
 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 valid\".  Archive specific settings can "
-"be made by appending the label of the archive to the option name."
+"Maximum time (in seconds) after its creation (as indicated by the "
+"<literal>Date</literal> header) that the <filename>Release</filename> file "
+"should be considered valid.  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 \"valid forever\".  Archive specific settings can be made by appending "
+"the label of the archive to the option name."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:281
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:316
 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."
+"Minimum time (in seconds) after its creation (as indicated by the "
+"<literal>Date</literal> header) that the <filename>Release</filename> file "
+"should be considered valid.  Use this if you need to use a seldom updated "
+"(local) mirror of a more frequently 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 ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:292
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:328
 msgid ""
-"Try to download deltas called <literal>PDiffs</literal> for Packages or "
-"Sources files instead of downloading whole ones. True by default."
+"Try to download deltas called <literal>PDiffs</literal> for indexes (like "
+"<filename>Packages</filename> files) instead of downloading whole ones. True "
+"by default."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:295
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:331
 msgid ""
-"Two sub-options to limit the use of PDiffs are also available: With "
-"<literal>FileLimit</literal> can be specified how many PDiff files are "
-"downloaded at most to update a file. <literal>SizeLimit</literal> on the "
-"other hand is the maximum percentage of the size of all patches compared to "
-"the size of the targeted file. If one of these limits is exceeded the "
-"complete file is downloaded instead of the patches."
+"Two sub-options to limit the use of PDiffs are also available: "
+"<literal>FileLimit</literal> can be used to specify a maximum number of "
+"PDiff files should be downloaded to update a file. <literal>SizeLimit</"
+"literal> on the other hand is the maximum percentage of the size of all "
+"patches compared to the size of the targeted file. If one of these limits is "
+"exceeded the complete file is downloaded instead of the patches."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:305
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:341
 msgid ""
 "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
 "literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -2634,161 +2651,161 @@ msgid ""
 "connection per URI type will be opened."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:313
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:349
 msgid ""
 "Number of retries to perform. If this is non-zero APT will retry failed "
 "files the given number of times."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:318
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:354
 msgid ""
 "Use symlinks for source archives. If set to true then source archives will "
 "be symlinked when possible instead of copying. True is the default."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:323
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:359
 msgid ""
-"HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
-"standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per "
-"host proxies can also be specified by using the form <literal>http::Proxy::"
-"&lt;host&gt;</literal> with the special keyword <literal>DIRECT</literal> "
-"meaning to use no proxies. If no one of the above settings is specified, "
-"<envar>http_proxy</envar> environment variable will be used."
+"<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. "
+"It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</"
+"literal>.  Per host proxies can also be specified by using the form "
+"<literal>http::Proxy::&lt;host&gt;</literal> with the special keyword "
+"<literal>DIRECT</literal> meaning to use no proxies. If no one of the above "
+"settings is specified, <envar>http_proxy</envar> environment variable will "
+"be used."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:331
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:367
 msgid ""
 "Three settings are provided for cache control with HTTP/1.1 compliant proxy "
-"caches. <literal>No-Cache</literal> tells the proxy to not use its cached "
-"response under any circumstances, <literal>Max-Age</literal> is sent only "
-"for index files and tells the cache to refresh its object if it is older "
-"than the given number of seconds. Debian updates its index files daily so "
-"the default is 1 day. <literal>No-Store</literal> specifies that the cache "
-"should never store this request, it is only set for archive files. This may "
-"be useful to prevent polluting a proxy cache with very large .deb files. "
-"Note: Squid 2.0.2 does not support any of these options."
+"caches.  <literal>No-Cache</literal> tells the proxy not to use its cached "
+"response under any circumstances.  <literal>Max-Age</literal> sets the "
+"allowed maximum age (in seconds) of an index file in the cache of the "
+"proxy.  <literal>No-Store</literal> specifies that the proxy should not "
+"store the requested archive files in its cache, which can be used to prevent "
+"the proxy from polluting its cache with (big) .deb files."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:341 apt.conf.5.xml:407
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:377 apt.conf.5.xml:449
 msgid ""
 "The option <literal>timeout</literal> sets the timeout timer used by the "
-"method, this applies to all things including connection timeout and data "
-"timeout."
+"method; this value applies to the connection as well as the data timeout."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:344
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:380
 msgid ""
 "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
-"enabled HTTP pipeling (RFC 2616 section 8.1.2.2) which can be beneficial e."
-"g. on high-latency connections. It specifies how many requests are send in a "
+"enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
+"g. on high-latency connections. It specifies how many requests are sent in a "
 "pipeline.  Previous APT versions had a default of 10 for this setting, but "
 "the default value is now 0 (= disabled) to avoid problems with the ever-"
 "growing amount of webservers and proxies which choose to not conform to the "
 "HTTP/1.1 specification."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:351
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:387
 msgid ""
-"<literal>Acquire::http::AllowRedirect</literal> controls if APT will follow "
-"redirects, which is enabled by default."
+"<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
+"follow redirects, which is enabled by default."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:354
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:390
 msgid ""
 "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
-"literal> which accepts integer values in kilobyte. The default value is 0 "
-"which deactivates the limit and tries uses as much as possible of the "
-"bandwidth (Note that this option implicit deactivates the download from "
-"multiple servers at the same time.)"
+"literal> which accepts integer values in kilobytes. The default value is 0 "
+"which deactivates the limit and tries to use all available bandwidth (note "
+"that this option implicitly disables downloading from multiple servers at "
+"the same time.)"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:359
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:395
 msgid ""
 "<literal>Acquire::http::User-Agent</literal> can be used to set a different "
 "User-Agent for the http download method as some proxies allow access for "
 "clients only if the client uses a known identifier."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:366
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:403
 msgid ""
-"HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
-"options are the same as for <literal>http</literal> method and will also "
-"default to the options from the <literal>http</literal> method if they are "
-"not explicitly set for https. <literal>Pipeline-Depth</literal> option is "
-"not supported yet."
+"The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
+"<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
+"<literal>proxy</literal> options work for HTTPS URIs in the same way as for "
+"the <literal>http</literal> method, and default to the same values if they "
+"are not explicitly set. The <literal>Pipeline-Depth</literal> option is not "
+"yet supported."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:372
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:411
 msgid ""
 "<literal>CaInfo</literal> suboption specifies place of file that holds info "
-"about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is "
+"about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is the "
 "corresponding per-host option.  <literal>Verify-Peer</literal> boolean "
-"suboption determines whether verify server's host certificate against "
-"trusted certificates or not.  <literal>&lt;host&gt;::Verify-Peer</literal> "
-"is corresponding per-host option.  <literal>Verify-Host</literal> boolean "
-"suboption determines whether verify server's hostname or not.  <literal>&lt;"
-"host&gt;::Verify-Host</literal> is corresponding per-host option.  "
-"<literal>SslCert</literal> determines what certificate to use for client "
-"authentication. <literal>&lt;host&gt;::SslCert</literal> is corresponding "
-"per-host option.  <literal>SslKey</literal> determines what private key to "
-"use for client authentication. <literal>&lt;host&gt;::SslKey</literal> is "
-"corresponding per-host option.  <literal>SslForceVersion</literal> overrides "
-"default SSL version to use.  Can contain 'TLSv1' or 'SSLv3' string.  "
-"<literal>&lt;host&gt;::SslForceVersion</literal> is corresponding per-host "
-"option."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:391
-msgid ""
-"FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard "
-"form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host "
-"proxies can also be specified by using the form <literal>ftp::Proxy::&lt;"
-"host&gt;</literal> with the special keyword <literal>DIRECT</literal> "
-"meaning to use no proxies. If no one of the above settings is specified, "
-"<envar>ftp_proxy</envar> environment variable will be used. To use a ftp "
-"proxy you will have to set the <literal>ftp::ProxyLogin</literal> script in "
-"the configuration file. This entry specifies the commands to send to tell "
-"the proxy server what to connect to. Please see &configureindex; for an "
-"example of how to do this. The substitution variables available are <literal>"
-"$(PROXY_USER)</literal> <literal>$(PROXY_PASS)</literal> <literal>"
-"$(SITE_USER)</literal> <literal>$(SITE_PASS)</literal> <literal>$(SITE)</"
-"literal> and <literal>$(SITE_PORT)</literal> Each is taken from it's "
-"respective URI component."
+"suboption determines whether or not the server's host certificate should be "
+"verified against trusted certificates.  <literal>&lt;host&gt;::Verify-Peer</"
+"literal> is the corresponding per-host option.  <literal>Verify-Host</"
+"literal> boolean suboption determines whether or not the server's hostname "
+"should be verified.  <literal>&lt;host&gt;::Verify-Host</literal> is the "
+"corresponding per-host option.  <literal>SslCert</literal> determines what "
+"certificate to use for client authentication. <literal>&lt;host&gt;::"
+"SslCert</literal> is the corresponding per-host option.  <literal>SslKey</"
+"literal> determines what private key to use for client authentication. "
+"<literal>&lt;host&gt;::SslKey</literal> is the corresponding per-host "
+"option.  <literal>SslForceVersion</literal> overrides default SSL version to "
+"use.  It can contain either of the strings '<literal>TLSv1</literal>' or "
+"'<literal>SSLv3</literal>'.  <literal>&lt;host&gt;::SslForceVersion</"
+"literal> is the corresponding per-host option."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:432
+msgid ""
+"<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs.  "
+"It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</"
+"literal>.  Per host proxies can also be specified by using the form "
+"<literal>ftp::Proxy::&lt;host&gt;</literal> with the special keyword "
+"<literal>DIRECT</literal> meaning to use no proxies. If no one of the above "
+"settings is specified, <envar>ftp_proxy</envar> environment variable will be "
+"used. To use an FTP proxy you will have to set the <literal>ftp::ProxyLogin</"
+"literal> script in the configuration file. This entry specifies the commands "
+"to send to tell the proxy server what to connect to. Please see "
+"&configureindex; for an example of how to do this. The substitution "
+"variables representing the corresponding URI component are <literal>"
+"$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, <literal>"
+"$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, <literal>$(SITE)</"
+"literal> and <literal>$(SITE_PORT)</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:410
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:452
 msgid ""
 "Several settings are provided to control passive mode. Generally it is safe "
-"to leave passive mode on, it works in nearly every environment.  However "
-"some situations require that passive mode be disabled and port mode ftp used "
-"instead. This can be done globally, for connections that go through a proxy "
-"or for a specific host (See the sample config file for examples)."
+"to leave passive mode on; it works in nearly every environment.  However, "
+"some situations require that passive mode be disabled and port mode FTP used "
+"instead. This can be done globally or for connections that go through a "
+"proxy or for a specific host (see the sample config file for examples)."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:417
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:459
 msgid ""
 "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
-"envar> environment variable to a http url - see the discussion of the http "
+"envar> environment variable to an HTTP URL - see the discussion of the http "
 "method above for syntax. You cannot set this in the configuration file and "
 "it is not recommended to use FTP over HTTP due to its low efficiency."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:422
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:464
 msgid ""
 "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
 "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -2797,111 +2814,111 @@ msgid ""
 "that most FTP servers do not support RFC2428."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:435
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
+#: apt.conf.5.xml:478
 #, no-wrap
 msgid "/cdrom/::Mount \"foo\";"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:430
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:473
 msgid ""
-"CD-ROM URIs; the only setting for CD-ROM URIs is the mount point, "
-"<literal>cdrom::Mount</literal> which must be the mount point for the CD-ROM "
-"drive as specified in <filename>/etc/fstab</filename>. It is possible to "
-"provide alternate mount and unmount commands if your mount point cannot be "
-"listed in the fstab (such as an SMB mount and old mount packages). The "
+"For URIs using the <literal>cdrom</literal> method, the only configurable "
+"option is the mount point, <literal>cdrom::Mount</literal>, which must be "
+"the mount point for the CD-ROM (or DVD, or whatever) drive as specified in "
+"<filename>/etc/fstab</filename>. It is possible to provide alternate mount "
+"and unmount commands if your mount point cannot be listed in the fstab.  The "
 "syntax is to put <placeholder type=\"literallayout\" id=\"0\"/> within the "
-"cdrom block. It is important to have the trailing slash. Unmount commands "
-"can be specified using UMount."
+"<literal>cdrom</literal> block. It is important to have the trailing slash.  "
+"Unmount commands can be specified using UMount."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:441
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:486
 msgid ""
-"GPGV URIs; the only option for GPGV URIs is the option to pass additional "
-"parameters to gpgv.  <literal>gpgv::Options</literal> Additional options "
-"passed to gpgv."
+"For GPGV URIs the only configurable option is <literal>gpgv::Options</"
+"literal>, which passes additional parameters to gpgv."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:452
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
+#: apt.conf.5.xml:497
 #, no-wrap
 msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:447
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:492
 msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "
-"compression formats.  Per default the acquire methods can decompress "
+"compression formats.  By default the acquire methods can decompress "
 "<command>bzip2</command>, <command>lzma</command> and <command>gzip</"
-"command> compressed files, with this setting more formats can be added on "
+"command> compressed files; with this setting more formats can be added on "
 "the fly or the used method can be changed. The syntax for this is: "
 "<placeholder type=\"synopsis\" id=\"0\"/>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:457
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
+#: apt.conf.5.xml:502
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order:: \"gz\";"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:460
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
+#: apt.conf.5.xml:505
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:453
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:498
 msgid ""
-"Also the <literal>Order</literal> subgroup can be used to define in which "
+"Also, the <literal>Order</literal> subgroup can be used to define in which "
 "order the acquire system will try to download the compressed files. The "
 "acquire system will try the first and proceed with the next compression type "
-"in this list on error, so to prefer one over the other type simple add the "
-"preferred type at first - not already added default types will be added at "
-"run time to the end of the list, so e.g. <placeholder type=\"synopsis\" id="
+"in this list on error, so to prefer one over the other type simply add the "
+"preferred type first - default types not already added will be implicitly "
+"appended to the end of the list, so e.g. <placeholder type=\"synopsis\" id="
 "\"0\"/> can be used to prefer <command>gzip</command> compressed files over "
 "<command>bzip2</command> and <command>lzma</command>.  If <command>lzma</"
 "command> should be preferred over <command>gzip</command> and "
-"<command>bzip2</command> the configure setting should look like this "
+"<command>bzip2</command> the configure setting should look like this: "
 "<placeholder type=\"synopsis\" id=\"1\"/> It is not needed to add "
-"<literal>bz2</literal> explicit to the list as it will be added automatic."
+"<literal>bz2</literal> to the list explicitly as it will be added "
+"automatically."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:464
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
+#: apt.conf.5.xml:512
 #, no-wrap
 msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:462
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:507
 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."
+"Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></"
+"literal> will be checked at run time. If this option has been set, the "
+"method will only be used if this file exists; e.g. for the <literal>bzip2</"
+"literal> 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."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:469
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:517
 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."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:476
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:524
 msgid ""
 "When downloading <literal>gzip</literal> compressed indexes (Packages, "
 "Sources, or Translations), keep them gzip compressed locally instead of "
@@ -2909,50 +2926,48 @@ msgid ""
 "CPU requirements when building the local package caches. False by default."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:484
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:532
 msgid ""
 "The Languages subsection controls which <filename>Translation</filename> "
-"files are downloaded and in which order APT tries to display the Description-"
-"Translations. APT will try to display the first available Description in the "
-"Language which is listed at first. Languages can be defined with their short "
-"or long Languagecodes. Note that not all archives provide "
-"<filename>Translation</filename> files for every Language - especially the "
-"long Languagecodes are rare, so please inform you which ones are available "
-"before you set here impossible values."
+"files are downloaded and in which order APT tries to display the description-"
+"translations. APT will try to display the first available description in the "
+"language which is listed first. Languages can be defined with their short or "
+"long language codes. Note that not all archives provide "
+"<filename>Translation</filename> files for every language - the long "
+"language codes are especially rare."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:500
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
+#: apt.conf.5.xml:549
 #, no-wrap
 msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:490
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:537
 msgid ""
 "The default list includes \"environment\" and \"en\". "
-"\"<literal>environment</literal>\" has a special meaning here: It will be "
-"replaced at runtime with the languagecodes extracted from the "
+"\"<literal>environment</literal>\" has a special meaning here: it will be "
+"replaced at runtime with the language codes extracted from the "
 "<literal>LC_MESSAGES</literal> environment variable.  It will also ensure "
 "that these codes are not included twice in the list. If "
 "<literal>LC_MESSAGES</literal> is set to \"C\" only the "
 "<filename>Translation-en</filename> file (if available) will be used.  To "
-"force apt to use no Translation file use the setting <literal>Acquire::"
+"force APT to use no Translation file use the setting <literal>Acquire::"
 "Languages=none</literal>. \"<literal>none</literal>\" is another special "
-"meaning code which will stop the search for a fitting <filename>Translation</"
-"filename> file.  This can be used by the system administrator to let APT "
-"know that it should download also this files without actually use them if "
-"the environment doesn't specify this languages. So the following example "
-"configuration will result in the order \"en, de\" in an english and in \"de, "
-"en\" in a german localization. Note that \"fr\" is downloaded, but not used "
-"if APT is not used in a french localization, in such an environment the "
-"order would be \"fr, de, en\".  <placeholder type=\"programlisting\" id="
-"\"0\"/>"
+"meaning code which will stop the search for a suitable "
+"<filename>Translation</filename> file.  This tells APT to download these "
+"translations too, without actually using them unless the environment "
+"specifies the languages. So the following example configuration will result "
+"in the order \"en, de\" in an English locale or \"de, en\" in a German one. "
+"Note that \"fr\" is downloaded, but not used unless APT is used in a French "
+"locale (where the order would be \"fr, de, en\").  <placeholder type="
+"\"programlisting\" id=\"0\"/>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:501
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:550
 msgid ""
 "Note: To prevent problems resulting from APT being executed in different "
 "environments (e.g. by different users or by other programs) all Translation "
@@ -2961,37 +2976,37 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:560
 msgid "Directories"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:514
+#: apt.conf.5.xml:562
 msgid ""
 "The <literal>Dir::State</literal> section has directories that pertain to "
 "local state information. <literal>lists</literal> is the directory to place "
 "downloaded package lists in and <literal>status</literal> is the name of the "
-"dpkg status file.  <literal>preferences</literal> is the name of the APT "
+"&dpkg; status file.  <literal>preferences</literal> is the name of the APT "
 "<filename>preferences</filename> file.  <literal>Dir::State</literal> "
-"contains the default directory to prefix on all sub items if they do not "
+"contains the default directory to prefix on all sub-items if they do not "
 "start with <filename>/</filename> or <filename>./</filename>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:521
+#: apt.conf.5.xml:569
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
 "and <literal>pkgcache</literal> as well as the location to place downloaded "
 "archives, <literal>Dir::Cache::archives</literal>. Generation of caches can "
-"be turned off by setting their names to be blank. This will slow down "
-"startup but save disk space. It is probably preferred to turn off the "
+"be turned off by setting their names to the empty string. This will slow "
+"down startup but save disk space. It is probably preferable to turn off the "
 "pkgcache rather than the srcpkgcache. Like <literal>Dir::State</literal> the "
 "default directory is contained in <literal>Dir::Cache</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:530
+#: apt.conf.5.xml:578
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -3001,7 +3016,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:536
+#: apt.conf.5.xml:584
 msgid ""
 "The <literal>Dir::Parts</literal> setting reads in all the config fragments "
 "in lexical order from the directory specified. After this is done then the "
@@ -3009,7 +3024,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:540
+#: apt.conf.5.xml:588
 msgid ""
 "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
 "Bin::Methods</literal> specifies the location of the method handlers and "
@@ -3020,7 +3035,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:548
+#: apt.conf.5.xml:596
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "
@@ -3033,7 +3048,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:561
+#: apt.conf.5.xml:609
 msgid ""
 "The <literal>Ignore-Files-Silently</literal> list can be used to specify "
 "which files APT should silently ignore while parsing the files in the "
@@ -3044,91 +3059,93 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:570
+#: apt.conf.5.xml:618
 msgid "APT in DSelect"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:572
+#: apt.conf.5.xml:620
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
-"control the default behaviour. These are in the <literal>DSelect</literal> "
+"control the default behavior. These are in the <literal>DSelect</literal> "
 "section."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:577
+#: apt.conf.5.xml:625
 msgid ""
-"Cache Clean mode; this value may be one of always, prompt, auto, pre-auto "
-"and never.  always and prompt will remove all packages from the cache after "
-"upgrading, prompt (the default) does so conditionally.  auto removes only "
-"those packages which are no longer downloadable (replaced with a new version "
-"for instance).  pre-auto performs this action before downloading new "
-"packages."
+"Cache Clean mode; this value may be one of <literal>always</literal>, "
+"<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
+"literal> and <literal>never</literal>.  <literal>always</literal> and "
+"<literal>prompt</literal> will remove all packages from the cache after "
+"upgrading, <literal>prompt</literal> (the default) does so conditionally.  "
+"<literal>auto</literal> removes only those packages which are no longer "
+"downloadable (replaced with a new version for instance).  <literal>pre-auto</"
+"literal> performs this action before downloading new packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:586
+#: apt.conf.5.xml:639
 msgid ""
-"The contents of this variable is passed to &apt-get; as command line options "
-"when it is run for the install phase."
+"The contents of this variable are passed to &apt-get; as command line "
+"options when it is run for the install phase."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:591
+#: apt.conf.5.xml:644
 msgid ""
-"The contents of this variable is passed to &apt-get; as command line options "
-"when it is run for the update phase."
+"The contents of this variable are passed to &apt-get; as command line "
+"options when it is run for the update phase."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:596
+#: apt.conf.5.xml:649
 msgid ""
 "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
 "The default is to prompt only on error."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:602
-msgid "How APT calls dpkg"
+#: apt.conf.5.xml:655
+msgid "How APT calls &dpkg;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:603
+#: apt.conf.5.xml:656
 msgid ""
 "Several configuration directives control how APT invokes &dpkg;. These are "
 "in the <literal>DPkg</literal> section."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:608
+#: apt.conf.5.xml:661
 msgid ""
-"This is a list of options to pass to dpkg. The options must be specified "
+"This is a list of options to pass to &dpkg;. The options must be specified "
 "using the list notation and each list item is passed as a single argument to "
 "&dpkg;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:614
+#: apt.conf.5.xml:667
 msgid ""
 "This is a list of shell commands to run before/after invoking &dpkg;.  Like "
 "<literal>options</literal> this must be specified in list notation. The "
-"commands are invoked in order using <filename>/bin/sh</filename>, should any "
+"commands are invoked in order using <filename>/bin/sh</filename>; should any "
 "fail APT will abort."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:621
+#: apt.conf.5.xml:674
 msgid ""
-"This is a list of shell commands to run before invoking dpkg. Like "
+"This is a list of shell commands to run before invoking &dpkg;. Like "
 "<literal>options</literal> this must be specified in list notation. The "
-"commands are invoked in order using <filename>/bin/sh</filename>, should any "
-"fail APT will abort. APT will pass to the commands on standard input the "
-"filenames of all .deb files it is going to install, one per line."
+"commands are invoked in order using <filename>/bin/sh</filename>; should any "
+"fail APT will abort. APT will pass the filenames of all .deb files it is "
+"going to install to the commands, one per line on standard input."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:627
+#: apt.conf.5.xml:680
 msgid ""
 "Version 2 of this protocol dumps more information, including the protocol "
 "version, the APT configuration space and the packages, files and versions "
@@ -3138,41 +3155,41 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:635
+#: apt.conf.5.xml:688
 msgid ""
-"APT chdirs to this directory before invoking dpkg, the default is <filename>/"
-"</filename>."
+"APT chdirs to this directory before invoking &dpkg;, the default is "
+"<filename>/</filename>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:640
+#: apt.conf.5.xml:693
 msgid ""
-"These options are passed to &dpkg-buildpackage; when compiling packages, the "
+"These options are passed to &dpkg-buildpackage; when compiling packages; the "
 "default is to disable signing and produce all binaries."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:645
+#: apt.conf.5.xml:698
 msgid "dpkg trigger usage (and related options)"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:646
+#: apt.conf.5.xml:699
 msgid ""
-"APT can call dpkg in a way so it can make aggressive use of triggers over "
-"multiple calls of dpkg. Without further options dpkg will use triggers only "
-"in between his own run. Activating these options can therefore decrease the "
-"time needed to perform the install / upgrade. Note that it is intended to "
-"activate these options per default in the future, but as it changes the way "
-"APT calling dpkg drastically it needs a lot more testing.  <emphasis>These "
-"options are therefore currently experimental and should not be used in "
-"productive environments.</emphasis> Also it breaks the progress reporting so "
-"all frontends will currently stay around half (or more) of the time in the "
-"100% state while it actually configures all packages."
+"APT can call &dpkg; in such a way as to let it make aggressive use of "
+"triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
+"use triggers once each time it runs.  Activating these options can therefore "
+"decrease the time needed to perform the install or upgrade. Note that it is "
+"intended to activate these options per default in the future, but as it "
+"drastically changes the way APT calls &dpkg; it needs a lot more testing.  "
+"<emphasis>These options are therefore currently experimental and should not "
+"be used in production environments.</emphasis> It also breaks progress "
+"reporting such that all front-ends will currently stay around half (or more) "
+"of the time in the 100% state while it actually configures all packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:661
+#: apt.conf.5.xml:714
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
@@ -3182,82 +3199,72 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:655
+#: apt.conf.5.xml:708
 msgid ""
 "Note that it is not guaranteed that APT will support these options or that "
 "these options will not cause (big) trouble in the future. If you have "
 "understand the current risks and problems with these options, but are brave "
-"enough to help testing them create a new configuration file and test a "
+"enough to help testing them, create a new configuration file and test a "
 "combination of options. Please report any bugs, problems and improvements "
 "you encounter and make sure to note which options you have used in your "
-"reports. Asking dpkg for help could also be useful for debugging proposes, "
+"reports. Asking &dpkg; for help could also be useful for debugging proposes, "
 "see e.g. <command>dpkg --audit</command>. A defensive option combination "
 "would be <placeholder type=\"literallayout\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:668
+#: apt.conf.5.xml:721
 msgid ""
-"Add the no triggers flag to all dpkg calls (except the ConfigurePending "
+"Add the no triggers flag to all &dpkg; calls (except the ConfigurePending "
 "call).  See &dpkg; if you are interested in what this actually means. In "
-"short: dpkg will not run the triggers when this flag is present unless it is "
-"explicitly called to do so in an extra call.  Note that this option exists "
-"(undocumented) also in older apt versions with a slightly different meaning: "
-"Previously these option only append --no-triggers to the configure calls to "
-"dpkg - now apt will add these flag also to the unpack and remove calls."
+"short: &dpkg; will not run the triggers when this flag is present unless it "
+"is explicitly called to do so in an extra call.  Note that this option "
+"exists (undocumented) also in older APT versions with a slightly different "
+"meaning: Previously these option only append --no-triggers to the configure "
+"calls to &dpkg; - now APT will also add this flag to the unpack and remove "
+"calls."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:676
+#: apt.conf.5.xml:729
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
-"and \"<literal>no</literal>\".  \"<literal>all</literal>\" is the default "
-"value and causes APT to configure all packages explicit.  The "
-"\"<literal>smart</literal>\" way is it to configure only packages which need "
-"to be configured before another package can be unpacked (Pre-Depends) and "
-"let the rest configure by dpkg with a call generated by the next option. "
-"\"<literal>no</literal>\" on the other hand will not configure anything and "
-"totally rely on dpkg for configuration (which will at the moment fail if a "
-"Pre-Depends is encountered).  Setting this option to another than the all "
-"value will implicitly activate also the next option per default as otherwise "
-"the system could end in an unconfigured status which could be unbootable!"
+"and \"<literal>no</literal>\".  The default value is \"<literal>all</literal>"
+"\", which causes APT to configure all packages. The \"<literal>smart</"
+"literal>\" way is to configure only packages which need to be configured "
+"before another package can be unpacked (Pre-Depends), and let the rest be "
+"configured by &dpkg; with a call generated by the ConfigurePending option "
+"(see below). On the other hand, \"<literal>no</literal>\" will not configure "
+"anything, and totally relies on &dpkg; for configuration (which at the "
+"moment will fail if a Pre-Depends is encountered). Setting this option to "
+"any value other than <literal>all</literal> will implicitly also activate "
+"the next option by default, as otherwise the system could end in an "
+"unconfigured and potentially unbootable state."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:687
+#: apt.conf.5.xml:744
 msgid ""
-"If this option is set apt will call <command>dpkg --configure --pending</"
-"command> to let dpkg handle all required configurations and triggers. This "
-"option is activated automatic per default if the previous option is not set "
-"to <literal>all</literal>, but deactivating could be useful if you want to "
-"run APT multiple times in a row - e.g. in an installer. In these sceneries "
-"you could deactivate this option in all but the last run."
+"If this option is set APT will call <command>dpkg --configure --pending</"
+"command> to let &dpkg; handle all required configurations and triggers. This "
+"option is activated automatically per default if the previous option is not "
+"set to <literal>all</literal>, but deactivating it could be useful if you "
+"want to run APT multiple times in a row - e.g. in an installer. In these "
+"sceneries you could deactivate this option in all but the last run."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:694
+#: apt.conf.5.xml:751
 msgid ""
-"Useful for <literal>smart</literal> configuration as a package which has "
-"pending triggers is not considered as <literal>installed</literal> and dpkg "
-"treats them as <literal>unpacked</literal> currently which is a dealbreaker "
-"for Pre-Dependencies (see debbugs #526774). Note that this will process all "
-"triggers, not only the triggers needed to configure this package."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:700
-msgid ""
-"As the configuration can be deferred to be done at the end by dpkg it can be "
-"tried to order the unpack series only by critical needs, e.g. by Pre-"
-"Depends. Default is true and therefore the \"old\" method of ordering in "
-"various steps by everything. While both method were present in earlier APT "
-"versions the <literal>OrderCritical</literal> method was unused, so this "
-"method is very experimental and needs further improvements before becoming "
-"really useful."
+"Useful for the <literal>smart</literal> configuration as a package which has "
+"pending triggers is not considered as <literal>installed</literal>, and "
+"&dpkg; treats them as <literal>unpacked</literal> currently which is a "
+"showstopper for Pre-Dependencies (see debbugs #526774). Note that this will "
+"process all triggers, not only the triggers needed to configure this package."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:715
+#: apt.conf.5.xml:764
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
@@ -3269,40 +3276,40 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:708
+#: apt.conf.5.xml:757
 msgid ""
-"Essential packages (and there dependencies) should be configured immediately "
-"after unpacking. It will be a good idea to do this quite early in the "
-"upgrade process as these these configure calls require currently also "
-"<literal>DPkg::TriggersPending</literal> which will run quite a few triggers "
-"(which maybe not needed). Essentials get per default a high score but the "
-"immediate flag is relatively low (a package which has a Pre-Depends is "
-"higher rated).  These option and the others in the same group can be used to "
-"change the scoring. The following example shows the settings with there "
-"default values.  <placeholder type=\"literallayout\" id=\"0\"/>"
+"Essential packages (and their dependencies) should be configured immediately "
+"after unpacking. It is a good idea to do this quite early in the upgrade "
+"process as these configure calls also currently require <literal>DPkg::"
+"TriggersPending</literal> which will run quite a few triggers (which may not "
+"be needed). Essentials get per default a high score but the immediate flag "
+"is relatively low (a package which has a Pre-Depends is rated higher).  "
+"These option and the others in the same group can be used to change the "
+"scoring. The following example shows the settings with their default "
+"values.  <placeholder type=\"literallayout\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:728
+#: apt.conf.5.xml:777
 msgid "Periodic and Archives options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:729
+#: apt.conf.5.xml:778
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
-"of options configure behavior of apt periodic updates, which is done by "
-"<literal>/etc/cron.daily/apt</literal> script. See header of this script for "
-"the brief documentation of these options."
+"of options configure behavior of apt periodic updates, which is done by the "
+"<literal>/etc/cron.daily/apt</literal> script. See the top of this script "
+"for the brief documentation of these options."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:737
+#: apt.conf.5.xml:786
 msgid "Debug options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:739
+#: apt.conf.5.xml:788
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -3313,7 +3320,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:750
+#: apt.conf.5.xml:799
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -3321,7 +3328,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:758
+#: apt.conf.5.xml:807
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s install</"
@@ -3329,7 +3336,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:767
+#: apt.conf.5.xml:816
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
@@ -3339,66 +3346,66 @@ msgstr ""
 #. 	   motivating example, except I haven't a clue why you'd want
 #. 	   to do this. 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:775
+#: apt.conf.5.xml:824
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
 "in CD-ROM IDs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:785
+#: apt.conf.5.xml:834
 msgid "A full list of debugging options to apt follows."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:794
+#: apt.conf.5.xml:843
 msgid ""
 "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:805
+#: apt.conf.5.xml:854
 msgid "Print information related to downloading packages using FTP."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:816
+#: apt.conf.5.xml:865
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:827
+#: apt.conf.5.xml:876
 msgid "Print information related to downloading packages using HTTPS."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:838
+#: apt.conf.5.xml:887
 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:849
+#: apt.conf.5.xml:898
 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:859
+#: apt.conf.5.xml:908
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:869
+#: apt.conf.5.xml:918
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:879
+#: apt.conf.5.xml:928
 msgid ""
 "Do not include information from <literal>statfs</literal>, namely the number "
 "of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@ -3406,53 +3413,53 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:890
+#: apt.conf.5.xml:939
 msgid ""
 "Disable all file locking.  For instance, this will allow two instances of "
 "<quote><literal>apt-get update</literal></quote> to run at the same time."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:902
+#: apt.conf.5.xml:951
 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:912
+#: apt.conf.5.xml:961
 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:922
+#: apt.conf.5.xml:971
 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:934
+#: apt.conf.5.xml:983
 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:945
+#: apt.conf.5.xml:994
 msgid ""
 "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:956
+#: apt.conf.5.xml:1005
 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:966
+#: apt.conf.5.xml:1015
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
@@ -3462,68 +3469,64 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:980
+#: apt.conf.5.xml:1029
 msgid ""
-"Generate debug messages describing which package is marked as keep/install/"
+"Generate debug messages describing which packages are marked as keep/install/"
 "remove while the ProblemResolver does his work.  Each addition or deletion "
-"may trigger additional actions; they are shown indented two additional space "
-"under the original entry.  The format for each line is <literal>MarkKeep</"
-"literal>, <literal>MarkDelete</literal> or <literal>MarkInstall</literal> "
-"followed by <literal>package-name &lt;a.b.c -&gt; d.e.f | x.y.z&gt; (section)"
-"</literal> where <literal>a.b.c</literal> is the current version of the "
-"package, <literal>d.e.f</literal> is the version considered for installation "
-"and <literal>x.y.z</literal> is a newer version, but not considered for "
-"installation (because of a low pin score). The later two can be omitted if "
-"there is none or if it is the same version as the installed.  "
-"<literal>section</literal> is the name of the section the package appears in."
+"may trigger additional actions; they are shown indented two additional "
+"spaces under the original entry.  The format for each line is "
+"<literal>MarkKeep</literal>, <literal>MarkDelete</literal> or "
+"<literal>MarkInstall</literal> followed by <literal>package-name &lt;a.b.c -"
+"&gt; d.e.f | x.y.z&gt; (section)</literal> where <literal>a.b.c</literal> is "
+"the current version of the package, <literal>d.e.f</literal> is the version "
+"considered for installation and <literal>x.y.z</literal> is a newer version, "
+"but not considered for installation (because of a low pin score). The later "
+"two can be omitted if there is none or if it is the same as the installed "
+"version.  <literal>section</literal> is the name of the section the package "
+"appears in."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1002
-msgid "Dump the default configuration to standard error on startup."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1012
+#: apt.conf.5.xml:1050
 msgid ""
 "When invoking &dpkg;, output the precise command line with which it is being "
 "invoked, with arguments separated by a single space character."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1023
+#: apt.conf.5.xml:1061
 msgid ""
 "Output all the data received from &dpkg; on the status file descriptor and "
 "any errors encountered while parsing it."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1034
+#: apt.conf.5.xml:1072
 msgid ""
 "Generate a trace of the algorithm that decides the order in which "
 "<literal>apt</literal> should pass packages to &dpkg;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1046
+#: apt.conf.5.xml:1084
 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1057
+#: apt.conf.5.xml:1095
 msgid "Output the priority of each package list on startup."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1067
+#: apt.conf.5.xml:1105
 msgid ""
 "Trace the execution of the dependency resolver (this applies only to what "
 "happens when a complex dependency problem is encountered)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1078
+#: apt.conf.5.xml:1116
 msgid ""
 "Display a list of all installed packages with their calculated score used by "
 "the pkgProblemResolver. The description of the package is the same as "
@@ -3531,21 +3534,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1090
+#: apt.conf.5.xml:1128
 msgid ""
 "Print information about the vendors read from <filename>/etc/apt/vendors."
 "list</filename>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1112 apt_preferences.5.xml:545 sources.list.5.xml:211
+#: apt.conf.5.xml:1150 apt_preferences.5.xml:545 sources.list.5.xml:211
 #: apt-ftparchive.1.xml:596
 #, fuzzy
 msgid "Examples"
 msgstr "Exemplos"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1113
+#: apt.conf.5.xml:1151
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
@@ -3553,7 +3556,7 @@ msgstr ""
 
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1125
+#: apt.conf.5.xml:1163
 #, fuzzy
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
@@ -3639,7 +3642,7 @@ msgid ""
 "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, unless that file matches a pattern in the "
-"<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this "
+"<literal>Dir::Ignore-Files-Silently</literal> configuration list - in which "
 "case it will be silently ignored."
 msgstr ""
 
@@ -4966,25 +4969,24 @@ msgid "Package resource list for APT"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:37
+#: sources.list.5.xml:38
 msgid ""
-"The package resource list is used to locate archives of the package "
-"distribution system in use on the system. At this time, this manual page "
-"documents only the packaging system used by the Debian system.  This control "
-"file is <filename>/etc/apt/sources.list</filename>."
+"The source list <filename>/etc/apt/sources.list</filename> is designed to "
+"support any number of active sources and a variety of source media. The file "
+"lists one source per line, with the most preferred source listed first. The "
+"information available from the configured sources is acquired by "
+"<command>apt-get update</command> (or by an equivalent command from another "
+"APT front-end)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:42
+#: sources.list.5.xml:45
 msgid ""
-"The source list is designed to support any number of active sources and a "
-"variety of source media. The file lists one source per line, with the most "
-"preferred source listed first. The format of each line is: <literal>type uri "
-"args</literal> The first item, <literal>type</literal> determines the format "
-"for <literal>args</literal>. <literal>uri</literal> is a Universal Resource "
-"Identifier (URI), which is a superset of the more specific and well-known "
-"Universal Resource Locator, or URL. The rest of the line can be marked as a "
-"comment by using a #."
+"Each line specifying a source starts with type (e.g. <literal>deb-src</"
+"literal>)  followed by options and arguments for this type.  Individual "
+"entries cannot be continued onto a following line. Empty lines are ignored, "
+"and a <literal>#</literal> character anywhere on a line marks the remainder "
+"of that line as a comment."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
@@ -5002,7 +5004,7 @@ msgid ""
 "digits (0-9), underscore (_), hyphen (-) and period (.) characters.  "
 "Otherwise APT will print a notice that it has ignored a file, unless that "
 "file matches a pattern in the <literal>Dir::Ignore-Files-Silently</literal> "
-"configuration list - in this case it will be silently ignored."
+"configuration list - in which case it will be silently ignored."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
@@ -5013,16 +5015,16 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:66
 msgid ""
-"The <literal>deb</literal> type describes a typical two-level Debian "
-"archive, <filename>distribution/component</filename>. Typically, "
-"<literal>distribution</literal> is generally an archivename like "
+"The <literal>deb</literal> type references a typical two-level Debian "
+"archive, <filename>distribution/component</filename>. The "
+"<literal>distribution</literal> is generally an archive name like "
 "<literal>stable</literal> or <literal>testing</literal> or a codename like "
 "<literal>&stable-codename;</literal> or <literal>&testing-codename;</"
-"literal> while component is one of <literal>main</literal> <literal>contrib</"
-"literal> or <literal>non-free</literal>. The <literal>deb-src</literal> type "
-"describes a debian distribution's source code in the same form as the "
-"<literal>deb</literal> type.  A <literal>deb-src</literal> line is required "
-"to fetch source indexes."
+"literal> while component is one of <literal>main</literal>, "
+"<literal>contrib</literal> or <literal>non-free</literal>. The <literal>deb-"
+"src</literal> type references a Debian distribution's source code in the "
+"same form as the <literal>deb</literal> type.  A <literal>deb-src</literal> "
+"line is required to fetch source indexes."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -5045,21 +5047,22 @@ msgid ""
 "Debian distribution, from which APT will find the information it needs.  "
 "<literal>distribution</literal> can specify an exact path, in which case the "
 "components must be omitted and <literal>distribution</literal> must end with "
-"a slash (/). This is useful for when the case only a particular sub-section "
-"of the archive denoted by the URI is of interest.  If <literal>distribution</"
-"literal> does not specify an exact path, at least one <literal>component</"
-"literal> must be present."
+"a slash (<literal>/</literal>). This is useful for the case when only a "
+"particular sub-section of the archive denoted by the URI is of interest.  If "
+"<literal>distribution</literal> does not specify an exact path, at least one "
+"<literal>component</literal> must be present."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:92
 msgid ""
 "<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)"
-"</literal> which expands to the Debian architecture (i386, m68k, "
-"powerpc, ...)  used on the system. This permits architecture-independent "
-"<filename>sources.list</filename> files to be used. In general this is only "
-"of interest when specifying an exact path, <literal>APT</literal> will "
-"automatically generate a URI with the current architecture otherwise."
+"</literal> which expands to the Debian architecture (such as <literal>amd64</"
+"literal> or <literal>armel</literal>) used on the system. This permits "
+"architecture-independent <filename>sources.list</filename> files to be used. "
+"In general this is only of interest when specifying an exact path, "
+"<literal>APT</literal> will automatically generate a URI with the current "
+"architecture otherwise."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -5080,12 +5083,12 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:112
 msgid ""
-"<literal>options</literal> is always optional and needs to be surounded by "
+"<literal>options</literal> is always optional and needs to be surrounded 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:"
+"following settings are supported by APT (note however that unsupported "
+"settings will be ignored silently):"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
@@ -5093,7 +5096,7 @@ msgstr ""
 msgid ""
 "<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 "
+"information should be downloaded. If this option is not set all "
 "architectures defined by the <literal>APT::Architectures</literal> option "
 "will be downloaded."
 msgstr ""
@@ -5174,29 +5177,30 @@ msgstr ""
 msgid ""
 "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
 "is highly configurable; for more information see the &apt-conf; manual page. "
-"Please note that a ftp proxy can be specified by using the <envar>ftp_proxy</"
-"envar> environment variable. It is possible to specify a http proxy (http "
-"proxy servers often understand ftp urls)  using this method and ONLY this "
-"method. ftp proxies using http specified in the configuration file will be "
+"Please note that an FTP proxy can be specified by using the "
+"<envar>ftp_proxy</envar> environment variable. It is possible to specify an "
+"HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
+"environment variable and <emphasis>ONLY</emphasis> this environment "
+"variable. Proxies using HTTP specified in the configuration file will be "
 "ignored."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:183
+#: sources.list.5.xml:184
 msgid ""
 "The copy scheme is identical to the file scheme except that packages are "
 "copied into the cache directory instead of used directly at their location.  "
-"This is useful for people using a zip disk to copy files around with APT."
+"This is useful for people using removable media to copy files around with "
+"APT."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:190
+#: sources.list.5.xml:191
 msgid ""
-"The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given "
-"user and access the files. It is a good idea to do prior arrangements with "
-"RSA keys or rhosts.  Access to files on the remote uses standard "
-"<command>find</command> and <command>dd</command> commands to perform the "
-"file transfers from the remote."
+"The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
+"the files as a given user. Prior configuration of rhosts or RSA keys is "
+"recommended. The standard <command>find</command> and <command>dd</command> "
+"commands are used to perform the file transfers from the remote host."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
@@ -5207,12 +5211,12 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml:200
 msgid ""
-"APT can be extended with more methods shipped in other optional packages "
-"which should follow the nameing scheme <package>apt-transport-"
-"<replaceable>method</replaceable></package>.  The APT team e.g. maintains "
-"also the <package>apt-transport-https</package> package which provides "
-"access methods for https-URIs with features similar to the http method, but "
-"other methods for using e.g. debtorrent are also available, see &apt-"
+"APT can be extended with more methods shipped in other optional packages, "
+"which should follow the naming scheme <package>apt-transport-"
+"<replaceable>method</replaceable></package>.  For instance, the APT team "
+"also maintains the package <package>apt-transport-https</package>, which "
+"provides access methods for HTTPS URIs with features similar to the http "
+"method.  Methods for using e.g. debtorrent are also available - see &apt-"
 "transport-debtorrent;."
 msgstr ""
 
@@ -5400,7 +5404,8 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-sortpkgs.1.xml:45
-msgid "All output is sent to stdout, the input must be a seekable file."
+msgid ""
+"All output is sent to standard output; the input must be a seekable file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>