summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/apt-key.8.xml2
-rw-r--r--doc/apt-verbatim.ent2
-rw-r--r--doc/po/apt-doc.pot78
-rw-r--r--doc/po/de.po298
-rw-r--r--doc/po/es.po364
-rw-r--r--doc/po/fr.po283
-rw-r--r--doc/po/it.po437
-rw-r--r--doc/po/ja.po336
-rw-r--r--doc/po/nl.po349
-rw-r--r--doc/po/pl.po304
-rw-r--r--doc/po/pt.po396
-rw-r--r--doc/po/pt_BR.po212
-rw-r--r--doc/sources.list.5.xml2
13 files changed, 1963 insertions, 1100 deletions
diff --git a/doc/apt-key.8.xml b/doc/apt-key.8.xml
index 5f2701e0c..7cf4da40e 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>2020-05-06T00:00:00Z</date>
+ <date>2022-02-22T00:00:00Z</date>
</refentryinfo>
<refmeta>
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index f8217839d..a586737a6 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.3.15">
+<!ENTITY apt-product-version "2.4.0">
<!-- (Code)names for various things used all over the place -->
<!ENTITY debian-oldstable-codename "buster">
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 "
diff --git a/doc/po/de.po b/doc/po/de.po
index 4dddef902..6ecd459e6 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: 2022-01-06 20:58+0100\n"
+"POT-Creation-Date: 2022-02-22 20:01+0100\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"
@@ -412,13 +412,24 @@ msgstr ""
#. type: Plain text
#: apt.ent
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
+#| " <listitem><para>File fragments for the trusted keys, additional keyrings can\n"
+#| " be stored here (by other packages or the administrator).\n"
+#| " Configuration Item <literal>Dir::Etc::TrustedParts</literal>.</para></listitem>\n"
+#| " </varlistentry>\n"
+#| "\">\n"
msgid ""
" <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
" <listitem><para>File fragments for the trusted keys, additional keyrings can\n"
" be stored here (by other packages or the administrator).\n"
" 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 ""
" <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
@@ -815,8 +826,8 @@ msgstr ""
#: apt.8.xml
msgid ""
"<option>satisfy</option> satisfies dependency strings, as used in Build-"
-"Depends. It also handles conflicts, by prefixing an argument with <literal>"
-"\"Conflicts: \"</literal>."
+"Depends. It also handles conflicts, by prefixing an argument with "
+"<literal>\"Conflicts: \"</literal>."
msgstr ""
"<option>satisfy</option> erfüllt Abhängigkeitszeichenketten, wie sie in "
"Build-Depends benutzt werden. Es handhabt auch Konflikte, indem es einem "
@@ -825,11 +836,11 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.8.xml
msgid ""
-"Example: <literal>apt satisfy \"foo, bar (>= 1.0)\" \"Conflicts: baz, fuzz"
-"\"</literal>"
+"Example: <literal>apt satisfy \"foo, bar (>= 1.0)\" \"Conflicts: baz, "
+"fuzz\"</literal>"
msgstr ""
-"Beispiel: <literal>apt satisfy \"foo, bar (>= 1.0)\" \"Conflicts: baz, fuzz"
-"\"</literal>"
+"Beispiel: <literal>apt satisfy \"foo, bar (>= 1.0)\" \"Conflicts: baz, "
+"fuzz\"</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt.8.xml
@@ -2596,11 +2607,12 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cache.8.xml
msgid ""
-"The same as <literal>dotty</literal>, only for xvcg from the <ulink url="
-"\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>."
+"The same as <literal>dotty</literal>, only for xvcg from the <ulink "
+"url=\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</"
+"ulink>."
msgstr ""
-"Das gleiche wie <literal>dotty</literal>, nur für xvcg vom <ulink url="
-"\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG-Werkzeug</"
+"Das gleiche wie <literal>dotty</literal>, nur für xvcg vom <ulink "
+"url=\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG-Werkzeug</"
"ulink>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
@@ -3104,6 +3116,72 @@ msgstr ""
"<filename>trusted.gpg</filename> der primäre Schlüsselbund wird, d.h. neue "
"Schlüssel werden zu diesem hinzugefügt."
+#. type: Content of: <refentry><refsect1><title>
+#: apt-key.8.xml
+#, fuzzy
+#| msgid "Operation"
+msgid "Deprecation"
+msgstr "Betrieb"
+
+#. 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;"
@@ -3726,8 +3804,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt-secure.8.xml
msgid ""
-"For more background information you might want to review the <ulink url="
-"\"https://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
+"For more background information you might want to review the <ulink "
+"url=\"https://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
"Security Infrastructure</ulink> chapter of the Securing Debian Manual (also "
"available in the harden-doc package) and the <ulink url=\"http://www."
"cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution HOWTO</"
@@ -4161,9 +4239,9 @@ msgstr ""
#| "tools such as bind and dhcp use. Lines starting with <literal>//</"
#| "literal> are treated as comments (ignored), as well as all text between "
#| "<literal>/*</literal> and <literal>*/</literal>, just like C/C++ "
-#| "comments. Each line is of the form <literal>APT::Get::Assume-Yes \"true"
-#| "\";</literal>. The quotation marks and trailing semicolon are required. "
-#| "The value must be on one line, and there is no kind of string "
+#| "comments. Each line is of the form <literal>APT::Get::Assume-Yes "
+#| "\"true\";</literal>. The quotation marks and trailing semicolon are "
+#| "required. The value must be on one line, and there is no kind of string "
#| "concatenation. Values must not include backslashes or extra quotation "
#| "marks. Option names are made up of alphanumeric characters and the "
#| "characters \"/-:._+\". A new scope can be opened with curly braces, like "
@@ -4918,10 +4996,10 @@ msgid ""
"literal> script in the configuration file. This entry specifies the commands "
"to send to tell the proxy server what to connect to. Please see "
"&configureindex; for an example of how to do this. The substitution "
-"variables representing the corresponding URI component are <literal>"
-"$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, <literal>"
-"$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, <literal>$(SITE)</"
-"literal> and <literal>$(SITE_PORT)</literal>."
+"variables representing the corresponding URI component are "
+"<literal>$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, "
+"<literal>$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, "
+"<literal>$(SITE)</literal> and <literal>$(SITE_PORT)</literal>."
msgstr ""
"<literal>ftp::Proxy</literal> setzt den Standard-Proxy, der für FTP-URIs "
"benutzt werden soll. Er wird in der Standardform <literal>ftp://[[Benutzer][:"
@@ -4936,9 +5014,9 @@ msgstr ""
"dem Proxy-Server mitzuteilen, womit er sich verbinden soll. Ein Beispiel, "
"wie das funktioniert, finden Sie unter &configureindex;. Die "
"Platzhaltervariablen, die für den zugehörigen URI-Bestandteil stehen, sind "
-"<literal>$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, <literal>"
-"$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, <literal>$(SITE)</"
-"literal> und <literal>$(SITE_PORT)</literal>."
+"<literal>$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, "
+"<literal>$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, "
+"<literal>$(SITE)</literal> und <literal>$(SITE_PORT)</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml
@@ -5208,8 +5286,8 @@ msgid ""
"specifies the languages. So the following example configuration will result "
"in the order \"en, de\" in an English locale or \"de, en\" in a German one. "
"Note that \"fr\" is downloaded, but not used unless APT is used in a French "
-"locale (where the order would be \"fr, de, en\"). <placeholder type="
-"\"programlisting\" id=\"0\"/>"
+"locale (where the order would be \"fr, de, en\"). <placeholder "
+"type=\"programlisting\" id=\"0\"/>"
msgstr ""
"Die Standardliste beinhaltet »environment« und »en«. »<literal>environment</"
"literal>« hat hier eine besondere Bedeutung: Es wird zur Laufzeit durch die "
@@ -6352,8 +6430,9 @@ msgid ""
"in the APT configuration file <filename>/etc/apt/apt.conf</filename>. Note "
"that this has precedence over any general priority you set in the <filename>/"
"etc/apt/preferences</filename> file described later, but not over "
-"specifically pinned packages. For example, <placeholder type="
-"\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>"
+"specifically pinned packages. For example, <placeholder "
+"type=\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" "
+"id=\"1\"/>"
msgstr ""
"Wenn es keine Einstellungsdatei gibt oder es in der Datei keinen Eintrag "
"gibt, der sich auf eine bestimmte Version bezieht, dann ist die dieser "
@@ -6366,8 +6445,8 @@ msgstr ""
"dies Vorrang vor einer allgemeinen Priorität hat, die Sie, wie später "
"beschrieben, in der Datei <filename>/etc/apt/preferences</filename> setzen, "
"aber nicht vor bestimmten mit Pinning festgehaltenen Paketen. Beispielsweise "
-"<placeholder type=\"programlisting\" id=\"0\"/> <placeholder type="
-"\"programlisting\" id=\"1\"/>"
+"<placeholder type=\"programlisting\" id=\"0\"/> <placeholder "
+"type=\"programlisting\" id=\"1\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml
@@ -6724,8 +6803,8 @@ msgid ""
"This should <emphasis>not</emphasis> be confused with the Origin of a "
"distribution as specified in a <filename>Release</filename> file. What "
"follows the \"Origin:\" tag in a <filename>Release</filename> file is not an "
-"Internet address but an author or vendor name, such as \"Debian\" or \"Ximian"
-"\"."
+"Internet address but an author or vendor name, such as \"Debian\" or "
+"\"Ximian\"."
msgstr ""
"Dies sollte nicht mit der Herkunft einer Distribution verwechselt werden, "
"wie sie in einer <filename>Release</filename>-Datei angegeben wurde. Was dem "
@@ -7512,8 +7591,8 @@ msgstr ""
"Paketversionen eine höhere Priorität als die Vorgabe (500) zu geben, die zu "
"einer <literal>stable</literal>-Distribution gehören und eine ungeheuer "
"niedrige Priorität zu Paketversionen, die zu anderen <literal>Debian</"
-"literal>-Distributionen gehören. <placeholder type=\"programlisting\" id="
-"\"0\"/>"
+"literal>-Distributionen gehören. <placeholder type=\"programlisting\" "
+"id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#: apt_preferences.5.xml
@@ -7557,8 +7636,8 @@ msgstr ""
"Der folgende Befehl wird APT veranlassen, ein Upgrade des angegebenen Pakets "
"auf die neuste Version der <literal>testing</literal>-Distribution "
"durchzuführen. Von dem Paket wird kein weiteres Upgrade durchgeführt, außer "
-"wenn dieser Befehl wieder angegeben wird. <placeholder type=\"programlisting"
-"\" id=\"0\"/>"
+"wenn dieser Befehl wieder angegeben wird. <placeholder "
+"type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt_preferences.5.xml
@@ -7600,15 +7679,15 @@ msgid ""
"to package versions from the <literal>testing</literal> distribution, a "
"lower priority to package versions from the <literal>unstable</literal> "
"distribution, and a prohibitively low priority to package versions from "
-"other <literal>Debian</literal> distributions. <placeholder type="
-"\"programlisting\" id=\"0\"/>"
+"other <literal>Debian</literal> distributions. <placeholder "
+"type=\"programlisting\" id=\"0\"/>"
msgstr ""
"Die folgende APT-Einstellungsdatei wird APT veranlassen, Paketversionen der "
"<literal>testing</literal>-Distribution eine hohe Priorität, Paketversionen "
"der <literal>unstable</literal>-Distribution eine niedrigere Priorität und "
"eine ungeheuer niedrige Priorität zu Paketversionen von anderen "
-"<literal>Debian</literal>-Distributionen zuzuweisen. <placeholder type="
-"\"programlisting\" id=\"0\"/>"
+"<literal>Debian</literal>-Distributionen zuzuweisen. <placeholder "
+"type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml
@@ -7646,8 +7725,8 @@ msgstr ""
"des Pakets auf die aktuellste <literal>testing</literal>-Version "
"durchführen, falls diese aktueller als die installierte Version ist, "
"andernfalls auf die aktuellste <literal>unstable</literal>-Version, wenn "
-"diese aktueller als die installierte Version ist. <placeholder type="
-"\"programlisting\" id=\"0\"/>"
+"diese aktueller als die installierte Version ist. <placeholder "
+"type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt_preferences.5.xml
@@ -7726,8 +7805,8 @@ msgstr ""
"Mit einer geeigneten &sources-list;-Datei und der obigen Einstellungsdatei "
"wird jeder der folgenden Befehle APT veranlassen, ein Upgrade auf die "
"letzte(n) Version(en) im Release mit Codenamen <literal>&debian-testing-"
-"codename;</literal> durchzuführen. <placeholder type=\"programlisting\" id="
-"\"0\"/>"
+"codename;</literal> durchzuführen. <placeholder type=\"programlisting\" "
+"id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#: apt_preferences.5.xml
@@ -7752,8 +7831,8 @@ msgstr ""
"des Pakets auf die aktuellste <literal>&debian-testing-codename;</literal>-"
"Version durchführen, wenn diese aktueller als die installierte Version ist, "
"andernfalls auf die aktuellste <literal>sid</literal>-Version, wenn diese "
-"aktueller als die installierte Version ist. <placeholder type="
-"\"programlisting\" id=\"0\"/>"
+"aktueller als die installierte Version ist. <placeholder "
+"type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
#: apt_preferences.5.xml
@@ -8133,8 +8212,8 @@ msgid ""
msgstr ""
"Die Quellen für Ihre Distribution könnten zum Beispiel im Format mit "
"einzeiligem Stil so aussehen: <placeholder type=\"literallayout\" id=\"0\"/> "
-"oder im Format mit Deb822-Stil so: <placeholder type=\"literallayout\" id="
-"\"1\"/>."
+"oder im Format mit Deb822-Stil so: <placeholder type=\"literallayout\" "
+"id=\"1\"/>."
#. type: Content of: <refentry><refsect1><title>
#: sources.list.5.xml
@@ -8380,20 +8459,23 @@ 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 "
-"<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 "
-"keyrings are selected. A fingerprint will accept also all signatures by a "
-"subkey of this key, if this isn't desired an exclamation mark (<literal>!</"
-"literal>) can be appended to the fingerprint to disable this behaviour. The "
-"option defaults to the value of the option with the same name if set in the "
-"previously acquired <filename>Release</filename> file of this repository "
-"(only fingerprints can be specified there through). Otherwise all keys in "
-"the trusted keyrings are considered valid signers for this repository. The "
-"option may also be set directly to an embedded GPG public key block. Special "
-"care is needed to encode the empty line with leading spaces and \".\": "
-"<placeholder type=\"literallayout\" id=\"0\"/>"
+"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 keyrings are selected. A "
+"fingerprint will accept also all signatures by a subkey of this key, if this "
+"isn't desired an exclamation mark (<literal>!</literal>) can be appended to "
+"the fingerprint to disable this behaviour. The option defaults to the value "
+"of the option with the same name if set in the previously acquired "
+"<filename>Release</filename> file of this repository (only fingerprints can "
+"be specified there through). Otherwise all keys in the trusted keyrings are "
+"considered valid signers for this repository. The option may also be set "
+"directly to an embedded GPG public key block. Special care is needed to "
+"encode the empty line with leading spaces and \".\": <placeholder "
+"type=\"literallayout\" id=\"0\"/>"
msgstr ""
"<option>Signed-By</option> (<option>signed-by</option>) ist eine Option, die "
"erfordert, dass ein Depot die &apt-secure;-Prüfung mit einem bestimmten Satz "
@@ -8636,10 +8718,10 @@ msgid ""
msgstr ""
"Das Schema »mirror« gibt den Speicherort der Spiegelserverliste an. "
"Standardmäßig wird für den Speicherort das Schema <literal>http</literal> "
-"benutzt, aber jedes andere Schema kann per <command>mirror"
-"+<replaceable>Schema</replaceable></command> verwendet werden. Die "
-"Spiegelserverliste selbst kann mehrere verschiedenen URIs für Spiegel "
-"enthalten, die der APT-Client transparent auswählt oder auf die er "
+"benutzt, aber jedes andere Schema kann per "
+"<command>mirror+<replaceable>Schema</replaceable></command> verwendet "
+"werden. Die Spiegelserverliste selbst kann mehrere verschiedenen URIs für "
+"Spiegel enthalten, die der APT-Client transparent auswählt oder auf die er "
"zurückgreift. Dies ist als Hilfe bei der Lastverteilung zwischen verfügbaren "
"Spiegelservern gedacht und stellt zudem sicher, dass Clients sogar dann "
"Daten beziehen können, wenn einige konfigurierte Spiegelserver nicht "
@@ -9004,8 +9086,8 @@ msgstr ""
"andere unterstützte Architekturen, gefunden werden. [Beachten Sie, dass "
"dieses Beispiel nur anschaulich macht, wie die Platzhaltervariable benutzt "
"wird. Offizielle Debian-Archive sind nicht so strukturiert.] <placeholder "
-"type=\"literallayout\" id=\"0\"/> <placeholder type=\"literallayout\" id="
-"\"1\"/>"
+"type=\"literallayout\" id=\"0\"/> <placeholder type=\"literallayout\" "
+"id=\"1\"/>"
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml
@@ -9605,11 +9687,11 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml
msgid ""
-"Sets the top of the source package directory tree. Defaults to <filename>"
-"$(DIST)/$(SECTION)/source/</filename>"
+"Sets the top of the source package directory tree. Defaults to "
+"<filename>$(DIST)/$(SECTION)/source/</filename>"
msgstr ""
-"setzt den Beginn des Quellpaketverzeichnisbaums. Vorgabe ist <filename>"
-"$(DIST)/$(SECTION)/source/</filename>"
+"setzt den Beginn des Quellpaketverzeichnisbaums. Vorgabe ist "
+"<filename>$(DIST)/$(SECTION)/source/</filename>"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml
@@ -9633,8 +9715,8 @@ msgstr ""
#: apt-ftparchive.1.xml
msgid ""
"Sets the output Translation-en master file with the long descriptions if "
-"they should be not included in the Packages file. Defaults to <filename>"
-"$(DIST)/$(SECTION)/i18n/Translation-en</filename>"
+"they should be not included in the Packages file. Defaults to "
+"<filename>$(DIST)/$(SECTION)/i18n/Translation-en</filename>"
msgstr ""
"setzt die Ausgabe der Translation-en-Hauptdatei mit den langen "
"Beschreibungen falls sie nicht in der Packages-Datei enthalten sein sollen. "
@@ -9767,8 +9849,8 @@ msgstr ""
#: apt-ftparchive.1.xml
msgid ""
"When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
-"command> performs an operation similar to: <placeholder type=\"programlisting"
-"\" id=\"0\"/>"
+"command> performs an operation similar to: <placeholder "
+"type=\"programlisting\" id=\"0\"/>"
msgstr ""
"Wenn ein <literal>Tree</literal>-Abschnitt bearbeitet wird, führt "
"<command>apt-ftparchive</command> eine Aktion aus, die folgender ähnelt:"
@@ -9930,19 +10012,19 @@ msgstr "neu"
#. type: Content of: <refentry><refsect1><para>
#: apt-ftparchive.1.xml
msgid ""
-"The general form of the maintainer field is: <placeholder type="
-"\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
-"id=\"1\"/> The first form allows a double-slash separated list of old email "
-"addresses to be specified. If any of those are found then new is substituted "
-"for the maintainer field. The second form unconditionally substitutes the "
-"maintainer field."
+"The general form of the maintainer field is: <placeholder "
+"type=\"literallayout\" id=\"0\"/> or simply, <placeholder "
+"type=\"literallayout\" id=\"1\"/> The first form allows a double-slash "
+"separated list of old email addresses to be specified. If any of those are "
+"found then new is substituted for the maintainer field. The second form "
+"unconditionally substitutes the maintainer field."
msgstr ""
-"Die allgemeine Form des Betreuerfelds ist: <placeholder type=\"literallayout"
-"\" id=\"0\"/> oder einfach <placeholder type=\"literallayout\" id=\"1\"/>. "
-"Die erste Form erlaubt es, eine durch Doppelschrägstrich getrennte Liste "
-"alter E-Mail-Adressen anzugegeben. Wenn eine davon gefunden wird, wird die "
-"neue für das Betreuerfeld ersetzt. Die zweite Form ersetzt das Betreuerfeld "
-"bedingungslos."
+"Die allgemeine Form des Betreuerfelds ist: <placeholder "
+"type=\"literallayout\" id=\"0\"/> oder einfach <placeholder "
+"type=\"literallayout\" id=\"1\"/>. Die erste Form erlaubt es, eine durch "
+"Doppelschrägstrich getrennte Liste alter E-Mail-Adressen anzugegeben. Wenn "
+"eine davon gefunden wird, wird die neue für das Betreuerfeld ersetzt. Die "
+"zweite Form ersetzt das Betreuerfeld bedingungslos."
#. type: Content of: <refentry><refsect1><title>
#: apt-ftparchive.1.xml
@@ -10257,8 +10339,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
@@ -10350,8 +10432,8 @@ msgid ""
"password <literal>debian</literal> for the &sources-list; entry <placeholder "
"type=\"literallayout\" id=\"0\"/> could be done in the entry directly: "
"<placeholder type=\"literallayout\" id=\"1\"/> Alternatively an entry like "
-"the following in the auth.conf file could be used: <placeholder type="
-"\"literallayout\" id=\"2\"/> Or alternatively within a single line: "
+"the following in the auth.conf file could be used: <placeholder "
+"type=\"literallayout\" id=\"2\"/> Or alternatively within a single line: "
"<placeholder type=\"literallayout\" id=\"3\"/> If you need to be more "
"specific all of these lines will also apply to the example entry: "
"<placeholder type=\"literallayout\" id=\"4\"/> On the other hand neither of "
@@ -10363,11 +10445,11 @@ msgstr ""
"bereitgestellt werden: <placeholder type=\"literallayout\" id=\"1\"/>. "
"Alternativ kann ein Eintrag wie der folgende in der Datei »auth.conf« "
"verwendet werden: <placeholder type=\"literallayout\" id=\"2\"/>. Oder "
-"alternativ in einer einzelnen Zeile: <placeholder type=\"literallayout\" id="
-"\"3\"/>. Falls Sie dies präziser mögen, werden all diese Zeilen auf den "
+"alternativ in einer einzelnen Zeile: <placeholder type=\"literallayout\" "
+"id=\"3\"/>. Falls Sie dies präziser mögen, werden all diese Zeilen auf den "
"Beispieleintrag angewendet: <placeholder type=\"literallayout\" id=\"4\"/>. "
-"Andererseits wird keine der folgenden Zeilen angewendet: <placeholder type="
-"\"literallayout\" id=\"5\"/>."
+"Andererseits wird keine der folgenden Zeilen angewendet: <placeholder "
+"type=\"literallayout\" id=\"5\"/>."
#. type: Content of: <refentry><refsect1><title>
#: apt_auth.conf.5.xml
@@ -10468,10 +10550,10 @@ msgstr ""
msgid ""
"HTTP is an unencrypted transport protocol meaning that the whole "
"communication with the remote server (or proxy) can be observed by a "
-"sufficiently capable attacker commonly referred to as a \"man in the middle"
-"\" (MITM). However, such an attacker can <emphasis>not</emphasis> modify "
-"the communication to compromise the security of your system, as APT's data "
-"security model is independent of the chosen transport method. This is "
+"sufficiently capable attacker commonly referred to as a \"man in the "
+"middle\" (MITM). However, such an attacker can <emphasis>not</emphasis> "
+"modify the communication to compromise the security of your system, as APT's "
+"data security model is independent of the chosen transport method. This is "
"explained in detail in &apt-secure;. An overview of available transport "
"methods is given in &sources-list;."
msgstr ""
@@ -12818,10 +12900,10 @@ msgstr ""
msgid ""
"Both that APT <command>dselect</command> method and <command>apt-get</"
"command> share the same interface. It is a simple system that generally "
-"tells you what it will do and then goes and does it. <placeholder type="
-"\"footnote\" id=\"0\"/> After printing out a summary of what will happen APT "
-"then will print out some informative status messages so that you can "
-"estimate how far along it is and how much is left to do."
+"tells you what it will do and then goes and does it. <placeholder "
+"type=\"footnote\" id=\"0\"/> After printing out a summary of what will "
+"happen APT then will print out some informative status messages so that you "
+"can estimate how far along it is and how much is left to do."
msgstr ""
"Sowohl diese APT-Methode <command>dselect</command> als auch <command>apt-"
"get</command> benutzen die gleiche Schnittstelle. Es ist ein einfaches "
@@ -12958,10 +13040,10 @@ msgstr ""
msgid ""
"There are two ways a system can get into a broken state like this. The first "
"is caused by <command>dpkg</command> missing some subtle relationships "
-"between packages when performing upgrades. <placeholder type=\"footnote\" id="
-"\"0\"/>. The second is if a package installation fails during an operation. "
-"In this situation a package may have been unpacked without its dependents "
-"being installed."
+"between packages when performing upgrades. <placeholder type=\"footnote\" "
+"id=\"0\"/>. The second is if a package installation fails during an "
+"operation. In this situation a package may have been unpacked without its "
+"dependents being installed."
msgstr ""
"Es gibt zwei Möglichkeiten, wie ein System in einen kaputten Status wie "
"diesen kommen kann. Die erste wird dadurch verursacht, dass <command>dpkg</"
diff --git a/doc/po/es.po b/doc/po/es.po
index 20f2f30fa..2d992b07e 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: 2022-01-06 20:58+0100\n"
+"POT-Creation-Date: 2022-02-22 20:01+0100\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"
@@ -447,13 +447,24 @@ msgstr ""
#. type: Plain text
#: apt.ent
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
+#| " <listitem><para>File fragments for the trusted keys, additional keyrings can\n"
+#| " be stored here (by other packages or the administrator).\n"
+#| " Configuration Item <literal>Dir::Etc::TrustedParts</literal>.</para></listitem>\n"
+#| " </varlistentry>\n"
+#| "\">\n"
msgid ""
" <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
" <listitem><para>File fragments for the trusted keys, additional keyrings can\n"
" be stored here (by other packages or the administrator).\n"
" 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 ""
" <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
@@ -864,15 +875,15 @@ msgstr ""
#: apt.8.xml
msgid ""
"<option>satisfy</option> satisfies dependency strings, as used in Build-"
-"Depends. It also handles conflicts, by prefixing an argument with <literal>"
-"\"Conflicts: \"</literal>."
+"Depends. It also handles conflicts, by prefixing an argument with "
+"<literal>\"Conflicts: \"</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.8.xml
msgid ""
-"Example: <literal>apt satisfy \"foo, bar (>= 1.0)\" \"Conflicts: baz, fuzz"
-"\"</literal>"
+"Example: <literal>apt satisfy \"foo, bar (>= 1.0)\" \"Conflicts: baz, "
+"fuzz\"</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
@@ -1482,9 +1493,9 @@ msgstr ""
#| "<literal>changelog</literal> downloads a package changelog and displays "
#| "it through <command>sensible-pager</command>. The server name and base "
#| "directory is defined in the <literal>APT::Changelogs::Server</literal> "
-#| "variable (e.g. <ulink url=\"http://packages.debian.org/changelogs"
-#| "\">packages.debian.org/changelogs</ulink> for Debian or <ulink url="
-#| "\"https://changelogs.ubuntu.com/changelogs\">changelogs.ubuntu.com/"
+#| "variable (e.g. <ulink url=\"http://packages.debian.org/"
+#| "changelogs\">packages.debian.org/changelogs</ulink> for Debian or <ulink "
+#| "url=\"https://changelogs.ubuntu.com/changelogs\">changelogs.ubuntu.com/"
#| "changelogs</ulink> for Ubuntu). By default it displays the changelog for "
#| "the version that is installed. However, you can specify the same options "
#| "as for the <option>install</option> command."
@@ -1497,13 +1508,13 @@ msgstr ""
"<literal>changelog</literal> descarga un fichero de registro de cambios "
"«changelog» de un paquete dado y lo muestra a través de <command>sensible-"
"pager</command>. El nombre de servidor y el directorio base se define con la "
-"variable <literal>APT::Changelogs::Server</literal> (por ejemplo, <ulink url="
-"\"http://packages.debian.org/changelogs\">packages.debian.org/changelogs</"
-"ulink> para Debian o <ulink url=\"https://changelogs.ubuntu.com/changelogs"
-"\">changelogs.ubuntu.com/changelogs</ulink> para Ubuntu). Por omisión, "
-"muestra el fichero de registro de cambios de la versión instalada. Por otra "
-"parte, puede definir las mismas opciones que con la orden <option>install</"
-"option>."
+"variable <literal>APT::Changelogs::Server</literal> (por ejemplo, <ulink "
+"url=\"http://packages.debian.org/changelogs\">packages.debian.org/"
+"changelogs</ulink> para Debian o <ulink url=\"https://changelogs.ubuntu.com/"
+"changelogs\">changelogs.ubuntu.com/changelogs</ulink> para Ubuntu). Por "
+"omisión, muestra el fichero de registro de cambios de la versión instalada. "
+"Por otra parte, puede definir las mismas opciones que con la orden "
+"<option>install</option>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml
@@ -2612,8 +2623,8 @@ msgid ""
"GivenOnly</literal> option."
msgstr ""
"<literal>dotty</literal> toma una lista de paquetes de la línea de ordenes y "
-"genera una salida apropiada para su uso con dotty, del paquete <ulink url="
-"\"http://www.research.att.com/sw/tools/graphviz/\">GraphViz</ulink>. El "
+"genera una salida apropiada para su uso con dotty, del paquete <ulink "
+"url=\"http://www.research.att.com/sw/tools/graphviz/\">GraphViz</ulink>. El "
"resultado será un conjunto de nodos y uniones representando las relaciones "
"entre los paquetes. De forma predeterminada, los paquetes proporcionados "
"mostrarán todas sus dependencias, lo que puede producir un grafo muy grande. "
@@ -2643,12 +2654,13 @@ msgstr "Tenga cuidado, dotty no puede dibujar grandes conjuntos de paquetes."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cache.8.xml
msgid ""
-"The same as <literal>dotty</literal>, only for xvcg from the <ulink url="
-"\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>."
-msgstr ""
-"Lo mismo que <literal>dotty</literal>, sólo para xvcg de la <ulink url="
-"\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">herramienta VCG</"
+"The same as <literal>dotty</literal>, only for xvcg from the <ulink "
+"url=\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</"
"ulink>."
+msgstr ""
+"Lo mismo que <literal>dotty</literal>, sólo para xvcg de la <ulink "
+"url=\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">herramienta "
+"VCG</ulink>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml
@@ -3109,6 +3121,72 @@ msgstr ""
"<filename>trusted.gpg</filename> es el registro de claves principal, esto "
"es, por ejemplo, que las claves nuevas se añaden a este fichero."
+#. type: Content of: <refentry><refsect1><title>
+#: apt-key.8.xml
+#, fuzzy
+#| msgid "Operation"
+msgid "Deprecation"
+msgstr "Operación"
+
+#. 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;"
@@ -3718,19 +3796,19 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt-secure.8.xml
msgid ""
-"For more background information you might want to review the <ulink url="
-"\"https://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
+"For more background information you might want to review the <ulink "
+"url=\"https://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
"Security Infrastructure</ulink> chapter of the Securing Debian Manual (also "
"available in the harden-doc package) and the <ulink url=\"http://www."
"cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution HOWTO</"
"ulink> by V. Alex Brennen."
msgstr ""
-"Para más información puede que quiera revisar el capítulo de la <ulink url="
-"\"https://www.debian.org/doc/manuals/securing-debian-howto/"
+"Para más información puede que quiera revisar el capítulo de la <ulink "
+"url=\"https://www.debian.org/doc/manuals/securing-debian-howto/"
"ch7\">Infraestructura de Seguridad de Debian</ulink> del Manual de Seguridad "
-"de Debian (también disponible en el paquete harden-doc) y el <ulink url="
-"\"http://www.cryptnet.net/fdp/crypto/strong_distro.html\" >COMO Fortificar "
-"una Distribución</ulink> de V. Alex Brennen."
+"de Debian (también disponible en el paquete harden-doc) y el <ulink "
+"url=\"http://www.cryptnet.net/fdp/crypto/strong_distro.html\" >COMO "
+"Fortificar una Distribución</ulink> de V. Alex Brennen."
#. type: Content of: <refentry><refsect1><title>
#: apt-secure.8.xml
@@ -4156,9 +4234,9 @@ msgstr ""
#| "tools such as bind and dhcp use. Lines starting with <literal>//</"
#| "literal> are treated as comments (ignored), as well as all text between "
#| "<literal>/*</literal> and <literal>*/</literal>, just like C/C++ "
-#| "comments. Each line is of the form <literal>APT::Get::Assume-Yes \"true"
-#| "\";</literal>. The quotation marks and trailing semicolon are required. "
-#| "The value must be on one line, and there is no kind of string "
+#| "comments. Each line is of the form <literal>APT::Get::Assume-Yes "
+#| "\"true\";</literal>. The quotation marks and trailing semicolon are "
+#| "required. The value must be on one line, and there is no kind of string "
#| "concatenation. Values must not include backslashes or extra quotation "
#| "marks. Option names are made up of alphanumeric characters and the "
#| "characters \"/-:._+\". A new scope can be opened with curly braces, like "
@@ -4893,10 +4971,10 @@ msgid ""
"literal> script in the configuration file. This entry specifies the commands "
"to send to tell the proxy server what to connect to. Please see "
"&configureindex; for an example of how to do this. The substitution "
-"variables representing the corresponding URI component are <literal>"
-"$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, <literal>"
-"$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, <literal>$(SITE)</"
-"literal> and <literal>$(SITE_PORT)</literal>."
+"variables representing the corresponding URI component are "
+"<literal>$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, "
+"<literal>$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, "
+"<literal>$(SITE)</literal> and <literal>$(SITE_PORT)</literal>."
msgstr ""
"<literal>ftp::Proxy</literal> define el proxy predeterminado que utilizar "
"para los URI de FTP. Utiliza el formato estándar <literal>ftp://[[usuario][:"
@@ -5039,8 +5117,8 @@ msgstr ""
"métodos de «acquire» pueden descomprimir los ficheros comprimidos en "
"<command>bzip2</command>, <command>lzma</command> y <command>gzip</command>, "
"y con esta opción se pueden añadir más formatos en el momento, o cambiar el "
-"método usado. La sintaxis para esto es: <placeholder type=\"synopsis\" id="
-"\"0\"/>"
+"método usado. La sintaxis para esto es: <placeholder type=\"synopsis\" "
+"id=\"0\"/>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
#: apt.conf.5.xml
@@ -5096,8 +5174,8 @@ msgstr ""
"<command>gzip</command> antes que con <command>bzip2</command> y "
"<command>lzma</command>. Si se prefiere <command>lzma</command> antes que "
"<command>gzip</command> y <command>bzip2</command>, la opción de "
-"configuración debería parecerse a esto <placeholder type=\"synopsis\" id="
-"\"1\"/> No es necesario añadir <literal>bz2</literal> a la lista de forma "
+"configuración debería parecerse a esto <placeholder type=\"synopsis\" "
+"id=\"1\"/> No es necesario añadir <literal>bz2</literal> a la lista de forma "
"explícita ya que se añadirá de forma automática."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
@@ -5136,8 +5214,8 @@ msgstr ""
"Tenga en cuenta que <literal>Dir::Bin::<replaceable>método</replaceable></"
"literal> se comprueba en tiempo de ejecución. Si se define esta opción, el "
"método se usará solo si este fichero existe; por ejemplo, la opción para el "
-"método <literal>bzip2</literal> (integrado) es: <placeholder type="
-"\"literallayout\" id=\"0\"/>. Tenga en cuenta que las entradas para la "
+"método <literal>bzip2</literal> (integrado) es: <placeholder "
+"type=\"literallayout\" id=\"0\"/>. Tenga en cuenta que las entradas para la "
"lista definidas en la línea de órdenes se añadirán al final de la lista "
"definida en los ficheros de configuración, pero antes que las entradas "
"predefinidas. Si prefiere un tipo sobre otro definido en los ficheros de "
@@ -5213,8 +5291,8 @@ msgid ""
"specifies the languages. So the following example configuration will result "
"in the order \"en, de\" in an English locale or \"de, en\" in a German one. "
"Note that \"fr\" is downloaded, but not used unless APT is used in a French "
-"locale (where the order would be \"fr, de, en\"). <placeholder type="
-"\"programlisting\" id=\"0\"/>"
+"locale (where the order would be \"fr, de, en\"). <placeholder "
+"type=\"programlisting\" id=\"0\"/>"
msgstr ""
"La lista predeterminada incluye «environment» y «en». «<literal>environment</"
"literal>» tiene aquí un significado especial: se sustituye en tiempo de "
@@ -5231,8 +5309,8 @@ msgstr ""
"configuración en el orden «en, de» para una configuración local en inglés, o "
"«de, en» para una en alemán. Tenga en cuenta que se descarga «fr», pero no "
"se utiliza a menos que se utilice APT bajo una configuración local en "
-"francés (donde el orden sería «fr, de, en»). <placeholder type="
-"\"programlisting\" id=\"0\"/>"
+"francés (donde el orden sería «fr, de, en»). <placeholder "
+"type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml
@@ -6270,8 +6348,9 @@ msgid ""
"in the APT configuration file <filename>/etc/apt/apt.conf</filename>. Note "
"that this has precedence over any general priority you set in the <filename>/"
"etc/apt/preferences</filename> file described later, but not over "
-"specifically pinned packages. For example, <placeholder type="
-"\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>"
+"specifically pinned packages. For example, <placeholder "
+"type=\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" "
+"id=\"1\"/>"
msgstr ""
"De no existir el fichero de preferencias, o si no hay ninguna entrada en "
"éste que se pueda aplicar a una determinada versión, se asigna a la versión "
@@ -6283,8 +6362,8 @@ msgstr ""
"configuración de APT <filename>/etc/apt/apt.conf</filename>. Tenga en cuenta "
"que esto tiene preferencia sobre cualquier otra prioridad definida en "
"<filename>/etc/apt/preferencias</filename>, pero que no afecta al anclaje de "
-"paquetes específicos. Por ejemplo, <placeholder type=\"programlisting\" id="
-"\"0\"/><placeholder type=\"programlisting\" id=\"1\"/>"
+"paquetes específicos. Por ejemplo, <placeholder type=\"programlisting\" "
+"id=\"0\"/><placeholder type=\"programlisting\" id=\"1\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml
@@ -6644,8 +6723,8 @@ msgid ""
"This should <emphasis>not</emphasis> be confused with the Origin of a "
"distribution as specified in a <filename>Release</filename> file. What "
"follows the \"Origin:\" tag in a <filename>Release</filename> file is not an "
-"Internet address but an author or vendor name, such as \"Debian\" or \"Ximian"
-"\"."
+"Internet address but an author or vendor name, such as \"Debian\" or "
+"\"Ximian\"."
msgstr ""
"<emphasis>No</emphasis> se debe confundir con el origen («Origin») de una "
"distribución tal y como se especifica un fichero <filename>Release</"
@@ -7454,8 +7533,8 @@ msgstr ""
"Con un fichero «&sources-list;» adecuado y el fichero de preferencias "
"mostrado anteriormente, cualquiera de las siguientes órdenes de APT hace que "
"o bien todo el sistema o bien sólo algunos paquetes se actualicen a la "
-"última versión en <literal>stable</literal>. <placeholder type="
-"\"programlisting\" id=\"0\"/>"
+"última versión en <literal>stable</literal>. <placeholder "
+"type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#: apt_preferences.5.xml
@@ -7473,8 +7552,8 @@ msgid ""
msgstr ""
"La siguiente orden hace que APT actualice un paquete a la última versión de "
"la distribución <literal>testing</literal>, el paquete no se actualizará de "
-"nuevo a menos que se ejecute la orden otra vez. <placeholder type="
-"\"programlisting\" id=\"0\"/>"
+"nuevo a menos que se ejecute la orden otra vez. <placeholder "
+"type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt_preferences.5.xml
@@ -7516,8 +7595,8 @@ msgid ""
"to package versions from the <literal>testing</literal> distribution, a "
"lower priority to package versions from the <literal>unstable</literal> "
"distribution, and a prohibitively low priority to package versions from "
-"other <literal>Debian</literal> distributions. <placeholder type="
-"\"programlisting\" id=\"0\"/>"
+"other <literal>Debian</literal> distributions. <placeholder "
+"type=\"programlisting\" id=\"0\"/>"
msgstr ""
"El siguiente fichero de preferencias de APT provocará que APT asigne mayor "
"prioridad a las versiones de la distribución <literal>testing</literal>, una "
@@ -7627,8 +7706,8 @@ msgstr ""
"<literal>stable</literal> y por último <literal>oldstable</literal>. Si "
"desea seguir, por ejemplo, el progreso en <literal>testing</literal> "
"obviando el nombre de la publicación, debería usar los ejemplos de "
-"configuración mencionados anteriormente. <placeholder type=\"programlisting"
-"\" id=\"0\"/>"
+"configuración mencionados anteriormente. <placeholder "
+"type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml
@@ -7641,8 +7720,8 @@ msgstr ""
"Con un fichero «&sources-list;» adecuado y el fichero de preferencias "
"mostrado anteriormente, cualquiera de las siguientes órdenes provocará que "
"APT actualice los paquetes a la última versión de la distribución llamada "
-"<literal>&debian-testing-codename;</literal>. <placeholder type="
-"\"programlisting\" id=\"0\"/>"
+"<literal>&debian-testing-codename;</literal>. <placeholder "
+"type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#: apt_preferences.5.xml
@@ -7945,13 +8024,13 @@ msgstr ""
#: sources.list.5.xml
#, fuzzy
#| msgid ""
-#| "<literal>distribution</literal> may also contain a variable, <literal>"
-#| "$(ARCH)</literal> which expands to the Debian architecture (such as "
-#| "<literal>amd64</literal> or <literal>armel</literal>) used on the system. "
-#| "This permits architecture-independent <filename>sources.list</filename> "
-#| "files to be used. In general this is only of interest when specifying an "
-#| "exact path, <literal>APT</literal> will automatically generate a URI with "
-#| "the current architecture otherwise."
+#| "<literal>distribution</literal> may also contain a variable, "
+#| "<literal>$(ARCH)</literal> which expands to the Debian architecture (such "
+#| "as <literal>amd64</literal> or <literal>armel</literal>) used on the "
+#| "system. This permits architecture-independent <filename>sources.list</"
+#| "filename> files to be used. In general this is only of interest when "
+#| "specifying an exact path, <literal>APT</literal> will automatically "
+#| "generate a URI with the current architecture otherwise."
msgid ""
"<literal>suite</literal> may also contain a variable, <literal>$(ARCH)</"
"literal> which expands to the Debian architecture (such as <literal>amd64</"
@@ -7961,14 +8040,14 @@ msgid ""
"<literal>APT</literal> will automatically generate a URI with the current "
"architecture otherwise."
msgstr ""
-"<literal>distribución</literal> puede contener una variable, <literal>"
-"$(ARCH)</literal>, que se expandirá a la arquitectura de Debian usada en el "
-"sistema (por ejemplo, <literal>amd64</literal> o <literal>armel</literal>). "
-"Esto permite que los ficheros <filename>sources.list</filename> sean "
-"independientes de la arquitectura. En general, esta característica sólo es "
-"de interés si se especifica una ruta completa, de lo contrario <literal>APT</"
-"literal> generará automáticamente una URI con la arquitectura actual del "
-"sistema."
+"<literal>distribución</literal> puede contener una variable, "
+"<literal>$(ARCH)</literal>, que se expandirá a la arquitectura de Debian "
+"usada en el sistema (por ejemplo, <literal>amd64</literal> o <literal>armel</"
+"literal>). Esto permite que los ficheros <filename>sources.list</filename> "
+"sean independientes de la arquitectura. En general, esta característica sólo "
+"es de interés si se especifica una ruta completa, de lo contrario "
+"<literal>APT</literal> generará automáticamente una URI con la arquitectura "
+"actual del sistema."
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml
@@ -8213,20 +8292,23 @@ 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 "
-"<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 "
-"keyrings are selected. A fingerprint will accept also all signatures by a "
-"subkey of this key, if this isn't desired an exclamation mark (<literal>!</"
-"literal>) can be appended to the fingerprint to disable this behaviour. The "
-"option defaults to the value of the option with the same name if set in the "
-"previously acquired <filename>Release</filename> file of this repository "
-"(only fingerprints can be specified there through). Otherwise all keys in "
-"the trusted keyrings are considered valid signers for this repository. The "
-"option may also be set directly to an embedded GPG public key block. Special "
-"care is needed to encode the empty line with leading spaces and \".\": "
-"<placeholder type=\"literallayout\" id=\"0\"/>"
+"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 keyrings are selected. A "
+"fingerprint will accept also all signatures by a subkey of this key, if this "
+"isn't desired an exclamation mark (<literal>!</literal>) can be appended to "
+"the fingerprint to disable this behaviour. The option defaults to the value "
+"of the option with the same name if set in the previously acquired "
+"<filename>Release</filename> file of this repository (only fingerprints can "
+"be specified there through). Otherwise all keys in the trusted keyrings are "
+"considered valid signers for this repository. The option may also be set "
+"directly to an embedded GPG public key block. Special care is needed to "
+"encode the empty line with leading spaces and \".\": <placeholder "
+"type=\"literallayout\" id=\"0\"/>"
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
@@ -8746,8 +8828,8 @@ msgstr ""
#| "i386</filename> on i386 machines, <filename>unstable/binary-amd64</"
#| "filename> on amd64, and so forth for other supported architectures. [Note "
#| "this example only illustrates how to use the substitution variable; "
-#| "official debian archives are not structured like this] <placeholder type="
-#| "\"literallayout\" id=\"0\"/>"
+#| "official debian archives are not structured like this] <placeholder "
+#| "type=\"literallayout\" id=\"0\"/>"
msgid ""
"Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
"directory, and uses only files found under <filename>unstable/binary-i386</"
@@ -9361,14 +9443,14 @@ msgid ""
"Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
"$(SECTION)/binary-$(ARCH)/</filename>"
msgstr ""
-"Define la raíz del directorio «.deb». El valor predeterminado es <filename>"
-"$(DIST)/$(SECTION)/binary-$(ARCH)/</filename>"
+"Define la raíz del directorio «.deb». El valor predeterminado es "
+"<filename>$(DIST)/$(SECTION)/binary-$(ARCH)/</filename>"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml
msgid ""
-"Sets the top of the source package directory tree. Defaults to <filename>"
-"$(DIST)/$(SECTION)/source/</filename>"
+"Sets the top of the source package directory tree. Defaults to "
+"<filename>$(DIST)/$(SECTION)/source/</filename>"
msgstr ""
"Define la raíz del directorio de los paquetes de fuentes. El valor "
"predeterminado es <filename>$(DIST)/$(SECTION)/source/</filename>"
@@ -9379,8 +9461,8 @@ msgid ""
"Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
"binary-$(ARCH)/Packages</filename>"
msgstr ""
-"Define el fichero «Packages» de salida. El valor predeterminado es <filename>"
-"$(DIST)/$(SECTION)/binary-$(ARCH)/Packages</filename>"
+"Define el fichero «Packages» de salida. El valor predeterminado es "
+"<filename>$(DIST)/$(SECTION)/binary-$(ARCH)/Packages</filename>"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml
@@ -9388,15 +9470,15 @@ msgid ""
"Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
"source/Sources</filename>"
msgstr ""
-"Define el fichero «Sources» de salida. El valor predeterminado es <filename>"
-"$(DIST)/$(SECTION)/source/Sources</filename>"
+"Define el fichero «Sources» de salida. El valor predeterminado es "
+"<filename>$(DIST)/$(SECTION)/source/Sources</filename>"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml
msgid ""
"Sets the output Translation-en master file with the long descriptions if "
-"they should be not included in the Packages file. Defaults to <filename>"
-"$(DIST)/$(SECTION)/i18n/Translation-en</filename>"
+"they should be not included in the Packages file. Defaults to "
+"<filename>$(DIST)/$(SECTION)/i18n/Translation-en</filename>"
msgstr ""
"Define el fichero maestro «Translation-en» que contiene las descripciones "
"largas en el caso de que no se incluyan en el fichero «Packages». El valor "
@@ -9422,9 +9504,9 @@ msgid ""
"ftparchive</command> will integrate those package files together "
"automatically."
msgstr ""
-"Define el fichero «Contents» de salida. El valor predeterminado es <filename>"
-"$(DIST)/Contents-$(ARCH)</filename>. Si este valor provoca que varios "
-"ficheros «Packages» se relacionen con un único fichero «Contents» (el "
+"Define el fichero «Contents» de salida. El valor predeterminado es "
+"<filename>$(DIST)/Contents-$(ARCH)</filename>. Si este valor provoca que "
+"varios ficheros «Packages» se relacionen con un único fichero «Contents» (el "
"comportamiento predeterminado), <command>apt-ftparchive</command> integrará "
"automáticamente esos ficheros de paquete."
@@ -9531,8 +9613,8 @@ msgstr ""
#: apt-ftparchive.1.xml
msgid ""
"When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
-"command> performs an operation similar to: <placeholder type=\"programlisting"
-"\" id=\"0\"/>"
+"command> performs an operation similar to: <placeholder "
+"type=\"programlisting\" id=\"0\"/>"
msgstr ""
"Cuando se procesa una sección <literal>Tree</literal> <command>apt-"
"ftparchive</command> realiza una operación similar a la siguiente: "
@@ -9687,19 +9769,20 @@ msgstr "nueva"
#. type: Content of: <refentry><refsect1><para>
#: apt-ftparchive.1.xml
msgid ""
-"The general form of the maintainer field is: <placeholder type="
-"\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
-"id=\"1\"/> The first form allows a double-slash separated list of old email "
-"addresses to be specified. If any of those are found then new is substituted "
-"for the maintainer field. The second form unconditionally substitutes the "
-"maintainer field."
-msgstr ""
-"La forma general del campo del mantenedor es: <placeholder type="
-"\"literallayout\" id=\"0\"/> o simplemente <placeholder type=\"literallayout"
-"\" id=\"1\"/> La primera forma permite una lista separada por barras dobles "
-"de las direcciones de correo electrónico antiguas a definir. Si se encuentra "
-"cualquier de ellas «nueva» se sustituye por el campo del mantenedor. La "
-"segunda forma sustituye de forma incondicional el campo del mantenedor."
+"The general form of the maintainer field is: <placeholder "
+"type=\"literallayout\" id=\"0\"/> or simply, <placeholder "
+"type=\"literallayout\" id=\"1\"/> The first form allows a double-slash "
+"separated list of old email addresses to be specified. If any of those are "
+"found then new is substituted for the maintainer field. The second form "
+"unconditionally substitutes the maintainer field."
+msgstr ""
+"La forma general del campo del mantenedor es: <placeholder "
+"type=\"literallayout\" id=\"0\"/> o simplemente <placeholder "
+"type=\"literallayout\" id=\"1\"/> La primera forma permite una lista "
+"separada por barras dobles de las direcciones de correo electrónico antiguas "
+"a definir. Si se encuentra cualquier de ellas «nueva» se sustituye por el "
+"campo del mantenedor. La segunda forma sustituye de forma incondicional el "
+"campo del mantenedor."
#. type: Content of: <refentry><refsect1><title>
#: apt-ftparchive.1.xml
@@ -10078,8 +10161,8 @@ msgid ""
"password <literal>debian</literal> for the &sources-list; entry <placeholder "
"type=\"literallayout\" id=\"0\"/> could be done in the entry directly: "
"<placeholder type=\"literallayout\" id=\"1\"/> Alternatively an entry like "
-"the following in the auth.conf file could be used: <placeholder type="
-"\"literallayout\" id=\"2\"/> Or alternatively within a single line: "
+"the following in the auth.conf file could be used: <placeholder "
+"type=\"literallayout\" id=\"2\"/> Or alternatively within a single line: "
"<placeholder type=\"literallayout\" id=\"3\"/> If you need to be more "
"specific all of these lines will also apply to the example entry: "
"<placeholder type=\"literallayout\" id=\"4\"/> On the other hand neither of "
@@ -10178,10 +10261,10 @@ msgstr ""
msgid ""
"HTTP is an unencrypted transport protocol meaning that the whole "
"communication with the remote server (or proxy) can be observed by a "
-"sufficiently capable attacker commonly referred to as a \"man in the middle"
-"\" (MITM). However, such an attacker can <emphasis>not</emphasis> modify "
-"the communication to compromise the security of your system, as APT's data "
-"security model is independent of the chosen transport method. This is "
+"sufficiently capable attacker commonly referred to as a \"man in the "
+"middle\" (MITM). However, such an attacker can <emphasis>not</emphasis> "
+"modify the communication to compromise the security of your system, as APT's "
+"data security model is independent of the chosen transport method. This is "
"explained in detail in &apt-secure;. An overview of available transport "
"methods is given in &sources-list;."
msgstr ""
@@ -12147,10 +12230,10 @@ msgstr ""
msgid ""
"Both that APT <command>dselect</command> method and <command>apt-get</"
"command> share the same interface. It is a simple system that generally "
-"tells you what it will do and then goes and does it. <placeholder type="
-"\"footnote\" id=\"0\"/> After printing out a summary of what will happen APT "
-"then will print out some informative status messages so that you can "
-"estimate how far along it is and how much is left to do."
+"tells you what it will do and then goes and does it. <placeholder "
+"type=\"footnote\" id=\"0\"/> After printing out a summary of what will "
+"happen APT then will print out some informative status messages so that you "
+"can estimate how far along it is and how much is left to do."
msgstr ""
"El método <command>dselect</command> de APT y <command>apt-get</command> "
"comparten la misma interfaz. Es un sencillo programa que le informa de lo "
@@ -12280,17 +12363,18 @@ msgstr ""
msgid ""
"There are two ways a system can get into a broken state like this. The first "
"is caused by <command>dpkg</command> missing some subtle relationships "
-"between packages when performing upgrades. <placeholder type=\"footnote\" id="
-"\"0\"/>. The second is if a package installation fails during an operation. "
-"In this situation a package may have been unpacked without its dependents "
-"being installed."
+"between packages when performing upgrades. <placeholder type=\"footnote\" "
+"id=\"0\"/>. The second is if a package installation fails during an "
+"operation. In this situation a package may have been unpacked without its "
+"dependents being installed."
msgstr ""
"Hay dos formas de que el sistema tenga un estado roto como éste. El primero "
"es causado por la omisión de <command>dpkg</command> de ciertas relaciones "
-"delicadas entre paquetes al realizar una actualización. <placeholder type="
-"\"footnote\" id=\"0\"/>. El segundo ocurre se la instalación de un paquete "
-"falla durante la operación. En esta situación puede que un paquete se haya "
-"desempaquetado sin que sus dependencias estuviesen instaladas previamente."
+"delicadas entre paquetes al realizar una actualización. <placeholder "
+"type=\"footnote\" id=\"0\"/>. El segundo ocurre se la instalación de un "
+"paquete falla durante la operación. En esta situación puede que un paquete "
+"se haya desempaquetado sin que sus dependencias estuviesen instaladas "
+"previamente."
#. type: Content of: <book><chapter><section><para>
#: guide.dbk
diff --git a/doc/po/fr.po b/doc/po/fr.po
index 1a4ae8415..005f5a356 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: 2022-01-06 20:58+0100\n"
+"POT-Creation-Date: 2022-02-22 20:01+0100\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"
@@ -412,13 +412,24 @@ msgstr ""
#. type: Plain text
#: apt.ent
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
+#| " <listitem><para>File fragments for the trusted keys, additional keyrings can\n"
+#| " be stored here (by other packages or the administrator).\n"
+#| " Configuration Item <literal>Dir::Etc::TrustedParts</literal>.</para></listitem>\n"
+#| " </varlistentry>\n"
+#| "\">\n"
msgid ""
" <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
" <listitem><para>File fragments for the trusted keys, additional keyrings can\n"
" be stored here (by other packages or the administrator).\n"
" 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 ""
" <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
@@ -809,15 +820,15 @@ msgstr ""
#: apt.8.xml
msgid ""
"<option>satisfy</option> satisfies dependency strings, as used in Build-"
-"Depends. It also handles conflicts, by prefixing an argument with <literal>"
-"\"Conflicts: \"</literal>."
+"Depends. It also handles conflicts, by prefixing an argument with "
+"<literal>\"Conflicts: \"</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.8.xml
msgid ""
-"Example: <literal>apt satisfy \"foo, bar (>= 1.0)\" \"Conflicts: baz, fuzz"
-"\"</literal>"
+"Example: <literal>apt satisfy \"foo, bar (>= 1.0)\" \"Conflicts: baz, "
+"fuzz\"</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
@@ -2571,8 +2582,9 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cache.8.xml
msgid ""
-"The same as <literal>dotty</literal>, only for xvcg from the <ulink url="
-"\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>."
+"The same as <literal>dotty</literal>, only for xvcg from the <ulink "
+"url=\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</"
+"ulink>."
msgstr ""
"Identique à <literal>dotty</literal>, mais réservé à xvcg fourni avec <ulink "
"url=\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</"
@@ -3081,6 +3093,72 @@ msgstr ""
"gpg</filename> reste le fichier principal pour les clés donc, par exemple, "
"les nouvelles clés y seront ajoutées."
+#. type: Content of: <refentry><refsect1><title>
+#: apt-key.8.xml
+#, fuzzy
+#| msgid "Operation"
+msgid "Deprecation"
+msgstr "Fonctionnement"
+
+#. 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;"
@@ -3699,15 +3777,15 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt-secure.8.xml
msgid ""
-"For more background information you might want to review the <ulink url="
-"\"https://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
+"For more background information you might want to review the <ulink "
+"url=\"https://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
"Security Infrastructure</ulink> chapter of the Securing Debian Manual (also "
"available in the harden-doc package) and the <ulink url=\"http://www."
"cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution HOWTO</"
"ulink> by V. Alex Brennen."
msgstr ""
-"Pour des informations plus complètes, vous pouvez consulter <ulink url="
-"\"https://www.debian.org/doc/manuals/securing-debian-howto/ch7\"> "
+"Pour des informations plus complètes, vous pouvez consulter <ulink "
+"url=\"https://www.debian.org/doc/manuals/securing-debian-howto/ch7\"> "
"l'infrastructure debian pour la sécurité</ulink> un chapitre du manuel "
"Debian sur la sécurité (disponible dans le paquet harden-doc) et le <ulink "
"url=\"http://www.cryptnet.net/fdp/crypto/strong_distro.html\">Strong "
@@ -4074,8 +4152,8 @@ msgid ""
"be silently ignored."
msgstr ""
"tous les fichiers de <literal>Dir::Etc::Parts</literal> dans l'ordre "
-"alphanumérique ascendant qui ont soit l'extension \"<literal>conf</literal>"
-"\", soit aucune extension et qui ne contiennent que des caractères "
+"alphanumérique ascendant qui ont soit l'extension \"<literal>conf</"
+"literal>\", soit aucune extension et qui ne contiennent que des caractères "
"alphanumériques, des tirets (-), des caractères de soulignement (_) et des "
"points (.), les autres fichiers étant ignorés. Dans le cas contraire, APT "
"affichera un avertissement indiquant qu'il a ignoré un fichier si celui-ci "
@@ -4137,9 +4215,9 @@ msgstr ""
#| "tools such as bind and dhcp use. Lines starting with <literal>//</"
#| "literal> are treated as comments (ignored), as well as all text between "
#| "<literal>/*</literal> and <literal>*/</literal>, just like C/C++ "
-#| "comments. Each line is of the form <literal>APT::Get::Assume-Yes \"true"
-#| "\";</literal>. The quotation marks and trailing semicolon are required. "
-#| "The value must be on one line, and there is no kind of string "
+#| "comments. Each line is of the form <literal>APT::Get::Assume-Yes "
+#| "\"true\";</literal>. The quotation marks and trailing semicolon are "
+#| "required. The value must be on one line, and there is no kind of string "
#| "concatenation. Values must not include backslashes or extra quotation "
#| "marks. Option names are made up of alphanumeric characters and the "
#| "characters \"/-:._+\". A new scope can be opened with curly braces, like "
@@ -4897,10 +4975,10 @@ msgid ""
"literal> script in the configuration file. This entry specifies the commands "
"to send to tell the proxy server what to connect to. Please see "
"&configureindex; for an example of how to do this. The substitution "
-"variables representing the corresponding URI component are <literal>"
-"$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, <literal>"
-"$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, <literal>$(SITE)</"
-"literal> and <literal>$(SITE_PORT)</literal>."
+"variables representing the corresponding URI component are "
+"<literal>$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, "
+"<literal>$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, "
+"<literal>$(SITE)</literal> and <literal>$(SITE_PORT)</literal>."
msgstr ""
"<literal>ftp::Proxy</literal> est le mandataire (proxy) FTP à utiliser par "
"défaut pour les URI FTP. Il se présente sous la forme standard : "
@@ -4916,9 +4994,9 @@ msgstr ""
"pour lui préciser à quoi il doit se connecter. Voyez &configureindex; pour "
"savoir comment faire. Les variables de substitution qui représentent le "
"composant d'URI correspondant sont : <literal>$(PROXY_USER)</literal>, "
-"<literal>$(PROXY_PASS)</literal>, <literal>$(SITE_USER)</literal>, <literal>"
-"$(SITE_PASS)</literal>, <literal>$(SITE)</literal> et <literal>$(SITE_PORT)</"
-"literal>."
+"<literal>$(PROXY_PASS)</literal>, <literal>$(SITE_USER)</literal>, "
+"<literal>$(SITE_PASS)</literal>, <literal>$(SITE)</literal> et "
+"<literal>$(SITE_PORT)</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml
@@ -5041,8 +5119,8 @@ msgstr ""
"<command>gzip</command> ; ce champ d'action permet de rechercher les formats "
"pris en charge ou de les modifier, et l'ajout de prise en charge de formats "
"supplémentaires est aussi possible (voir aussi <option>APT::Compressor</"
-"option>). La syntaxe à utiliser est : <placeholder type=\"synopsis\" id="
-"\"0\"/>"
+"option>). La syntaxe à utiliser est : <placeholder type=\"synopsis\" "
+"id=\"0\"/>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
#: apt.conf.5.xml
@@ -5193,8 +5271,8 @@ msgid ""
"specifies the languages. So the following example configuration will result "
"in the order \"en, de\" in an English locale or \"de, en\" in a German one. "
"Note that \"fr\" is downloaded, but not used unless APT is used in a French "
-"locale (where the order would be \"fr, de, en\"). <placeholder type="
-"\"programlisting\" id=\"0\"/>"
+"locale (where the order would be \"fr, de, en\"). <placeholder "
+"type=\"programlisting\" id=\"0\"/>"
msgstr ""
"La liste par défaut contient « environment » et « en ». La valeur "
"« environment » a une signification spéciale : elle sera remplacée, à "
@@ -6331,8 +6409,9 @@ msgid ""
"in the APT configuration file <filename>/etc/apt/apt.conf</filename>. Note "
"that this has precedence over any general priority you set in the <filename>/"
"etc/apt/preferences</filename> file described later, but not over "
-"specifically pinned packages. For example, <placeholder type="
-"\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>"
+"specifically pinned packages. For example, <placeholder "
+"type=\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" "
+"id=\"1\"/>"
msgstr ""
"Quand le fichier des préférences n'existe pas, ou quand aucune entrée de ce "
"fichier ne s'applique à une version précise, la priorité affectée à cette "
@@ -6341,8 +6420,9 @@ msgstr ""
"celle des autres distributions : on l'appelle la distribution par défaut ou "
"« target release » et elle peut être définie sur la ligne de commande de "
"<command>apt-get</command> ou dans le fichier de configuration d'APT, "
-"<filename>/etc/apt/apt.conf</filename>. Par exemple : <placeholder type="
-"\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>"
+"<filename>/etc/apt/apt.conf</filename>. Par exemple : <placeholder "
+"type=\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" "
+"id=\"1\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml
@@ -6693,8 +6773,8 @@ msgid ""
"This should <emphasis>not</emphasis> be confused with the Origin of a "
"distribution as specified in a <filename>Release</filename> file. What "
"follows the \"Origin:\" tag in a <filename>Release</filename> file is not an "
-"Internet address but an author or vendor name, such as \"Debian\" or \"Ximian"
-"\"."
+"Internet address but an author or vendor name, such as \"Debian\" or "
+"\"Ximian\"."
msgstr ""
"Veuillez noter que le mot-clé utilisé ici, <literal>origin</literal>, ne "
"doit pas être confondu avec l'Origine d'une distribution indiquée dans un "
@@ -7499,8 +7579,8 @@ msgid ""
msgstr ""
"Avec le fichier des préférences ci-dessus et un fichier &sources-list; "
"adéquat, les commandes suivantes utiliseront les versions les plus récentes "
-"de <literal>stable</literal> pour faire la mise à niveau : <placeholder type="
-"\"programlisting\" id=\"0\"/>"
+"de <literal>stable</literal> pour faire la mise à niveau : <placeholder "
+"type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#: apt_preferences.5.xml
@@ -7561,8 +7641,8 @@ msgid ""
"to package versions from the <literal>testing</literal> distribution, a "
"lower priority to package versions from the <literal>unstable</literal> "
"distribution, and a prohibitively low priority to package versions from "
-"other <literal>Debian</literal> distributions. <placeholder type="
-"\"programlisting\" id=\"0\"/>"
+"other <literal>Debian</literal> distributions. <placeholder "
+"type=\"programlisting\" id=\"0\"/>"
msgstr ""
"Le fichier des préférences suivant affecte une priorité haute aux versions "
"des paquets appartenant à la distribution <literal>testing</literal>, une "
@@ -8084,8 +8164,8 @@ msgid ""
msgstr ""
"À titre d'exemple, les sources de votre distribution au format « One-Line-"
"Style » pourraient ressembler à ceci : <placeholder type=\"literallayout\" "
-"id=\"0\"/> ou à ceci au format de style deb822 : <placeholder type="
-"\"literallayout\" id=\"1\"/>"
+"id=\"0\"/> ou à ceci au format de style deb822 : <placeholder "
+"type=\"literallayout\" id=\"1\"/>"
#. type: Content of: <refentry><refsect1><title>
#: sources.list.5.xml
@@ -8329,20 +8409,23 @@ 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 "
-"<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 "
-"keyrings are selected. A fingerprint will accept also all signatures by a "
-"subkey of this key, if this isn't desired an exclamation mark (<literal>!</"
-"literal>) can be appended to the fingerprint to disable this behaviour. The "
-"option defaults to the value of the option with the same name if set in the "
-"previously acquired <filename>Release</filename> file of this repository "
-"(only fingerprints can be specified there through). Otherwise all keys in "
-"the trusted keyrings are considered valid signers for this repository. The "
-"option may also be set directly to an embedded GPG public key block. Special "
-"care is needed to encode the empty line with leading spaces and \".\": "
-"<placeholder type=\"literallayout\" id=\"0\"/>"
+"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 keyrings are selected. A "
+"fingerprint will accept also all signatures by a subkey of this key, if this "
+"isn't desired an exclamation mark (<literal>!</literal>) can be appended to "
+"the fingerprint to disable this behaviour. The option defaults to the value "
+"of the option with the same name if set in the previously acquired "
+"<filename>Release</filename> file of this repository (only fingerprints can "
+"be specified there through). Otherwise all keys in the trusted keyrings are "
+"considered valid signers for this repository. The option may also be set "
+"directly to an embedded GPG public key block. Special care is needed to "
+"encode the empty line with leading spaces and \".\": <placeholder "
+"type=\"literallayout\" id=\"0\"/>"
msgstr ""
"<option>Signed-By</option> (<option>signed-by</option>) est une option pour "
"demander la vérification d’un dépot par &apt-secure; avec un certain jeu de "
@@ -8950,8 +9033,8 @@ msgstr ""
"de suite pour les autres architectures reconnues. [Notez que cet exemple "
"montre seulement la manière d'utiliser la variable à substituer, les "
"archives Debian officielles n'étant pas structurées de cette manière.] "
-"<placeholder type=\"literallayout\" id=\"0\"/> <placeholder type="
-"\"literallayout\" id=\"1\"/>"
+"<placeholder type=\"literallayout\" id=\"0\"/> <placeholder "
+"type=\"literallayout\" id=\"1\"/>"
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml
@@ -9547,8 +9630,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml
msgid ""
-"Sets the top of the source package directory tree. Defaults to <filename>"
-"$(DIST)/$(SECTION)/source/</filename>"
+"Sets the top of the source package directory tree. Defaults to "
+"<filename>$(DIST)/$(SECTION)/source/</filename>"
msgstr ""
"Indique la racine de l'arborescence des paquets source. Par défaut, c'est "
"<filename>$(DIST)/$(SECTION)/source/</filename>."
@@ -9575,8 +9658,8 @@ msgstr ""
#: apt-ftparchive.1.xml
msgid ""
"Sets the output Translation-en master file with the long descriptions if "
-"they should be not included in the Packages file. Defaults to <filename>"
-"$(DIST)/$(SECTION)/i18n/Translation-en</filename>"
+"they should be not included in the Packages file. Defaults to "
+"<filename>$(DIST)/$(SECTION)/i18n/Translation-en</filename>"
msgstr ""
"Définit le fichier maître Translation-en qui comporte les descriptions "
"longues si elles ne sont pas incluses dans le fichier Packages. Valeur par "
@@ -9706,12 +9789,12 @@ msgstr ""
#: apt-ftparchive.1.xml
msgid ""
"When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
-"command> performs an operation similar to: <placeholder type=\"programlisting"
-"\" id=\"0\"/>"
+"command> performs an operation similar to: <placeholder "
+"type=\"programlisting\" id=\"0\"/>"
msgstr ""
"Quand il exécute la section <literal>Tree</literal>, <command>apt-"
-"ftparchive</command> effectue une opération analogue à : <placeholder type="
-"\"programlisting\" id=\"0\"/>"
+"ftparchive</command> effectue une opération analogue à : <placeholder "
+"type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml
@@ -9869,19 +9952,20 @@ msgstr "new"
#. type: Content of: <refentry><refsect1><para>
#: apt-ftparchive.1.xml
msgid ""
-"The general form of the maintainer field is: <placeholder type="
-"\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
-"id=\"1\"/> The first form allows a double-slash separated list of old email "
-"addresses to be specified. If any of those are found then new is substituted "
-"for the maintainer field. The second form unconditionally substitutes the "
-"maintainer field."
-msgstr ""
-"Le champ du responsable est de cette forme : <placeholder type="
-"\"literallayout\" id=\"0\"/> ou simplement, <placeholder type=\"literallayout"
-"\" id=\"1\"/> La première forme permet de spécifier de vieilles adresses "
-"dans une liste (le séparateur est la double barre oblique). Si l'une de ces "
-"deux formes est rencontrée, la valeur de new remplace la valeur du champ. La "
-"deuxième forme remplace inconditionnellement le champ."
+"The general form of the maintainer field is: <placeholder "
+"type=\"literallayout\" id=\"0\"/> or simply, <placeholder "
+"type=\"literallayout\" id=\"1\"/> The first form allows a double-slash "
+"separated list of old email addresses to be specified. If any of those are "
+"found then new is substituted for the maintainer field. The second form "
+"unconditionally substitutes the maintainer field."
+msgstr ""
+"Le champ du responsable est de cette forme : <placeholder "
+"type=\"literallayout\" id=\"0\"/> ou simplement, <placeholder "
+"type=\"literallayout\" id=\"1\"/> La première forme permet de spécifier de "
+"vieilles adresses dans une liste (le séparateur est la double barre "
+"oblique). Si l'une de ces deux formes est rencontrée, la valeur de new "
+"remplace la valeur du champ. La deuxième forme remplace inconditionnellement "
+"le champ."
#. type: Content of: <refentry><refsect1><title>
#: apt-ftparchive.1.xml
@@ -10301,8 +10385,8 @@ msgid ""
"password <literal>debian</literal> for the &sources-list; entry <placeholder "
"type=\"literallayout\" id=\"0\"/> could be done in the entry directly: "
"<placeholder type=\"literallayout\" id=\"1\"/> Alternatively an entry like "
-"the following in the auth.conf file could be used: <placeholder type="
-"\"literallayout\" id=\"2\"/> Or alternatively within a single line: "
+"the following in the auth.conf file could be used: <placeholder "
+"type=\"literallayout\" id=\"2\"/> Or alternatively within a single line: "
"<placeholder type=\"literallayout\" id=\"3\"/> If you need to be more "
"specific all of these lines will also apply to the example entry: "
"<placeholder type=\"literallayout\" id=\"4\"/> On the other hand neither of "
@@ -10311,14 +10395,15 @@ msgstr ""
"La fourniture d'informations de connexion pour un utilisateur nommé "
"<literal>apt</literal> avec le mot de passe <literal>debian</literal> pour "
"l'entrée de &sources-list; <placeholder type=\"literallayout\" id=\"0\"/> "
-"peut se faire directement dans l'entrée : <placeholder type=\"literallayout"
-"\" id=\"1\"/> Autrement, une entrée dans le fichier auth.conf telle que la "
-"suivante peut être utilisée : <placeholder type=\"literallayout\" id=\"2\"/> "
-"Ou enfin, en une seule ligne : <placeholder type=\"literallayout\" id=\"3\"/"
-">. Si vous avez besoin d'être plus précis, tout le contenu de ces lignes "
-"s'appliquera également à l'entrée d'exemple : <placeholder type="
-"\"literallayout\" id=\"4\"/> En revanche, aucune des lignes suivantes ne "
-"s'applique : <placeholder type=\"literallayout\" id=\"5\"/>"
+"peut se faire directement dans l'entrée : <placeholder "
+"type=\"literallayout\" id=\"1\"/> Autrement, une entrée dans le fichier auth."
+"conf telle que la suivante peut être utilisée : <placeholder "
+"type=\"literallayout\" id=\"2\"/> Ou enfin, en une seule ligne : "
+"<placeholder type=\"literallayout\" id=\"3\"/>. Si vous avez besoin d'être "
+"plus précis, tout le contenu de ces lignes s'appliquera également à l'entrée "
+"d'exemple : <placeholder type=\"literallayout\" id=\"4\"/> En revanche, "
+"aucune des lignes suivantes ne s'applique : <placeholder "
+"type=\"literallayout\" id=\"5\"/>"
#. type: Content of: <refentry><refsect1><title>
#: apt_auth.conf.5.xml
@@ -10414,10 +10499,10 @@ msgstr ""
msgid ""
"HTTP is an unencrypted transport protocol meaning that the whole "
"communication with the remote server (or proxy) can be observed by a "
-"sufficiently capable attacker commonly referred to as a \"man in the middle"
-"\" (MITM). However, such an attacker can <emphasis>not</emphasis> modify "
-"the communication to compromise the security of your system, as APT's data "
-"security model is independent of the chosen transport method. This is "
+"sufficiently capable attacker commonly referred to as a \"man in the "
+"middle\" (MITM). However, such an attacker can <emphasis>not</emphasis> "
+"modify the communication to compromise the security of your system, as APT's "
+"data security model is independent of the chosen transport method. This is "
"explained in detail in &apt-secure;. An overview of available transport "
"methods is given in &sources-list;."
msgstr ""
@@ -12641,10 +12726,10 @@ msgstr ""
msgid ""
"Both that APT <command>dselect</command> method and <command>apt-get</"
"command> share the same interface. It is a simple system that generally "
-"tells you what it will do and then goes and does it. <placeholder type="
-"\"footnote\" id=\"0\"/> After printing out a summary of what will happen APT "
-"then will print out some informative status messages so that you can "
-"estimate how far along it is and how much is left to do."
+"tells you what it will do and then goes and does it. <placeholder "
+"type=\"footnote\" id=\"0\"/> After printing out a summary of what will "
+"happen APT then will print out some informative status messages so that you "
+"can estimate how far along it is and how much is left to do."
msgstr ""
"La méthode APT de <command>dselect</command> et le programme <command>apt-"
"get</command> utilisent la même interface. Elle consiste en un système "
@@ -12775,10 +12860,10 @@ msgstr ""
msgid ""
"There are two ways a system can get into a broken state like this. The first "
"is caused by <command>dpkg</command> missing some subtle relationships "
-"between packages when performing upgrades. <placeholder type=\"footnote\" id="
-"\"0\"/>. The second is if a package installation fails during an operation. "
-"In this situation a package may have been unpacked without its dependents "
-"being installed."
+"between packages when performing upgrades. <placeholder type=\"footnote\" "
+"id=\"0\"/>. The second is if a package installation fails during an "
+"operation. In this situation a package may have been unpacked without its "
+"dependents being installed."
msgstr ""
"Il existe deux façons pour le système d'aboutir à cet état. Cela peut "
"d'abord être causé par des subtilités de relations entre les paquets que "
diff --git a/doc/po/it.po b/doc/po/it.po
index 99a3b25d5..200259f73 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: 2022-01-06 20:58+0100\n"
+"POT-Creation-Date: 2022-02-22 20:01+0100\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"
@@ -416,13 +416,24 @@ msgstr ""
#. type: Plain text
#: apt.ent
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
+#| " <listitem><para>File fragments for the trusted keys, additional keyrings can\n"
+#| " be stored here (by other packages or the administrator).\n"
+#| " Configuration Item <literal>Dir::Etc::TrustedParts</literal>.</para></listitem>\n"
+#| " </varlistentry>\n"
+#| "\">\n"
msgid ""
" <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
" <listitem><para>File fragments for the trusted keys, additional keyrings can\n"
" be stored here (by other packages or the administrator).\n"
" 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 ""
" <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
@@ -618,8 +629,8 @@ msgid ""
"packages path override-file pathprefix --> <!ENTITY synopsis-path \"path\">"
msgstr ""
"<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
-"packages path override-file pathprefix --> <!ENTITY synopsis-path \"percorso"
-"\">"
+"packages path override-file pathprefix --> <!ENTITY synopsis-path "
+"\"percorso\">"
#. type: Plain text
#: apt.ent
@@ -859,15 +870,15 @@ msgstr ""
#: apt.8.xml
msgid ""
"<option>satisfy</option> satisfies dependency strings, as used in Build-"
-"Depends. It also handles conflicts, by prefixing an argument with <literal>"
-"\"Conflicts: \"</literal>."
+"Depends. It also handles conflicts, by prefixing an argument with "
+"<literal>\"Conflicts: \"</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.8.xml
msgid ""
-"Example: <literal>apt satisfy \"foo, bar (>= 1.0)\" \"Conflicts: baz, fuzz"
-"\"</literal>"
+"Example: <literal>apt satisfy \"foo, bar (>= 1.0)\" \"Conflicts: baz, "
+"fuzz\"</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
@@ -2598,11 +2609,12 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cache.8.xml
msgid ""
-"The same as <literal>dotty</literal>, only for xvcg from the <ulink url="
-"\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>."
+"The same as <literal>dotty</literal>, only for xvcg from the <ulink "
+"url=\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</"
+"ulink>."
msgstr ""
-"Stessa cosa di <literal>dotty</literal>, ma per xvcg dello <ulink url="
-"\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">strumento VCG</"
+"Stessa cosa di <literal>dotty</literal>, ma per xvcg dello <ulink "
+"url=\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">strumento VCG</"
"ulink>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
@@ -3099,6 +3111,72 @@ msgstr ""
"gpg</filename> è però il portachiavi primario il che significa, ad esempio, "
"che le nuove chiavi sono aggiunte ad esso."
+#. type: Content of: <refentry><refsect1><title>
+#: apt-key.8.xml
+#, fuzzy
+#| msgid "Dir Section"
+msgid "Deprecation"
+msgstr "Sezione Dir"
+
+#. 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;"
@@ -3725,8 +3803,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt-secure.8.xml
msgid ""
-"For more background information you might want to review the <ulink url="
-"\"https://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
+"For more background information you might want to review the <ulink "
+"url=\"https://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
"Security Infrastructure</ulink> chapter of the Securing Debian Manual (also "
"available in the harden-doc package) and the <ulink url=\"http://www."
"cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution HOWTO</"
@@ -3735,8 +3813,8 @@ msgstr ""
"Per maggiori informazioni sui concetti alla base di questo sistema, si può "
"leggere il capitolo <ulink url=\"https://www.debian.org/doc/manuals/securing-"
"debian-howto/ch7\">Debian Security Infrastructure</ulink> del manuale "
-"Securing Debian (disponibile anche nel pacchetto harden-doc) e il <ulink url="
-"\"http://www.cryptnet.net/fdp/crypto/strong_distro.html\" >Strong "
+"Securing Debian (disponibile anche nel pacchetto harden-doc) e il <ulink "
+"url=\"http://www.cryptnet.net/fdp/crypto/strong_distro.html\" >Strong "
"Distribution HOWTO</ulink> di V. Alex Brennen."
#. type: Content of: <refentry><refsect1><title>
@@ -4160,9 +4238,9 @@ msgstr ""
#| "tools such as bind and dhcp use. Lines starting with <literal>//</"
#| "literal> are treated as comments (ignored), as well as all text between "
#| "<literal>/*</literal> and <literal>*/</literal>, just like C/C++ "
-#| "comments. Each line is of the form <literal>APT::Get::Assume-Yes \"true"
-#| "\";</literal>. The quotation marks and trailing semicolon are required. "
-#| "The value must be on one line, and there is no kind of string "
+#| "comments. Each line is of the form <literal>APT::Get::Assume-Yes "
+#| "\"true\";</literal>. The quotation marks and trailing semicolon are "
+#| "required. The value must be on one line, and there is no kind of string "
#| "concatenation. Values must not include backslashes or extra quotation "
#| "marks. Option names are made up of alphanumeric characters and the "
#| "characters \"/-:._+\". A new scope can be opened with curly braces, like "
@@ -4904,10 +4982,10 @@ msgid ""
"literal> script in the configuration file. This entry specifies the commands "
"to send to tell the proxy server what to connect to. Please see "
"&configureindex; for an example of how to do this. The substitution "
-"variables representing the corresponding URI component are <literal>"
-"$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, <literal>"
-"$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, <literal>$(SITE)</"
-"literal> and <literal>$(SITE_PORT)</literal>."
+"variables representing the corresponding URI component are "
+"<literal>$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, "
+"<literal>$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, "
+"<literal>$(SITE)</literal> and <literal>$(SITE_PORT)</literal>."
msgstr ""
"<literal>ftp::Proxy</literal> imposta il proxy predefinito da usare per gli "
"URI FTP. È nella forma standard <literal>ftp://[[utente][:password]@]host[:"
@@ -4921,9 +4999,9 @@ msgstr ""
"server proxy a cosa connettersi. Vedere &configureindex; per un esempio di "
"come utilizzarla. Le variabili di sostituzione che rappresentano i "
"corrispondenti componenti dell'URI sono <literal>$(PROXY_USER)</literal>, "
-"<literal>$(PROXY_PASS)</literal>, <literal>$(SITE_USER)</literal>, <literal>"
-"$(SITE_PASS)</literal>, <literal>$(SITE)</literal> e <literal>$(SITE_PORT)</"
-"literal>."
+"<literal>$(PROXY_PASS)</literal>, <literal>$(SITE_USER)</literal>, "
+"<literal>$(SITE_PASS)</literal>, <literal>$(SITE)</literal> e "
+"<literal>$(SITE_PORT)</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml
@@ -5083,8 +5161,8 @@ msgstr ""
"preferire i file compressi con <command>gzip</command> a tutti gli altri "
"formati di compressione. Se si volesse preferire <command>xz</command> "
"rispetto a <command>gzip</command> e <command>bzip2</command>, "
-"l'impostazione di configurazione sarebbe: <placeholder type=\"synopsis\" id="
-"\"1\"/> Non è necessario aggiungere esplicitamente <literal>bz2</literal> "
+"l'impostazione di configurazione sarebbe: <placeholder type=\"synopsis\" "
+"id=\"1\"/> Non è necessario aggiungere esplicitamente <literal>bz2</literal> "
"all'elenco, dato che verrà aggiunto automaticamente."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
@@ -5190,8 +5268,8 @@ msgid ""
"specifies the languages. So the following example configuration will result "
"in the order \"en, de\" in an English locale or \"de, en\" in a German one. "
"Note that \"fr\" is downloaded, but not used unless APT is used in a French "
-"locale (where the order would be \"fr, de, en\"). <placeholder type="
-"\"programlisting\" id=\"0\"/>"
+"locale (where the order would be \"fr, de, en\"). <placeholder "
+"type=\"programlisting\" id=\"0\"/>"
msgstr ""
"L'elenco predefinito include «environment» ed «en». «<literal>environment</"
"literal>» ha un significato speciale in questo contesto: viene sostituito al "
@@ -6318,8 +6396,9 @@ msgid ""
"in the APT configuration file <filename>/etc/apt/apt.conf</filename>. Note "
"that this has precedence over any general priority you set in the <filename>/"
"etc/apt/preferences</filename> file described later, but not over "
-"specifically pinned packages. For example, <placeholder type="
-"\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>"
+"specifically pinned packages. For example, <placeholder "
+"type=\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" "
+"id=\"1\"/>"
msgstr ""
"Se non c'è alcun file di preferenze o non c'è nel file una voce applicabile "
"ad una versione particolare, allora la priorità assegnata a quella versione "
@@ -6331,8 +6410,9 @@ msgstr ""
"filename>. Notare che questa impostazione ha precedenza rispetto a qualsiasi "
"priorità generale sia stata impostata nel file <filename>/etc/apt/"
"preferences</filename> descritto in seguito, ma non rispetto a pacchetti per "
-"cui è specificatamente indicato un pin. Per esempio, <placeholder type="
-"\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>"
+"cui è specificatamente indicato un pin. Per esempio, <placeholder "
+"type=\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" "
+"id=\"1\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml
@@ -6685,8 +6765,8 @@ msgid ""
"This should <emphasis>not</emphasis> be confused with the Origin of a "
"distribution as specified in a <filename>Release</filename> file. What "
"follows the \"Origin:\" tag in a <filename>Release</filename> file is not an "
-"Internet address but an author or vendor name, such as \"Debian\" or \"Ximian"
-"\"."
+"Internet address but an author or vendor name, such as \"Debian\" or "
+"\"Ximian\"."
msgstr ""
"Questo <emphasis>non</emphasis> deve essere confuso con l'Origine di una "
"distribuzione come indicata in un file <filename>Release</filename>. Ciò che "
@@ -7469,8 +7549,8 @@ msgstr ""
"alta di quella predefinita (500) a tutte le versioni di pacchetto che "
"appartengono alla distribuzione <literal>stable</literal>, e una priorità "
"eccezionalmente bassa alle versioni di pacchetto che appartengono alle altre "
-"distribuzioni <literal>Debian</literal>. <placeholder type=\"programlisting"
-"\" id=\"0\"/>"
+"distribuzioni <literal>Debian</literal>. <placeholder "
+"type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#: apt_preferences.5.xml
@@ -7494,8 +7574,8 @@ msgid ""
msgstr ""
"Con un file &sources-list; adatto e il file di preferenze descritto sopra, "
"uno qualsiasi dei seguenti comandi farà sì che APT aggiorni il sistema alle "
-"versioni più recenti di <literal>stable</literal>. <placeholder type="
-"\"programlisting\" id=\"0\"/>"
+"versioni più recenti di <literal>stable</literal>. <placeholder "
+"type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#: apt_preferences.5.xml
@@ -7556,8 +7636,8 @@ msgid ""
"to package versions from the <literal>testing</literal> distribution, a "
"lower priority to package versions from the <literal>unstable</literal> "
"distribution, and a prohibitively low priority to package versions from "
-"other <literal>Debian</literal> distributions. <placeholder type="
-"\"programlisting\" id=\"0\"/>"
+"other <literal>Debian</literal> distributions. <placeholder "
+"type=\"programlisting\" id=\"0\"/>"
msgstr ""
"Il seguente file di preferenze di APT fa sì che APT assegni una priorità "
"alta alle versioni di pacchetto nella distribuzione <literal>testing</"
@@ -7576,8 +7656,8 @@ msgid ""
msgstr ""
"Con un file &sources-list; adatto e il file di preferenze descritto sopra, "
"uno qualsiasi dei seguenti comandi farà sì che APT aggiorni il sistema alle "
-"versioni più recenti di <literal>testing</literal>. <placeholder type="
-"\"programlisting\" id=\"0\"/>"
+"versioni più recenti di <literal>testing</literal>. <placeholder "
+"type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#: apt_preferences.5.xml
@@ -8097,8 +8177,8 @@ msgid ""
"this in deb822 style format: <placeholder type=\"literallayout\" id=\"1\"/>"
msgstr ""
"Come esempio, le fonti per la propria distribuzione potrebbero essere simili "
-"a queste in formato in stile a singola riga: <placeholder type="
-"\"literallayout\" id=\"0\"/> o a queste in formato in stile deb822: "
+"a queste in formato in stile a singola riga: <placeholder "
+"type=\"literallayout\" id=\"0\"/> o a queste in formato in stile deb822: "
"<placeholder type=\"literallayout\" id=\"1\"/>"
#. type: Content of: <refentry><refsect1><title>
@@ -8335,20 +8415,23 @@ 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 "
-"<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 "
-"keyrings are selected. A fingerprint will accept also all signatures by a "
-"subkey of this key, if this isn't desired an exclamation mark (<literal>!</"
-"literal>) can be appended to the fingerprint to disable this behaviour. The "
-"option defaults to the value of the option with the same name if set in the "
-"previously acquired <filename>Release</filename> file of this repository "
-"(only fingerprints can be specified there through). Otherwise all keys in "
-"the trusted keyrings are considered valid signers for this repository. The "
-"option may also be set directly to an embedded GPG public key block. Special "
-"care is needed to encode the empty line with leading spaces and \".\": "
-"<placeholder type=\"literallayout\" id=\"0\"/>"
+"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 keyrings are selected. A "
+"fingerprint will accept also all signatures by a subkey of this key, if this "
+"isn't desired an exclamation mark (<literal>!</literal>) can be appended to "
+"the fingerprint to disable this behaviour. The option defaults to the value "
+"of the option with the same name if set in the previously acquired "
+"<filename>Release</filename> file of this repository (only fingerprints can "
+"be specified there through). Otherwise all keys in the trusted keyrings are "
+"considered valid signers for this repository. The option may also be set "
+"directly to an embedded GPG public key block. Special care is needed to "
+"encode the empty line with leading spaces and \".\": <placeholder "
+"type=\"literallayout\" id=\"0\"/>"
msgstr ""
"<option>Signed-By</option> (<option>signed-by</option>) è un percorso "
"assoluto ad un file di portachiavi (deve essere accessibile e leggibile "
@@ -8909,8 +8992,8 @@ msgstr ""
"quelle amd64 e così via per le altre architetture supportate. [Notare che "
"questo esempio illustra solamente come usare la variabile per la "
"sostituzione; gli archivi Debian ufficiali non sono strutturati in questo "
-"modo.] <placeholder type=\"literallayout\" id=\"0\"/> <placeholder type="
-"\"literallayout\" id=\"1\"/>"
+"modo.] <placeholder type=\"literallayout\" id=\"0\"/> <placeholder "
+"type=\"literallayout\" id=\"1\"/>"
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml
@@ -9501,8 +9584,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml
msgid ""
-"Sets the top of the source package directory tree. Defaults to <filename>"
-"$(DIST)/$(SECTION)/source/</filename>"
+"Sets the top of the source package directory tree. Defaults to "
+"<filename>$(DIST)/$(SECTION)/source/</filename>"
msgstr ""
"Imposta la radice dell'albero della directory dei pacchetti sorgente. Il "
"valore predefinito è <filename>$(DIST)/$(SECTION)/source/</filename>."
@@ -9513,8 +9596,8 @@ msgid ""
"Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
"binary-$(ARCH)/Packages</filename>"
msgstr ""
-"Imposta il file Packages di uscita. Il valore predefinito è <filename>"
-"$(DIST)/$(SECTION)/binary-$(ARCH)/Packages</filename>."
+"Imposta il file Packages di uscita. Il valore predefinito è "
+"<filename>$(DIST)/$(SECTION)/binary-$(ARCH)/Packages</filename>."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml
@@ -9529,8 +9612,8 @@ msgstr ""
#: apt-ftparchive.1.xml
msgid ""
"Sets the output Translation-en master file with the long descriptions if "
-"they should be not included in the Packages file. Defaults to <filename>"
-"$(DIST)/$(SECTION)/i18n/Translation-en</filename>"
+"they should be not included in the Packages file. Defaults to "
+"<filename>$(DIST)/$(SECTION)/i18n/Translation-en</filename>"
msgstr ""
"Imposta il file Translation-en principale di uscita contenente le "
"descrizioni lunghe se non devono essere incluse nel file Packages. Il valore "
@@ -9556,11 +9639,11 @@ msgid ""
"ftparchive</command> will integrate those package files together "
"automatically."
msgstr ""
-"Imposta il file Contents di uscita. Il valore predefinito è <filename>"
-"$(DIST)/$(SECTION)/Contents-$(ARCH)</filename>. Se questa impostazione fa sì "
-"che più file Packages corrispondano a un solo file Contents (come avviene "
-"con il valore predefinito), allora <command>apt-ftparchive</command> unirà "
-"automaticamente insieme questi file dei pacchetti."
+"Imposta il file Contents di uscita. Il valore predefinito è "
+"<filename>$(DIST)/$(SECTION)/Contents-$(ARCH)</filename>. Se questa "
+"impostazione fa sì che più file Packages corrispondano a un solo file "
+"Contents (come avviene con il valore predefinito), allora <command>apt-"
+"ftparchive</command> unirà automaticamente insieme questi file dei pacchetti."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml
@@ -9663,8 +9746,8 @@ msgstr ""
#: apt-ftparchive.1.xml
msgid ""
"When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
-"command> performs an operation similar to: <placeholder type=\"programlisting"
-"\" id=\"0\"/>"
+"command> performs an operation similar to: <placeholder "
+"type=\"programlisting\" id=\"0\"/>"
msgstr ""
"Quando elabora una sezione <literal>Tree</literal>, <command>apt-ftparchive</"
"command> esegue un'operazione simile a: <placeholder type=\"programlisting\" "
@@ -9825,19 +9908,20 @@ msgstr "nuovo"
#. type: Content of: <refentry><refsect1><para>
#: apt-ftparchive.1.xml
msgid ""
-"The general form of the maintainer field is: <placeholder type="
-"\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
-"id=\"1\"/> The first form allows a double-slash separated list of old email "
-"addresses to be specified. If any of those are found then new is substituted "
-"for the maintainer field. The second form unconditionally substitutes the "
-"maintainer field."
-msgstr ""
-"La forma generale del campo manutentore è: <placeholder type=\"literallayout"
-"\" id=\"0\"/> o semplicemente <placeholder type=\"literallayout\" id=\"1\"/"
-">. La prima forma consente di specificare una lista di vecchi indirizzi di "
-"posta elettronica separati da una doppia sbarra. Se qualcuno di essi viene "
-"trovato, allora il campo manutentore viene sostituito con «nuovo». La "
-"seconda forma sostituisce invariabilmente il campo manutentore."
+"The general form of the maintainer field is: <placeholder "
+"type=\"literallayout\" id=\"0\"/> or simply, <placeholder "
+"type=\"literallayout\" id=\"1\"/> The first form allows a double-slash "
+"separated list of old email addresses to be specified. If any of those are "
+"found then new is substituted for the maintainer field. The second form "
+"unconditionally substitutes the maintainer field."
+msgstr ""
+"La forma generale del campo manutentore è: <placeholder "
+"type=\"literallayout\" id=\"0\"/> o semplicemente <placeholder "
+"type=\"literallayout\" id=\"1\"/>. La prima forma consente di specificare "
+"una lista di vecchi indirizzi di posta elettronica separati da una doppia "
+"sbarra. Se qualcuno di essi viene trovato, allora il campo manutentore viene "
+"sostituito con «nuovo». La seconda forma sostituisce invariabilmente il "
+"campo manutentore."
#. type: Content of: <refentry><refsect1><title>
#: apt-ftparchive.1.xml
@@ -10215,8 +10299,8 @@ msgid ""
"password <literal>debian</literal> for the &sources-list; entry <placeholder "
"type=\"literallayout\" id=\"0\"/> could be done in the entry directly: "
"<placeholder type=\"literallayout\" id=\"1\"/> Alternatively an entry like "
-"the following in the auth.conf file could be used: <placeholder type="
-"\"literallayout\" id=\"2\"/> Or alternatively within a single line: "
+"the following in the auth.conf file could be used: <placeholder "
+"type=\"literallayout\" id=\"2\"/> Or alternatively within a single line: "
"<placeholder type=\"literallayout\" id=\"3\"/> If you need to be more "
"specific all of these lines will also apply to the example entry: "
"<placeholder type=\"literallayout\" id=\"4\"/> On the other hand neither of "
@@ -10315,10 +10399,10 @@ msgstr ""
msgid ""
"HTTP is an unencrypted transport protocol meaning that the whole "
"communication with the remote server (or proxy) can be observed by a "
-"sufficiently capable attacker commonly referred to as a \"man in the middle"
-"\" (MITM). However, such an attacker can <emphasis>not</emphasis> modify "
-"the communication to compromise the security of your system, as APT's data "
-"security model is independent of the chosen transport method. This is "
+"sufficiently capable attacker commonly referred to as a \"man in the "
+"middle\" (MITM). However, such an attacker can <emphasis>not</emphasis> "
+"modify the communication to compromise the security of your system, as APT's "
+"data security model is independent of the chosen transport method. This is "
"explained in detail in &apt-secure;. An overview of available transport "
"methods is given in &sources-list;."
msgstr ""
@@ -12420,17 +12504,17 @@ msgstr ""
msgid ""
"Both that APT <command>dselect</command> method and <command>apt-get</"
"command> share the same interface. It is a simple system that generally "
-"tells you what it will do and then goes and does it. <placeholder type="
-"\"footnote\" id=\"0\"/> After printing out a summary of what will happen APT "
-"then will print out some informative status messages so that you can "
-"estimate how far along it is and how much is left to do."
+"tells you what it will do and then goes and does it. <placeholder "
+"type=\"footnote\" id=\"0\"/> After printing out a summary of what will "
+"happen APT then will print out some informative status messages so that you "
+"can estimate how far along it is and how much is left to do."
msgstr ""
"Sia il metodo APT per <command>dselect</command> sia <command>apt-get</"
"command> condividono la stessa interfaccia; si tratta di un sistema semplice "
-"che indica in genere cosa sta per fare, e poi lo fa.<placeholder type="
-"\"footnote\" id=\"0\"/> Dopo la stampa di un riassunto delle operazioni che "
-"saranno fatte, APT stampa dei messaggi informativi sullo stato, in modo da "
-"poter avere un'idea del punto a cui arrivato e di quanto ci sia ancora da "
+"che indica in genere cosa sta per fare, e poi lo fa.<placeholder "
+"type=\"footnote\" id=\"0\"/> Dopo la stampa di un riassunto delle operazioni "
+"che saranno fatte, APT stampa dei messaggi informativi sullo stato, in modo "
+"da poter avere un'idea del punto a cui arrivato e di quanto ci sia ancora da "
"fare."
#. type: Content of: <book><chapter><section><title>
@@ -12556,10 +12640,10 @@ msgstr ""
msgid ""
"There are two ways a system can get into a broken state like this. The first "
"is caused by <command>dpkg</command> missing some subtle relationships "
-"between packages when performing upgrades. <placeholder type=\"footnote\" id="
-"\"0\"/>. The second is if a package installation fails during an operation. "
-"In this situation a package may have been unpacked without its dependents "
-"being installed."
+"between packages when performing upgrades. <placeholder type=\"footnote\" "
+"id=\"0\"/>. The second is if a package installation fails during an "
+"operation. In this situation a package may have been unpacked without its "
+"dependents being installed."
msgstr ""
"Ci sono due modi in cui un sistema può arrivare in uno stato problematico di "
"questo genere: il primo avviene se <command>dpkg</command> non ha ravvisato "
@@ -14758,46 +14842,50 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ "<command>apt-cache</command> <arg><option>-hvsn</option></arg> "
#~ "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
#~ "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
-#~ "choice=\"req\"> <arg>add <arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>file</replaceable></arg></arg> <arg>gencaches</arg> "
-#~ "<arg>showpkg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-#~ "replaceable></arg></arg> <arg>showsrc <arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>pkg</replaceable></arg></arg> <arg>stats</arg> <arg>dump</"
-#~ "arg> <arg>dumpavail</arg> <arg>unmet</arg> <arg>search <arg choice=\"plain"
-#~ "\"><replaceable>regex</replaceable></arg></arg> <arg>show <arg choice="
-#~ "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-#~ "<arg>depends <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-#~ "replaceable></arg></arg> <arg>rdepends <arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>pkg</replaceable></arg></arg> <arg>pkgnames <arg choice="
-#~ "\"plain\"><replaceable>prefix</replaceable></arg></arg> <arg>dotty <arg "
-#~ "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></"
-#~ "arg> <arg>xvcg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-#~ "replaceable></arg></arg> <arg>policy <arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>pkgs</replaceable></arg></arg> <arg>madison <arg choice="
-#~ "\"plain\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></arg> </"
-#~ "group>"
+#~ "choice=\"req\"> <arg>add <arg choice=\"plain\" "
+#~ "rep=\"repeat\"><replaceable>file</replaceable></arg></arg> "
+#~ "<arg>gencaches</arg> <arg>showpkg <arg choice=\"plain\" "
+#~ "rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg>showsrc "
+#~ "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></"
+#~ "arg></arg> <arg>stats</arg> <arg>dump</arg> <arg>dumpavail</arg> "
+#~ "<arg>unmet</arg> <arg>search <arg choice=\"plain\"><replaceable>regex</"
+#~ "replaceable></arg></arg> <arg>show <arg choice=\"plain\" "
+#~ "rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg>depends "
+#~ "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></"
+#~ "arg></arg> <arg>rdepends <arg choice=\"plain\" "
+#~ "rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg>pkgnames "
+#~ "<arg choice=\"plain\"><replaceable>prefix</replaceable></arg></arg> "
+#~ "<arg>dotty <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
+#~ "replaceable></arg></arg> <arg>xvcg <arg choice=\"plain\" "
+#~ "rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg>policy "
+#~ "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkgs</replaceable></"
+#~ "arg></arg> <arg>madison <arg choice=\"plain\" "
+#~ "rep=\"repeat\"><replaceable>pkgs</replaceable></arg></arg> </group>"
#~ msgstr ""
#~ "<command>apt-cache</command> <arg><option>-hvsn</option></arg> "
#~ "<arg><option>-o=<replaceable>stringa di configurazione</replaceable></"
#~ "option></arg> <arg><option>-c=<replaceable>file</replaceable></option></"
-#~ "arg> <group choice=\"req\"> <arg>add <arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>file</replaceable></arg></arg> <arg>gencaches</arg> "
-#~ "<arg>showpkg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pacchetto</"
-#~ "replaceable></arg></arg> <arg>showsrc <arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>pacchetto</replaceable></arg></arg> <arg>stats</arg> "
-#~ "<arg>dump</arg> <arg>dumpavail</arg> <arg>unmet</arg> <arg>search <arg "
+#~ "arg> <group choice=\"req\"> <arg>add <arg choice=\"plain\" "
+#~ "rep=\"repeat\"><replaceable>file</replaceable></arg></arg> "
+#~ "<arg>gencaches</arg> <arg>showpkg <arg choice=\"plain\" "
+#~ "rep=\"repeat\"><replaceable>pacchetto</replaceable></arg></arg> "
+#~ "<arg>showsrc <arg choice=\"plain\" rep=\"repeat\"><replaceable>pacchetto</"
+#~ "replaceable></arg></arg> <arg>stats</arg> <arg>dump</arg> <arg>dumpavail</"
+#~ "arg> <arg>unmet</arg> <arg>search <arg "
#~ "choice=\"plain\"><replaceable>regex</replaceable></arg></arg> <arg>show "
#~ "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pacchetto</"
-#~ "replaceable></arg></arg> <arg>depends <arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>pacchetto</replaceable></arg></arg> <arg>rdepends <arg "
-#~ "choice=\"plain\" rep=\"repeat\"><replaceable>pacchetto</replaceable></"
-#~ "arg></arg> <arg>pkgnames <arg choice=\"plain\"><replaceable>prefisso</"
-#~ "replaceable></arg></arg> <arg>dotty <arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>pacchetto</replaceable></arg></arg> <arg>xvcg <arg choice="
-#~ "\"plain\" rep=\"repeat\"><replaceable>pacchetto</replaceable></arg></arg> "
-#~ "<arg>policy <arg choice=\"plain\" rep=\"repeat\"><replaceable>pacchetti</"
-#~ "replaceable></arg></arg> <arg>madison <arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>pacchetti</replaceable></arg></arg> </group>"
+#~ "replaceable></arg></arg> <arg>depends <arg choice=\"plain\" "
+#~ "rep=\"repeat\"><replaceable>pacchetto</replaceable></arg></arg> "
+#~ "<arg>rdepends <arg choice=\"plain\" "
+#~ "rep=\"repeat\"><replaceable>pacchetto</replaceable></arg></arg> "
+#~ "<arg>pkgnames <arg choice=\"plain\"><replaceable>prefisso</replaceable></"
+#~ "arg></arg> <arg>dotty <arg choice=\"plain\" "
+#~ "rep=\"repeat\"><replaceable>pacchetto</replaceable></arg></arg> <arg>xvcg "
+#~ "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pacchetto</"
+#~ "replaceable></arg></arg> <arg>policy <arg choice=\"plain\" "
+#~ "rep=\"repeat\"><replaceable>pacchetti</replaceable></arg></arg> "
+#~ "<arg>madison <arg choice=\"plain\" rep=\"repeat\"><replaceable>pacchetti</"
+#~ "replaceable></arg></arg> </group>"
#~ msgid "add <replaceable>file(s)</replaceable>"
#~ msgstr "add <replaceable>file</replaceable>"
@@ -15124,8 +15212,8 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ msgid ""
#~ "Unless the <option>-h</option>, or <option>--help</option> option is "
-#~ "given one of the commands below must be present. <placeholder type="
-#~ "\"variablelist\" id=\"0\"/>"
+#~ "given one of the commands below must be present. <placeholder "
+#~ "type=\"variablelist\" id=\"0\"/>"
#~ msgstr ""
#~ "A meno che non venga fornita l'opzione <option>-h</option> o <option>--"
#~ "help</option>, deve essere presente uno dei comandi seguenti. "
@@ -15298,19 +15386,20 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ "option></arg> <arg><option>-o <replaceable>config</"
#~ "replaceable>=<replaceable>string</replaceable></option></arg> "
#~ "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
-#~ "choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>path</replaceable></arg><arg><replaceable>override</"
-#~ "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
-#~ "<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>path</"
-#~ "replaceable></arg><arg><replaceable>override</"
-#~ "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
-#~ "<arg>contents <arg choice=\"plain\"><replaceable>path</replaceable></"
-#~ "arg></arg> <arg>release <arg choice=\"plain\"><replaceable>path</"
-#~ "replaceable></arg></arg> <arg>generate <arg choice=\"plain"
-#~ "\"><replaceable>config-file</replaceable></arg> <arg choice=\"plain\" rep="
-#~ "\"repeat\"><replaceable>section</replaceable></arg></arg> <arg>clean <arg "
-#~ "choice=\"plain\"><replaceable>config-file</replaceable></arg></arg> </"
-#~ "group>"
+#~ "choice=\"req\"> <arg>packages<arg choice=\"plain\" "
+#~ "rep=\"repeat\"><replaceable>path</replaceable></"
+#~ "arg><arg><replaceable>override</replaceable><arg><replaceable>pathprefix</"
+#~ "replaceable></arg></arg></arg> <arg>sources<arg choice=\"plain\" "
+#~ "rep=\"repeat\"><replaceable>path</replaceable></"
+#~ "arg><arg><replaceable>override</replaceable><arg><replaceable>pathprefix</"
+#~ "replaceable></arg></arg></arg> <arg>contents <arg "
+#~ "choice=\"plain\"><replaceable>path</replaceable></arg></arg> <arg>release "
+#~ "<arg choice=\"plain\"><replaceable>path</replaceable></arg></arg> "
+#~ "<arg>generate <arg choice=\"plain\"><replaceable>config-file</"
+#~ "replaceable></arg> <arg choice=\"plain\" "
+#~ "rep=\"repeat\"><replaceable>section</replaceable></arg></arg> <arg>clean "
+#~ "<arg choice=\"plain\"><replaceable>config-file</replaceable></arg></arg> "
+#~ "</group>"
#~ msgstr ""
#~ "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
#~ "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
@@ -15319,19 +15408,20 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ "option></arg> <arg><option>-o <replaceable>configurazione</"
#~ "replaceable>=<replaceable>stringa</replaceable></option></arg> "
#~ "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
-#~ "choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>percorso</replaceable></arg><arg><replaceable>override</"
-#~ "replaceable><arg><replaceable>prefisso del percorso</replaceable></arg></"
-#~ "arg></arg> <arg>sources<arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>percorso</replaceable></arg><arg><replaceable>override</"
-#~ "replaceable><arg><replaceable>prefisso del percorso</replaceable></arg></"
-#~ "arg></arg> <arg>contents <arg choice=\"plain\"><replaceable>percorso</"
-#~ "replaceable></arg></arg> <arg>release <arg choice=\"plain"
-#~ "\"><replaceable>percorso</replaceable></arg></arg> <arg>generate <arg "
-#~ "choice=\"plain\"><replaceable>file-di-configurazione</replaceable></arg> "
-#~ "<arg choice=\"plain\" rep=\"repeat\"><replaceable>sezione</replaceable></"
-#~ "arg></arg> <arg>clean <arg choice=\"plain\"><replaceable>file-di-"
-#~ "configurazione</replaceable></arg></arg> </group>"
+#~ "choice=\"req\"> <arg>packages<arg choice=\"plain\" "
+#~ "rep=\"repeat\"><replaceable>percorso</replaceable></"
+#~ "arg><arg><replaceable>override</replaceable><arg><replaceable>prefisso "
+#~ "del percorso</replaceable></arg></arg></arg> <arg>sources<arg "
+#~ "choice=\"plain\" rep=\"repeat\"><replaceable>percorso</replaceable></"
+#~ "arg><arg><replaceable>override</replaceable><arg><replaceable>prefisso "
+#~ "del percorso</replaceable></arg></arg></arg> <arg>contents <arg "
+#~ "choice=\"plain\"><replaceable>percorso</replaceable></arg></arg> "
+#~ "<arg>release <arg choice=\"plain\"><replaceable>percorso</replaceable></"
+#~ "arg></arg> <arg>generate <arg choice=\"plain\"><replaceable>file-di-"
+#~ "configurazione</replaceable></arg> <arg choice=\"plain\" "
+#~ "rep=\"repeat\"><replaceable>sezione</replaceable></arg></arg> <arg>clean "
+#~ "<arg choice=\"plain\"><replaceable>file-di-configurazione</replaceable></"
+#~ "arg></arg> </group>"
#~ msgid "packages"
#~ msgstr "packages"
@@ -15389,9 +15479,6 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ "La configurazione di generate ha 4 sezioni separate, ciascuna delle quali "
#~ "è descritta sotto."
-#~ msgid "Dir Section"
-#~ msgstr "Sezione Dir"
-
#~ msgid "ArchiveDir"
#~ msgstr "ArchiveDir"
@@ -15474,10 +15561,10 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ "ftparchive</command> will integrate those package files together "
#~ "automatically."
#~ msgstr ""
-#~ "Imposta il file Contents di uscita. Il valore predefinito è <filename>"
-#~ "$(DIST)/Contents-$(ARCH)</filename>. Se questa impostazione fa sì che più "
-#~ "file Packages corrispondano a un solo file Contents (come con il valore "
-#~ "predefinito) allora <command>apt-ftparchive</command> unirà "
+#~ "Imposta il file Contents di uscita. Il valore predefinito è "
+#~ "<filename>$(DIST)/Contents-$(ARCH)</filename>. Se questa impostazione fa "
+#~ "sì che più file Packages corrispondano a un solo file Contents (come con "
+#~ "il valore predefinito) allora <command>apt-ftparchive</command> unirà "
#~ "automaticamente insieme questi file dei pacchetti."
#~ msgid "Contents::Header"
diff --git a/doc/po/ja.po b/doc/po/ja.po
index c468dfdbc..3870299d8 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: 2022-01-06 20:58+0100\n"
+"POT-Creation-Date: 2022-02-22 20:01+0100\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"
@@ -412,13 +412,24 @@ msgstr ""
#. type: Plain text
#: apt.ent
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
+#| " <listitem><para>File fragments for the trusted keys, additional keyrings can\n"
+#| " be stored here (by other packages or the administrator).\n"
+#| " Configuration Item <literal>Dir::Etc::TrustedParts</literal>.</para></listitem>\n"
+#| " </varlistentry>\n"
+#| "\">\n"
msgid ""
" <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
" <listitem><para>File fragments for the trusted keys, additional keyrings can\n"
" be stored here (by other packages or the administrator).\n"
" 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 ""
" <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
@@ -851,15 +862,15 @@ msgstr ""
#: apt.8.xml
msgid ""
"<option>satisfy</option> satisfies dependency strings, as used in Build-"
-"Depends. It also handles conflicts, by prefixing an argument with <literal>"
-"\"Conflicts: \"</literal>."
+"Depends. It also handles conflicts, by prefixing an argument with "
+"<literal>\"Conflicts: \"</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.8.xml
msgid ""
-"Example: <literal>apt satisfy \"foo, bar (>= 1.0)\" \"Conflicts: baz, fuzz"
-"\"</literal>"
+"Example: <literal>apt satisfy \"foo, bar (>= 1.0)\" \"Conflicts: baz, "
+"fuzz\"</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
@@ -2480,12 +2491,12 @@ msgid ""
"the packages listed on the command line, set the <literal>APT::Cache::"
"GivenOnly</literal> option."
msgstr ""
-"<literal>dotty</literal> は、コマンドライン上のパッケージ名から、<ulink url="
-"\"http://www.research.att.com/sw/tools/graphviz/\">GraphViz</ulink> パッケー"
-"ジの dotty コマンドで利用するのに便利な出力を生成します。結果はパッケージの関"
-"係を表わす、ノード・エッジのセットで表現されます。デフォルトでは、すべての依"
-"存パッケージをトレースするので、非常に大きい図が得られます。コマンドラインに"
-"列挙したパッケージだけを出力するように制限するには、<literal>APT::Cache::"
+"<literal>dotty</literal> は、コマンドライン上のパッケージ名から、<ulink "
+"url=\"http://www.research.att.com/sw/tools/graphviz/\">GraphViz</ulink> パッ"
+"ケージの dotty コマンドで利用するのに便利な出力を生成します。結果はパッケージ"
+"の関係を表わす、ノード・エッジのセットで表現されます。デフォルトでは、すべて"
+"の依存パッケージをトレースするので、非常に大きい図が得られます。コマンドライ"
+"ンに列挙したパッケージだけを出力するように制限するには、<literal>APT::Cache::"
"GivenOnly</literal> をセットしてください。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -2509,8 +2520,9 @@ msgstr "注意) dotty は、パッケージのより大きなセットのグラ
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cache.8.xml
msgid ""
-"The same as <literal>dotty</literal>, only for xvcg from the <ulink url="
-"\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>."
+"The same as <literal>dotty</literal>, only for xvcg from the <ulink "
+"url=\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</"
+"ulink>."
msgstr ""
"<literal>dotty</literal> と同様ですが、<ulink url=\"http://rw4.cs.uni-sb.de/"
"users/sander/html/gsvcg1.html\">VCG tool</ulink> の xvcg 専用です。"
@@ -3001,6 +3013,72 @@ msgstr ""
"ます。とはいえ、<filename>trusted.gpg</filename> がプライマリキーリングになり"
"ます。つまり新しいキーはこのファイルに追加されます。"
+#. type: Content of: <refentry><refsect1><title>
+#: apt-key.8.xml
+#, fuzzy
+#| msgid "Operation"
+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;"
@@ -3602,8 +3680,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt-secure.8.xml
msgid ""
-"For more background information you might want to review the <ulink url="
-"\"https://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
+"For more background information you might want to review the <ulink "
+"url=\"https://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
"Security Infrastructure</ulink> chapter of the Securing Debian Manual (also "
"available in the harden-doc package) and the <ulink url=\"http://www."
"cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution HOWTO</"
@@ -4018,9 +4096,9 @@ msgstr ""
#| "tools such as bind and dhcp use. Lines starting with <literal>//</"
#| "literal> are treated as comments (ignored), as well as all text between "
#| "<literal>/*</literal> and <literal>*/</literal>, just like C/C++ "
-#| "comments. Each line is of the form <literal>APT::Get::Assume-Yes \"true"
-#| "\";</literal>. The quotation marks and trailing semicolon are required. "
-#| "The value must be on one line, and there is no kind of string "
+#| "comments. Each line is of the form <literal>APT::Get::Assume-Yes "
+#| "\"true\";</literal>. The quotation marks and trailing semicolon are "
+#| "required. The value must be on one line, and there is no kind of string "
#| "concatenation. Values must not include backslashes or extra quotation "
#| "marks. Option names are made up of alphanumeric characters and the "
#| "characters \"/-:._+\". A new scope can be opened with curly braces, like "
@@ -4039,13 +4117,13 @@ msgid ""
"opened with curly braces, like this:"
msgstr ""
"設定言語の構文は、bind や dhcp のような ISC ツールをモデルにしています。"
-"<literal>//</literal> で始まる行はコメントとして扱われます (無視)。同様に C/C"
-"++ のコメントのような <literal>/*</literal> と <literal>*/</literal> の間もコ"
-"メントとして扱います。いずれの行も、<literal>APT::Get::Assume-Yes \"true\";</"
-"literal> のような形式です。引用符と行末のセミコロンは必須です。値は1行でなけ"
-"ればならず、文字列結合はありません。値の中にバックスラッシュや余計な引用符が"
-"あってはいけません。オプション名は、英数字と \"/-:._+\" が使用できます。以下"
-"のように波カッコを使うと、新しいスコープを開くことができます。"
+"<literal>//</literal> で始まる行はコメントとして扱われます (無視)。同様に C/"
+"C++ のコメントのような <literal>/*</literal> と <literal>*/</literal> の間も"
+"コメントとして扱います。いずれの行も、<literal>APT::Get::Assume-Yes \"true\";"
+"</literal> のような形式です。引用符と行末のセミコロンは必須です。値は1行でな"
+"ければならず、文字列結合はありません。値の中にバックスラッシュや余計な引用符"
+"があってはいけません。オプション名は、英数字と \"/-:._+\" が使用できます。以"
+"下のように波カッコを使うと、新しいスコープを開くことができます。"
#. type: Content of: <refentry><refsect1><informalexample><programlisting>
#: apt.conf.5.xml
@@ -4715,10 +4793,10 @@ msgid ""
"literal> script in the configuration file. This entry specifies the commands "
"to send to tell the proxy server what to connect to. Please see "
"&configureindex; for an example of how to do this. The substitution "
-"variables representing the corresponding URI component are <literal>"
-"$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, <literal>"
-"$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, <literal>$(SITE)</"
-"literal> and <literal>$(SITE_PORT)</literal>."
+"variables representing the corresponding URI component are "
+"<literal>$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, "
+"<literal>$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, "
+"<literal>$(SITE)</literal> and <literal>$(SITE_PORT)</literal>."
msgstr ""
"<literal>ftp::Proxy</literal> は、FTP URI を使用する際のデフォルトプロキシを"
"設定します。<literal>ftp://[[user][:pass]@]host[:port]/</literal> という標準"
@@ -4729,10 +4807,10 @@ msgstr ""
"るには、設定ファイルに <literal>ftp::ProxyLogin</literal> スクリプトを設定す"
"る必要があります。このエントリには、接続する際にプロキシサーバに送信するコマ"
"ンドを設定します。どのようにするのかは &configureindex; の例を参照してくださ"
-"い。URI を構成するコンポーネントに対応する置換変数は、<literal>"
-"$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, <literal>"
-"$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, <literal>$(SITE)</"
-"literal>, <literal>$(SITE_PORT)</literal> です。"
+"い。URI を構成するコンポーネントに対応する置換変数は、"
+"<literal>$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, "
+"<literal>$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, "
+"<literal>$(SITE)</literal>, <literal>$(SITE_PORT)</literal> です。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml
@@ -4811,9 +4889,9 @@ msgstr ""
"うに、CD-ROM (または DVD など) ドライブのマウントポイントを <literal>cdrom::"
"Mount</literal> に設定しなければなりません。マウントポイントが fstab に記述で"
"きない場合、かわりにマウント・アンマウントコマンドも使用できます。構文は、"
-"<literal>cdrom</literal> ブロックを <placeholder type=\"literallayout\" id="
-"\"0\"/> の形で記述します。スラッシュを後につけるのが重要です。アンマウントコ"
-"マンドは UMount で指定することができます。"
+"<literal>cdrom</literal> ブロックを <placeholder type=\"literallayout\" "
+"id=\"0\"/> の形で記述します。スラッシュを後につけるのが重要です。アンマウント"
+"コマンドは UMount で指定することができます。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml
@@ -4846,8 +4924,8 @@ msgstr ""
"acquire メソッドは、<command>xz</command> や <command>gzip</command> 等の一般"
"的な多くの圧縮形式で展開、再圧縮できます。この設定項目ではサポートする圧縮形"
"式を参照、変更でき、サポートする圧縮形式をさらに追加することもできます (関連"
-"項目 <option>APT::Compressor</option>)。<placeholder type=\"synopsis\" id="
-"\"0\"/>"
+"項目 <option>APT::Compressor</option>)。<placeholder type=\"synopsis\" "
+"id=\"0\"/>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
#: apt.conf.5.xml
@@ -4987,8 +5065,8 @@ msgid ""
"specifies the languages. So the following example configuration will result "
"in the order \"en, de\" in an English locale or \"de, en\" in a German one. "
"Note that \"fr\" is downloaded, but not used unless APT is used in a French "
-"locale (where the order would be \"fr, de, en\"). <placeholder type="
-"\"programlisting\" id=\"0\"/>"
+"locale (where the order would be \"fr, de, en\"). <placeholder "
+"type=\"programlisting\" id=\"0\"/>"
msgstr ""
"デフォルトのリストには \"environment\" と \"en\" がありま"
"す。\"<literal>environment</literal>\" はここでは特殊な意味があります。これは"
@@ -5232,12 +5310,12 @@ msgstr ""
"ています。これは、ダウンロード済アーカイブの場所を示す <literal>Dir::Cache::"
"archives</literal> と同様に、<literal>srcpkgcache</literal> と "
"<literal>pkgcache</literal> のパッケージキャッシュの場所になります。"
-"<literal>pkgcache</literal> や <literal>srcpkgcache</literal> に <literal>"
-"\"\"</literal> をセットすることで、キャッシュの生成を無効にできます。これによ"
-"り起動時に遅くなりますが、ディスク容量を節約できます。おそらく、srcpkgcache "
-"よりも pkgcache を無効にすることが多いと思います。<literal>Dir::State</"
-"literal> と同様、<literal>Dir::Cache</literal> はデフォルトディレクトリを含ん"
-"でいます。"
+"<literal>pkgcache</literal> や <literal>srcpkgcache</literal> に "
+"<literal>\"\"</literal> をセットすることで、キャッシュの生成を無効にできま"
+"す。これにより起動時に遅くなりますが、ディスク容量を節約できます。おそらく、"
+"srcpkgcache よりも pkgcache を無効にすることが多いと思います。<literal>Dir::"
+"State</literal> と同様、<literal>Dir::Cache</literal> はデフォルトディレクト"
+"リを含んでいます。"
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml
@@ -5506,10 +5584,11 @@ msgid ""
"it should be read as \"no\" and users are encouraged to support both."
msgstr ""
"バージョン 3 では、各バージョンフィールドの後に、このバージョンのアーキテク"
-"チャが続きます。バージョンなしの場合は \"-\" 、そして MultiArch 型 \"same"
-"\"、\"foreign\"、\"allowed\" または \"none\" を示すフィールド。\"none\" は単"
-"に互換性を維持するために残された、誤った型名であることに注意してください。そ"
-"れは\"no\" と読まれるべきで、ユーザは両方をサポートすることをお勧めします。"
+"チャが続きます。バージョンなしの場合は \"-\" 、そして MultiArch 型 "
+"\"same\"、\"foreign\"、\"allowed\" または \"none\" を示すフィール"
+"ド。\"none\" は単に互換性を維持するために残された、誤った型名であることに注意"
+"してください。それは\"no\" と読まれるべきで、ユーザは両方をサポートすることを"
+"お勧めします。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml
@@ -6053,8 +6132,9 @@ msgid ""
"in the APT configuration file <filename>/etc/apt/apt.conf</filename>. Note "
"that this has precedence over any general priority you set in the <filename>/"
"etc/apt/preferences</filename> file described later, but not over "
-"specifically pinned packages. For example, <placeholder type="
-"\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>"
+"specifically pinned packages. For example, <placeholder "
+"type=\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" "
+"id=\"1\"/>"
msgstr ""
"プリファレンスファイルがなかったり、プリファレンスファイルに特定のパッケージ"
"を割り当てるエントリがない場合、そのバージョンの優先度は、そのバージョンが属"
@@ -6064,8 +6144,9 @@ msgstr ""
"コマンドラインや、APT 設定ファイル <filename>/etc/apt/apt.conf</filename> で"
"設定できます。後述する <filename>/etc/apt/preferences</filename> ファイルで設"
"定した一般優先度よりもこれは優先されますが、pin 止めしたパッケージには及ばな"
-"いことに注意してください。例えば以下のようになります。<placeholder type="
-"\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>"
+"いことに注意してください。例えば以下のようになります。<placeholder "
+"type=\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" "
+"id=\"1\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml
@@ -6409,8 +6490,8 @@ msgid ""
"This should <emphasis>not</emphasis> be confused with the Origin of a "
"distribution as specified in a <filename>Release</filename> file. What "
"follows the \"Origin:\" tag in a <filename>Release</filename> file is not an "
-"Internet address but an author or vendor name, such as \"Debian\" or \"Ximian"
-"\"."
+"Internet address but an author or vendor name, such as \"Debian\" or "
+"\"Ximian\"."
msgstr ""
"<filename>Release</filename> ファイルに指定されたような、ディストリビューショ"
"ンの Origin と <emphasis>混同しない</emphasis>ようにしてください。"
@@ -6446,9 +6527,9 @@ msgid ""
"belonging to any distribution whose Codename is \"<literal>&debian-testing-"
"codename;</literal>\"."
msgstr ""
-"以下のレコードは、コード名が \"<literal>&debian-testing-codename;</literal>"
-"\" となっているディストリビューションに属するパッケージのバージョンを、高い優"
-"先度に割り当てます。"
+"以下のレコードは、コード名が \"<literal>&debian-testing-codename;</"
+"literal>\" となっているディストリビューションに属するパッケージのバージョン"
+"を、高い優先度に割り当てます。"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
#: apt_preferences.5.xml
@@ -7213,8 +7294,8 @@ msgid ""
msgstr ""
"以下のコマンドで、指定したパッケージを <literal>testing</literal> ディストリ"
"ビューションの最新バージョンにアップグレードします。このパッケージは、再度こ"
-"のコマンドを発行しないとアップグレードされません。<placeholder type="
-"\"programlisting\" id=\"0\"/>"
+"のコマンドを発行しないとアップグレードされません。<placeholder "
+"type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt_preferences.5.xml
@@ -7256,8 +7337,8 @@ msgid ""
"to package versions from the <literal>testing</literal> distribution, a "
"lower priority to package versions from the <literal>unstable</literal> "
"distribution, and a prohibitively low priority to package versions from "
-"other <literal>Debian</literal> distributions. <placeholder type="
-"\"programlisting\" id=\"0\"/>"
+"other <literal>Debian</literal> distributions. <placeholder "
+"type=\"programlisting\" id=\"0\"/>"
msgstr ""
"以下の APT プリファレンスファイルは、<literal>testing</literal> ディストリ"
"ビューションのパッケージのバージョンに高い優先度を割り当て、"
@@ -7300,8 +7381,8 @@ msgstr ""
"get upgrade</command> は <literal>testing</literal> バージョンのパッケージが"
"更新されていれば <literal>testing</literal> の最新版に、<literal>unstable</"
"literal> バージョンのパッケージが更新されていれば <literal>unstable</"
-"literal> の最新版にアップグレードします。<placeholder type=\"programlisting"
-"\" id=\"0\"/>"
+"literal> の最新版にアップグレードします。<placeholder "
+"type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt_preferences.5.xml
@@ -7376,8 +7457,8 @@ msgid ""
msgstr ""
"適切な &sources-list; ファイルと上記のプリファレンスファイルにより、以下のコ"
"マンドのいずれかで、リリースコード名が <literal>&debian-testing-codename;</"
-"literal> である最新バージョンにアップグレードできます。<placeholder type="
-"\"programlisting\" id=\"0\"/>"
+"literal> である最新バージョンにアップグレードできます。<placeholder "
+"type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#: apt_preferences.5.xml
@@ -7678,8 +7759,8 @@ msgid ""
"Alternatively the equivalent entry in deb822 style looks like this: "
"<placeholder type=\"literallayout\" id=\"0\"/>"
msgstr ""
-"他に deb822 スタイルで同等のエントリもサポートしています: <placeholder type="
-"\"literallayout\" id=\"0\"/>"
+"他に deb822 スタイルで同等のエントリもサポートしています: <placeholder "
+"type=\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml
@@ -7776,8 +7857,8 @@ msgid ""
msgstr ""
"例として、あなたのディストリビューション用のソースは、1 行スタイル形式で次の"
"ようになります: <placeholder type=\"literallayout\" id=\"0\"/> または deb822 "
-"スタイル形式でこのようになります: <placeholder type=\"literallayout\" id="
-"\"1\"/>"
+"スタイル形式でこのようになります: <placeholder type=\"literallayout\" "
+"id=\"1\"/>"
#. type: Content of: <refentry><refsect1><title>
#: sources.list.5.xml
@@ -8000,20 +8081,23 @@ 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 "
-"<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 "
-"keyrings are selected. A fingerprint will accept also all signatures by a "
-"subkey of this key, if this isn't desired an exclamation mark (<literal>!</"
-"literal>) can be appended to the fingerprint to disable this behaviour. The "
-"option defaults to the value of the option with the same name if set in the "
-"previously acquired <filename>Release</filename> file of this repository "
-"(only fingerprints can be specified there through). Otherwise all keys in "
-"the trusted keyrings are considered valid signers for this repository. The "
-"option may also be set directly to an embedded GPG public key block. Special "
-"care is needed to encode the empty line with leading spaces and \".\": "
-"<placeholder type=\"literallayout\" id=\"0\"/>"
+"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 keyrings are selected. A "
+"fingerprint will accept also all signatures by a subkey of this key, if this "
+"isn't desired an exclamation mark (<literal>!</literal>) can be appended to "
+"the fingerprint to disable this behaviour. The option defaults to the value "
+"of the option with the same name if set in the previously acquired "
+"<filename>Release</filename> file of this repository (only fingerprints can "
+"be specified there through). Otherwise all keys in the trusted keyrings are "
+"considered valid signers for this repository. The option may also be set "
+"directly to an embedded GPG public key block. Special care is needed to "
+"encode the empty line with leading spaces and \".\": <placeholder "
+"type=\"literallayout\" id=\"0\"/>"
msgstr ""
"<option>Signed-By</option> (<option>signed-by</option>) は、(<literal>_apt</"
"literal> ユーザがアクセス可能かつ読み取り可能な必要があり、つまりすべてのユー"
@@ -8565,8 +8649,8 @@ msgstr ""
"amd64</filename> 以下にあるファイル、その他サポートするアーキテクチャごとの"
"ファイルのみ使用します。[このサンプルは変数展開の使用法の説明でしかないことに"
"注意してください。公式 debian アーカイブはこのような構造になっていません] "
-"<placeholder type=\"literallayout\" id=\"0\"/> <placeholder type="
-"\"literallayout\" id=\"1\"/>"
+"<placeholder type=\"literallayout\" id=\"0\"/> <placeholder "
+"type=\"literallayout\" id=\"1\"/>"
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml
@@ -9138,11 +9222,11 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml
msgid ""
-"Sets the top of the source package directory tree. Defaults to <filename>"
-"$(DIST)/$(SECTION)/source/</filename>"
+"Sets the top of the source package directory tree. Defaults to "
+"<filename>$(DIST)/$(SECTION)/source/</filename>"
msgstr ""
-"ソースパッケージディレクトリツリーの先頭を設定します。デフォルトは <filename>"
-"$(DIST)/$(SECTION)/source/</filename> です。"
+"ソースパッケージディレクトリツリーの先頭を設定します。デフォルトは "
+"<filename>$(DIST)/$(SECTION)/source/</filename> です。"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml
@@ -9166,8 +9250,8 @@ msgstr ""
#: apt-ftparchive.1.xml
msgid ""
"Sets the output Translation-en master file with the long descriptions if "
-"they should be not included in the Packages file. Defaults to <filename>"
-"$(DIST)/$(SECTION)/i18n/Translation-en</filename>"
+"they should be not included in the Packages file. Defaults to "
+"<filename>$(DIST)/$(SECTION)/i18n/Translation-en</filename>"
msgstr ""
"万一 Packages ファイルに含まれていない場合、長い説明文がある Translation-en "
"マスターファイルの出力先を設定します。デフォルトは、<filename>$(DIST)/"
@@ -9294,8 +9378,8 @@ msgstr ""
#: apt-ftparchive.1.xml
msgid ""
"When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
-"command> performs an operation similar to: <placeholder type=\"programlisting"
-"\" id=\"0\"/>"
+"command> performs an operation similar to: <placeholder "
+"type=\"programlisting\" id=\"0\"/>"
msgstr ""
"<literal>Tree</literal> セクションを処理する際、<command>apt-ftparchive</"
"command> は以下のような操作を行います。<placeholder type=\"programlisting\" "
@@ -9454,19 +9538,19 @@ msgstr "new"
#. type: Content of: <refentry><refsect1><para>
#: apt-ftparchive.1.xml
msgid ""
-"The general form of the maintainer field is: <placeholder type="
-"\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
-"id=\"1\"/> The first form allows a double-slash separated list of old email "
-"addresses to be specified. If any of those are found then new is substituted "
-"for the maintainer field. The second form unconditionally substitutes the "
-"maintainer field."
-msgstr ""
-"メンテナフィールドの一般的な形は以下のようになります。<placeholder type="
-"\"literallayout\" id=\"0\"/> また単純に以下のようにもなります。<placeholder "
-"type=\"literallayout\" id=\"1\"/>最初の形式は、// で区切られた古い email アド"
-"レスのリストを許可します。この形式がある場合は、メンテナフィールドになるよう "
-"new に置換してください。2 番目の形式は無条件にメンテナフィールドに置換しま"
-"す。"
+"The general form of the maintainer field is: <placeholder "
+"type=\"literallayout\" id=\"0\"/> or simply, <placeholder "
+"type=\"literallayout\" id=\"1\"/> The first form allows a double-slash "
+"separated list of old email addresses to be specified. If any of those are "
+"found then new is substituted for the maintainer field. The second form "
+"unconditionally substitutes the maintainer field."
+msgstr ""
+"メンテナフィールドの一般的な形は以下のようになります。<placeholder "
+"type=\"literallayout\" id=\"0\"/> また単純に以下のようにもなります。"
+"<placeholder type=\"literallayout\" id=\"1\"/>最初の形式は、// で区切られた古"
+"い email アドレスのリストを許可します。この形式がある場合は、メンテナフィール"
+"ドになるよう new に置換してください。2 番目の形式は無条件にメンテナフィールド"
+"に置換します。"
#. type: Content of: <refentry><refsect1><title>
#: apt-ftparchive.1.xml
@@ -9835,8 +9919,8 @@ msgid ""
"password <literal>debian</literal> for the &sources-list; entry <placeholder "
"type=\"literallayout\" id=\"0\"/> could be done in the entry directly: "
"<placeholder type=\"literallayout\" id=\"1\"/> Alternatively an entry like "
-"the following in the auth.conf file could be used: <placeholder type="
-"\"literallayout\" id=\"2\"/> Or alternatively within a single line: "
+"the following in the auth.conf file could be used: <placeholder "
+"type=\"literallayout\" id=\"2\"/> Or alternatively within a single line: "
"<placeholder type=\"literallayout\" id=\"3\"/> If you need to be more "
"specific all of these lines will also apply to the example entry: "
"<placeholder type=\"literallayout\" id=\"4\"/> On the other hand neither of "
@@ -9931,10 +10015,10 @@ msgstr ""
msgid ""
"HTTP is an unencrypted transport protocol meaning that the whole "
"communication with the remote server (or proxy) can be observed by a "
-"sufficiently capable attacker commonly referred to as a \"man in the middle"
-"\" (MITM). However, such an attacker can <emphasis>not</emphasis> modify "
-"the communication to compromise the security of your system, as APT's data "
-"security model is independent of the chosen transport method. This is "
+"sufficiently capable attacker commonly referred to as a \"man in the "
+"middle\" (MITM). However, such an attacker can <emphasis>not</emphasis> "
+"modify the communication to compromise the security of your system, as APT's "
+"data security model is independent of the chosen transport method. This is "
"explained in detail in &apt-secure;. An overview of available transport "
"methods is given in &sources-list;."
msgstr ""
@@ -11573,9 +11657,9 @@ msgid ""
"from the <emphasis>Sources</emphasis> so that it knows what packages are "
"available. This is done with <literal>apt-get update</literal>. For instance,"
msgstr ""
-"<command>apt-get</command> を使う前にまずやるべきことは<placeholder type="
-"\"footnote\" id=\"0\"/>パッケージ一覧を<emphasis>ソース</emphasis>から取得す"
-"ることで、それにより利用できるパッケージがわかるようになります。これには "
+"<command>apt-get</command> を使う前にまずやるべきことは<placeholder "
+"type=\"footnote\" id=\"0\"/>パッケージ一覧を<emphasis>ソース</emphasis>から取"
+"得することで、それにより利用できるパッケージがわかるようになります。これには "
"<literal>apt-get update</literal> を実行します。例えば"
#. type: Content of: <book><chapter><screen>
@@ -11915,10 +11999,10 @@ msgstr ""
msgid ""
"Both that APT <command>dselect</command> method and <command>apt-get</"
"command> share the same interface. It is a simple system that generally "
-"tells you what it will do and then goes and does it. <placeholder type="
-"\"footnote\" id=\"0\"/> After printing out a summary of what will happen APT "
-"then will print out some informative status messages so that you can "
-"estimate how far along it is and how much is left to do."
+"tells you what it will do and then goes and does it. <placeholder "
+"type=\"footnote\" id=\"0\"/> After printing out a summary of what will "
+"happen APT then will print out some informative status messages so that you "
+"can estimate how far along it is and how much is left to do."
msgstr ""
"APT の <command>dselect</command> メソッドと <command>apt-get</command> は共"
"に同一のインターフェイスを共有しています。通常は行う内容を告知して実行する簡"
@@ -12047,10 +12131,10 @@ msgstr ""
msgid ""
"There are two ways a system can get into a broken state like this. The first "
"is caused by <command>dpkg</command> missing some subtle relationships "
-"between packages when performing upgrades. <placeholder type=\"footnote\" id="
-"\"0\"/>. The second is if a package installation fails during an operation. "
-"In this situation a package may have been unpacked without its dependents "
-"being installed."
+"between packages when performing upgrades. <placeholder type=\"footnote\" "
+"id=\"0\"/>. The second is if a package installation fails during an "
+"operation. In this situation a package may have been unpacked without its "
+"dependents being installed."
msgstr ""
"システムがこのように壊れた状態となる原因は2つあります。1つ目はアップグレード"
"実行時にパッケージ間の難解な依存関係を <command>dpkg</command> がいくらか欠い"
diff --git a/doc/po/nl.po b/doc/po/nl.po
index 6162181ef..12190f8b3 100644
--- a/doc/po/nl.po
+++ b/doc/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-doc 2.3.11\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2022-01-06 20:58+0100\n"
+"POT-Creation-Date: 2022-02-22 20:01+0100\n"
"PO-Revision-Date: 2021-10-25 12:46+0200\n"
"Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
"Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
@@ -414,13 +414,24 @@ msgstr ""
#. type: Plain text
#: apt.ent
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
+#| " <listitem><para>File fragments for the trusted keys, additional keyrings can\n"
+#| " be stored here (by other packages or the administrator).\n"
+#| " Configuration Item <literal>Dir::Etc::TrustedParts</literal>.</para></listitem>\n"
+#| " </varlistentry>\n"
+#| "\">\n"
msgid ""
" <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
" <listitem><para>File fragments for the trusted keys, additional keyrings can\n"
" be stored here (by other packages or the administrator).\n"
" 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 ""
" <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
@@ -538,8 +549,8 @@ msgid ""
"\"target_release\">"
msgstr ""
"<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release e.g. -"
-"t=squeeze apt/experimental --> <!ENTITY synopsis-target-release \"doelrelease"
-"\">"
+"t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
+"\"doelrelease\">"
#. type: Plain text
#: apt.ent
@@ -868,8 +879,8 @@ msgstr ""
#: apt.8.xml
msgid ""
"<option>satisfy</option> satisfies dependency strings, as used in Build-"
-"Depends. It also handles conflicts, by prefixing an argument with <literal>"
-"\"Conflicts: \"</literal>."
+"Depends. It also handles conflicts, by prefixing an argument with "
+"<literal>\"Conflicts: \"</literal>."
msgstr ""
"<option>satisfy</option> voldoet aan vereistentekenreeksen, zoals die in "
"Build-Depends gebruikt worden. Behandelt ook conflicten wanneer voor een "
@@ -878,11 +889,11 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.8.xml
msgid ""
-"Example: <literal>apt satisfy \"foo, bar (>= 1.0)\" \"Conflicts: baz, fuzz"
-"\"</literal>"
+"Example: <literal>apt satisfy \"foo, bar (>= 1.0)\" \"Conflicts: baz, "
+"fuzz\"</literal>"
msgstr ""
-"Voorbeeld: <literal>apt satisfy \"foo, bar (>= 1.0)\" \"Conflicts: baz, fuzz"
-"\"</literal>"
+"Voorbeeld: <literal>apt satisfy \"foo, bar (>= 1.0)\" \"Conflicts: baz, "
+"fuzz\"</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt.8.xml
@@ -2669,8 +2680,9 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cache.8.xml
msgid ""
-"The same as <literal>dotty</literal>, only for xvcg from the <ulink url="
-"\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>."
+"The same as <literal>dotty</literal>, only for xvcg from the <ulink "
+"url=\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</"
+"ulink>."
msgstr ""
"Hetzelfde als <literal>dotty</literal>, maar dan voor xvcg uit het <ulink "
"url=\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG "
@@ -2913,8 +2925,8 @@ msgstr ""
"gecomprimeerd worden in elk formaat dat door apt ondersteund wordt, zolang "
"ze de correcte extensie hebben. Indien u in één map meerdere van deze "
"bestanden moet opslaan, kunt u aan de naam een voorvoegsel naar keuze "
-"toevoegen met als laatste letter een liggend streepje (\"<literal>_</literal>"
-"\"). Bijvoorbeeld: mijn.voorbeeld_Packages.xz"
+"toevoegen met als laatste letter een liggend streepje (\"<literal>_</"
+"literal>\"). Bijvoorbeeld: mijn.voorbeeld_Packages.xz"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cache.8.xml
@@ -3184,6 +3196,72 @@ msgstr ""
"de primaire sleutelbos is, wat betekent dat bijvoorbeeld alle nieuwe "
"sleutels daar toegevoegd worden."
+#. type: Content of: <refentry><refsect1><title>
+#: apt-key.8.xml
+#, fuzzy
+#| msgid "Operation"
+msgid "Deprecation"
+msgstr "Werking"
+
+#. 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;"
@@ -3821,8 +3899,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt-secure.8.xml
msgid ""
-"For more background information you might want to review the <ulink url="
-"\"https://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
+"For more background information you might want to review the <ulink "
+"url=\"https://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
"Security Infrastructure</ulink> chapter of the Securing Debian Manual (also "
"available in the harden-doc package) and the <ulink url=\"http://www."
"cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution HOWTO</"
@@ -4851,10 +4929,10 @@ msgstr ""
"<literal>Date</literal>), dat het als geldig beschouwd moet worden. Indien "
"het Release-bestand zelf een koptekst <literal>Valid-Until</literal> bevat "
"wordt de meest recente van beide data als vervaldatum genomen. De "
-"standaardwaarde is <literal>0</literal> hetgeen staat voor \"onbeperkt geldig"
-"\". Archiefspecifieke instellingen kunnen aangemaakt worden door de naam van "
-"het archief toe te voegen aan de optienaam. Hetzelfde effect kan voor "
-"specifieke regels uit &sources-list; bereikt worden door daar de optie "
+"standaardwaarde is <literal>0</literal> hetgeen staat voor \"onbeperkt "
+"geldig\". Archiefspecifieke instellingen kunnen aangemaakt worden door de "
+"naam van het archief toe te voegen aan de optienaam. Hetzelfde effect kan "
+"voor specifieke regels uit &sources-list; bereikt worden door daar de optie "
"<option>Valid-Until-Max</option> te gebruiken, wat bij voorkeur gedaan zou "
"moeten worden."
@@ -5010,10 +5088,10 @@ msgid ""
"literal> script in the configuration file. This entry specifies the commands "
"to send to tell the proxy server what to connect to. Please see "
"&configureindex; for an example of how to do this. The substitution "
-"variables representing the corresponding URI component are <literal>"
-"$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, <literal>"
-"$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, <literal>$(SITE)</"
-"literal> and <literal>$(SITE_PORT)</literal>."
+"variables representing the corresponding URI component are "
+"<literal>$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, "
+"<literal>$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, "
+"<literal>$(SITE)</literal> and <literal>$(SITE_PORT)</literal>."
msgstr ""
"<literal>ftp::Proxy</literal> stelt de te gebruiken standaard-proxy in voor "
"URI's van het type FTP. De standaardvorm ervan is <literal>ftp://[[user][:"
@@ -5027,10 +5105,10 @@ msgstr ""
"omschrijft de te verzenden commando's die de proxy-server moeten laten weten "
"waarmee hij een verbinding moet maken. Raadpleeg &configureindex; voor een "
"voorbeeld van hoe dit moet gedaan worden. De substitutievariabelen die de "
-"overeenkomstige URI-component vertegenwoordigen, zijn <literal>"
-"$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, <literal>"
-"$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, <literal>$(SITE)</"
-"literal> en <literal>$(SITE_PORT)</literal>."
+"overeenkomstige URI-component vertegenwoordigen, zijn "
+"<literal>$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, "
+"<literal>$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, "
+"<literal>$(SITE)</literal> en <literal>$(SITE_PORT)</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml
@@ -5115,9 +5193,9 @@ msgstr ""
"(of DVD-station of wat dan ook) zijn zoals vermeld in <filename>/etc/fstab</"
"filename>. Het is mogelijk om te voorzien in vervangende commando's voor de "
"aankoppelings- en afkoppelingsoperaties als het niet mogelijk is om het "
-"aankoppelpunt in fstab op te nemen. De syntaxis is om <placeholder type="
-"\"literallayout\" id=\"0\"/> binnen het <literal>cdrom</literal>-blok te "
-"plaatsen. Het is belangrijk dat ook de nakomende slash gebruikt wordt. "
+"aankoppelpunt in fstab op te nemen. De syntaxis is om <placeholder "
+"type=\"literallayout\" id=\"0\"/> binnen het <literal>cdrom</literal>-blok "
+"te plaatsen. Het is belangrijk dat ook de nakomende slash gebruikt wordt. "
"Afkoppelingsopdrachten kunnen opgegeven worden door UMount te gebruiken."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -5191,8 +5269,8 @@ msgstr ""
"compressietype proberen en als dat mislukt het volgende uit deze lijst. Om "
"dus een type boven een ander te laten verkiezen moet u het gewoon vooraan in "
"de lijst plaatsen. Nog niet vermelde standaardtypes zullen impliciet aan het "
-"einde van de lijst toegevoegd worden. Zo kan bijvoorbeeld <placeholder type="
-"\"synopsis\" id=\"0\"/> gebruikt worden om met <command>gzip</command> "
+"einde van de lijst toegevoegd worden. Zo kan bijvoorbeeld <placeholder "
+"type=\"synopsis\" id=\"0\"/> gebruikt worden om met <command>gzip</command> "
"gecomprimeerde bestanden te verkiezen boven alle andere formaten. Indien "
"<command>xz</command> moet verkozen worden boven <command>gzip</command> en "
"<command>bzip2</command>, moet de configuratie-instelling er als volgt "
@@ -5226,8 +5304,8 @@ msgstr ""
"Indien deze optie ingesteld werd en ondersteuning voor dit formaat niet "
"rechtstreeks ingebouwd is in apt, zal de methode enkel gebruikt worden "
"indien dat bestand bestaat. Voor de methode <literal>bzip2</literal> "
-"bijvoorbeeld, is de (ingebouwde) instelling: <placeholder type="
-"\"literallayout\" id=\"0\"/>. Merk ook op dat de lijstitems die aan de "
+"bijvoorbeeld, is de (ingebouwde) instelling: <placeholder "
+"type=\"literallayout\" id=\"0\"/>. Merk ook op dat de lijstitems die aan de "
"commandoregel opgegeven worden, toegevoegd zullen worden achteraan de lijst "
"die in de configuratiebestanden vermeld wordt, maar voorafgaand aan de "
"standaarditems. Om in dit geval een type boven die uit de "
@@ -5304,8 +5382,8 @@ msgid ""
"specifies the languages. So the following example configuration will result "
"in the order \"en, de\" in an English locale or \"de, en\" in a German one. "
"Note that \"fr\" is downloaded, but not used unless APT is used in a French "
-"locale (where the order would be \"fr, de, en\"). <placeholder type="
-"\"programlisting\" id=\"0\"/>"
+"locale (where the order would be \"fr, de, en\"). <placeholder "
+"type=\"programlisting\" id=\"0\"/>"
msgstr ""
"De lijst bevat standaard \"environment\" en \"en\". \"<literal>environment</"
"literal>\" heeft hier een speciale betekenis: op het moment van uitvoering "
@@ -6463,8 +6541,9 @@ msgid ""
"in the APT configuration file <filename>/etc/apt/apt.conf</filename>. Note "
"that this has precedence over any general priority you set in the <filename>/"
"etc/apt/preferences</filename> file described later, but not over "
-"specifically pinned packages. For example, <placeholder type="
-"\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>"
+"specifically pinned packages. For example, <placeholder "
+"type=\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" "
+"id=\"1\"/>"
msgstr ""
"Indien het bestand preferences niet bestaat of indien het geen item bevat "
"dat op een specifieke versie betrekking heeft, dan wordt aan die versie de "
@@ -6477,8 +6556,8 @@ msgstr ""
"gelijk welke algemene prioriteitsinstelling die u vastlegt in het bestand "
"<filename>/etc/apt/preferences</filename> waarover we het later hebben, maar "
"geen voorrang op specifieke gepinde pakketten. Bijvoorbeeld <placeholder "
-"type=\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" id="
-"\"1\"/>"
+"type=\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" "
+"id=\"1\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml
@@ -6849,8 +6928,8 @@ msgid ""
"This should <emphasis>not</emphasis> be confused with the Origin of a "
"distribution as specified in a <filename>Release</filename> file. What "
"follows the \"Origin:\" tag in a <filename>Release</filename> file is not an "
-"Internet address but an author or vendor name, such as \"Debian\" or \"Ximian"
-"\"."
+"Internet address but an author or vendor name, such as \"Debian\" or "
+"\"Ximian\"."
msgstr ""
"Men mag dit <emphasis>niet</emphasis> verwarren met de oorsprong (Origin) "
"van een distributie zoals die in een <filename>Release</filename>-bestand "
@@ -7040,9 +7119,9 @@ msgstr ""
"vervangen zou worden door een lijst met alle pakketnamen die ermee "
"overeenkomen. Het is nog niet beslist of dit in de toekomst anders zal "
"worden. U moet dus altijd jokertekenpins eerst plaatsen, zodat latere "
-"specifieke pins die kunnen overschrijven. Het patroon \"<literal>*</literal>"
-"\" in een Package-veld wordt op zichzelf niet als een &glob;-expressie "
-"beschouwd."
+"specifieke pins die kunnen overschrijven. Het patroon \"<literal>*</"
+"literal>\" in een Package-veld wordt op zichzelf niet als een &glob;-"
+"expressie beschouwd."
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml
@@ -7731,8 +7810,8 @@ msgid ""
"to package versions from the <literal>testing</literal> distribution, a "
"lower priority to package versions from the <literal>unstable</literal> "
"distribution, and a prohibitively low priority to package versions from "
-"other <literal>Debian</literal> distributions. <placeholder type="
-"\"programlisting\" id=\"0\"/>"
+"other <literal>Debian</literal> distributions. <placeholder "
+"type=\"programlisting\" id=\"0\"/>"
msgstr ""
"Het volgende preferences-bestand van APT doet APT een hoge prioriteit "
"toekennen aan pakketversies uit de distributie <literal>testing</literal>, "
@@ -7842,8 +7921,8 @@ msgstr ""
"literal> naar <literal>stable</literal> en later <literal>oldstable</"
"literal>. Indien u bijvoorbeeld de voortgang in <literal>testing</literal> "
"wilt volgen ongeacht de veranderende codenaam, dan moet u de hierboven "
-"gegeven configuratievoorbeelden gebruiken. <placeholder type=\"programlisting"
-"\" id=\"0\"/>"
+"gegeven configuratievoorbeelden gebruiken. <placeholder "
+"type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml
@@ -7856,8 +7935,8 @@ msgstr ""
"Met een passend bestand &sources-list; en het bovenstaande preferences-"
"bestand, zal elk van de volgende commando's APT ertoe aanzetten om op te "
"waarderen naar de nieuwste versie(s) uit de release met de codenaam "
-"<literal>&debian-testing-codename;</literal>. <placeholder type="
-"\"programlisting\" id=\"0\"/>"
+"<literal>&debian-testing-codename;</literal>. <placeholder "
+"type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#: apt_preferences.5.xml
@@ -8266,8 +8345,8 @@ msgid ""
"this in deb822 style format: <placeholder type=\"literallayout\" id=\"1\"/>"
msgstr ""
"Bij wijze van voorbeeld zouden de pakketbronnen voor uw distributie er als "
-"volgt kunnen uitzien met de indeling in de één-regelstijl: <placeholder type="
-"\"literallayout\" id=\"0\"/> en als volgt met de indeling in de deb822-"
+"volgt kunnen uitzien met de indeling in de één-regelstijl: <placeholder "
+"type=\"literallayout\" id=\"0\"/> en als volgt met de indeling in de deb822-"
"stijl: <placeholder type=\"literallayout\" id=\"1\"/>"
#. type: Content of: <refentry><refsect1><title>
@@ -8504,6 +8583,29 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
#: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "<option>Signed-By</option> (<option>signed-by</option>) is an option to "
+#| "require a repository to pass &apt-secure; verification with a certain set "
+#| "of keys rather than all trusted keys apt has configured. It is specified "
+#| "as a 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 "
+#| "<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 "
+#| "keyrings are selected. A fingerprint will accept also all signatures by a "
+#| "subkey of this key, if this isn't desired an exclamation mark (<literal>!"
+#| "</literal>) can be appended to the fingerprint to disable this "
+#| "behaviour. The option defaults to the value of the option with the same "
+#| "name if set in the previously acquired <filename>Release</filename> file "
+#| "of this repository (only fingerprints can be specified there through). "
+#| "Otherwise all keys in the trusted keyrings are considered valid signers "
+#| "for this repository. The option may also be set directly to an embedded "
+#| "GPG public key block. Special care is needed to encode the empty line "
+#| "with leading spaces and \".\": <placeholder type=\"literallayout\" "
+#| "id=\"0\"/>"
msgid ""
"<option>Signed-By</option> (<option>signed-by</option>) is an option to "
"require a repository to pass &apt-secure; verification with a certain set of "
@@ -8511,20 +8613,23 @@ 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 "
-"<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 "
-"keyrings are selected. A fingerprint will accept also all signatures by a "
-"subkey of this key, if this isn't desired an exclamation mark (<literal>!</"
-"literal>) can be appended to the fingerprint to disable this behaviour. The "
-"option defaults to the value of the option with the same name if set in the "
-"previously acquired <filename>Release</filename> file of this repository "
-"(only fingerprints can be specified there through). Otherwise all keys in "
-"the trusted keyrings are considered valid signers for this repository. The "
-"option may also be set directly to an embedded GPG public key block. Special "
-"care is needed to encode the empty line with leading spaces and \".\": "
-"<placeholder type=\"literallayout\" id=\"0\"/>"
+"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 keyrings are selected. A "
+"fingerprint will accept also all signatures by a subkey of this key, if this "
+"isn't desired an exclamation mark (<literal>!</literal>) can be appended to "
+"the fingerprint to disable this behaviour. The option defaults to the value "
+"of the option with the same name if set in the previously acquired "
+"<filename>Release</filename> file of this repository (only fingerprints can "
+"be specified there through). Otherwise all keys in the trusted keyrings are "
+"considered valid signers for this repository. The option may also be set "
+"directly to an embedded GPG public key block. Special care is needed to "
+"encode the empty line with leading spaces and \".\": <placeholder "
+"type=\"literallayout\" id=\"0\"/>"
msgstr ""
"<option>Signed-By</option> (<option>signed-by</option>) is een optie die van "
"een pakketbron vereist dat de verificatie door &apt-secure; gebeurt aan de "
@@ -8549,8 +8654,8 @@ msgstr ""
"betrouwbare sleutelbossen als geldige ondertekenaars van deze pakketbron "
"aanzien. De optie kan ook rechtstreeks worden ingesteld op een ingebed blok "
"van een GPG-publieke sleutel. Speciale zorg is nodig om de lege regel te "
-"coderen met voorloopspaties en \".\": <placeholder type=\"literallayout\" id="
-"\"0\"/>"
+"coderen met voorloopspaties en \".\": <placeholder type=\"literallayout\" "
+"id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
#: sources.list.5.xml
@@ -9140,8 +9245,9 @@ msgstr ""
"computers bestanden onder <filename>unstable/binary-amd64</filename> en zo "
"verder voor andere ondersteunde architecturen. [Merk op dat dit voorbeeld "
"enkel toont hoe de substitutievariabele moet gebruikt worden; officiële "
-"debian-archieven worden niet op die manier georganiseerd] <placeholder type="
-"\"literallayout\" id=\"0\"/> <placeholder type=\"literallayout\" id=\"1\"/>"
+"debian-archieven worden niet op die manier georganiseerd] <placeholder "
+"type=\"literallayout\" id=\"0\"/> <placeholder type=\"literallayout\" "
+"id=\"1\"/>"
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml
@@ -9746,8 +9852,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml
msgid ""
-"Sets the top of the source package directory tree. Defaults to <filename>"
-"$(DIST)/$(SECTION)/source/</filename>"
+"Sets the top of the source package directory tree. Defaults to "
+"<filename>$(DIST)/$(SECTION)/source/</filename>"
msgstr ""
"Stelt de basis in van de mappenboom van broncodepakketten. Standaard is dat "
"<filename>$(DIST)/$(SECTION)/source/</filename>"
@@ -9774,8 +9880,8 @@ msgstr ""
#: apt-ftparchive.1.xml
msgid ""
"Sets the output Translation-en master file with the long descriptions if "
-"they should be not included in the Packages file. Defaults to <filename>"
-"$(DIST)/$(SECTION)/i18n/Translation-en</filename>"
+"they should be not included in the Packages file. Defaults to "
+"<filename>$(DIST)/$(SECTION)/i18n/Translation-en</filename>"
msgstr ""
"Stelt in waar het hoofdbestand Translation-en geschreven wordt met daarin de "
"uitgebreide beschrijvingen in het geval die niet in het bestand Packages "
@@ -9914,8 +10020,8 @@ msgstr ""
#: apt-ftparchive.1.xml
msgid ""
"When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
-"command> performs an operation similar to: <placeholder type=\"programlisting"
-"\" id=\"0\"/>"
+"command> performs an operation similar to: <placeholder "
+"type=\"programlisting\" id=\"0\"/>"
msgstr ""
"Als <command>apt-ftparchive</command> een <literal>Tree</literal>-sectie "
"verwerkt, voert het een operatie uit die vergelijkbaar is met: <placeholder "
@@ -10078,20 +10184,20 @@ msgstr "nieuwe"
#. type: Content of: <refentry><refsect1><para>
#: apt-ftparchive.1.xml
msgid ""
-"The general form of the maintainer field is: <placeholder type="
-"\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
-"id=\"1\"/> The first form allows a double-slash separated list of old email "
-"addresses to be specified. If any of those are found then new is substituted "
-"for the maintainer field. The second form unconditionally substitutes the "
-"maintainer field."
-msgstr ""
-"De algemene vorm van het onderhouder-veld is: <placeholder type="
-"\"literallayout\" id=\"0\"/>, of gewoon <placeholder type=\"literallayout\" "
-"id=\"1\"/> De eerste vorm laat toe om een lijst van oude e-mailadressen, van "
-"elkaar gescheiden door een dubbele slash, op te geven. Indien een ervan "
-"aangetroffen wordt, dan zal nieuw als de nieuwe waarde voor het onderhouder-"
-"veld gebruikt worden. De tweede vorm vervangt onvoorwaardelijk de inhoud van "
-"het onderhouder-veld."
+"The general form of the maintainer field is: <placeholder "
+"type=\"literallayout\" id=\"0\"/> or simply, <placeholder "
+"type=\"literallayout\" id=\"1\"/> The first form allows a double-slash "
+"separated list of old email addresses to be specified. If any of those are "
+"found then new is substituted for the maintainer field. The second form "
+"unconditionally substitutes the maintainer field."
+msgstr ""
+"De algemene vorm van het onderhouder-veld is: <placeholder "
+"type=\"literallayout\" id=\"0\"/>, of gewoon <placeholder "
+"type=\"literallayout\" id=\"1\"/> De eerste vorm laat toe om een lijst van "
+"oude e-mailadressen, van elkaar gescheiden door een dubbele slash, op te "
+"geven. Indien een ervan aangetroffen wordt, dan zal nieuw als de nieuwe "
+"waarde voor het onderhouder-veld gebruikt worden. De tweede vorm vervangt "
+"onvoorwaardelijk de inhoud van het onderhouder-veld."
#. type: Content of: <refentry><refsect1><title>
#: apt-ftparchive.1.xml
@@ -10260,11 +10366,11 @@ msgstr ""
"maar in de buffer aanwezige metadata, zoals grootte en controlesommen, "
"gebruikt zullen worden. Indien deze optie aangezet wordt, zal dit niet meer "
"gebeuren, vermits gecontroleerd zal worden of het bestand gewijzigd werd. "
-"Noteer dat deze optie standaard ingesteld staat op \"<literal>false</literal>"
-"\" (uit), omdat het niet aangewezen is om meerdere versies/bouwversies van "
-"een pakket met hetzelfde versienummer te uploaden. In theorie zal dus "
-"niemand met deze problemen geconfronteerd worden en daarom zijn al deze "
-"extra controles nutteloos."
+"Noteer dat deze optie standaard ingesteld staat op \"<literal>false</"
+"literal>\" (uit), omdat het niet aangewezen is om meerdere versies/"
+"bouwversies van een pakket met hetzelfde versienummer te uploaden. In "
+"theorie zal dus niemand met deze problemen geconfronteerd worden en daarom "
+"zijn al deze extra controles nutteloos."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml
@@ -10275,8 +10381,8 @@ msgid ""
"that the <filename>Translation-en</filename> master file can only be created "
"in the generate command."
msgstr ""
-"Deze configuratieoptie staat standaard ingesteld op \"<literal>true</literal>"
-"\" (aan) en zou enkel moeten ingesteld worden op <literal>\"false\"</"
+"Deze configuratieoptie staat standaard ingesteld op \"<literal>true</"
+"literal>\" (aan) en zou enkel moeten ingesteld worden op <literal>\"false\"</"
"literal> (uit) indien het archief dat met &apt-ftparchive; gegenereerd wordt "
"ook <filename>Translation</filename>-bestanden bevat. Merk op dat het "
"hoofdbestand <filename>Translation-en</filename> enkel aangemaakt kan worden "
@@ -10503,8 +10609,8 @@ msgid ""
"password <literal>debian</literal> for the &sources-list; entry <placeholder "
"type=\"literallayout\" id=\"0\"/> could be done in the entry directly: "
"<placeholder type=\"literallayout\" id=\"1\"/> Alternatively an entry like "
-"the following in the auth.conf file could be used: <placeholder type="
-"\"literallayout\" id=\"2\"/> Or alternatively within a single line: "
+"the following in the auth.conf file could be used: <placeholder "
+"type=\"literallayout\" id=\"2\"/> Or alternatively within a single line: "
"<placeholder type=\"literallayout\" id=\"3\"/> If you need to be more "
"specific all of these lines will also apply to the example entry: "
"<placeholder type=\"literallayout\" id=\"4\"/> On the other hand neither of "
@@ -10513,14 +10619,15 @@ msgstr ""
"Voor een gebruiker met als naam <literal>apt</literal> en met het wachtwoord "
"<literal>debian</literal> inloginformatie verstrekken voor het element "
"&sources-list; <placeholder type=\"literallayout\" id=\"0\"/> zou "
-"rechtstreeks in het element kunnen gedaan worden: <placeholder type="
-"\"literallayout\" id=\"1\"/> Als alternatief zou in het bestand auth.conf "
-"een element als het volgende gebruikt kunnen worden: <placeholder type="
-"\"literallayout\" id=\"2\"/> Of anders in één enkele regel: <placeholder "
-"type=\"literallayout\" id=\"3\"/> Indien u meer moet specificeren, zullen al "
-"deze regels ook op het element example van toepassing zijn: <placeholder "
-"type=\"literallayout\" id=\"4\"/> Daarentegen zijn geen van de volgende "
-"regels van toepassing: <placeholder type=\"literallayout\" id=\"5\"/>"
+"rechtstreeks in het element kunnen gedaan worden: <placeholder "
+"type=\"literallayout\" id=\"1\"/> Als alternatief zou in het bestand auth."
+"conf een element als het volgende gebruikt kunnen worden: <placeholder "
+"type=\"literallayout\" id=\"2\"/> Of anders in één enkele regel: "
+"<placeholder type=\"literallayout\" id=\"3\"/> Indien u meer moet "
+"specificeren, zullen al deze regels ook op het element example van "
+"toepassing zijn: <placeholder type=\"literallayout\" id=\"4\"/> Daarentegen "
+"zijn geen van de volgende regels van toepassing: <placeholder "
+"type=\"literallayout\" id=\"5\"/>"
#. type: Content of: <refentry><refsect1><title>
#: apt_auth.conf.5.xml
@@ -10620,10 +10727,10 @@ msgstr ""
msgid ""
"HTTP is an unencrypted transport protocol meaning that the whole "
"communication with the remote server (or proxy) can be observed by a "
-"sufficiently capable attacker commonly referred to as a \"man in the middle"
-"\" (MITM). However, such an attacker can <emphasis>not</emphasis> modify "
-"the communication to compromise the security of your system, as APT's data "
-"security model is independent of the chosen transport method. This is "
+"sufficiently capable attacker commonly referred to as a \"man in the "
+"middle\" (MITM). However, such an attacker can <emphasis>not</emphasis> "
+"modify the communication to compromise the security of your system, as APT's "
+"data security model is independent of the chosen transport method. This is "
"explained in detail in &apt-secure;. An overview of available transport "
"methods is given in &sources-list;."
msgstr ""
@@ -12945,10 +13052,10 @@ msgstr ""
msgid ""
"Both that APT <command>dselect</command> method and <command>apt-get</"
"command> share the same interface. It is a simple system that generally "
-"tells you what it will do and then goes and does it. <placeholder type="
-"\"footnote\" id=\"0\"/> After printing out a summary of what will happen APT "
-"then will print out some informative status messages so that you can "
-"estimate how far along it is and how much is left to do."
+"tells you what it will do and then goes and does it. <placeholder "
+"type=\"footnote\" id=\"0\"/> After printing out a summary of what will "
+"happen APT then will print out some informative status messages so that you "
+"can estimate how far along it is and how much is left to do."
msgstr ""
"Zowel de <command>dselect</command>-methode van APT als <command>apt-get</"
"command> maken gebruik van dezelfde interface. Het is een eenvoudig systeem "
@@ -13083,10 +13190,10 @@ msgstr ""
msgid ""
"There are two ways a system can get into a broken state like this. The first "
"is caused by <command>dpkg</command> missing some subtle relationships "
-"between packages when performing upgrades. <placeholder type=\"footnote\" id="
-"\"0\"/>. The second is if a package installation fails during an operation. "
-"In this situation a package may have been unpacked without its dependents "
-"being installed."
+"between packages when performing upgrades. <placeholder type=\"footnote\" "
+"id=\"0\"/>. The second is if a package installation fails during an "
+"operation. In this situation a package may have been unpacked without its "
+"dependents being installed."
msgstr ""
"Een systeem kan op twee manieren terechtkomen in een dergelijke defecte "
"staat. Een eerste oorzaak kan <command>dpkg</command> zijn aan wie sommige "
diff --git a/doc/po/pl.po b/doc/po/pl.po
index 6a6a2fa4c..bd678d8af 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: 2022-01-06 20:58+0100\n"
+"POT-Creation-Date: 2022-02-22 20:01+0100\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"
@@ -418,13 +418,24 @@ msgstr ""
#. type: Plain text
#: apt.ent
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
+#| " <listitem><para>File fragments for the trusted keys, additional keyrings can\n"
+#| " be stored here (by other packages or the administrator).\n"
+#| " Configuration Item <literal>Dir::Etc::TrustedParts</literal>.</para></listitem>\n"
+#| " </varlistentry>\n"
+#| "\">\n"
msgid ""
" <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
" <listitem><para>File fragments for the trusted keys, additional keyrings can\n"
" be stored here (by other packages or the administrator).\n"
" 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 ""
" <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
@@ -509,8 +520,8 @@ msgid ""
"pkgProblemResolver=1 --> <!ENTITY synopsis-config-string \"config_string\">"
msgstr ""
"<!-- TRANSLATOR: used as in -o=config_string e.g. -o=Debug::"
-"pkgProblemResolver=1 --> <!ENTITY synopsis-config-string \"opcja_konfiguracji"
-"\">"
+"pkgProblemResolver=1 --> <!ENTITY synopsis-config-string "
+"\"opcja_konfiguracji\">"
#. type: Plain text
#: apt.ent
@@ -613,8 +624,8 @@ msgid ""
"packages path override-file pathprefix --> <!ENTITY synopsis-path \"path\">"
msgstr ""
"<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
-"packages path override-file pathprefix --> <!ENTITY synopsis-path \"ścieżka"
-"\">"
+"packages path override-file pathprefix --> <!ENTITY synopsis-path "
+"\"ścieżka\">"
#. type: Plain text
#: apt.ent
@@ -824,15 +835,15 @@ msgstr ""
#: apt.8.xml
msgid ""
"<option>satisfy</option> satisfies dependency strings, as used in Build-"
-"Depends. It also handles conflicts, by prefixing an argument with <literal>"
-"\"Conflicts: \"</literal>."
+"Depends. It also handles conflicts, by prefixing an argument with "
+"<literal>\"Conflicts: \"</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.8.xml
msgid ""
-"Example: <literal>apt satisfy \"foo, bar (>= 1.0)\" \"Conflicts: baz, fuzz"
-"\"</literal>"
+"Example: <literal>apt satisfy \"foo, bar (>= 1.0)\" \"Conflicts: baz, "
+"fuzz\"</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
@@ -1465,9 +1476,9 @@ msgstr ""
#| "<literal>changelog</literal> downloads a package changelog and displays "
#| "it through <command>sensible-pager</command>. The server name and base "
#| "directory is defined in the <literal>APT::Changelogs::Server</literal> "
-#| "variable (e.g. <ulink url=\"http://packages.debian.org/changelogs"
-#| "\">packages.debian.org/changelogs</ulink> for Debian or <ulink url="
-#| "\"https://changelogs.ubuntu.com/changelogs\">changelogs.ubuntu.com/"
+#| "variable (e.g. <ulink url=\"http://packages.debian.org/"
+#| "changelogs\">packages.debian.org/changelogs</ulink> for Debian or <ulink "
+#| "url=\"https://changelogs.ubuntu.com/changelogs\">changelogs.ubuntu.com/"
#| "changelogs</ulink> for Ubuntu). By default it displays the changelog for "
#| "the version that is installed. However, you can specify the same options "
#| "as for the <option>install</option> command."
@@ -2402,9 +2413,9 @@ msgid ""
msgstr ""
"<literal>Pojedyncze pakiety wirtualne (Single virtual packages)</literal> - "
"liczba pakietów, dla których istnieje tylko jeden pakiet, który dostarcza "
-"danego pakietu wirtualnego. Na przykład, w systemie Debian \"X11-text-viewer"
-"\" jest pakietem wirtualnym, ale tylko jeden pakiet, mianowicie \"xless\","
-"dostarcza \"X11-text-viewer\"."
+"danego pakietu wirtualnego. Na przykład, w systemie Debian \"X11-text-"
+"viewer\" jest pakietem wirtualnym, ale tylko jeden pakiet, mianowicie "
+"\"xless\",dostarcza \"X11-text-viewer\"."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
#: apt-cache.8.xml
@@ -2673,11 +2684,12 @@ msgstr "Uwaga: dotty nie potrafi narysować większego zbioru pakietów."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cache.8.xml
msgid ""
-"The same as <literal>dotty</literal>, only for xvcg from the <ulink url="
-"\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>."
+"The same as <literal>dotty</literal>, only for xvcg from the <ulink "
+"url=\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</"
+"ulink>."
msgstr ""
-"Robi to samo, co <literal>dotty</literal>, tylko dla xvcg z <ulink url="
-"\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">narzędzia VCG</"
+"Robi to samo, co <literal>dotty</literal>, tylko dla xvcg z <ulink "
+"url=\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">narzędzia VCG</"
"ulink>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
@@ -3157,6 +3169,72 @@ msgstr ""
"składnicą kluczy, co oznacza na przykład to, że nowe klucze będą dodawane "
"właśnie tam."
+#. type: Content of: <refentry><refsect1><title>
+#: apt-key.8.xml
+#, fuzzy
+#| msgid "Operation"
+msgid "Deprecation"
+msgstr "Kolejne kroki"
+
+#. 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;"
@@ -3767,15 +3845,15 @@ msgstr ""
#: 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="
-"\"https://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
+#| "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=\"https://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
"Security Infrastructure</ulink> chapter of the Securing Debian Manual (also "
"available in the harden-doc package) and the <ulink url=\"http://www."
"cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution HOWTO</"
@@ -3783,8 +3861,8 @@ msgid ""
msgstr ""
"Więcej informacji można znaleźć w rozdziale \"<ulink url=\"http://www.debian."
"org/doc/manuals/securing-debian-howto/ch7\">Debian Security Infrastructure</"
-"ulink>\" podręcznika \"Securing Debian Manual\" i w dokumencie \"<ulink url="
-"\"http://www.cryptnet.net/fdp/crypto/strong_distro.html\" >Strong "
+"ulink>\" podręcznika \"Securing Debian Manual\" i w dokumencie \"<ulink "
+"url=\"http://www.cryptnet.net/fdp/crypto/strong_distro.html\" >Strong "
"Distribution HOWTO</ulink>\" napisanym przez V. Alexa Brennena."
#. type: Content of: <refentry><refsect1><title>
@@ -4698,10 +4776,10 @@ msgid ""
"literal> script in the configuration file. This entry specifies the commands "
"to send to tell the proxy server what to connect to. Please see "
"&configureindex; for an example of how to do this. The substitution "
-"variables representing the corresponding URI component are <literal>"
-"$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, <literal>"
-"$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, <literal>$(SITE)</"
-"literal> and <literal>$(SITE_PORT)</literal>."
+"variables representing the corresponding URI component are "
+"<literal>$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, "
+"<literal>$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, "
+"<literal>$(SITE)</literal> and <literal>$(SITE_PORT)</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -4889,8 +4967,8 @@ msgid ""
"specifies the languages. So the following example configuration will result "
"in the order \"en, de\" in an English locale or \"de, en\" in a German one. "
"Note that \"fr\" is downloaded, but not used unless APT is used in a French "
-"locale (where the order would be \"fr, de, en\"). <placeholder type="
-"\"programlisting\" id=\"0\"/>"
+"locale (where the order would be \"fr, de, en\"). <placeholder "
+"type=\"programlisting\" id=\"0\"/>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -5708,8 +5786,9 @@ msgid ""
"in the APT configuration file <filename>/etc/apt/apt.conf</filename>. Note "
"that this has precedence over any general priority you set in the <filename>/"
"etc/apt/preferences</filename> file described later, but not over "
-"specifically pinned packages. For example, <placeholder type="
-"\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>"
+"specifically pinned packages. For example, <placeholder "
+"type=\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" "
+"id=\"1\"/>"
msgstr ""
"Jeśli plik preferencji nie istnieje lub nie zawiera wpisu pasującego do "
"pewnej wersji, to priorytetem przypisanym do tej wersji jest priorytet "
@@ -5721,8 +5800,8 @@ msgstr ""
"zauważyć, że wydanie docelowe nadpisuje jakikolwiek ogólny priorytet "
"ustawiony w opisanym poniżej pliku <filename>/etc/apt/preferences</"
"filename>, ale nie nadpisuje priorytetów szczegółowych przypisanych do "
-"poszczególnych pakietów. Na przykład <placeholder type=\"programlisting\" id="
-"\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>"
+"poszczególnych pakietów. Na przykład <placeholder type=\"programlisting\" "
+"id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml
@@ -6073,8 +6152,8 @@ msgid ""
"This should <emphasis>not</emphasis> be confused with the Origin of a "
"distribution as specified in a <filename>Release</filename> file. What "
"follows the \"Origin:\" tag in a <filename>Release</filename> file is not an "
-"Internet address but an author or vendor name, such as \"Debian\" or \"Ximian"
-"\"."
+"Internet address but an author or vendor name, such as \"Debian\" or "
+"\"Ximian\"."
msgstr ""
"<emphasis>Nie</emphasis> należy tego mylić z polem <literal>Origin</literal> "
"podanym w pliku <filename>Release</filename>. Wartością pola "
@@ -6632,8 +6711,8 @@ msgid ""
"the line:"
msgstr ""
"nazywa archiwum, do którego należą wszystkie pakiety znajdujące się w "
-"drzewie katalogów. Na przykład linia \"Archive: stable\" lub \"Suite: stable"
-"\" mówi, że wszystkie pakiety w drzewie katalogów poniżej katalogu "
+"drzewie katalogów. Na przykład linia \"Archive: stable\" lub \"Suite: "
+"stable\" mówi, że wszystkie pakiety w drzewie katalogów poniżej katalogu "
"nadrzędnego pliku <filename>Release</filename> należą do archiwum "
"<literal>stable</literal>. Wartość tę można podać w pliku preferencji APT w "
"następujący sposób:"
@@ -6945,8 +7024,8 @@ msgid ""
"to package versions from the <literal>testing</literal> distribution, a "
"lower priority to package versions from the <literal>unstable</literal> "
"distribution, and a prohibitively low priority to package versions from "
-"other <literal>Debian</literal> distributions. <placeholder type="
-"\"programlisting\" id=\"0\"/>"
+"other <literal>Debian</literal> distributions. <placeholder "
+"type=\"programlisting\" id=\"0\"/>"
msgstr ""
"Następujący plik preferencji APT spowoduje przypisanie wysokiego priorytetu "
"wersjom pakietów z dystrybucji <literal>testing</literal>, niskiego "
@@ -6991,8 +7070,8 @@ msgstr ""
"wersji z dystrybucji <literal>testing</literal>, jeśli ta wersja będzie "
"nowsza od wersji zainstalowanej, lub w przeciwnym wypadku - do najnowszej "
"wersji z dystrybucji <literal>unstable</literal>, jeśli ta wersja będzie "
-"nowsza od wersji zainstalowanej. <placeholder type=\"programlisting\" id="
-"\"0\"/>"
+"nowsza od wersji zainstalowanej. <placeholder type=\"programlisting\" "
+"id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt_preferences.5.xml
@@ -7056,8 +7135,8 @@ msgstr ""
"<literal>stable</literal> aż do <literal>oldstable</literal>. Aby śledzić "
"postępy na przykład w dystrybucji <literal>testing</literal> niezależnie od "
"nazwy kodowej tej dystrybucji, należy użyć jednej z zaprezentowanych "
-"powyżej przykładowych konfiguracji. <placeholder type=\"programlisting\" id="
-"\"0\"/>"
+"powyżej przykładowych konfiguracji. <placeholder type=\"programlisting\" "
+"id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml
@@ -7375,13 +7454,13 @@ msgstr ""
#: sources.list.5.xml
#, fuzzy
#| msgid ""
-#| "<literal>distribution</literal> may also contain a variable, <literal>"
-#| "$(ARCH)</literal> which expands to the Debian architecture (such as "
-#| "<literal>amd64</literal> or <literal>armel</literal>) used on the system. "
-#| "This permits architecture-independent <filename>sources.list</filename> "
-#| "files to be used. In general this is only of interest when specifying an "
-#| "exact path, <literal>APT</literal> will automatically generate a URI with "
-#| "the current architecture otherwise."
+#| "<literal>distribution</literal> may also contain a variable, "
+#| "<literal>$(ARCH)</literal> which expands to the Debian architecture (such "
+#| "as <literal>amd64</literal> or <literal>armel</literal>) used on the "
+#| "system. This permits architecture-independent <filename>sources.list</"
+#| "filename> files to be used. In general this is only of interest when "
+#| "specifying an exact path, <literal>APT</literal> will automatically "
+#| "generate a URI with the current architecture otherwise."
msgid ""
"<literal>suite</literal> may also contain a variable, <literal>$(ARCH)</"
"literal> which expands to the Debian architecture (such as <literal>amd64</"
@@ -7645,20 +7724,23 @@ 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 "
-"<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 "
-"keyrings are selected. A fingerprint will accept also all signatures by a "
-"subkey of this key, if this isn't desired an exclamation mark (<literal>!</"
-"literal>) can be appended to the fingerprint to disable this behaviour. The "
-"option defaults to the value of the option with the same name if set in the "
-"previously acquired <filename>Release</filename> file of this repository "
-"(only fingerprints can be specified there through). Otherwise all keys in "
-"the trusted keyrings are considered valid signers for this repository. The "
-"option may also be set directly to an embedded GPG public key block. Special "
-"care is needed to encode the empty line with leading spaces and \".\": "
-"<placeholder type=\"literallayout\" id=\"0\"/>"
+"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 keyrings are selected. A "
+"fingerprint will accept also all signatures by a subkey of this key, if this "
+"isn't desired an exclamation mark (<literal>!</literal>) can be appended to "
+"the fingerprint to disable this behaviour. The option defaults to the value "
+"of the option with the same name if set in the previously acquired "
+"<filename>Release</filename> file of this repository (only fingerprints can "
+"be specified there through). Otherwise all keys in the trusted keyrings are "
+"considered valid signers for this repository. The option may also be set "
+"directly to an embedded GPG public key block. Special care is needed to "
+"encode the empty line with leading spaces and \".\": <placeholder "
+"type=\"literallayout\" id=\"0\"/>"
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
@@ -8163,8 +8245,8 @@ msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
#| "i386</filename> on i386 machines, <filename>unstable/binary-amd64</"
#| "filename> on amd64, and so forth for other supported architectures. [Note "
#| "this example only illustrates how to use the substitution variable; "
-#| "official debian archives are not structured like this] <placeholder type="
-#| "\"literallayout\" id=\"0\"/>"
+#| "official debian archives are not structured like this] <placeholder "
+#| "type=\"literallayout\" id=\"0\"/>"
msgid ""
"Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
"directory, and uses only files found under <filename>unstable/binary-i386</"
@@ -8654,8 +8736,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml
msgid ""
-"Sets the top of the source package directory tree. Defaults to <filename>"
-"$(DIST)/$(SECTION)/source/</filename>"
+"Sets the top of the source package directory tree. Defaults to "
+"<filename>$(DIST)/$(SECTION)/source/</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
@@ -8676,8 +8758,8 @@ msgstr ""
#: apt-ftparchive.1.xml
msgid ""
"Sets the output Translation-en master file with the long descriptions if "
-"they should be not included in the Packages file. Defaults to <filename>"
-"$(DIST)/$(SECTION)/i18n/Translation-en</filename>"
+"they should be not included in the Packages file. Defaults to "
+"<filename>$(DIST)/$(SECTION)/i18n/Translation-en</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
@@ -8779,8 +8861,8 @@ msgstr ""
#: apt-ftparchive.1.xml
msgid ""
"When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
-"command> performs an operation similar to: <placeholder type=\"programlisting"
-"\" id=\"0\"/>"
+"command> performs an operation similar to: <placeholder "
+"type=\"programlisting\" id=\"0\"/>"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
@@ -8916,12 +8998,12 @@ msgstr "new"
#. type: Content of: <refentry><refsect1><para>
#: apt-ftparchive.1.xml
msgid ""
-"The general form of the maintainer field is: <placeholder type="
-"\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
-"id=\"1\"/> The first form allows a double-slash separated list of old email "
-"addresses to be specified. If any of those are found then new is substituted "
-"for the maintainer field. The second form unconditionally substitutes the "
-"maintainer field."
+"The general form of the maintainer field is: <placeholder "
+"type=\"literallayout\" id=\"0\"/> or simply, <placeholder "
+"type=\"literallayout\" id=\"1\"/> The first form allows a double-slash "
+"separated list of old email addresses to be specified. If any of those are "
+"found then new is substituted for the maintainer field. The second form "
+"unconditionally substitutes the maintainer field."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
@@ -9275,8 +9357,8 @@ msgid ""
"password <literal>debian</literal> for the &sources-list; entry <placeholder "
"type=\"literallayout\" id=\"0\"/> could be done in the entry directly: "
"<placeholder type=\"literallayout\" id=\"1\"/> Alternatively an entry like "
-"the following in the auth.conf file could be used: <placeholder type="
-"\"literallayout\" id=\"2\"/> Or alternatively within a single line: "
+"the following in the auth.conf file could be used: <placeholder "
+"type=\"literallayout\" id=\"2\"/> Or alternatively within a single line: "
"<placeholder type=\"literallayout\" id=\"3\"/> If you need to be more "
"specific all of these lines will also apply to the example entry: "
"<placeholder type=\"literallayout\" id=\"4\"/> On the other hand neither of "
@@ -9378,10 +9460,10 @@ msgstr ""
msgid ""
"HTTP is an unencrypted transport protocol meaning that the whole "
"communication with the remote server (or proxy) can be observed by a "
-"sufficiently capable attacker commonly referred to as a \"man in the middle"
-"\" (MITM). However, such an attacker can <emphasis>not</emphasis> modify "
-"the communication to compromise the security of your system, as APT's data "
-"security model is independent of the chosen transport method. This is "
+"sufficiently capable attacker commonly referred to as a \"man in the "
+"middle\" (MITM). However, such an attacker can <emphasis>not</emphasis> "
+"modify the communication to compromise the security of your system, as APT's "
+"data security model is independent of the chosen transport method. This is "
"explained in detail in &apt-secure;. An overview of available transport "
"methods is given in &sources-list;."
msgstr ""
@@ -10757,8 +10839,8 @@ msgid ""
msgstr ""
"\"APT\" i ten dokument są oprogramowaniem wolnodostępnym, które można "
"rozpowszechniać oraz zmieniać zgodnie z postanowieniami drugiej albo (wedle "
-"uznania) dowolnej późniejszej wersji \"Ogólnej Licencji Publicznej GNU"
-"\" (GNU General Public License) publikowanej przez \"Fundację Wolnego "
+"uznania) dowolnej późniejszej wersji \"Ogólnej Licencji Publicznej "
+"GNU\" (GNU General Public License) publikowanej przez \"Fundację Wolnego "
"Oprogramowania (Free Software Foundation)."
#. type: Content of: <book><bookinfo><legalnotice><para>
@@ -11220,9 +11302,9 @@ msgid ""
msgstr ""
"Lista komponentów jest listą pod-dystrybucji do pobrania. Dystrybucja jest "
"podzielona ze względu na licencje oprogramowania: main (główna) zawiera "
-"pakiety zgodne z DFSG (\"Wytycznymi Debiana w sprawie Wolnego Oprogramowania"
-"\"),contrib i non-free zawierają pakiety, które zawierają restrykcje "
-"związane z ich używaniem lub rozpowszechnianiem."
+"pakiety zgodne z DFSG (\"Wytycznymi Debiana w sprawie Wolnego "
+"Oprogramowania\"),contrib i non-free zawierają pakiety, które zawierają "
+"restrykcje związane z ich używaniem lub rozpowszechnianiem."
#. type: Content of: <book><chapter><para>
#: guide.dbk
@@ -11258,8 +11340,8 @@ msgid ""
"[R]emove commands have no meaning, the [I]nstall command performs both of "
"them together."
msgstr ""
-"Następnie można wybrać pakiety do zainstalowania, używając opcji \"[S] Wybór"
-"\", a potem zainstalować te pakiety opcją \"[I] Instalacja\". Używanie "
+"Następnie można wybrać pakiety do zainstalowania, używając opcji \"[S] "
+"Wybór\", a potem zainstalować te pakiety opcją \"[I] Instalacja\". Używanie "
"metody APT czyni opcje \"[C] Konfiguracja\" i \"[R] Usuwanie\" "
"bezużytecznymi, gdyż \"[I] Instalacja\" przeprowadza również te dwie "
"operacje."
@@ -11296,10 +11378,10 @@ msgstr ""
msgid ""
"Both that APT <command>dselect</command> method and <command>apt-get</"
"command> share the same interface. It is a simple system that generally "
-"tells you what it will do and then goes and does it. <placeholder type="
-"\"footnote\" id=\"0\"/> After printing out a summary of what will happen APT "
-"then will print out some informative status messages so that you can "
-"estimate how far along it is and how much is left to do."
+"tells you what it will do and then goes and does it. <placeholder "
+"type=\"footnote\" id=\"0\"/> After printing out a summary of what will "
+"happen APT then will print out some informative status messages so that you "
+"can estimate how far along it is and how much is left to do."
msgstr ""
"Metoda APT programu <command>dselect</command> i program <command>apt-get</"
"command> dzielą wspólny interfejs. Jest to prosty system, który najpierw "
@@ -11429,10 +11511,10 @@ msgstr ""
msgid ""
"There are two ways a system can get into a broken state like this. The first "
"is caused by <command>dpkg</command> missing some subtle relationships "
-"between packages when performing upgrades. <placeholder type=\"footnote\" id="
-"\"0\"/>. The second is if a package installation fails during an operation. "
-"In this situation a package may have been unpacked without its dependents "
-"being installed."
+"between packages when performing upgrades. <placeholder type=\"footnote\" "
+"id=\"0\"/>. The second is if a package installation fails during an "
+"operation. In this situation a package may have been unpacked without its "
+"dependents being installed."
msgstr ""
"Są dwie przyczyny, z których powodu system może być zepsuty w powyższy "
"sposób. Pierwszą jest to, że <command>dpkg</command> podczas aktualizacji "
@@ -12726,12 +12808,12 @@ msgstr "Które użyje pobranych uprzednio archiwów z dysku."
#~ msgid ""
#~ "Unless the <option>-h</option>, or <option>--help</option> option is "
-#~ "given one of the commands below must be present. <placeholder type="
-#~ "\"variablelist\" id=\"0\"/>"
+#~ "given one of the commands below must be present. <placeholder "
+#~ "type=\"variablelist\" id=\"0\"/>"
#~ msgstr ""
#~ "Jedno z poniższych poleceń musi być użyte, chyba że została podana opcja "
-#~ "<option>-h</option> lub <option>--help</option>. <placeholder type="
-#~ "\"variablelist\" id=\"0\"/>"
+#~ "<option>-h</option> lub <option>--help</option>. <placeholder "
+#~ "type=\"variablelist\" id=\"0\"/>"
#~ msgid "APT package handling utility -- cache manipulator"
#~ msgstr "Narzędzie zarządzania pakietami APT -- manipulator bufora"
diff --git a/doc/po/pt.po b/doc/po/pt.po
index 3be367ef9..c603ec961 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 2.3.12\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2022-01-06 20:58+0100\n"
+"POT-Creation-Date: 2022-02-22 20:01+0100\n"
"PO-Revision-Date: 2021-11-22 22:20+0000\n"
"Last-Translator: Américo Monteiro <a_monteiro@gmx.com>\n"
"Language-Team: Portuguese <>\n"
@@ -414,13 +414,24 @@ msgstr ""
#. type: Plain text
#: apt.ent
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
+#| " <listitem><para>File fragments for the trusted keys, additional keyrings can\n"
+#| " be stored here (by other packages or the administrator).\n"
+#| " Configuration Item <literal>Dir::Etc::TrustedParts</literal>.</para></listitem>\n"
+#| " </varlistentry>\n"
+#| "\">\n"
msgid ""
" <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
" <listitem><para>File fragments for the trusted keys, additional keyrings can\n"
" be stored here (by other packages or the administrator).\n"
" 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 ""
" <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
@@ -616,8 +627,8 @@ msgid ""
"packages path override-file pathprefix --> <!ENTITY synopsis-path \"path\">"
msgstr ""
"<!-- TRANSLATOR: usado como parâmetro para apt-ftparchive ex. apt-ftparchive "
-"packages path override-file pathprefix --> <!ENTITY synopsis-path \"caminho"
-"\">"
+"packages path override-file pathprefix --> <!ENTITY synopsis-path "
+"\"caminho\">"
#. type: Plain text
#: apt.ent
@@ -854,8 +865,8 @@ msgstr ""
#: apt.8.xml
msgid ""
"<option>satisfy</option> satisfies dependency strings, as used in Build-"
-"Depends. It also handles conflicts, by prefixing an argument with <literal>"
-"\"Conflicts: \"</literal>."
+"Depends. It also handles conflicts, by prefixing an argument with "
+"<literal>\"Conflicts: \"</literal>."
msgstr ""
"<option>satisfy</option> satisfaz strings de dependências, como usado em "
"Build-Depends. Também lida com conflitos, ao prefixar um argumento com "
@@ -864,11 +875,11 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.8.xml
msgid ""
-"Example: <literal>apt satisfy \"foo, bar (>= 1.0)\" \"Conflicts: baz, fuzz"
-"\"</literal>"
+"Example: <literal>apt satisfy \"foo, bar (>= 1.0)\" \"Conflicts: baz, "
+"fuzz\"</literal>"
msgstr ""
-"Exemplo: <literal>apt satisfy \"foo, bar (>= 1.0)\" \"Conflicts: baz, fuzz"
-"\"</literal>"
+"Exemplo: <literal>apt satisfy \"foo, bar (>= 1.0)\" \"Conflicts: baz, "
+"fuzz\"</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt.8.xml
@@ -1914,10 +1925,11 @@ msgid ""
"<option>remove --purge</option> is equivalent to the <option>purge</option> "
"command. Configuration Item: <literal>APT::Get::Purge</literal>."
msgstr ""
-"Usa purgar em vez de remoção para tudo o que seja removido. Um asterisco (\"*"
-"\") será mostrado junto dos pacotes que estão agendados para serem purgados. "
-"<option>remove --purge</option> é equivalente ao comando <option>purge</"
-"option>. Item de Configuração: <literal>APT::Get::Purge</literal>."
+"Usa purgar em vez de remoção para tudo o que seja removido. Um asterisco "
+"(\"*\") será mostrado junto dos pacotes que estão agendados para serem "
+"purgados. <option>remove --purge</option> é equivalente ao comando "
+"<option>purge</option>. Item de Configuração: <literal>APT::Get::Purge</"
+"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml
@@ -2573,8 +2585,8 @@ msgid ""
"GivenOnly</literal> option."
msgstr ""
"<literal>dotty</literal> recebe uma lista de pacotes na linha de comandos e "
-"gera resultados apropriados para uso pelo dotty do pacote <ulink url="
-"\"http://www.research.att.com/sw/tools/graphviz/\">GraphViz</ulink>. O "
+"gera resultados apropriados para uso pelo dotty do pacote <ulink "
+"url=\"http://www.research.att.com/sw/tools/graphviz/\">GraphViz</ulink>. O "
"resultado será um conjunto de nós e orlas que representam os relacionamentos "
"entre os pacotes. Por predefinição, os pacotes fornecidos irão seguir todos "
"os pacotes dependentes; isto pode produzir um gráfico muito grande. Para "
@@ -2605,8 +2617,9 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cache.8.xml
msgid ""
-"The same as <literal>dotty</literal>, only for xvcg from the <ulink url="
-"\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>."
+"The same as <literal>dotty</literal>, only for xvcg from the <ulink "
+"url=\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</"
+"ulink>."
msgstr ""
"O mesmo que <literal>dotty</literal>, apenas para xvcg a partir de <ulink "
"url=\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">Ferramenta "
@@ -2920,11 +2933,11 @@ msgid ""
"should therefore always be created with <command>gpg --export</command>."
msgstr ""
"O apt-key suporta apenas o formato binário OpenPGP (também conhecido como "
-"\"GPG key public ring\") em ficheiros com a extensão \"<literal>gpg</literal>"
-"\", não o formato de base de dados keybox introduzido em novas versões &gpg; "
-"como predefinição para ficheiros de chaveiro. Os ficheiros chaveiro binários "
-"que se destinam a ser usados com qualquer versão do apt devem por isto ser "
-"sempre criados com <command>gpg --export</command>."
+"\"GPG key public ring\") em ficheiros com a extensão \"<literal>gpg</"
+"literal>\", não o formato de base de dados keybox introduzido em novas "
+"versões &gpg; como predefinição para ficheiros de chaveiro. Os ficheiros "
+"chaveiro binários que se destinam a ser usados com qualquer versão do apt "
+"devem por isto ser sempre criados com <command>gpg --export</command>."
#. type: Content of: <refentry><refsect1><para>
#: apt-key.8.xml
@@ -3104,6 +3117,72 @@ msgstr ""
"filename> é o chaveiro principal o que significa que, por exemplo, as novas "
"chaves são adicionadas a este."
+#. type: Content of: <refentry><refsect1><title>
+#: apt-key.8.xml
+#, fuzzy
+#| msgid "Operation"
+msgid "Deprecation"
+msgstr "Operação"
+
+#. 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;"
@@ -3720,8 +3799,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt-secure.8.xml
msgid ""
-"For more background information you might want to review the <ulink url="
-"\"https://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
+"For more background information you might want to review the <ulink "
+"url=\"https://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
"Security Infrastructure</ulink> chapter of the Securing Debian Manual (also "
"available in the harden-doc package) and the <ulink url=\"http://www."
"cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution HOWTO</"
@@ -4874,10 +4953,10 @@ msgid ""
"literal> script in the configuration file. This entry specifies the commands "
"to send to tell the proxy server what to connect to. Please see "
"&configureindex; for an example of how to do this. The substitution "
-"variables representing the corresponding URI component are <literal>"
-"$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, <literal>"
-"$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, <literal>$(SITE)</"
-"literal> and <literal>$(SITE_PORT)</literal>."
+"variables representing the corresponding URI component are "
+"<literal>$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, "
+"<literal>$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, "
+"<literal>$(SITE)</literal> and <literal>$(SITE_PORT)</literal>."
msgstr ""
"<literal>ftp::Proxy</literal> define o proxy predefinido a usar para URIs "
"FTP. Está no formato standard de <literal>ftp://[[user][:pass]@]host[:port]/"
@@ -4890,10 +4969,10 @@ msgstr ""
"configuração. Esta entrada especifica os comandos a enviar para dizer ao "
"servidor proxy ao que se ligar. Por favor veja &configureindex; para um "
"exemplo de como fazer isto. As variáveis de substituição que representam o "
-"componente URI correspondente são <literal>$(PROXY_USER)</literal> <literal>"
-"$(PROXY_PASS)</literal> <literal>$(SITE_USER)</literal> <literal>"
-"$(SITE_PASS)</literal> <literal>$(SITE)</literal> e <literal>$(SITE_PORT)</"
-"literal>."
+"componente URI correspondente são <literal>$(PROXY_USER)</literal> "
+"<literal>$(PROXY_PASS)</literal> <literal>$(SITE_USER)</literal> "
+"<literal>$(SITE_PASS)</literal> <literal>$(SITE)</literal> e "
+"<literal>$(SITE_PORT)</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml
@@ -5080,8 +5159,8 @@ msgstr ""
"literal> será verificado em tempo de execução. Se esta definição estiver "
"definida e o suporte para este formato não está compilado directamente no "
"apt, o método apenas será usado se este ficheiro existir; ex. para o método "
-"<literal>bzip2</literal> (o embutido) a definição é: <placeholder type="
-"\"literallayout\" id=\"0\"/>. Note também que as entradas na lista "
+"<literal>bzip2</literal> (o embutido) a definição é: <placeholder "
+"type=\"literallayout\" id=\"0\"/>. Note também que as entradas na lista "
"especificadas na linha de comandos serão adicionadas no fim da lista "
"especificada nos ficheiros de configuração, mas antes das entradas "
"predefinidas. Para preferir um tipo neste caso sobre aqueles especificados "
@@ -5158,8 +5237,8 @@ msgid ""
"specifies the languages. So the following example configuration will result "
"in the order \"en, de\" in an English locale or \"de, en\" in a German one. "
"Note that \"fr\" is downloaded, but not used unless APT is used in a French "
-"locale (where the order would be \"fr, de, en\"). <placeholder type="
-"\"programlisting\" id=\"0\"/>"
+"locale (where the order would be \"fr, de, en\"). <placeholder "
+"type=\"programlisting\" id=\"0\"/>"
msgstr ""
"A lista predefinida inclui \"environment\" e \"en\". \"<literal>environment</"
"literal>\" tem um significado especial aqui: será substituída em tempo de "
@@ -5176,8 +5255,8 @@ msgstr ""
"exemplo de configuração irá resultar na ordem \"en, de\" num ambiente em "
"Inglês e \"de, en\" num ambiente em Alemão. Note que o \"fr\" é "
"descarregado, mas não é usado a menos que o APT seja usado num ambiente em "
-"Francês (onde a ordem deveria ser \"fr, de, en\". <placeholder type="
-"\"programlisting\" id=\"0\"/>"
+"Francês (onde a ordem deveria ser \"fr, de, en\". <placeholder "
+"type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml
@@ -5703,8 +5782,8 @@ msgid ""
msgstr ""
"Na versão 3 após cada campo de versão segue-se a arquitectura dessa versão, "
"a qual é \"-\" se não existir nenhuma versão, e um campo que mostra o tipo "
-"de MultiArch \"same\", \"foreign\", \"allowed\" ou \"none\". Note que \"none"
-"\" é um nome de tipo incorreto o qual é apenas mantido para permanecer "
+"de MultiArch \"same\", \"foreign\", \"allowed\" ou \"none\". Note que "
+"\"none\" é um nome de tipo incorreto o qual é apenas mantido para permanecer "
"compatível, deve ser lido como \"no\" e os utilizadores são encorajados a "
"suportar ambos."
@@ -6276,8 +6355,9 @@ msgid ""
"in the APT configuration file <filename>/etc/apt/apt.conf</filename>. Note "
"that this has precedence over any general priority you set in the <filename>/"
"etc/apt/preferences</filename> file described later, but not over "
-"specifically pinned packages. For example, <placeholder type="
-"\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>"
+"specifically pinned packages. For example, <placeholder "
+"type=\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" "
+"id=\"1\"/>"
msgstr ""
"Senão existir um ficheiro de preferências ou se não existe uma entrada no "
"ficheiro que se aplique a uma versão particular então a prioridade atribuída "
@@ -6289,8 +6369,9 @@ msgstr ""
"<filename>/etc/apt/apt.conf</filename>. Note que isto tem precedências sobre "
"qualquer prioridade geral que possa definir no ficheiro <filename>/etc/apt/"
"preferences</filename> descrito mais tarde, mas não sobre pacotes "
-"especificamente imobilizados. Por exemplo, <placeholder type=\"programlisting"
-"\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>"
+"especificamente imobilizados. Por exemplo, <placeholder "
+"type=\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" "
+"id=\"1\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml
@@ -6627,10 +6708,11 @@ msgid ""
"high priority to all versions available from the server identified by the "
"hostname \"ftp.de.debian.org\""
msgstr ""
-"Uma nota de atenção: a palavra chave usada aqui é \"<literal>origin</literal>"
-"\" que pode ser usada para corresponder a um nome de máquina. O seguinte "
-"registo irá atribuir uma alta prioridade a todas as versões disponíveis do "
-"servidor identificadas pelo nome de máquina \"ftp.de.debian.org\""
+"Uma nota de atenção: a palavra chave usada aqui é \"<literal>origin</"
+"literal>\" que pode ser usada para corresponder a um nome de máquina. O "
+"seguinte registo irá atribuir uma alta prioridade a todas as versões "
+"disponíveis do servidor identificadas pelo nome de máquina \"ftp.de.debian."
+"org\""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
#: apt_preferences.5.xml
@@ -6650,8 +6732,8 @@ msgid ""
"This should <emphasis>not</emphasis> be confused with the Origin of a "
"distribution as specified in a <filename>Release</filename> file. What "
"follows the \"Origin:\" tag in a <filename>Release</filename> file is not an "
-"Internet address but an author or vendor name, such as \"Debian\" or \"Ximian"
-"\"."
+"Internet address but an author or vendor name, such as \"Debian\" or "
+"\"Ximian\"."
msgstr ""
"Isto <emphasis>não</emphasis> deve ser confundido com a Origem de uma "
"distribuição como especificada num ficheiro <filename>Release</filename>. O "
@@ -7434,8 +7516,8 @@ msgstr ""
"uma prioridade mais alta que o predefinido (500) a todos as versões de "
"pacotes que pertencem a uma distribuição <literal>stable</literal> e uma "
"prioridade proibitivamente baixa a versões de pacotes pertencentes a outras "
-"distribuições <literal>Debian</literal>. <placeholder type=\"programlisting"
-"\" id=\"0\"/>"
+"distribuições <literal>Debian</literal>. <placeholder "
+"type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#: apt_preferences.5.xml
@@ -7459,8 +7541,8 @@ msgid ""
msgstr ""
"Com um ficheiro &sources-list; apropriado e o ficheiro de preferências "
"acima, qualquer dos seguintes comandos irá fazer com que o APT actualize "
-"para as versões <literal>stable</literal> mais recentes. <placeholder type="
-"\"programlisting\" id=\"0\"/>"
+"para as versões <literal>stable</literal> mais recentes. <placeholder "
+"type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#: apt_preferences.5.xml
@@ -7521,8 +7603,8 @@ msgid ""
"to package versions from the <literal>testing</literal> distribution, a "
"lower priority to package versions from the <literal>unstable</literal> "
"distribution, and a prohibitively low priority to package versions from "
-"other <literal>Debian</literal> distributions. <placeholder type="
-"\"programlisting\" id=\"0\"/>"
+"other <literal>Debian</literal> distributions. <placeholder "
+"type=\"programlisting\" id=\"0\"/>"
msgstr ""
"O seguinte ficheiro de preferências do APT irá fazer com que o APT atribua "
"uma prioridade alta a versões de pacotes da distribuição <literal>testing</"
@@ -7541,8 +7623,8 @@ msgid ""
msgstr ""
"Com um ficheiro &sources-list; apropriado e o ficheiro de preferências "
"acima, qualquer dos seguintes comandos irá fazer com que o APT actualize "
-"para as versões <literal>testing</literal> mais recentes. <placeholder type="
-"\"programlisting\" id=\"0\"/>"
+"para as versões <literal>testing</literal> mais recentes. <placeholder "
+"type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#: apt_preferences.5.xml
@@ -7828,8 +7910,8 @@ msgstr ""
"literal> no inicia da linha marca a linha inteira como um comentário. Uma "
"entrada pode assim ser desactivada ao comentar cada linha que pertence à "
"estrofe, mas é geralmente mais fácil adicionar o campo \"Enabled: no\" à "
-"estrofe para desactivar a entrada. Removendo o campo ou defini-lo para \"yes"
-"\" volta a activá-la. As opções têm a mesma sintaxe que todos os outros "
+"estrofe para desactivar a entrada. Removendo o campo ou defini-lo para "
+"\"yes\" volta a activá-la. As opções têm a mesma sintaxe que todos os outros "
"campos. Um nome de campo é separado por dois pontos (<literal>:</literal>) e "
"opcionalmente por espaços dos seus valor(es). Note especialmente que "
"múltiplos valores são separados por espaços em branco (como espaços, tabs e "
@@ -8042,8 +8124,8 @@ msgid ""
msgstr ""
"Como um exemplo, as fontes da sua distribuição podem-se parecer com isto no "
"formato estilo uma-linha: <placeholder type=\"literallayout\" id=\"0\"/> ou "
-"com isto no formato estilo deb822: <placeholder type=\"literallayout\" id="
-"\"1\"/>"
+"com isto no formato estilo deb822: <placeholder type=\"literallayout\" "
+"id=\"1\"/>"
#. type: Content of: <refentry><refsect1><title>
#: sources.list.5.xml
@@ -8267,6 +8349,29 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
#: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "<option>Signed-By</option> (<option>signed-by</option>) is an option to "
+#| "require a repository to pass &apt-secure; verification with a certain set "
+#| "of keys rather than all trusted keys apt has configured. It is specified "
+#| "as a 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 "
+#| "<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 "
+#| "keyrings are selected. A fingerprint will accept also all signatures by a "
+#| "subkey of this key, if this isn't desired an exclamation mark (<literal>!"
+#| "</literal>) can be appended to the fingerprint to disable this "
+#| "behaviour. The option defaults to the value of the option with the same "
+#| "name if set in the previously acquired <filename>Release</filename> file "
+#| "of this repository (only fingerprints can be specified there through). "
+#| "Otherwise all keys in the trusted keyrings are considered valid signers "
+#| "for this repository. The option may also be set directly to an embedded "
+#| "GPG public key block. Special care is needed to encode the empty line "
+#| "with leading spaces and \".\": <placeholder type=\"literallayout\" "
+#| "id=\"0\"/>"
msgid ""
"<option>Signed-By</option> (<option>signed-by</option>) is an option to "
"require a repository to pass &apt-secure; verification with a certain set of "
@@ -8274,20 +8379,23 @@ 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 "
-"<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 "
-"keyrings are selected. A fingerprint will accept also all signatures by a "
-"subkey of this key, if this isn't desired an exclamation mark (<literal>!</"
-"literal>) can be appended to the fingerprint to disable this behaviour. The "
-"option defaults to the value of the option with the same name if set in the "
-"previously acquired <filename>Release</filename> file of this repository "
-"(only fingerprints can be specified there through). Otherwise all keys in "
-"the trusted keyrings are considered valid signers for this repository. The "
-"option may also be set directly to an embedded GPG public key block. Special "
-"care is needed to encode the empty line with leading spaces and \".\": "
-"<placeholder type=\"literallayout\" id=\"0\"/>"
+"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 keyrings are selected. A "
+"fingerprint will accept also all signatures by a subkey of this key, if this "
+"isn't desired an exclamation mark (<literal>!</literal>) can be appended to "
+"the fingerprint to disable this behaviour. The option defaults to the value "
+"of the option with the same name if set in the previously acquired "
+"<filename>Release</filename> file of this repository (only fingerprints can "
+"be specified there through). Otherwise all keys in the trusted keyrings are "
+"considered valid signers for this repository. The option may also be set "
+"directly to an embedded GPG public key block. Special care is needed to "
+"encode the empty line with leading spaces and \".\": <placeholder "
+"type=\"literallayout\" id=\"0\"/>"
msgstr ""
"<option>Signed-By</option> (<option>signed-by</option>) é uma opção para "
"requerer a um repositório para passar a verificação &apt-secure; com um "
@@ -8311,8 +8419,8 @@ msgstr ""
"chaveiros de confiança são consideradas assinantes válidos para este "
"repositório. A opção também pode ser definida diretamente para um bloco de "
"chave pública embebido. É preciso especial cuidado para codificar a linha "
-"vazia com espaços iniciais e \".\": <placeholder type=\"literallayout\" id="
-"\"0\"/>"
+"vazia com espaços iniciais e \".\": <placeholder type=\"literallayout\" "
+"id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
#: sources.list.5.xml
@@ -8528,11 +8636,11 @@ msgid ""
msgstr ""
"O esquema mirror especifica a localização de uma mirrorlist. Por "
"predefinição o esquema usado para a localização é <literal>http</literal>, "
-"mas pode ser usado qualquer outro esquema via <command>mirror"
-"+<replaceable>esquema</replaceable></command>. A própria mirrorlist pode "
-"conter vários URIs diferentes para mirrors que o cliente do APT pode "
-"transparentemente pegar, escolher e recorrer entre os pretendentes para "
-"ajudar tanto com a distribuição da carga sobre os mirrors disponíveis e "
+"mas pode ser usado qualquer outro esquema via "
+"<command>mirror+<replaceable>esquema</replaceable></command>. A própria "
+"mirrorlist pode conter vários URIs diferentes para mirrors que o cliente do "
+"APT pode transparentemente pegar, escolher e recorrer entre os pretendentes "
+"para ajudar tanto com a distribuição da carga sobre os mirrors disponíveis e "
"assegurando que os clientes podem adquirir dados mesmo que alguns dos "
"mirrors configurados não estejam disponíveis."
@@ -8890,8 +8998,9 @@ msgstr ""
"binary-i386</filename> em máquinas i386, <filename>unstable/binary-amd64</"
"filename> em amd64, e assim por diante para outras arquitecturas suportadas. "
"[Note que este exemplo apenas mostra como usar a variável de substituição; "
-"os arquivos oficiais debian não estão estruturados assim] <placeholder type="
-"\"literallayout\" id=\"0\"/> <placeholder type=\"literallayout\" id=\"1\"/>"
+"os arquivos oficiais debian não estão estruturados assim] <placeholder "
+"type=\"literallayout\" id=\"0\"/> <placeholder type=\"literallayout\" "
+"id=\"1\"/>"
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml
@@ -9481,14 +9590,14 @@ msgid ""
"Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
"$(SECTION)/binary-$(ARCH)/</filename>"
msgstr ""
-"Define o topo da árvore de directórios .deb. A predefinição é <filename>"
-"$(DIST)/$(SECTION)/binary-$(ARCH)/</filename>"
+"Define o topo da árvore de directórios .deb. A predefinição é "
+"<filename>$(DIST)/$(SECTION)/binary-$(ARCH)/</filename>"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml
msgid ""
-"Sets the top of the source package directory tree. Defaults to <filename>"
-"$(DIST)/$(SECTION)/source/</filename>"
+"Sets the top of the source package directory tree. Defaults to "
+"<filename>$(DIST)/$(SECTION)/source/</filename>"
msgstr ""
"Define o topo da árvore de directórios de pacotes fonte. A predefinição é "
"<filename>$(DIST)/$(SECTION)/source/</filename>"
@@ -9515,12 +9624,12 @@ msgstr ""
#: apt-ftparchive.1.xml
msgid ""
"Sets the output Translation-en master file with the long descriptions if "
-"they should be not included in the Packages file. Defaults to <filename>"
-"$(DIST)/$(SECTION)/i18n/Translation-en</filename>"
+"they should be not included in the Packages file. Defaults to "
+"<filename>$(DIST)/$(SECTION)/i18n/Translation-en</filename>"
msgstr ""
"Define se o ficheiro mestre Translation-en de saída com as descrições longas "
-"não deve ser incluído no ficheiro Packages. A predefinição é <filename>"
-"$(DIST)/$(SECTION)/i18n/Translation-en</filename>"
+"não deve ser incluído no ficheiro Packages. A predefinição é "
+"<filename>$(DIST)/$(SECTION)/i18n/Translation-en</filename>"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml
@@ -9649,12 +9758,12 @@ msgstr ""
#: apt-ftparchive.1.xml
msgid ""
"When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
-"command> performs an operation similar to: <placeholder type=\"programlisting"
-"\" id=\"0\"/>"
+"command> performs an operation similar to: <placeholder "
+"type=\"programlisting\" id=\"0\"/>"
msgstr ""
"Quando processa uma secção <literal>Tree</literal>, o <command>apt-"
-"ftparchive</command> executa uma operação semelhante a: <placeholder type="
-"\"programlisting\" id=\"0\"/>"
+"ftparchive</command> executa uma operação semelhante a: <placeholder "
+"type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml
@@ -9812,19 +9921,20 @@ msgstr "new"
#. type: Content of: <refentry><refsect1><para>
#: apt-ftparchive.1.xml
msgid ""
-"The general form of the maintainer field is: <placeholder type="
-"\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
-"id=\"1\"/> The first form allows a double-slash separated list of old email "
-"addresses to be specified. If any of those are found then new is substituted "
-"for the maintainer field. The second form unconditionally substitutes the "
-"maintainer field."
-msgstr ""
-"O formato geral do campo do responsável é: <placeholder type=\"literallayout"
-"\" id=\"0\"/> ou simplesmente, <placeholder type=\"literallayout\" id=\"1\"/"
-">. O primeiro formato permite uma lista separada por um duplo slash (//) de "
-"antigos endereços e email a serem especificados. Se nenhum destes for "
-"encontrado então 'new' é substituído para o campo do responsável. O segundo "
-"formato substitui incondicionalmente o campo do responsável."
+"The general form of the maintainer field is: <placeholder "
+"type=\"literallayout\" id=\"0\"/> or simply, <placeholder "
+"type=\"literallayout\" id=\"1\"/> The first form allows a double-slash "
+"separated list of old email addresses to be specified. If any of those are "
+"found then new is substituted for the maintainer field. The second form "
+"unconditionally substitutes the maintainer field."
+msgstr ""
+"O formato geral do campo do responsável é: <placeholder "
+"type=\"literallayout\" id=\"0\"/> ou simplesmente, <placeholder "
+"type=\"literallayout\" id=\"1\"/>. O primeiro formato permite uma lista "
+"separada por um duplo slash (//) de antigos endereços e email a serem "
+"especificados. Se nenhum destes for encontrado então 'new' é substituído "
+"para o campo do responsável. O segundo formato substitui incondicionalmente "
+"o campo do responsável."
#. type: Content of: <refentry><refsect1><title>
#: apt-ftparchive.1.xml
@@ -10226,8 +10336,8 @@ msgid ""
"password <literal>debian</literal> for the &sources-list; entry <placeholder "
"type=\"literallayout\" id=\"0\"/> could be done in the entry directly: "
"<placeholder type=\"literallayout\" id=\"1\"/> Alternatively an entry like "
-"the following in the auth.conf file could be used: <placeholder type="
-"\"literallayout\" id=\"2\"/> Or alternatively within a single line: "
+"the following in the auth.conf file could be used: <placeholder "
+"type=\"literallayout\" id=\"2\"/> Or alternatively within a single line: "
"<placeholder type=\"literallayout\" id=\"3\"/> If you need to be more "
"specific all of these lines will also apply to the example entry: "
"<placeholder type=\"literallayout\" id=\"4\"/> On the other hand neither of "
@@ -10239,11 +10349,11 @@ msgstr ""
"feito na entrada directamente: <placeholder type=\"literallayout\" id=\"1\"/"
"> Alternativamente, pode ser usada uma entrada como a seguinte no ficheiro "
"auth.conf: <placeholder type=\"literallayout\" id=\"2\"/> Ou "
-"alternativamente dentro de uma linha única: <placeholder type=\"literallayout"
-"\" id=\"3\"/> Se precisar de ser mais específico, todas estas linha poderão "
-"ser aplicadas no exemplo de entrada: <placeholder type=\"literallayout\" id="
-"\"4\"/> Por outro lado nenhuma das seguintes linhas aplicam-se: "
-"<placeholder type=\"literallayout\" id=\"5\"/>"
+"alternativamente dentro de uma linha única: <placeholder "
+"type=\"literallayout\" id=\"3\"/> Se precisar de ser mais específico, todas "
+"estas linha poderão ser aplicadas no exemplo de entrada: <placeholder "
+"type=\"literallayout\" id=\"4\"/> Por outro lado nenhuma das seguintes "
+"linhas aplicam-se: <placeholder type=\"literallayout\" id=\"5\"/>"
#. type: Content of: <refentry><refsect1><title>
#: apt_auth.conf.5.xml
@@ -10341,10 +10451,10 @@ msgstr ""
msgid ""
"HTTP is an unencrypted transport protocol meaning that the whole "
"communication with the remote server (or proxy) can be observed by a "
-"sufficiently capable attacker commonly referred to as a \"man in the middle"
-"\" (MITM). However, such an attacker can <emphasis>not</emphasis> modify "
-"the communication to compromise the security of your system, as APT's data "
-"security model is independent of the chosen transport method. This is "
+"sufficiently capable attacker commonly referred to as a \"man in the "
+"middle\" (MITM). However, such an attacker can <emphasis>not</emphasis> "
+"modify the communication to compromise the security of your system, as APT's "
+"data security model is independent of the chosen transport method. This is "
"explained in detail in &apt-secure;. An overview of available transport "
"methods is given in &sources-list;."
msgstr ""
@@ -10774,8 +10884,8 @@ msgstr ""
"verificado contra a identidade encontrada no certificado. Este comportamento "
"predefinido é seguro e não deve ser alterado, ,mas se você sabe que o "
"servidor que está a usar tem um nome DNS que não corresponde à identidade no "
-"seu certificado, você pode definir a opção para \"<literal>false</literal>"
-"\", o que irá impedir que a comparação seja feita."
+"seu certificado, você pode definir a opção para \"<literal>false</"
+"literal>\", o que irá impedir que a comparação seja feita."
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt-transport-https.1.xml
@@ -12598,10 +12708,10 @@ msgstr ""
msgid ""
"Both that APT <command>dselect</command> method and <command>apt-get</"
"command> share the same interface. It is a simple system that generally "
-"tells you what it will do and then goes and does it. <placeholder type="
-"\"footnote\" id=\"0\"/> After printing out a summary of what will happen APT "
-"then will print out some informative status messages so that you can "
-"estimate how far along it is and how much is left to do."
+"tells you what it will do and then goes and does it. <placeholder "
+"type=\"footnote\" id=\"0\"/> After printing out a summary of what will "
+"happen APT then will print out some informative status messages so that you "
+"can estimate how far along it is and how much is left to do."
msgstr ""
"Ambos método <command>dselect</command> do APT e <command>apt-get</command> "
"partilham a mesma interface. É um sistema simples que geralmente lhe diz o "
@@ -12732,15 +12842,15 @@ msgstr ""
msgid ""
"There are two ways a system can get into a broken state like this. The first "
"is caused by <command>dpkg</command> missing some subtle relationships "
-"between packages when performing upgrades. <placeholder type=\"footnote\" id="
-"\"0\"/>. The second is if a package installation fails during an operation. "
-"In this situation a package may have been unpacked without its dependents "
-"being installed."
+"between packages when performing upgrades. <placeholder type=\"footnote\" "
+"id=\"0\"/>. The second is if a package installation fails during an "
+"operation. In this situation a package may have been unpacked without its "
+"dependents being installed."
msgstr ""
"Existem duas maneiras de um sistema entrar num estado de quebra como este. A "
"primeira é causada pelo <command>dpkg</command> que não vê algumas relações "
-"subtis entre pacotes quando executa actualizações. <placeholder type="
-"\"footnote\" id=\"0\"/>. A segunda é se uma instalação de pacote falha "
+"subtis entre pacotes quando executa actualizações. <placeholder "
+"type=\"footnote\" id=\"0\"/>. A segunda é se uma instalação de pacote falha "
"durante uma operação. Nesta situação um pacote pode ter sido desempacotado "
"sem que as suas dependências tenham sido instaladas."
@@ -13783,8 +13893,8 @@ msgstr "O qual irá usar os arquivos já obtidos e que estão no disco."
#~ "problemas e melhoramentos que encontre e certifique-se de anotar nos seus "
#~ "relatórios quais as opções que usou. Pedir ajuda ao &dpkg; também pode "
#~ "ser útil para propósitos de depuração, veja ex. <command>dpkg --audit</"
-#~ "command>. Uma combinação de opções defensiva seria <placeholder type="
-#~ "\"literallayout\" id=\"0\"/>"
+#~ "command>. Uma combinação de opções defensiva seria <placeholder "
+#~ "type=\"literallayout\" id=\"0\"/>"
#~ msgid ""
#~ "Add the no triggers flag to all &dpkg; calls (except the ConfigurePending "
@@ -13821,11 +13931,11 @@ msgstr "O qual irá usar os arquivos já obtidos e que estão no disco."
#~ "otherwise the system could end in an unconfigured and potentially "
#~ "unbootable state."
#~ msgstr ""
-#~ "Valores válidos são \"<literal>all</literal>\", \"<literal>smart</literal>"
-#~ "\" e \"<literal>no</literal>\". O valor predefinido é \"<literal>all</"
-#~ "literal>\" que faz com que o APT configure todos os pacotes. O modo "
-#~ "\"<literal>smart</literal>\" serve para configurar apenas pacotes que "
-#~ "precisam de ser configurados antes que outro pacote possa ser "
+#~ "Valores válidos são \"<literal>all</literal>\", \"<literal>smart</"
+#~ "literal>\" e \"<literal>no</literal>\". O valor predefinido é "
+#~ "\"<literal>all</literal>\" que faz com que o APT configure todos os "
+#~ "pacotes. O modo \"<literal>smart</literal>\" serve para configurar apenas "
+#~ "pacotes que precisam de ser configurados antes que outro pacote possa ser "
#~ "desempacotado (pré-dependências) e o resto configurado pelo &dpkg; com "
#~ "uma chamada gerada pela opção ConfigurePending (veja em baixo). Por outro "
#~ "lado, \"<literal>no</literal>\" não irá configurar nada e confiar no "
@@ -13886,8 +13996,8 @@ msgstr "O qual irá usar os arquivos já obtidos e que estão no disco."
#~ "'imediato' é relativamente baixa (um pacote que tenha uma pré-dependência "
#~ "tem pontuação mais alta). Esta opção e as outras no mesmo grupo podem ser "
#~ "usadas para alterar a pontuação. O exemplo seguinte mostra as definições "
-#~ "que são valores predefinidos. <placeholder type=\"literallayout\" id="
-#~ "\"0\"/>"
+#~ "que são valores predefinidos. <placeholder type=\"literallayout\" "
+#~ "id=\"0\"/>"
#~ msgid "List fingerprints of trusted keys."
#~ msgstr "Lista as fingerprints das chaves de confiança."
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index 5c2b2b74c..dfc6ca58f 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: 2022-01-06 20:58+0100\n"
+"POT-Creation-Date: 2022-02-22 20:01+0100\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"
@@ -302,6 +302,10 @@ msgid ""
" be stored here (by other packages or the administrator).\n"
" 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 ""
@@ -621,15 +625,15 @@ msgstr ""
#: apt.8.xml
msgid ""
"<option>satisfy</option> satisfies dependency strings, as used in Build-"
-"Depends. It also handles conflicts, by prefixing an argument with <literal>"
-"\"Conflicts: \"</literal>."
+"Depends. It also handles conflicts, by prefixing an argument with "
+"<literal>\"Conflicts: \"</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.8.xml
msgid ""
-"Example: <literal>apt satisfy \"foo, bar (>= 1.0)\" \"Conflicts: baz, fuzz"
-"\"</literal>"
+"Example: <literal>apt satisfy \"foo, bar (>= 1.0)\" \"Conflicts: baz, "
+"fuzz\"</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
@@ -1818,8 +1822,9 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cache.8.xml
msgid ""
-"The same as <literal>dotty</literal>, only for xvcg from the <ulink url="
-"\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>."
+"The same as <literal>dotty</literal>, only for xvcg from the <ulink "
+"url=\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</"
+"ulink>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
@@ -2175,6 +2180,71 @@ msgid ""
"this one."
msgstr ""
+#. type: Content of: <refentry><refsect1><title>
+#: apt-key.8.xml
+#, fuzzy
+msgid "Deprecation"
+msgstr "Descrição"
+
+#. 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;"
@@ -2602,8 +2672,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt-secure.8.xml
msgid ""
-"For more background information you might want to review the <ulink url="
-"\"https://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
+"For more background information you might want to review the <ulink "
+"url=\"https://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
"Security Infrastructure</ulink> chapter of the Securing Debian Manual (also "
"available in the harden-doc package) and the <ulink url=\"http://www."
"cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution HOWTO</"
@@ -3392,10 +3462,10 @@ msgid ""
"literal> script in the configuration file. This entry specifies the commands "
"to send to tell the proxy server what to connect to. Please see "
"&configureindex; for an example of how to do this. The substitution "
-"variables representing the corresponding URI component are <literal>"
-"$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, <literal>"
-"$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, <literal>$(SITE)</"
-"literal> and <literal>$(SITE_PORT)</literal>."
+"variables representing the corresponding URI component are "
+"<literal>$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, "
+"<literal>$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, "
+"<literal>$(SITE)</literal> and <literal>$(SITE_PORT)</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -3582,8 +3652,8 @@ msgid ""
"specifies the languages. So the following example configuration will result "
"in the order \"en, de\" in an English locale or \"de, en\" in a German one. "
"Note that \"fr\" is downloaded, but not used unless APT is used in a French "
-"locale (where the order would be \"fr, de, en\"). <placeholder type="
-"\"programlisting\" id=\"0\"/>"
+"locale (where the order would be \"fr, de, en\"). <placeholder "
+"type=\"programlisting\" id=\"0\"/>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -4382,8 +4452,9 @@ msgid ""
"in the APT configuration file <filename>/etc/apt/apt.conf</filename>. Note "
"that this has precedence over any general priority you set in the <filename>/"
"etc/apt/preferences</filename> file described later, but not over "
-"specifically pinned packages. For example, <placeholder type="
-"\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>"
+"specifically pinned packages. For example, <placeholder "
+"type=\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" "
+"id=\"1\"/>"
msgstr ""
"Caso não exista um arquivo de preferências ou caso não exista uma entrada no "
"arquivo que se aplique a uma instância em particular, a prioridade atribuída "
@@ -4743,15 +4814,15 @@ msgid ""
"This should <emphasis>not</emphasis> be confused with the Origin of a "
"distribution as specified in a <filename>Release</filename> file. What "
"follows the \"Origin:\" tag in a <filename>Release</filename> file is not an "
-"Internet address but an author or vendor name, such as \"Debian\" or \"Ximian"
-"\"."
+"Internet address but an author or vendor name, such as \"Debian\" or "
+"\"Ximian\"."
msgstr ""
-"Uma nota de aviso : a palavra-chave usada aqui é \"<literal>origin</literal>"
-"\". Esta palavra não deve ser confundida com a origem (\"Origin:\") de uma "
-"distribuição como especificado em um arquivo <filename>Release</filename>. O "
-"que segue a tag \"Origin:\" em um arquivo <filename>Release</filename> não é "
-"um endereço de site Internet mas sim nome de autor ou distribuidor (vendor), "
-"como \"Debian\" ou \"Ximian\"."
+"Uma nota de aviso : a palavra-chave usada aqui é \"<literal>origin</"
+"literal>\". Esta palavra não deve ser confundida com a origem (\"Origin:\") "
+"de uma distribuição como especificado em um arquivo <filename>Release</"
+"filename>. O que segue a tag \"Origin:\" em um arquivo <filename>Release</"
+"filename> não é um endereço de site Internet mas sim nome de autor ou "
+"distribuidor (vendor), como \"Debian\" ou \"Ximian\"."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#: apt_preferences.5.xml
@@ -5631,8 +5702,8 @@ msgid ""
"to package versions from the <literal>testing</literal> distribution, a "
"lower priority to package versions from the <literal>unstable</literal> "
"distribution, and a prohibitively low priority to package versions from "
-"other <literal>Debian</literal> distributions. <placeholder type="
-"\"programlisting\" id=\"0\"/>"
+"other <literal>Debian</literal> distributions. <placeholder "
+"type=\"programlisting\" id=\"0\"/>"
msgstr ""
"O arquivo de preferências do APT a seguir fará com que o APT atribua uma "
"prioridade maior para versões de pacote da distribuição <literal>testing</"
@@ -6158,20 +6229,23 @@ 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 "
-"<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 "
-"keyrings are selected. A fingerprint will accept also all signatures by a "
-"subkey of this key, if this isn't desired an exclamation mark (<literal>!</"
-"literal>) can be appended to the fingerprint to disable this behaviour. The "
-"option defaults to the value of the option with the same name if set in the "
-"previously acquired <filename>Release</filename> file of this repository "
-"(only fingerprints can be specified there through). Otherwise all keys in "
-"the trusted keyrings are considered valid signers for this repository. The "
-"option may also be set directly to an embedded GPG public key block. Special "
-"care is needed to encode the empty line with leading spaces and \".\": "
-"<placeholder type=\"literallayout\" id=\"0\"/>"
+"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 keyrings are selected. A "
+"fingerprint will accept also all signatures by a subkey of this key, if this "
+"isn't desired an exclamation mark (<literal>!</literal>) can be appended to "
+"the fingerprint to disable this behaviour. The option defaults to the value "
+"of the option with the same name if set in the previously acquired "
+"<filename>Release</filename> file of this repository (only fingerprints can "
+"be specified there through). Otherwise all keys in the trusted keyrings are "
+"considered valid signers for this repository. The option may also be set "
+"directly to an embedded GPG public key block. Special care is needed to "
+"encode the empty line with leading spaces and \".\": <placeholder "
+"type=\"literallayout\" id=\"0\"/>"
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
@@ -7017,8 +7091,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml
msgid ""
-"Sets the top of the source package directory tree. Defaults to <filename>"
-"$(DIST)/$(SECTION)/source/</filename>"
+"Sets the top of the source package directory tree. Defaults to "
+"<filename>$(DIST)/$(SECTION)/source/</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
@@ -7039,8 +7113,8 @@ msgstr ""
#: apt-ftparchive.1.xml
msgid ""
"Sets the output Translation-en master file with the long descriptions if "
-"they should be not included in the Packages file. Defaults to <filename>"
-"$(DIST)/$(SECTION)/i18n/Translation-en</filename>"
+"they should be not included in the Packages file. Defaults to "
+"<filename>$(DIST)/$(SECTION)/i18n/Translation-en</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
@@ -7137,8 +7211,8 @@ msgstr ""
#: apt-ftparchive.1.xml
msgid ""
"When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
-"command> performs an operation similar to: <placeholder type=\"programlisting"
-"\" id=\"0\"/>"
+"command> performs an operation similar to: <placeholder "
+"type=\"programlisting\" id=\"0\"/>"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
@@ -7272,12 +7346,12 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt-ftparchive.1.xml
msgid ""
-"The general form of the maintainer field is: <placeholder type="
-"\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
-"id=\"1\"/> The first form allows a double-slash separated list of old email "
-"addresses to be specified. If any of those are found then new is substituted "
-"for the maintainer field. The second form unconditionally substitutes the "
-"maintainer field."
+"The general form of the maintainer field is: <placeholder "
+"type=\"literallayout\" id=\"0\"/> or simply, <placeholder "
+"type=\"literallayout\" id=\"1\"/> The first form allows a double-slash "
+"separated list of old email addresses to be specified. If any of those are "
+"found then new is substituted for the maintainer field. The second form "
+"unconditionally substitutes the maintainer field."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
@@ -7582,8 +7656,8 @@ msgid ""
"password <literal>debian</literal> for the &sources-list; entry <placeholder "
"type=\"literallayout\" id=\"0\"/> could be done in the entry directly: "
"<placeholder type=\"literallayout\" id=\"1\"/> Alternatively an entry like "
-"the following in the auth.conf file could be used: <placeholder type="
-"\"literallayout\" id=\"2\"/> Or alternatively within a single line: "
+"the following in the auth.conf file could be used: <placeholder "
+"type=\"literallayout\" id=\"2\"/> Or alternatively within a single line: "
"<placeholder type=\"literallayout\" id=\"3\"/> If you need to be more "
"specific all of these lines will also apply to the example entry: "
"<placeholder type=\"literallayout\" id=\"4\"/> On the other hand neither of "
@@ -7668,10 +7742,10 @@ msgstr ""
msgid ""
"HTTP is an unencrypted transport protocol meaning that the whole "
"communication with the remote server (or proxy) can be observed by a "
-"sufficiently capable attacker commonly referred to as a \"man in the middle"
-"\" (MITM). However, such an attacker can <emphasis>not</emphasis> modify "
-"the communication to compromise the security of your system, as APT's data "
-"security model is independent of the chosen transport method. This is "
+"sufficiently capable attacker commonly referred to as a \"man in the "
+"middle\" (MITM). However, such an attacker can <emphasis>not</emphasis> "
+"modify the communication to compromise the security of your system, as APT's "
+"data security model is independent of the chosen transport method. This is "
"explained in detail in &apt-secure;. An overview of available transport "
"methods is given in &sources-list;."
msgstr ""
@@ -9401,10 +9475,10 @@ msgstr ""
msgid ""
"Both that APT <command>dselect</command> method and <command>apt-get</"
"command> share the same interface. It is a simple system that generally "
-"tells you what it will do and then goes and does it. <placeholder type="
-"\"footnote\" id=\"0\"/> After printing out a summary of what will happen APT "
-"then will print out some informative status messages so that you can "
-"estimate how far along it is and how much is left to do."
+"tells you what it will do and then goes and does it. <placeholder "
+"type=\"footnote\" id=\"0\"/> After printing out a summary of what will "
+"happen APT then will print out some informative status messages so that you "
+"can estimate how far along it is and how much is left to do."
msgstr ""
#. type: Content of: <book><chapter><section><title>
@@ -9491,10 +9565,10 @@ msgstr ""
msgid ""
"There are two ways a system can get into a broken state like this. The first "
"is caused by <command>dpkg</command> missing some subtle relationships "
-"between packages when performing upgrades. <placeholder type=\"footnote\" id="
-"\"0\"/>. The second is if a package installation fails during an operation. "
-"In this situation a package may have been unpacked without its dependents "
-"being installed."
+"between packages when performing upgrades. <placeholder type=\"footnote\" "
+"id=\"0\"/>. The second is if a package installation fails during an "
+"operation. In this situation a package may have been unpacked without its "
+"dependents being installed."
msgstr ""
#. type: Content of: <book><chapter><section><para>
@@ -10165,10 +10239,6 @@ msgstr ""
#~ "Pin-Priority: 50\n"
#, fuzzy
-#~ msgid "Dir Section"
-#~ msgstr "Descrição"
-
-#, fuzzy
#~ msgid "<replaceable>&synopsis-filename;</replaceable>"
#~ msgstr ""
#~ "<programlisting>\n"
diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml
index 6c278dd61..f7da9ba43 100644
--- a/doc/sources.list.5.xml
+++ b/doc/sources.list.5.xml
@@ -14,7 +14,7 @@
&apt-email;
&apt-product;
<!-- The last update date -->
- <date>2021-06-09T00:00:00Z</date>
+ <date>2022-02-22T00:00:00Z</date>
</refentryinfo>
<refmeta>