Remove leftovers of the apt-key removal

References: a00fbbdb28cc31e78882301c2efe7218583ab4cb

12 files changed, 45 insertions, 109 deletions

diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 67977ccc8..61db5888b 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -69,12 +69,6 @@
   </citerefentry>"
 >
 
-<!ENTITY apt-key "<citerefentry>
-    <refentrytitle><command>apt-key</command></refentrytitle>
-    <manvolnum>8</manvolnum>
-  </citerefentry>"
->
-
 <!ENTITY apt-secure "<citerefentry>
     <refentrytitle>apt-secure</refentrytitle>
     <manvolnum>8</manvolnum>
@@ -424,23 +418,6 @@
 		&synopsis-help;
 	</group>
 </cmdsynopsis></refsynopsisdiv>">
-<!ENTITY synopsis-param-keyid "<replaceable>&synopsis-keyid;</replaceable>">
-<!ENTITY synopsis-command-apt-key "<refsynopsisdiv><cmdsynopsis>
-	<command>apt-key</command>
-	<arg><option>--keyring &synopsis-param-filename;</option></arg>
-	<group choice='req'>
-		<arg choice='plain'>add &synopsis-param-filename;</arg>
-		<arg choice='plain'>del &synopsis-param-keyid;</arg>
-		<arg choice='plain'>export &synopsis-param-keyid;</arg>
-		<arg choice='plain'>exportall</arg>
-		<arg choice='plain'>list</arg>
-		<arg choice='plain'>finger</arg>
-		<arg choice='plain'>adv</arg>
-		<arg choice='plain'>update</arg>
-		<arg choice='plain'>net-update</arg>
-		&synopsis-help;
-	</group>
-</cmdsynopsis></refsynopsisdiv>">
 <!ENTITY synopsis-command-apt-mark "<refsynopsisdiv><cmdsynopsis>
 	<command>apt-mark</command>
 	<group choice='plain'>
diff --git a/doc/apt.ent b/doc/apt.ent
index b502073a9..9034d2e66 100644
--- a/doc/apt.ent
+++ b/doc/apt.ent
@@ -258,7 +258,3 @@ or further configured by the <option>APT::Color</option> configuration option an
 
 <!-- TRANSLATOR: used as parameter for apt-ftparchive  e.g. apt-ftparchive generate section -->
 <!ENTITY synopsis-section "section">
-
-<!-- TRANSLATOR: used as in apt-key export keyid  e.g. apt-key export 473041FA -->
-<!ENTITY synopsis-keyid "keyid">
-
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index dfed6c4d5..bb7a2180e 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -525,13 +525,6 @@ msgid ""
 "generate section --> <!ENTITY synopsis-section \"section\">"
 msgstr ""
 
-#. type: Plain text
-#: apt.ent
-msgid ""
-"<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
-"473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
-msgstr ""
-
 #. type: Content of: <refentry><refmeta><manvolnum>
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-mark.8.xml apt-secure.8.xml
 #: apt-cdrom.8.xml apt-config.8.xml
diff --git a/doc/po/de.po b/doc/po/de.po
index 71b7ead94..7268e5d8c 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -697,13 +697,6 @@ msgid ""
 "generate section --> <!ENTITY synopsis-section \"section\">"
 msgstr "<!ENTITY synopsis-section \"Abschnitt\">"
 
-#. type: Plain text
-#: apt.ent
-msgid ""
-"<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
-"473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
-msgstr "<!ENTITY synopsis-keyid \"Schlüsselkennung\">"
-
 #. type: Content of: <refentry><refmeta><manvolnum>
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-mark.8.xml apt-secure.8.xml
 #: apt-cdrom.8.xml apt-config.8.xml
@@ -14080,6 +14073,11 @@ msgstr ""
 "fortfahren, wodurch die bereits auf der Platte heruntergeladenen Archive "
 "benutzt werden."
 
+#~ msgid ""
+#~ "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
+#~ "473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
+#~ msgstr "<!ENTITY synopsis-keyid \"Schlüsselkennung\">"
+
 #, fuzzy
 #~| msgid "APT key management utility"
 #~ msgid "Deprecated APT key management utility"
diff --git a/doc/po/es.po b/doc/po/es.po
index 0eb8a0cbe..bf6f153f3 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -777,15 +777,6 @@ msgstr ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "generate section --> <!ENTITY synopsis-section \"section\">"
 
-#. type: Plain text
-#: apt.ent
-msgid ""
-"<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
-"473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
-msgstr ""
-"<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
-"473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
-
 #. type: Content of: <refentry><refmeta><manvolnum>
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-mark.8.xml apt-secure.8.xml
 #: apt-cdrom.8.xml apt-config.8.xml
diff --git a/doc/po/fr.po b/doc/po/fr.po
index b020c08be..df70ce2b8 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -692,13 +692,6 @@ msgid ""
 "generate section --> <!ENTITY synopsis-section \"section\">"
 msgstr "<!ENTITY synopsis-section \"section\">"
 
-#. type: Plain text
-#: apt.ent
-msgid ""
-"<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
-"473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
-msgstr "<!ENTITY synopsis-keyid \"id_de_clé\">"
-
 #. type: Content of: <refentry><refmeta><manvolnum>
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-mark.8.xml apt-secure.8.xml
 #: apt-cdrom.8.xml apt-config.8.xml
@@ -13911,6 +13904,11 @@ msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
 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 ""
+#~ "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
+#~ "473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
+#~ msgstr "<!ENTITY synopsis-keyid \"id_de_clé\">"
+
 #, fuzzy
 #~| msgid "APT key management utility"
 #~ msgid "Deprecated APT key management utility"
diff --git a/doc/po/it.po b/doc/po/it.po
index 75751dadb..5fa78e1e8 100644
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -736,15 +736,6 @@ msgstr ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "generate section --> <!ENTITY synopsis-section \"sezione\">"
 
-#. type: Plain text
-#: apt.ent
-msgid ""
-"<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
-"473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
-msgstr ""
-"<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
-"473041FA --> <!ENTITY synopsis-keyid \"IDchiave\">"
-
 #. type: Content of: <refentry><refmeta><manvolnum>
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-mark.8.xml apt-secure.8.xml
 #: apt-cdrom.8.xml apt-config.8.xml
@@ -13695,6 +13686,13 @@ msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
 msgid "Which will use the already fetched archives on the disc."
 msgstr "che userà gli archivi già scaricati e presenti sul disco."
 
+#~ msgid ""
+#~ "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
+#~ "473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
+#~ msgstr ""
+#~ "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
+#~ "473041FA --> <!ENTITY synopsis-keyid \"IDchiave\">"
+
 #, fuzzy
 #~| msgid "APT key management utility"
 #~ msgid "Deprecated APT key management utility"
diff --git a/doc/po/ja.po b/doc/po/ja.po
index e223cbd6e..783e29c32 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -739,15 +739,6 @@ msgstr ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "generate section --> <!ENTITY synopsis-section \"セクション\">"
 
-#. type: Plain text
-#: apt.ent
-msgid ""
-"<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
-"473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
-msgstr ""
-"<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
-"473041FA --> <!ENTITY synopsis-keyid \"キーID\">"
-
 #. type: Content of: <refentry><refmeta><manvolnum>
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-mark.8.xml apt-secure.8.xml
 #: apt-cdrom.8.xml apt-config.8.xml
@@ -13143,6 +13134,13 @@ msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
 msgid "Which will use the already fetched archives on the disc."
 msgstr "これで、ディスクにある取得済みのアーカイブを使用するようになります。"
 
+#~ msgid ""
+#~ "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
+#~ "473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
+#~ msgstr ""
+#~ "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
+#~ "473041FA --> <!ENTITY synopsis-keyid \"キーID\">"
+
 #, fuzzy
 #~| msgid "APT key management utility"
 #~ msgid "Deprecated APT key management utility"
diff --git a/doc/po/nl.po b/doc/po/nl.po
index 56b8207f2..e265e318a 100644
--- a/doc/po/nl.po
+++ b/doc/po/nl.po
@@ -705,15 +705,6 @@ msgstr ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "generate section --> <!ENTITY synopsis-section \"sectie\">"
 
-#. type: Plain text
-#: apt.ent
-msgid ""
-"<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
-"473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
-msgstr ""
-"<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
-"473041FA --> <!ENTITY synopsis-keyid \"sleutel-ID\">"
-
 #. type: Content of: <refentry><refmeta><manvolnum>
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-mark.8.xml apt-secure.8.xml
 #: apt-cdrom.8.xml apt-config.8.xml
@@ -14249,6 +14240,13 @@ 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 ""
+#~ "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
+#~ "473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
+#~ msgstr ""
+#~ "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
+#~ "473041FA --> <!ENTITY synopsis-keyid \"sleutel-ID\">"
+
 #~ msgid "Deprecated APT key management utility"
 #~ msgstr "Verouderd hulpprogramma voor het beheer van de sleutels van APT"
 
diff --git a/doc/po/pl.po b/doc/po/pl.po
index db3391fd6..c8c38c448 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -735,15 +735,6 @@ msgstr ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "generate section --> <!ENTITY synopsis-section \"sekcja\">"
 
-#. type: Plain text
-#: apt.ent
-msgid ""
-"<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
-"473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
-msgstr ""
-"<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
-"473041FA --> <!ENTITY synopsis-keyid \"id_klucza\">"
-
 #. type: Content of: <refentry><refmeta><manvolnum>
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-mark.8.xml apt-secure.8.xml
 #: apt-cdrom.8.xml apt-config.8.xml
@@ -12517,6 +12508,13 @@ msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
 msgid "Which will use the already fetched archives on the disc."
 msgstr "Które użyje pobranych uprzednio archiwów z dysku."
 
+#~ msgid ""
+#~ "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
+#~ "473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
+#~ msgstr ""
+#~ "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
+#~ "473041FA --> <!ENTITY synopsis-keyid \"id_klucza\">"
+
 #
 #, fuzzy
 #~| msgid "APT key management utility"
diff --git a/doc/po/pt.po b/doc/po/pt.po
index 0a5832611..083a16f37 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -700,15 +700,6 @@ msgstr ""
 "<!-- TRANSLATOR: usado como parâmetro para apt-ftparchive ex. apt-ftparchive "
 "generate section --> <!ENTITY synopsis-section \"secção\">"
 
-#. type: Plain text
-#: apt.ent
-msgid ""
-"<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
-"473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
-msgstr ""
-"<!-- TRANSLATOR: usado como id de chave de exportação do apt-key ex. apt-key "
-"export 473041FA --> <!ENTITY synopsis-keyid \"id_de_chave\">"
-
 #. type: Content of: <refentry><refmeta><manvolnum>
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-mark.8.xml apt-secure.8.xml
 #: apt-cdrom.8.xml apt-config.8.xml
@@ -13868,6 +13859,13 @@ msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
 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 ""
+#~ "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
+#~ "473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
+#~ msgstr ""
+#~ "<!-- TRANSLATOR: usado como id de chave de exportação do apt-key ex. apt-"
+#~ "key export 473041FA --> <!ENTITY synopsis-keyid \"id_de_chave\">"
+
 #~ msgid "Deprecated APT key management utility"
 #~ msgstr "Utilitário de gestão de chaves do APT descontinuado"
 
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index f36008f8c..f685f4026 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -501,13 +501,6 @@ msgid ""
 "generate section --> <!ENTITY synopsis-section \"section\">"
 msgstr ""
 
-#. type: Plain text
-#: apt.ent
-msgid ""
-"<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
-"473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
-msgstr ""
-
 #. type: Content of: <refentry><refmeta><manvolnum>
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-mark.8.xml apt-secure.8.xml
 #: apt-cdrom.8.xml apt-config.8.xml