split up help messages for simpler reuse

That is one huge commit with busy work only: Help messages used to be
one big translateable string, which is a pain for translators and hard
to reuse for us. This change there 'explodes' this single string into
new string for each documented string trying hard to split up the
translated messages as well. This actually restores many translations as
previously adding a single command made all of the bug message fuzzy.
The splitup also highlighted that its easy to forget a line, duplicate
one and similar stuff.

Git-Dch: Ignore

9 files changed, 4836 insertions, 1795 deletions

diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 30e24eebd..c308771f2 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.1~exp14\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-10-22 16:34+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"
@@ -526,170 +526,180 @@ msgstr ""
 #. 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 ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><para>
 #: 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 "
+"overwelming readers with a cornucopia of options and details."
 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 ""
-"<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 ""
-"<literal>install</literal> is followed by one or more package names desired "
-"for installation or upgrading."
+"<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>
-#: 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)."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:1 apt-get.8.xml:1
+#: apt.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><term>
-#: apt.8.xml:1 apt-get.8.xml:1 apt-get.8.xml:1
-msgid "(and the"
+"<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>
-#: 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>
-#: apt.8.xml:1 apt-get.8.xml:1
+#: apt.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."
+"Performs the requested action on one or more packages specified via &regex;, "
+"&glob; or exact match. The requested action can be overidden 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 ""
-"<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 ""
-"<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 installtion request for the accidently 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."
 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 ""
-"<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."
+"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 "
+"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."
 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 ""
 
-#. type: Content of: <refentry><refsect1><title>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: 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 the 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 ""
 
-#. type: Content of: <refentry><refsect1><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: 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 many 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 ""
 
-#. 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 ""
 
-#. type: Content of: <refentry><refsect1><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: 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 ""
 
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: 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 ""
 
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#. type: Content of: <refentry><refsect1><title>
 #: apt.8.xml:1
-msgid "The option <literal>APT::Color</literal> is enabled."
+msgid "Script usage and Differences to other APT tools"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#. type: Content of: <refentry><refsect1><para>
 #: 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 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 "
+"interactive use."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#. type: Content of: <refentry><refsect1><para>
 #: 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 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>
@@ -820,6 +830,17 @@ 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 ""
 "Both of the version selection mechanisms can downgrade packages and must be "
 "used with care."
 msgstr ""
@@ -858,6 +879,16 @@ 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 ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
 "that packages are removed and purged (any configuration files are deleted "
 "too)."
@@ -946,6 +977,16 @@ msgid ""
 "<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 ""
@@ -961,6 +1002,14 @@ 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 ""
 "<literal>changelog</literal> tries to download the changelog of a package "
 "and displays it through <command>sensible-pager</command>.  By default it "
 "displays the changelog for the version that is installed.  However, you can "
@@ -982,6 +1031,12 @@ msgid ""
 "<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 ""
@@ -1843,6 +1898,14 @@ 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."
 msgstr ""
 
@@ -1869,8 +1932,11 @@ msgstr ""
 #. 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>
@@ -1894,7 +1960,7 @@ msgid ""
 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 ""
 
@@ -1953,14 +2019,23 @@ msgstr ""
 
 #. 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 ""
-"<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 frontend to set various "
+"settings for a package like 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>
@@ -1968,9 +2043,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 "
-"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 package you installed explicitely is "
+"marked as manually installed.  Once a 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>
@@ -1992,35 +2069,46 @@ msgstr ""
 #. 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 ""
-"<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 ""
-"<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 ""
-"<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>
@@ -2030,13 +2118,22 @@ msgid ""
 "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 "Shedule packages for install, remove and purge"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><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>."
+"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>, "
+"<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>
@@ -2054,38 +2151,49 @@ msgstr ""
 #. 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 ""
-"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 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."
 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 frontends 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
-msgid "Trusted archives"
+msgid "Trusted repositories"
 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 "
@@ -2105,12 +2213,13 @@ msgstr ""
 #. 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 e.g. 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 one "
+"of the Debian package maintainers 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>
@@ -2163,10 +2272,10 @@ msgstr ""
 #. 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>
@@ -2178,9 +2287,18 @@ msgstr ""
 #: 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 securily "
+"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>
@@ -2227,7 +2345,20 @@ msgstr ""
 msgid ""
 "<emphasis>Publish the key fingerprint</emphasis>, that way your users will "
 "know what key they need to import in order to authenticate the files in the "
-"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 securily 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 leverage the web of trust."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -2249,7 +2380,7 @@ msgstr ""
 #: 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 "
+"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 "
 "url=\"http://www.cryptnet.net/fdp/crypto/strong_distro.html\" >Strong "
@@ -2536,6 +2667,13 @@ 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 ""
 "the command line options are applied to override the configuration "
 "directives or to load even more configuration files."
 msgstr ""
@@ -3372,6 +3510,40 @@ 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"
 msgstr ""
 
@@ -5371,6 +5543,22 @@ 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 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."
+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 "
diff --git a/doc/po/de.po b/doc/po/de.po
index 20afe56d4..b8d848781 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.8\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-10-22 16:34+0200\n"
 "PO-Revision-Date: 2014-09-14 14:46+0200\n"
 "Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -644,66 +644,106 @@ msgstr "Beschreibung"
 #. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml
 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 ""
-"<command>apt</command> (Advanced Package Tool) ist das Befehlszeilenwerkzeug "
-"für den Umgang mit Paketen. Es stellt eine Befehlszeilenschnittstelle zur "
-"Verwaltung von Paketen auf dem System bereit. Tiefer ansetzende "
-"Befehlsoptionen finden sie unter &apt-get; und &apt-cache;."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml
 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 "
+"overwelming readers with a cornucopia of options and details."
 msgstr ""
-"<literal>list</literal> wird benutzt, um eine Paketliste anzuzeigen. Es "
-"unterstützt Shell-Muster zur Beschränkung auf passende Paketnamen. Die "
-"folgenden Optionen werden unterstützt: <option>--installed</option>, "
-"<option>--upgradable</option>, <option>--upgradeable</option>, <option>--all-"
-"versions</option>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml
+#, fuzzy
+#| msgid "apt-get"
+msgid "(&apt-get;)"
+msgstr "apt-get"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
-"<literal>search</literal> searches for the given term(s) and display "
-"matching packages."
+"<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 ""
-"<literal>search</literal> sucht nach angegebenen Begriffen und zeigt "
-"passende Pakete an."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>upgrade</literal> is used to install the newest versions of all "
+#| "packages currently installed on the system from the sources enumerated in "
+#| "<filename>/etc/apt/sources.list</filename>. New packages will be "
+#| "installed, but existing packages will never be removed."
+msgid ""
+"<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 ""
+"<literal>upgrade</literal> wird verwendet, um die neuesten Versionen aller "
+"derzeit auf Ihrem System installierten Pakete von den in <filename>/etc/apt/"
+"sources.list</filename> aufgezählten Quellen zu installieren. Dabei werden "
+"neue Pakete installiert, existierende jedoch nicht entfernt."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml
+#, fuzzy
+#| 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."
 msgid ""
-"<literal>show</literal> shows the package information for the given "
-"package(s)."
+"<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 ""
+"<literal>full-upgrade</literal> verrichtet die Funktion von »upgrade«, kann "
+"aber auch installierte Pakete entfernen, falls dies zum Auflösen eines "
+"Paketkonflikts nötig ist."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml
+msgid ","
 msgstr ""
-"<literal>show</literal> zeigt die Paketinformationen für die angegebenen "
-"Pakete."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
-"<literal>install</literal> is followed by one or more package names desired "
-"for installation or upgrading."
+"Performs the requested action on one or more packages specified via &regex;, "
+"&glob; or exact match. The requested action can be overidden for specific "
+"packages by append a plus (+) to the package name to install this package or "
+"a minus (-) to remove it."
 msgstr ""
-"<literal>install</literal> wird ergänzt mit einem oder mehreren Paketnamen, "
-"von denen eine Installation oder ein Upgrade gewünscht wird."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml apt-get.8.xml
+#: apt.8.xml
+#, fuzzy
+#| 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)."
 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)."
+"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 ""
 "Eine bestimmte Version eines Paketes kann durch den Paketnamen gefolgt von "
 "einem Gleichheitszeichen und der Version des Paketes zur Installation "
@@ -714,36 +754,29 @@ msgstr ""
 "ausgewählt werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml apt-get.8.xml
+#: apt.8.xml
 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 ""
-"<literal>remove</literal> ist identisch mit <literal>install</literal>, mit "
-"der Ausnahme, dass Pakete entfernt anstatt installiert werden. Beachten Sie, "
-"dass das Entfernen von Paketen deren Konfigurationsdateien im System "
-"belässt. Wenn ein Pluszeichen an den Paketnamen angehängt wird (ohne "
-"Leerzeichen dazwischen) wird das erkannte Paket installiert anstatt entfernt."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.8.xml apt-get.8.xml
-msgid "(and the"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.8.xml apt-get.8.xml
-msgid "alias since 1.1)"
+"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 accidently 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."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml apt-get.8.xml
+#: apt.8.xml
+#, fuzzy
+#| 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."
 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."
+"now no longer needed as dependencies changed or the package(s)  needing them "
+"were removed in the meantime."
 msgstr ""
 "<literal>autoremove</literal> wird benutzt, um Pakete zu entfernen, die "
 "automatisch installiert wurden, um Abhängigkeiten für andere Pakete zu "
@@ -752,64 +785,99 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
-"<literal>edit-sources</literal> lets you edit your sources.list file and "
-"provides basic sanity checks."
+"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 "
+"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."
 msgstr ""
-"<literal>edit-sources</literal> ermöglicht die Bearbeitung Ihrer »sources."
-"list«-Datei und stellt grundlegende Plausibilitätsprüfungen bereit."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml
+#, fuzzy
+#| msgid "&apt-conf;"
+msgid "(&apt-cache;)"
+msgstr "&apt-conf;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
-"<literal>update</literal> is used to resynchronize the package index files "
-"from their sources."
+"<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 "
+"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 ""
-"<literal>update</literal> wird benutzt, um die Paketindexdateien wieder mit "
-"ihren Quellen in Einklang zu bringen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 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."
+"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 "
+"look at this information before allowing &apt; to remove a package or while "
+"searching for new packages to install."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml
+msgid "(work-in-progress)"
 msgstr ""
-"<literal>upgrade</literal> wird verwendet, um die neuesten Versionen aller "
-"derzeit auf Ihrem System installierten Pakete von den in <filename>/etc/apt/"
-"sources.list</filename> aufgezählten Quellen zu installieren. Dabei werden "
-"neue Pakete installiert, existierende jedoch nicht entfernt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
-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."
+#, fuzzy
+#| 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."
+msgid ""
+"<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 ""
-"<literal>full-upgrade</literal> verrichtet die Funktion von »upgrade«, kann "
-"aber auch installierte Pakete entfernen, falls dies zum Auflösen eines "
-"Paketkonflikts nötig ist."
+"<literal>list</literal> wird benutzt, um eine Paketliste anzuzeigen. Es "
+"unterstützt Shell-Muster zur Beschränkung auf passende Paketnamen. Die "
+"folgenden Optionen werden unterstützt: <option>--installed</option>, "
+"<option>--upgradable</option>, <option>--upgradeable</option>, <option>--all-"
+"versions</option>."
 
-#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-mark.8.xml apt-config.8.xml
-#: apt-extracttemplates.1.xml apt-sortpkgs.1.xml apt-ftparchive.1.xml
-msgid "options"
-msgstr "Optionen"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>edit-sources</literal> lets you edit your sources.list file and "
+#| "provides basic sanity checks."
+msgid ""
+"<literal>edit-sources</literal> lets you edit your &sources-list; files in "
+"your preferred texteditor while also providing basic sanity checks."
+msgstr ""
+"<literal>edit-sources</literal> ermöglicht die Bearbeitung Ihrer »sources."
+"list«-Datei und stellt grundlegende Plausibilitätsprüfungen bereit."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.8.xml
-msgid "Script usage"
-msgstr "Skriptaufruf"
+msgid "Script usage and Differences to other APT tools"
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml
+#, fuzzy
+#| 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."
 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."
+"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 "
+"interactive use."
 msgstr ""
 "Die &apt;-Befehlszeile wurde als Endanwenderwerkzeug entworfen und kann bei "
 "Versionswechseln die Ausgabe ändern. Obwohl es versucht, nicht die "
@@ -818,49 +886,15 @@ msgstr ""
 "Optionen verfügbar. Bitte benutzen Sie vorzugsweise diese Befehle in Ihren "
 "Skripten."
 
-#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml
-msgid "Differences to &apt-get;"
-msgstr "Unterschiede zu &apt-get;"
-
 #. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml
 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:"
+"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."
 msgstr ""
-"Der Befehl <command>apt</command> ist dazu gedacht, dem Endanwender die "
-"Arbeit zu erleichtern und benötigt keine Abwärtskompatibilität wie &apt-"
-"get;. Daher unterscheiden sich einige Optionen:"
-
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml
-msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
-msgstr "Die Option <literal>DPkg::Progress-Fancy</literal> ist aktiviert."
-
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml
-msgid "The option <literal>APT::Color</literal> is enabled."
-msgstr "Die Option <literal>APT::Color</literal> ist aktiviert."
-
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml
-msgid ""
-"A new <literal>list</literal> command is available similar to <literal>dpkg "
-"--list</literal>."
-msgstr ""
-"Ein neuer <literal>list</literal>-Befehl ist verfügbar. Er ist <literal>dpkg "
-"--list</literal> ähnlich."
-
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml
-msgid ""
-"The option <literal>upgrade</literal> has <literal>--with-new-pkgs</literal> "
-"enabled by default."
-msgstr ""
-"Bei der Option <literal>upgrade</literal> ist standardmäßig <literal>--with-"
-"new-pkgs</literal> aktiviert."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml
@@ -1049,6 +1083,24 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 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 ""
+"Eine bestimmte Version eines Paketes kann durch den Paketnamen gefolgt von "
+"einem Gleichheitszeichen und der Version des Paketes zur Installation "
+"ausgewählt werden. Dies bewirkt, dass diese Version gesucht und zum "
+"Installieren ausgewählt wird. Alternativ kann eine bestimmte Distribution "
+"durch den Paketnamen gefolgt von einem Schrägstrich und der Version der "
+"Distribution oder des Archivnamens (»stable«, »testing«, »unstable«) "
+"ausgewählt werden."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
 "used with care."
 msgstr ""
@@ -1108,6 +1160,21 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 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 ""
+"<literal>remove</literal> ist identisch mit <literal>install</literal>, mit "
+"der Ausnahme, dass Pakete entfernt anstatt installiert werden. Beachten Sie, "
+"dass das Entfernen von Paketen deren Konfigurationsdateien im System "
+"belässt. Wenn ein Pluszeichen an den Paketnamen angehängt wird (ohne "
+"Leerzeichen dazwischen) wird das erkannte Paket installiert anstatt entfernt."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
 "that packages are removed and purged (any configuration files are deleted "
 "too)."
@@ -1241,6 +1308,16 @@ msgstr ""
 "<filename>&cachedir;/archives/</filename> und <filename>&cachedir;/archives/"
 "partial/</filename>."
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml
+msgid "(and the"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml
+msgid "alias since 1.1)"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
@@ -1263,6 +1340,17 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
+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 ""
+"<literal>autoremove</literal> wird benutzt, um Pakete zu entfernen, die "
+"automatisch installiert wurden, um Abhängigkeiten für andere Pakete zu "
+"erfüllen und die nicht mehr benötigt werden."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
 #, fuzzy
 #| msgid ""
 #| "<literal>changelog</literal> downloads a package changelog and displays "
@@ -1304,6 +1392,12 @@ msgid ""
 "<literal><filename>doc/acquire-additional-files.txt</filename></literal>."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><title>
+#: apt-get.8.xml apt-cache.8.xml apt-config.8.xml apt-extracttemplates.1.xml
+#: apt-sortpkgs.1.xml apt-ftparchive.1.xml
+msgid "options"
+msgstr "Optionen"
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
@@ -2594,6 +2688,14 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
+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
 msgid "Remove a key from the list of trusted keys."
 msgstr ""
 "entfernt einen Schlüssel von der Liste der vertrauenswürdigen Schlüssel."
@@ -2621,11 +2723,11 @@ msgstr "listet Fingerabdrücke vertrauenswürdiger Schlüssel auf."
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 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 ""
-"leitet erweitere Optionen an gpg weiter. Mit adv --recv-key können Sie den "
-"öffentlichen Schlüssel herunterladen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
@@ -2660,7 +2762,7 @@ msgstr ""
 "Ubuntu funktioniert dies aber."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml apt-cdrom.8.xml
+#: apt-key.8.xml apt-mark.8.xml apt-cdrom.8.xml
 msgid "Options"
 msgstr "Optionen"
 
@@ -2730,28 +2832,42 @@ msgstr "&apt-get;, &apt-secure;"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-mark.8.xml
-msgid "mark/unmark a package as being automatically-installed"
+msgid "show, set and unset various settings for a package"
 msgstr ""
-"ein Paket als automatisch installiert markieren oder diese Markierung "
-"entfernen"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-mark.8.xml
 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 frontend to set various "
+"settings for a package like 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
+msgid "Automatically and manually installed packages"
 msgstr ""
-"<command>apt-mark</command> wird ändern, ob ein Paket als automatisch "
-"installiert markiert ist."
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-mark.8.xml
+#, fuzzy
+#| 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>."
 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 package you installed explicitely is "
+"marked as manually installed.  Once a 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 ""
 "Wenn Sie die Installation eines Paketes anfordern und andere Pakete "
 "installiert werden, um dessen Abhängigkeiten zu erfüllen, werden die "
@@ -2785,31 +2901,6 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml
 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."
-msgstr ""
-"<literal>hold</literal> wird benutzt, um ein Paket als zurückgehalten zu "
-"markieren, was verhindert, dass das Paket automatisch installiert, ein "
-"Upgrade davon durchgeführt oder es entfernt wird. Der Befehl ist nur ein "
-"Wrapper um <command>dpkg --set-selections</command> und der Status wird "
-"daher durch &dpkg; verwaltet und nicht durch die Option <option>--file</"
-"option>."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml
-msgid ""
-"<literal>unhold</literal> is used to cancel a previously set hold on a "
-"package to allow all actions again."
-msgstr ""
-"<literal>unhold</literal> wird benutzt, um ein vorher gesetztes »hold« auf "
-"ein Paket aufzuheben, um alle Aktionen wieder zu erlauben."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml
-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 "
@@ -2832,6 +2923,48 @@ msgstr ""
 "<literal>showauto</literal> benutzt werden, mit der Ausnahme, dass es "
 "stattdessen eine Liste manuell installierter Pakete ausgibt."
 
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml
+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 ""
+"schreibt/liest Paketstatus von dem Dateinamen, der mit dem Parameter "
+"&synopsis-param-filename;, anstatt vom Standardort, der "
+"<filename>extended_status</filename> im von Konfigurationselement "
+"<literal>Dir::State</literal> definierten Verzeichnis, ist."
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt-mark.8.xml
+msgid "Prevent changes for a package"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>manual</literal> is used to mark a package as being manually "
+#| "installed, which will prevent the package from being automatically "
+#| "removed if no other packages depend on it."
+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."
+msgstr ""
+"<literal>manual</literal> wird benutzt, um ein Paket als manuell installiert "
+"zu markieren, was verhindert, dass das Paket automatisch entfernt wird, wenn "
+"kein anderes Paket von ihm abhängt."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml
+msgid ""
+"<literal>unhold</literal> is used to cancel a previously set hold on a "
+"package to allow all actions again."
+msgstr ""
+"<literal>unhold</literal> wird benutzt, um ein vorher gesetztes »hold« auf "
+"ein Paket aufzuheben, um alle Aktionen wieder zu erlauben."
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml
 msgid ""
@@ -2841,18 +2974,23 @@ msgstr ""
 "<literal>showhold</literal> wird benutzt, um eine Liste auf »hold« gesetzter "
 "Pakete auf die gleiche Art wie für andere Anzeigebefehle auszugeben."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><title>
+#: apt-mark.8.xml
+msgid "Shedule packages for install, remove and purge"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
 #: apt-mark.8.xml
 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 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>, <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 ""
-"schreibt/liest Paketstatus von dem Dateinamen, der mit dem Parameter "
-"&synopsis-param-filename;, anstatt vom Standardort, der "
-"<filename>extended_status</filename> im von Konfigurationselement "
-"<literal>Dir::State</literal> definierten Verzeichnis, ist."
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-mark.8.xml
@@ -2870,11 +3008,17 @@ msgstr "Archivauthentifizierungsunterstützung für APT"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| 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."
 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 ""
 "Beginnend mit Version 0.6 enthält <command>apt</command> Code, der die "
 "Signatur der Release-Datei für alle Archive prüft. Dies stellt sicher, dass "
@@ -2884,37 +3028,56 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 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 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."
 msgstr ""
-"Wenn ein Paket aus einem Archiv ohne Signatur stammt oder einem mit "
-"Signatur, für das APT keinen Schlüssel hat, wird dieses Paket als nicht "
-"vertrauenswürdig angesehen und es zu installieren, führt zu einer großen "
-"Warnung. <command>apt-get</command> wird aktuell nur bei nicht signierten "
-"Archiven warnen, zukünftige Releases könnten die Prüfung aller Quellen vor "
-"dem Herunterladen von Paketen von dort erzwingen."
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 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
+#, fuzzy
+#| msgid ""
+#| "The package frontends &apt-get;, &aptitude; and &synaptic; support this "
+#| "new authentication feature."
+msgid ""
+"Note: All APT-based package management frontends 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 ""
 "Die Paketoberflächen &apt-get;, &aptitude; und &synaptic; unterstützen diese "
 "neue Authentifizierungsfunktion."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-secure.8.xml
-msgid "Trusted archives"
+#, fuzzy
+#| msgid "Trusted archives"
+msgid "Trusted repositories"
 msgstr "Vertrauenswürdige Archive"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
-msgid ""
-"The chain of trust from an apt archive to the end user is made up of several "
+#, fuzzy
+#| msgid ""
+#| "The chain of trust from an apt archive to the end user is made up of "
+#| "several steps. <command>apt-secure</command> is the last step in this "
+#| "chain; 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 archive maintainer's responsibility to ensure that "
+#| "the archive's integrity is preserved."
+msgid ""
+"The chain of trust from an APT archive to the end user is made up of several "
 "steps. <command>apt-secure</command> is the last step in this chain; "
 "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 "
@@ -2944,13 +3107,22 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
-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."
+#, fuzzy
+#| 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."
+msgid ""
+"The chain of trust in Debian e.g. 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 one "
+"of the Debian package maintainers 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 ""
 "Die Kette des Vertrauens in Debian beginnt, wenn eine Betreuer ein neues "
 "Paket oder eine neue Version eines Pakets in das Debian-Archiv hochlädt. "
@@ -3033,11 +3205,17 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| 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."
 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 ""
 "Es schützt jedoch nicht gegen eine Kompromittierung des Haupt-Debian-Servers "
 "selbst (der die Pakete signiert) oder gegen eine Kompromittierung des "
@@ -3051,11 +3229,17 @@ msgstr "Benutzerkonfiguration"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| 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."
 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 ""
 "<command>apt-key</command> ist das Programm, das die Liste der von APT "
 "verwendeten Schlüssel verwaltet. Es kann benutzt werden, um Schlüssel "
@@ -3066,6 +3250,15 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""
+"Note that a default installation already contains all keys to securily "
+"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>
+#: apt-secure.8.xml
+msgid ""
 "In order to add a new key you need to first download it (you should make "
 "sure you are using a trusted communication channel when retrieving it), add "
 "it with <command>apt-key</command> and then run <command>apt-get update</"
@@ -3119,15 +3312,33 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| msgid ""
+#| "<emphasis>Publish the key fingerprint</emphasis>, that way your users "
+#| "will know what key they need to import in order to authenticate the files "
+#| "in the archive."
 msgid ""
 "<emphasis>Publish the key fingerprint</emphasis>, that way your users will "
 "know what key they need to import in order to authenticate the files in the "
-"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 ""
 "<emphasis>Veröffentlichen Sie den Schlüsselfingerabdruck</emphasis>, damit "
 "Ihre Anwender wissen, welchen Schlüssel sie importieren müssen, um die "
 "Dateien im Archiv zu authentifizieren."
 
+#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
+#: apt-secure.8.xml
+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 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."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""
@@ -3150,9 +3361,17 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| 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=\"http://"
+#| "www.cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution "
+#| "HOWTO</ulink> by V. Alex Brennen."
 msgid ""
 "For more background information you might want to review the <ulink url="
-"\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
+"\"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 url=\"http://www."
 "cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution HOWTO</"
@@ -3543,6 +3762,13 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
 #: apt.conf.5.xml
 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
+msgid ""
 "the command line options are applied to override the configuration "
 "directives or to load even more configuration files."
 msgstr ""
@@ -4831,6 +5057,41 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.conf.5.xml
+#, fuzzy
+#| msgid "User configuration"
+msgid "Binary specific configuration"
+msgstr "Benutzerkonfiguration"
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml
+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
+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
+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
 msgid "Directories"
 msgstr "Verzeichnisse"
 
@@ -5756,8 +6017,7 @@ msgstr ""
 "literal> oder <literal>APT::Update::{Pre,Post}-Invoke</literal> mit ein."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml
-#: apt-ftparchive.1.xml
+#: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml apt-ftparchive.1.xml
 msgid "Examples"
 msgstr "Beispiele"
 
@@ -7655,6 +7915,22 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #: sources.list.5.xml
 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."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml
+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 "
@@ -10861,6 +11137,129 @@ msgid "Which will use the already fetched archives on the disc."
 msgstr "Es wird die bereits auf die Platte heruntergeladenen Archive benutzen."
 
 #~ msgid ""
+#~ "<command>apt</command> (Advanced Package Tool) is the command-line tool "
+#~ "for handling packages. It provides a commandline interface for the "
+#~ "package management of the system.  See also &apt-get; and &apt-cache; for "
+#~ "more low-level command options."
+#~ msgstr ""
+#~ "<command>apt</command> (Advanced Package Tool) ist das "
+#~ "Befehlszeilenwerkzeug für den Umgang mit Paketen. Es stellt eine "
+#~ "Befehlszeilenschnittstelle zur Verwaltung von Paketen auf dem System "
+#~ "bereit. Tiefer ansetzende Befehlsoptionen finden sie unter &apt-get; und "
+#~ "&apt-cache;."
+
+#~ msgid ""
+#~ "<literal>search</literal> searches for the given term(s) and display "
+#~ "matching packages."
+#~ msgstr ""
+#~ "<literal>search</literal> sucht nach angegebenen Begriffen und zeigt "
+#~ "passende Pakete an."
+
+#~ msgid ""
+#~ "<literal>show</literal> shows the package information for the given "
+#~ "package(s)."
+#~ msgstr ""
+#~ "<literal>show</literal> zeigt die Paketinformationen für die angegebenen "
+#~ "Pakete."
+
+#~ msgid ""
+#~ "<literal>install</literal> is followed by one or more package names "
+#~ "desired for installation or upgrading."
+#~ msgstr ""
+#~ "<literal>install</literal> wird ergänzt mit einem oder mehreren "
+#~ "Paketnamen, von denen eine Installation oder ein Upgrade gewünscht wird."
+
+#~ msgid ""
+#~ "<literal>update</literal> is used to resynchronize the package index "
+#~ "files from their sources."
+#~ msgstr ""
+#~ "<literal>update</literal> wird benutzt, um die Paketindexdateien wieder "
+#~ "mit ihren Quellen in Einklang zu bringen."
+
+#~ msgid "Script usage"
+#~ msgstr "Skriptaufruf"
+
+#~ msgid "Differences to &apt-get;"
+#~ msgstr "Unterschiede zu &apt-get;"
+
+#~ msgid ""
+#~ "The <command>apt</command> command is meant to be pleasant for end users "
+#~ "and does not need to be backward compatible like &apt-get;. Therefore "
+#~ "some options are different:"
+#~ msgstr ""
+#~ "Der Befehl <command>apt</command> ist dazu gedacht, dem Endanwender die "
+#~ "Arbeit zu erleichtern und benötigt keine Abwärtskompatibilität wie &apt-"
+#~ "get;. Daher unterscheiden sich einige Optionen:"
+
+#~ msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
+#~ msgstr "Die Option <literal>DPkg::Progress-Fancy</literal> ist aktiviert."
+
+#~ msgid "The option <literal>APT::Color</literal> is enabled."
+#~ msgstr "Die Option <literal>APT::Color</literal> ist aktiviert."
+
+#~ msgid ""
+#~ "A new <literal>list</literal> command is available similar to "
+#~ "<literal>dpkg --list</literal>."
+#~ msgstr ""
+#~ "Ein neuer <literal>list</literal>-Befehl ist verfügbar. Er ist "
+#~ "<literal>dpkg --list</literal> ähnlich."
+
+#~ msgid ""
+#~ "The option <literal>upgrade</literal> has <literal>--with-new-pkgs</"
+#~ "literal> enabled by default."
+#~ msgstr ""
+#~ "Bei der Option <literal>upgrade</literal> ist standardmäßig <literal>--"
+#~ "with-new-pkgs</literal> aktiviert."
+
+#~ msgid ""
+#~ "Pass advanced options to gpg. With adv --recv-key you can download the "
+#~ "public key."
+#~ msgstr ""
+#~ "leitet erweitere Optionen an gpg weiter. Mit adv --recv-key können Sie "
+#~ "den öffentlichen Schlüssel herunterladen."
+
+#~ msgid "mark/unmark a package as being automatically-installed"
+#~ msgstr ""
+#~ "ein Paket als automatisch installiert markieren oder diese Markierung "
+#~ "entfernen"
+
+#~ msgid ""
+#~ "<command>apt-mark</command> will change whether a package has been marked "
+#~ "as being automatically installed."
+#~ msgstr ""
+#~ "<command>apt-mark</command> wird ändern, ob ein Paket als automatisch "
+#~ "installiert markiert ist."
+
+#~ 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."
+#~ msgstr ""
+#~ "<literal>hold</literal> wird benutzt, um ein Paket als zurückgehalten zu "
+#~ "markieren, was verhindert, dass das Paket automatisch installiert, ein "
+#~ "Upgrade davon durchgeführt oder es entfernt wird. Der Befehl ist nur ein "
+#~ "Wrapper um <command>dpkg --set-selections</command> und der Status wird "
+#~ "daher durch &dpkg; verwaltet und nicht durch die Option <option>--file</"
+#~ "option>."
+
+#~ 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."
+#~ msgstr ""
+#~ "Wenn ein Paket aus einem Archiv ohne Signatur stammt oder einem mit "
+#~ "Signatur, für das APT keinen Schlüssel hat, wird dieses Paket als nicht "
+#~ "vertrauenswürdig angesehen und es zu installieren, führt zu einer großen "
+#~ "Warnung. <command>apt-get</command> wird aktuell nur bei nicht signierten "
+#~ "Archiven warnen, zukünftige Releases könnten die Prüfung aller Quellen "
+#~ "vor dem Herunterladen von Paketen von dort erzwingen."
+
+#~ msgid ""
 #~ "No action; perform a simulation of events that would occur but do not "
 #~ "actually change the system.  Configuration Item: <literal>APT::Get::"
 #~ "Simulate</literal>."
diff --git a/doc/po/es.po b/doc/po/es.po
index 4a2bb4fd4..8dbfecd58 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -38,7 +38,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.5\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-10-22 16:34+0200\n"
 "PO-Revision-Date: 2014-07-04 01:31+0200\n"
 "Last-Translator: Omar Campagne <ocampagne@gmail.com>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -728,56 +728,88 @@ msgstr "Descripción"
 #. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml
 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 ""
 
+#. type: Content of: <refentry><refsect1><para>
+#: apt.8.xml
+msgid ""
+"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 "
+"overwelming readers with a cornucopia of options and details."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml
+#, fuzzy
+#| msgid "apt-get"
+msgid "(&apt-get;)"
+msgstr "apt-get"
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 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."
+"<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
 msgid ""
-"<literal>search</literal> searches for the given term(s) and display "
-"matching packages."
+"<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>
 #: apt.8.xml
-#, fuzzy
-#| msgid ""
-#| "<literal>rdepends</literal> shows a listing of each reverse dependency a "
-#| "package has."
 msgid ""
-"<literal>show</literal> shows the package information for the given "
-"package(s)."
+"<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>
+#: apt.8.xml
+msgid ","
 msgstr ""
-"<literal>rdepends</literal> muestra las dependencias inversas de un paquete."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
-"<literal>install</literal> is followed by one or more package names desired "
-"for installation or upgrading."
+"Performs the requested action on one or more packages specified via &regex;, "
+"&glob; or exact match. The requested action can be overidden 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 apt-get.8.xml
+#: apt.8.xml
+#, fuzzy
+#| 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)."
 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)."
+"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 ""
 "Puede seleccionar una versión especifica de un paquete poniendo a "
 "continuación del nombre del paquete un símbolo igual («=») seguido de la "
@@ -788,37 +820,29 @@ msgstr ""
 "(stable, testing, unstable)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml apt-get.8.xml
+#: apt.8.xml
 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 ""
-"<literal>remove</literal> se comporta del mismo modo que <literal>install</"
-"literal> con la diferencia de que elimina los paquetes en vez de "
-"instalarlos. Tenga en cuenta que al eliminar un paquete sus ficheros de "
-"configuración permanecen en el sistema. Si un signo de suma precede al "
-"nombre del paquete (sin ningún espacio en blanco entre los dos), el paquete "
-"en cuestión será instalado en vez de eliminado."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.8.xml apt-get.8.xml
-msgid "(and the"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.8.xml apt-get.8.xml
-msgid "alias since 1.1)"
+"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 accidently 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."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml apt-get.8.xml
+#: apt.8.xml
+#, fuzzy
+#| 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."
 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."
+"now no longer needed as dependencies changed or the package(s)  needing them "
+"were removed in the meantime."
 msgstr ""
 "<literal>autoremove</literal> desinstala paquetes que se instalaron "
 "automáticamente para satisfacer las dependencias de otros paquetes pero que "
@@ -827,104 +851,86 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
-"<literal>edit-sources</literal> lets you edit your sources.list file and "
-"provides basic sanity checks."
+"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 "
+"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."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt.8.xml
 #, fuzzy
-#| msgid ""
-#| "<literal>showhold</literal> is used to print a list of packages on hold "
-#| "in the same way as for the other show commands."
-msgid ""
-"<literal>update</literal> is used to resynchronize the package index files "
-"from their sources."
-msgstr ""
-"<literal>showhold</literal> muestra una lista de paquetes retenidos («hold») "
-"de la misma forma que las otras órdenes «show»."
+#| msgid "&apt-conf;"
+msgid "(&apt-cache;)"
+msgstr "&apt-conf;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 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."
+"<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 "
+"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 ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 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."
+"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 "
+"look at this information before allowing &apt; to remove a package or while "
+"searching for new packages to install."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-mark.8.xml apt-config.8.xml
-#: apt-extracttemplates.1.xml apt-sortpkgs.1.xml apt-ftparchive.1.xml
-msgid "options"
-msgstr "Opciones"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml
+msgid "(work-in-progress)"
+msgstr ""
 
-#. type: Content of: <refentry><refsect1><title>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
-msgid "Script usage"
+msgid ""
+"<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 ""
 
-#. type: Content of: <refentry><refsect1><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 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."
+"<literal>edit-sources</literal> lets you edit your &sources-list; files in "
+"your preferred texteditor while also providing basic sanity checks."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.8.xml
-msgid "Differences to &apt-get;"
+msgid "Script usage and Differences to other APT tools"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml
 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:"
+"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 "
+"interactive use."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml
-#, fuzzy
-#| msgid "the <literal>Package:</literal> line"
-msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
-msgstr "La línea <literal>Package:</literal>"
-
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml
-#, fuzzy
-#| msgid "the <literal>Component:</literal> line"
-msgid "The option <literal>APT::Color</literal> is enabled."
-msgstr "La línea <literal>Component:</literal>"
-
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml
 msgid ""
-"A new <literal>list</literal> command is available similar to <literal>dpkg "
-"--list</literal>."
+"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."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml
-#, fuzzy
-#| msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
-msgid ""
-"The option <literal>upgrade</literal> has <literal>--with-new-pkgs</literal> "
-"enabled by default."
-msgstr "Las líneas <literal>Archive:</literal> o <literal>Suite:</literal>"
-
 #. type: Content of: <refentry><refsect1><title>
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml
 #: apt-secure.8.xml apt-cdrom.8.xml apt-config.8.xml apt.conf.5.xml
@@ -1128,6 +1134,24 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 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 ""
+"Puede seleccionar una versión especifica de un paquete poniendo a "
+"continuación del nombre del paquete un símbolo igual («=») seguido de la "
+"versión deseada. Esto provocará que se localice y seleccione esa versión "
+"para su instalación. Alternativamente se puede seleccionar una distribución "
+"específica poniendo a continuación del nombre del paquete una barra («/») "
+"seguida de la versión de la distribución o su nombre en el archivo de Debian "
+"(stable, testing, unstable)."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
 "used with care."
 msgstr ""
@@ -1186,6 +1210,22 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 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 ""
+"<literal>remove</literal> se comporta del mismo modo que <literal>install</"
+"literal> con la diferencia de que elimina los paquetes en vez de "
+"instalarlos. Tenga en cuenta que al eliminar un paquete sus ficheros de "
+"configuración permanecen en el sistema. Si un signo de suma precede al "
+"nombre del paquete (sin ningún espacio en blanco entre los dos), el paquete "
+"en cuestión será instalado en vez de eliminado."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
 "that packages are removed and purged (any configuration files are deleted "
 "too)."
@@ -1328,6 +1368,16 @@ msgstr ""
 "no usa dselect es probable que desee ejecutar <literal>apt-get clean</"
 "literal> de vez en cuando para liberar algo de espacio en disco."
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml
+msgid "(and the"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml
+msgid "alias since 1.1)"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
@@ -1349,6 +1399,17 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
+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 ""
+"<literal>autoremove</literal> desinstala paquetes que se instalaron "
+"automáticamente para satisfacer las dependencias de otros paquetes pero que "
+"ya no son necesarios."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
 #, fuzzy
 #| msgid ""
 #| "<literal>changelog</literal> downloads a package changelog and displays "
@@ -1391,6 +1452,12 @@ msgid ""
 "<literal><filename>doc/acquire-additional-files.txt</filename></literal>."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><title>
+#: apt-get.8.xml apt-cache.8.xml apt-config.8.xml apt-extracttemplates.1.xml
+#: apt-sortpkgs.1.xml apt-ftparchive.1.xml
+msgid "options"
+msgstr "Opciones"
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
@@ -2693,6 +2760,14 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
+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
 msgid "Remove a key from the list of trusted keys."
 msgstr "Elimina una clave de la lista de claves de confianza."
 
@@ -2719,11 +2794,11 @@ msgstr "Lista las huellas digitales de las claves de confianza."
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 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 ""
-"Proporciona opciones avanzadas a gpg. Puede descargar la clave pública con "
-"«adv --recv-key»."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
@@ -2758,7 +2833,7 @@ msgstr ""
 "de APT para Ubuntu sí es compatible."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml apt-cdrom.8.xml
+#: apt-key.8.xml apt-mark.8.xml apt-cdrom.8.xml
 msgid "Options"
 msgstr "Opciones"
 
@@ -2827,26 +2902,42 @@ msgstr "&apt-get;, &apt-secure;"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-mark.8.xml
-msgid "mark/unmark a package as being automatically-installed"
-msgstr "Marca o desmarca un paquete como instalado automáticamente"
+msgid "show, set and unset various settings for a package"
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-mark.8.xml
 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 frontend to set various "
+"settings for a package like 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
+msgid "Automatically and manually installed packages"
 msgstr ""
-"<command>apt-mark</command> conmuta si un paquete se instaló automáticamente "
-"o no."
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-mark.8.xml
+#, fuzzy
+#| 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>."
 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 package you installed explicitely is "
+"marked as manually installed.  Once a 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 ""
 "Cuando solicita la instalación de un paquete y como resultado de ello se "
 "instalan otros paquetes para satisfacer sus dependencias, éstos se marcarán "
@@ -2880,30 +2971,6 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml
 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."
-msgstr ""
-"<literal>hold</literal> sirve para marcar un paquete para su retención, "
-"impidiendo que el paquete se instale, actualice o elimine de forma "
-"automática. La orden es una interfaz para <command>dpkg --set-selections</"
-"command>, por lo que &dpkg; preserva el estado sin que la opción <option>--"
-"file</option> tenga efecto sobre él."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml
-msgid ""
-"<literal>unhold</literal> is used to cancel a previously set hold on a "
-"package to allow all actions again."
-msgstr ""
-"<literal>unhold</literal> sirve para permitir cualquier acción habitual "
-"sobre un paquete previamente marcado con «hold»."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml
-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 "
@@ -2925,16 +2992,7 @@ msgstr ""
 "<literal>showauto</literal>, a excepción de que muestra una lista de "
 "paquetes manualmente instalados."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml
-msgid ""
-"<literal>showhold</literal> is used to print a list of packages on hold in "
-"the same way as for the other show commands."
-msgstr ""
-"<literal>showhold</literal> muestra una lista de paquetes retenidos («hold») "
-"de la misma forma que las otras órdenes «show»."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml
 msgid ""
 "Read/Write package stats from the filename given with the parameter "
@@ -2948,6 +3006,62 @@ msgstr ""
 "directorio definido con la opción de configuración: <literal>Dir::State</"
 "literal>."
 
+#. type: Content of: <refentry><refsect1><title>
+#: apt-mark.8.xml
+msgid "Prevent changes for a package"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>manual</literal> is used to mark a package as being manually "
+#| "installed, which will prevent the package from being automatically "
+#| "removed if no other packages depend on it."
+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."
+msgstr ""
+"<literal>manual</literal> sirve para marcar un paquete como instalado "
+"manualmente, impidiendo la eliminación automática de este paquete si ningún "
+"otro depende de él."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml
+msgid ""
+"<literal>unhold</literal> is used to cancel a previously set hold on a "
+"package to allow all actions again."
+msgstr ""
+"<literal>unhold</literal> sirve para permitir cualquier acción habitual "
+"sobre un paquete previamente marcado con «hold»."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml
+msgid ""
+"<literal>showhold</literal> is used to print a list of packages on hold in "
+"the same way as for the other show commands."
+msgstr ""
+"<literal>showhold</literal> muestra una lista de paquetes retenidos («hold») "
+"de la misma forma que las otras órdenes «show»."
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt-mark.8.xml
+msgid "Shedule packages for install, remove and purge"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-mark.8.xml
+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>, <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>
 #: apt-mark.8.xml
 msgid ""
@@ -2964,11 +3078,17 @@ msgstr "Compatibilidad con la autenticación en el archivo para APT"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| 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."
 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 ""
 "Desde la versión 0.6, <command>apt</command> contiene el código que realiza "
 "la comprobación de la firma del fichero «Release» para todos los archivos. "
@@ -2978,37 +3098,56 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 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 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."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-secure.8.xml
+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>."
 msgstr ""
-"Si el paquete viene de un archivo sin una firma o con una firma de la que "
-"apt no tiene su clave, el paquete se considerará no fiable y su instalación "
-"provocará un aviso importante. <command>apt-get</command> actualmente sólo "
-"avisa de los archivos sin firmar, puede que las próximas versiones  fuercen "
-"una comprobación de todas las fuentes antes de descargar paquetes desde "
-"ellas."
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| msgid ""
+#| "The package frontends &apt-get;, &aptitude; and &synaptic; support this "
+#| "new authentication feature."
 msgid ""
-"The package frontends &apt-get;, &aptitude; and &synaptic; support this new "
-"authentication feature."
+"Note: All APT-based package management frontends 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 ""
 "Las interfaces de gestión de paquetes &apt-get;, &aptitude; y &synaptic; "
 "pueden usar esta nueva funcionalidad de autenticación."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-secure.8.xml
-msgid "Trusted archives"
+#, fuzzy
+#| msgid "Trusted archives"
+msgid "Trusted repositories"
 msgstr "Archivos de confianza"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
-msgid ""
-"The chain of trust from an apt archive to the end user is made up of several "
+#, fuzzy
+#| msgid ""
+#| "The chain of trust from an apt archive to the end user is made up of "
+#| "several steps. <command>apt-secure</command> is the last step in this "
+#| "chain; 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 archive maintainer's responsibility to ensure that "
+#| "the archive's integrity is preserved."
+msgid ""
+"The chain of trust from an APT archive to the end user is made up of several "
 "steps. <command>apt-secure</command> is the last step in this chain; "
 "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 "
@@ -3037,13 +3176,22 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
-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."
+#, fuzzy
+#| 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."
+msgid ""
+"The chain of trust in Debian e.g. 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 one "
+"of the Debian package maintainers 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 ""
 "La cadena de confianza de Debian comienza cuando un mantenedor sube un nuevo "
 "paquete o una nueva versión de un paquete al archivo de Debian. Para que la "
@@ -3127,11 +3275,17 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| 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."
 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 ""
 "Sin embargo, esto no protege de un servidor maestro de Debian (que firma los "
 "paquetes) comprometido o contra una clave usada para firmar los ficheros "
@@ -3145,11 +3299,17 @@ msgstr "Configuración de usuario"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| 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."
 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 ""
 "<command>apt-key</command> es el programa que gestiona la lista de claves "
 "usadas por apt. Se puede usar para añadir o eliminar claves, aunque la "
@@ -3160,6 +3320,15 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""
+"Note that a default installation already contains all keys to securily "
+"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>
+#: apt-secure.8.xml
+msgid ""
 "In order to add a new key you need to first download it (you should make "
 "sure you are using a trusted communication channel when retrieving it), add "
 "it with <command>apt-key</command> and then run <command>apt-get update</"
@@ -3212,15 +3381,33 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| msgid ""
+#| "<emphasis>Publish the key fingerprint</emphasis>, that way your users "
+#| "will know what key they need to import in order to authenticate the files "
+#| "in the archive."
 msgid ""
 "<emphasis>Publish the key fingerprint</emphasis>, that way your users will "
 "know what key they need to import in order to authenticate the files in the "
-"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 ""
 "<emphasis>Publicar la huella digital de la clave</emphasis>, de modo que los "
 "usuarios conozcan qué clave necesitan importar para autenticar los ficheros "
 "del archivo."
 
+#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
+#: apt-secure.8.xml
+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 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."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""
@@ -3243,9 +3430,17 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| 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=\"http://"
+#| "www.cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution "
+#| "HOWTO</ulink> by V. Alex Brennen."
 msgid ""
 "For more background information you might want to review the <ulink url="
-"\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
+"\"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 url=\"http://www."
 "cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution HOWTO</"
@@ -3641,6 +3836,13 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
 #: apt.conf.5.xml
 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
+msgid ""
 "the command line options are applied to override the configuration "
 "directives or to load even more configuration files."
 msgstr ""
@@ -4897,6 +5099,41 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.conf.5.xml
+#, fuzzy
+#| msgid "User configuration"
+msgid "Binary specific configuration"
+msgstr "Configuración de usuario"
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml
+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
+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
+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
 msgid "Directories"
 msgstr "Directorios"
 
@@ -5812,8 +6049,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml
-#: apt-ftparchive.1.xml
+#: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml apt-ftparchive.1.xml
 msgid "Examples"
 msgstr "Ejemplos"
 
@@ -7704,6 +7940,22 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #: sources.list.5.xml
 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."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml
+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 "
@@ -10865,6 +11117,90 @@ msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
 msgid "Which will use the already fetched archives on the disc."
 msgstr "Esto utiliza los archivos del disco previamente obtenidos."
 
+#, fuzzy
+#~| msgid ""
+#~| "<literal>rdepends</literal> shows a listing of each reverse dependency a "
+#~| "package has."
+#~ msgid ""
+#~ "<literal>show</literal> shows the package information for the given "
+#~ "package(s)."
+#~ msgstr ""
+#~ "<literal>rdepends</literal> muestra las dependencias inversas de un "
+#~ "paquete."
+
+#, fuzzy
+#~| msgid ""
+#~| "<literal>showhold</literal> is used to print a list of packages on hold "
+#~| "in the same way as for the other show commands."
+#~ msgid ""
+#~ "<literal>update</literal> is used to resynchronize the package index "
+#~ "files from their sources."
+#~ msgstr ""
+#~ "<literal>showhold</literal> muestra una lista de paquetes retenidos "
+#~ "(«hold») de la misma forma que las otras órdenes «show»."
+
+#, fuzzy
+#~| msgid "the <literal>Package:</literal> line"
+#~ msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
+#~ msgstr "La línea <literal>Package:</literal>"
+
+#, fuzzy
+#~| msgid "the <literal>Component:</literal> line"
+#~ msgid "The option <literal>APT::Color</literal> is enabled."
+#~ msgstr "La línea <literal>Component:</literal>"
+
+#, fuzzy
+#~| msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
+#~ msgid ""
+#~ "The option <literal>upgrade</literal> has <literal>--with-new-pkgs</"
+#~ "literal> enabled by default."
+#~ msgstr "Las líneas <literal>Archive:</literal> o <literal>Suite:</literal>"
+
+#~ msgid ""
+#~ "Pass advanced options to gpg. With adv --recv-key you can download the "
+#~ "public key."
+#~ msgstr ""
+#~ "Proporciona opciones avanzadas a gpg. Puede descargar la clave pública "
+#~ "con «adv --recv-key»."
+
+#~ msgid "mark/unmark a package as being automatically-installed"
+#~ msgstr "Marca o desmarca un paquete como instalado automáticamente"
+
+#~ msgid ""
+#~ "<command>apt-mark</command> will change whether a package has been marked "
+#~ "as being automatically installed."
+#~ msgstr ""
+#~ "<command>apt-mark</command> conmuta si un paquete se instaló "
+#~ "automáticamente o no."
+
+#~ 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."
+#~ msgstr ""
+#~ "<literal>hold</literal> sirve para marcar un paquete para su retención, "
+#~ "impidiendo que el paquete se instale, actualice o elimine de forma "
+#~ "automática. La orden es una interfaz para <command>dpkg --set-selections</"
+#~ "command>, por lo que &dpkg; preserva el estado sin que la opción "
+#~ "<option>--file</option> tenga efecto sobre él."
+
+#~ 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."
+#~ msgstr ""
+#~ "Si el paquete viene de un archivo sin una firma o con una firma de la que "
+#~ "apt no tiene su clave, el paquete se considerará no fiable y su "
+#~ "instalación provocará un aviso importante. <command>apt-get</command> "
+#~ "actualmente sólo avisa de los archivos sin firmar, puede que las próximas "
+#~ "versiones  fuercen una comprobación de todas las fuentes antes de "
+#~ "descargar paquetes desde ellas."
+
 #~ msgid ""
 #~ "No action; perform a simulation of events that would occur but do not "
 #~ "actually change the system.  Configuration Item: <literal>APT::Get::"
diff --git a/doc/po/fr.po b/doc/po/fr.po
index 4c6b6dde5..67b759120 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.5\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-10-22 16:34+0200\n"
 "PO-Revision-Date: 2014-11-15 17:26+0100\n"
 "Last-Translator: Jean-Pierre Giraud <jean-pierregiraud@neuf.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -640,65 +640,107 @@ msgstr "Description"
 #. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml
 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 ""
-"<command>apt</command> (Advanced Package Tool) est un outil en ligne de "
-"commande pour gérer les paquets. Il fournit une interface en ligne de "
-"commande au système de gestion de paquets. Voir également &apt-get; et &apt-"
-"cache; pour davantage d'options en ligne de commande."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml
 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 "
+"overwelming readers with a cornucopia of options and details."
 msgstr ""
-"La commande <literal>list</literal> est utilisée pour afficher une liste de "
-"paquets. Il gère les motifs du shell pour chercher les noms de paquets, "
-"ainsi que les options suivantes : <option>--installed</option>, <option>--"
-"upgradable</option>, <option>--all-versions</option>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml
+#, fuzzy
+#| msgid "apt-get"
+msgid "(&apt-get;)"
+msgstr "apt-get"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
-"<literal>search</literal> searches for the given term(s) and display "
-"matching packages."
+"<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
+#, fuzzy
+#| msgid ""
+#| "<literal>upgrade</literal> is used to install the newest versions of all "
+#| "packages currently installed on the system from the sources enumerated in "
+#| "<filename>/etc/apt/sources.list</filename>. New packages will be "
+#| "installed, but existing packages will never be removed."
+msgid ""
+"<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 ""
-"La commande <literal>search</literal> recherche le(s) terme(s) donnée(s) et "
-"affiche les paquets correspondants."
+"La commande <literal>upgrade</literal> permet d'installer les versions les "
+"plus récentes de tous les paquets présents sur le système en utilisant les "
+"sources énumérées dans <filename>/etc/apt/sources.list</filename>. De "
+"nouveaux paquets seront installés, mais les paquets installés ne seront "
+"jamais supprimés."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
+#, fuzzy
+#| 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."
 msgid ""
-"<literal>show</literal> shows the package information for the given "
-"package(s)."
+"<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 ""
+"La commande <literal>full-upgrade</literal> remplit la même fonction que "
+"upgrade mais peut aussi supprimer des paquets installés si cela est "
+"nécessaire pour résoudre un conflit entre des paquets."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml
+msgid ","
 msgstr ""
-"La commande <literal>show</literal> affiche les informations sur le(s) "
-"paquet(s) donné(s)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
-"<literal>install</literal> is followed by one or more package names desired "
-"for installation or upgrading."
+"Performs the requested action on one or more packages specified via &regex;, "
+"&glob; or exact match. The requested action can be overidden for specific "
+"packages by append a plus (+) to the package name to install this package or "
+"a minus (-) to remove it."
 msgstr ""
-"La commande <literal>install</literal> est suivie du nom de un ou plusieurs "
-"paquets dont l'installation ou la mise à jour est souhaitée."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml apt-get.8.xml
+#: apt.8.xml
+#, fuzzy
+#| 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)."
 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)."
+"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 ""
 "On peut choisir d'installer une version particulière d'un paquet en faisant "
 "suivre son nom par un signe égal et par la version. Cette version sera "
@@ -708,37 +750,29 @@ msgstr ""
 "unstable)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml apt-get.8.xml
+#: apt.8.xml
 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 ""
-"La commande <literal>remove</literal> est identique à la commande "
-"<literal>install</literal>, les paquets étant alors supprimés et non "
-"installés. Veuillez noter que la suppression d'un paquet en laisse les "
-"fichiers de configuration sur le système. Quand un signe plus est accolé "
-"(sans espace intermédiaire) au nom du paquet, le paquet est installé au lieu "
-"d'être supprimé."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.8.xml apt-get.8.xml
-msgid "(and the"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.8.xml apt-get.8.xml
-msgid "alias since 1.1)"
+"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 accidently 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."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml apt-get.8.xml
+#: apt.8.xml
+#, fuzzy
+#| 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."
 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."
+"now no longer needed as dependencies changed or the package(s)  needing them "
+"were removed in the meantime."
 msgstr ""
 "Avec la commande <literal>autoremove</literal>, apt-get supprime les paquets "
 "installés dans le but de satisfaire les dépendances d'autres paquets et qui "
@@ -747,65 +781,98 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
-"<literal>edit-sources</literal> lets you edit your sources.list file and "
-"provides basic sanity checks."
+"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 "
+"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."
 msgstr ""
-"La commande <literal>edit-sources</literal> permet de modifier le fichier "
-"sources.list et fournit des vérifications de sécurité de base."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml
+#, fuzzy
+#| msgid "&apt-conf;"
+msgid "(&apt-cache;)"
+msgstr "&apt-conf;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
-"<literal>update</literal> is used to resynchronize the package index files "
-"from their sources."
+"<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 "
+"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 ""
-"La commande <literal>update</literal> permet de resynchroniser un fichier "
-"d'index répertoriant les paquets disponibles et sa source."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 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."
+"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 "
+"look at this information before allowing &apt; to remove a package or while "
+"searching for new packages to install."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml
+msgid "(work-in-progress)"
 msgstr ""
-"La commande <literal>upgrade</literal> permet d'installer les versions les "
-"plus récentes de tous les paquets présents sur le système en utilisant les "
-"sources énumérées dans <filename>/etc/apt/sources.list</filename>. De "
-"nouveaux paquets seront installés, mais les paquets installés ne seront "
-"jamais supprimés."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
-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."
+#, fuzzy
+#| 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."
+msgid ""
+"<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 ""
-"La commande <literal>full-upgrade</literal> remplit la même fonction que "
-"upgrade mais peut aussi supprimer des paquets installés si cela est "
-"nécessaire pour résoudre un conflit entre des paquets."
+"La commande <literal>list</literal> est utilisée pour afficher une liste de "
+"paquets. Il gère les motifs du shell pour chercher les noms de paquets, "
+"ainsi que les options suivantes : <option>--installed</option>, <option>--"
+"upgradable</option>, <option>--all-versions</option>."
 
-#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-mark.8.xml apt-config.8.xml
-#: apt-extracttemplates.1.xml apt-sortpkgs.1.xml apt-ftparchive.1.xml
-msgid "options"
-msgstr "options"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>edit-sources</literal> lets you edit your sources.list file and "
+#| "provides basic sanity checks."
+msgid ""
+"<literal>edit-sources</literal> lets you edit your &sources-list; files in "
+"your preferred texteditor while also providing basic sanity checks."
+msgstr ""
+"La commande <literal>edit-sources</literal> permet de modifier le fichier "
+"sources.list et fournit des vérifications de sécurité de base."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.8.xml
-msgid "Script usage"
-msgstr "Utilisation de scripts"
+msgid "Script usage and Differences to other APT tools"
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml
+#, fuzzy
+#| 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."
 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."
+"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 "
+"interactive use."
 msgstr ""
 "La ligne de commande de &apt; est conçue comme un outil pour l'utilisateur "
 "et les sorties peuvent varier selon ses versions. Bien qu'il s'efforce de ne "
@@ -814,49 +881,15 @@ msgstr ""
 "&apt-get; grâce aux options de APT. Il est conseillé d'utiliser ces "
 "commandes dans vos scripts."
 
-#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml
-msgid "Differences to &apt-get;"
-msgstr "Différences avec &apt-get;"
-
 #. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml
 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:"
+"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."
 msgstr ""
-"La commande <command>apt</command> est sensée être agréable à l'utilisateur "
-"et ne pas avoir besoin de compatibilité ascendante comme &apt-get;. Par "
-"conséquent, certaines options sont différentes :"
-
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml
-msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
-msgstr "L'option <literal>DPkg::Progress-Fancy</literal> est activée."
-
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml
-msgid "The option <literal>APT::Color</literal> is enabled."
-msgstr "L'option <literal>APT::Color</literal> est activée."
-
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml
-msgid ""
-"A new <literal>list</literal> command is available similar to <literal>dpkg "
-"--list</literal>."
-msgstr ""
-"Une nouvelle commande <literal>list</literal> est disponible, semblable à la "
-"commande <literal>dpkg --list</literal>."
-
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml
-msgid ""
-"The option <literal>upgrade</literal> has <literal>--with-new-pkgs</literal> "
-"enabled by default."
-msgstr ""
-"La commande <literal>upgrade</literal> a l'option <literal>--with-new-pkgs</"
-"literal> activée par défaut."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml
@@ -1045,6 +1078,23 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 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 ""
+"On peut choisir d'installer une version particulière d'un paquet en faisant "
+"suivre son nom par un signe égal et par la version. Cette version sera "
+"recherchée et l'installation sera demandée. On peut aussi choisir une "
+"distribution particulière en faisant suivre le nom du paquet par une barre "
+"oblique et par le nom de la distribution ou de l'archive (stable, testing, "
+"unstable)."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
 "used with care."
 msgstr ""
@@ -1105,6 +1155,22 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 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 ""
+"La commande <literal>remove</literal> est identique à la commande "
+"<literal>install</literal>, les paquets étant alors supprimés et non "
+"installés. Veuillez noter que la suppression d'un paquet en laisse les "
+"fichiers de configuration sur le système. Quand un signe plus est accolé "
+"(sans espace intermédiaire) au nom du paquet, le paquet est installé au lieu "
+"d'être supprimé."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
 "that packages are removed and purged (any configuration files are deleted "
 "too)."
@@ -1236,6 +1302,16 @@ msgstr ""
 "dans <filename>&cachedir;/archives/</filename> et <filename>&cachedir;/"
 "archives/partial/</filename>."
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml
+msgid "(and the"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml
+msgid "alias since 1.1)"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
@@ -1257,6 +1333,17 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
+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 ""
+"Avec la commande <literal>autoremove</literal>, apt-get supprime les paquets "
+"installés dans le but de satisfaire les dépendances d'autres paquets et qui "
+"ne sont plus nécessaires."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
 #, fuzzy
 #| msgid ""
 #| "<literal>changelog</literal> downloads a package changelog and displays "
@@ -1299,6 +1386,12 @@ msgid ""
 "<literal><filename>doc/acquire-additional-files.txt</filename></literal>."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><title>
+#: apt-get.8.xml apt-cache.8.xml apt-config.8.xml apt-extracttemplates.1.xml
+#: apt-sortpkgs.1.xml apt-ftparchive.1.xml
+msgid "options"
+msgstr "options"
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
@@ -2592,6 +2685,14 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
+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
 msgid "Remove a key from the list of trusted keys."
 msgstr "Supprimer une clé de la liste des clés fiables."
 
@@ -2618,11 +2719,11 @@ msgstr "Afficher les empreintes des clés fiables."
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 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 ""
-"Passer des options avancées à gpg. Avec la commande adv --recv-key, il est "
-"possible de télécharger une clé publique."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
@@ -2657,7 +2758,7 @@ msgstr ""
 "place. Par contre, la version d'Ubuntu permet de l'utiliser."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml apt-cdrom.8.xml
+#: apt-key.8.xml apt-mark.8.xml apt-cdrom.8.xml
 msgid "Options"
 msgstr "Options"
 
@@ -2724,26 +2825,42 @@ msgstr "&apt-get;, &apt-secure;"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-mark.8.xml
-msgid "mark/unmark a package as being automatically-installed"
-msgstr "Indiquer si un paquet a été installé automatiquement ou non"
+msgid "show, set and unset various settings for a package"
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-mark.8.xml
 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 frontend to set various "
+"settings for a package like 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
+msgid "Automatically and manually installed packages"
 msgstr ""
-"Avec la commande <command>apt-mark</command>, on peut indiquer si un paquet "
-"a été automatiquement installé ou pas."
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-mark.8.xml
+#, fuzzy
+#| 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>."
 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 package you installed explicitely is "
+"marked as manually installed.  Once a 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 ""
 "Lorsque l'installation d'un paquet est demandée et que par voie de "
 "dépendances d'autres paquets sont installés, ces paquets sont marqués comme "
@@ -2777,31 +2894,6 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml
 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."
-msgstr ""
-"<literal>hold</literal> permet de marquer un paquet comme conservé, ce qui "
-"empêchera de l'installer, de le mettre à jour ou de le supprimer "
-"automatiquement. Cette commande est une simple envelopper à la commande "
-"<command>dpkg --set-selections</command>, l'état étant géré par &dpkg; et "
-"non affecté par l'option <option>--file</option>."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml
-msgid ""
-"<literal>unhold</literal> is used to cancel a previously set hold on a "
-"package to allow all actions again."
-msgstr ""
-"<literal>unhold</literal> est utilisé pour supprimer  l'état "
-"« hold » (conservé) d'un paquet afin de permettre toute action qui y est "
-"liée."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml
-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 "
@@ -2824,6 +2916,49 @@ msgstr ""
 "<literal>showauto</literal> pour afficher la liste des paquets installés "
 "manuellement."
 
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml
+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 ""
+"Lecture/écriture des statistiques d'un paquet dans &synopsis-param-filename; "
+"au lieu du fichier par défaut (<filename>extended_status</filename> dans le "
+"répertoire défini par l'élément de configuration <literal>Dir::State</"
+"literal>)."
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt-mark.8.xml
+msgid "Prevent changes for a package"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>manual</literal> is used to mark a package as being manually "
+#| "installed, which will prevent the package from being automatically "
+#| "removed if no other packages depend on it."
+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."
+msgstr ""
+"<literal>manual</literal> permet de marquer un paquet comme installé "
+"manuellement. Un tel paquet ne sera pas supprimé automatiquement, même si "
+"aucun autre paquet n'en dépend."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml
+msgid ""
+"<literal>unhold</literal> is used to cancel a previously set hold on a "
+"package to allow all actions again."
+msgstr ""
+"<literal>unhold</literal> est utilisé pour supprimer  l'état "
+"« hold » (conservé) d'un paquet afin de permettre toute action qui y est "
+"liée."
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml
 msgid ""
@@ -2833,18 +2968,23 @@ msgstr ""
 "<literal>showhold</literal> permet d'afficher la liste des paquets conservés "
 "de manière analogue aux commandes de même type."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><title>
+#: apt-mark.8.xml
+msgid "Shedule packages for install, remove and purge"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
 #: apt-mark.8.xml
 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 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>, <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 ""
-"Lecture/écriture des statistiques d'un paquet dans &synopsis-param-filename; "
-"au lieu du fichier par défaut (<filename>extended_status</filename> dans le "
-"répertoire défini par l'élément de configuration <literal>Dir::State</"
-"literal>)."
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-mark.8.xml
@@ -2862,11 +3002,17 @@ msgstr "Gestion de l'authentification d'archive avec APT"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| 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."
 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 ""
 "Depuis sa version 0.6, <command>apt</command> sait vérifier la signature du "
 "fichier Release de chaque archive. On s'assure ainsi que les paquets de "
@@ -2876,37 +3022,56 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 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 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."
 msgstr ""
-"Quand un paquet provient d'une archive sans signature ou d'une archive avec "
-"une signature dont apt ne possède pas la clé, ce paquet n'est pas considéré "
-"comme fiable et son installation provoquera un avertissement. Pour "
-"l'instant, <command>apt-get</command> ne signale que les archives sans "
-"signature ; les prochaines versions pourraient rendre obligatoire la "
-"vérification des sources avant tout téléchargement de paquet."
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 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
+#, fuzzy
+#| msgid ""
+#| "The package frontends &apt-get;, &aptitude; and &synaptic; support this "
+#| "new authentication feature."
+msgid ""
+"Note: All APT-based package management frontends 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 ""
 "Les interfaces &apt-get;, &aptitude; et &synaptic; possèdent cette nouvelle "
 "fonction de certification."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-secure.8.xml
-msgid "Trusted archives"
+#, fuzzy
+#| msgid "Trusted archives"
+msgid "Trusted repositories"
 msgstr "Trusted archives"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
-msgid ""
-"The chain of trust from an apt archive to the end user is made up of several "
+#, fuzzy
+#| msgid ""
+#| "The chain of trust from an apt archive to the end user is made up of "
+#| "several steps. <command>apt-secure</command> is the last step in this "
+#| "chain; 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 archive maintainer's responsibility to ensure that "
+#| "the archive's integrity is preserved."
+msgid ""
+"The chain of trust from an APT archive to the end user is made up of several "
 "steps. <command>apt-secure</command> is the last step in this chain; "
 "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 "
@@ -2935,13 +3100,22 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
-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."
+#, fuzzy
+#| 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."
+msgid ""
+"The chain of trust in Debian e.g. 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 one "
+"of the Debian package maintainers 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 ""
 "La chaîne de confiance dans Debian commence quand un responsable de paquet "
 "envoie un nouveau paquet ou une nouvelle version d'un paquet dans l'archive. "
@@ -3023,11 +3197,17 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| 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."
 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 ""
 "Cependant cette méthode ne protège pas contre une compromission du serveur "
 "Debian lui-même (qui signe les paquets) ni contre la compromission de la clé "
@@ -3041,11 +3221,17 @@ msgstr "Configuration utilisateur"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| 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."
 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 ""
 "Le programme qui gère la liste des clés utilisées par apt s'appelle "
 "<command>apt-key</command>. Il peut ajouter ou supprimer des clés. Cette "
@@ -3055,6 +3241,15 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""
+"Note that a default installation already contains all keys to securily "
+"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>
+#: apt-secure.8.xml
+msgid ""
 "In order to add a new key you need to first download it (you should make "
 "sure you are using a trusted communication channel when retrieving it), add "
 "it with <command>apt-key</command> and then run <command>apt-get update</"
@@ -3107,15 +3302,33 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| msgid ""
+#| "<emphasis>Publish the key fingerprint</emphasis>, that way your users "
+#| "will know what key they need to import in order to authenticate the files "
+#| "in the archive."
 msgid ""
 "<emphasis>Publish the key fingerprint</emphasis>, that way your users will "
 "know what key they need to import in order to authenticate the files in the "
-"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 ""
 "<emphasis>publier l'empreinte de la clé</emphasis>. Ainsi les utilisateurs "
 "de votre archive connaîtront la clé qu'ils doivent importer pour "
 "authentifier les fichiers de l'archive."
 
+#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
+#: apt-secure.8.xml
+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 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."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""
@@ -3137,9 +3350,17 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| 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=\"http://"
+#| "www.cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution "
+#| "HOWTO</ulink> by V. Alex Brennen."
 msgid ""
 "For more background information you might want to review the <ulink url="
-"\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
+"\"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 url=\"http://www."
 "cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution HOWTO</"
@@ -3532,6 +3753,13 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
 #: apt.conf.5.xml
 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
+msgid ""
 "the command line options are applied to override the configuration "
 "directives or to load even more configuration files."
 msgstr ""
@@ -4819,6 +5047,41 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.conf.5.xml
+#, fuzzy
+#| msgid "User configuration"
+msgid "Binary specific configuration"
+msgstr "Configuration utilisateur"
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml
+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
+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
+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
 msgid "Directories"
 msgstr "Les répertoires"
 
@@ -5742,8 +6005,7 @@ msgstr ""
 "Post}-Invoke</literal> ou <literal>APT::Update::{Pre,Post}-Invoke</literal>."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml
-#: apt-ftparchive.1.xml
+#: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml apt-ftparchive.1.xml
 msgid "Examples"
 msgstr "Exemples"
 
@@ -7621,6 +7883,22 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #: sources.list.5.xml
 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."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml
+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 "
@@ -10817,6 +11095,125 @@ msgid "Which will use the already fetched archives on the disc."
 msgstr "Cette commande utilisera les fichiers récupérés sur le disque."
 
 #~ msgid ""
+#~ "<command>apt</command> (Advanced Package Tool) is the command-line tool "
+#~ "for handling packages. It provides a commandline interface for the "
+#~ "package management of the system.  See also &apt-get; and &apt-cache; for "
+#~ "more low-level command options."
+#~ msgstr ""
+#~ "<command>apt</command> (Advanced Package Tool) est un outil en ligne de "
+#~ "commande pour gérer les paquets. Il fournit une interface en ligne de "
+#~ "commande au système de gestion de paquets. Voir également &apt-get; et "
+#~ "&apt-cache; pour davantage d'options en ligne de commande."
+
+#~ msgid ""
+#~ "<literal>search</literal> searches for the given term(s) and display "
+#~ "matching packages."
+#~ msgstr ""
+#~ "La commande <literal>search</literal> recherche le(s) terme(s) donnée(s) "
+#~ "et affiche les paquets correspondants."
+
+#~ msgid ""
+#~ "<literal>show</literal> shows the package information for the given "
+#~ "package(s)."
+#~ msgstr ""
+#~ "La commande <literal>show</literal> affiche les informations sur le(s) "
+#~ "paquet(s) donné(s)."
+
+#~ msgid ""
+#~ "<literal>install</literal> is followed by one or more package names "
+#~ "desired for installation or upgrading."
+#~ msgstr ""
+#~ "La commande <literal>install</literal> est suivie du nom de un ou "
+#~ "plusieurs paquets dont l'installation ou la mise à jour est souhaitée."
+
+#~ msgid ""
+#~ "<literal>update</literal> is used to resynchronize the package index "
+#~ "files from their sources."
+#~ msgstr ""
+#~ "La commande <literal>update</literal> permet de resynchroniser un fichier "
+#~ "d'index répertoriant les paquets disponibles et sa source."
+
+#~ msgid "Script usage"
+#~ msgstr "Utilisation de scripts"
+
+#~ msgid "Differences to &apt-get;"
+#~ msgstr "Différences avec &apt-get;"
+
+#~ msgid ""
+#~ "The <command>apt</command> command is meant to be pleasant for end users "
+#~ "and does not need to be backward compatible like &apt-get;. Therefore "
+#~ "some options are different:"
+#~ msgstr ""
+#~ "La commande <command>apt</command> est sensée être agréable à "
+#~ "l'utilisateur et ne pas avoir besoin de compatibilité ascendante comme "
+#~ "&apt-get;. Par conséquent, certaines options sont différentes :"
+
+#~ msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
+#~ msgstr "L'option <literal>DPkg::Progress-Fancy</literal> est activée."
+
+#~ msgid "The option <literal>APT::Color</literal> is enabled."
+#~ msgstr "L'option <literal>APT::Color</literal> est activée."
+
+#~ msgid ""
+#~ "A new <literal>list</literal> command is available similar to "
+#~ "<literal>dpkg --list</literal>."
+#~ msgstr ""
+#~ "Une nouvelle commande <literal>list</literal> est disponible, semblable à "
+#~ "la commande <literal>dpkg --list</literal>."
+
+#~ msgid ""
+#~ "The option <literal>upgrade</literal> has <literal>--with-new-pkgs</"
+#~ "literal> enabled by default."
+#~ msgstr ""
+#~ "La commande <literal>upgrade</literal> a l'option <literal>--with-new-"
+#~ "pkgs</literal> activée par défaut."
+
+#~ msgid ""
+#~ "Pass advanced options to gpg. With adv --recv-key you can download the "
+#~ "public key."
+#~ msgstr ""
+#~ "Passer des options avancées à gpg. Avec la commande adv --recv-key, il "
+#~ "est possible de télécharger une clé publique."
+
+#~ msgid "mark/unmark a package as being automatically-installed"
+#~ msgstr "Indiquer si un paquet a été installé automatiquement ou non"
+
+#~ msgid ""
+#~ "<command>apt-mark</command> will change whether a package has been marked "
+#~ "as being automatically installed."
+#~ msgstr ""
+#~ "Avec la commande <command>apt-mark</command>, on peut indiquer si un "
+#~ "paquet a été automatiquement installé ou pas."
+
+#~ 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."
+#~ msgstr ""
+#~ "<literal>hold</literal> permet de marquer un paquet comme conservé, ce "
+#~ "qui empêchera de l'installer, de le mettre à jour ou de le supprimer "
+#~ "automatiquement. Cette commande est une simple envelopper à la commande "
+#~ "<command>dpkg --set-selections</command>, l'état étant géré par &dpkg; et "
+#~ "non affecté par l'option <option>--file</option>."
+
+#~ 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."
+#~ msgstr ""
+#~ "Quand un paquet provient d'une archive sans signature ou d'une archive "
+#~ "avec une signature dont apt ne possède pas la clé, ce paquet n'est pas "
+#~ "considéré comme fiable et son installation provoquera un avertissement. "
+#~ "Pour l'instant, <command>apt-get</command> ne signale que les archives "
+#~ "sans signature ; les prochaines versions pourraient rendre obligatoire la "
+#~ "vérification des sources avant tout téléchargement de paquet."
+
+#~ msgid ""
 #~ "No action; perform a simulation of events that would occur but do not "
 #~ "actually change the system.  Configuration Item: <literal>APT::Get::"
 #~ "Simulate</literal>."
diff --git a/doc/po/it.po b/doc/po/it.po
index 94d98ef0a..c97b09b35 100644
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.5\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-10-22 16:34+0200\n"
 "PO-Revision-Date: 2015-01-27 14:11+0200\n"
 "Last-Translator: Beatrice Torracca <beatricet@libero.it>\n"
 "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
@@ -691,67 +691,106 @@ msgstr "Descrizione"
 #. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml
 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 ""
-"<command>apt</command> (Advanced Package Tool, strumento avanzato per "
-"pacchetti) è lo strumento a riga di comando per maneggiare i pacchetti. "
-"Fornisce un'interfaccia a riga di comando per la gestione dei pacchetti del "
-"sistema. Per altre opzioni di comandi a basso livello vedere anche &apt-get; "
-"e &apt-cache;."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml
 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 "
+"overwelming readers with a cornucopia of options and details."
 msgstr ""
-"<literal>list</literal> viene usato per visualizzare un elenco di pacchetti. "
-"Permette l'uso dei modelli di shell per la corrispondenza con nomi di "
-"pacchetto e sono gestite le seguenti opzioni: <option>--installed</option>, "
-"<option>--upgradable</option>, <option>--upgradeable</option>, <option>--all-"
-"versions</option>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml
+#, fuzzy
+#| msgid "apt-get"
+msgid "(&apt-get;)"
+msgstr "apt-get"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
-"<literal>search</literal> searches for the given term(s) and display "
-"matching packages."
+"<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 ""
-"<literal>search</literal> cerca i termini specificati e visualizza i "
-"pacchetti che corrispondono."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>upgrade</literal> is used to install the newest versions of all "
+#| "packages currently installed on the system from the sources enumerated in "
+#| "<filename>/etc/apt/sources.list</filename>. New packages will be "
+#| "installed, but existing packages will never be removed."
+msgid ""
+"<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 ""
+"<literal>upgrade</literal> viene usato per installare le versioni più "
+"recenti di tutti i pacchetti attualmente installati nel sistema prendendoli "
+"dalle fonti elencate in <filename>/etc/apt/sources.list</filename>. Nuovi "
+"pacchetti verranno installati, ma quelli esistenti non saranno mai rimossi."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml
+#, fuzzy
+#| 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."
 msgid ""
-"<literal>show</literal> shows the package information for the given "
-"package(s)."
+"<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 ""
+"<literal>full-upgrade</literal> effettua la funzione di aggiornamento ma può "
+"anche rimuovere i pacchetti installati se ciò è necessario per poter "
+"risolvere un conflitto tra pacchetti."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml
+msgid ","
 msgstr ""
-"<literal>show</literal> mostra le informazioni di pacchetto per i pacchetti "
-"specificati."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
-"<literal>install</literal> is followed by one or more package names desired "
-"for installation or upgrading."
+"Performs the requested action on one or more packages specified via &regex;, "
+"&glob; or exact match. The requested action can be overidden for specific "
+"packages by append a plus (+) to the package name to install this package or "
+"a minus (-) to remove it."
 msgstr ""
-"<literal>install</literal> è seguito da uno o più nomi di pacchetto che si "
-"desidera vengano installati o aggiornati."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml apt-get.8.xml
+#: apt.8.xml
+#, fuzzy
+#| 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)."
 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)."
+"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 ""
 "È possibile selezionare una versione specifica di un pacchetto per "
 "l'installazione scrivendo dopo il nome del pacchetto un segno di uguale e la "
@@ -762,36 +801,29 @@ msgstr ""
 "(stable, testing, unstable)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml apt-get.8.xml
+#: apt.8.xml
 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 ""
-"<literal>remove</literal> è identico a <literal>install</literal> tranne per "
-"il fatto che i pacchetti sono rimossi invece che installati. Notare che la "
-"rimozione di un pacchetto lascia i suoi file di configurazione nel sistema. "
-"Se viene aggiunto un segno più in fondo al nome del pacchetto (senza spazi "
-"in mezzo), il pacchetto specificato viene installato invece che rimosso."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.8.xml apt-get.8.xml
-msgid "(and the"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.8.xml apt-get.8.xml
-msgid "alias since 1.1)"
+"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 accidently 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."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml apt-get.8.xml
+#: apt.8.xml
+#, fuzzy
+#| 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."
 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."
+"now no longer needed as dependencies changed or the package(s)  needing them "
+"were removed in the meantime."
 msgstr ""
 "<literal>autoremove</literal> viene usato per rimuovere i pacchetti che sono "
 "stati installati automaticamente per soddisfare delle dipendenze per altri "
@@ -800,64 +832,99 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
-"<literal>edit-sources</literal> lets you edit your sources.list file and "
-"provides basic sanity checks."
+"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 "
+"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."
 msgstr ""
-"<literal>edit-sources</literal> permette di modificare il proprio file "
-"sources.list e fornisce controlli di sanità di base."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml
+#, fuzzy
+#| msgid "apt-cache"
+msgid "(&apt-cache;)"
+msgstr "apt-cache"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
-"<literal>update</literal> is used to resynchronize the package index files "
-"from their sources."
+"<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 "
+"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 ""
-"<literal>update</literal> viene usato per risincronizzare i file con gli "
-"indici dei pacchetti con le loro fonti."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 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."
+"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 "
+"look at this information before allowing &apt; to remove a package or while "
+"searching for new packages to install."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml
+msgid "(work-in-progress)"
 msgstr ""
-"<literal>upgrade</literal> viene usato per installare le versioni più "
-"recenti di tutti i pacchetti attualmente installati nel sistema prendendoli "
-"dalle fonti elencate in <filename>/etc/apt/sources.list</filename>. Nuovi "
-"pacchetti verranno installati, ma quelli esistenti non saranno mai rimossi."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
-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."
+#, fuzzy
+#| 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."
+msgid ""
+"<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 ""
-"<literal>full-upgrade</literal> effettua la funzione di aggiornamento ma può "
-"anche rimuovere i pacchetti installati se ciò è necessario per poter "
-"risolvere un conflitto tra pacchetti."
+"<literal>list</literal> viene usato per visualizzare un elenco di pacchetti. "
+"Permette l'uso dei modelli di shell per la corrispondenza con nomi di "
+"pacchetto e sono gestite le seguenti opzioni: <option>--installed</option>, "
+"<option>--upgradable</option>, <option>--upgradeable</option>, <option>--all-"
+"versions</option>."
 
-#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-mark.8.xml apt-config.8.xml
-#: apt-extracttemplates.1.xml apt-sortpkgs.1.xml apt-ftparchive.1.xml
-msgid "options"
-msgstr "opzioni"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>edit-sources</literal> lets you edit your sources.list file and "
+#| "provides basic sanity checks."
+msgid ""
+"<literal>edit-sources</literal> lets you edit your &sources-list; files in "
+"your preferred texteditor while also providing basic sanity checks."
+msgstr ""
+"<literal>edit-sources</literal> permette di modificare il proprio file "
+"sources.list e fornisce controlli di sanità di base."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.8.xml
-msgid "Script usage"
-msgstr "Uso di script"
+msgid "Script usage and Differences to other APT tools"
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml
+#, fuzzy
+#| 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."
 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."
+"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 "
+"interactive use."
 msgstr ""
 "La riga di comando di &apt; è progettata come strumento per l'utente finale "
 "e il suo output può cambiare da una versione ad un'altra. Sebbene si cerchi "
@@ -866,49 +933,15 @@ msgstr ""
 "attraverso opzioni APT. Si raccomando di preferire l'uso di questi comandi "
 "negli script."
 
-#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml
-msgid "Differences to &apt-get;"
-msgstr "Differenze con &apt-get;"
-
 #. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml
 msgid ""
-"The <command>apt</command> command is meant to be pleasant for end users and "
-"does not need to be backward compatible like &apt-get;. Therefore some "
-"options are different:"
-msgstr ""
-"Il comando <command>apt</command> non è pensato per essere facile da usare "
-"per gli utenti finali e non è necessario sia compatibile all'indietro come "
-"&apt-get;. Perciò alcune opzioni sono diverse:"
-
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml
-msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
-msgstr "L'opzione <literal>DPkg::Progress-Fancy</literal> è abilitata."
-
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml
-msgid "The option <literal>APT::Color</literal> is enabled."
-msgstr "L'opzione <literal>APT::Color</literal> è abilitata."
-
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml
-msgid ""
-"A new <literal>list</literal> command is available similar to <literal>dpkg "
-"--list</literal>."
-msgstr ""
-"È disponibile un nuovo comando <literal>list</literal> simile a "
-"<literal>dpkg --list</literal>."
-
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml
-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 prefer using "
+"these commands (potentially with some additional options enabled) in your "
+"scripts as they keep backward compatibility as much as possible."
 msgstr ""
-"L'opzione <literal>upgrade</literal> ha <literal>--with-new-pkgs</literal> "
-"abilitato in modo predefinito."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml
@@ -1097,6 +1130,24 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 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 ""
+"È possibile selezionare una versione specifica di un pacchetto per "
+"l'installazione scrivendo dopo il nome del pacchetto un segno di uguale e la "
+"versione del pacchetto da selezionare. Ciò farà sì che venga localizzata e "
+"selezionata per l'installazione quella versione. In alternativa può essere "
+"selezionata una distribuzione specifica scrivendo dopo il nome del pacchetto "
+"una sbarra («/») e la versione della distribuzione o il nome dell'archivio "
+"(stable, testing, unstable)."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
 "used with care."
 msgstr ""
@@ -1155,6 +1206,21 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 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 ""
+"<literal>remove</literal> è identico a <literal>install</literal> tranne per "
+"il fatto che i pacchetti sono rimossi invece che installati. Notare che la "
+"rimozione di un pacchetto lascia i suoi file di configurazione nel sistema. "
+"Se viene aggiunto un segno più in fondo al nome del pacchetto (senza spazi "
+"in mezzo), il pacchetto specificato viene installato invece che rimosso."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
 "that packages are removed and purged (any configuration files are deleted "
 "too)."
@@ -1287,6 +1353,16 @@ msgstr ""
 "filename> e <filename>&cachedir;/archives/partial/</filename>,  tranne il "
 "file di lock."
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml
+msgid "(and the"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml
+msgid "alias since 1.1)"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
@@ -1308,6 +1384,17 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
+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 ""
+"<literal>autoremove</literal> viene usato per rimuovere i pacchetti che sono "
+"stati installati automaticamente per soddisfare delle dipendenze per altri "
+"pacchetti e che non sono più necessari."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
 #, fuzzy
 #| msgid ""
 #| "<literal>changelog</literal> downloads a package changelog and displays "
@@ -1349,6 +1436,12 @@ msgid ""
 "<literal><filename>doc/acquire-additional-files.txt</filename></literal>."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><title>
+#: apt-get.8.xml apt-cache.8.xml apt-config.8.xml apt-extracttemplates.1.xml
+#: apt-sortpkgs.1.xml apt-ftparchive.1.xml
+msgid "options"
+msgstr "opzioni"
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
@@ -2631,6 +2724,14 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
+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
 msgid "Remove a key from the list of trusted keys."
 msgstr "Rimuove una chiave dall'elenco delle chiavi fidate."
 
@@ -2658,11 +2759,11 @@ msgstr "Elenca le impronte digitali delle chiavi fidate."
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 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 ""
-"Passa opzioni avanzate a gpg. Con adv --recv-key è possibile scaricare la "
-"chiave pubblica."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
@@ -2697,7 +2798,7 @@ msgstr ""
 "<command>update</command>; APT in Ubuntu invece lo fa."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml apt-cdrom.8.xml
+#: apt-key.8.xml apt-mark.8.xml apt-cdrom.8.xml
 msgid "Options"
 msgstr "Opzioni"
 
@@ -2765,27 +2866,42 @@ msgstr "&apt-get;, &apt-secure;"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-mark.8.xml
-msgid "mark/unmark a package as being automatically-installed"
+msgid "show, set and unset various settings for a package"
 msgstr ""
-"mette/toglie il contrassegno di automaticamente installato ai pacchetti"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-mark.8.xml
 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 frontend to set various "
+"settings for a package like 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
+msgid "Automatically and manually installed packages"
 msgstr ""
-"<command>apt-mark</command> cambia il contrassegno di un pacchetto che "
-"indica se è stato installato automaticamente."
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-mark.8.xml
+#, fuzzy
+#| 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>."
 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 package you installed explicitely is "
+"marked as manually installed.  Once a 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 ""
 "Quando viene richiesta l'installazione di un pacchetto e ciò fa sì che altri "
 "pacchetti vengano installati per soddisfare le sue dipendenze, queste ultime "
@@ -2820,30 +2936,6 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml
 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."
-msgstr ""
-"<literal>hold</literal> viene usato per contrassegnare un pacchetto come "
-"bloccato, il che impedisce che il pacchetto venga automaticamente "
-"installato, aggiornato o rimosso. Il comando è solamente un wrapper per "
-"<command>dpkg --set-selections</command> e lo stato è pertanto mantenuto da "
-"&dpkg; e non è influenzato dall'opzione <option>--file</option>."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml
-msgid ""
-"<literal>unhold</literal> is used to cancel a previously set hold on a "
-"package to allow all actions again."
-msgstr ""
-"<literal>unhold</literal> viene usato per annullare un blocco impostato in "
-"precedenza, per permettere nuovamente tutte le azioni."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml
-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 "
@@ -2866,6 +2958,48 @@ msgstr ""
 "<literal>showauto</literal>, tranne per il fatto che stampa invece un elenco "
 "dei pacchetti installati manualmente"
 
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml
+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 ""
+"Legge/Scrive le statistiche sui pacchetti dal file specificato con il "
+"parametro &synopsis-param-filename; invece che dalla posizione predefinita "
+"che è <filename>extended_status</filename> nella directory definita dalla "
+"voce di configurazione <literal>Dir::State</literal>."
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt-mark.8.xml
+msgid "Prevent changes for a package"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>manual</literal> is used to mark a package as being manually "
+#| "installed, which will prevent the package from being automatically "
+#| "removed if no other packages depend on it."
+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."
+msgstr ""
+"<literal>manual</literal> viene usato per contrassegnare un pacchetto come "
+"installato manualmente, il che impedisce che un pacchetto venga rimosso "
+"automaticamente se nessun altro dipende da esso."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml
+msgid ""
+"<literal>unhold</literal> is used to cancel a previously set hold on a "
+"package to allow all actions again."
+msgstr ""
+"<literal>unhold</literal> viene usato per annullare un blocco impostato in "
+"precedenza, per permettere nuovamente tutte le azioni."
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml
 msgid ""
@@ -2875,18 +3009,23 @@ msgstr ""
 "<literal>showhold</literal> viene usato per stampare un elenco di pacchetti "
 "bloccati in modo uguale a ciò che fanno gli altri comandi «show»."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><title>
+#: apt-mark.8.xml
+msgid "Shedule packages for install, remove and purge"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
 #: apt-mark.8.xml
 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 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>, <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 ""
-"Legge/Scrive le statistiche sui pacchetti dal file specificato con il "
-"parametro &synopsis-param-filename; invece che dalla posizione predefinita "
-"che è <filename>extended_status</filename> nella directory definita dalla "
-"voce di configurazione <literal>Dir::State</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-mark.8.xml
@@ -2904,11 +3043,17 @@ msgstr "supporto per l'autenticazione degli archivi per APT"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| 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."
 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 ""
 "A partire dalla versione 0.6, <command>apt</command> contiene del codice che "
 "controlla le firme dei file Release per tutti gli archivi. Ciò assicura che "
@@ -2918,37 +3063,56 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 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 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."
 msgstr ""
-"Se un pacchetto proviene da un archivio senza una firma, o con una firma per "
-"la quale apt non ha una chiave, tale pacchetto viene considerato non fidato "
-"e quando lo si installa si ottiene un importante avvertimento. <command>apt-"
-"get</command> attualmente avverte solamente in caso di archivi non firmati; "
-"le versioni future potrebbero forzare la verifica di tutte le fonti prima di "
-"scaricare pacchetti da esse."
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 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
+#, fuzzy
+#| msgid ""
+#| "The package frontends &apt-get;, &aptitude; and &synaptic; support this "
+#| "new authentication feature."
+msgid ""
+"Note: All APT-based package management frontends 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 ""
 "I frontend per i pacchetti &apt-get;, &aptitude; e &synaptic; supportano "
 "questa nuova funzionalità di autenticazione."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-secure.8.xml
-msgid "Trusted archives"
+#, fuzzy
+#| msgid "Trusted archives"
+msgid "Trusted repositories"
 msgstr "Archivi fidati"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
-msgid ""
-"The chain of trust from an apt archive to the end user is made up of several "
+#, fuzzy
+#| msgid ""
+#| "The chain of trust from an apt archive to the end user is made up of "
+#| "several steps. <command>apt-secure</command> is the last step in this "
+#| "chain; 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 archive maintainer's responsibility to ensure that "
+#| "the archive's integrity is preserved."
+msgid ""
+"The chain of trust from an APT archive to the end user is made up of several "
 "steps. <command>apt-secure</command> is the last step in this chain; "
 "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 "
@@ -2978,13 +3142,22 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
-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."
+#, fuzzy
+#| 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."
+msgid ""
+"The chain of trust in Debian e.g. 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 one "
+"of the Debian package maintainers 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 ""
 "La catena di fiducia in Debian ha inizio quando un manutentore carica un "
 "nuovo pacchetto o una nuova versione di un pacchetto nell'archivio Debian. "
@@ -3067,11 +3240,17 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| 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."
 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 ""
 "Tuttavia non difende dalle compromissioni del server principale Debian "
 "stesso (che firma i pacchetti) o dalla compromissione della chiave usata per "
@@ -3085,11 +3264,17 @@ msgstr "Configurazione utente"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| 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."
 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 ""
 "<command>apt-key</command> è il programma che gestisce l'elenco delle chiavi "
 "usate da apt. Può essere usato per aggiungere o rimuovere chiavi, anche se "
@@ -3100,6 +3285,15 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""
+"Note that a default installation already contains all keys to securily "
+"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>
+#: apt-secure.8.xml
+msgid ""
 "In order to add a new key you need to first download it (you should make "
 "sure you are using a trusted communication channel when retrieving it), add "
 "it with <command>apt-key</command> and then run <command>apt-get update</"
@@ -3152,15 +3346,33 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| msgid ""
+#| "<emphasis>Publish the key fingerprint</emphasis>, that way your users "
+#| "will know what key they need to import in order to authenticate the files "
+#| "in the archive."
 msgid ""
 "<emphasis>Publish the key fingerprint</emphasis>, that way your users will "
 "know what key they need to import in order to authenticate the files in the "
-"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 ""
 "<emphasis>Pubblicare l'impronta digitale della chiave</emphasis>, in questo "
 "modo gli utenti sapranno quale chiave devono importare per poter autenticare "
 "i file nell'archivio."
 
+#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
+#: apt-secure.8.xml
+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 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."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""
@@ -3183,9 +3395,17 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| 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=\"http://"
+#| "www.cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution "
+#| "HOWTO</ulink> by V. Alex Brennen."
 msgid ""
 "For more background information you might want to review the <ulink url="
-"\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
+"\"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 url=\"http://www."
 "cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution HOWTO</"
@@ -3576,6 +3796,13 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
 #: apt.conf.5.xml
 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
+msgid ""
 "the command line options are applied to override the configuration "
 "directives or to load even more configuration files."
 msgstr ""
@@ -4847,6 +5074,41 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.conf.5.xml
+#, fuzzy
+#| msgid "User configuration"
+msgid "Binary specific configuration"
+msgstr "Configurazione utente"
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml
+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
+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
+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
 msgid "Directories"
 msgstr "Directory"
 
@@ -5761,8 +6023,7 @@ msgstr ""
 "Invoke</literal> o <literal>APT::Update::{Pre,Post}-Invoke</literal>."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml
-#: apt-ftparchive.1.xml
+#: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml apt-ftparchive.1.xml
 msgid "Examples"
 msgstr "Esempi"
 
@@ -7658,6 +7919,22 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #: sources.list.5.xml
 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."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml
+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 "
@@ -10822,6 +11099,127 @@ msgid "Which will use the already fetched archives on the disc."
 msgstr "che userà gli archivi già scaricati e presenti sul disco."
 
 #~ msgid ""
+#~ "<command>apt</command> (Advanced Package Tool) is the command-line tool "
+#~ "for handling packages. It provides a commandline interface for the "
+#~ "package management of the system.  See also &apt-get; and &apt-cache; for "
+#~ "more low-level command options."
+#~ msgstr ""
+#~ "<command>apt</command> (Advanced Package Tool, strumento avanzato per "
+#~ "pacchetti) è lo strumento a riga di comando per maneggiare i pacchetti. "
+#~ "Fornisce un'interfaccia a riga di comando per la gestione dei pacchetti "
+#~ "del sistema. Per altre opzioni di comandi a basso livello vedere anche "
+#~ "&apt-get; e &apt-cache;."
+
+#~ msgid ""
+#~ "<literal>search</literal> searches for the given term(s) and display "
+#~ "matching packages."
+#~ msgstr ""
+#~ "<literal>search</literal> cerca i termini specificati e visualizza i "
+#~ "pacchetti che corrispondono."
+
+#~ msgid ""
+#~ "<literal>show</literal> shows the package information for the given "
+#~ "package(s)."
+#~ msgstr ""
+#~ "<literal>show</literal> mostra le informazioni di pacchetto per i "
+#~ "pacchetti specificati."
+
+#~ msgid ""
+#~ "<literal>install</literal> is followed by one or more package names "
+#~ "desired for installation or upgrading."
+#~ msgstr ""
+#~ "<literal>install</literal> è seguito da uno o più nomi di pacchetto che "
+#~ "si desidera vengano installati o aggiornati."
+
+#~ msgid ""
+#~ "<literal>update</literal> is used to resynchronize the package index "
+#~ "files from their sources."
+#~ msgstr ""
+#~ "<literal>update</literal> viene usato per risincronizzare i file con gli "
+#~ "indici dei pacchetti con le loro fonti."
+
+#~ msgid "Script usage"
+#~ msgstr "Uso di script"
+
+#~ msgid "Differences to &apt-get;"
+#~ msgstr "Differenze con &apt-get;"
+
+#~ msgid ""
+#~ "The <command>apt</command> command is meant to be pleasant for end users "
+#~ "and does not need to be backward compatible like &apt-get;. Therefore "
+#~ "some options are different:"
+#~ msgstr ""
+#~ "Il comando <command>apt</command> non è pensato per essere facile da "
+#~ "usare per gli utenti finali e non è necessario sia compatibile "
+#~ "all'indietro come &apt-get;. Perciò alcune opzioni sono diverse:"
+
+#~ msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
+#~ msgstr "L'opzione <literal>DPkg::Progress-Fancy</literal> è abilitata."
+
+#~ msgid "The option <literal>APT::Color</literal> is enabled."
+#~ msgstr "L'opzione <literal>APT::Color</literal> è abilitata."
+
+#~ msgid ""
+#~ "A new <literal>list</literal> command is available similar to "
+#~ "<literal>dpkg --list</literal>."
+#~ msgstr ""
+#~ "È disponibile un nuovo comando <literal>list</literal> simile a "
+#~ "<literal>dpkg --list</literal>."
+
+#~ msgid ""
+#~ "The option <literal>upgrade</literal> has <literal>--with-new-pkgs</"
+#~ "literal> enabled by default."
+#~ msgstr ""
+#~ "L'opzione <literal>upgrade</literal> ha <literal>--with-new-pkgs</"
+#~ "literal> abilitato in modo predefinito."
+
+#~ msgid ""
+#~ "Pass advanced options to gpg. With adv --recv-key you can download the "
+#~ "public key."
+#~ msgstr ""
+#~ "Passa opzioni avanzate a gpg. Con adv --recv-key è possibile scaricare la "
+#~ "chiave pubblica."
+
+#~ msgid "mark/unmark a package as being automatically-installed"
+#~ msgstr ""
+#~ "mette/toglie il contrassegno di automaticamente installato ai pacchetti"
+
+#~ msgid ""
+#~ "<command>apt-mark</command> will change whether a package has been marked "
+#~ "as being automatically installed."
+#~ msgstr ""
+#~ "<command>apt-mark</command> cambia il contrassegno di un pacchetto che "
+#~ "indica se è stato installato automaticamente."
+
+#~ 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."
+#~ msgstr ""
+#~ "<literal>hold</literal> viene usato per contrassegnare un pacchetto come "
+#~ "bloccato, il che impedisce che il pacchetto venga automaticamente "
+#~ "installato, aggiornato o rimosso. Il comando è solamente un wrapper per "
+#~ "<command>dpkg --set-selections</command> e lo stato è pertanto mantenuto "
+#~ "da &dpkg; e non è influenzato dall'opzione <option>--file</option>."
+
+#~ 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."
+#~ msgstr ""
+#~ "Se un pacchetto proviene da un archivio senza una firma, o con una firma "
+#~ "per la quale apt non ha una chiave, tale pacchetto viene considerato non "
+#~ "fidato e quando lo si installa si ottiene un importante avvertimento. "
+#~ "<command>apt-get</command> attualmente avverte solamente in caso di "
+#~ "archivi non firmati; le versioni future potrebbero forzare la verifica di "
+#~ "tutte le fonti prima di scaricare pacchetti da esse."
+
+#~ msgid ""
 #~ "No action; perform a simulation of events that would occur but do not "
 #~ "actually change the system.  Configuration Item: <literal>APT::Get::"
 #~ "Simulate</literal>."
@@ -11660,9 +12058,6 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
 #~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
 #~ "<date>29 February 2004</date>"
 
-#~ msgid "apt-cache"
-#~ msgstr "apt-cache"
-
 #~ msgid "APT package handling utility -- cache manipulator"
 #~ msgstr "APT strumento di gestione pacchetti -- manipolatore di cache"
 
diff --git a/doc/po/ja.po b/doc/po/ja.po
index 1a88c704c..7aaff2e79 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.6\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-10-22 16:34+0200\n"
 "PO-Revision-Date: 2014-07-10 19:52+0900\n"
 "Last-Translator: KURASAWA Nozomu <nabetaro@debian.or.jp>\n"
 "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@ -686,65 +686,106 @@ msgstr "説明"
 #. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml
 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 ""
-"<command>apt</command> (Advanced Package Tool、高度パッケージツール) はパッ"
-"ケージ処理用のコマンドラインツールです。システムのパッケージ管理用コマンドラ"
-"インインターフェイスを提供します。さらなる低レベルコマンドオプションについて"
-"は &apt-get; 及び &apt-cache; も参照してください。"
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.8.xml
+msgid ""
+"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 "
+"overwelming readers with a cornucopia of options and details."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml
+#, fuzzy
+#| msgid "apt-get"
+msgid "(&apt-get;)"
+msgstr "apt-get"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 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."
+"<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 ""
-"パッケージ一覧を表示するには <literal>list</literal> を使います。パッケージ名"
-"のマッチングにシェルパターン、そしてオプション <option>--installed</"
-"option>、 <option>--upgradable</option>, <option>--upgradeable</option>、 "
-"<option>--all-versions</option> をサポートしています。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>upgrade</literal> is used to install the newest versions of all "
+#| "packages currently installed on the system from the sources enumerated in "
+#| "<filename>/etc/apt/sources.list</filename>. New package will be "
+#| "installed, but existing package will never removed."
 msgid ""
-"<literal>search</literal> searches for the given term(s) and display "
-"matching packages."
+"<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 ""
-"<literal>search</literal> では指定した語を検索して該当するパッケージを表示し"
-"ます。"
+"<literal>upgrade</literal> を使うとシステムに現在インストールされている全パッ"
+"ケージの最新版を <filename>/etc/apt/sources.list</filename> に記載されている"
+"ソースからインストールします。新しいパッケージはインストールされますが既存の"
+"パッケージが削除されることはありません。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
+#, fuzzy
+#| 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."
 msgid ""
-"<literal>show</literal> shows the package information for the given "
-"package(s)."
+"<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 ""
+"<literal>full-upgrade</literal> はアップグレードの機能を実行しますが、パッ"
+"ケージの衝突を解決するために必要であればインストールされているパッケージの削"
+"除も行います。"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml
+msgid ","
 msgstr ""
-"<literal>show</literal> では指定したパッケージについてのパッケージ情報を表示"
-"します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
-"<literal>install</literal> is followed by one or more package names desired "
-"for installation or upgrading."
+"Performs the requested action on one or more packages specified via &regex;, "
+"&glob; or exact match. The requested action can be overidden for specific "
+"packages by append a plus (+) to the package name to install this package or "
+"a minus (-) to remove it."
 msgstr ""
-"<literal>install</literal> に続けてインストールやアップグレードしたいパッケー"
-"ジの名前を指定します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml apt-get.8.xml
+#: apt.8.xml
+#, fuzzy
+#| 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)."
 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)."
+"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 ""
 "パッケージにイコール記号とバージョンを続けることで、選択したバージョンのパッ"
 "ケージをインストールすることができます。つまり、指定のバージョンのパッケージ"
@@ -754,36 +795,29 @@ msgstr ""
 "ます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml apt-get.8.xml
+#: apt.8.xml
 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 ""
-"<literal>remove</literal> は、パッケージが削除されることを除き、"
-"<literal>install</literal> と同様です。削除されたパッケージの設定ファイルは、"
-"システムに残ったままになることに注意してください。プラス記号がパッケージ名に "
-"(間に空白を含まずに) 付加されると、識別されたパッケージを、削除ではなくインス"
-"トールします。"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.8.xml apt-get.8.xml
-msgid "(and the"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.8.xml apt-get.8.xml
-msgid "alias since 1.1)"
+"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 accidently 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."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml apt-get.8.xml
+#: apt.8.xml
+#, fuzzy
+#| 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."
 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."
+"now no longer needed as dependencies changed or the package(s)  needing them "
+"were removed in the meantime."
 msgstr ""
 "<literal>autoremove</literal> は、他のパッケージの依存関係を満たすために自動"
 "的にインストールされ、もう必要なくなったパッケージを削除するのに使用します。"
@@ -791,70 +825,98 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
-"<literal>edit-sources</literal> lets you edit your sources.list file and "
-"provides basic sanity checks."
+"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 "
+"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."
 msgstr ""
-"<literal>edit-sources</literal> では sources.list ファイルを編集させ、基礎的"
-"な健全性確認を行います。"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml
+#, fuzzy
+#| msgid "&apt-conf;"
+msgid "(&apt-cache;)"
+msgstr "&apt-conf;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
-"<literal>update</literal> is used to resynchronize the package index files "
-"from their sources."
+"<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 "
+"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 ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml
+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 "
+"look at this information before allowing &apt; to remove a package or while "
+"searching for new packages to install."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml
+msgid "(work-in-progress)"
 msgstr ""
-"<literal>update</literal> を使うとパッケージ索引ファイルをそれぞれのソースと"
-"再同期します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 #, fuzzy
 #| msgid ""
-#| "<literal>upgrade</literal> is used to install the newest versions of all "
-#| "packages currently installed on the system from the sources enumerated in "
-#| "<filename>/etc/apt/sources.list</filename>. New package will be "
-#| "installed, but existing package will never removed."
-msgid ""
-"<literal>upgrade</literal> is used to install the newest versions of all "
-"packages currently installed on the system from the sources enumerated in "
-"<filename>/etc/apt/sources.list</filename>. New packages will be installed, "
-"but existing packages will never be removed."
+#| "<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."
+msgid ""
+"<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 ""
-"<literal>upgrade</literal> を使うとシステムに現在インストールされている全パッ"
-"ケージの最新版を <filename>/etc/apt/sources.list</filename> に記載されている"
-"ソースからインストールします。新しいパッケージはインストールされますが既存の"
-"パッケージが削除されることはありません。"
+"パッケージ一覧を表示するには <literal>list</literal> を使います。パッケージ名"
+"のマッチングにシェルパターン、そしてオプション <option>--installed</"
+"option>、 <option>--upgradable</option>, <option>--upgradeable</option>、 "
+"<option>--all-versions</option> をサポートしています。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>edit-sources</literal> lets you edit your sources.list file and "
+#| "provides basic sanity checks."
 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."
+"<literal>edit-sources</literal> lets you edit your &sources-list; files in "
+"your preferred texteditor while also providing basic sanity checks."
 msgstr ""
-"<literal>full-upgrade</literal> はアップグレードの機能を実行しますが、パッ"
-"ケージの衝突を解決するために必要であればインストールされているパッケージの削"
-"除も行います。"
-
-#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-mark.8.xml apt-config.8.xml
-#: apt-extracttemplates.1.xml apt-sortpkgs.1.xml apt-ftparchive.1.xml
-msgid "options"
-msgstr "オプション"
+"<literal>edit-sources</literal> では sources.list ファイルを編集させ、基礎的"
+"な健全性確認を行います。"
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.8.xml
-msgid "Script usage"
-msgstr "スクリプトでの利用"
+msgid "Script usage and Differences to other APT tools"
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml
+#, fuzzy
+#| 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."
 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."
+"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 "
+"interactive use."
 msgstr ""
 "&apt; コマンドラインはエンドユーザ向けツールとして設計されており、出力はバー"
 "ジョン間で変更される可能性があります。後方互換性を損なうことのないようには努"
@@ -862,50 +924,15 @@ msgstr ""
 "&apt-cache; や &apt-get; で利用可能です。スクリプトでは各コマンドの利用を選択"
 "するようにしてください。"
 
-#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml
-msgid "Differences to &apt-get;"
-msgstr "&apt-get; との違い"
-
 #. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml
 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:"
+"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."
 msgstr ""
-"<command>apt</command> コマンドはエンドユーザにとって使いやすいように意図して"
-"作られているため &apt-get; のように後方互換性が必ずしもあるとは限りません。し"
-"たがって、一部のオプションに異なる点があります:"
-
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml
-msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
-msgstr ""
-"オプション <literal>DPkg::Progress-Fancy</literal> が有効になっています。"
-
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml
-msgid "The option <literal>APT::Color</literal> is enabled."
-msgstr "オプション <literal>APT::Color</literal> が有効になっています。"
-
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml
-msgid ""
-"A new <literal>list</literal> command is available similar to <literal>dpkg "
-"--list</literal>."
-msgstr ""
-"新しい <literal>list</literal> コマンドは <literal>dpkg --list</literal> と同"
-"じように利用できます。"
-
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml
-msgid ""
-"The option <literal>upgrade</literal> has <literal>--with-new-pkgs</literal> "
-"enabled by default."
-msgstr ""
-"オプション <literal>upgrade</literal> では <literal>--with-new-pkgs</"
-"literal> がデフォルトで有効になっています。"
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml
@@ -1086,6 +1113,23 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 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 ""
+"パッケージにイコール記号とバージョンを続けることで、選択したバージョンのパッ"
+"ケージをインストールすることができます。つまり、指定のバージョンのパッケージ"
+"をインストールするように選択する、ということです。別の方法としては、ディスト"
+"リビューションを特定するのに、パッケージ名に続けて、スラッシュとディストリ"
+"ビューションのバージョンやアーカイブ名 (stable, testing, unstable) を記述でき"
+"ます。"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
 "used with care."
 msgstr ""
@@ -1140,6 +1184,21 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 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 ""
+"<literal>remove</literal> は、パッケージが削除されることを除き、"
+"<literal>install</literal> と同様です。削除されたパッケージの設定ファイルは、"
+"システムに残ったままになることに注意してください。プラス記号がパッケージ名に "
+"(間に空白を含まずに) 付加されると、識別されたパッケージを、削除ではなくインス"
+"トールします。"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
 "that packages are removed and purged (any configuration files are deleted "
 "too)."
@@ -1265,6 +1324,16 @@ msgstr ""
 "す。<filename>&cachedir;/archives/</filename> と <filename>&cachedir;/"
 "archives/partial/</filename> からロックファイル以外すべて削除します。"
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml
+msgid "(and the"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml
+msgid "alias since 1.1)"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
@@ -1286,6 +1355,16 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
+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 ""
+"<literal>autoremove</literal> は、他のパッケージの依存関係を満たすために自動"
+"的にインストールされ、もう必要なくなったパッケージを削除するのに使用します。"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
 #, fuzzy
 #| msgid ""
 #| "<literal>changelog</literal> downloads a package changelog and displays "
@@ -1326,6 +1405,12 @@ msgid ""
 "<literal><filename>doc/acquire-additional-files.txt</filename></literal>."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><title>
+#: apt-get.8.xml apt-cache.8.xml apt-config.8.xml apt-extracttemplates.1.xml
+#: apt-sortpkgs.1.xml apt-ftparchive.1.xml
+msgid "options"
+msgstr "オプション"
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
@@ -2550,6 +2635,14 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
+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
 msgid "Remove a key from the list of trusted keys."
 msgstr "信頼キー一覧からキーを削除します。"
 
@@ -2576,11 +2669,11 @@ msgstr "信頼キーのフィンガープリントを一覧表示します。"
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 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 ""
-"gpg に上級オプションを渡します。adv --recv-key とすると、公開鍵をダウンロード"
-"できます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
@@ -2614,7 +2707,7 @@ msgstr ""
 "有効です。"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml apt-cdrom.8.xml
+#: apt-key.8.xml apt-mark.8.xml apt-cdrom.8.xml
 msgid "Options"
 msgstr "オプション"
 
@@ -2680,26 +2773,42 @@ msgstr "&apt-get;, &apt-secure;"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-mark.8.xml
-msgid "mark/unmark a package as being automatically-installed"
-msgstr "パッケージが自動的にインストールされたかどうかのマークを変更します。"
+msgid "show, set and unset various settings for a package"
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-mark.8.xml
 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 frontend to set various "
+"settings for a package like 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
+msgid "Automatically and manually installed packages"
 msgstr ""
-"<command>apt-mark</command> は、パッケージが自動的にインストールされたかどう"
-"かのマークを変更します。"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-mark.8.xml
+#, fuzzy
+#| 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>."
 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 package you installed explicitely is "
+"marked as manually installed.  Once a 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 ""
 "パッケージをインストールすると要求し、その結果、別のパッケージが依存関係を満"
 "たすためにインストールされた場合、依存関係に自動的にインストールしたと印を付"
@@ -2732,30 +2841,6 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml
 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."
-msgstr ""
-"<literal>hold</literal> は、パッケージが自動的にインストール・アップグレー"
-"ド・削除が行われないよう、パッケージに保留マークをつけるのに使用します。この"
-"コマンドは <command>dpkg --set-selections</command> のラッパーに過ぎず、その"
-"ため状態は  &dpkg; により管理され、<option>--file</option> オプションは効果が"
-"ありません。"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml
-msgid ""
-"<literal>unhold</literal> is used to cancel a previously set hold on a "
-"package to allow all actions again."
-msgstr ""
-"<literal>unhold</literal> は、以前保留したパッケージを、また操作できるよう"
-"キャンセルするのに使用します。"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml
-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 "
@@ -2776,6 +2861,47 @@ msgstr ""
 "<literal>showmanual</literal> は <literal>showauto</literal> と同様に使用でき"
 "ますが、手動でインストールしたパッケージの一覧を表示します。"
 
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml
+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 ""
+"デフォルトの場所 (設定項目: <literal>Dir::State</literal> で定義したディレク"
+"トリの <filename>extended_status</filename>) ではなく、パラメータ &synopsis-"
+"param-filename; からパッケージの状態を読み書きします。"
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt-mark.8.xml
+msgid "Prevent changes for a package"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>manual</literal> is used to mark a package as being manually "
+#| "installed, which will prevent the package from being automatically "
+#| "removed if no other packages depend on it."
+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."
+msgstr ""
+"<literal>manual</literal> は、パッケージを手動でインストールしたとしてマーク"
+"します。このパッケージに依存する他のパッケージがなくなっても、このパッケージ"
+"を自動的に削除するのを防ぎます。"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml
+msgid ""
+"<literal>unhold</literal> is used to cancel a previously set hold on a "
+"package to allow all actions again."
+msgstr ""
+"<literal>unhold</literal> は、以前保留したパッケージを、また操作できるよう"
+"キャンセルするのに使用します。"
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml
 msgid ""
@@ -2785,17 +2911,23 @@ msgstr ""
 "<literal>showhold</literal> は、他の show コマンドと同様に、保留されている"
 "パッケージを出力します。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><title>
+#: apt-mark.8.xml
+msgid "Shedule packages for install, remove and purge"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
 #: apt-mark.8.xml
 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 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>, <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 ""
-"デフォルトの場所 (設定項目: <literal>Dir::State</literal> で定義したディレク"
-"トリの <filename>extended_status</filename>) ではなく、パラメータ &synopsis-"
-"param-filename; からパッケージの状態を読み書きします。"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-mark.8.xml
@@ -2813,11 +2945,17 @@ msgstr "APT アーカイブ認証サポート"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| 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."
 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 ""
 "バージョン 0.6 より、<command>apt</command> 全アーカイブに対する Release ファ"
 "イルの署名チェックコードが含まれています。これにより、アーカイブのパッケージ"
@@ -2827,36 +2965,56 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 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 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."
 msgstr ""
-"アーカイブ由来のパッケージが、署名されなかったり、apt が持っていないキーで署"
-"名されていた場合、信頼されていないと見なし、インストールの際に重要な警告を表"
-"示します。<command>apt-get</command> は、現在未署名のパッケージに対して警告す"
-"るだけですが、将来のリリースでは、アーカイブからパッケージをダウンロードする"
-"前に、すべてのソースに対して、強制的に検証される可能性があります。"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 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
+#, fuzzy
+#| msgid ""
+#| "The package frontends &apt-get;, &aptitude; and &synaptic; support this "
+#| "new authentication feature."
+msgid ""
+"Note: All APT-based package management frontends 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 ""
 "&apt-get;, &aptitude;, &synaptic; といったパッケージフロントエンドは、この新"
 "認証機能をサポートしています。"
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-secure.8.xml
-msgid "Trusted archives"
+#, fuzzy
+#| msgid "Trusted archives"
+msgid "Trusted repositories"
 msgstr "信頼済アーカイブ"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
-msgid ""
-"The chain of trust from an apt archive to the end user is made up of several "
+#, fuzzy
+#| msgid ""
+#| "The chain of trust from an apt archive to the end user is made up of "
+#| "several steps. <command>apt-secure</command> is the last step in this "
+#| "chain; 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 archive maintainer's responsibility to ensure that "
+#| "the archive's integrity is preserved."
+msgid ""
+"The chain of trust from an APT archive to the end user is made up of several "
 "steps. <command>apt-secure</command> is the last step in this chain; "
 "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 "
@@ -2885,13 +3043,22 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
-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."
+#, fuzzy
+#| 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."
+msgid ""
+"The chain of trust in Debian e.g. 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 one "
+"of the Debian package maintainers 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 ""
 "Debian における信頼の輪は、新しいパッケージやパッケージの新バージョンを、メン"
 "テナが Debian アーカイブにアップロードすることから始まります。これが有効にな"
@@ -2970,11 +3137,17 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| 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."
 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 ""
 "しかしこれは、(パッケージに署名する) Debian マスターサーバ自体の侵害や、"
 "Release ファイルに署名するのに使用したキーの漏洩を防げません。いずれにせよ、"
@@ -2987,11 +3160,17 @@ msgstr "ユーザの設定"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| 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."
 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 ""
 "<command>apt-key</command> は、apt が使用するキーリストを管理するプログラムで"
 "す。このリリースのインストールでは、Debian パッケージリポジトリで使用する、デ"
@@ -3001,6 +3180,15 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""
+"Note that a default installation already contains all keys to securily "
+"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>
+#: apt-secure.8.xml
+msgid ""
 "In order to add a new key you need to first download it (you should make "
 "sure you are using a trusted communication channel when retrieving it), add "
 "it with <command>apt-key</command> and then run <command>apt-get update</"
@@ -3053,15 +3241,33 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| msgid ""
+#| "<emphasis>Publish the key fingerprint</emphasis>, that way your users "
+#| "will know what key they need to import in order to authenticate the files "
+#| "in the archive."
 msgid ""
 "<emphasis>Publish the key fingerprint</emphasis>, that way your users will "
 "know what key they need to import in order to authenticate the files in the "
-"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 ""
 "<emphasis>キーの指紋を配布</emphasis>します。これにより、アーカイブ内のファイ"
 "ル認証に、どのキーをインポートする必要があるかを、ユーザに知らせることになり"
 "ます。"
 
+#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
+#: apt-secure.8.xml
+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 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."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""
@@ -3083,9 +3289,17 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| 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=\"http://"
+#| "www.cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution "
+#| "HOWTO</ulink> by V. Alex Brennen."
 msgid ""
 "For more background information you might want to review the <ulink url="
-"\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
+"\"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 url=\"http://www."
 "cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution HOWTO</"
@@ -3458,6 +3672,13 @@ msgstr "<literal>Dir::Etc::Main</literal> で指定される、メイン設定�
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
 #: apt.conf.5.xml
 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
+msgid ""
 "the command line options are applied to override the configuration "
 "directives or to load even more configuration files."
 msgstr ""
@@ -4662,6 +4883,41 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.conf.5.xml
+#, fuzzy
+#| msgid "User configuration"
+msgid "Binary specific configuration"
+msgstr "ユーザの設定"
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml
+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
+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
+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
 msgid "Directories"
 msgstr "ディレクトリ"
 
@@ -5524,8 +5780,7 @@ msgstr ""
 "{Pre,Post}-Invoke</literal> があります。"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml
-#: apt-ftparchive.1.xml
+#: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml apt-ftparchive.1.xml
 msgid "Examples"
 msgstr "サンプル"
 
@@ -7365,6 +7620,22 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #: sources.list.5.xml
 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."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml
+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 "
@@ -10427,6 +10698,127 @@ msgid "Which will use the already fetched archives on the disc."
 msgstr "これで、ディスクにある取得済みのアーカイブを使用するようになります。"
 
 #~ msgid ""
+#~ "<command>apt</command> (Advanced Package Tool) is the command-line tool "
+#~ "for handling packages. It provides a commandline interface for the "
+#~ "package management of the system.  See also &apt-get; and &apt-cache; for "
+#~ "more low-level command options."
+#~ msgstr ""
+#~ "<command>apt</command> (Advanced Package Tool、高度パッケージツール) は"
+#~ "パッケージ処理用のコマンドラインツールです。システムのパッケージ管理用コマ"
+#~ "ンドラインインターフェイスを提供します。さらなる低レベルコマンドオプション"
+#~ "については &apt-get; 及び &apt-cache; も参照してください。"
+
+#~ msgid ""
+#~ "<literal>search</literal> searches for the given term(s) and display "
+#~ "matching packages."
+#~ msgstr ""
+#~ "<literal>search</literal> では指定した語を検索して該当するパッケージを表示"
+#~ "します。"
+
+#~ msgid ""
+#~ "<literal>show</literal> shows the package information for the given "
+#~ "package(s)."
+#~ msgstr ""
+#~ "<literal>show</literal> では指定したパッケージについてのパッケージ情報を表"
+#~ "示します。"
+
+#~ msgid ""
+#~ "<literal>install</literal> is followed by one or more package names "
+#~ "desired for installation or upgrading."
+#~ msgstr ""
+#~ "<literal>install</literal> に続けてインストールやアップグレードしたいパッ"
+#~ "ケージの名前を指定します。"
+
+#~ msgid ""
+#~ "<literal>update</literal> is used to resynchronize the package index "
+#~ "files from their sources."
+#~ msgstr ""
+#~ "<literal>update</literal> を使うとパッケージ索引ファイルをそれぞれのソース"
+#~ "と再同期します。"
+
+#~ msgid "Script usage"
+#~ msgstr "スクリプトでの利用"
+
+#~ msgid "Differences to &apt-get;"
+#~ msgstr "&apt-get; との違い"
+
+#~ msgid ""
+#~ "The <command>apt</command> command is meant to be pleasant for end users "
+#~ "and does not need to be backward compatible like &apt-get;. Therefore "
+#~ "some options are different:"
+#~ msgstr ""
+#~ "<command>apt</command> コマンドはエンドユーザにとって使いやすいように意図"
+#~ "して作られているため &apt-get; のように後方互換性が必ずしもあるとは限りま"
+#~ "せん。したがって、一部のオプションに異なる点があります:"
+
+#~ msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
+#~ msgstr ""
+#~ "オプション <literal>DPkg::Progress-Fancy</literal> が有効になっています。"
+
+#~ msgid "The option <literal>APT::Color</literal> is enabled."
+#~ msgstr "オプション <literal>APT::Color</literal> が有効になっています。"
+
+#~ msgid ""
+#~ "A new <literal>list</literal> command is available similar to "
+#~ "<literal>dpkg --list</literal>."
+#~ msgstr ""
+#~ "新しい <literal>list</literal> コマンドは <literal>dpkg --list</literal> "
+#~ "と同じように利用できます。"
+
+#~ msgid ""
+#~ "The option <literal>upgrade</literal> has <literal>--with-new-pkgs</"
+#~ "literal> enabled by default."
+#~ msgstr ""
+#~ "オプション <literal>upgrade</literal> では <literal>--with-new-pkgs</"
+#~ "literal> がデフォルトで有効になっています。"
+
+#~ msgid ""
+#~ "Pass advanced options to gpg. With adv --recv-key you can download the "
+#~ "public key."
+#~ msgstr ""
+#~ "gpg に上級オプションを渡します。adv --recv-key とすると、公開鍵をダウン"
+#~ "ロードできます。"
+
+#~ msgid "mark/unmark a package as being automatically-installed"
+#~ msgstr ""
+#~ "パッケージが自動的にインストールされたかどうかのマークを変更します。"
+
+#~ msgid ""
+#~ "<command>apt-mark</command> will change whether a package has been marked "
+#~ "as being automatically installed."
+#~ msgstr ""
+#~ "<command>apt-mark</command> は、パッケージが自動的にインストールされたかど"
+#~ "うかのマークを変更します。"
+
+#~ 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."
+#~ msgstr ""
+#~ "<literal>hold</literal> は、パッケージが自動的にインストール・アップグレー"
+#~ "ド・削除が行われないよう、パッケージに保留マークをつけるのに使用します。こ"
+#~ "のコマンドは <command>dpkg --set-selections</command> のラッパーに過ぎず、"
+#~ "そのため状態は  &dpkg; により管理され、<option>--file</option> オプション"
+#~ "は効果がありません。"
+
+#~ 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."
+#~ msgstr ""
+#~ "アーカイブ由来のパッケージが、署名されなかったり、apt が持っていないキーで"
+#~ "署名されていた場合、信頼されていないと見なし、インストールの際に重要な警告"
+#~ "を表示します。<command>apt-get</command> は、現在未署名のパッケージに対し"
+#~ "て警告するだけですが、将来のリリースでは、アーカイブからパッケージをダウン"
+#~ "ロードする前に、すべてのソースに対して、強制的に検証される可能性がありま"
+#~ "す。"
+
+#~ msgid ""
 #~ "No action; perform a simulation of events that would occur but do not "
 #~ "actually change the system.  Configuration Item: <literal>APT::Get::"
 #~ "Simulate</literal>."
diff --git a/doc/po/pl.po b/doc/po/pl.po
index a69d99f8d..37cf2fb5f 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.5\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-10-22 16:34+0200\n"
 "PO-Revision-Date: 2014-07-04 02:13+0200\n"
 "Last-Translator: Robert Luberda <robert@debian.org>\n"
 "Language-Team: Polish <manpages-pl-list@lists.sourceforge.net>\n"
@@ -686,59 +686,89 @@ msgstr "Opis"
 #. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml
 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 ""
 
+#. type: Content of: <refentry><refsect1><para>
+#: apt.8.xml
+msgid ""
+"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 "
+"overwelming readers with a cornucopia of options and details."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml
+#, fuzzy
+#| msgid "apt-get"
+msgid "(&apt-get;)"
+msgstr "apt-get"
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 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."
+"<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
 msgid ""
-"<literal>search</literal> searches for the given term(s) and display "
-"matching packages."
+"<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>
 #: apt.8.xml
-#, fuzzy
-#| msgid ""
-#| "<literal>rdepends</literal> shows a listing of each reverse dependency a "
-#| "package has."
 msgid ""
-"<literal>show</literal> shows the package information for the given "
-"package(s)."
+"<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>
+#: apt.8.xml
+msgid ","
 msgstr ""
-"<literal>rdepends</literal> pokazuje listę wszystkich odwrotnych zależności "
-"danego pakietu."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
-"<literal>install</literal> is followed by one or more package names desired "
-"for installation or upgrading."
+"Performs the requested action on one or more packages specified via &regex;, "
+"&glob; or exact match. The requested action can be overidden 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 apt-get.8.xml
+#: apt.8.xml
+#, fuzzy
+#| 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)."
 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)."
+"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 ""
 "Konkretna wersja pakietu może być wybrana do zainstalowania przez "
 "umieszczenie po nazwie pakietu znaku równości, a za nim wybranej wersji "
@@ -747,37 +777,30 @@ msgstr ""
 "pakietu znaku ukośnika, po którym następuje wersja dystrybucji bądź nazwa "
 "archiwum (stable, testing, unstable)."
 
-#
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml apt-get.8.xml
+#: apt.8.xml
 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 ""
-"<literal>remove</literal> odpowiada poleceniu <literal>install</literal> z "
-"tą różnicą, że pakiety są usuwane, a nie instalowane. Jeżeli nazwa pakietu "
-"zostanie poprzedzona znakiem plusa (bez rozdzielającej spacji), wskazany "
-"pakiet zostanie zainstalowany zamiast zostać usunięty."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.8.xml apt-get.8.xml
-msgid "(and the"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.8.xml apt-get.8.xml
-msgid "alias since 1.1)"
+"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 accidently 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."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml apt-get.8.xml
+#: apt.8.xml
+#, fuzzy
+#| 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."
 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."
+"now no longer needed as dependencies changed or the package(s)  needing them "
+"were removed in the meantime."
 msgstr ""
 "<literal>autoremove</literal> jest używane do usuwania pakietów, które  "
 "zostały zainstalowane automatycznie, żeby rozwiązać zależności w innych "
@@ -786,104 +809,86 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
-"<literal>edit-sources</literal> lets you edit your sources.list file and "
-"provides basic sanity checks."
+"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 "
+"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."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt.8.xml
 #, fuzzy
-#| msgid ""
-#| "<literal>showhold</literal> is used to print a list of packages on hold "
-#| "in the same way as for the other show commands."
-msgid ""
-"<literal>update</literal> is used to resynchronize the package index files "
-"from their sources."
-msgstr ""
-"<literal>showhold</literal> jest używane do wypisania listy wszystkich "
-"pakietów wstrzymanych, w taki sam sposób jak pozostałe polecenia \"show\"."
+#| msgid "&apt-conf;"
+msgid "(&apt-cache;)"
+msgstr "&apt-conf;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 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."
+"<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 "
+"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 ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 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."
+"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 "
+"look at this information before allowing &apt; to remove a package or while "
+"searching for new packages to install."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-mark.8.xml apt-config.8.xml
-#: apt-extracttemplates.1.xml apt-sortpkgs.1.xml apt-ftparchive.1.xml
-msgid "options"
-msgstr "opcje"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml
+msgid "(work-in-progress)"
+msgstr ""
 
-#. type: Content of: <refentry><refsect1><title>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
-msgid "Script usage"
+msgid ""
+"<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 ""
 
-#. type: Content of: <refentry><refsect1><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 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."
+"<literal>edit-sources</literal> lets you edit your &sources-list; files in "
+"your preferred texteditor while also providing basic sanity checks."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.8.xml
-msgid "Differences to &apt-get;"
+msgid "Script usage and Differences to other APT tools"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml
 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:"
+"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 "
+"interactive use."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml
-#, fuzzy
-#| msgid "the <literal>Package:</literal> line"
-msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
-msgstr "linia <literal>Package:</literal>"
-
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml
-#, fuzzy
-#| msgid "the <literal>Component:</literal> line"
-msgid "The option <literal>APT::Color</literal> is enabled."
-msgstr "linia <literal>Component:</literal>"
-
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml
 msgid ""
-"A new <literal>list</literal> command is available similar to <literal>dpkg "
-"--list</literal>."
+"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."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml
-#, fuzzy
-#| msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
-msgid ""
-"The option <literal>upgrade</literal> has <literal>--with-new-pkgs</literal> "
-"enabled by default."
-msgstr "linia <literal>Archive:</literal> lub <literal>Suite:</literal>"
-
 #. type: Content of: <refentry><refsect1><title>
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml
 #: apt-secure.8.xml apt-cdrom.8.xml apt-config.8.xml apt.conf.5.xml
@@ -1095,6 +1100,24 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 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 ""
+"Konkretna wersja pakietu może być wybrana do zainstalowania przez "
+"umieszczenie po nazwie pakietu znaku równości, a za nim wybranej wersji "
+"pakietu. Podana wersja zostanie wyszukana i wybrana do zainstalowania.  "
+"Również konkretna dystrybucja może być wybrana przez umieszczenie po nazwie "
+"pakietu znaku ukośnika, po którym następuje wersja dystrybucji bądź nazwa "
+"archiwum (stable, testing, unstable)."
+
+#
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
 "used with care."
 msgstr ""
@@ -1154,6 +1177,21 @@ msgstr ""
 "początek lub koniec dopasowania wyrażenia regularnego, używając znaków \"^| "
 "lub \"$\", można też stworzyć bardziej specyficzne wyrażenie regularne."
 
+#
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+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 ""
+"<literal>remove</literal> odpowiada poleceniu <literal>install</literal> z "
+"tą różnicą, że pakiety są usuwane, a nie instalowane. Jeżeli nazwa pakietu "
+"zostanie poprzedzona znakiem plusa (bez rozdzielającej spacji), wskazany "
+"pakiet zostanie zainstalowany zamiast zostać usunięty."
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
@@ -1303,6 +1341,16 @@ msgstr ""
 "dselect, powinny od czasu do czasu uruchamiać <literal>apt-get clean</"
 "literal>, aby zwolnić trochę miejsca na dysku."
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml
+msgid "(and the"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml
+msgid "alias since 1.1)"
+msgstr ""
+
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -1326,6 +1374,17 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
+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 ""
+"<literal>autoremove</literal> jest używane do usuwania pakietów, które  "
+"zostały zainstalowane automatycznie, żeby rozwiązać zależności w innych "
+"pakietach, i nie są już potrzebne."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
 #, fuzzy
 #| msgid ""
 #| "<literal>changelog</literal> downloads a package changelog and displays "
@@ -1367,6 +1426,12 @@ msgid ""
 "<literal><filename>doc/acquire-additional-files.txt</filename></literal>."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><title>
+#: apt-get.8.xml apt-cache.8.xml apt-config.8.xml apt-extracttemplates.1.xml
+#: apt-sortpkgs.1.xml apt-ftparchive.1.xml
+msgid "options"
+msgstr "opcje"
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
@@ -2731,6 +2796,14 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
+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
 msgid "Remove a key from the list of trusted keys."
 msgstr "Usuwa klucz z listy zaufanych kluczy."
 
@@ -2757,11 +2830,11 @@ msgstr "Wyświetla listę odcisków zaufanych kluczy."
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 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 ""
-"Przekazuje zaawansowane opcje do gpg. Na przykład adv --recv-key umożliwia "
-"pobranie klucza publicznego."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
@@ -2796,7 +2869,7 @@ msgstr ""
 "command>, ale APT w Ubuntu je obsługuje."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml apt-cdrom.8.xml
+#: apt-key.8.xml apt-mark.8.xml apt-cdrom.8.xml
 msgid "Options"
 msgstr "Opcje"
 
@@ -2863,26 +2936,42 @@ msgstr "&apt-get;, &apt-secure;"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-mark.8.xml
-msgid "mark/unmark a package as being automatically-installed"
-msgstr "Zaznaczanie/odznaczanie pakietu jako zainstalowanego automatycznie."
+msgid "show, set and unset various settings for a package"
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-mark.8.xml
 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 frontend to set various "
+"settings for a package like 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
+msgid "Automatically and manually installed packages"
 msgstr ""
-"<command>apt-mark</command> zmienia flagę mówiącą o tym, czy pakiet był "
-"zainstalowany automatycznie."
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-mark.8.xml
+#, fuzzy
+#| 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>."
 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 package you installed explicitely is "
+"marked as manually installed.  Once a 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 ""
 "Kiedy użytkownik zażąda zainstalowania pakietu, to zazwyczaj instalowane są "
 "również inne pakiety, zależące od żądanego pakietu. Te zależne pakiety są "
@@ -2916,31 +3005,6 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml
 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."
-msgstr ""
-"<literal>hold</literal> jest używane do wstrzymania pakietu, co zabroni "
-"automatycznego instalowania, aktualizowania lub usuwania pakietu. Polecenie "
-"jest nakładką na <command>dpkg --set-selections</command>, stan pakietu jest "
-"zarządzany przez &dpkg;, a opcja <option>--file</option> nie wpływa na "
-"działanie tego polecenia."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml
-msgid ""
-"<literal>unhold</literal> is used to cancel a previously set hold on a "
-"package to allow all actions again."
-msgstr ""
-"<literal>unhold</literal> jest używane do usunięcia stanu wstrzymania "
-"pakietu ustawionego poprzednio i pozwolenia na wykonywanie wszystkich akcji "
-"na tym pakiecie."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml
-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 "
@@ -2963,6 +3027,49 @@ msgstr ""
 "jak <literal>showauto</literal> z tym wyjątkiem, że wypisze listę ręcznie "
 "zainstalowanych pakietów."
 
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml
+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 ""
+"Informacje o stanie pakietów są czytane z (lub zapisywane do) pliku "
+"przekazanego w parametrze &synopsis-param-filename; zamiast z pliku "
+"domyślnego, którym jest <filename>extended_status</filename> w katalogu "
+"określonym w pliku konfiguracyjnym w pozycji<literal>Dir::State</literal>."
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt-mark.8.xml
+msgid "Prevent changes for a package"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>manual</literal> is used to mark a package as being manually "
+#| "installed, which will prevent the package from being automatically "
+#| "removed if no other packages depend on it."
+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."
+msgstr ""
+"<literal>manual</literal> jest używane do zaznaczania pakietu jako "
+"zainstalowanego ręcznie, co go uchroni przed automatycznym usunięciem, w "
+"sytuacji gdy żaden inny pakiet nie będzie od niego zależał."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml
+msgid ""
+"<literal>unhold</literal> is used to cancel a previously set hold on a "
+"package to allow all actions again."
+msgstr ""
+"<literal>unhold</literal> jest używane do usunięcia stanu wstrzymania "
+"pakietu ustawionego poprzednio i pozwolenia na wykonywanie wszystkich akcji "
+"na tym pakiecie."
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml
 msgid ""
@@ -2972,18 +3079,23 @@ msgstr ""
 "<literal>showhold</literal> jest używane do wypisania listy wszystkich "
 "pakietów wstrzymanych, w taki sam sposób jak pozostałe polecenia \"show\"."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><title>
+#: apt-mark.8.xml
+msgid "Shedule packages for install, remove and purge"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
 #: apt-mark.8.xml
 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 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>, <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 ""
-"Informacje o stanie pakietów są czytane z (lub zapisywane do) pliku "
-"przekazanego w parametrze &synopsis-param-filename; zamiast z pliku "
-"domyślnego, którym jest <filename>extended_status</filename> w katalogu "
-"określonym w pliku konfiguracyjnym w pozycji<literal>Dir::State</literal>."
 
 #
 #. type: Content of: <refentry><refsect1><para>
@@ -3002,11 +3114,17 @@ msgstr "Wsparcie APT dla autentykacji archiwum."
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| 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."
 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 ""
 "Począwszy od wersji 0.6 <command>apt</command> zawiera kod sprawdzający "
 "sygnatury plików \"Release\" wszystkich archiwów. Zapewnia to, że pakiety w "
@@ -3016,37 +3134,56 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 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 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."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-secure.8.xml
+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>."
 msgstr ""
-"Jeśli pakiet pochodzi z archiwum niemającego sygnatury lub mającego "
-"sygnaturę, dla której APT nie ma klucza, to pakiet taki jest uznawany za "
-"niezaufany, a podczas jego instalacji zostanie wypisane ostrzeżenie. Obecnie "
-"<command>apt-get</command> tylko wypisuje ostrzeżenia o niepodpisanych "
-"archiwach, przyszłe wydania mogą wymuszać, by wszystkie źródła były "
-"zweryfikowane, zanim w ogóle APT spróbuje z nich pobrać pakiety."
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| msgid ""
+#| "The package frontends &apt-get;, &aptitude; and &synaptic; support this "
+#| "new authentication feature."
 msgid ""
-"The package frontends &apt-get;, &aptitude; and &synaptic; support this new "
-"authentication feature."
+"Note: All APT-based package management frontends 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 ""
 "Nakładki na APT typu &apt-get;, &aptitude; i &synaptic; obsługują ten nowy "
 "sposób autoryzacji pakietów."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-secure.8.xml
-msgid "Trusted archives"
+#, fuzzy
+#| msgid "Trusted archives"
+msgid "Trusted repositories"
 msgstr "Zaufane archiwa"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
-msgid ""
-"The chain of trust from an apt archive to the end user is made up of several "
+#, fuzzy
+#| msgid ""
+#| "The chain of trust from an apt archive to the end user is made up of "
+#| "several steps. <command>apt-secure</command> is the last step in this "
+#| "chain; 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 archive maintainer's responsibility to ensure that "
+#| "the archive's integrity is preserved."
+msgid ""
+"The chain of trust from an APT archive to the end user is made up of several "
 "steps. <command>apt-secure</command> is the last step in this chain; "
 "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 "
@@ -3074,13 +3211,22 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
-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."
+#, fuzzy
+#| 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."
+msgid ""
+"The chain of trust in Debian e.g. 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 one "
+"of the Debian package maintainers 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 ""
 "Łańcuch zaufania w Debianie zaczyna się od wgrania nowego pakietu lub nowej "
 "wersji pakietu przez jego opiekuna do archiwum Debiana. Dostarczony przez "
@@ -3165,11 +3311,17 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| 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."
 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 ""
 "Jednakże nie chroni przed złamaniem zabezpieczeń głównego serwera Debiana "
 "(używanego do podpisywania pakietów) lub złamaniem zabezpieczeń klucza "
@@ -3183,11 +3335,17 @@ msgstr "Konfiguracja użytkownika"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| 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."
 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 ""
 "<command>apt-key</command> jest programem służącym do zarządzania listą "
 "kluczy używanych przez APT. Można go użyć do dodania lub usunięcia klucza, "
@@ -3198,6 +3356,15 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""
+"Note that a default installation already contains all keys to securily "
+"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>
+#: apt-secure.8.xml
+msgid ""
 "In order to add a new key you need to first download it (you should make "
 "sure you are using a trusted communication channel when retrieving it), add "
 "it with <command>apt-key</command> and then run <command>apt-get update</"
@@ -3247,15 +3414,33 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| msgid ""
+#| "<emphasis>Publish the key fingerprint</emphasis>, that way your users "
+#| "will know what key they need to import in order to authenticate the files "
+#| "in the archive."
 msgid ""
 "<emphasis>Publish the key fingerprint</emphasis>, that way your users will "
 "know what key they need to import in order to authenticate the files in the "
-"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 ""
 "<emphasis>Opublikować odcisk klucza (ang. \"key fingerprint\")</emphasis>, "
 "tak żeby użytkownicy wiedzieli, który klucz zaimportować, żeby móc "
 "autoryzować plików w archiwum."
 
+#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
+#: apt-secure.8.xml
+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 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."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""
@@ -3277,9 +3462,17 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| 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=\"http://"
+#| "www.cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution "
+#| "HOWTO</ulink> by V. Alex Brennen."
 msgid ""
 "For more background information you might want to review the <ulink url="
-"\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
+"\"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 url=\"http://www."
 "cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution HOWTO</"
@@ -3688,6 +3881,13 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
 #: apt.conf.5.xml
 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
+msgid ""
 "the command line options are applied to override the configuration "
 "directives or to load even more configuration files."
 msgstr ""
@@ -4520,6 +4720,41 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.conf.5.xml
+#, fuzzy
+#| msgid "User configuration"
+msgid "Binary specific configuration"
+msgstr "Konfiguracja użytkownika"
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml
+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
+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
+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
 msgid "Directories"
 msgstr ""
 
@@ -5164,8 +5399,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml
-#: apt-ftparchive.1.xml
+#: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml apt-ftparchive.1.xml
 msgid "Examples"
 msgstr "Przykłady"
 
@@ -7051,6 +7285,22 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #: sources.list.5.xml
 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."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml
+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 "
@@ -9991,6 +10241,92 @@ msgid "Which will use the already fetched archives on the disc."
 msgstr "Które użyje pobranych uprzednio archiwów z dysku."
 
 #
+#, fuzzy
+#~| msgid ""
+#~| "<literal>rdepends</literal> shows a listing of each reverse dependency a "
+#~| "package has."
+#~ msgid ""
+#~ "<literal>show</literal> shows the package information for the given "
+#~ "package(s)."
+#~ msgstr ""
+#~ "<literal>rdepends</literal> pokazuje listę wszystkich odwrotnych "
+#~ "zależności danego pakietu."
+
+#, fuzzy
+#~| msgid ""
+#~| "<literal>showhold</literal> is used to print a list of packages on hold "
+#~| "in the same way as for the other show commands."
+#~ msgid ""
+#~ "<literal>update</literal> is used to resynchronize the package index "
+#~ "files from their sources."
+#~ msgstr ""
+#~ "<literal>showhold</literal> jest używane do wypisania listy wszystkich "
+#~ "pakietów wstrzymanych, w taki sam sposób jak pozostałe polecenia \"show\"."
+
+#, fuzzy
+#~| msgid "the <literal>Package:</literal> line"
+#~ msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
+#~ msgstr "linia <literal>Package:</literal>"
+
+#, fuzzy
+#~| msgid "the <literal>Component:</literal> line"
+#~ msgid "The option <literal>APT::Color</literal> is enabled."
+#~ msgstr "linia <literal>Component:</literal>"
+
+#, fuzzy
+#~| msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
+#~ msgid ""
+#~ "The option <literal>upgrade</literal> has <literal>--with-new-pkgs</"
+#~ "literal> enabled by default."
+#~ msgstr "linia <literal>Archive:</literal> lub <literal>Suite:</literal>"
+
+#~ msgid ""
+#~ "Pass advanced options to gpg. With adv --recv-key you can download the "
+#~ "public key."
+#~ msgstr ""
+#~ "Przekazuje zaawansowane opcje do gpg. Na przykład adv --recv-key "
+#~ "umożliwia pobranie klucza publicznego."
+
+#~ msgid "mark/unmark a package as being automatically-installed"
+#~ msgstr "Zaznaczanie/odznaczanie pakietu jako zainstalowanego automatycznie."
+
+#~ msgid ""
+#~ "<command>apt-mark</command> will change whether a package has been marked "
+#~ "as being automatically installed."
+#~ msgstr ""
+#~ "<command>apt-mark</command> zmienia flagę mówiącą o tym, czy pakiet był "
+#~ "zainstalowany automatycznie."
+
+#~ 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."
+#~ msgstr ""
+#~ "<literal>hold</literal> jest używane do wstrzymania pakietu, co zabroni "
+#~ "automatycznego instalowania, aktualizowania lub usuwania pakietu. "
+#~ "Polecenie jest nakładką na <command>dpkg --set-selections</command>, stan "
+#~ "pakietu jest zarządzany przez &dpkg;, a opcja <option>--file</option> nie "
+#~ "wpływa na działanie tego polecenia."
+
+#~ 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."
+#~ msgstr ""
+#~ "Jeśli pakiet pochodzi z archiwum niemającego sygnatury lub mającego "
+#~ "sygnaturę, dla której APT nie ma klucza, to pakiet taki jest uznawany za "
+#~ "niezaufany, a podczas jego instalacji zostanie wypisane ostrzeżenie. "
+#~ "Obecnie <command>apt-get</command> tylko wypisuje ostrzeżenia o "
+#~ "niepodpisanych archiwach, przyszłe wydania mogą wymuszać, by wszystkie "
+#~ "źródła były zweryfikowane, zanim w ogóle APT spróbuje z nich pobrać "
+#~ "pakiety."
+
+#
 #~ msgid ""
 #~ "No action; perform a simulation of events that would occur but do not "
 #~ "actually change the system.  Configuration Item: <literal>APT::Get::"
diff --git a/doc/po/pt.po b/doc/po/pt.po
index 832d807fe..eae77d68d 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.7\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-10-22 16:34+0200\n"
 "PO-Revision-Date: 2014-08-29 00:34+0100\n"
 "Last-Translator: Américo Monteiro <a_monteiro@gmx.com>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -689,65 +689,106 @@ msgstr "Descrição"
 #. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml
 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 ""
-"<command>apt</command> (Advanced Package Tool) é uma ferramenta de linha de "
-"comandos para manuseamento de pacotes. Disponibiliza uma interface de linha "
-"de comandos para a gestão de pacotes do sistema. Veja também &apt-get; e "
-"&apt-cache; para mais opções de baixo nível dos comandos."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml
 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 "
+"overwelming readers with a cornucopia of options and details."
 msgstr ""
-"<literal>list</literal> é usado para mostrar uma lista de pacotes. Suporta "
-"padrões da shell para corresponder aos nomes de pacotes e são suportadas as "
-"seguintes opções <option>--installed</option>, <option>--upgradable</"
-"option>, <option>--all-versions</option>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml
+#, fuzzy
+#| msgid "apt-get"
+msgid "(&apt-get;)"
+msgstr "apt-get"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
-"<literal>search</literal> searches for the given term(s) and display "
-"matching packages."
+"<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 ""
-"<literal>search</literal> procura por termo(s) determinado(s) e mostra os "
-"pacotes correspondentes."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>upgrade</literal> is used to install the newest versions of all "
+#| "packages currently installed on the system from the sources enumerated in "
+#| "<filename>/etc/apt/sources.list</filename>. New packages will be "
+#| "installed, but existing packages will never be removed."
+msgid ""
+"<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 ""
+"<literal>upgrade</literal> é usado para instalar as versões mais recentes de "
+"todos os pacotes actualmente instalados no sistema a partir das fontes "
+"enumeradas em <filename>/etc/apt/sources.list</filename>. Serão instalados "
+"novos pacotes, mas pacotes existentes nunca serão removidos."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml
+#, fuzzy
+#| 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."
 msgid ""
-"<literal>show</literal> shows the package information for the given "
-"package(s)."
+"<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 ""
+"<literal>full-upgrade</literal> executa a função de upgrade mas pode também "
+"remover pacotes instalados se tal for necessário de modo a resolver um "
+"conflito de pacotes."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml
+msgid ","
 msgstr ""
-"<literal>show</literal> mostra a informação do pacote para o(s) pacote(s) "
-"determinado(s)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
-"<literal>install</literal> is followed by one or more package names desired "
-"for installation or upgrading."
+"Performs the requested action on one or more packages specified via &regex;, "
+"&glob; or exact match. The requested action can be overidden for specific "
+"packages by append a plus (+) to the package name to install this package or "
+"a minus (-) to remove it."
 msgstr ""
-"<literal>install</literal> é seguido por um ou mais nomes de pacotes que se "
-"deseja instalar ou actualizar."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml apt-get.8.xml
+#: apt.8.xml
+#, fuzzy
+#| 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)."
 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)."
+"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 ""
 "Pode ser seleccionada para instalação uma versão específica de um pacote ao "
 "continuar o nome do pacote com um igual (=) e a versão do pacote a "
@@ -757,36 +798,29 @@ msgstr ""
 "versão da distribuição ou o nome de Arquivo (stable, testing, unstable)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml apt-get.8.xml
+#: apt.8.xml
 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 ""
-"<literal>remove</literal> é idêntico a <literal>install</literal>  à "
-"excepção que os pacotes são removidos em vez de instalados. Note que remover "
-"um pacote deixa os seus ficheiros de configuração no sistema. Se um sinal "
-"mais (+) for acrescentado ao nome do pacote (sem nenhum espaço a separar), o "
-"pacote identificado será instalado em vez de removido."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.8.xml apt-get.8.xml
-msgid "(and the"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.8.xml apt-get.8.xml
-msgid "alias since 1.1)"
+"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 accidently 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."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml apt-get.8.xml
+#: apt.8.xml
+#, fuzzy
+#| 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."
 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."
+"now no longer needed as dependencies changed or the package(s)  needing them "
+"were removed in the meantime."
 msgstr ""
 "<literal>autoremove</literal> é usado para remover pacotes que foram "
 "instalados automaticamente para satisfazer dependências de outros pacotes e "
@@ -795,64 +829,98 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
-"<literal>edit-sources</literal> lets you edit your sources.list file and "
-"provides basic sanity checks."
+"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 "
+"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."
 msgstr ""
-"<literal>edit-sources</literal> permite-lhe editar o seu ficheiro sources."
-"list e disponibiliza verificações de sanidade básicas."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml
+#, fuzzy
+#| msgid "&apt-conf;"
+msgid "(&apt-cache;)"
+msgstr "&apt-conf;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
-"<literal>update</literal> is used to resynchronize the package index files "
-"from their sources."
+"<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 "
+"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 ""
-"<literal>update</literal> é usado para re-sincronizar o índice dos pacotes a "
-"partir das suas fontes."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 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."
+"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 "
+"look at this information before allowing &apt; to remove a package or while "
+"searching for new packages to install."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml
+msgid "(work-in-progress)"
 msgstr ""
-"<literal>upgrade</literal> é usado para instalar as versões mais recentes de "
-"todos os pacotes actualmente instalados no sistema a partir das fontes "
-"enumeradas em <filename>/etc/apt/sources.list</filename>. Serão instalados "
-"novos pacotes, mas pacotes existentes nunca serão removidos."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
-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."
+#, fuzzy
+#| 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."
+msgid ""
+"<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 ""
-"<literal>full-upgrade</literal> executa a função de upgrade mas pode também "
-"remover pacotes instalados se tal for necessário de modo a resolver um "
-"conflito de pacotes."
+"<literal>list</literal> é usado para mostrar uma lista de pacotes. Suporta "
+"padrões da shell para corresponder aos nomes de pacotes e são suportadas as "
+"seguintes opções <option>--installed</option>, <option>--upgradable</"
+"option>, <option>--all-versions</option>."
 
-#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-mark.8.xml apt-config.8.xml
-#: apt-extracttemplates.1.xml apt-sortpkgs.1.xml apt-ftparchive.1.xml
-msgid "options"
-msgstr "opções"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>edit-sources</literal> lets you edit your sources.list file and "
+#| "provides basic sanity checks."
+msgid ""
+"<literal>edit-sources</literal> lets you edit your &sources-list; files in "
+"your preferred texteditor while also providing basic sanity checks."
+msgstr ""
+"<literal>edit-sources</literal> permite-lhe editar o seu ficheiro sources."
+"list e disponibiliza verificações de sanidade básicas."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.8.xml
-msgid "Script usage"
-msgstr "Utilização de script"
+msgid "Script usage and Differences to other APT tools"
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml
+#, fuzzy
+#| 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."
 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."
+"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 "
+"interactive use."
 msgstr ""
 "A linha de comandos do &apt; foi desenhada como ferramenta de utilizador "
 "final e pode variar os textos mostrados entre versões. Apesar de tentar não "
@@ -861,49 +929,15 @@ msgstr ""
 "get; via opções do APT. Por favor dê preferência a usar estes comandos nos "
 "seus scripts."
 
-#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml
-msgid "Differences to &apt-get;"
-msgstr "Diferenças para o &apt-get;"
-
 #. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml
 msgid ""
-"The <command>apt</command> command is meant to be pleasant for end users and "
-"does not need to be backward compatible like &apt-get;. Therefore some "
-"options are different:"
-msgstr ""
-"O comando  <command>apt</command> destina-se a ser agradável para os "
-"utilizadores finais e não precisa de ser compatível com as versões "
-"anteriores como o &apt-get;. Por isso algumas opções são diferentes."
-
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml
-msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
-msgstr "A opção <literal>DPkg::Progress-Fancy</literal> está activada."
-
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml
-msgid "The option <literal>APT::Color</literal> is enabled."
-msgstr "A opção <literal>APT::Color</literal> está activada."
-
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml
-msgid ""
-"A new <literal>list</literal> command is available similar to <literal>dpkg "
-"--list</literal>."
-msgstr ""
-"Está disponível um novo comando <literal>list</literal> de modo semelhante a "
-"<literal>dpkg --list</literal>."
-
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml
-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 prefer using "
+"these commands (potentially with some additional options enabled) in your "
+"scripts as they keep backward compatibility as much as possible."
 msgstr ""
-"A opção <literal>upgrade</literal> tem <literal>--with-new-pkgs</literal> "
-"activado por predefinição."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml
@@ -1091,6 +1125,23 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 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 ""
+"Pode ser seleccionada para instalação uma versão específica de um pacote ao "
+"continuar o nome do pacote com um igual (=) e a versão do pacote a "
+"seleccionar. Isto irá fazer com que essa versão seja localizada e "
+"seleccionada para instalação. Alternativamente pode ser seleccionada uma "
+"distribuição específica ao continuar o nome do pacote com uma slash (/) e a "
+"versão da distribuição ou o nome de Arquivo (stable, testing, unstable)."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
 "used with care."
 msgstr ""
@@ -1148,6 +1199,21 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 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 ""
+"<literal>remove</literal> é idêntico a <literal>install</literal>  à "
+"excepção que os pacotes são removidos em vez de instalados. Note que remover "
+"um pacote deixa os seus ficheiros de configuração no sistema. Se um sinal "
+"mais (+) for acrescentado ao nome do pacote (sem nenhum espaço a separar), o "
+"pacote identificado será instalado em vez de removido."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
 "that packages are removed and purged (any configuration files are deleted "
 "too)."
@@ -1276,6 +1342,16 @@ msgstr ""
 "obtidos. Remove tudo excepto o ficheiro lock de <filename>&cachedir;/"
 "archives/</filename> e <filename>&cachedir;/archives/partial/</filename>."
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml
+msgid "(and the"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml
+msgid "alias since 1.1)"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
@@ -1297,6 +1373,17 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
+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 ""
+"<literal>autoremove</literal> é usado para remover pacotes que foram "
+"instalados automaticamente para satisfazer dependências de outros pacotes e "
+"que já não são necessários."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
 #, fuzzy
 #| msgid ""
 #| "<literal>changelog</literal> downloads a package changelog and displays "
@@ -1338,6 +1425,12 @@ msgid ""
 "<literal><filename>doc/acquire-additional-files.txt</filename></literal>."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><title>
+#: apt-get.8.xml apt-cache.8.xml apt-config.8.xml apt-extracttemplates.1.xml
+#: apt-sortpkgs.1.xml apt-ftparchive.1.xml
+msgid "options"
+msgstr "opções"
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
@@ -2605,6 +2698,14 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
+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
 msgid "Remove a key from the list of trusted keys."
 msgstr "Remove uma chave da lista de chaves de confiança."
 
@@ -2631,11 +2732,11 @@ msgstr "Lista as fingerprints das chaves de confiança."
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 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 ""
-"Passa opções avançadas ao gpg. Com adv --recv-key você pode descarregar a "
-"chave pública."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
@@ -2669,7 +2770,7 @@ msgstr ""
 "lo."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml apt-cdrom.8.xml
+#: apt-key.8.xml apt-mark.8.xml apt-cdrom.8.xml
 msgid "Options"
 msgstr "Opções"
 
@@ -2737,26 +2838,42 @@ msgstr "&apt-get;, &apt-secure;"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-mark.8.xml
-msgid "mark/unmark a package as being automatically-installed"
-msgstr "marca/desmarca um pacote como sendo instalado automaticamente"
+msgid "show, set and unset various settings for a package"
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-mark.8.xml
 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 frontend to set various "
+"settings for a package like 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
+msgid "Automatically and manually installed packages"
 msgstr ""
-"<command>apt-mark</command> irá modificar se um pacote foi marcado como "
-"sendo instalado automaticamente."
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-mark.8.xml
+#, fuzzy
+#| 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>."
 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 package you installed explicitely is "
+"marked as manually installed.  Once a 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 ""
 "Quando você pede que um pacote seja instalado, e como resultado outros "
 "pacotes são instalados para satisfazer as suas dependências, as dependências "
@@ -2790,30 +2907,6 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml
 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."
-msgstr ""
-"<literal>hold</literal> é usado para marcar um pacote como retido, o que vai "
-"prevenir que o pacote seja automaticamente instalado, actualizado ou "
-"removido. O comando é apenas um invólucro em redor de <command>dpkg --set-"
-"selections</command> e o estado é assim mantido pelo &dpkg; e não é afectado "
-"pela opção <option>--file</option>."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml
-msgid ""
-"<literal>unhold</literal> is used to cancel a previously set hold on a "
-"package to allow all actions again."
-msgstr ""
-"<literal>unhold</literal> é usado para cancelar um \"hold\" previamente "
-"definido num pacote para permitir de novo todas as acções."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml
-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 "
@@ -2836,6 +2929,48 @@ msgstr ""
 "<literal>showauto</literal>, excepto que irá escrever uma lista dos pacotes "
 "instalados manualmente."
 
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml
+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 ""
+"Lê/Escreve o estado de pacote a partir do nome de ficheiro dado com o "
+"parâmetro &synopsis-param-filename; em vez de o fazer a partir da "
+"localização predefinida, a qual é <filename>extended_status</filename> no "
+"directório definido pelo Item de Configuração: <literal>Dir::State</literal>."
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt-mark.8.xml
+msgid "Prevent changes for a package"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>manual</literal> is used to mark a package as being manually "
+#| "installed, which will prevent the package from being automatically "
+#| "removed if no other packages depend on it."
+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."
+msgstr ""
+"<literal>manual</literal> é usado para marcar um pacote como sendo instalado "
+"manualmente, o que irá prevenir que o pacote seja removido automaticamente "
+"se nenhum outro pacote depender dele."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml
+msgid ""
+"<literal>unhold</literal> is used to cancel a previously set hold on a "
+"package to allow all actions again."
+msgstr ""
+"<literal>unhold</literal> é usado para cancelar um \"hold\" previamente "
+"definido num pacote para permitir de novo todas as acções."
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml
 msgid ""
@@ -2845,18 +2980,23 @@ msgstr ""
 "<literal>showhold</literal> é usado para escrever uma lista dos pacotes em "
 "retenção do mesmo modo que os outros comandos show."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><title>
+#: apt-mark.8.xml
+msgid "Shedule packages for install, remove and purge"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
 #: apt-mark.8.xml
 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 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>, <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 ""
-"Lê/Escreve o estado de pacote a partir do nome de ficheiro dado com o "
-"parâmetro &synopsis-param-filename; em vez de o fazer a partir da "
-"localização predefinida, a qual é <filename>extended_status</filename> no "
-"directório definido pelo Item de Configuração: <literal>Dir::State</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-mark.8.xml
@@ -2874,11 +3014,17 @@ msgstr "Suporte de autenticação de arquivos para o APT"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| 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."
 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 ""
 "A partir da versão 0.6, o <command>apt</command> contém código que faz "
 "verificação de assinaturas do ficheiro Release para todos os arquivos. Isto "
@@ -2888,37 +3034,56 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 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 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."
 msgstr ""
-"Se um pacote vem dum arquivo sem assinatura ou com uma assinatura para a "
-"qual o apt não tem a chave, esse pacote é considerado 'não sendo de "
-"confiança' e instalá-lo irá resultar num grande aviso. Actualmente o "
-"<command>apt-get</command> irá avisar apenas de arquivos não assinados, "
-"lançamentos futuros poderão vir a forçar que todas as fontes sejam "
-"verificadas antes de descarregar pacotes delas."
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 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
+#, fuzzy
+#| msgid ""
+#| "The package frontends &apt-get;, &aptitude; and &synaptic; support this "
+#| "new authentication feature."
+msgid ""
+"Note: All APT-based package management frontends 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 ""
 "Os frontends de pacotes &apt-get;, &aptitude; e &synaptic; suportam esta "
 "nova funcionalidade de autenticação."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-secure.8.xml
-msgid "Trusted archives"
+#, fuzzy
+#| msgid "Trusted archives"
+msgid "Trusted repositories"
 msgstr "Arquivos de confiança"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
-msgid ""
-"The chain of trust from an apt archive to the end user is made up of several "
+#, fuzzy
+#| msgid ""
+#| "The chain of trust from an apt archive to the end user is made up of "
+#| "several steps. <command>apt-secure</command> is the last step in this "
+#| "chain; 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 archive maintainer's responsibility to ensure that "
+#| "the archive's integrity is preserved."
+msgid ""
+"The chain of trust from an APT archive to the end user is made up of several "
 "steps. <command>apt-secure</command> is the last step in this chain; "
 "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 "
@@ -2947,13 +3112,22 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
-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."
+#, fuzzy
+#| 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."
+msgid ""
+"The chain of trust in Debian e.g. 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 one "
+"of the Debian package maintainers 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 ""
 "A corrente de confiança em Debian começa quando o responsável faz o upload "
 "de um novo pacote ou de uma nova versão de um pacote para o arquivo Debian. "
@@ -3036,11 +3210,17 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| 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."
 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 ""
 "No entanto, isto não defende contra um compromisso do próprio servidor "
 "mestre da Debian (o qual assina os pacotes) ou contra um compromisso da "
@@ -3054,11 +3234,17 @@ msgstr "Configuração do utilizador"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| 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."
 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 ""
 "<command>apt-key</command> é o programa que gere a lista de chaves usada "
 "pelo apt. Pode ser usado para adicionar ou remover chaves apesar de uma "
@@ -3069,6 +3255,15 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""
+"Note that a default installation already contains all keys to securily "
+"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>
+#: apt-secure.8.xml
+msgid ""
 "In order to add a new key you need to first download it (you should make "
 "sure you are using a trusted communication channel when retrieving it), add "
 "it with <command>apt-key</command> and then run <command>apt-get update</"
@@ -3121,15 +3316,33 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| msgid ""
+#| "<emphasis>Publish the key fingerprint</emphasis>, that way your users "
+#| "will know what key they need to import in order to authenticate the files "
+#| "in the archive."
 msgid ""
 "<emphasis>Publish the key fingerprint</emphasis>, that way your users will "
 "know what key they need to import in order to authenticate the files in the "
-"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 ""
 "<emphasis>Publicar a impressão digital da chave</emphasis>, deste modo os "
 "seus utilizadores irão saber que chave precisam de importar de modo a "
 "autenticar os ficheiros no arquivo."
 
+#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
+#: apt-secure.8.xml
+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 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."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""
@@ -3152,9 +3365,17 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
+#, fuzzy
+#| 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=\"http://"
+#| "www.cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution "
+#| "HOWTO</ulink> by V. Alex Brennen."
 msgid ""
 "For more background information you might want to review the <ulink url="
-"\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
+"\"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 url=\"http://www."
 "cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution HOWTO</"
@@ -3541,6 +3762,13 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
 #: apt.conf.5.xml
 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
+msgid ""
 "the command line options are applied to override the configuration "
 "directives or to load even more configuration files."
 msgstr ""
@@ -4800,6 +5028,41 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.conf.5.xml
+#, fuzzy
+#| msgid "User configuration"
+msgid "Binary specific configuration"
+msgstr "Configuração do utilizador"
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml
+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
+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
+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
 msgid "Directories"
 msgstr "Directórios"
 
@@ -5700,8 +5963,7 @@ msgstr ""
 "literal> ou <literal>APT::Update::{Pre,Post}-Invoke</literal>."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml
-#: apt-ftparchive.1.xml
+#: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml apt-ftparchive.1.xml
 msgid "Examples"
 msgstr "Exemplos"
 
@@ -7585,6 +7847,22 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #: sources.list.5.xml
 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."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml
+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 "
@@ -10729,6 +11007,125 @@ msgid "Which will use the already fetched archives on the disc."
 msgstr "O qual irá usar os arquivos já obtidos e que estão no disco."
 
 #~ msgid ""
+#~ "<command>apt</command> (Advanced Package Tool) is the command-line tool "
+#~ "for handling packages. It provides a commandline interface for the "
+#~ "package management of the system.  See also &apt-get; and &apt-cache; for "
+#~ "more low-level command options."
+#~ msgstr ""
+#~ "<command>apt</command> (Advanced Package Tool) é uma ferramenta de linha "
+#~ "de comandos para manuseamento de pacotes. Disponibiliza uma interface de "
+#~ "linha de comandos para a gestão de pacotes do sistema. Veja também &apt-"
+#~ "get; e &apt-cache; para mais opções de baixo nível dos comandos."
+
+#~ msgid ""
+#~ "<literal>search</literal> searches for the given term(s) and display "
+#~ "matching packages."
+#~ msgstr ""
+#~ "<literal>search</literal> procura por termo(s) determinado(s) e mostra os "
+#~ "pacotes correspondentes."
+
+#~ msgid ""
+#~ "<literal>show</literal> shows the package information for the given "
+#~ "package(s)."
+#~ msgstr ""
+#~ "<literal>show</literal> mostra a informação do pacote para o(s) pacote(s) "
+#~ "determinado(s)."
+
+#~ msgid ""
+#~ "<literal>install</literal> is followed by one or more package names "
+#~ "desired for installation or upgrading."
+#~ msgstr ""
+#~ "<literal>install</literal> é seguido por um ou mais nomes de pacotes que "
+#~ "se deseja instalar ou actualizar."
+
+#~ msgid ""
+#~ "<literal>update</literal> is used to resynchronize the package index "
+#~ "files from their sources."
+#~ msgstr ""
+#~ "<literal>update</literal> é usado para re-sincronizar o índice dos "
+#~ "pacotes a partir das suas fontes."
+
+#~ msgid "Script usage"
+#~ msgstr "Utilização de script"
+
+#~ msgid "Differences to &apt-get;"
+#~ msgstr "Diferenças para o &apt-get;"
+
+#~ msgid ""
+#~ "The <command>apt</command> command is meant to be pleasant for end users "
+#~ "and does not need to be backward compatible like &apt-get;. Therefore "
+#~ "some options are different:"
+#~ msgstr ""
+#~ "O comando  <command>apt</command> destina-se a ser agradável para os "
+#~ "utilizadores finais e não precisa de ser compatível com as versões "
+#~ "anteriores como o &apt-get;. Por isso algumas opções são diferentes."
+
+#~ msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
+#~ msgstr "A opção <literal>DPkg::Progress-Fancy</literal> está activada."
+
+#~ msgid "The option <literal>APT::Color</literal> is enabled."
+#~ msgstr "A opção <literal>APT::Color</literal> está activada."
+
+#~ msgid ""
+#~ "A new <literal>list</literal> command is available similar to "
+#~ "<literal>dpkg --list</literal>."
+#~ msgstr ""
+#~ "Está disponível um novo comando <literal>list</literal> de modo "
+#~ "semelhante a <literal>dpkg --list</literal>."
+
+#~ msgid ""
+#~ "The option <literal>upgrade</literal> has <literal>--with-new-pkgs</"
+#~ "literal> enabled by default."
+#~ msgstr ""
+#~ "A opção <literal>upgrade</literal> tem <literal>--with-new-pkgs</literal> "
+#~ "activado por predefinição."
+
+#~ msgid ""
+#~ "Pass advanced options to gpg. With adv --recv-key you can download the "
+#~ "public key."
+#~ msgstr ""
+#~ "Passa opções avançadas ao gpg. Com adv --recv-key você pode descarregar a "
+#~ "chave pública."
+
+#~ msgid "mark/unmark a package as being automatically-installed"
+#~ msgstr "marca/desmarca um pacote como sendo instalado automaticamente"
+
+#~ msgid ""
+#~ "<command>apt-mark</command> will change whether a package has been marked "
+#~ "as being automatically installed."
+#~ msgstr ""
+#~ "<command>apt-mark</command> irá modificar se um pacote foi marcado como "
+#~ "sendo instalado automaticamente."
+
+#~ 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."
+#~ msgstr ""
+#~ "<literal>hold</literal> é usado para marcar um pacote como retido, o que "
+#~ "vai prevenir que o pacote seja automaticamente instalado, actualizado ou "
+#~ "removido. O comando é apenas um invólucro em redor de <command>dpkg --set-"
+#~ "selections</command> e o estado é assim mantido pelo &dpkg; e não é "
+#~ "afectado pela opção <option>--file</option>."
+
+#~ 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."
+#~ msgstr ""
+#~ "Se um pacote vem dum arquivo sem assinatura ou com uma assinatura para a "
+#~ "qual o apt não tem a chave, esse pacote é considerado 'não sendo de "
+#~ "confiança' e instalá-lo irá resultar num grande aviso. Actualmente o "
+#~ "<command>apt-get</command> irá avisar apenas de arquivos não assinados, "
+#~ "lançamentos futuros poderão vir a forçar que todas as fontes sejam "
+#~ "verificadas antes de descarregar pacotes delas."
+
+#~ msgid ""
 #~ "No action; perform a simulation of events that would occur but do not "
 #~ "actually change the system.  Configuration Item: <literal>APT::Get::"
 #~ "Simulate</literal>."
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index b27fd139f..a96dc5e3c 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.5\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-10-22 16:34+0200\n"
 "PO-Revision-Date: 2004-09-20 17:02+0000\n"
 "Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
 "Language-Team: <debian-l10n-portuguese@lists.debian.org>\n"
@@ -509,172 +509,185 @@ msgstr "Descrição"
 #. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml
 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 ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml
 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 "
+"overwelming readers with a cornucopia of options and details."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt.8.xml
-msgid ""
-"<literal>search</literal> searches for the given term(s) and display "
-"matching packages."
+msgid "(&apt-get;)"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 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
 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 apt-get.8.xml
-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>
-#: apt.8.xml apt-get.8.xml
+#: apt.8.xml
 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>
-#: apt.8.xml apt-get.8.xml
-msgid "(and the"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.8.xml apt-get.8.xml
-msgid "alias since 1.1)"
+#: apt.8.xml
+msgid ","
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml apt-get.8.xml
+#: apt.8.xml
 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 overidden 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
 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
 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 installtion request for the accidently 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."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 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
 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."
+"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 "
+"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."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-mark.8.xml apt-config.8.xml
-#: apt-extracttemplates.1.xml apt-sortpkgs.1.xml apt-ftparchive.1.xml
-msgid "options"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml
+#, fuzzy
+msgid "(&apt-cache;)"
 msgstr ""
+"&apt-docinfo;\n"
+"\n"
+" "
 
-#. type: Content of: <refentry><refsect1><title>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
-msgid "Script usage"
+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 "
+"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 ""
 
-#. type: Content of: <refentry><refsect1><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 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 many 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 ""
 
-#. type: Content of: <refentry><refsect1><title>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt.8.xml
-msgid "Differences to &apt-get;"
+msgid "(work-in-progress)"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 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 ""
 
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
-#, fuzzy
-msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
-msgstr "a linha <literal>Package:</literal>"
+msgid ""
+"<literal>edit-sources</literal> lets you edit your &sources-list; files in "
+"your preferred texteditor while also providing basic sanity checks."
+msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#. type: Content of: <refentry><refsect1><title>
 #: apt.8.xml
-#, fuzzy
-msgid "The option <literal>APT::Color</literal> is enabled."
-msgstr "a linha <literal>Component:</literal>"
+msgid "Script usage and Differences to other APT tools"
+msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml
 msgid ""
-"A new <literal>list</literal> command is available similar to <literal>dpkg "
-"--list</literal>."
+"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 "
+"interactive use."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml
-#, fuzzy
 msgid ""
-"The option <literal>upgrade</literal> has <literal>--with-new-pkgs</literal> "
-"enabled by default."
-msgstr "a linha <literal>Archive:</literal>"
+"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."
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml
@@ -803,6 +816,17 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 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
+msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
 "used with care."
 msgstr ""
@@ -841,6 +865,16 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 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
+msgid ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
 "that packages are removed and purged (any configuration files are deleted "
 "too)."
@@ -929,6 +963,16 @@ msgid ""
 "partial/</filename>."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml
+msgid "(and the"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml
+msgid "alias since 1.1)"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
@@ -944,6 +988,14 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 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
+msgid ""
 "<literal>changelog</literal> tries to download the changelog of a package "
 "and displays it through <command>sensible-pager</command>.  By default it "
 "displays the changelog for the version that is installed.  However, you can "
@@ -964,6 +1016,12 @@ msgid ""
 "<literal><filename>doc/acquire-additional-files.txt</filename></literal>."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><title>
+#: apt-get.8.xml apt-cache.8.xml apt-config.8.xml apt-extracttemplates.1.xml
+#: apt-sortpkgs.1.xml apt-ftparchive.1.xml
+msgid "options"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
@@ -1818,6 +1876,14 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
+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
 msgid "Remove a key from the list of trusted keys."
 msgstr ""
 
@@ -1844,8 +1910,10 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 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>
@@ -1869,7 +1937,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml apt-cdrom.8.xml
+#: apt-key.8.xml apt-mark.8.xml apt-cdrom.8.xml
 msgid "Options"
 msgstr ""
 
@@ -1930,14 +1998,22 @@ msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-mark.8.xml
-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
 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 frontend to set various "
+"settings for a package like 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
+msgid "Automatically and manually installed packages"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -1945,9 +2021,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 "
-"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 package you installed explicitely is "
+"marked as manually installed.  Once a 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>
@@ -1969,35 +2047,46 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml
 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
 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
+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
+msgid "Prevent changes for a package"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml
 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
 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>
@@ -2007,13 +2096,22 @@ msgid ""
 "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
+msgid "Shedule packages for install, remove and purge"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
 #: apt-mark.8.xml
 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 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>, <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>
@@ -2031,38 +2129,49 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 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
 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 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."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-secure.8.xml
+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>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""
-"The package frontends &apt-get;, &aptitude; and &synaptic; support this new "
-"authentication feature."
+"Note: All APT-based package management frontends 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
-msgid "Trusted archives"
+msgid "Trusted repositories"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 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 "
@@ -2082,12 +2191,13 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 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 e.g. 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 one "
+"of the Debian package maintainers 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>
@@ -2140,10 +2250,10 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 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>
@@ -2155,9 +2265,18 @@ msgstr ""
 #: apt-secure.8.xml
 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
+msgid ""
+"Note that a default installation already contains all keys to securily "
+"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>
@@ -2204,7 +2323,20 @@ msgstr ""
 msgid ""
 "<emphasis>Publish the key fingerprint</emphasis>, that way your users will "
 "know what key they need to import in order to authenticate the files in the "
-"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
+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 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."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -2226,7 +2358,7 @@ msgstr ""
 #: apt-secure.8.xml
 msgid ""
 "For more background information you might want to review the <ulink url="
-"\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
+"\"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 url=\"http://www."
 "cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution HOWTO</"
@@ -2519,6 +2651,13 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
 #: apt.conf.5.xml
 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
+msgid ""
 "the command line options are applied to override the configuration "
 "directives or to load even more configuration files."
 msgstr ""
@@ -3338,6 +3477,39 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.conf.5.xml
+msgid "Binary specific configuration"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml
+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
+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
+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
 msgid "Directories"
 msgstr ""
 
@@ -3968,8 +4140,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml
-#: apt-ftparchive.1.xml
+#: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml apt-ftparchive.1.xml
 #, fuzzy
 msgid "Examples"
 msgstr "Exemplos"
@@ -5736,6 +5907,22 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #: sources.list.5.xml
 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."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml
+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 "
@@ -8011,6 +8198,20 @@ msgid "Which will use the already fetched archives on the disc."
 msgstr ""
 
 #, fuzzy
+#~ msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
+#~ msgstr "a linha <literal>Package:</literal>"
+
+#, fuzzy
+#~ msgid "The option <literal>APT::Color</literal> is enabled."
+#~ msgstr "a linha <literal>Component:</literal>"
+
+#, fuzzy
+#~ msgid ""
+#~ "The option <literal>upgrade</literal> has <literal>--with-new-pkgs</"
+#~ "literal> enabled by default."
+#~ msgstr "a linha <literal>Archive:</literal>"
+
+#, fuzzy
 #~ msgid ""
 #~ "to the versions that are not installed and do not belong to the target "
 #~ "release."