Release 2.1.8

13 files changed, 522 insertions, 256 deletions

diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index a7b786dfe..38a8c253a 100644
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -14,7 +14,7 @@
    &apt-email;
    &apt-product;
    <!-- The last update date -->
-   <date>2020-01-15T00:00:00Z</date>
+   <date>2020-02-27T00:00:00Z</date>
  </refentryinfo>
  
  <refmeta>
diff --git a/doc/apt-key.8.xml b/doc/apt-key.8.xml
index 2c8c3f655..eace6a02e 100644
--- a/doc/apt-key.8.xml
+++ b/doc/apt-key.8.xml
@@ -13,7 +13,7 @@
    &apt-email;
    &apt-product;
    <!-- The last update date -->
-   <date>2019-04-04T00:00:00Z</date>
+   <date>2020-05-06T00:00:00Z</date>
  </refentryinfo>
 
  <refmeta>
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index c691d1de8..b1c8a21b2 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -274,7 +274,7 @@
 ">
 
 <!-- this will be updated by 'prepare-release' -->
-<!ENTITY apt-product-version "2.1.7">
+<!ENTITY apt-product-version "2.1.8">
 
 <!-- (Code)names for various things used all over the place -->
 <!ENTITY debian-oldstable-codename "stretch">
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index f0bf7bdf1..dee3265e2 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -5,9 +5,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: apt-doc 2.1.7\n"
+"Project-Id-Version: apt-doc 2.1.8\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2020-07-08 09:40+0200\n"
+"POT-Creation-Date: 2020-08-04 12:40+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"
@@ -1414,6 +1414,16 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
+"After successful installation, mark all freshly installed packages as "
+"automatically installed, which will cause each of the packages to be removed "
+"when no more manually installed packages depend on this package.  This is "
+"equally to running <command>apt-mark auto</command> for all installed "
+"packages.  Configuration Item: <literal>APT::Get::Mark-Auto</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
 "If any packages are to be removed apt-get immediately aborts without "
 "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
 msgstr ""
@@ -2014,7 +2024,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-key.8.xml
-msgid "APT key management utility"
+msgid "Deprecated APT key management utility"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -2028,14 +2038,16 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-key.8.xml
 msgid ""
-"Note that if usage of <command>apt-key</command> is desired the additional "
-"installation of the GNU Privacy Guard suite (packaged in "
-"<package>gnupg</package>) is required. For this reason alone the "
-"programmatic usage (especially in package maintainer scripts!) is strongly "
-"discouraged.  Further more the output format of all commands is undefined "
-"and can and does change whenever the underlying commands "
-"change. <command>apt-key</command> will try to detect such usage and "
-"generates warnings on stderr in these cases."
+"Use of <command>apt-key</command> is deprecated, except for the use of "
+"<command>apt-key del</command> in maintainer scripts to remove existing keys "
+"from the main keyring.  If such usage of <command>apt-key</command> is "
+"desired the additional installation of the GNU Privacy Guard suite (packaged "
+"in <package>gnupg</package>) is required."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-key.8.xml
+msgid "apt-key(8) will last be available in Debian 11 and Ubuntu 22.04."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
@@ -2067,6 +2079,11 @@ msgstr ""
 msgid "Commands"
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-key.8.xml
+msgid "(deprecated)"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 msgid ""
@@ -2092,6 +2109,11 @@ msgid ""
 "\"<literal>asc</literal>\" as file extension."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-key.8.xml
+msgid "(mostly deprecated)"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 msgid "Remove a key from the list of trusted keys."
@@ -2122,11 +2144,6 @@ msgid ""
 "care."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml
-msgid "(deprecated)"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 msgid ""
diff --git a/doc/po/de.po b/doc/po/de.po
index 5d471a61d..f6014bc90 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 2.0.1\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2020-03-24 11:53+0100\n"
+"POT-Creation-Date: 2020-08-04 12:40+0200\n"
 "PO-Revision-Date: 2020-04-04 08:45+0200\n"
 "Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -730,8 +730,8 @@ msgstr ","
 msgid ""
 "Performs the requested action on one or more packages specified via &regex;, "
 "&glob; or exact match. The requested action can be overridden for specific "
-"packages by appending a plus (+) to the package name to install this package or "
-"a minus (-) to remove it."
+"packages by appending a plus (+) to the package name to install this package "
+"or a minus (-) to remove it."
 msgstr ""
 "führt die angefragte Aktion für eines oder mehrere Pakete durch, die über "
 "&regex;, &glob; oder exakten Treffer angegeben wurden. Die angefragte Aktion "
@@ -1206,8 +1206,8 @@ msgid ""
 msgstr ""
 "In APT 2.0 ist ein Rückgriff auf reguläre Ausdrücke missbilligt und wurde in "
 "&apt; entfernt, außer für verankerte Ausdrücke. Es wird auch in einer "
-"zukünftigen Version von &apt-get; entfernt. Nutzen Sie stattdessen "
-"&apt-patterns;."
+"zukünftigen Version von &apt-get; entfernt. Nutzen Sie stattdessen &apt-"
+"patterns;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -1978,6 +1978,16 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
+"After successful installation, mark all freshly installed packages as "
+"automatically installed, which will cause each of the packages to be removed "
+"when no more manually installed packages depend on this package.  This is "
+"equally to running <command>apt-mark auto</command> for all installed "
+"packages.  Configuration Item: <literal>APT::Get::Mark-Auto</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
 "If any packages are to be removed apt-get immediately aborts without "
 "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
 msgstr ""
@@ -2848,7 +2858,9 @@ msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-key.8.xml
-msgid "APT key management utility"
+#, fuzzy
+#| msgid "APT key management utility"
+msgid "Deprecated APT key management utility"
 msgstr "APT-Schlüsselverwaltungsdienstprogramm"
 
 #. type: Content of: <refentry><refsect1><para>
@@ -2866,24 +2878,17 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-key.8.xml
 msgid ""
-"Note that if usage of <command>apt-key</command> is desired the additional "
-"installation of the GNU Privacy Guard suite (packaged in <package>gnupg</"
-"package>) is required. For this reason alone the programmatic usage "
-"(especially in package maintainer scripts!) is strongly discouraged.  "
-"Further more the output format of all commands is undefined and can and does "
-"change whenever the underlying commands change. <command>apt-key</command> "
-"will try to detect such usage and generates warnings on stderr in these "
-"cases."
-msgstr ""
-"Falls die Benutzung von <command>apt-key</command> gewünscht wird, beachten "
-"Sie, dass die Installation der GNU-Privacy-Guard-Programmsammlung (paketiert "
-"in <package>gnupg</package>) erforderlich ist. Allein aus diesem Grund wird "
-"vom programmatischen Gebrauch (insbesondere in Betreuerskripten) "
-"eindringlich abgeraten. Darüberhinaus ist das Ausgabeformat aller Befehle "
-"undefiniert und kann und wird sich immer dann ändern, wenn sich die "
-"darunterliegenden Befehle ändern. <command>apt-key</command> wird versuchen, "
-"derartige Benutzung zu erkennen und in diesen Fällen Warnungen auf der "
-"Standardfehlerausgabe erzeugen."
+"Use of <command>apt-key</command> is deprecated, except for the use of "
+"<command>apt-key del</command> in maintainer scripts to remove existing keys "
+"from the main keyring.  If such usage of <command>apt-key</command> is "
+"desired the additional installation of the GNU Privacy Guard suite (packaged "
+"in <package>gnupg</package>) is required."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-key.8.xml
+msgid "apt-key(8) will last be available in Debian 11 and Ubuntu 22.04."
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-key.8.xml
@@ -2925,6 +2930,11 @@ msgstr ""
 msgid "Commands"
 msgstr "Befehle"
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-key.8.xml
+msgid "(deprecated)"
+msgstr "(missbilligt)"
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 msgid ""
@@ -2960,6 +2970,13 @@ msgstr ""
 "literal>« oder »<literal>asc</literal>« als Dateinamenserweiterung direkt im "
 "Verzeichnis <filename>/etc/apt/trusted.gpg.d/</filename> abgelegt werden."
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-key.8.xml
+#, fuzzy
+#| msgid "(deprecated)"
+msgid "(mostly deprecated)"
+msgstr "(missbilligt)"
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 msgid "Remove a key from the list of trusted keys."
@@ -2996,11 +3013,6 @@ msgstr ""
 "einfach, die &apt-secure;-Infrastruktur komplett auszuhöhlen, falls dies "
 "ohne Sorgfalt benutzt wird."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml
-msgid "(deprecated)"
-msgstr "(missbilligt)"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 msgid ""
@@ -6834,9 +6846,8 @@ msgid ""
 "For example, to pin all binaries produced by the apt source package of this "
 "APT's version to 990, you can do:"
 msgstr ""
-"Um zum Beispiel ein Pinning für alle von einem Apt-Quellpaket dieser "
-"APT-Version erzeugten Programme auf 990 durchzuführen, können Sie Folgendes "
-"tun:"
+"Um zum Beispiel ein Pinning für alle von einem Apt-Quellpaket dieser APT-"
+"Version erzeugten Programme auf 990 durchzuführen, können Sie Folgendes tun:"
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
 #: apt_preferences.5.xml
@@ -10112,8 +10123,8 @@ msgstr ""
 msgid ""
 "If protocol is not specified, the entry only matches https and tor+https."
 msgstr ""
-"Falls kein Protokoll angegeben wurde, passt der Eintrag nur auf https und "
-"tor+https."
+"Falls kein Protokoll angegeben wurde, passt der Eintrag nur auf https und tor"
+"+https."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt_auth.conf.5.xml
@@ -10257,9 +10268,10 @@ msgid ""
 "for the redirect destination can be supplied."
 msgstr ""
 "Anmeldeinformationen in auth.conf sind flexibler als die in sources.list. "
-"Anmeldeinformationen können zum Beispiel nur für Teile eines Depots angegeben "
-"werden oder wenn der Eintrag der sources.list woanders hin verweist, können "
-"die Anmeldeinformationen für das Verweisziel bereitgestellt werden."
+"Anmeldeinformationen können zum Beispiel nur für Teile eines Depots "
+"angegeben werden oder wenn der Eintrag der sources.list woanders hin "
+"verweist, können die Anmeldeinformationen für das Verweisziel bereitgestellt "
+"werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt_auth.conf.5.xml
@@ -11240,9 +11252,9 @@ msgid ""
 "complex expressions, as well as <code>?true</code> and <code>?false</code> "
 "patterns."
 msgstr ""
-"Diese Muster stellen die grundlegenden Mittel zur Verfügung, um andere Muster "
-"zu komplexeren Ausdrücken zu kombinieren, sowohl zu <code>?true</code>- als "
-"auch zu <code>?false</code>-Mustern."
+"Diese Muster stellen die grundlegenden Mittel zur Verfügung, um andere "
+"Muster zu komplexeren Ausdrücken zu kombinieren, sowohl zu <code>?true</"
+"code>- als auch zu <code>?false</code>-Mustern."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-patterns.7.xml
@@ -11372,9 +11384,9 @@ msgid ""
 "<code>?and</code> to act on the same version."
 msgstr ""
 "Während beispielsweise <code>?and(?version(1),?version(2))</code> auf Pakete "
-"passt, die eine Version haben, die 1 enthält und eine Version, die 2 enthält, "
-"beschränkt <code>?any-version(?and(?version(1),?version(2)))</code> das "
-"<code>?and</code> auf dieselbe Version."
+"passt, die eine Version haben, die 1 enthält und eine Version, die 2 "
+"enthält, beschränkt <code>?any-version(?and(?version(1),?version(2)))</code> "
+"das <code>?and</code> auf dieselbe Version."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-patterns.7.xml
@@ -11416,8 +11428,8 @@ msgid ""
 "Selects packages matching the specified architecture, which may contain "
 "wildcards using any."
 msgstr ""
-"wählt Pakete aus, die auf die angegebene Architektur passen, darf Platzhalter "
-"mit »any« enthalten."
+"wählt Pakete aus, die auf die angegebene Architektur passen, darf "
+"Platzhalter mit »any« enthalten."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-patterns.7.xml
@@ -11642,8 +11654,8 @@ msgid ""
 "<command>apt-cache policy</command>."
 msgstr ""
 "wählt Versionen aus, deren Ursprung auf den regulären Ausdruck passt. "
-"Ursprung bedeutet hier, die Werte nach <code>o=</code> in "
-"<command>apt-cache policy</command>."
+"Ursprung bedeutet hier, die Werte nach <code>o=</code> in <command>apt-cache "
+"policy</command>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-patterns.7.xml
@@ -11774,8 +11786,8 @@ msgid ""
 "Syntax is uniform: If there is an opening parenthesis after a term, it is "
 "always assumed to be the beginning of an argument list."
 msgstr ""
-"Die Syntax ist einheitlich: Falls es nach einem Begriff eine öffnende Klammer "
-"gibt, wird immer vom Anfang einer Argumentenliste ausgegangen."
+"Die Syntax ist einheitlich: Falls es nach einem Begriff eine öffnende "
+"Klammer gibt, wird immer vom Anfang einer Argumentenliste ausgegangen."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #: apt-patterns.7.xml
@@ -11784,9 +11796,9 @@ msgid ""
 "and(?foo,bar)\"</code> if foo does not take an argument. In APT, this will "
 "cause an error."
 msgstr ""
-"In Aptitude kann eine syntaktische Form <code>»?foo(bar)«</code> "
-"<code>»?and(?foo,bar)«</code> bedeuten, falls es kein Argument entgegen "
-"nimmt. In APT verursacht dies einen Fehler."
+"In Aptitude kann eine syntaktische Form <code>»?foo(bar)«</code> <code>»?"
+"and(?foo,bar)«</code> bedeuten, falls es kein Argument entgegen nimmt. In "
+"APT verursacht dies einen Fehler."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #: apt-patterns.7.xml
@@ -11829,9 +11841,9 @@ msgstr ""
 "<code>foo</code> kann nicht als Kurzschreibweise für <code>?name(foo)</code> "
 "benutzt werden, da dies unbemerkte Tippfehler verursachen kann. Betrachten "
 "Sie <code>?and(…,~poptional)</code>: Dies erfordert, dass das Paket die "
-"Priorität <code>required</code> hat, wenn Sie jedoch nicht das <code>~</code> "
-"eintippen, würde es erfordern, dass der Paketname <code>poptional</code> "
-"enthält."
+"Priorität <code>required</code> hat, wenn Sie jedoch nicht das <code>~</"
+"code> eintippen, würde es erfordern, dass der Paketname <code>poptional</"
+"code> enthält."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #: apt-patterns.7.xml
@@ -11840,10 +11852,10 @@ msgid ""
 "as <code>A|B</code> are not supported. We do not believe that the use of "
 "<code>|</code> is that common, and the grouping is not necessary without it."
 msgstr ""
-"Bündelnde Muster mit <code>(…)</code> oder der Schreibweise "
-"<code>A|B</code> für <code>?or(A,B)</code> werden nicht unterstützt. Wir "
-"gehen nicht davon aus, dass die Verwendung von <code>|</code> üblich ist und "
-"ohne diese ist eine Bündelung unnötig."
+"Bündelnde Muster mit <code>(…)</code> oder der Schreibweise <code>A|B</code> "
+"für <code>?or(A,B)</code> werden nicht unterstützt. Wir gehen nicht davon "
+"aus, dass die Verwendung von <code>|</code> üblich ist und ohne diese ist "
+"eine Bündelung unnötig."
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-patterns.7.xml
@@ -13488,3 +13500,24 @@ msgid "Which will use the already fetched archives on the disc."
 msgstr ""
 "fortfahren, wodurch die bereits auf der Platte heruntergeladenen Archive "
 "benutzt werden."
+
+#~ msgid ""
+#~ "Note that if usage of <command>apt-key</command> is desired the "
+#~ "additional installation of the GNU Privacy Guard suite (packaged in "
+#~ "<package>gnupg</package>) is required. For this reason alone the "
+#~ "programmatic usage (especially in package maintainer scripts!) is "
+#~ "strongly discouraged.  Further more the output format of all commands is "
+#~ "undefined and can and does change whenever the underlying commands "
+#~ "change. <command>apt-key</command> will try to detect such usage and "
+#~ "generates warnings on stderr in these cases."
+#~ msgstr ""
+#~ "Falls die Benutzung von <command>apt-key</command> gewünscht wird, "
+#~ "beachten Sie, dass die Installation der GNU-Privacy-Guard-"
+#~ "Programmsammlung (paketiert in <package>gnupg</package>) erforderlich "
+#~ "ist. Allein aus diesem Grund wird vom programmatischen Gebrauch "
+#~ "(insbesondere in Betreuerskripten) eindringlich abgeraten. Darüberhinaus "
+#~ "ist das Ausgabeformat aller Befehle undefiniert und kann und wird sich "
+#~ "immer dann ändern, wenn sich die darunterliegenden Befehle ändern. "
+#~ "<command>apt-key</command> wird versuchen, derartige Benutzung zu "
+#~ "erkennen und in diesen Fällen Warnungen auf der Standardfehlerausgabe "
+#~ "erzeugen."
diff --git a/doc/po/es.po b/doc/po/es.po
index d1fdfef95..b8e126b85 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: 2020-02-26 21:29+0100\n"
+"POT-Creation-Date: 2020-08-04 12:40+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"
@@ -790,8 +790,8 @@ msgstr ""
 msgid ""
 "Performs the requested action on one or more packages specified via &regex;, "
 "&glob; or exact match. The requested action can be overridden for specific "
-"packages by appending a plus (+) to the package name to install this package or "
-"a minus (-) to remove it."
+"packages by appending 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>
@@ -2032,6 +2032,16 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
+"After successful installation, mark all freshly installed packages as "
+"automatically installed, which will cause each of the packages to be removed "
+"when no more manually installed packages depend on this package.  This is "
+"equally to running <command>apt-mark auto</command> for all installed "
+"packages.  Configuration Item: <literal>APT::Get::Mark-Auto</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
 "If any packages are to be removed apt-get immediately aborts without "
 "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
 msgstr ""
@@ -2886,7 +2896,9 @@ msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-key.8.xml
-msgid "APT key management utility"
+#, fuzzy
+#| msgid "APT key management utility"
+msgid "Deprecated APT key management utility"
 msgstr "Herramienta para gestionar las claves de APT"
 
 #. type: Content of: <refentry><refsect1><para>
@@ -2903,14 +2915,16 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-key.8.xml
 msgid ""
-"Note that if usage of <command>apt-key</command> is desired the additional "
-"installation of the GNU Privacy Guard suite (packaged in <package>gnupg</"
-"package>) is required. For this reason alone the programmatic usage "
-"(especially in package maintainer scripts!) is strongly discouraged.  "
-"Further more the output format of all commands is undefined and can and does "
-"change whenever the underlying commands change. <command>apt-key</command> "
-"will try to detect such usage and generates warnings on stderr in these "
-"cases."
+"Use of <command>apt-key</command> is deprecated, except for the use of "
+"<command>apt-key del</command> in maintainer scripts to remove existing keys "
+"from the main keyring.  If such usage of <command>apt-key</command> is "
+"desired the additional installation of the GNU Privacy Guard suite (packaged "
+"in <package>gnupg</package>) is required."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-key.8.xml
+msgid "apt-key(8) will last be available in Debian 11 and Ubuntu 22.04."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
@@ -2942,6 +2956,11 @@ msgstr ""
 msgid "Commands"
 msgstr "Órdenes"
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-key.8.xml
+msgid "(deprecated)"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 msgid ""
@@ -2970,6 +2989,11 @@ msgid ""
 "\"<literal>asc</literal>\" as file extension."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-key.8.xml
+msgid "(mostly deprecated)"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 msgid "Remove a key from the list of trusted keys."
@@ -3001,11 +3025,6 @@ msgid ""
 "to completely undermine the &apt-secure; infrastructure if used without care."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml
-msgid "(deprecated)"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 msgid ""
diff --git a/doc/po/fr.po b/doc/po/fr.po
index bf2b79429..26160cef2 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.8.0\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2020-02-26 21:29+0100\n"
+"POT-Creation-Date: 2020-08-04 12:40+0200\n"
 "PO-Revision-Date: 2019-05-01 17:00+0100\n"
 "Last-Translator: Jean-Pierre Giraud <jean-pierregiraud@neuf.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -728,8 +728,8 @@ msgstr ","
 msgid ""
 "Performs the requested action on one or more packages specified via &regex;, "
 "&glob; or exact match. The requested action can be overridden for specific "
-"packages by appending a plus (+) to the package name to install this package or "
-"a minus (-) to remove it."
+"packages by appending a plus (+) to the package name to install this package "
+"or a minus (-) to remove it."
 msgstr ""
 "La commande réalise l'action requise sur un ou plusieurs paquets spécifiés "
 "avec &regex;, &glob; ou avec la correspondance exacte. Les actions requises "
@@ -1947,6 +1947,16 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
+"After successful installation, mark all freshly installed packages as "
+"automatically installed, which will cause each of the packages to be removed "
+"when no more manually installed packages depend on this package.  This is "
+"equally to running <command>apt-mark auto</command> for all installed "
+"packages.  Configuration Item: <literal>APT::Get::Mark-Auto</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
 "If any packages are to be removed apt-get immediately aborts without "
 "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
 msgstr ""
@@ -2826,7 +2836,9 @@ msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-key.8.xml
-msgid "APT key management utility"
+#, fuzzy
+#| msgid "APT key management utility"
+msgid "Deprecated APT key management utility"
 msgstr "Utilitaire de gestion des clés d'APT"
 
 #. type: Content of: <refentry><refsect1><para>
@@ -2842,24 +2854,17 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-key.8.xml
 msgid ""
-"Note that if usage of <command>apt-key</command> is desired the additional "
-"installation of the GNU Privacy Guard suite (packaged in <package>gnupg</"
-"package>) is required. For this reason alone the programmatic usage "
-"(especially in package maintainer scripts!) is strongly discouraged.  "
-"Further more the output format of all commands is undefined and can and does "
-"change whenever the underlying commands change. <command>apt-key</command> "
-"will try to detect such usage and generates warnings on stderr in these "
-"cases."
-msgstr ""
-"Notez que si vous souhaitez utiliser <command>apt-key</command>, "
-"l'installation complémentaire de la suite GNU Privacy Guard (paquet "
-"<package>gnupg</package>) est requise. Pour cette raison uniquement, "
-"l'utilisation programmée (en particulier dans les scripts des responsables "
-"des paquets !) est fortement déconseillée. En outre, le format de sortie de "
-"toutes les commandes est indéfini et de plus il peut changer, et il change "
-"réellement chaque fois que les commandes sous-jacentes changent. "
-"<command>apt-key</command> essaiera de détecter un tel usage et, dans ces "
-"cas, enverra des alertes sur l'erreur standard."
+"Use of <command>apt-key</command> is deprecated, except for the use of "
+"<command>apt-key del</command> in maintainer scripts to remove existing keys "
+"from the main keyring.  If such usage of <command>apt-key</command> is "
+"desired the additional installation of the GNU Privacy Guard suite (packaged "
+"in <package>gnupg</package>) is required."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-key.8.xml
+msgid "apt-key(8) will last be available in Debian 11 and Ubuntu 22.04."
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-key.8.xml
@@ -2902,6 +2907,11 @@ msgstr ""
 msgid "Commands"
 msgstr "Commandes"
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-key.8.xml
+msgid "(deprecated)"
+msgstr "(obsolète)"
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 msgid ""
@@ -2939,6 +2949,13 @@ msgstr ""
 "« <literal>gpg</literal> » soit « <literal>asc</literal> » comme extension "
 "de fichier."
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-key.8.xml
+#, fuzzy
+#| msgid "(deprecated)"
+msgid "(mostly deprecated)"
+msgstr "(obsolète)"
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 msgid "Remove a key from the list of trusted keys."
@@ -2974,11 +2991,6 @@ msgstr ""
 "facile de compromettre complètement l'infrastructure &apt-secure;, si la "
 "commande est utilisée sans précaution."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml
-msgid "(deprecated)"
-msgstr "(obsolète)"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 msgid ""
@@ -13354,6 +13366,26 @@ 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 ""
+#~ "Note that if usage of <command>apt-key</command> is desired the "
+#~ "additional installation of the GNU Privacy Guard suite (packaged in "
+#~ "<package>gnupg</package>) is required. For this reason alone the "
+#~ "programmatic usage (especially in package maintainer scripts!) is "
+#~ "strongly discouraged.  Further more the output format of all commands is "
+#~ "undefined and can and does change whenever the underlying commands "
+#~ "change. <command>apt-key</command> will try to detect such usage and "
+#~ "generates warnings on stderr in these cases."
+#~ msgstr ""
+#~ "Notez que si vous souhaitez utiliser <command>apt-key</command>, "
+#~ "l'installation complémentaire de la suite GNU Privacy Guard (paquet "
+#~ "<package>gnupg</package>) est requise. Pour cette raison uniquement, "
+#~ "l'utilisation programmée (en particulier dans les scripts des "
+#~ "responsables des paquets !) est fortement déconseillée. En outre, le "
+#~ "format de sortie de toutes les commandes est indéfini et de plus il peut "
+#~ "changer, et il change réellement chaque fois que les commandes sous-"
+#~ "jacentes changent. <command>apt-key</command> essaiera de détecter un tel "
+#~ "usage et, dans ces cas, enverra des alertes sur l'erreur standard."
+
+#~ msgid ""
 #~ "<literal>http::Proxy</literal> sets the default proxy to use for HTTP "
 #~ "URIs. It is in the standard form of <literal>http://[[user][:pass]@]host[:"
 #~ "port]/</literal>.  Per host proxies can also be specified by using the "
diff --git a/doc/po/it.po b/doc/po/it.po
index ca6e8e62b..b7c42d690 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: 2020-02-26 21:29+0100\n"
+"POT-Creation-Date: 2020-08-04 12:40+0200\n"
 "PO-Revision-Date: 2017-03-27 19:05+0200\n"
 "Last-Translator: Beatrice Torracca <beatricet@libero.it>\n"
 "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
@@ -778,8 +778,8 @@ msgstr ","
 msgid ""
 "Performs the requested action on one or more packages specified via &regex;, "
 "&glob; or exact match. The requested action can be overridden for specific "
-"packages by appending a plus (+) to the package name to install this package or "
-"a minus (-) to remove it."
+"packages by appending a plus (+) to the package name to install this package "
+"or a minus (-) to remove it."
 msgstr ""
 "Effettua l'azione richiesta su uno o più pacchetti specificati attraverso "
 "&regex;, &glob; o una corrispondenza esatta. L'azione richiesta può essere "
@@ -1996,6 +1996,16 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
+"After successful installation, mark all freshly installed packages as "
+"automatically installed, which will cause each of the packages to be removed "
+"when no more manually installed packages depend on this package.  This is "
+"equally to running <command>apt-mark auto</command> for all installed "
+"packages.  Configuration Item: <literal>APT::Get::Mark-Auto</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
 "If any packages are to be removed apt-get immediately aborts without "
 "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
 msgstr ""
@@ -2846,7 +2856,9 @@ msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-key.8.xml
-msgid "APT key management utility"
+#, fuzzy
+#| msgid "APT key management utility"
+msgid "Deprecated APT key management utility"
 msgstr "strumento APT per la gestione delle chiavi"
 
 #. type: Content of: <refentry><refsect1><para>
@@ -2863,23 +2875,17 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-key.8.xml
 msgid ""
-"Note that if usage of <command>apt-key</command> is desired the additional "
-"installation of the GNU Privacy Guard suite (packaged in <package>gnupg</"
-"package>) is required. For this reason alone the programmatic usage "
-"(especially in package maintainer scripts!) is strongly discouraged.  "
-"Further more the output format of all commands is undefined and can and does "
-"change whenever the underlying commands change. <command>apt-key</command> "
-"will try to detect such usage and generates warnings on stderr in these "
-"cases."
-msgstr ""
-"Notare che si desidera usare <command>apt-key</command> è necessaria "
-"l'installazione aggiuntiva della suite GNU Privacy Guard (pacchettizzata in "
-"<package>gnupg</package>). Espressamente per questo motivo l'uso "
-"programmatico (specialmente in script del manutentore per i pacchetti!) è "
-"fortemente sconsigliato. Inoltre il formato di output di tutti i comandi non "
-"è definito e può cambiare, e lo fa, ogni volta che cambiano i comandi "
-"sottostanti. <command>apt-key</command> cerca di rilevare questi usi e "
-"genera in questi casi avvertimenti sullo stderr."
+"Use of <command>apt-key</command> is deprecated, except for the use of "
+"<command>apt-key del</command> in maintainer scripts to remove existing keys "
+"from the main keyring.  If such usage of <command>apt-key</command> is "
+"desired the additional installation of the GNU Privacy Guard suite (packaged "
+"in <package>gnupg</package>) is required."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-key.8.xml
+msgid "apt-key(8) will last be available in Debian 11 and Ubuntu 22.04."
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-key.8.xml
@@ -2920,6 +2926,11 @@ msgstr ""
 msgid "Commands"
 msgstr "Comandi"
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-key.8.xml
+msgid "(deprecated)"
+msgstr "(deprecato)"
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 msgid ""
@@ -2956,6 +2967,13 @@ msgstr ""
 "etc/apt/trusted.gpg.d/</filename> con un nome descrittivo e con "
 "«<literal>gpg</literal>» o «<literal>asc</literal>» come estensione di file."
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-key.8.xml
+#, fuzzy
+#| msgid "(deprecated)"
+msgid "(mostly deprecated)"
+msgstr "(deprecato)"
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 msgid "Remove a key from the list of trusted keys."
@@ -2991,11 +3009,6 @@ msgstr ""
 "effettuato alcun controllo, perciò è facile minare completamente "
 "l'infrastruttura &apt-secure; se viene usato senza cautela."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml
-msgid "(deprecated)"
-msgstr "(deprecato)"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 msgid ""
@@ -13113,6 +13126,25 @@ msgid "Which will use the already fetched archives on the disc."
 msgstr "che userà gli archivi già scaricati e presenti sul disco."
 
 #~ msgid ""
+#~ "Note that if usage of <command>apt-key</command> is desired the "
+#~ "additional installation of the GNU Privacy Guard suite (packaged in "
+#~ "<package>gnupg</package>) is required. For this reason alone the "
+#~ "programmatic usage (especially in package maintainer scripts!) is "
+#~ "strongly discouraged.  Further more the output format of all commands is "
+#~ "undefined and can and does change whenever the underlying commands "
+#~ "change. <command>apt-key</command> will try to detect such usage and "
+#~ "generates warnings on stderr in these cases."
+#~ msgstr ""
+#~ "Notare che si desidera usare <command>apt-key</command> è necessaria "
+#~ "l'installazione aggiuntiva della suite GNU Privacy Guard (pacchettizzata "
+#~ "in <package>gnupg</package>). Espressamente per questo motivo l'uso "
+#~ "programmatico (specialmente in script del manutentore per i pacchetti!) è "
+#~ "fortemente sconsigliato. Inoltre il formato di output di tutti i comandi "
+#~ "non è definito e può cambiare, e lo fa, ogni volta che cambiano i comandi "
+#~ "sottostanti. <command>apt-key</command> cerca di rilevare questi usi e "
+#~ "genera in questi casi avvertimenti sullo stderr."
+
+#~ msgid ""
 #~ "<literal>http::Proxy</literal> sets the default proxy to use for HTTP "
 #~ "URIs. It is in the standard form of <literal>http://[[user][:pass]@]host[:"
 #~ "port]/</literal>.  Per host proxies can also be specified by using the "
diff --git a/doc/po/ja.po b/doc/po/ja.po
index b760afc6b..576f872c9 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.4\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2020-02-26 21:29+0100\n"
+"POT-Creation-Date: 2020-08-04 12:40+0200\n"
 "PO-Revision-Date: 2017-01-06 04:50+0900\n"
 "Last-Translator: Takuma Yamada <tyamada@takumayamada.com>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -774,8 +774,8 @@ msgstr ","
 msgid ""
 "Performs the requested action on one or more packages specified via &regex;, "
 "&glob; or exact match. The requested action can be overridden for specific "
-"packages by appending a plus (+) to the package name to install this package or "
-"a minus (-) to remove it."
+"packages by appending a plus (+) to the package name to install this package "
+"or a minus (-) to remove it."
 msgstr ""
 "&regex;、&glob; または 完全な一致で指定された 1 つ以上のパッケージに対して要"
 "求された処理を実行します。要求された処理は、特定のパッケージに対してパッケー"
@@ -1932,6 +1932,16 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
+"After successful installation, mark all freshly installed packages as "
+"automatically installed, which will cause each of the packages to be removed "
+"when no more manually installed packages depend on this package.  This is "
+"equally to running <command>apt-mark auto</command> for all installed "
+"packages.  Configuration Item: <literal>APT::Get::Mark-Auto</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
 "If any packages are to be removed apt-get immediately aborts without "
 "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
 msgstr ""
@@ -2745,7 +2755,9 @@ msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-key.8.xml
-msgid "APT key management utility"
+#, fuzzy
+#| msgid "APT key management utility"
+msgid "Deprecated APT key management utility"
 msgstr "APT キー管理ユーティリティ"
 
 #. type: Content of: <refentry><refsect1><para>
@@ -2762,22 +2774,17 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-key.8.xml
 msgid ""
-"Note that if usage of <command>apt-key</command> is desired the additional "
-"installation of the GNU Privacy Guard suite (packaged in <package>gnupg</"
-"package>) is required. For this reason alone the programmatic usage "
-"(especially in package maintainer scripts!) is strongly discouraged.  "
-"Further more the output format of all commands is undefined and can and does "
-"change whenever the underlying commands change. <command>apt-key</command> "
-"will try to detect such usage and generates warnings on stderr in these "
-"cases."
-msgstr ""
-"<command>apt-key</command> を利用するためには GNU Privacy Guard suite "
-"(<package>gnupg</package> に収録) を追加でインストールする必要があることに注"
-"意してください。そのため、プログラム単体での用途に (特にパッケージのメンテナ"
-"スクリプトで!) 使うことは全く勧められません。さらに、このプログラムのコマンド"
-"の出力形式はどれも規定されておらず、根本となるコマンドに変更があればこちらも"
-"変わるということになります。<command>apt-key</command> はそういった使い方の検"
-"出を試み、その場合には標準エラーに警告を出します。"
+"Use of <command>apt-key</command> is deprecated, except for the use of "
+"<command>apt-key del</command> in maintainer scripts to remove existing keys "
+"from the main keyring.  If such usage of <command>apt-key</command> is "
+"desired the additional installation of the GNU Privacy Guard suite (packaged "
+"in <package>gnupg</package>) is required."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-key.8.xml
+msgid "apt-key(8) will last be available in Debian 11 and Ubuntu 22.04."
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-key.8.xml
@@ -2818,6 +2825,11 @@ msgstr ""
 msgid "Commands"
 msgstr "コマンド"
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-key.8.xml
+msgid "(deprecated)"
+msgstr "(非推奨)"
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 msgid ""
@@ -2854,6 +2866,13 @@ msgstr ""
 "literal>」として <filename>/etc/apt/trusted.gpg.d/</filename> ディレクトリに"
 "直接配置する方法もあります。"
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-key.8.xml
+#, fuzzy
+#| msgid "(deprecated)"
+msgid "(mostly deprecated)"
+msgstr "(非推奨)"
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 msgid "Remove a key from the list of trusted keys."
@@ -2894,11 +2913,6 @@ msgstr ""
 "できます。チェックが<emphasis>行われない</emphasis>ことに注意してください。注"
 "意せず使用するなら、容易に &apt-secure; インフラを完全に傷つけます。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml
-msgid "(deprecated)"
-msgstr "(非推奨)"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 msgid ""
@@ -12606,6 +12620,24 @@ msgid "Which will use the already fetched archives on the disc."
 msgstr "これで、ディスクにある取得済みのアーカイブを使用するようになります。"
 
 #~ msgid ""
+#~ "Note that if usage of <command>apt-key</command> is desired the "
+#~ "additional installation of the GNU Privacy Guard suite (packaged in "
+#~ "<package>gnupg</package>) is required. For this reason alone the "
+#~ "programmatic usage (especially in package maintainer scripts!) is "
+#~ "strongly discouraged.  Further more the output format of all commands is "
+#~ "undefined and can and does change whenever the underlying commands "
+#~ "change. <command>apt-key</command> will try to detect such usage and "
+#~ "generates warnings on stderr in these cases."
+#~ msgstr ""
+#~ "<command>apt-key</command> を利用するためには GNU Privacy Guard suite "
+#~ "(<package>gnupg</package> に収録) を追加でインストールする必要があることに"
+#~ "注意してください。そのため、プログラム単体での用途に (特にパッケージのメン"
+#~ "テナスクリプトで!) 使うことは全く勧められません。さらに、このプログラムの"
+#~ "コマンドの出力形式はどれも規定されておらず、根本となるコマンドに変更があれ"
+#~ "ばこちらも変わるということになります。<command>apt-key</command> はそう"
+#~ "いった使い方の検出を試み、その場合には標準エラーに警告を出します。"
+
+#~ msgid ""
 #~ "<literal>http::Proxy</literal> sets the default proxy to use for HTTP "
 #~ "URIs. It is in the standard form of <literal>http://[[user][:pass]@]host[:"
 #~ "port]/</literal>.  Per host proxies can also be specified by using the "
diff --git a/doc/po/nl.po b/doc/po/nl.po
index 53145ebae..e555bbb70 100644
--- a/doc/po/nl.po
+++ b/doc/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 2.1.4\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2020-05-24 21:07+0200\n"
+"POT-Creation-Date: 2020-08-04 12:40+0200\n"
 "PO-Revision-Date: 2020-05-24 16:39+0200\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
@@ -2040,6 +2040,16 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
+"After successful installation, mark all freshly installed packages as "
+"automatically installed, which will cause each of the packages to be removed "
+"when no more manually installed packages depend on this package.  This is "
+"equally to running <command>apt-mark auto</command> for all installed "
+"packages.  Configuration Item: <literal>APT::Get::Mark-Auto</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
 "If any packages are to be removed apt-get immediately aborts without "
 "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
 msgstr ""
@@ -2913,7 +2923,9 @@ msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-key.8.xml
-msgid "APT key management utility"
+#, fuzzy
+#| msgid "APT key management utility"
+msgid "Deprecated APT key management utility"
 msgstr "Hulpprogramma voor het beheer van de sleutels van APT"
 
 #. type: Content of: <refentry><refsect1><para>
@@ -2931,24 +2943,17 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-key.8.xml
 msgid ""
-"Note that if usage of <command>apt-key</command> is desired the additional "
-"installation of the GNU Privacy Guard suite (packaged in <package>gnupg</"
-"package>) is required. For this reason alone the programmatic usage "
-"(especially in package maintainer scripts!) is strongly discouraged.  "
-"Further more the output format of all commands is undefined and can and does "
-"change whenever the underlying commands change. <command>apt-key</command> "
-"will try to detect such usage and generates warnings on stderr in these "
-"cases."
-msgstr ""
-"Merk op dat als het gebruik van het commando <command>apt-key</command> "
-"gewenst is, dan ook de installatie van de GNU Privacy Guard suite (verpakt "
-"in het pakket <package>gnupg</package>) vereist is. Enkel omwille daarvan al "
-"wordt het gebruik ervan in programma's (zeker in scripts voor "
-"pakketonderhoud) sterk afgeraden. Daarenboven wordt de indeling van de "
-"uitvoer van alle commando's onvoorspelbaar en kan die wijzigen telkens "
-"wanneer de achterliggende commando's wijzigen. <command>apt-key</command> "
-"zal een dergelijk gebruik trachten te detecteren en geeft in dergelijke "
-"gevallen waarschuwingen op de standaard foutuitvoer."
+"Use of <command>apt-key</command> is deprecated, except for the use of "
+"<command>apt-key del</command> in maintainer scripts to remove existing keys "
+"from the main keyring.  If such usage of <command>apt-key</command> is "
+"desired the additional installation of the GNU Privacy Guard suite (packaged "
+"in <package>gnupg</package>) is required."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-key.8.xml
+msgid "apt-key(8) will last be available in Debian 11 and Ubuntu 22.04."
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-key.8.xml
@@ -2991,6 +2996,11 @@ msgstr ""
 msgid "Commands"
 msgstr "Commando's"
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-key.8.xml
+msgid "(deprecated)"
+msgstr "(verouderd)"
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 msgid ""
@@ -3029,6 +3039,13 @@ msgstr ""
 "filename> moeten plaatsen met een descriptieve naam en ofwel \"<literal>gpg</"
 "literal>\" of \"<literal>asc</literal>\" als bestandsextensie."
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-key.8.xml
+#, fuzzy
+#| msgid "(deprecated)"
+msgid "(mostly deprecated)"
+msgstr "(verouderd)"
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 msgid "Remove a key from the list of trusted keys."
@@ -3064,11 +3081,6 @@ msgstr ""
 "secure;-infrastructuur volledig ondermijnen als het onzorgvuldig gebruikt "
 "wordt."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml
-msgid "(deprecated)"
-msgstr "(verouderd)"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 msgid ""
@@ -13654,3 +13666,24 @@ msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
 msgid "Which will use the already fetched archives on the disc."
 msgstr ""
 "En dit zal gebruik maken van de reeds opgehaalde archieven op de schijf."
+
+#~ msgid ""
+#~ "Note that if usage of <command>apt-key</command> is desired the "
+#~ "additional installation of the GNU Privacy Guard suite (packaged in "
+#~ "<package>gnupg</package>) is required. For this reason alone the "
+#~ "programmatic usage (especially in package maintainer scripts!) is "
+#~ "strongly discouraged.  Further more the output format of all commands is "
+#~ "undefined and can and does change whenever the underlying commands "
+#~ "change. <command>apt-key</command> will try to detect such usage and "
+#~ "generates warnings on stderr in these cases."
+#~ msgstr ""
+#~ "Merk op dat als het gebruik van het commando <command>apt-key</command> "
+#~ "gewenst is, dan ook de installatie van de GNU Privacy Guard suite "
+#~ "(verpakt in het pakket <package>gnupg</package>) vereist is. Enkel "
+#~ "omwille daarvan al wordt het gebruik ervan in programma's (zeker in "
+#~ "scripts voor pakketonderhoud) sterk afgeraden. Daarenboven wordt de "
+#~ "indeling van de uitvoer van alle commando's onvoorspelbaar en kan die "
+#~ "wijzigen telkens wanneer de achterliggende commando's wijzigen. "
+#~ "<command>apt-key</command> zal een dergelijk gebruik trachten te "
+#~ "detecteren en geeft in dergelijke gevallen waarschuwingen op de standaard "
+#~ "foutuitvoer."
diff --git a/doc/po/pl.po b/doc/po/pl.po
index 478fa8b3c..d4045f1cb 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: 2020-02-26 21:29+0100\n"
+"POT-Creation-Date: 2020-08-04 12:40+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"
@@ -750,8 +750,8 @@ msgstr ""
 msgid ""
 "Performs the requested action on one or more packages specified via &regex;, "
 "&glob; or exact match. The requested action can be overridden for specific "
-"packages by appending a plus (+) to the package name to install this package or "
-"a minus (-) to remove it."
+"packages by appending a plus (+) to the package name to install this package "
+"or a minus (-) to remove it."
 msgstr ""
 
 #
@@ -2028,6 +2028,16 @@ msgstr ""
 "option> odpowie \"nie\".  Pozycja w pliku konfiguracyjnym: <literal>APT::"
 "Get::Trivial-Only</literal>."
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
+"After successful installation, mark all freshly installed packages as "
+"automatically installed, which will cause each of the packages to be removed "
+"when no more manually installed packages depend on this package.  This is "
+"equally to running <command>apt-mark auto</command> for all installed "
+"packages.  Configuration Item: <literal>APT::Get::Mark-Auto</literal>."
+msgstr ""
+
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -2933,7 +2943,9 @@ msgstr ""
 #
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-key.8.xml
-msgid "APT key management utility"
+#, fuzzy
+#| msgid "APT key management utility"
+msgid "Deprecated APT key management utility"
 msgstr "Narzędzie zarządzanie kluczami APT"
 
 #. type: Content of: <refentry><refsect1><para>
@@ -2951,14 +2963,16 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-key.8.xml
 msgid ""
-"Note that if usage of <command>apt-key</command> is desired the additional "
-"installation of the GNU Privacy Guard suite (packaged in <package>gnupg</"
-"package>) is required. For this reason alone the programmatic usage "
-"(especially in package maintainer scripts!) is strongly discouraged.  "
-"Further more the output format of all commands is undefined and can and does "
-"change whenever the underlying commands change. <command>apt-key</command> "
-"will try to detect such usage and generates warnings on stderr in these "
-"cases."
+"Use of <command>apt-key</command> is deprecated, except for the use of "
+"<command>apt-key del</command> in maintainer scripts to remove existing keys "
+"from the main keyring.  If such usage of <command>apt-key</command> is "
+"desired the additional installation of the GNU Privacy Guard suite (packaged "
+"in <package>gnupg</package>) is required."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-key.8.xml
+msgid "apt-key(8) will last be available in Debian 11 and Ubuntu 22.04."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
@@ -2990,6 +3004,11 @@ msgstr ""
 msgid "Commands"
 msgstr "Polecenia"
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-key.8.xml
+msgid "(deprecated)"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 msgid ""
@@ -3018,6 +3037,11 @@ msgid ""
 "\"<literal>asc</literal>\" as file extension."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-key.8.xml
+msgid "(mostly deprecated)"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 msgid "Remove a key from the list of trusted keys."
@@ -3049,11 +3073,6 @@ msgid ""
 "to completely undermine the &apt-secure; infrastructure if used without care."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml
-msgid "(deprecated)"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 msgid ""
diff --git a/doc/po/pt.po b/doc/po/pt.po
index 1d30c9b31..38de01002 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 2.1.6\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2020-06-14 10:17+0200\n"
+"POT-Creation-Date: 2020-08-04 12:40+0200\n"
 "PO-Revision-Date: 2020-06-08 17:06+0000\n"
 "Last-Translator: Américo Monteiro <a_monteiro@gmx.com>\n"
 "Language-Team: Portuguese <>\n"
@@ -1985,6 +1985,16 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
+"After successful installation, mark all freshly installed packages as "
+"automatically installed, which will cause each of the packages to be removed "
+"when no more manually installed packages depend on this package.  This is "
+"equally to running <command>apt-mark auto</command> for all installed "
+"packages.  Configuration Item: <literal>APT::Get::Mark-Auto</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
 "If any packages are to be removed apt-get immediately aborts without "
 "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
 msgstr ""
@@ -2844,7 +2854,9 @@ msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-key.8.xml
-msgid "APT key management utility"
+#, fuzzy
+#| msgid "APT key management utility"
+msgid "Deprecated APT key management utility"
 msgstr "Utilitário de gestão de chaves do APT"
 
 #. type: Content of: <refentry><refsect1><para>
@@ -2861,23 +2873,17 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-key.8.xml
 msgid ""
-"Note that if usage of <command>apt-key</command> is desired the additional "
-"installation of the GNU Privacy Guard suite (packaged in <package>gnupg</"
-"package>) is required. For this reason alone the programmatic usage "
-"(especially in package maintainer scripts!) is strongly discouraged.  "
-"Further more the output format of all commands is undefined and can and does "
-"change whenever the underlying commands change. <command>apt-key</command> "
-"will try to detect such usage and generates warnings on stderr in these "
-"cases."
-msgstr ""
-"Note que se a utilização do <command>apt-key</command> for desejada, é "
-"necessária a instalação adicional da suite GNU Privacy Guard (empacotada no "
-"<package>gnupg</package>). Apenas por esta razão a utilização programática é "
-"fortemente desencorajada (especialmente no pacote maintainerscripts!). Mais "
-"ainda o formato de saída de todos os comandos não está definido e pode "
-"alterar (e altera mesmo) sempre que os comandos subjacentes mudam. O "
-"<command>apt-key</command> irá tentar detectar tal utilização e gerar avisos "
-"no stderr nestes casos."
+"Use of <command>apt-key</command> is deprecated, except for the use of "
+"<command>apt-key del</command> in maintainer scripts to remove existing keys "
+"from the main keyring.  If such usage of <command>apt-key</command> is "
+"desired the additional installation of the GNU Privacy Guard suite (packaged "
+"in <package>gnupg</package>) is required."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-key.8.xml
+msgid "apt-key(8) will last be available in Debian 11 and Ubuntu 22.04."
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-key.8.xml
@@ -2919,6 +2925,11 @@ msgstr ""
 msgid "Commands"
 msgstr "Comandos"
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-key.8.xml
+msgid "(deprecated)"
+msgstr "(descontinuado)"
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 msgid ""
@@ -2955,6 +2966,13 @@ msgstr ""
 "filename> com um nome descritivo e com \"<literal>gpg</literal>\" ou "
 "\"<literal>asc</literal>\" como extensão de ficheiro."
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-key.8.xml
+#, fuzzy
+#| msgid "(deprecated)"
+msgid "(mostly deprecated)"
+msgstr "(descontinuado)"
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 msgid "Remove a key from the list of trusted keys."
@@ -2989,11 +3007,6 @@ msgstr ""
 "são feitas verificações, portanto é fácil enfraquecer completamente a "
 "infraestrutura &apt-secure; se for usado sem cuidado."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml
-msgid "(deprecated)"
-msgstr "(descontinuado)"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 msgid ""
@@ -13274,6 +13287,25 @@ 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 ""
+#~ "Note that if usage of <command>apt-key</command> is desired the "
+#~ "additional installation of the GNU Privacy Guard suite (packaged in "
+#~ "<package>gnupg</package>) is required. For this reason alone the "
+#~ "programmatic usage (especially in package maintainer scripts!) is "
+#~ "strongly discouraged.  Further more the output format of all commands is "
+#~ "undefined and can and does change whenever the underlying commands "
+#~ "change. <command>apt-key</command> will try to detect such usage and "
+#~ "generates warnings on stderr in these cases."
+#~ msgstr ""
+#~ "Note que se a utilização do <command>apt-key</command> for desejada, é "
+#~ "necessária a instalação adicional da suite GNU Privacy Guard (empacotada "
+#~ "no <package>gnupg</package>). Apenas por esta razão a utilização "
+#~ "programática é fortemente desencorajada (especialmente no pacote "
+#~ "maintainerscripts!). Mais ainda o formato de saída de todos os comandos "
+#~ "não está definido e pode alterar (e altera mesmo) sempre que os comandos "
+#~ "subjacentes mudam. O <command>apt-key</command> irá tentar detectar tal "
+#~ "utilização e gerar avisos no stderr nestes casos."
+
+#~ msgid ""
 #~ "<literal>http::Proxy</literal> sets the default proxy to use for HTTP "
 #~ "URIs. It is in the standard form of <literal>http://[[user][:pass]@]host[:"
 #~ "port]/</literal>.  Per host proxies can also be specified by using the "
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index c9ffe0c2d..33c8ece75 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -8,7 +8,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: 2020-02-26 21:29+0100\n"
+"POT-Creation-Date: 2020-08-04 12:40+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"
@@ -570,8 +570,8 @@ msgstr ""
 msgid ""
 "Performs the requested action on one or more packages specified via &regex;, "
 "&glob; or exact match. The requested action can be overridden for specific "
-"packages by appending a plus (+) to the package name to install this package or "
-"a minus (-) to remove it."
+"packages by appending 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>
@@ -1390,6 +1390,16 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
+"After successful installation, mark all freshly installed packages as "
+"automatically installed, which will cause each of the packages to be removed "
+"when no more manually installed packages depend on this package.  This is "
+"equally to running <command>apt-mark auto</command> for all installed "
+"packages.  Configuration Item: <literal>APT::Get::Mark-Auto</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
 "If any packages are to be removed apt-get immediately aborts without "
 "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
 msgstr ""
@@ -1982,7 +1992,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-key.8.xml
-msgid "APT key management utility"
+msgid "Deprecated APT key management utility"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -1996,14 +2006,16 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-key.8.xml
 msgid ""
-"Note that if usage of <command>apt-key</command> is desired the additional "
-"installation of the GNU Privacy Guard suite (packaged in <package>gnupg</"
-"package>) is required. For this reason alone the programmatic usage "
-"(especially in package maintainer scripts!) is strongly discouraged.  "
-"Further more the output format of all commands is undefined and can and does "
-"change whenever the underlying commands change. <command>apt-key</command> "
-"will try to detect such usage and generates warnings on stderr in these "
-"cases."
+"Use of <command>apt-key</command> is deprecated, except for the use of "
+"<command>apt-key del</command> in maintainer scripts to remove existing keys "
+"from the main keyring.  If such usage of <command>apt-key</command> is "
+"desired the additional installation of the GNU Privacy Guard suite (packaged "
+"in <package>gnupg</package>) is required."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-key.8.xml
+msgid "apt-key(8) will last be available in Debian 11 and Ubuntu 22.04."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
@@ -2035,6 +2047,11 @@ msgstr ""
 msgid "Commands"
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-key.8.xml
+msgid "(deprecated)"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 msgid ""
@@ -2060,6 +2077,11 @@ msgid ""
 "\"<literal>asc</literal>\" as file extension."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-key.8.xml
+msgid "(mostly deprecated)"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 msgid "Remove a key from the list of trusted keys."
@@ -2089,11 +2111,6 @@ msgid ""
 "to completely undermine the &apt-secure; infrastructure if used without care."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml
-msgid "(deprecated)"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml
 msgid ""