Release 2.4.02.4.0

1 files changed, 193 insertions, 111 deletions

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"