summaryrefslogtreecommitdiff
path: root/doc/po/apt-doc.pot
diff options
context:
space:
mode:
Diffstat (limited to 'doc/po/apt-doc.pot')
-rw-r--r--doc/po/apt-doc.pot78
1 files changed, 75 insertions, 3 deletions
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 7262ce2f9..72023c2ff 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.3.15\n"
+"Project-Id-Version: apt-doc 2.4.0\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2022-02-01 18:06+0100\n"
+"POT-Creation-Date: 2022-02-22 20:01+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -311,6 +311,11 @@ msgid ""
" Configuration Item "
"<literal>Dir::Etc::TrustedParts</literal>.</para></listitem>\n"
" </varlistentry>\n"
+" <varlistentry><term><filename>/etc/apt/keyrings/</filename></term>\n"
+" <listitem><para>Place to store additional keyrings to be used with "
+"<literal>Signed-By</literal>.\n"
+" </para></listitem>\n"
+" </varlistentry>\n"
"\">\n"
msgstr ""
@@ -2208,6 +2213,70 @@ msgid ""
"e.g. new keys are added to this one."
msgstr ""
+#. type: Content of: <refentry><refsect1><title>
+#: apt-key.8.xml
+msgid "Deprecation"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-key.8.xml
+msgid ""
+"Except for using <command>apt-key del</command> in maintainer scripts, the "
+"use of <command>apt-key</command> is deprecated. This section shows how to "
+"replace existing use of <command>apt-key</command>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-key.8.xml
+msgid "If your existing use of <command>apt-key add</command> looks like this:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-key.8.xml
+msgid ""
+"<literal>wget -qO- https://myrepo.example/myrepo.asc | sudo apt-key add "
+"-</literal>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-key.8.xml
+msgid ""
+"Then you can directly replace this with (though note the recommendation "
+"below):"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-key.8.xml
+msgid ""
+"<literal>wget -qO- https://myrepo.example/myrepo.asc | sudo tee "
+"/etc/apt/trusted.gpg.d/myrepo.asc</literal>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-key.8.xml
+msgid ""
+"Make sure to use the \"<literal>asc</literal>\" extension for ASCII armored "
+"keys and the \"<literal>gpg</literal>\" extension for the binary OpenPGP "
+"format (also known as \"GPG key public ring\"). The binary OpenPGP format "
+"works for all apt versions, while the ASCII armored format works for apt "
+"version >= 1.4."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-key.8.xml
+msgid ""
+"<emphasis>Recommended:</emphasis> Instead of placing keys into the "
+"<filename>/etc/apt/trusted.gpg.d</filename> directory, you can place them "
+"anywhere on your filesystem by using the <literal>Signed-By</literal> option "
+"in your <literal>sources.list</literal> and pointing to the filename of the "
+"key. See &sources-list; for details. Since APT 2.4, "
+"<filename>/etc/apt/keyrings</filename> is provided as the recommended "
+"location for keys not managed by packages. When using a deb822-style "
+"sources.list, and with apt version >= 2.4, the <literal>Signed-By</literal> "
+"option can also be used to include the full ASCII armored keyring directly "
+"in the <literal>sources.list</literal> without an additional file."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><para>
#: apt-key.8.xml
msgid "&apt-get;, &apt-secure;"
@@ -5825,7 +5894,10 @@ msgid ""
"list of absolute paths to keyring files (have to be accessible and readable "
"for the <literal>_apt</literal> system user, so ensure everyone has "
"read-permissions on the file) and fingerprints of keys to select from these "
-"keyrings. If no keyring files are specified the default is the "
+"keyrings. The recommended locations for keyrings are "
+"<filename>/usr/share/keyrings</filename> for keyrings managed by packages, "
+"and <filename>/etc/apt/keyrings</filename> for keyrings managed by the "
+"system operator. If no keyring files are specified the default is the "
"<filename>trusted.gpg</filename> keyring and all keyrings in the "
"<filename>trusted.gpg.d/</filename> directory (see <command>apt-key "
"fingerprint</command>). If no fingerprint is specified all keys in the "