Get rid of memmove() in our read buffering

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

diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 30e24eebd0359c40ee109412056bd188137e7272..156fcc72431faeeacd10225574a5afd85b0702aa 100644 (file)
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -1,14 +1,13 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
+# Translation of apt manpages and documentation to LANGUAGE

 # This file is distributed under the same license as the apt-doc package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 # This file is distributed under the same license as the apt-doc package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""

-"Project-Id-Version: apt-doc 1.1~exp14\n"
+"Project-Id-Version: apt-doc 1.1.6\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-20 19:29+0200\n"
+"POT-Creation-Date: 2015-12-24 17:02+0100\n"

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


@@ -526,170 +525,181 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml:1
 msgid ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml:1
 msgid ""

-"<command>apt</command> (Advanced Package Tool) is the command-line tool for "
-"handling packages. It provides a commandline interface for the package "
-"management of the system.  See also &apt-get; and &apt-cache; for more "
-"low-level command options."
+"<command>apt</command> provides a high-level commandline interface for the "
+"package management system. It is intended as an end user interface and "
+"enables some options better suited for interactive usage by default compared "
+"to more specialized APT tools like &apt-get; and &apt-cache;."

 msgstr ""
 
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><para>

 #: apt.8.xml:1
 msgid ""
 #: apt.8.xml:1
 msgid ""

-"<literal>list</literal> is used to display a list of packages. It supports "
-"shell pattern for matching package names and the following options: "
-"<option>--installed</option>, <option>--upgradable</option>, "
-"<option>--upgradeable</option>, <option>--all-versions</option> are "
-"supported."
+"Much like <command>apt</command> itself, its manpage is intended as an end "
+"user interface and as such only mentions the most used commands and options "
+"partly to not duplicate information in multiple places and partly to avoid "
+"overwhelming readers with a cornucopia of options and details."

 msgstr ""
 
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:1
-msgid ""
-"<literal>search</literal> searches for the given term(s) and display "
-"matching packages."
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml:1 apt.8.xml:1 apt.8.xml:1 apt.8.xml:1 apt.8.xml:1
+msgid "(&apt-get;)"

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

-"<literal>show</literal> shows the package information for the given "
-"package(s)."
+"<option>update</option> is used to download package information from all "
+"configured sources. Other commands operate on this data to e.g. perform "
+"package upgrades or search in and display details about all packages "
+"available for installation."

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

-"<literal>install</literal> is followed by one or more package names desired "
-"for installation or upgrading."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:1 apt-get.8.xml:1
-msgid ""
-"A specific version of a package can be selected for installation by "
-"following the package name with an equals and the version of the package to "
-"select. This will cause that version to be located and selected for "
-"install. Alternatively a specific distribution can be selected by following "
-"the package name with a slash and the version of the distribution or the "
-"Archive name (stable, testing, unstable)."
+"<option>upgrade</option> is used to install available upgrades of all "
+"packages currently installed on the system from the sources configured via "
+"&sources-list;. New packages will be installed if required to statisfy "
+"dependencies, but existing packages will never be removed. If an upgrade for "
+"a package requires the remove of an installed package the upgrade for this "
+"package isn't performed."

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

-#: apt.8.xml:1 apt-get.8.xml:1
+#: apt.8.xml:1

 msgid ""
 msgid ""

-"<literal>remove</literal> is identical to <literal>install</literal> except "
-"that packages are removed instead of installed. Note that removing a package "
-"leaves its configuration files on the system. If a plus sign is appended to "
-"the package name (with no intervening space), the identified package will be "
-"installed instead of removed."
+"<literal>full-upgrade</literal> performs the function of upgrade but will "
+"remove currently installed packages if this is needed to upgrade the system "
+"as a whole."

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

-#: apt.8.xml:1 apt-get.8.xml:1 apt-get.8.xml:1
-msgid "(and the"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.8.xml:1 apt-get.8.xml:1 apt-get.8.xml:1
-msgid "alias since 1.1)"
+#: apt.8.xml:1 apt.8.xml:1
+msgid ","

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

-#: apt.8.xml:1 apt-get.8.xml:1
+#: apt.8.xml:1

 msgid ""
 msgid ""

-"<literal>autoremove</literal> is used to remove packages that were "
-"automatically installed to satisfy dependencies for other packages and are "
-"now no longer needed."
+"Performs the requested action on one or more packages specified via &regex;, "
+"&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 ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml:1
 msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml:1
 msgid ""

-"<literal>edit-sources</literal> lets you edit your sources.list file and "
-"provides basic sanity checks."
+"A specific version of a package can be selected for installation by "
+"following the package name with an equals (=) and the version of the package "
+"to select. 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."

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

-"<literal>update</literal> is used to resynchronize the package index files "
-"from their sources."
+"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 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>
 #: apt.8.xml:1
 msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml:1
 msgid ""

-"<literal>upgrade</literal> is used to install the newest versions of all "
-"packages currently installed on the system from the sources enumerated in "
-"<filename>/etc/apt/sources.list</filename>. New packages will be installed, "
-"but existing packages will never be removed."
+"<literal>autoremove</literal> is used to remove packages that were "
+"automatically installed to satisfy dependencies for other packages and are "
+"now no longer needed as dependencies changed or the package(s)  needing them "
+"were removed in the meantime."

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

-"<literal>full-upgrade</literal> performs the function of upgrade but may "
-"also remove installed packages if that is required in order to resolve a "
-"package conflict."
+"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 "
+"<command>install</command> are also never proposed for automatic removal."

 msgstr ""
 
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:1 apt-get.8.xml:1 apt-cache.8.xml:1 apt-mark.8.xml:1
-#: apt-config.8.xml:1 apt-extracttemplates.1.xml:1 apt-sortpkgs.1.xml:1
-#: apt-ftparchive.1.xml:1
-msgid "options"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml:1 apt.8.xml:1
+msgid "(&apt-cache;)"

 msgstr ""
 
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><title>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

 #: apt.8.xml:1
 #: apt.8.xml:1

-msgid "Script usage"
+msgid ""
+"<option>search</option> can be used to search for the given &regex; term(s) "
+"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 ""
 
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

 #: apt.8.xml:1
 msgid ""
 #: apt.8.xml:1
 msgid ""

-"The &apt; commandline is designed as a end-user tool and it may change the "
-"output between versions. While it tries to not break backward compatibility "
-"there is no guarantee for it either.  All features of &apt; are available in "
-"&apt-cache; and &apt-get; via APT options. Please prefer using these "
-"commands in your scripts."
+"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 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 ""
 
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:1
-msgid "Differences to &apt-get;"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml:1 apt.8.xml:1
+msgid "(work-in-progress)"

 msgstr ""
 
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

 #: apt.8.xml:1
 msgid ""
 #: apt.8.xml:1
 msgid ""

-"The <command>apt</command> command is meant to be pleasant for end users and "
-"does not need to be backward compatible like &apt-get;. Therefore some "
-"options are different:"
+"<option>list</option> is somewhat similar to <command>dpkg-query "
+"--list</command> in that it can display a list of packages satisfying "
+"certain criteria.  It supports &glob; patterns for matching package names as "
+"well as options to list installed (<option>--installed</option>), "
+"upgradeable (<option>--upgradeable</option>) or all available "
+"(<option>--all-versions</option>) versions."

 msgstr ""
 
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

 #: apt.8.xml:1
 #: apt.8.xml:1

-msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
+msgid ""
+"<literal>edit-sources</literal> lets you edit your &sources-list; files in "
+"your preferred texteditor while also providing basic sanity checks."

 msgstr ""
 
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#. type: Content of: <refentry><refsect1><title>

 #: apt.8.xml:1
 #: apt.8.xml:1

-msgid "The option <literal>APT::Color</literal> is enabled."
+msgid "Script Usage and Differences from Other APT Tools"

 msgstr ""
 
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#. type: Content of: <refentry><refsect1><para>

 #: apt.8.xml:1
 msgid ""
 #: apt.8.xml:1
 msgid ""

-"A new <literal>list</literal> command is available similar to <literal>dpkg "
-"--list</literal>."
+"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 ""
 
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#. type: Content of: <refentry><refsect1><para>

 #: apt.8.xml:1
 msgid ""
 #: apt.8.xml:1
 msgid ""

-"The option <literal>upgrade</literal> has <literal>--with-new-pkgs</literal> "
-"enabled by default."
+"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 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>


@@ -817,6 +827,17 @@ msgid ""
 "decisions made by apt-get's conflict resolution system."
 msgstr ""
 
 "decisions made by apt-get's conflict resolution system."
 msgstr ""
 

+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:1
+msgid ""
+"A specific version of a package can be selected for installation by "
+"following the package name with an equals and the version of the package to "
+"select. This will cause that version to be located and selected for "
+"install. Alternatively a specific distribution can be selected by following "
+"the package name with a slash and the version of the distribution or the "
+"Archive name (stable, testing, unstable)."
+msgstr ""
+

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:1
 msgid ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:1
 msgid ""


@@ -855,6 +876,16 @@ msgid ""
 "expression."
 msgstr ""
 
 "expression."
 msgstr ""
 

+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:1
+msgid ""
+"<literal>remove</literal> is identical to <literal>install</literal> except "
+"that packages are removed instead of installed. Note that removing a package "
+"leaves its configuration files on the system. If a plus sign is appended to "
+"the package name (with no intervening space), the identified package will be "
+"installed instead of removed."
+msgstr ""
+

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:1
 msgid ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:1
 msgid ""


@@ -946,6 +977,16 @@ msgid ""
 "<filename>&cachedir;/archives/partial/</filename>."
 msgstr ""
 
 "<filename>&cachedir;/archives/partial/</filename>."
 msgstr ""
 

+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml:1 apt-get.8.xml:1
+msgid "(and the"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml:1 apt-get.8.xml:1
+msgid "alias since 1.1)"
+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 ""


@@ -958,6 +999,14 @@ msgid ""
 "being erased if it is set to off."
 msgstr ""
 
 "being erased if it is set to off."
 msgstr ""
 

+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:1
+msgid ""
+"<literal>autoremove</literal> is used to remove packages that were "
+"automatically installed to satisfy dependencies for other packages and are "
+"now no longer needed."
+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 ""


@@ -982,6 +1031,12 @@ msgid ""
 "<literal><filename>doc/acquire-additional-files.txt</filename></literal>."
 msgstr ""
 
 "<literal><filename>doc/acquire-additional-files.txt</filename></literal>."
 msgstr ""
 

+#. type: Content of: <refentry><refsect1><title>
+#: apt-get.8.xml:1 apt-cache.8.xml:1 apt-config.8.xml:1
+#: apt-extracttemplates.1.xml:1 apt-sortpkgs.1.xml:1 apt-ftparchive.1.xml:1
+msgid "options"
+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 ""


@@ -1390,7 +1445,11 @@ msgid ""
 "<command>apt-cache</command> performs a variety of operations on APT's "
 "package cache. <command>apt-cache</command> does not manipulate the state of "
 "the system but does provide operations to search and generate interesting "
 "<command>apt-cache</command> performs a variety of operations on APT's "
 "package cache. <command>apt-cache</command> does not manipulate the state of "
 "the system but does provide operations to search and generate interesting "

-"output from the package metadata."
+"output from the package metadata. The metadata is acquired and updated via "
+"the 'update' command of e.g. <command>apt-get</command>, so that it can be "
+"outdated if the last update is too long ago, but in exchange "
+"<command>apt-cache</command> works independently of the availability of the "
+"configured sources (e.g. offline)."

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


@@ -1841,6 +1900,14 @@ msgid ""
 "filename is <literal>-</literal> from standard input."
 msgstr ""
 
 "filename is <literal>-</literal> from standard input."
 msgstr ""
 

+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-key.8.xml:1
+msgid ""
+"It is critical that keys added manually via <command>apt-key</command> are "
+"verified to belong to the owner of the repositories they claim to be for "
+"otherwise the &apt-secure; infrastructure is completely undermined."
+msgstr ""
+

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:1
 msgid "Remove a key from the list of trusted keys."
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:1
 msgid "Remove a key from the list of trusted keys."


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

-"Pass advanced options to gpg. With adv --recv-key you can download the "
-"public key."
+"Pass advanced options to gpg. With <command>adv --recv-key</command> you can "
+"e.g. download key from keyservers directly into the the trusted set of "
+"keys. Note that there are <emphasis>no</emphasis> checks performed, so it is "
+"easy to completely undermine the &apt-secure; infrastructure if used without "
+"care."

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


@@ -1894,7 +1964,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>

-#: apt-key.8.xml:1 apt-cdrom.8.xml:1
+#: apt-key.8.xml:1 apt-mark.8.xml:1 apt-mark.8.xml:1 apt-cdrom.8.xml:1

 msgid "Options"
 msgstr ""
 
 msgid "Options"
 msgstr ""
 


@@ -1953,14 +2023,23 @@ msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-mark.8.xml:1
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-mark.8.xml:1

-msgid "mark/unmark a package as being automatically-installed"
+msgid "show, set and unset various settings for a package"

 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 ""

-"<command>apt-mark</command> will change whether a package has been marked as "
-"being automatically installed."
+"<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 "
+"<command>aptitude</command>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt-mark.8.xml:1
+msgid "Automatically and Manually Installed Packages"

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


@@ -1968,9 +2047,11 @@ 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.  Once these automatically installed packages "
-"are no longer depended on by any manually installed packages, they will be "
-"removed by e.g.  <command>apt-get</command> or <command>aptitude</command>."
+"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."

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


@@ -1992,35 +2073,46 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:1
 msgid ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:1
 msgid ""

-"<literal>hold</literal> is used to mark a package as held back, which will "
-"prevent the package from being automatically installed, upgraded or "
-"removed.  The command is only a wrapper around <command>dpkg "
-"--set-selections</command> and the state is therefore maintained by &dpkg; "
-"and not affected by the <option>--file</option> option."
+"<literal>showauto</literal> is used to print a list of automatically "
+"installed packages with each package on a new line.  All automatically "
+"installed packages will be listed if no package is given.  If packages are "
+"given only those which are automatically installed will be shown."

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

-"<literal>unhold</literal> is used to cancel a previously set hold on a "
-"package to allow all actions again."
+"<literal>showmanual</literal> can be used in the same way as "
+"<literal>showauto</literal> except that it will print a list of manually "
+"installed packages instead."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:1
+msgid ""
+"Read/Write package stats from the filename given with the parameter "
+"&synopsis-param-filename; instead of from the default location, which is "
+"<filename>extended_status</filename> in the directory defined by the "
+"Configuration Item: <literal>Dir::State</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt-mark.8.xml:1
+msgid "Prevent Changes for a Package"

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

-"<literal>showauto</literal> is used to print a list of automatically "
-"installed packages with each package on a new line.  All automatically "
-"installed packages will be listed if no package is given.  If packages are "
-"given only those which are automatically installed will be shown."
+"<literal>hold</literal> is used to mark a package as held back, which will "
+"prevent the package from being automatically installed, upgraded or removed."

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

-"<literal>showmanual</literal> can be used in the same way as "
-"<literal>showauto</literal> except that it will print a list of manually "
-"installed packages instead."
+"<literal>unhold</literal> is used to cancel a previously set hold on a "
+"package to allow all actions again."

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


@@ -2030,13 +2122,22 @@ msgid ""
 "the same way as for the other show commands."
 msgstr ""
 
 "the same way as for the other show commands."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><title>
+#: apt-mark.8.xml:1
+msgid "Schedule Packages for Install, Remove and Purge"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>

 #: apt-mark.8.xml:1
 msgid ""
 #: apt-mark.8.xml:1
 msgid ""

-"Read/Write package stats from the filename given with the parameter "
-"&synopsis-param-filename; instead of from the default location, which is "
-"<filename>extended_status</filename> in the directory defined by the "
-"Configuration Item: <literal>Dir::State</literal>."
+"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>showpurge</option> respectively.  More information about these so "
+"called dpkg selections can be found in &dpkg;."

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


@@ -2054,38 +2155,49 @@ 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 ""

-"Starting with version 0.6, <command>apt</command> contains code that does "
-"signature checking of the Release file for all archives. This ensures that "
-"packages in the archive can't be modified by people who have no access to "
-"the Release file signing key."
+"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."

 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 a package comes from a archive without a signature, or with a signature "
-"that apt does not have a key for, that package is considered untrusted, and "
-"installing it will result in a big warning. <command>apt-get</command> will "
-"currently only warn for unsigned archives; future releases might force all "
-"sources to be verified before downloading packages from them."
+"If an archive has an unsigned Release file or no Release file at all current "
+"APT versions will raise a warning in <command>update</command> operations "
+"and front-ends like <command>apt-get</command> 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 ""

-"The package frontends &apt-get;, &aptitude; and &synaptic; support this new "
-"authentication feature."
+"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>."
+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
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-secure.8.xml:1

-msgid "Trusted archives"
+msgid "Trusted Repositories"

 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 ""

-"The chain of trust from an apt archive to the end user is made up of several "
+"The chain of trust from an APT archive to the end user is made up of several "

 "steps. <command>apt-secure</command> is the last step in this chain; "
 "trusting an archive does not mean that you trust its packages not to contain "
 "malicious code, but means that you trust the archive maintainer. It's the "
 "steps. <command>apt-secure</command> is the last step in this chain; "
 "trusting an archive does not mean that you trust its packages not to contain "
 "malicious code, but means that you trust the archive maintainer. It's the "


@@ -2105,12 +2217,13 @@ 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 starts 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 the Debian "
-"Maintainers keyring (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."
+"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 "
+"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."

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


@@ -2163,24 +2276,33 @@ 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 ""

-"However, it does not defend against a compromise of the Debian master server "
-"itself (which signs the packages) or against a compromise of the key used to "
-"sign the Release files. In any case, this mechanism can complement a "
-"per-package signature."
+"However, it does not defend against a compromise of the master server itself "
+"(which signs the packages) or against a compromise of the key used to sign "
+"the Release files. In any case, this mechanism can complement a per-package "
+"signature."

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

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

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml:1
 msgid ""
 "<command>apt-key</command> is the program that manages the list of keys used "
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml:1
 msgid ""
 "<command>apt-key</command> is the program that manages the list of keys used "

-"by apt. It can be used to add or remove keys, although an installation of "
-"this release will automatically contain the default Debian archive signing "
-"keys used in the Debian package repositories."
+"by APT to trust repositories. It can be used to add or remove keys as well "
+"as list the trusted keys. Limiting which key(s) are able to sign which "
+"archive is possible via the <option>Signed-By</option> in &sources-list;."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-secure.8.xml:1
+msgid ""
+"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."

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


@@ -2196,7 +2318,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>


@@ -2225,9 +2347,22 @@ 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 "
 "know what key they need to import in order to authenticate the files in the "

-"archive."
+"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 "
+"updates and key transitions automatically later."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
+#: 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 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 "
+"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>


@@ -2249,9 +2384,9 @@ msgstr ""
 #: apt-secure.8.xml:1
 msgid ""
 "For more background information you might want to review the <ulink "
 #: apt-secure.8.xml:1
 msgid ""
 "For more background information you might want to review the <ulink "

-"url=\"http://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 "
+"url=\"https://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
+"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 ""


@@ -2533,6 +2668,13 @@ msgstr ""
 msgid "the main configuration file specified by <literal>Dir::Etc::main</literal>"
 msgstr ""
 
 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:1
+msgid ""
+"all options set in the binary specific configuration subtree are moved into "
+"the root of the tree."
+msgstr ""
+

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


@@ -3356,7 +3498,7 @@ msgid ""
 "<literal>Acquire::Changelogs::URI::Override::Origin::<replaceable>ORIGIN</replaceable></literal>.  "
 "The value should be a normal URI to a text file, expect that package "
 "specific data is replaced with the placeholder "
 "<literal>Acquire::Changelogs::URI::Override::Origin::<replaceable>ORIGIN</replaceable></literal>.  "
 "The value should be a normal URI to a text file, expect that package "
 "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 "
 "otherwise it is omitted, 2. the first letter of source package name, expect "
 "if the source package name starts with '<literal>lib</literal>' in which "
 "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 "
 "if the source package name starts with '<literal>lib</literal>' in which "


@@ -3370,6 +3512,40 @@ msgid ""
 "tried if available in this case."
 msgstr ""
 
 "tried if available in this case."
 msgstr ""
 

+#. type: Content of: <refentry><refsect1><title>
+#: apt.conf.5.xml:1
+msgid "Binary specific configuration"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml:1
+msgid ""
+"Especially with the introduction of the <command>apt</command> binary it can "
+"be useful to set certain options only for a specific binary as even options "
+"which look like they would effect only a certain binary like "
+"<option>APT::Get::Show-Versions</option> effect <command>apt-get</command> "
+"as well as <command>apt</command>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml:1
+msgid ""
+"Setting an option for a specific binary only can be achieved by setting the "
+"option inside the "
+"<option>Binary::<replaceable>specific-binary</replaceable></option> "
+"scope. Setting the option <option>APT::Get::Show-Versions</option> for the "
+"<command>apt</command> only can e.g. by done by setting "
+"<option>Binary::apt::APT::Get::Show-Versions</option> instead."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml:1
+msgid ""
+"Note that as seen in the DESCRIPTION section further above you can't set "
+"binary-specific options on the commandline itself nor in configuration files "
+"loaded via the commandline."
+msgstr ""
+

 #. type: Content of: <refentry><refsect1><title>
 #: apt.conf.5.xml:1
 msgid "Directories"
 #. type: Content of: <refentry><refsect1><title>
 #: apt.conf.5.xml:1
 msgid "Directories"


@@ -5044,10 +5220,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 "


@@ -5077,7 +5253,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>


@@ -5094,9 +5270,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 ""


@@ -5106,14 +5282,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>


@@ -5121,18 +5297,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."


@@ -5143,19 +5319,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>


@@ -5177,7 +5353,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 ""
 


@@ -5232,14 +5408,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 "


@@ -5275,9 +5451,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>


@@ -5288,12 +5465,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."


@@ -5312,7 +5489,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."


@@ -5324,7 +5501,7 @@ 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, "
+"<option>Acquire::IndexTargets</option> configuration scope.  Additionally, "

 "specific targets can be enabled or disabled by using the identifier as field "
 "name instead of using this multivalue option."
 msgstr ""
 "specific targets can be enabled or disabled by using the identifier as field "
 "name instead of using this multivalue option."
 msgstr ""


@@ -5337,7 +5514,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 ""


@@ -5346,14 +5523,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>."


@@ -5362,23 +5540,39 @@ 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>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 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>
 #: sources.list.5.xml:1
 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 "
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #: sources.list.5.xml:1
 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 "

-"file) or a fingerprint of a key in either the "
+"file) or a fingerprint of a key either in the "

 "<filename>trusted.gpg</filename> keyring or in one of the keyrings in the "
 "<filename>trusted.gpg.d/</filename> directory (see <command>apt-key "
 "<filename>trusted.gpg</filename> keyring or in one of the keyrings in the "
 "<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; "
+"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."
 msgstr ""
 "verification of this repository. Otherwise all keys in the trusted keyrings "
 "are considered valid signers for this repository."
 msgstr ""


@@ -5388,15 +5582,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 ""


@@ -5419,7 +5613,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>


@@ -5548,7 +5742,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>


@@ -6259,7 +6453,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>