add myself to Uploaders

[apt.git] / doc / po / apt-doc.pot

diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index d6c1b4e80b99cc5ca810d342b3adfac5f4e675f3..09954b4429655030e3b97547da577222c3332081 100644 (file)
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -5,9 +5,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
 #, fuzzy
 msgid ""
 msgstr ""

-"Project-Id-Version: apt-doc 1.1~exp14\n"
+"Project-Id-Version: apt-doc 1.3~exp3\n"

 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"

-"POT-Creation-Date: 2015-10-27 10:30+0100\n"
+"POT-Creation-Date: 2016-06-22 14:50+0200\n"

 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"


@@ -582,7 +582,7 @@ msgstr ""
 #: apt.8.xml:1
 msgid ""
 "Performs the requested action on one or more packages specified via &regex;, "
 #: apt.8.xml:1
 msgid ""
 "Performs the requested action on one or more packages specified via &regex;, "

-"&glob; or exact match. The requested action can be overidden for specific "
+"&glob; or exact match. The requested action can be overridden for specific "

 "packages by append a plus (+) to the package name to install this package or "
 "a minus (-) to remove it."
 msgstr ""
 "packages by append a plus (+) to the package name to install this package or "
 "a minus (-) to remove it."
 msgstr ""


@@ -594,9 +594,9 @@ msgid ""
 "following the package name with an equals (=) and the version of the package "
 "to select. Alternatively the version from a specific release can be selected "
 "by following the package name with a forward slash (/) and codename "
 "following the package name with an equals (=) and the version of the package "
 "to select. Alternatively the version from a specific release can be selected "
 "by following the package name with a forward slash (/) and codename "

-"(&stable-codename;, &testing-codename;, sid …) or suite name (stable, "
-"testing, unstable). This will also select versions from this release for "
-"dependencies of this package if needed to satisfy the request."
+"(&debian-stable-codename;, &debian-testing-codename;, sid …) or suite name "
+"(stable, testing, unstable). This will also select versions from this "
+"release for dependencies of this package if needed to satisfy the request."

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>


@@ -604,11 +604,11 @@ msgstr ""
 msgid ""
 "Removing a package removes all packaged data, but leaves usually small "
 "(modified) user configuration files behind, in case the remove was an "
 msgid ""
 "Removing a package removes all packaged data, but leaves usually small "
 "(modified) user configuration files behind, in case the remove was an "

-"accident. Just issuing an installtion request for the accidentally removed "
-"package will restore it funcation as before in that case. On the other hand "
-"you can get right of these leftovers via calling <command>purge</command> "
-"even on already removed packages.  Note that this does not effect any data "
-"or configuration stored in your home directory."
+"accident. Just issuing an installation request for the accidentally removed "
+"package will restore its function as before in that case. On the other hand "
+"you can get rid of these leftovers by calling <command>purge</command> even "
+"on already removed packages. Note that this does not affect any data or "
+"configuration stored in your home directory."

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>


@@ -623,11 +623,11 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml:1
 msgid ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml:1
 msgid ""

-"Try to ensure that the list does not include applications you have grown to "
-"like even through they there once installed just as a dependency of another "
+"You should check that the list does not include applications you have grown "
+"to like even though they were once installed just as a dependency of another "

 "package. You can mark such a package as manually installed by using "
 "&apt-mark;. Packages which you have installed explicitly via "
 "package. You can mark such a package as manually installed by using "
 "&apt-mark;. Packages which you have installed explicitly via "

-"<command>install</command> are never proposed for automatic removal as well."
+"<command>install</command> are also never proposed for automatic removal."

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>


@@ -639,7 +639,7 @@ msgstr ""
 #: apt.8.xml:1
 msgid ""
 "<option>search</option> can be used to search for the given &regex; term(s) "
 #: apt.8.xml:1
 msgid ""
 "<option>search</option> can be used to search for the given &regex; term(s) "

-"in the list of the available packages and display matches.  This can e.g. be "
+"in the list of available packages and display matches.  This can e.g. be "

 "useful if you are looking for packages having a specific feature.  If you "
 "are looking for a package including a specific file try &apt-file;."
 msgstr ""
 "useful if you are looking for packages having a specific feature.  If you "
 "are looking for a package including a specific file try &apt-file;."
 msgstr ""


@@ -649,7 +649,7 @@ msgstr ""
 msgid ""
 "Show information about the given package(s) including its dependencies, "
 "installation and download size, sources the package is available from, the "
 msgid ""
 "Show information about the given package(s) including its dependencies, "
 "installation and download size, sources the package is available from, the "

-"description of the packages content and many more. It can e.g. be helpful to "
+"description of the packages content and much more. It can e.g. be helpful to "

 "look at this information before allowing &apt; to remove a package or while "
 "searching for new packages to install."
 msgstr ""
 "look at this information before allowing &apt; to remove a package or while "
 "searching for new packages to install."
 msgstr ""


@@ -679,15 +679,15 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.8.xml:1
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.8.xml:1

-msgid "Script usage and Differences to other APT tools"
+msgid "Script Usage and Differences from Other APT Tools"

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml:1
 msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml:1
 msgid ""

-"The &apt; commandline is designed as a end-user tool and it may change "
-"behaviour between versions. While it tries to not break backward "
-"compatibility there is no guarantee for it either if it seems benefitial for "
+"The &apt; commandline is designed as an end-user tool and it may change "
+"behavior between versions. While it tries not to break backward "
+"compatibility this is not guaranteed either if a change seems beneficial for "

 "interactive use."
 msgstr ""
 
 "interactive use."
 msgstr ""
 


@@ -696,9 +696,10 @@ msgstr ""
 msgid ""
 "All features of &apt; are available in dedicated APT tools like &apt-get; "
 "and &apt-cache; as well.  &apt; just changes the default value of some "
 msgid ""
 "All features of &apt; are available in dedicated APT tools like &apt-get; "
 "and &apt-cache; as well.  &apt; just changes the default value of some "

-"options (see &apt-conf; and specifically the Binary scope). So prefer using "
-"these commands (potentially with some additional options enabled) in your "
-"scripts as they keep backward compatibility as much as possible."
+"options (see &apt-conf; and specifically the Binary scope). So you should "
+"prefer using these commands (potentially with some additional options "
+"enabled) in your scripts as they keep backward compatibility as much as "
+"possible."

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>


@@ -1026,8 +1027,8 @@ msgid ""
 "with APT to get information as well as filenames for downloaded files so "
 "they can use them as well instead of downloading them again on their "
 "own. Detailed documentation is omitted here and can instead be found in the "
 "with APT to get information as well as filenames for downloaded files so "
 "they can use them as well instead of downloading them again on their "
 "own. Detailed documentation is omitted here and can instead be found in the "

-"source tree in "
-"<literal><filename>doc/acquire-additional-files.txt</filename></literal>."
+"file &apt-acquire-additional-files; shipped by the "
+"<package>apt-doc</package> package."

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>


@@ -1150,8 +1151,8 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:1
 msgid ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:1
 msgid ""

-"Show upgraded packages; print out a list of all packages that are to be "
-"upgraded.  Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
+"Do not show a list of all packages that are to be upgraded.  Configuration "
+"Item: <literal>APT::Get::Show-Upgraded</literal>."

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>


@@ -1397,8 +1398,9 @@ msgstr ""
 #: apt-get.8.xml:1
 msgid ""
 "Forbid the update command to acquire unverifiable data from configured "
 #: apt-get.8.xml:1
 msgid ""
 "Forbid the update command to acquire unverifiable data from configured "

-"sources. Apt will fail at the update command for repositories without valid "
-"cryptographically signatures.  Configuration Item: "
+"sources. APT will fail at the update command for repositories without valid "
+"cryptographically signatures. See also &apt-secure; for details on the "
+"concept and the implications.  Configuration Item: "

 "<literal>Acquire::AllowInsecureRepositories</literal>."
 msgstr ""
 
 "<literal>Acquire::AllowInsecureRepositories</literal>."
 msgstr ""
 


@@ -1796,11 +1798,10 @@ msgstr ""
 msgid ""
 "Per default <command>depends</command> and <command>rdepends</command> print "
 "only dependencies explicitly expressed in the metadata. With this flag it "
 msgid ""
 "Per default <command>depends</command> and <command>rdepends</command> print "
 "only dependencies explicitly expressed in the metadata. With this flag it "

-"will also show dependencies implicitely added based on the encountered "
-"data.  A <literal>Conflicts: foo</literal> e.g. expresses implicitely that "
-"this package also conflicts with the package foo from any other "
-"architecture.  Configuration Item: "
-"<literal>APT::Cache::ShowImplicit</literal>."
+"will also show dependencies implicitly added based on the encountered data.  "
+"A <literal>Conflicts: foo</literal> e.g. expresses implicitly that this "
+"package also conflicts with the package foo from any other architecture.  "
+"Configuration Item: <literal>APT::Cache::ShowImplicit</literal>."

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>


@@ -2028,8 +2029,8 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-mark.8.xml:1
 msgid ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-mark.8.xml:1
 msgid ""

-"<command>apt-mark</command> can be used as a unified frontend to set various "
-"settings for a package like marking a package as being "
+"<command>apt-mark</command> can be used as a unified front-end to set "
+"various settings for a package, such as marking a package as being "

 "automatically/manually installed or changing <command>dpkg</command> "
 "selections such as hold, install, deinstall and purge which are respected "
 "e.g. by <command>apt-get dselect-upgrade</command> or "
 "automatically/manually installed or changing <command>dpkg</command> "
 "selections such as hold, install, deinstall and purge which are respected "
 "e.g. by <command>apt-get dselect-upgrade</command> or "


@@ -2038,7 +2039,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-mark.8.xml:1
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-mark.8.xml:1

-msgid "Automatically and manually installed packages"
+msgid "Automatically and Manually Installed Packages"

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>


@@ -2046,8 +2047,8 @@ msgstr ""
 msgid ""
 "When you request that a package is installed, and as a result other packages "
 "are installed to satisfy its dependencies, the dependencies are marked as "
 msgid ""
 "When you request that a package is installed, and as a result other packages "
 "are installed to satisfy its dependencies, the dependencies are marked as "

-"being automatically installed, while package you installed explicitely is "
-"marked as manually installed.  Once a automatically installed package is no "
+"being automatically installed, while the package you installed explicitly is "
+"marked as manually installed.  Once an automatically installed package is no "

 "longer depended on by any manually installed package it is considered no "
 "longer needed and e.g. <command>apt-get</command> or "
 "<command>aptitude</command> will at least suggest removing them."
 "longer depended on by any manually installed package it is considered no "
 "longer needed and e.g. <command>apt-get</command> or "
 "<command>aptitude</command> will at least suggest removing them."


@@ -2097,7 +2098,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-mark.8.xml:1
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-mark.8.xml:1

-msgid "Prevent changes for a package"
+msgid "Prevent Changes for a Package"

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>


@@ -2123,15 +2124,15 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-mark.8.xml:1
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-mark.8.xml:1

-msgid "Shedule packages for install, remove and purge"
+msgid "Schedule Packages for Install, Remove and Purge"

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-mark.8.xml:1
 msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-mark.8.xml:1
 msgid ""

-"Some frontends like <command>apt-get dselect-upgrade</command> can be used "
-"to apply previously sheduled changes to the install state of packages. Such "
-"changes can be sheduled with the <option>install</option>, "
+"Some front-ends like <command>apt-get dselect-upgrade</command> can be used "
+"to apply previously scheduled changes to the install state of packages. Such "
+"changes can be scheduled with the <option>install</option>, "

 "<option>remove</option> (also known as <option>deinstall</option>) and "
 "<option>purge</option> commands.  Packages with a specific selection can be "
 "displayed with <option>showinstall</option>, <option>showremove</option> and "
 "<option>remove</option> (also known as <option>deinstall</option>) and "
 "<option>purge</option> commands.  Packages with a specific selection can be "
 "displayed with <option>showinstall</option>, <option>showremove</option> and "


@@ -2157,40 +2158,72 @@ msgid ""
 "Starting with version 0.6, <command>APT</command> contains code that does "
 "signature checking of the Release file for all repositories. This ensures "
 "that data like packages in the archive can't be modified by people who have "
 "Starting with version 0.6, <command>APT</command> contains code that does "
 "signature checking of the Release file for all repositories. This ensures "
 "that data like packages in the archive can't be modified by people who have "

-"no access to the Release file signing key."
+"no access to the Release file signing key. Starting with version 1.1 "
+"<command>APT</command> requires repositories to provide recent "
+"authentication information for unimpeded usage of the repository."

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml:1
 msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml:1
 msgid ""

-"If an archive doesn't have a signed Release file or no Release file at all "
-"current APT versions will raise a warning in <command>update</command> "
-"operations and frontends like <command>apt-get</command> will require "
-"explicit confirmation if an installation request includes a package from "
-"such an unauthenticated archive."
+"If an archive has an unsigned Release file or no Release file at all current "
+"APT versions will refuse to download data from them by default in "
+"<command>update</command> operations and even if forced to download "
+"front-ends like &apt-get; will require explicit confirmation if an "
+"installation request includes a package from such an unauthenticated "
+"archive."

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml:1
 msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml:1
 msgid ""

-"In the future APT will refuse to work with unauthenticated repositories by "
-"default until support for them is removed entirely. Users have the option to "
-"opt-in to this behavior already by setting the configuration option "
-"<option>Acquire::AllowInsecureRepositories</option> to "
-"<literal>false</literal>."
+"As a temporary exception &apt-get; (not &apt;!) raises warnings only if it "
+"encounters unauthenticated archives to give a slightly longer grace period "
+"on this backward compatibility effecting change. This exception will be "
+"removed in future releases and you can opt-out of this grace period by "
+"setting the configuration option "
+"<option>Binary::apt-get::Acquire::AllowInsecureRepositories</option> to "
+"<literal>false</literal> or "
+"<option>--no-allow-insecure-repositories</option> on the command line."

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml:1
 msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml:1
 msgid ""

-"Note: All APT-based package management frontends like &apt-get;, &aptitude; "
+"You can force all APT clients to raise only warnings by setting the "
+"configuration option <option>Acquire::AllowInsecureRepositories</option> to "
+"<literal>true</literal>. Individual repositories can also be allowed to be "
+"insecure via the &sources-list; option "
+"<literal>allow-insecure=yes</literal>.  Note that insecure repositories are "
+"strongly discouraged and all options to force apt to continue supporting "
+"them will eventually be removed.  Users also have the "
+"<option>Trusted</option> option available to disable even the warnings, but "
+"be sure to understand the implications as detailed in &sources-list;."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-secure.8.xml:1
+msgid ""
+"A repository which previously was authentication but would loose this state "
+"in an <command>update</command> operation raises an error in all APT clients "
+"irrespective of the option to allow or forbid usage of insecure "
+"repositories.  The error can be overcome by additionally setting "
+"<option>Acquire::AllowDowngradeToInsecureRepositories</option> to "
+"<literal>true</literal> or for Individual repositories with the "
+"&sources-list; option <literal>allow-downgrade-to-insecure=yes</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-secure.8.xml:1
+msgid ""
+"Note: All APT-based package management front-ends like &apt-get;, &aptitude; "

 "and &synaptic; support this authentication feature, so this manpage uses "
 "<literal>APT</literal> to refer to them all for simplicity only."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-secure.8.xml:1
 "and &synaptic; support this authentication feature, so this manpage uses "
 "<literal>APT</literal> to refer to them all for simplicity only."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-secure.8.xml:1

-msgid "Trusted repositories"
+msgid "Trusted Repositories"

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>


@@ -2216,10 +2249,10 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml:1
 msgid ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml:1
 msgid ""

-"The chain of trust in Debian e.g. starts when a maintainer uploads a new "
+"The chain of trust in Debian starts (e.g.) when a maintainer uploads a new "

 "package or a new version of a package to the Debian archive. In order to "
 "become effective, this upload needs to be signed by a key contained in one "
 "package or a new version of a package to the Debian archive. In order to "
 "become effective, this upload needs to be signed by a key contained in one "

-"of the Debian package maintainers keyrings (available in the debian-keyring "
+"of the Debian package maintainer keyrings (available in the debian-keyring "

 "package). Maintainers' keys are signed by other maintainers following "
 "pre-established procedures to ensure the identity of the key holder. Similar "
 "procedures exist in all Debian-based distributions."
 "package). Maintainers' keys are signed by other maintainers following "
 "pre-established procedures to ensure the identity of the key holder. Similar "
 "procedures exist in all Debian-based distributions."


@@ -2283,7 +2316,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-secure.8.xml:1
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-secure.8.xml:1

-msgid "User configuration"
+msgid "User Configuration"

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>


@@ -2298,7 +2331,7 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml:1
 msgid ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml:1
 msgid ""

-"Note that a default installation already contains all keys to securily "
+"Note that a default installation already contains all keys to securely "

 "acquire packages from the default repositories, so fiddling with "
 "<command>apt-key</command> is only needed if third-party repositories are "
 "added."
 "acquire packages from the default repositories, so fiddling with "
 "<command>apt-key</command> is only needed if third-party repositories are "
 "added."


@@ -2317,7 +2350,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-secure.8.xml:1
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-secure.8.xml:1

-msgid "Archive configuration"
+msgid "Archive Configuration"

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>


@@ -2346,7 +2379,7 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #: apt-secure.8.xml:1
 msgid ""
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #: apt-secure.8.xml:1
 msgid ""

-"<emphasis>Publish the key fingerprint</emphasis>, that way your users will "
+"<emphasis>Publish the key fingerprint</emphasis>, so that your users will "

 "know what key they need to import in order to authenticate the files in the "
 "archive. It is best to ship your key in its own keyring package like "
 "&keyring-distro; does with &keyring-package; to be able to distribute "
 "know what key they need to import in order to authenticate the files in the "
 "archive. It is best to ship your key in its own keyring package like "
 "&keyring-distro; does with &keyring-package; to be able to distribute "


@@ -2357,11 +2390,11 @@ msgstr ""
 #: apt-secure.8.xml:1
 msgid ""
 "<emphasis>Provide instructions on how to add your archive and "
 #: apt-secure.8.xml:1
 msgid ""
 "<emphasis>Provide instructions on how to add your archive and "

-"key</emphasis>.  If your users can't acquire your key securily the chain of "
+"key</emphasis>.  If your users can't acquire your key securely the chain of "

 "trust described above is broken.  How you can help users add your key "
 "depends on your archive and target audience ranging from having your keyring "
 "package included in another archive users already have configured (like the "
 "trust described above is broken.  How you can help users add your key "
 "depends on your archive and target audience ranging from having your keyring "
 "package included in another archive users already have configured (like the "

-"default repositories of their distribution) to leverage the web of trust."
+"default repositories of their distribution) to leveraging the web of trust."

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>


@@ -2384,8 +2417,8 @@ msgstr ""
 msgid ""
 "For more background information you might want to review the <ulink "
 "url=\"https://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
 msgid ""
 "For more background information you might want to review the <ulink "
 "url=\"https://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "

-"Security Infrastructure</ulink> chapter of the Securing Debian Manual "
-"(available also in the harden-doc package) and the <ulink "
+"Security Infrastructure</ulink> chapter of the Securing Debian Manual (also "
+"available in the harden-doc package) and the <ulink "

 "url=\"http://www.cryptnet.net/fdp/crypto/strong_distro.html\" >Strong "
 "Distribution HOWTO</ulink> by V. Alex Brennen."
 msgstr ""
 "url=\"http://www.cryptnet.net/fdp/crypto/strong_distro.html\" >Strong "
 "Distribution HOWTO</ulink> by V. Alex Brennen."
 msgstr ""


@@ -2846,6 +2879,33 @@ msgid ""
 "--add-architecture</command>."
 msgstr ""
 
 "--add-architecture</command>."
 msgstr ""
 

+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:1
+msgid ""
+"This scope defines which compression formats are supported, how compression "
+"and decompression can be performed if support for this format isn't built "
+"into apt directly and a cost-value indicating how costly it is to compress "
+"something in this format. As an example the following configuration stanza "
+"would allow apt to download and uncompress as well as create and store files "
+"with the low-cost <literal>.reversed</literal> file extension which it will "
+"pass to the command <command>rev</command> without additional commandline "
+"parameters for compression and uncompression:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><informalexample><programlisting>
+#: apt.conf.5.xml:1
+#, no-wrap
+msgid ""
+"APT::Compressor::rev {\n"
+"\tName \"rev\";\n"
+"\tExtension \".reversed\";\n"
+"\tBinary \"rev\";\n"
+"\tCompressArg {};\n"
+"\tUncompressArg {};\n"
+"\tCost \"10\";\n"
+"};\n"
+msgstr ""
+

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1
 msgid ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1
 msgid ""


@@ -2860,8 +2920,8 @@ msgstr ""
 msgid ""
 "Default release to install packages from if more than one version is "
 "available. Contains release name, codename or release version. Examples: "
 msgid ""
 "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;."
+"'stable', 'testing', 'unstable', '&debian-stable-codename;', "
+"'&debian-testing-codename;', '4.0', '5.0*'. See also &apt-preferences;."

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>


@@ -3168,13 +3228,17 @@ msgstr ""
 #: apt.conf.5.xml:1
 msgid ""
 "<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to specify "
 #: apt.conf.5.xml:1
 msgid ""
 "<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to specify "

-"an external command to discover the http proxy to use. Apt expects the "
-"command to output the proxy on stdout in the style "
-"<literal>http://proxy:port/</literal>. This will override the generic "
-"<literal>Acquire::http::Proxy</literal> but not any specific host proxy "
-"configuration set via <literal>Acquire::http::Proxy::$HOST</literal>.  See "
-"the &squid-deb-proxy-client; package for an example implementation that uses "
-"avahi. This option takes precedence over the legacy option name "
+"an external command to discover the http proxy to use. The first and only "
+"parameter is an URI denoting the host to be contacted to allow for "
+"host-specific configuration. APT expects the command to output the proxy on "
+"stdout as a single line in the style <literal>http://proxy:port/</literal> "
+"or the word <literal>DIRECT</literal> if no proxy should be used. No output "
+"indicates that the generic proxy settings should be used.  Note that "
+"auto-detection will not be used for a host if a host-specific proxy "
+"configuration is already set via "
+"<literal>Acquire::http::Proxy::<replaceable>HOST</replaceable></literal>.  "
+"See the &squid-deb-proxy-client; package for an example implementation that "
+"uses avahi.  This option takes precedence over the legacy option name "

 "<literal>ProxyAutoDetect</literal>."
 msgstr ""
 
 "<literal>ProxyAutoDetect</literal>."
 msgstr ""
 


@@ -3304,11 +3368,12 @@ msgstr ""
 msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "
 msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "

-"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 the fly or the used method can be changed. The syntax for this "
-"is: <placeholder type=\"synopsis\" id=\"0\"/>"
+"compression formats.  By default the acquire methods can decompress and "
+"recompress many common formats like <command>xz</command> and "
+"<command>gzip</command>; with this scope the supported formats can be "
+"queried, modified as well as support for more formats added (see also "
+"<option>APT::Compressor</option>). The syntax for this is: <placeholder "
+"type=\"synopsis\" id=\"0\"/>"

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>


@@ -3320,7 +3385,7 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
 #: apt.conf.5.xml:1
 #, no-wrap
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
 #: apt.conf.5.xml:1
 #, no-wrap

-msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
+msgid "Acquire::CompressionTypes::Order { \"xz\"; \"gz\"; };"

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>


@@ -3330,15 +3395,14 @@ msgid ""
 "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 "
 "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 - 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: "
-"<placeholder type=\"synopsis\" id=\"1\"/> It is not needed to add "
-"<literal>bz2</literal> to the list explicitly as it will be added "
-"automatically."
+"preferred type first - 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 all "
+"other compression formats.  If <command>xz</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> to the list explicitly as it "
+"will be added automatically."

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>


@@ -3352,15 +3416,15 @@ msgstr ""
 msgid ""
 "Note that the "
 "<literal>Dir::Bin::<replaceable>Methodname</replaceable></literal> will be "
 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."
+"checked at run time. If this option has been set and support for this format "
+"isn't directly built into apt, 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><variablelist><varlistentry><listitem><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>


@@ -3458,21 +3522,30 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1
 msgid ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1
 msgid ""

-"Allow the update operation to load data files from a repository without a "
-"trusted signature. If enabled this option no data files will be loaded and "
-"the update operation fails with a error for this source. The default is "
-"false for backward compatibility. This will be changed in the future."
+"Allow update operations to load data files from repositories without "
+"sufficient security information.  The default value is "
+"\"<literal>false</literal>\".  Concept, implications as well as alternatives "
+"are detailed in &apt-secure;."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:1
+msgid ""
+"Allow update operations to load data files from repositories which provide "
+"security information, but these are deemed no longer cryptographically "
+"strong enough.  The default value is \"<literal>false</literal>\".  Concept, "
+"implications as well as alternatives are detailed in &apt-secure;."

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1
 msgid ""
 "Allow that a repository that was previously gpg signed to become unsigned "
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1
 msgid ""
 "Allow that a repository that was previously gpg signed to become unsigned "

-"durign a update operation. When there is no valid signature of a perviously "
-"trusted repository apt will refuse the update. This option can be used to "
-"override this protection. You almost certainly never want to enable "
-"this. The default is false.  Note that apt will still consider packages from "
-"this source untrusted and warn about them if you try to install them."
+"during an update operation. When there is no valid signature for a "
+"previously trusted repository apt will refuse the update. This option can be "
+"used to override this protection. You almost certainly never want to enable "
+"this. The default is <literal>false</literal>.  Concept, implications as "
+"well as alternatives are detailed in &apt-secure;."

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>


@@ -3495,11 +3568,11 @@ msgid ""
 "<literal>Acquire::Changelogs::URI::Override::Label::<replaceable>LABEL</replaceable></literal> "
 "or "
 "<literal>Acquire::Changelogs::URI::Override::Origin::<replaceable>ORIGIN</replaceable></literal>.  "
 "<literal>Acquire::Changelogs::URI::Override::Label::<replaceable>LABEL</replaceable></literal> "
 "or "
 "<literal>Acquire::Changelogs::URI::Override::Origin::<replaceable>ORIGIN</replaceable></literal>.  "

-"The value should be a normal URI to a text file, expect that package "
+"The value should be a normal URI to a text file, except that package "

 "specific data is replaced with the placeholder "
 "specific data is replaced with the placeholder "

-"<literal>CHANGEPATH</literal>. The value for it is: 1. if the package is "
+"<literal>@CHANGEPATH@</literal>. The value for it is: 1. if the package is "

 "from a component (e.g. <literal>main</literal>)  this is the first part "
 "from a component (e.g. <literal>main</literal>)  this is the first part "

-"otherwise it is omitted, 2. the first letter of source package name, expect "
+"otherwise it is omitted, 2. the first letter of source package name, except "

 "if the source package name starts with '<literal>lib</literal>' in which "
 "case it will be the first four letters. 3. The complete source package "
 "name. 4. the complete name again and 5. the source version.  The first (if "
 "if the source package name starts with '<literal>lib</literal>' in which "
 "case it will be the first four letters. 3. The complete source package "
 "name. 4. the complete name again and 5. the source version.  The first (if "


@@ -3743,14 +3816,15 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1
 msgid ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1
 msgid ""

-"Package action lines consist of five fields in Version 2: old version, "
-"direction of version change (&lt; for upgrades, &gt; for downgrades, = for "
-"no change), new version, action. The version fields are \"-\" for no version "
-"at all (for example when installing a package for the first time; no version "
-"is treated as earlier than any real version, so that is an upgrade, "
-"indicated as <literal>- &lt; 1.23.4</literal>). The action field is "
-"\"**CONFIGURE**\" if the package is being configured, \"**REMOVE**\" if it "
-"is being removed, or the filename of a .deb file if it is being unpacked."
+"Package action lines consist of five fields in Version 2: package name "
+"(without architecture qualification even if foreign), old version, direction "
+"of version change (&lt; for upgrades, &gt; for downgrades, = for no change), "
+"new version, action. The version fields are \"-\" for no version at all (for "
+"example when installing a package for the first time; no version is treated "
+"as earlier than any real version, so that is an upgrade, indicated as "
+"<literal>- &lt; 1.23.4</literal>). The action field is \"**CONFIGURE**\" if "
+"the package is being configured, \"**REMOVE**\" if it is being removed, or "
+"the filename of a .deb file if it is being unpacked."

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>


@@ -3758,7 +3832,7 @@ msgstr ""
 msgid ""
 "In Version 3 after each version field follows the architecture of this "
 "version, which is \"-\" if there is no version, and a field showing the "
 msgid ""
 "In Version 3 after each version field follows the architecture of this "
 "version, which is \"-\" if there is no version, and a field showing the "

-"MultiArch type \"same\", foreign\", \"allowed\" or \"none\". Note that "
+"MultiArch type \"same\", \"foreign\", \"allowed\" or \"none\". Note that "

 "\"none\" is an incorrect typename which is just kept to remain compatible, "
 "it should be read as \"no\" and users are encouraged to support both."
 msgstr ""
 "\"none\" is an incorrect typename which is just kept to remain compatible, "
 "it should be read as \"no\" and users are encouraged to support both."
 msgstr ""


@@ -4552,7 +4626,7 @@ msgstr ""
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any distribution whose Codename is "
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any distribution whose Codename is "

-"\"<literal>&testing-codename;</literal>\"."
+"\"<literal>&debian-testing-codename;</literal>\"."

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>


@@ -4560,7 +4634,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "Package: *\n"
 #, no-wrap
 msgid ""
 "Package: *\n"

-"Pin: release n=&testing-codename;\n"
+"Pin: release n=&debian-testing-codename;\n"

 "Pin-Priority: 900\n"
 msgstr ""
 
 "Pin-Priority: 900\n"
 msgstr ""
 


@@ -4569,7 +4643,8 @@ msgstr ""
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any release whose Archive name is \"<literal>stable</literal>\" "
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any release whose Archive name is \"<literal>stable</literal>\" "

-"and whose release Version number is \"<literal>&stable-version;</literal>\"."
+"and whose release Version number is "
+"\"<literal>&debian-stable-version;</literal>\"."

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>


@@ -4577,7 +4652,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "Package: *\n"
 #, no-wrap
 msgid ""
 "Package: *\n"

-"Pin: release a=stable, v=&stable-version;\n"
+"Pin: release a=stable, v=&debian-stable-version;\n"

 "Pin-Priority: 500\n"
 msgstr ""
 
 "Pin-Priority: 500\n"
 msgstr ""
 


@@ -4852,11 +4927,12 @@ msgid ""
 "The <filename>Release</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
 "example, <filename>.../dists/stable/Release</filename>, or "
 "The <filename>Release</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
 "example, <filename>.../dists/stable/Release</filename>, or "

-"<filename>.../dists/&stable-codename;/Release</filename>.  It consists of a "
-"single multi-line record which applies to <emphasis>all</emphasis> of the "
-"packages in the directory tree below its parent.  Unlike the "
-"<filename>Packages</filename> file, nearly all of the lines in a "
-"<filename>Release</filename> file are relevant for setting APT priorities:"
+"<filename>.../dists/&debian-stable-codename;/Release</filename>.  It "
+"consists of a single multi-line record which applies to "
+"<emphasis>all</emphasis> of the packages in the directory tree below its "
+"parent.  Unlike the <filename>Packages</filename> file, nearly all of the "
+"lines in a <filename>Release</filename> file are relevant for setting APT "
+"priorities:"

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>


@@ -4890,25 +4966,25 @@ msgstr ""
 #: apt_preferences.5.xml:1
 msgid ""
 "names the codename to which all the packages in the directory tree belong.  "
 #: apt_preferences.5.xml:1
 msgid ""
 "names the codename to which all the packages in the directory tree belong.  "

-"For example, the line \"Codename: &testing-codename;\" specifies that all of "
-"the packages in the directory tree below the parent of the "
+"For example, the line \"Codename: &debian-testing-codename;\" specifies that "
+"all of the packages in the directory tree below the parent of the "

 "<filename>Release</filename> file belong to a version named "
 "<filename>Release</filename> file belong to a version named "

-"<literal>&testing-codename;</literal>.  Specifying this value in the APT "
-"preferences file would require the line:"
+"<literal>&debian-testing-codename;</literal>.  Specifying this value in the "
+"APT preferences file would require the line:"

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 #: apt_preferences.5.xml:1
 #, no-wrap
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 #: apt_preferences.5.xml:1
 #, no-wrap

-msgid "Pin: release n=&testing-codename;\n"
+msgid "Pin: release n=&debian-testing-codename;\n"

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #: apt_preferences.5.xml:1
 msgid ""
 "names the release version.  For example, the packages in the tree might "
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #: apt_preferences.5.xml:1
 msgid ""
 "names the release version.  For example, the packages in the tree might "

-"belong to Debian release version &stable-version;.  Note that there is "
-"normally no version number for the <literal>testing</literal> and "
+"belong to Debian release version &debian-stable-version;.  Note that there "
+"is normally no version number for the <literal>testing</literal> and "

 "<literal>unstable</literal> distributions because they have not been "
 "released yet.  Specifying this in the APT preferences file would require one "
 "of the following lines."
 "<literal>unstable</literal> distributions because they have not been "
 "released yet.  Specifying this in the APT preferences file would require one "
 "of the following lines."


@@ -4918,9 +4994,9 @@ msgstr ""
 #: apt_preferences.5.xml:1
 #, no-wrap
 msgid ""
 #: apt_preferences.5.xml:1
 #, no-wrap
 msgid ""

-"Pin: release v=&stable-version;\n"
-"Pin: release a=stable, v=&stable-version;\n"
-"Pin: release &stable-version;\n"
+"Pin: release v=&debian-stable-version;\n"
+"Pin: release a=stable, v=&debian-stable-version;\n"
+"Pin: release &debian-stable-version;\n"

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>


@@ -5149,9 +5225,9 @@ msgid ""
 "Explanation: Uninstall or do not install any Debian-originated package "
 "versions\n"
 "Explanation: other than those in the distribution codenamed with "
 "Explanation: Uninstall or do not install any Debian-originated package "
 "versions\n"
 "Explanation: other than those in the distribution codenamed with "

-"&testing-codename; or sid\n"
+"&debian-testing-codename; or sid\n"

 "Package: *\n"
 "Package: *\n"

-"Pin: release n=&testing-codename;\n"
+"Pin: release n=&debian-testing-codename;\n"

 "Pin-Priority: 900\n"
 "\n"
 "Explanation: Debian unstable is always codenamed with sid\n"
 "Pin-Priority: 900\n"
 "\n"
 "Explanation: Debian unstable is always codenamed with sid\n"


@@ -5184,7 +5260,7 @@ msgstr ""
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
 "the following commands will cause APT to upgrade to the latest version(s) in "
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
 "the following commands will cause APT to upgrade to the latest version(s) in "

-"the release codenamed with <literal>&testing-codename;</literal>.  "
+"the release codenamed with <literal>&debian-testing-codename;</literal>.  "

 "<placeholder type=\"programlisting\" id=\"0\"/>"
 msgstr ""
 
 "<placeholder type=\"programlisting\" id=\"0\"/>"
 msgstr ""
 


@@ -5200,8 +5276,8 @@ msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>sid</literal> distribution.  Thereafter, "
 "<command>apt-get upgrade</command> will upgrade the package to the most "
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>sid</literal> distribution.  Thereafter, "
 "<command>apt-get upgrade</command> will upgrade the package to the most "

-"recent <literal>&testing-codename;</literal> version if that is more recent "
-"than the installed version, otherwise, to the most recent "
+"recent <literal>&debian-testing-codename;</literal> version if that is more "
+"recent than the installed version, otherwise, to the most recent "

 "<literal>sid</literal> version if that is more recent than the installed "
 "version.  <placeholder type=\"programlisting\" id=\"0\"/>"
 msgstr ""
 "<literal>sid</literal> version if that is more recent than the installed "
 "version.  <placeholder type=\"programlisting\" id=\"0\"/>"
 msgstr ""


@@ -5219,10 +5295,10 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:1
 msgid ""
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:1
 msgid ""

-"The source list <filename>/etc/apt/sources.list</filename> and the the files "
+"The source list <filename>/etc/apt/sources.list</filename> and the files "

 "contained in <filename>/etc/apt/sources.list.d/</filename> are designed to "
 "support any number of active sources and a variety of source media. The "
 "contained in <filename>/etc/apt/sources.list.d/</filename> are designed to "
 "support any number of active sources and a variety of source media. The "

-"files list one source per line (one line style) or contain multiline stanzas "
+"files list one source per line (one-line style) or contain multiline stanzas "

 "defining one or more sources per stanza (deb822 style), with the most "
 "preferred source listed first (in case a single version is available from "
 "more than one source). The information available from the configured sources "
 "defining one or more sources per stanza (deb822 style), with the most "
 "preferred source listed first (in case a single version is available from "
 "more than one source). The information available from the configured sources "


@@ -5252,7 +5328,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: sources.list.5.xml:1
 
 #. type: Content of: <refentry><refsect1><title>
 #: sources.list.5.xml:1

-msgid "one line style format"
+msgid "One-Line-Style Format"

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>


@@ -5269,9 +5345,9 @@ msgid ""
 "enclosed by square brackets (<literal>[]</literal>)  included in the line "
 "after the type separated from it with a space.  If an option allows multiple "
 "values these are separated from each other with a comma "
 "enclosed by square brackets (<literal>[]</literal>)  included in the line "
 "after the type separated from it with a space.  If an option allows multiple "
 "values these are separated from each other with a comma "

-"(<literal>,</literal>). An option name is separated from its value(s) by a "
-"equal sign (<literal>=</literal>). Multivalue options have also "
-"<literal>-=</literal> and <literal>+=</literal> as separator which instead "
+"(<literal>,</literal>). An option name is separated from its value(s) by an "
+"equals sign (<literal>=</literal>). Multivalue options also have "
+"<literal>-=</literal> and <literal>+=</literal> as separators, which instead "

 "of replacing the default with the given value(s) modify the default value(s) "
 "to remove or include the given values."
 msgstr ""
 "of replacing the default with the given value(s) modify the default value(s) "
 "to remove or include the given values."
 msgstr ""


@@ -5281,14 +5357,14 @@ msgstr ""
 msgid ""
 "This is the traditional format and supported by all apt versions.  Note that "
 "not all options as described below are supported by all apt versions.  Note "
 msgid ""
 "This is the traditional format and supported by all apt versions.  Note that "
 "not all options as described below are supported by all apt versions.  Note "

-"also that some older applications parsing this format on its own might not "
+"also that some older applications parsing this format on their own might not "

 "expect to encounter options as they were uncommon before the introduction of "
 "multi-architecture support."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: sources.list.5.xml:1
 "expect to encounter options as they were uncommon before the introduction of "
 "multi-architecture support."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: sources.list.5.xml:1

-msgid "deb822 style format"
+msgid "deb822-Style Format"

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>


@@ -5296,18 +5372,18 @@ msgstr ""
 msgid ""
 "Files in this format have the extension <filename>.sources</filename>.  The "
 "format is similar in syntax to other files used by Debian and its "
 msgid ""
 "Files in this format have the extension <filename>.sources</filename>.  The "
 "format is similar in syntax to other files used by Debian and its "

-"derivatives, like the metadata itself apt will download from the configured "
-"sources or the <filename>debian/control</filename> file in a Debian source "
-"package.  Individual entries are separated by an empty line, additional "
-"empty lines are ignored, and a <literal>#</literal> character at the start "
-"of the line marks the entire line as a comment. An entry can hence be "
-"disabled by commenting out each line belonging to the stanza, but it is "
+"derivatives, such as the metadata files that apt will download from the "
+"configured sources or the <filename>debian/control</filename> file in a "
+"Debian source package.  Individual entries are separated by an empty line; "
+"additional empty lines are ignored, and a <literal>#</literal> character at "
+"the start of the line marks the entire line as a comment. An entry can hence "
+"be disabled by commenting out each line belonging to the stanza, but it is "

 "usually easier to add the field \"Enabled: no\" to the stanza to disable the "
 "entry. Removing the field or setting it to yes reenables it.  Options have "
 "the same syntax as every other field: A fieldname separated by a colon "
 "(<literal>:</literal>) and optionally spaces from its value(s).  Note "
 "especially that multiple values are separated by spaces, not by commas as in "
 "usually easier to add the field \"Enabled: no\" to the stanza to disable the "
 "entry. Removing the field or setting it to yes reenables it.  Options have "
 "the same syntax as every other field: A fieldname separated by a colon "
 "(<literal>:</literal>) and optionally spaces from its value(s).  Note "
 "especially that multiple values are separated by spaces, not by commas as in "

-"the one line format. Multivalue fields like <literal>Architectures</literal> "
+"the one-line format. Multivalue fields like <literal>Architectures</literal> "

 "also have <literal>Architectures-Add</literal> and "
 "<literal>Architectures-Remove</literal> to modify the default value rather "
 "than replacing it."
 "also have <literal>Architectures-Add</literal> and "
 "<literal>Architectures-Remove</literal> to modify the default value rather "
 "than replacing it."


@@ -5318,19 +5394,19 @@ msgstr ""
 msgid ""
 "This is a new format supported by apt itself since version 1.1. Previous "
 "versions ignore such files with a notice message as described earlier.  It "
 msgid ""
 "This is a new format supported by apt itself since version 1.1. Previous "
 "versions ignore such files with a notice message as described earlier.  It "

-"is intended to make this format gradually the default format and deprecating "
-"the previously described one line style format as it is easier to create, "
-"extend and modify by humans and machines alike especially if a lot of "
+"is intended to make this format gradually the default format, deprecating "
+"the previously described one-line-style format, as it is easier to create, "
+"extend and modify for humans and machines alike especially if a lot of "

 "sources and/or options are involved.  Developers who are working with and/or "
 "parsing apt sources are highly encouraged to add support for this format and "
 "to contact the APT team to coordinate and share this work. Users can freely "
 "sources and/or options are involved.  Developers who are working with and/or "
 "parsing apt sources are highly encouraged to add support for this format and "
 "to contact the APT team to coordinate and share this work. Users can freely "

-"adopt this format already, but could encounter problems with software not "
+"adopt this format already, but may encounter problems with software not "

 "supporting the format yet."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: sources.list.5.xml:1
 "supporting the format yet."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: sources.list.5.xml:1

-msgid "The deb and deb-src types: General Format"
+msgid "The deb and deb-src Types: General Format"

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>


@@ -5340,8 +5416,8 @@ msgid ""
 "archive, <filename>distribution/component</filename>. The "
 "<literal>distribution</literal> is generally a suite name like "
 "<literal>stable</literal> or <literal>testing</literal> or a codename like "
 "archive, <filename>distribution/component</filename>. The "
 "<literal>distribution</literal> is generally a suite 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>&debian-stable-codename;</literal> or "
+"<literal>&debian-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 references "
 "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 "


@@ -5352,7 +5428,7 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:1
 msgid ""
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:1
 msgid ""

-"The format for two one line style entries using the <literal>deb</literal> "
+"The format for two one-line-style entries using the <literal>deb</literal> "

 "and <literal>deb-src</literal> types is:"
 msgstr ""
 
 "and <literal>deb-src</literal> types is:"
 msgstr ""
 


@@ -5407,14 +5483,14 @@ msgid ""
 "<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 "
 "<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 "
+"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>
 #: sources.list.5.xml:1
 msgid ""
 "automatically generate a URI with the current architecture otherwise."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:1
 msgid ""

-"Especially in the one line style format since only one distribution can be "
+"Especially in the one-line-style format since only one distribution can be "

 "specified per line it may be necessary to have multiple lines for the same "
 "URI, if a subset of all available distributions or components at that "
 "location is desired.  APT will sort the URI list after it has generated a "
 "specified per line it may be necessary to have multiple lines for the same "
 "URI, if a subset of all available distributions or components at that "
 "location is desired.  APT will sort the URI list after it has generated a "


@@ -5450,9 +5526,10 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:1
 msgid ""
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:1
 msgid ""

-"As an example, the sources for your distribution could look like this in one "
-"line style format: <placeholder type=\"literallayout\" id=\"0\"/> or like "
-"this in deb822 style format: <placeholder type=\"literallayout\" id=\"1\"/>"
+"As an example, the sources for your distribution could look like this in "
+"one-line-style format: <placeholder type=\"literallayout\" id=\"0\"/> or "
+"like this in deb822 style format: <placeholder type=\"literallayout\" "
+"id=\"1\"/>"

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>


@@ -5463,12 +5540,12 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:1
 msgid ""
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:1
 msgid ""

-"Each source entry can have options specified modifying which and how the "
-"source is accessed and data acquired from it. Format, syntax and names of "
-"the options varies between the two formats one line and deb822 style as "
-"described, but they have both the same options available. For simplicity we "
-"list the deb822 fieldname and provide the one line name in brackets.  "
-"Remember that beside setting multivalue options explicitly, there is also "
+"Each source entry can have options specified to modify which source is "
+"accessed and how data is acquired from it. Format, syntax and names of the "
+"options vary between the one-line-style and deb822-style formats as "
+"described, but they both have the same options available. For simplicity we "
+"list the deb822 fieldname and provide the one-line name in brackets.  "
+"Remember that besides setting multivalue options explicitly, there is also "

 "the option to modify them based on the default, but we aren't listing those "
 "names explicitly here. Unsupported options are silently ignored by all APT "
 "versions."
 "the option to modify them based on the default, but we aren't listing those "
 "names explicitly here. Unsupported options are silently ignored by all APT "
 "versions."


@@ -5487,7 +5564,7 @@ msgstr ""
 #: sources.list.5.xml:1
 msgid ""
 "<option>Languages</option> (<option>lang</option>) is a multivalue option "
 #: sources.list.5.xml:1
 msgid ""
 "<option>Languages</option> (<option>lang</option>) is a multivalue option "

-"defining for which languages information like translated package "
+"defining for which languages information such as translated package "

 "descriptions should be downloaded.  If this option isn't set the default is "
 "all languages as defined by the <option>Acquire::Languages</option> config "
 "option."
 "descriptions should be downloaded.  If this option isn't set the default is "
 "all languages as defined by the <option>Acquire::Languages</option> config "
 "option."


@@ -5499,9 +5576,11 @@ msgid ""
 "<option>Targets</option> (<option>target</option>) is a multivalue option "
 "defining which download targets apt will try to acquire from this source. If "
 "not specified, the default set is defined by the "
 "<option>Targets</option> (<option>target</option>) is a multivalue option "
 "defining which download targets apt will try to acquire from this source. If "
 "not specified, the default set is defined by the "

-"<option>Acquire::IndexTargets</option> configuration scope.  Aditionally, "
-"specific targets can be enabled or disabled by using the identifier as field "
-"name instead of using this multivalue option."
+"<option>Acquire::IndexTargets</option> configuration scope (targets are "
+"specified by their name in the <literal>Created-By</literal> field).  "
+"Additionally, targets can be enabled or disabled by using the "
+"<literal>Identifier</literal> field as an option with a boolean value "
+"instead of using this multivalue option."

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>


@@ -5512,7 +5591,7 @@ msgid ""
 "downloading the new indexes entirely. The value of this option is ignored if "
 "the repository doesn't announce the availability of PDiffs.  Defaults to the "
 "value of the option with the same name for a specific index file defined in "
 "downloading the new indexes entirely. The value of this option is ignored if "
 "the repository doesn't announce the availability of PDiffs.  Defaults to the "
 "value of the option with the same name for a specific index file defined in "

-"the <option>Acquire::IndexTargets</option> scope, which itself default to "
+"the <option>Acquire::IndexTargets</option> scope, which itself defaults to "

 "the value of configuration option <option>Acquire::PDiffs</option> which "
 "defaults to <literal>yes</literal>."
 msgstr ""
 "the value of configuration option <option>Acquire::PDiffs</option> which "
 "defaults to <literal>yes</literal>."
 msgstr ""


@@ -5521,14 +5600,15 @@ msgstr ""
 #: sources.list.5.xml:1
 msgid ""
 "<option>By-Hash</option> (<option>by-hash</option>)  can have the value "
 #: sources.list.5.xml:1
 msgid ""
 "<option>By-Hash</option> (<option>by-hash</option>)  can have the value "

-"\"yes\", \"no\" or \"force\" and controls if APT should try to acquire "
-"indexes via an URI constructed from a hashsum of the expected file instead "
-"of using the well-known stable filename of the index. Using this can avoid "
-"hashsum mismatches, but requires a supporting mirror. The value "
-"\"yes\"/\"no\" activates/disables the use of this feature if this source "
-"indicates support for it, while \"force\" will enable the feature regardless "
-"of what the source indicates.  Defaults to the value of the option of the "
-"same name for a specific index file defined in the "
+"<literal>yes</literal>, <literal>no</literal> or <literal>force</literal> "
+"and controls if APT should try to acquire indexes via a URI constructed from "
+"a hashsum of the expected file instead of using the well-known stable "
+"filename of the index. Using this can avoid hashsum mismatches, but requires "
+"a supporting mirror. A <literal>yes</literal> or <literal>no</literal> value "
+"activates/disables the use of this feature if this source indicates support "
+"for it, while <literal>force</literal> will enable the feature regardless of "
+"what the source indicates. Defaults to the value of the option of the same "
+"name for a specific index file defined in the "

 "<option>Acquire::IndexTargets</option> scope, which itself defaults to the "
 "value of configuration option <option>Acquire::By-Hash</option> which "
 "defaults to <literal>yes</literal>."
 "<option>Acquire::IndexTargets</option> scope, which itself defaults to the "
 "value of configuration option <option>Acquire::By-Hash</option> which "
 "defaults to <literal>yes</literal>."


@@ -5537,26 +5617,37 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:1
 msgid ""
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:1
 msgid ""

-"Further more, there are options which if set effect <emphasis>all</emphasis> "
+"Furthermore, there are options which if set affect <emphasis>all</emphasis> "

 "sources with the same URI and Suite, so they have to be set on all such "
 "entries and can not be varied between different components. APT will try to "
 "detect and error out on such anomalies."
 msgstr ""
 
 "sources with the same URI and Suite, so they have to be set on all such "
 "entries and can not be varied between different components. APT will try to "
 "detect and error out on such anomalies."
 msgstr ""
 

+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml:1
+msgid ""
+"<option>Allow-Insecure</option> (<option>allow-insecure</option>), "
+"<option>Allow-Weak</option> (<option>allow-weak</option>) and "
+"<option>Allow-Downgrade-To-Insecure</option> "
+"(<option>allow-downgrade-to-insecure</option>)  are boolean values which all "
+"default to <literal>no</literal>.  If set to <literal>yes</literal> they "
+"circumvent parts of &apt-secure; and should therefore not be used lightly!"
+msgstr ""
+

 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #: sources.list.5.xml:1
 msgid ""
 "<option>Trusted</option> (<option>trusted</option>)  is a tri-state value "
 "which defaults to APT deciding if a source is considered trusted or if "
 "warnings should be raised before e.g.  packages are installed from this "
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #: sources.list.5.xml:1
 msgid ""
 "<option>Trusted</option> (<option>trusted</option>)  is a tri-state value "
 "which defaults to APT deciding if a source is considered trusted or if "
 "warnings should be raised before e.g.  packages are installed from this "

-"source. This option can be used to override this decision either with the "
-"value <literal>yes</literal>, which lets APT consider this source always as "
-"a trusted source even if it has no or fails authentication checks by "
-"disabling parts of &apt-secure; and should therefore only be used in a local "
-"and trusted context (if at all) as otherwise security is breached. The "
-"opposite can be achieved with the value no, which causes the source to be "
-"handled as untrusted even if the authentication checks passed successfully.  "
-"The default value can't be set explicitly."
+"source. This option can be used to override that decision. The value "
+"<literal>yes</literal> tells APT always to consider this source as trusted, "
+"even if it doesn't pass authentication checks. It disables parts of "
+"&apt-secure;, and should therefore only be used in a local and trusted "
+"context (if at all) as otherwise security is breached. The value "
+"<literal>no</literal> does the opposite, causing the source to be handled as "
+"untrusted even if the authentication checks passed successfully. The default "
+"value can't be set explicitly."

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>


@@ -5565,13 +5656,15 @@ msgid ""
 "<option>Signed-By</option> (<option>signed-by</option>)  is either an "
 "absolute path to a keyring file (has to be accessible and readable for the "
 "<literal>_apt</literal> user, so ensure everyone has read-permissions on the "
 "<option>Signed-By</option> (<option>signed-by</option>)  is either an "
 "absolute path to a keyring file (has to be accessible and readable for the "
 "<literal>_apt</literal> user, so ensure everyone has read-permissions on the "

-"file) or a fingerprint of a key in either the "
-"<filename>trusted.gpg</filename> keyring or in one of the keyrings in the "
+"file) or one or more fingerprints of keys either in the "
+"<filename>trusted.gpg</filename> keyring or in the keyrings in the "

 "<filename>trusted.gpg.d/</filename> directory (see <command>apt-key "
 "<filename>trusted.gpg.d/</filename> directory (see <command>apt-key "

-"fingerprint</command>). If the option is set only the key(s) in this keyring "
-"or only the key with this fingerprint is used for the &apt-secure; "
-"verification of this repository. Otherwise all keys in the trusted keyrings "
-"are considered valid signers for this repository."
+"fingerprint</command>). If the option is set, only the key(s) in this "
+"keyring or only the keys with these fingerprints are used for the "
+"&apt-secure; verification of this repository. Defaults to the value of the "
+"option with the same name if set in the previously acquired "
+"<filename>Release</filename> file.  Otherwise all keys in the trusted "
+"keyrings are considered valid signers for this repository."

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>


@@ -5579,15 +5672,15 @@ msgstr ""
 msgid ""
 "<option>Check-Valid-Until</option> (<option>check-valid-until</option>)  is "
 "a yes/no value which controls if APT should try to detect replay attacks. A "
 msgid ""
 "<option>Check-Valid-Until</option> (<option>check-valid-until</option>)  is "
 "a yes/no value which controls if APT should try to detect replay attacks. A "

-"repository creator can declare until then the data provided in the "
-"repository should be considered valid and if this time is reached, but no "
-"new data is provided the data is considered expired and an error is raised.  "
-"Beside increasing security as a malicious attacker can't sent old data "
-"forever denying a user to be able to upgrade to a new version, this also "
-"helps users identify mirrors which are no longer updated. Some repositories "
-"like historic archives aren't updated anymore by design through, so this "
-"check can be disabled by setting this option to <literal>no</literal>.  "
-"Defaults to the value of configuration option "
+"repository creator can declare a time until which the data provided in the "
+"repository should be considered valid, and if this time is reached, but no "
+"new data is provided, the data is considered expired and an error is "
+"raised.  Besides increasing security, as a malicious attacker can't send old "
+"data forever to prevent a user from upgrading to a new version, this also "
+"helps users identify mirrors which are no longer updated. However, some "
+"repositories such as historic archives are not updated any more by design, "
+"so this check can be disabled by setting this option to "
+"<literal>no</literal>.  Defaults to the value of configuration option "

 "<option>Acquire::Check-Valid-Until</option> which itself defaults to "
 "<literal>yes</literal>."
 msgstr ""
 "<option>Acquire::Check-Valid-Until</option> which itself defaults to "
 "<literal>yes</literal>."
 msgstr ""


@@ -5610,7 +5703,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: sources.list.5.xml:1
 
 #. type: Content of: <refentry><refsect1><title>
 #: sources.list.5.xml:1

-msgid "URI specification"
+msgid "URI Specification"

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>


@@ -5739,7 +5832,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:1
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:1

-msgid "Source line for the above"
+msgid "Sources specification for the above."

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>


@@ -5770,9 +5863,9 @@ msgstr ""
 #: sources.list.5.xml:1
 #, no-wrap
 msgid ""
 #: sources.list.5.xml:1
 #, no-wrap
 msgid ""

-"deb http://httpredir.debian.org/debian &stable-codename; main\n"
+"deb http://httpredir.debian.org/debian &debian-stable-codename; main\n"

 "deb [ arch=amd64,armel ] http://httpredir.debian.org/debian "
 "deb [ arch=amd64,armel ] http://httpredir.debian.org/debian "

-"&stable-codename; main"
+"&debian-stable-codename; main"

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>


@@ -5781,12 +5874,12 @@ msgstr ""
 msgid ""
 "Types: deb\n"
 "URIs: http://httpredir.debian.org/debian\n"
 msgid ""
 "Types: deb\n"
 "URIs: http://httpredir.debian.org/debian\n"

-"Suites: &stable-codename;\n"
+"Suites: &debian-stable-codename;\n"

 "Components: main\n"
 "\n"
 "Types: deb\n"
 "URIs: http://httpredir.debian.org/debian\n"
 "Components: main\n"
 "\n"
 "Types: deb\n"
 "URIs: http://httpredir.debian.org/debian\n"

-"Suites: &stable-codename;\n"
+"Suites: &debian-stable-codename;\n"

 "Components: main\n"
 "Architectures: amd64 armel\n"
 msgstr ""
 "Components: main\n"
 "Architectures: amd64 armel\n"
 msgstr ""


@@ -5818,13 +5911,13 @@ msgstr ""
 #: sources.list.5.xml:1
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
 #: sources.list.5.xml:1
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "

-"directory, and uses only the &stable-codename;/contrib area."
+"directory, and uses only the &debian-stable-codename;/contrib area."

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml:1
 #, no-wrap
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml:1
 #, no-wrap

-msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
+msgid "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>


@@ -5833,7 +5926,7 @@ msgstr ""
 msgid ""
 "Types: deb\n"
 "URIs: ftp://ftp.debian.org/debian\n"
 msgid ""
 "Types: deb\n"
 "URIs: ftp://ftp.debian.org/debian\n"

-"Suites: &stable-codename;\n"
+"Suites: &debian-stable-codename;\n"

 "Components: contrib"
 msgstr ""
 
 "Components: contrib"
 msgstr ""
 


@@ -5921,7 +6014,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:1
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:1

-msgid "&apt-get;, &apt-conf;"
+msgid "&apt-get;, &apt-conf;, &apt-acquire-additional-files;"

 msgstr ""
 
 #. type: Content of: <refentry><refmeta><manvolnum>
 msgstr ""
 
 #. type: Content of: <refentry><refmeta><manvolnum>


@@ -6090,12 +6183,12 @@ msgstr ""
 msgid ""
 "The <literal>release</literal> command generates a Release file from a "
 "directory tree. It recursively searches the given directory for uncompressed "
 msgid ""
 "The <literal>release</literal> command generates a Release file from a "
 "directory tree. It recursively searches the given directory for uncompressed "

-"<filename>Packages</filename> and <filename>Sources</filename> files and "
-"ones compressed with <command>gzip</command>, <command>bzip2</command> or "
-"<command>lzma</command> as well as <filename>Release</filename> and "
-"<filename>md5sum.txt</filename> files by default "
-"(<literal>APT::FTPArchive::Release::Default-Patterns</literal>). Additional "
-"filename patterns can be added by listing them in "
+"and compressed <filename>Packages</filename>, <filename>Sources</filename>, "
+"<filename>Contents</filename>, <filename>Components</filename> and "
+"<filename>icons</filename> files as well as <filename>Release</filename>, "
+"<filename>Index</filename> and <filename>md5sum.txt</filename> files by "
+"default (<literal>APT::FTPArchive::Release::Default-Patterns</literal>).  "
+"Additional filename patterns can be added by listing them in "

 "<literal>APT::FTPArchive::Release::Patterns</literal>.  It then writes to "
 "stdout a <filename>Release</filename> file containing (by default) an MD5, "
 "SHA1, SHA256 and SHA512 digest for each file."
 "<literal>APT::FTPArchive::Release::Patterns</literal>.  It then writes to "
 "stdout a <filename>Release</filename> file containing (by default) an MD5, "
 "SHA1, SHA256 and SHA512 digest for each file."


@@ -6107,12 +6200,13 @@ msgid ""
 "Values for the additional metadata fields in the Release file are taken from "
 "the corresponding variables under "
 "<literal>APT::FTPArchive::Release</literal>, "
 "Values for the additional metadata fields in the Release file are taken from "
 "the corresponding variables under "
 "<literal>APT::FTPArchive::Release</literal>, "

-"e.g. <literal>APT::FTPArchive::Release::Origin</literal>.  The supported "
-"fields are: <literal>Origin</literal>, <literal>Label</literal>, "
+"e.g. <literal>APT::FTPArchive::Release::Origin</literal>. The supported "
+"fields are <literal>Origin</literal>, <literal>Label</literal>, "

 "<literal>Suite</literal>, <literal>Version</literal>, "
 "<literal>Codename</literal>, <literal>Date</literal>, "
 "<literal>Suite</literal>, <literal>Version</literal>, "
 "<literal>Codename</literal>, <literal>Date</literal>, "

-"<literal>Valid-Until</literal>, <literal>Architectures</literal>, "
-"<literal>Components</literal>, <literal>Description</literal>."
+"<literal>Valid-Until</literal>, <literal>Signed-By</literal>, "
+"<literal>Architectures</literal>, <literal>Components</literal> and "
+"<literal>Description</literal>."

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>


@@ -6209,9 +6303,9 @@ msgstr ""
 #: apt-ftparchive.1.xml:1
 msgid ""
 "Sets the default compression schemes to use for the package index files. It "
 #: apt-ftparchive.1.xml:1
 msgid ""
 "Sets the default compression schemes to use for the package index files. It "

-"is a string that contains a space separated list of at least one of: '.' (no "
-"compression), 'gzip' and 'bzip2'. The default for all compression schemes is "
-"'. gzip'."
+"is a string that contains a space separated list of at least one of the "
+"compressors configured via the <option>APT::Compressor</option> "
+"configuration scope.  The default for all compression schemes is '. gzip'."

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>


@@ -6408,7 +6502,7 @@ msgid ""
 "The <literal>Tree</literal> section takes a scope tag which sets the "
 "<literal>$(DIST)</literal> variable and defines the root of the tree (the "
 "path is prefixed by <literal>ArchiveDir</literal>).  Typically this is a "
 "The <literal>Tree</literal> section takes a scope tag which sets the "
 "<literal>$(DIST)</literal> variable and defines the root of the tree (the "
 "path is prefixed by <literal>ArchiveDir</literal>).  Typically this is a "

-"setting such as <filename>dists/&stable-codename;</filename>."
+"setting such as <filename>dists/&debian-stable-codename;</filename>."

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>


@@ -6450,7 +6544,10 @@ msgstr ""
 msgid ""
 "This is a space separated list of all the architectures that appear under "
 "search section. The special architecture 'source' is used to indicate that "
 msgid ""
 "This is a space separated list of all the architectures that appear under "
 "search section. The special architecture 'source' is used to indicate that "

-"this tree has a source archive."
+"this tree has a source archive.  The architecture 'all' signals that "
+"architecture specific files like <filename>Packages</filename> should not "
+"include information about architecture <literal>all</literal> packages in "
+"all files as they will be available in a dedicated file."

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>