Release 2.9.262.9.26

This reflows the documentation po files now using the latest
gettext.

58 files changed, 4854 insertions, 3708 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3523d6173..0b6c6ec39 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -204,7 +204,7 @@ endif()
 # Configure some variables like package, version and architecture.
 set(PACKAGE ${PROJECT_NAME})
 set(PACKAGE_MAIL "APT Development Team <deity@lists.debian.org>")
-set(PACKAGE_VERSION "2.9.25")
+set(PACKAGE_VERSION "2.9.26")
 string(REGEX MATCH "^[0-9.]+" PROJECT_VERSION ${PACKAGE_VERSION})
 
 if (NOT DEFINED DPKG_DATADIR)
diff --git a/debian/changelog b/debian/changelog
index e8195f3fe..9350e55d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,25 @@
+apt (2.9.26) unstable; urgency=medium
+
+  [ Sam Hartman ]
+  * Fix regression that prevented sending intermediate client certificates
+
+  [ Andreas Rönnquist ]
+  * apt-secure manual page is in manual section 8
+
+  [ Julian Andres Klode ]
+  * apt: Introduce the modernize-sources command
+  * Make notices about .list sources without signed-by less obnoxious
+    You get a single line telling you about modernize-sources now, unless
+    you run --audit (or have deb822 files without Signed-By).
+  * Documentation updates:
+    - Deprecate legacy one-line-style format harder. Removal not before 2029.
+    - Set signed-by/Signed-By in sources.list(5) short examples for Debian, Ubuntu
+    - Update Debian, Ubuntu example default sources to best practices:
+      We now ship debian.sources/ubuntu.sources instead of sources.list
+    - Update codenames for trixie, plucky as stable
+
+ -- Julian Andres Klode <jak@debian.org>  Tue, 28 Jan 2025 19:49:53 +0100
+
 apt (2.9.25) unstable; urgency=medium
 
   * sqv, gpgv: Do not fail if Dir::Etc::Trusted is set and trusted.gpg.d is missing
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 85aca1607..f5a9832c4 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -268,7 +268,7 @@
 ">
 
 <!-- this will be updated by 'prepare-release' -->
-<!ENTITY apt-product-version "2.9.25">
+<!ENTITY apt-product-version "2.9.26">
 
 <!-- (Code)names for various things used all over the place -->
 <!ENTITY debian-oldstable-codename "bookworm">
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 5b17c4398..9e21b8602 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.9.25\n"
+"Project-Id-Version: apt-doc 2.9.26\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2025-01-22 10:57+0000\n"
+"POT-Creation-Date: 2025-01-28 18:52+0000\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"
@@ -5537,6 +5537,13 @@ msgid ""
 "multi-architecture support."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml
+msgid ""
+"This format is deprecated and may eventually be removed, but not before "
+"2029."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><title>
 #: sources.list.5.xml
 msgid "deb822-Style Format"
@@ -5702,10 +5709,10 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
 msgid ""
-"As an example, the sources for your distribution could look like this in "
-"one-line-style format: <placeholder type=\"literallayout\" id=\"0\"/> or "
-"like this in deb822 style format: <placeholder type=\"literallayout\" "
-"id=\"1\"/>"
+"As an example, the sources for your distribution could look like this in the "
+"deprecated one-line-style format: <placeholder type=\"literallayout\" "
+"id=\"0\"/> or like this in deb822 style format: <placeholder "
+"type=\"literallayout\" id=\"1\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
diff --git a/doc/po/de.po b/doc/po/de.po
index e25317f1a..09e6baa7d 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: 2025-01-01 21:58+0100\n"
+"POT-Creation-Date: 2025-01-28 18:52+0000\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"
@@ -591,8 +591,9 @@ msgstr ""
 #. type: Plain text
 #: apt.ent
 msgid ""
-"<!-- TRANSLATOR: used as in -o=config_string e.g. -o=Debug::"
-"pkgProblemResolver=1 --> <!ENTITY synopsis-config-string \"config_string\">"
+"<!-- TRANSLATOR: used as in -o=config_string e.g. "
+"-o=Debug::pkgProblemResolver=1 --> <!ENTITY synopsis-config-string "
+"\"config_string\">"
 msgstr "<!ENTITY synopsis-config-string \"Konfigurationszeichenkette\">"
 
 #. type: Plain text
@@ -605,8 +606,8 @@ msgstr "<!ENTITY synopsis-config-file \"Konfigurationsdatei\">"
 #. type: Plain text
 #: apt.ent
 msgid ""
-"<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release e.g. -"
-"t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
+"<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release e.g. "
+"-t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
 "\"target_release\">"
 msgstr "<!ENTITY synopsis-target-release \"Ziel-Release\">"
 
@@ -648,8 +649,8 @@ msgstr "<!ENTITY synopsis-regex \"regulärer_Ausdruck\">"
 #. type: Plain text
 #: apt.ent
 msgid ""
-"<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom -"
-"d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"cdrom_mount_point\">"
+"<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom "
+"-d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"cdrom_mount_point\">"
 msgstr "<!ENTITY synopsis-cdrom-mount \"CD-ROM-Einhängepunkt\">"
 
 #. type: Plain text
@@ -1177,11 +1178,11 @@ msgstr ""
 "get</command> hat ein »intelligentes« Konfliktauflösungssystem und es wird "
 "versuchen, Upgrades der wichtigsten Pakete, wenn nötig zu Lasten der weniger "
 "wichtigen, durchzuführen. Aufgrunddessen könnte der <literal>dist-upgrade</"
-"literal>-Befehl einige Pakete entfernen. Die <filename>/etc/apt/sources."
-"list</filename>-Datei enthält eine Liste von Orten, von denen gewünschte "
-"Paketdateien abgerufen werden. Siehe auch &apt-preferences; für einen "
-"Mechanismus zum Außerkraftsetzen der allgemeinen Einstellungen für einzelne "
-"Pakete."
+"literal>-Befehl einige Pakete entfernen. Die <filename>/etc/apt/"
+"sources.list</filename>-Datei enthält eine Liste von Orten, von denen "
+"gewünschte Paketdateien abgerufen werden. Siehe auch &apt-preferences; für "
+"einen Mechanismus zum Außerkraftsetzen der allgemeinen Einstellungen für "
+"einzelne Pakete."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -1492,8 +1493,8 @@ msgid ""
 "Example: <literal>apt-get satisfy \"foo\" \"Conflicts: bar\" \"baz (&gt;&gt; "
 "1.0) | bar (= 2.0), moo\"</literal>"
 msgstr ""
-"Beispiel: <literal>apt-get satisfy \"foo\" \"Conflicts: bar\" \"baz (&gt;"
-"&gt; 1.0) | bar (= 2.0), moo\"</literal>"
+"Beispiel: <literal>apt-get satisfy \"foo\" \"Conflicts: bar\" \"baz "
+"(&gt;&gt; 1.0) | bar (= 2.0), moo\"</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -1686,8 +1687,8 @@ msgid ""
 "structure can be so corrupt as to require manual intervention (which usually "
 "means using <command>dpkg --remove</command> to eliminate some of the "
 "offending packages). Use of this option together with <option>-m</option> "
-"may produce an error in some situations.  Configuration Item: <literal>APT::"
-"Get::Fix-Broken</literal>."
+"may produce an error in some situations.  Configuration Item: "
+"<literal>APT::Get::Fix-Broken</literal>."
 msgstr ""
 "Fehler beheben; versucht ein System von vorhandenen, beschädigten "
 "Abhängigkeiten zu befreien. Diese Option kann, wenn sie mit "
@@ -1721,8 +1722,8 @@ msgstr ""
 "kann in einigen Situationen zu Fehlern führen. Wenn ein Paket zur "
 "Installation ausgewählt ist (besonders, wenn es auf der Befehlszeile "
 "angegeben wurde) und nicht heruntergeladen werden kann, wird es "
-"stillschweigend zurückgehalten. Konfigurationselement: <literal>APT::Get::"
-"Fix-Missing</literal>."
+"stillschweigend zurückgehalten. Konfigurationselement: "
+"<literal>APT::Get::Fix-Missing</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -1815,11 +1816,11 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
-"Automatic \"no\" to all prompts.  Configuration Item: <literal>APT::Get::"
-"Assume-No</literal>."
+"Automatic \"no\" to all prompts.  Configuration Item: "
+"<literal>APT::Get::Assume-No</literal>."
 msgstr ""
-"automatisches »Nein« auf alle Anfragen. Konfigurationselement: <literal>APT::"
-"Get::Assume-No</literal>."
+"automatisches »Nein« auf alle Anfragen. Konfigurationselement: "
+"<literal>APT::Get::Assume-No</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -1859,15 +1860,15 @@ msgstr ""
 #, fuzzy
 #| msgid ""
 #| "Select the source override file to use with the <literal>sources</"
-#| "literal> command.  Configuration Item: <literal>APT::FTPArchive::"
-#| "SourceOverride</literal>."
+#| "literal> command.  Configuration Item: "
+#| "<literal>APT::FTPArchive::SourceOverride</literal>."
 msgid ""
 "Add the given value to the <literal>Comment:</literal> field in history.log "
 "Configuration Item: <literal>APT::History::Comment</literal>."
 msgstr ""
 "wählt die Quelldatei zum außer Kraft setzen, die mit dem <literal>sources</"
-"literal>-Befehl benutzt wird. Konfigurationselement: <literal>APT::"
-"FTPArchive::SourceOverride</literal>."
+"literal>-Befehl benutzt wird. Konfigurationselement: "
+"<literal>APT::FTPArchive::SourceOverride</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -1875,9 +1876,9 @@ msgid ""
 "This option controls the architecture packages are built for by <command>apt-"
 "get source --compile</command> and how cross-builddependencies are "
 "satisfied. By default is it not set which means that the host architecture "
-"is the same as the build architecture (which is defined by <literal>APT::"
-"Architecture</literal>).  Configuration Item: <literal>APT::Get::Host-"
-"Architecture</literal>."
+"is the same as the build architecture (which is defined by "
+"<literal>APT::Architecture</literal>).  Configuration Item: "
+"<literal>APT::Get::Host-Architecture</literal>."
 msgstr ""
 "Diese Option steuert, wie die Architektur der durch <command>apt-get source "
 "--compile</command> gebauten Pakete und wie Cross-Bauabhängigkeiten erfüllt "
@@ -1984,8 +1985,8 @@ msgstr ""
 "Dies ist eine gefährliche Option, die APT veranlasst, ohne Nachfrage "
 "fortzufahren, wenn es Downgrades durchführt. Sie sollte nicht benutzt "
 "werden, außer in ganz besonderen Situationen. Ihre Verwendung kann "
-"möglicherweise Ihr System zerstören. Konfigurationselement: <literal>APT::"
-"Get::allow-downgrades</literal>. Eingeführt mit APT 1.1."
+"möglicherweise Ihr System zerstören. Konfigurationselement: "
+"<literal>APT::Get::allow-downgrades</literal>. Eingeführt mit APT 1.1."
 
 # Tatsächlich fragt APT »J/n«
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -2050,8 +2051,8 @@ msgid ""
 "name on the remote site! This also works with the <literal>source</literal> "
 "and <literal>update</literal> commands. When used with the <literal>update</"
 "literal> command the MD5 and size are not included, and it is up to the user "
-"to decompress any compressed files.  Configuration Item: <literal>APT::Get::"
-"Print-URIs</literal>."
+"to decompress any compressed files.  Configuration Item: "
+"<literal>APT::Get::Print-URIs</literal>."
 msgstr ""
 "Anstatt die Dateien herunterzuladen, werden ihre URIs ausgegeben. Jeder URI "
 "wird den Pfad, den Zieldateinamen, die Größe und den erwarteten MD5-Hash "
@@ -2060,8 +2061,8 @@ msgstr ""
 "auch mit den Befehlen <literal>source</literal> und <literal>update</"
 "literal>. Wenn es mit dem Befehl <literal>update</literal> benutzt wird, "
 "sind MD5 und Größe nicht enthalten und es ist Aufgabe des Benutzers, "
-"komprimierte Dateien zu dekomprimieren. Konfigurationselement: <literal>APT::"
-"Get::Print-URIs</literal>."
+"komprimierte Dateien zu dekomprimieren. Konfigurationselement: "
+"<literal>APT::Get::Print-URIs</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -2092,16 +2093,16 @@ msgid ""
 "turn it off. When it is on, <command>apt-get</command> will automatically "
 "manage the contents of <filename>&statedir;/lists</filename> to ensure that "
 "obsolete files are erased.  The only reason to turn it off is if you "
-"frequently change your sources list.  Configuration Item: <literal>APT::Get::"
-"List-Cleanup</literal>."
+"frequently change your sources list.  Configuration Item: "
+"<literal>APT::Get::List-Cleanup</literal>."
 msgstr ""
 "Diese Option ist standardmäßig eingeschaltet. Um sie auszuschalten, benutzen "
 "Sie <literal>--no-list-cleanup</literal>. Wenn eingeschaltet, wird "
 "<command>apt-get</command> den Inhalt von <filename>&statedir;/lists</"
 "filename> automatisch verwalten, um sicherzustellen, dass veraltete Dateien "
 "gelöscht werden. Nur das häufige Ändern der Quelllisten stellt den einzigen "
-"Grund zum Ausschalten der Option dar. Konfigurationselement: <literal>APT::"
-"Get::List-Cleanup</literal>."
+"Grund zum Ausschalten der Option dar. Konfigurationselement: "
+"<literal>APT::Get::List-Cleanup</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -2181,8 +2182,8 @@ msgstr ""
 "Wenn der Befehl entweder <literal>install</literal> oder <literal>remove</"
 "literal> lautet, dann bewirkt diese Option wie das Ausführen des "
 "<literal>autoremove</literal>-Befehls das Entfernen der nicht mehr "
-"benötigten abhängigen Pakete. Konfigurationselement: <literal>APT::Get::"
-"AutomaticRemove</literal>."
+"benötigten abhängigen Pakete. Konfigurationselement: "
+"<literal>APT::Get::AutomaticRemove</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -2258,8 +2259,8 @@ msgstr ""
 #| "Forbid the update command to acquire unverifiable data from configured "
 #| "sources. APT will fail at the update command for repositories without "
 #| "valid cryptographically signatures. See also &apt-secure; for details on "
-#| "the concept and the implications.  Configuration Item: <literal>Acquire::"
-#| "AllowInsecureRepositories</literal>."
+#| "the concept and the implications.  Configuration Item: "
+#| "<literal>Acquire::AllowInsecureRepositories</literal>."
 msgid ""
 "Allow the update command to acquire unverifiable data from configured "
 "sources. APT will otherwise fail at the update command for repositories "
@@ -2306,8 +2307,8 @@ msgstr ""
 "Felder wie <literal>origin</literal>, <literal>label</literal>, "
 "<literal>codename</literal>, <literal>suite</literal>, <literal>version</"
 "literal> und <literal>defaultpin</literal> zu erlauben. Siehe auch &apt-"
-"preferences;. Konfigurationselement: <literal>Acquire::"
-"AllowReleaseInfoChange</literal>."
+"preferences;. Konfigurationselement: "
+"<literal>Acquire::AllowReleaseInfoChange</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -2322,8 +2323,9 @@ msgstr ""
 "Pakete installiert beziehungsweise entfernt werden oder ein Upgrade "
 "durchgeführt wird. Informationen über eine maschinell auswertbare Version "
 "dieser Daten finden Sie in README.progress-reporting im "
-"Dokumentationsverzeichnis apt/doc. Konfigurationselemente: <literal>Dpkg::"
-"Progress</literal> und <literal>Dpkg::Progress-Fancy</literal>."
+"Dokumentationsverzeichnis apt/doc. Konfigurationselemente: "
+"<literal>Dpkg::Progress</literal> und <literal>Dpkg::Progress-Fancy</"
+"literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -2799,12 +2801,12 @@ msgstr ""
 #: apt-cache.8.xml
 msgid ""
 "The same as <literal>dotty</literal>, only for xvcg from the <ulink "
-"url=\"https://www.rw.cdl.uni-saarland.de/people/sander/private/html/gsvcg1."
-"html\">VCG tool</ulink>."
+"url=\"https://www.rw.cdl.uni-saarland.de/people/sander/private/html/"
+"gsvcg1.html\">VCG tool</ulink>."
 msgstr ""
 "Das gleiche wie <literal>dotty</literal>, nur für xvcg vom <ulink "
-"url=\"https://www.rw.cdl.uni-saarland.de/people/sander/private/html/gsvcg1."
-"html\">VCG-Werkzeug</ulink>."
+"url=\"https://www.rw.cdl.uni-saarland.de/people/sander/private/html/"
+"gsvcg1.html\">VCG-Werkzeug</ulink>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml
@@ -2832,8 +2834,8 @@ msgid ""
 "archive management tool, <literal>madison</literal>.  It displays available "
 "versions of a package in a tabular format.  Unlike the original "
 "<literal>madison</literal>, it can only display information for the "
-"architecture for which APT has retrieved package lists (<literal>APT::"
-"Architecture</literal>)."
+"architecture for which APT has retrieved package lists "
+"(<literal>APT::Architecture</literal>)."
 msgstr ""
 "<literal>apt-cache</literal>s <literal>madison</literal>-Befehl versucht, "
 "das Ausgabeformat und eine Untermenge der Funktionalität des Debian-"
@@ -2847,8 +2849,8 @@ msgstr ""
 #: apt-cache.8.xml
 msgid ""
 "Select the file to store the package cache. The package cache is the primary "
-"cache used by all operations.  Configuration Item: <literal>Dir::Cache::"
-"pkgcache</literal>."
+"cache used by all operations.  Configuration Item: "
+"<literal>Dir::Cache::pkgcache</literal>."
 msgstr ""
 "wählt die Datei zum Speichern des Paketzwischenspeichers. Der "
 "Paketzwischenspeicher ist der primäre Zwischenspeicher, der von allen "
@@ -2869,8 +2871,8 @@ msgstr ""
 "ausgewertete Version der Paketinformationen von entfernt liegenden Quellen. "
 "Wenn der Paketzwischenspeicher gebildet wird, wird der "
 "Quellenzwischenspeicher benutzt, um ein erneutes Auswerten aller "
-"Paketdateien zu vermeiden. Konfigurationselement: <literal>Dir::Cache::"
-"srcpkgcache</literal>."
+"Paketdateien zu vermeiden. Konfigurationselement: "
+"<literal>Dir::Cache::srcpkgcache</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml
@@ -2903,16 +2905,16 @@ msgstr ""
 msgid ""
 "Per default the <command>depends</command> and <command>rdepends</command> "
 "print all dependencies. This can be tweaked with these flags which will omit "
-"the specified dependency type.  Configuration Item: <literal>APT::Cache::"
-"Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::"
-"Cache::ShowRecommends</literal>."
+"the specified dependency type.  Configuration Item: "
+"<literal>APT::Cache::Show<replaceable>DependencyType</replaceable></literal> "
+"e.g. <literal>APT::Cache::ShowRecommends</literal>."
 msgstr ""
 "Standardmäßig geben <command>depends</command> und <command>rdepends</"
 "command> alle Abhängigkeiten aus. Dies kann mit diesen Schaltern optimiert "
 "werden, die den angegebenen Abhängigkeitstyp weglassen. "
-"Konfigurationselement: <literal>APT::Cache::"
-"Show<replaceable>Abhängigkeitstyp</replaceable></literal> z.B. <literal>APT::"
-"Cache::ShowRecommends</literal>."
+"Konfigurationselement: "
+"<literal>APT::Cache::Show<replaceable>Abhängigkeitstyp</replaceable></"
+"literal> z.B. <literal>APT::Cache::ShowRecommends</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml
@@ -2984,8 +2986,8 @@ msgstr ""
 #: apt-cache.8.xml
 msgid ""
 "Make <literal>pkgnames</literal> print all names, including virtual packages "
-"and missing dependencies.  Configuration Item: <literal>APT::Cache::"
-"AllNames</literal>."
+"and missing dependencies.  Configuration Item: "
+"<literal>APT::Cache::AllNames</literal>."
 msgstr ""
 "lässt <literal>pkgnames</literal> alle Namen, einschließlich virtueller "
 "Pakete und fehlender Abhängigkeiten, ausgeben. Konfigurationselement: "
@@ -3024,10 +3026,11 @@ msgid ""
 msgstr ""
 "fügt die angegebene Datei als Quelle für Metadaten hinzu. Dies kann "
 "wiederholt werden, um mehrere Dateien hinzuzufügen. Unterstützt werden "
-"derzeit <literal>*.deb</literal>-, <literal>*.dsc</literal>-, <literal>*."
-"changes</literal>-, <literal>Sources</literal>- und <literal>Packages</"
-"literal>-Dateien sowie Quellpaketverzeichnisse. Dateien werden nur basierend "
-"auf ihren Dateinamen abgeglichen, nicht auf ihrem Inhalt!"
+"derzeit <literal>*.deb</literal>-, <literal>*.dsc</literal>-, "
+"<literal>*.changes</literal>-, <literal>Sources</literal>- und "
+"<literal>Packages</literal>-Dateien sowie Quellpaketverzeichnisse. Dateien "
+"werden nur basierend auf ihren Dateinamen abgeglichen, nicht auf ihrem "
+"Inhalt!"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml
@@ -3080,8 +3083,8 @@ msgid ""
 "<command>apt-mark</command> can be used as a unified front-end to set "
 "various settings for a package, such as marking a package as being "
 "automatically/manually installed or changing <command>dpkg</command> "
-"selections such as hold, install, deinstall and purge which are respected e."
-"g. by <command>apt-get dselect-upgrade</command> or <command>aptitude</"
+"selections such as hold, install, deinstall and purge which are respected "
+"e.g. by <command>apt-get dselect-upgrade</command> or <command>aptitude</"
 "command>."
 msgstr ""
 "<command>apt-mark</command> kann als einheitliche Oberfläche zum Setzen "
@@ -3323,10 +3326,11 @@ msgstr "Benutzerkonfiguration"
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""
-"Keys should usually be included inside their corresponding <literal>."
-"sources</literal> by embedding the ASCII-armored key in the <literal>Signed-"
-"By</literal> option.  To do so, replace the empty line with a dot, and then "
-"indent all lines by two spaces.  See &sources-list; for more information."
+"Keys should usually be included inside their corresponding "
+"<literal>.sources</literal> by embedding the ASCII-armored key in the "
+"<literal>Signed-By</literal> option.  To do so, replace the empty line with "
+"a dot, and then indent all lines by two spaces.  See &sources-list; for more "
+"information."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -3339,8 +3343,9 @@ msgid ""
 "literal> file or using <literal>deb [signed-by=/etc/apt/keyrings/example-"
 "archive-keyring.asc] ...</literal> in the legacy <literal>.list</literal> "
 "format. This may be useful for APT versions prior to 2.4, which do not "
-"support embedded keys. ASCII-armored keys must use an extension of <literal>."
-"asc</literal>, and unarmored keys an extension of <literal>.gpg</literal>."
+"support embedded keys. ASCII-armored keys must use an extension of "
+"<literal>.asc</literal>, and unarmored keys an extension of <literal>.gpg</"
+"literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -3641,12 +3646,12 @@ msgstr ""
 #: apt-secure.8.xml
 msgid ""
 "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg --"
-"clearsign -o InRelease Release</command> and <command>gpg -abs -o Release."
-"gpg Release</command>."
+"clearsign -o InRelease Release</command> and <command>gpg -abs -o "
+"Release.gpg Release</command>."
 msgstr ""
 "<emphasis>Sie signieren</emphasis>. Sie können dies tun, indem Sie "
-"<command>gpg --clearsign -o InRelease Release</command> und <command>gpg -"
-"abs -o Release.gpg Release</command> ausführen."
+"<command>gpg --clearsign -o InRelease Release</command> und <command>gpg "
+"-abs -o Release.gpg Release</command> ausführen."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #: apt-secure.8.xml
@@ -3807,8 +3812,8 @@ msgstr ""
 #: apt-cdrom.8.xml
 msgid ""
 "Do not try to auto-detect the CD-ROM path. Usually combined with the "
-"<option>--cdrom</option> option.  Configuration Item: <literal>Acquire::"
-"cdrom::AutoDetect</literal>."
+"<option>--cdrom</option> option.  Configuration Item: "
+"<literal>Acquire::cdrom::AutoDetect</literal>."
 msgstr ""
 "versucht nicht, den CD-ROM-Pfad automatisch zu bestimmen. Dies wird "
 "üblicherweise mit der Option <option>--cdrom</option> kombiniert. "
@@ -3823,8 +3828,8 @@ msgid ""
 msgstr ""
 "Einhängepunkt; gibt den Ort an, an dem die CD-ROM eingehängt wird. Dieser "
 "Einhängepunkt muss in <filename>/etc/fstab</filename> eingetragen und "
-"angemessen konfiguriert sein. Konfigurationselement: <literal>Acquire::"
-"cdrom::mount</literal>."
+"angemessen konfiguriert sein. Konfigurationselement: "
+"<literal>Acquire::cdrom::mount</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml
@@ -3842,8 +3847,8 @@ msgstr ""
 #: apt-cdrom.8.xml
 msgid ""
 "No mounting; prevent <command>apt-cdrom</command> from mounting and "
-"unmounting the mount point.  Configuration Item: <literal>APT::CDROM::"
-"NoMount</literal>."
+"unmounting the mount point.  Configuration Item: "
+"<literal>APT::CDROM::NoMount</literal>."
 msgstr ""
 "kein Einhängen; hindert <command>apt-cdrom</command> am Ein- und Aushängen "
 "des Einhängepunkts. Konfigurationselement: <literal>APT::CDROM::NoMount</"
@@ -3948,8 +3953,8 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-config.8.xml
 msgid ""
-"This will set the shell environment variable $OPTS to the value of MyApp::"
-"options with a default of <option>-f</option>."
+"This will set the shell environment variable $OPTS to the value of "
+"MyApp::options with a default of <option>-f</option>."
 msgstr ""
 "Dies wird die Shell-Umgebungsvariable $OPT auf den Wert von MyApp::options "
 "mit einer Vorgabe von <option>-f</option> setzen."
@@ -4078,9 +4083,9 @@ msgid ""
 "order which have either no or \"<literal>conf</literal>\" as filename "
 "extension and which only contain alphanumeric, hyphen (-), underscore (_) "
 "and period (.) characters.  Otherwise APT will print a notice that it has "
-"ignored a file, unless that file matches a pattern in the <literal>Dir::"
-"Ignore-Files-Silently</literal> configuration list - in which case it will "
-"be silently ignored."
+"ignored a file, unless that file matches a pattern in the "
+"<literal>Dir::Ignore-Files-Silently</literal> configuration list - in which "
+"case it will be silently ignored."
 msgstr ""
 "alle Dateien in <literal>Dir::Etc::Parts</literal> in aufsteigender "
 "alphanumerischer Reihenfolge, die entweder keine oder »<literal>conf</"
@@ -4133,9 +4138,10 @@ msgid ""
 msgstr ""
 "Die Konfigurationsdatei ist in einem Baum mit Optionen organisiert, die in "
 "funktionellen Gruppen organisiert sind. Optionsspezifikation wird mit einer "
-"doppelten Doppelpunktschreibweise angegeben, zum Beispiel ist <literal>APT::"
-"Get::Assume-Yes</literal> eine Option innerhalb der APT-Werkzeuggruppe für "
-"das Werkzeug Get. Optionen werden nicht von ihren Elterngruppe geerbt."
+"doppelten Doppelpunktschreibweise angegeben, zum Beispiel ist "
+"<literal>APT::Get::Assume-Yes</literal> eine Option innerhalb der APT-"
+"Werkzeuggruppe für das Werkzeug Get. Optionen werden nicht von ihren "
+"Elterngruppe geerbt."
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml
@@ -4403,10 +4409,12 @@ msgstr ""
 msgid ""
 "The subscope <option>action</option> defines the colors for package lists in "
 "<option>install</option> and similar commands. The following options may be "
-"set: <option>APT::Color::Action::Upgrade</option>, <option>APT::Color::"
-"Action::Install</option>, <option>APT::Color::Action::Install-Dependencies</"
-"option>, <option>APT::Color::Action::Downgrade</option>, <option>APT::Color::"
-"Action::Remove</option>; corresponding to their lists in the &apt; output."
+"set: <option>APT::Color::Action::Upgrade</option>, "
+"<option>APT::Color::Action::Install</option>, "
+"<option>APT::Color::Action::Install-Dependencies</option>, "
+"<option>APT::Color::Action::Downgrade</option>, "
+"<option>APT::Color::Action::Remove</option>; corresponding to their lists in "
+"the &apt; output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -4732,8 +4740,8 @@ msgstr ""
 #: apt.conf.5.xml
 msgid ""
 "Define the regular expression(s) for versioned kernel packages.  Based on "
-"these expressions a rule set is injected into apt similar to APT::"
-"NeverAutoRemove regular expressions."
+"these expressions a rule set is injected into apt similar to "
+"APT::NeverAutoRemove regular expressions."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -5183,9 +5191,9 @@ msgid ""
 "that these codes are not included twice in the list. If "
 "<literal>LC_MESSAGES</literal> is set to \"C\" only the "
 "<filename>Translation-en</filename> file (if available) will be used.  To "
-"force APT to use no Translation file use the setting <literal>Acquire::"
-"Languages=none</literal>. \"<literal>none</literal>\" is another special "
-"meaning code which will stop the search for a suitable "
+"force APT to use no Translation file use the setting "
+"<literal>Acquire::Languages=none</literal>. \"<literal>none</literal>\" is "
+"another special meaning code which will stop the search for a suitable "
 "<filename>Translation</filename> file.  This tells APT to download these "
 "translations too, without actually using them unless the environment "
 "specifies the languages. So the following example configuration will result "
@@ -5319,21 +5327,22 @@ msgid ""
 "<replaceable>ORIGIN</replaceable></literal> option exists and if so this "
 "value is taken. The value in the Release file can be overridden with "
 "<literal>Acquire::Changelogs::URI::Override::Label::<replaceable>LABEL</"
-"replaceable></literal> or <literal>Acquire::Changelogs::URI::Override::"
-"Origin::<replaceable>ORIGIN</replaceable></literal>.  The value should be a "
-"normal URI to a text file, except that package specific data is replaced "
-"with the placeholder <literal>@CHANGEPATH@</literal>. The value for it is: "
-"1. if the package is from a component (e.g. <literal>main</literal>)  this "
-"is the first part otherwise it is omitted, 2. the first letter of source "
-"package name, except if the source package name starts with '<literal>lib</"
-"literal>' in which case it will be the first four letters. 3. The complete "
-"source package name. 4. the complete name again and 5. the source version.  "
-"The first (if present), second, third and fourth part are separated by a "
-"slash ('<literal>/</literal>')  and between the fourth and fifth part is an "
-"underscore ('<literal>_</literal>').  The special value '<literal>no</"
-"literal>' is available for this option indicating that this source can't be "
-"used to acquire changelog files from. Another source will be tried if "
-"available in this case."
+"replaceable></literal> or "
+"<literal>Acquire::Changelogs::URI::Override::Origin::<replaceable>ORIGIN</"
+"replaceable></literal>.  The value should be a normal URI to a text file, "
+"except that package specific data is replaced with the placeholder "
+"<literal>@CHANGEPATH@</literal>. The value for it is: 1. if the package is "
+"from a component (e.g. <literal>main</literal>)  this is the first part "
+"otherwise it is omitted, 2. the first letter of source package name, except "
+"if the source package name starts with '<literal>lib</literal>' in which "
+"case it will be the first four letters. 3. The complete source package name. "
+"4. the complete name again and 5. the source version.  The first (if "
+"present), second, third and fourth part are separated by a slash ('<literal>/"
+"</literal>')  and between the fourth and fifth part is an underscore "
+"('<literal>_</literal>').  The special value '<literal>no</literal>' is "
+"available for this option indicating that this source can't be used to "
+"acquire changelog files from. Another source will be tried if available in "
+"this case."
 msgstr ""
 "Changelogs können nur beschafft werden, falls ein URI bekannt ist, von dem "
 "sie geholt werden können. Vorzugsweise gibt die Release-Datei ihn in einem "
@@ -5344,23 +5353,23 @@ msgstr ""
 "<replaceable>URSPRUNG</replaceable></literal>-Option existiert und, falls "
 "dies der Fall ist, wird dieser Wert genommen. Der Wert in der Release-Datei "
 "kann mit <literal>Acquire::Changelogs::URI::Override::Label::"
-"<replaceable>BESCHRIFTUNG</replaceable></literal> oder <literal>Acquire::"
-"Changelogs::URI::Override::Origin::<replaceable>URSPRUNG</replaceable></"
-"literal> außer Kraft gesetzt werden. Der Wert sollte ein normaler URI auf "
-"eine Textdatei sein, außer dass paketspezifische Daten durch den Platzhalter "
-"<literal>@CHANGEPATH@</literal> ersetzt werden. Der Wert dafür ist: 1. Falls "
-"das Paket von einem Bestandteil stammt (z.B. <literal>main</literal>), ist "
-"dies der erste Teil, ansonsten wird er weggelassen. 2. der erste Buchstabe "
-"des Quellpaketnamens, es sei denn, der Paketname beginnt mit »<literal>lib</"
-"literal>«. In diesem Fall werden es die vier ersten Buchstaben sein. 3. der "
-"komplette Quellpaketname. 4. wieder der vollständige Name und 5. die "
-"Quellversion. Der erste (falls vorhanden), zweite, dritte und vierte Teil "
-"werden durch einen Schrägstrich (»<literal>/</literal>«) voneinander "
-"getrennt und zwischen dem vierten und fünften ist ein Unterstrich "
-"(»<literal>_</literal>«). Der Spezialwert »<literal>no</literal>«, der für "
-"diese Option verfügbar ist, gibt an, dass diese Quelle nicht benutzt werden "
-"kann, um von dort Changelog-Dateien zu beschaffen. In diesem Fall wird, "
-"falls verfügbar, eine andere Quelle ausprobiert."
+"<replaceable>BESCHRIFTUNG</replaceable></literal> oder "
+"<literal>Acquire::Changelogs::URI::Override::Origin::<replaceable>URSPRUNG</"
+"replaceable></literal> außer Kraft gesetzt werden. Der Wert sollte ein "
+"normaler URI auf eine Textdatei sein, außer dass paketspezifische Daten "
+"durch den Platzhalter <literal>@CHANGEPATH@</literal> ersetzt werden. Der "
+"Wert dafür ist: 1. Falls das Paket von einem Bestandteil stammt (z.B. "
+"<literal>main</literal>), ist dies der erste Teil, ansonsten wird er "
+"weggelassen. 2. der erste Buchstabe des Quellpaketnamens, es sei denn, der "
+"Paketname beginnt mit »<literal>lib</literal>«. In diesem Fall werden es die "
+"vier ersten Buchstaben sein. 3. der komplette Quellpaketname. 4. wieder der "
+"vollständige Name und 5. die Quellversion. Der erste (falls vorhanden), "
+"zweite, dritte und vierte Teil werden durch einen Schrägstrich (»<literal>/</"
+"literal>«) voneinander getrennt und zwischen dem vierten und fünften ist ein "
+"Unterstrich (»<literal>_</literal>«). Der Spezialwert »<literal>no</"
+"literal>«, der für diese Option verfügbar ist, gibt an, dass diese Quelle "
+"nicht benutzt werden kann, um von dort Changelog-Dateien zu beschaffen. In "
+"diesem Fall wird, falls verfügbar, eine andere Quelle ausprobiert."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
@@ -5370,14 +5379,15 @@ msgstr ""
 #| "get them.  Preferable the Release file indicates this in a 'Changelogs' "
 #| "field. If this isn't available the Label/Origin field of the Release file "
 #| "is used to check if a <literal>Acquire::Changelogs::URI::Label::"
-#| "<replaceable>LABEL</replaceable></literal> or <literal>Acquire::"
-#| "Changelogs::URI::Origin::<replaceable>ORIGIN</replaceable></literal> "
-#| "option exists and if so this value is taken. The value in the Release "
-#| "file can be overridden with <literal>Acquire::Changelogs::URI::Override::"
-#| "Label::<replaceable>LABEL</replaceable></literal> or <literal>Acquire::"
-#| "Changelogs::URI::Override::Origin::<replaceable>ORIGIN</replaceable></"
-#| "literal>.  The value should be a normal URI to a text file, except that "
-#| "package specific data is replaced with the placeholder "
+#| "<replaceable>LABEL</replaceable></literal> or "
+#| "<literal>Acquire::Changelogs::URI::Origin::<replaceable>ORIGIN</"
+#| "replaceable></literal> option exists and if so this value is taken. The "
+#| "value in the Release file can be overridden with "
+#| "<literal>Acquire::Changelogs::URI::Override::Label::<replaceable>LABEL</"
+#| "replaceable></literal> or "
+#| "<literal>Acquire::Changelogs::URI::Override::Origin::<replaceable>ORIGIN</"
+#| "replaceable></literal>.  The value should be a normal URI to a text file, "
+#| "except that package specific data is replaced with the placeholder "
 #| "<literal>@CHANGEPATH@</literal>. The value for it is: 1. if the package "
 #| "is from a component (e.g. <literal>main</literal>)  this is the first "
 #| "part otherwise it is omitted, 2. the first letter of source package name, "
@@ -5395,17 +5405,19 @@ msgid ""
 "where to get them.  Preferable the Release file indicates this in a "
 "'Snapshots' field. If this isn't available the Label/Origin field of the "
 "Release file is used to check if a <literal>Acquire::Snapshots::URI::Label::"
-"<replaceable>LABEL</replaceable></literal> or <literal>Acquire::Snapshots::"
-"URI::Origin::<replaceable>ORIGIN</replaceable></literal> option exists and "
-"if so this value is taken. The value in the Release file can be overridden "
-"with <literal>Acquire::Snapshots::URI::Override::Label::<replaceable>LABEL</"
-"replaceable></literal> or <literal>Acquire::Snapshots::URI::Override::"
-"Origin::<replaceable>ORIGIN</replaceable></literal>.  The value should be a "
-"normal URI to a directory, except that the snapshot ID replaced with the "
-"placeholder <literal>@SNAPSHOTID@</literal>.  The special value "
-"'<literal>no</literal>' is available for this option indicating that this "
-"source cannot be used to acquire snapshots from. Another source will be "
-"tried if available in this case."
+"<replaceable>LABEL</replaceable></literal> or "
+"<literal>Acquire::Snapshots::URI::Origin::<replaceable>ORIGIN</replaceable></"
+"literal> option exists and if so this value is taken. The value in the "
+"Release file can be overridden with "
+"<literal>Acquire::Snapshots::URI::Override::Label::<replaceable>LABEL</"
+"replaceable></literal> or "
+"<literal>Acquire::Snapshots::URI::Override::Origin::<replaceable>ORIGIN</"
+"replaceable></literal>.  The value should be a normal URI to a directory, "
+"except that the snapshot ID replaced with the placeholder "
+"<literal>@SNAPSHOTID@</literal>.  The special value '<literal>no</literal>' "
+"is available for this option indicating that this source cannot be used to "
+"acquire snapshots from. Another source will be tried if available in this "
+"case."
 msgstr ""
 "Changelogs können nur beschafft werden, falls ein URI bekannt ist, von dem "
 "sie geholt werden können. Vorzugsweise gibt die Release-Datei ihn in einem "
@@ -5416,23 +5428,23 @@ msgstr ""
 "<replaceable>URSPRUNG</replaceable></literal>-Option existiert und, falls "
 "dies der Fall ist, wird dieser Wert genommen. Der Wert in der Release-Datei "
 "kann mit <literal>Acquire::Changelogs::URI::Override::Label::"
-"<replaceable>BESCHRIFTUNG</replaceable></literal> oder <literal>Acquire::"
-"Changelogs::URI::Override::Origin::<replaceable>URSPRUNG</replaceable></"
-"literal> außer Kraft gesetzt werden. Der Wert sollte ein normaler URI auf "
-"eine Textdatei sein, außer dass paketspezifische Daten durch den Platzhalter "
-"<literal>@CHANGEPATH@</literal> ersetzt werden. Der Wert dafür ist: 1. Falls "
-"das Paket von einem Bestandteil stammt (z.B. <literal>main</literal>), ist "
-"dies der erste Teil, ansonsten wird er weggelassen. 2. der erste Buchstabe "
-"des Quellpaketnamens, es sei denn, der Paketname beginnt mit »<literal>lib</"
-"literal>«. In diesem Fall werden es die vier ersten Buchstaben sein. 3. der "
-"komplette Quellpaketname. 4. wieder der vollständige Name und 5. die "
-"Quellversion. Der erste (falls vorhanden), zweite, dritte und vierte Teil "
-"werden durch einen Schrägstrich (»<literal>/</literal>«) voneinander "
-"getrennt und zwischen dem vierten und fünften ist ein Unterstrich "
-"(»<literal>_</literal>«). Der Spezialwert »<literal>no</literal>«, der für "
-"diese Option verfügbar ist, gibt an, dass diese Quelle nicht benutzt werden "
-"kann, um von dort Changelog-Dateien zu beschaffen. In diesem Fall wird, "
-"falls verfügbar, eine andere Quelle ausprobiert."
+"<replaceable>BESCHRIFTUNG</replaceable></literal> oder "
+"<literal>Acquire::Changelogs::URI::Override::Origin::<replaceable>URSPRUNG</"
+"replaceable></literal> außer Kraft gesetzt werden. Der Wert sollte ein "
+"normaler URI auf eine Textdatei sein, außer dass paketspezifische Daten "
+"durch den Platzhalter <literal>@CHANGEPATH@</literal> ersetzt werden. Der "
+"Wert dafür ist: 1. Falls das Paket von einem Bestandteil stammt (z.B. "
+"<literal>main</literal>), ist dies der erste Teil, ansonsten wird er "
+"weggelassen. 2. der erste Buchstabe des Quellpaketnamens, es sei denn, der "
+"Paketname beginnt mit »<literal>lib</literal>«. In diesem Fall werden es die "
+"vier ersten Buchstaben sein. 3. der komplette Quellpaketname. 4. wieder der "
+"vollständige Name und 5. die Quellversion. Der erste (falls vorhanden), "
+"zweite, dritte und vierte Teil werden durch einen Schrägstrich (»<literal>/</"
+"literal>«) voneinander getrennt und zwischen dem vierten und fünften ist ein "
+"Unterstrich (»<literal>_</literal>«). Der Spezialwert »<literal>no</"
+"literal>«, der für diese Option verfügbar ist, gibt an, dass diese Quelle "
+"nicht benutzt werden kann, um von dort Changelog-Dateien zu beschaffen. In "
+"diesem Fall wird, falls verfügbar, eine andere Quelle ausprobiert."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.conf.5.xml
@@ -5444,9 +5456,9 @@ msgstr "Programmspezifische Konfiguration"
 msgid ""
 "Especially with the introduction of the <command>apt</command> binary it can "
 "be useful to set certain options only for a specific binary as even options "
-"which look like they would effect only a certain binary like <option>APT::"
-"Get::Show-Versions</option> effect <command>apt-get</command> as well as "
-"<command>apt</command>."
+"which look like they would effect only a certain binary like "
+"<option>APT::Get::Show-Versions</option> effect <command>apt-get</command> "
+"as well as <command>apt</command>."
 msgstr ""
 "Insbesondere kann es mit der Einführung des <command>apt</command>-Programms "
 "nützlich sein, bestimmte Optionen nur für ein bestimmtes Programm zu setzen, "
@@ -5561,19 +5573,20 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml
 msgid ""
-"Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
-"Bin::Methods</literal> specifies the location of the method handlers and "
-"<literal>gzip</literal>, <literal>bzip2</literal>, <literal>lzma</literal>, "
-"<literal>dpkg</literal>, <literal>apt-get</literal> <literal>dpkg-source</"
-"literal> <literal>dpkg-buildpackage</literal> and <literal>apt-cache</"
-"literal> specify the location of the respective programs."
+"Binary programs are pointed to by <literal>Dir::Bin</literal>. "
+"<literal>Dir::Bin::Methods</literal> specifies the location of the method "
+"handlers and <literal>gzip</literal>, <literal>bzip2</literal>, "
+"<literal>lzma</literal>, <literal>dpkg</literal>, <literal>apt-get</literal> "
+"<literal>dpkg-source</literal> <literal>dpkg-buildpackage</literal> and "
+"<literal>apt-cache</literal> specify the location of the respective programs."
 msgstr ""
-"Auf Programme wird von <literal>Dir::Bin</literal> verwiesen. <literal>Dir::"
-"Bin::Methods</literal> gibt den Ort des Methodensteuerungsprogramms an und "
-"<literal>gzip</literal>, <literal>bzip2</literal>, <literal>lzma</literal>, "
-"<literal>dpkg</literal>, <literal>apt-get</literal>, <literal>dpkg-source</"
-"literal>, <literal>dpkg-buildpackage</literal> und <literal>apt-cache</"
-"literal> geben den Ort des jeweiligen Programms an."
+"Auf Programme wird von <literal>Dir::Bin</literal> verwiesen. "
+"<literal>Dir::Bin::Methods</literal> gibt den Ort des "
+"Methodensteuerungsprogramms an und <literal>gzip</literal>, <literal>bzip2</"
+"literal>, <literal>lzma</literal>, <literal>dpkg</literal>, <literal>apt-"
+"get</literal>, <literal>dpkg-source</literal>, <literal>dpkg-buildpackage</"
+"literal> und <literal>apt-cache</literal> geben den Ort des jeweiligen "
+"Programms an."
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml
@@ -5771,9 +5784,9 @@ msgid ""
 "literal>.  Special characters (equal signs, newlines, nonprintable "
 "characters, quotation marks, and percent signs in <literal>key</literal> and "
 "newlines, nonprintable characters, and percent signs in <literal>value</"
-"literal>) are %-encoded. Lists are represented by multiple <literal>key::"
-"=value</literal> lines with the same key. The configuration section ends "
-"with a blank line."
+"literal>) are %-encoded. Lists are represented by multiple "
+"<literal>key::=value</literal> lines with the same key. The configuration "
+"section ends with a blank line."
 msgstr ""
 "Jede Zeile der Konfigurationsrichtlinien hat die Form "
 "<literal>Schlüssel=Wert</literal>. Sonderzeichen (Gleichheitszeichen, "
@@ -5835,11 +5848,11 @@ msgid ""
 msgstr ""
 "Die Protokollversion, die für den Befehl <literal><replaceable>Befehl</"
 "replaceable></literal> benutzt werden soll, kann durch entsprechendes Setzen "
-"von <literal>DPkg::Tools::options::<replaceable>Befehl</replaceable>::"
-"Version</literal> ausgewählt werden, Voreinstellung ist Version 1. Falls APT "
-"die angefragte Version nicht unterstützt, wird es stattdessen die "
-"Informationen in der höchsten Version senden, für die es Unterstützung "
-"bietet."
+"von <literal>DPkg::Tools::options::<replaceable>Befehl</"
+"replaceable>::Version</literal> ausgewählt werden, Voreinstellung ist "
+"Version 1. Falls APT die angefragte Version nicht unterstützt, wird es "
+"stattdessen die Informationen in der höchsten Version senden, für die es "
+"Unterstützung bietet."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
@@ -6114,8 +6127,8 @@ msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
 "install pass performed in, e.g., <literal>apt-get install</literal>, and not "
-"to the full <literal>apt</literal> dependency resolver; see <literal>Debug::"
-"pkgProblemResolver</literal> for that."
+"to the full <literal>apt</literal> dependency resolver; see "
+"<literal>Debug::pkgProblemResolver</literal> for that."
 msgstr ""
 "generiert Fehlersuchmeldungen, die beschreiben, welche Pakete automatisch "
 "installiert werden, um Abhängigkeiten aufzulösen. Dies entspricht dem "
@@ -6132,14 +6145,14 @@ msgid ""
 "may trigger additional actions; they are shown indented two additional "
 "spaces under the original entry.  The format for each line is "
 "<literal>MarkKeep</literal>, <literal>MarkDelete</literal> or "
-"<literal>MarkInstall</literal> followed by <literal>package-name &lt;a.b.c -"
-"&gt; d.e.f | x.y.z&gt; (section)</literal> where <literal>a.b.c</literal> is "
-"the current version of the package, <literal>d.e.f</literal> is the version "
-"considered for installation and <literal>x.y.z</literal> is a newer version, "
-"but not considered for installation (because of a low pin score). The later "
-"two can be omitted if there is none or if it is the same as the installed "
-"version.  <literal>section</literal> is the name of the section the package "
-"appears in."
+"<literal>MarkInstall</literal> followed by <literal>package-name &lt;a.b.c "
+"-&gt; d.e.f | x.y.z&gt; (section)</literal> where <literal>a.b.c</literal> "
+"is the current version of the package, <literal>d.e.f</literal> is the "
+"version considered for installation and <literal>x.y.z</literal> is a newer "
+"version, but not considered for installation (because of a low pin score). "
+"The later two can be omitted if there is none or if it is the same as the "
+"installed version.  <literal>section</literal> is the name of the section "
+"the package appears in."
 msgstr ""
 "generiert Fehlersuchmeldungen, die beschreiben, welches Paket als "
 "»keep«/»install«/»remove« markiert ist, während der ProblemResolver seine "
@@ -6224,8 +6237,8 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
 msgid ""
-"Print information about the vendors read from <filename>/etc/apt/vendors."
-"list</filename>."
+"Print information about the vendors read from <filename>/etc/apt/"
+"vendors.list</filename>."
 msgstr ""
 "gibt die Informationen über die aus <filename>/etc/apt/vendors.list</"
 "filename> gelesenen Anbieter aus."
@@ -6233,8 +6246,8 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
 msgid ""
-"Display the external commands that are called by apt hooks.  This includes e."
-"g. the config options <literal>DPkg::{Pre,Post}-Invoke</literal> or "
+"Display the external commands that are called by apt hooks.  This includes "
+"e.g. the config options <literal>DPkg::{Pre,Post}-Invoke</literal> or "
 "<literal>APT::Update::{Pre,Post}-Invoke</literal>."
 msgstr ""
 "zeigt die externen Befehle, die durch APT-Hooks aufgerufen werden. Dies "
@@ -6355,15 +6368,15 @@ msgid ""
 "<literal>Dir::Ignore-Files-Silently</literal> configuration list - in which "
 "case it will be silently ignored."
 msgstr ""
-"Beachten Sie, dass die Dateien im Verzeichnis <filename>/etc/apt/preferences."
-"d</filename> in alphanumerisch aufsteigender Reihenfolge ausgewertet werden "
-"und der folgenden Namenskonvention unterliegen: Die Dateien haben entweder "
-"keine oder <literal>»pref«</literal> als Dateierweiterung und sie enthalten "
-"nur alphanumerische Zeichen, Bindestriche (-), Unterstriche (_) oder Punkte "
-"(.). Andernfalls wird APT einen Hinweis ausgeben, dass es eine Datei "
-"ignoriert hat, falls die Datei nicht auf ein Muster in der "
-"Konfigurationsliste <literal>Dir::Ignore-Files-Silently</literal> passt – in "
-"diesem Fall wird sie stillschweigend ignoriert."
+"Beachten Sie, dass die Dateien im Verzeichnis <filename>/etc/apt/"
+"preferences.d</filename> in alphanumerisch aufsteigender Reihenfolge "
+"ausgewertet werden und der folgenden Namenskonvention unterliegen: Die "
+"Dateien haben entweder keine oder <literal>»pref«</literal> als "
+"Dateierweiterung und sie enthalten nur alphanumerische Zeichen, Bindestriche "
+"(-), Unterstriche (_) oder Punkte (.). Andernfalls wird APT einen Hinweis "
+"ausgeben, dass es eine Datei ignoriert hat, falls die Datei nicht auf ein "
+"Muster in der Konfigurationsliste <literal>Dir::Ignore-Files-Silently</"
+"literal> passt – in diesem Fall wird sie stillschweigend ignoriert."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 #: apt_preferences.5.xml
@@ -6767,8 +6780,8 @@ msgstr ""
 "Eine Mahnung zur Vorsicht: Das hier benutzte Schlüsselwort ist "
 "»<literal>origin</literal>«, was zum Abgleich mit einem Rechnernamen benutzt "
 "werden kann. Der folgende Eintrag wird allen Versionen eine hohe Priorität "
-"zuweisen, die auf dem Server verfügbar sind, der durch den Rechnernamen »ftp."
-"de.debian.org« identifiziert wird."
+"zuweisen, die auf dem Server verfügbar sind, der durch den Rechnernamen "
+"»ftp.de.debian.org« identifiziert wird."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 #: apt_preferences.5.xml
@@ -7043,9 +7056,9 @@ msgstr ""
 #: apt_preferences.5.xml
 msgid ""
 "The <literal>:any</literal> suffix makes sure to select binary packages from "
-"any architecture. Without that suffix, apt implicitly assumes the <literal>:"
-"native</literal> suffix which would only select packages from the native "
-"architecture."
+"any architecture. Without that suffix, apt implicitly assumes the "
+"<literal>:native</literal> suffix which would only select packages from the "
+"native architecture."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
@@ -7218,9 +7231,9 @@ msgstr "Dann:"
 msgid ""
 "The most recent available version of the <literal>perl</literal> package "
 "will be installed, so long as that version's version number begins with "
-"\"<literal>&good-perl;</literal>\".  If <emphasis>any</emphasis> &good-perl;"
-"* version of <literal>perl</literal> is available and the installed version "
-"is &bad-perl;*, then <literal>perl</literal> will be downgraded."
+"\"<literal>&good-perl;</literal>\".  If <emphasis>any</emphasis> &good-"
+"perl;* version of <literal>perl</literal> is available and the installed "
+"version is &bad-perl;*, then <literal>perl</literal> will be downgraded."
 msgstr ""
 "Es wird die aktuellste verfügbare Version des Pakets <literal>perl</literal> "
 "installiert, so lange die Versionsnummer mit »<literal>&good-perl;</"
@@ -7499,12 +7512,12 @@ msgid ""
 "files retrieved from locations listed in the &sources-list; file are stored "
 "in the directory <filename>/var/lib/apt/lists</filename>, or in the file "
 "named by the variable <literal>Dir::State::Lists</literal> in the "
-"<filename>apt.conf</filename> file.  For example, the file <filename>debian."
-"lcs.mit.edu_debian_dists_unstable_contrib_binary-i386_Release</filename> "
-"contains the <filename>Release</filename> file retrieved from the site "
-"<literal>debian.lcs.mit.edu</literal> for <literal>binary-i386</literal> "
-"architecture files from the <literal>contrib</literal> component of the "
-"<literal>unstable</literal> distribution."
+"<filename>apt.conf</filename> file.  For example, the file "
+"<filename>debian.lcs.mit.edu_debian_dists_unstable_contrib_binary-"
+"i386_Release</filename> contains the <filename>Release</filename> file "
+"retrieved from the site <literal>debian.lcs.mit.edu</literal> for "
+"<literal>binary-i386</literal> architecture files from the <literal>contrib</"
+"literal> component of the <literal>unstable</literal> distribution."
 msgstr ""
 "Alle <filename>Packages</filename>- und <filename>Release</filename>-"
 "Dateien, die von Orten heruntergeladen werden, die in der Datei &sources-"
@@ -7952,6 +7965,12 @@ msgstr ""
 "erwarten, dass Optionen auftauchen, da diese vor der Einführung der "
 "Unterstützung mehrerer Architekturen nicht üblich waren."
 
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml
+msgid ""
+"This format is deprecated and may eventually be removed, but not before 2029."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><title>
 #: sources.list.5.xml
 msgid "deb822-Style Format"
@@ -8140,11 +8159,11 @@ msgstr ""
 "<literal>Suite</literal> darf außerdem eine Variable, <literal>$(ARCH)</"
 "literal>, enthalten, die zur Debian-Architektur (wie <literal>amd64</"
 "literal> oder <literal>armel</literal>) expandiert wird, die auf dem System "
-"benutzt wird. Dies erlaubt es, architekturunabhängige <filename>sources."
-"list</filename>-Dateien zu benutzen. Im Allgemeinen ist dies nur von "
-"Interesse, wenn ein genauer Pfad angegeben wird, andernfalls wird "
-"<literal>APT</literal> automatisch einen URI mit der aktuellen Architektur "
-"erstellen."
+"benutzt wird. Dies erlaubt es, architekturunabhängige "
+"<filename>sources.list</filename>-Dateien zu benutzen. Im Allgemeinen ist "
+"dies nur von Interesse, wenn ein genauer Pfad angegeben wird, andernfalls "
+"wird <literal>APT</literal> automatisch einen URI mit der aktuellen "
+"Architektur erstellen."
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
@@ -8200,10 +8219,17 @@ msgstr "&sourceslist-sources-format;"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "As an example, the sources for your distribution could look like this in "
+#| "one-line-style format: <placeholder type=\"literallayout\" id=\"0\"/> or "
+#| "like this in deb822 style format: <placeholder type=\"literallayout\" "
+#| "id=\"1\"/>"
 msgid ""
-"As an example, the sources for your distribution could look like this in one-"
-"line-style format: <placeholder type=\"literallayout\" id=\"0\"/> or like "
-"this in deb822 style format: <placeholder type=\"literallayout\" id=\"1\"/>"
+"As an example, the sources for your distribution could look like this in the "
+"deprecated one-line-style format: <placeholder type=\"literallayout\" "
+"id=\"0\"/> or like this in deb822 style format: <placeholder "
+"type=\"literallayout\" id=\"1\"/>"
 msgstr ""
 "Die Quellen für Ihre Distribution könnten zum Beispiel im Format mit "
 "einzeiligem Stil so aussehen: <placeholder type=\"literallayout\" id=\"0\"/> "
@@ -8251,8 +8277,8 @@ msgstr ""
 "<option>Architectures</option> (<option>arch</option>) ist eine Option mit "
 "mehreren Werten, die definiert, für welche Architekturen Informationen "
 "heruntergeladen werden sollen. Falls diese Option nicht gesetzt ist, ist die "
-"Voreinstellung alle durch die Konfigurationsoption <option>APT::"
-"Architectures</option> definierten Architekturen."
+"Voreinstellung alle durch die Konfigurationsoption "
+"<option>APT::Architectures</option> definierten Architekturen."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #: sources.list.5.xml
@@ -8274,21 +8300,22 @@ msgstr ""
 msgid ""
 "<option>Targets</option> (<option>target</option>) is a multivalue option "
 "defining which download targets apt will try to acquire from this source. If "
-"not specified, the default set is defined by the <option>Acquire::"
-"IndexTargets</option> configuration scope (targets are specified by their "
-"name in the <literal>Created-By</literal> field).  Additionally, targets can "
-"be enabled or disabled by using the <literal>Identifier</literal> field as "
-"an option with a boolean value instead of using this multivalue option."
+"not specified, the default set is defined by the "
+"<option>Acquire::IndexTargets</option> configuration scope (targets are "
+"specified by their name in the <literal>Created-By</literal> field).  "
+"Additionally, targets can be enabled or disabled by using the "
+"<literal>Identifier</literal> field as an option with a boolean value "
+"instead of using this multivalue option."
 msgstr ""
 "<option>Targets</option> (<option>target</option>) ist eine Option mit "
 "mehreren Werten, die definiert, welche Herunterladeziele APT aus dieser "
 "Quelle versucht zu beschaffen. Ist sie nicht angegeben, wird die "
-"Voreinstellung durch den Konfigurationsbereich <option>Acquire::"
-"IndexTargets</option> spezifiziert (Ziele werden im Feld <literal>Created-"
-"By</literal> durch ihren Namen angegeben). Außerdem können Ziele mittels des "
-"Felds <literal>Identifier</literal> als Option mit einem Wahrheitswert "
-"aktiviert oder deaktiviert werden, anstatt diese Option mit mehreren Werten "
-"zu benutzen."
+"Voreinstellung durch den Konfigurationsbereich "
+"<option>Acquire::IndexTargets</option> spezifiziert (Ziele werden im Feld "
+"<literal>Created-By</literal> durch ihren Namen angegeben). Außerdem können "
+"Ziele mittels des Felds <literal>Identifier</literal> als Option mit einem "
+"Wahrheitswert aktiviert oder deaktiviert werden, anstatt diese Option mit "
+"mehreren Werten zu benutzen."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #: sources.list.5.xml
@@ -8506,8 +8533,9 @@ msgid ""
 "helps users identify mirrors which are no longer updated. However, some "
 "repositories such as historic archives are not updated any more by design, "
 "so this check can be disabled by setting this option to <literal>no</"
-"literal>.  Defaults to the value of configuration option <option>Acquire::"
-"Check-Valid-Until</option> which itself defaults to <literal>yes</literal>."
+"literal>.  Defaults to the value of configuration option "
+"<option>Acquire::Check-Valid-Until</option> which itself defaults to "
+"<literal>yes</literal>."
 msgstr ""
 "<option>Check-Valid-Until</option> (<option>check-valid-until</option>) ist "
 "ein yes-/no- (Ja-/Nein-)Wert, der steuert, ob APT versuchen soll, "
@@ -9169,8 +9197,8 @@ msgstr ""
 #: apt-extracttemplates.1.xml
 msgid ""
 "Temporary directory in which to write extracted <command>debconf</command> "
-"template files and config scripts.  Configuration Item: <literal>APT::"
-"ExtractTemplates::TempDir</literal>"
+"template files and config scripts.  Configuration Item: "
+"<literal>APT::ExtractTemplates::TempDir</literal>"
 msgstr ""
 "temporäres Verzeichnis, in das die extrahierten <command>debconf</command>-"
 "Schablonendateien und Konfigurationsskripte geschrieben werden. "
@@ -9213,11 +9241,11 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-sortpkgs.1.xml
 msgid ""
-"Use source index field ordering.  Configuration Item: <literal>APT::"
-"SortPkgs::Source</literal>."
+"Use source index field ordering.  Configuration Item: "
+"<literal>APT::SortPkgs::Source</literal>."
 msgstr ""
-"Quellindexfeldanordnung benutzen. Konfigurationselement: <literal>APT::"
-"SortPkgs::Source</literal>."
+"Quellindexfeldanordnung benutzen. Konfigurationselement: "
+"<literal>APT::SortPkgs::Source</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-sortpkgs.1.xml
@@ -9351,10 +9379,10 @@ msgid ""
 "<filename>icons</filename> files as well as <filename>Release</filename>, "
 "<filename>Index</filename> and <filename>md5sum.txt</filename> files by "
 "default (<literal>APT::FTPArchive::Release::Default-Patterns</literal>).  "
-"Additional filename patterns can be added by listing them in <literal>APT::"
-"FTPArchive::Release::Patterns</literal>.  It then writes to stdout a "
-"<filename>Release</filename> file containing (by default) an MD5, SHA1, "
-"SHA256 and SHA512 digest for each file."
+"Additional filename patterns can be added by listing them in "
+"<literal>APT::FTPArchive::Release::Patterns</literal>.  It then writes to "
+"stdout a <filename>Release</filename> file containing (by default) an MD5, "
+"SHA1, SHA256 and SHA512 digest for each file."
 msgstr ""
 "Der Befehl <literal>release</literal> erzeugt eine Release-Datei aus einem "
 "Verzeichnisbaum. Standardmäßig durchsucht er rekursiv das angegebene "
@@ -9362,13 +9390,13 @@ msgstr ""
 "filename>-, <filename>Sources</filename>-, <filename>Contents</filename>-, "
 "<filename>Components</filename>- und <filename>icons</filename>-Dateien, "
 "ebenso wie standardmäßig <filename>Release</filename>-, <filename>Index</"
-"filename> und <filename>md5sum.txt</filename>-Dateien (<literal>APT::"
-"FTPArchive::Release::Default-Patterns</literal>). Zusätzliche Muster für "
-"Dateinamen können hinzugefügt werden, indem sie in <literal>APT::FTPArchive::"
-"Release::Patterns</literal> aufgeführt werden. Dann schreibt er eine "
-"<filename>Release</filename>-Datei auf die Standardausgabe, die "
-"(standardmäßig) für jede Datei eine MD5-, SHA1-, SHA256- und SHA512-"
-"Prüfsumme enthält."
+"filename> und <filename>md5sum.txt</filename>-Dateien "
+"(<literal>APT::FTPArchive::Release::Default-Patterns</literal>). Zusätzliche "
+"Muster für Dateinamen können hinzugefügt werden, indem sie in "
+"<literal>APT::FTPArchive::Release::Patterns</literal> aufgeführt werden. "
+"Dann schreibt er eine <filename>Release</filename>-Datei auf die "
+"Standardausgabe, die (standardmäßig) für jede Datei eine MD5-, SHA1-, "
+"SHA256- und SHA512-Prüfsumme enthält."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml
@@ -9616,12 +9644,12 @@ msgstr "<literal>TreeDefault</literal>-Abschnitt"
 #: apt-ftparchive.1.xml
 msgid ""
 "Sets defaults specific to <literal>Tree</literal> sections. All of these "
-"variables are substitution variables and have the strings $(DIST), "
-"$(SECTION) and $(ARCH) replaced with their respective values."
+"variables are substitution variables and have the strings $(DIST), $"
+"(SECTION) and $(ARCH) replaced with their respective values."
 msgstr ""
 "setzt Vorgaben speziell für <literal>Tree</literal>-Abschnitte. All diese "
-"Variablen sind Platzhaltervariablen und haben die Zeichenketten $(DIST), "
-"$(SECTION) und $(ARCH) durch ihre jeweiligen Werte ersetzt."
+"Variablen sind Platzhaltervariablen und haben die Zeichenketten $(DIST), $"
+"(SECTION) und $(ARCH) durch ihre jeweiligen Werte ersetzt."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml
@@ -9655,20 +9683,20 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml
 msgid ""
-"Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
-"$(SECTION)/binary-$(ARCH)/</filename>"
+"Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/$"
+"(SECTION)/binary-$(ARCH)/</filename>"
 msgstr ""
-"setzt den Beginn des .deb-Verzeichnisbaums. Vorgabe ist <filename>$(DIST)/"
-"$(SECTION)/binary-$(ARCH)/</filename>"
+"setzt den Beginn des .deb-Verzeichnisbaums. Vorgabe ist <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 ""
-"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
@@ -9692,8 +9720,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. "
@@ -10098,8 +10126,8 @@ msgstr ""
 "entfernt Verweise. Wenn die <literal>External-Links</literal>-Einstellung "
 "benutzt wird, schaltet diese Option tatsächlich das Entfernen von Verweisen "
 "zu Dateien ein. Standardmäßig ist es an und kann mit <option>--no-delink</"
-"option> ausgeschaltet werden. Konfigurationselement: <literal>APT::"
-"FTPArchive::DeLinkAct</literal>."
+"option> ausgeschaltet werden. Konfigurationselement: "
+"<literal>APT::FTPArchive::DeLinkAct</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml
@@ -10125,14 +10153,14 @@ msgid ""
 "literal>."
 msgstr ""
 "wählt die Quelldatei zum außer Kraft setzen, die mit dem <literal>sources</"
-"literal>-Befehl benutzt wird. Konfigurationselement: <literal>APT::"
-"FTPArchive::SourceOverride</literal>."
+"literal>-Befehl benutzt wird. Konfigurationselement: "
+"<literal>APT::FTPArchive::SourceOverride</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml
 msgid ""
-"Make the caching databases read only.  Configuration Item: <literal>APT::"
-"FTPArchive::ReadOnlyDB</literal>."
+"Make the caching databases read only.  Configuration Item: "
+"<literal>APT::FTPArchive::ReadOnlyDB</literal>."
 msgstr ""
 "macht die Zwischenspeicherdatenbank nur lesbar. Konfigurationselement: "
 "<literal>APT::FTPArchive::ReadOnlyDB</literal>."
@@ -10148,8 +10176,8 @@ msgstr ""
 "akzeptiert in den Befehlen <literal>packages</literal> und "
 "<literal>contents</literal> nur Paketdateien, die auf <literal>*_arch.deb</"
 "literal> oder <literal>*_all.deb</literal> passen, anstatt aller "
-"Paketdateien im angegebenen Pfad. Konfigurationselement: <literal>APT::"
-"FTPArchive::Architecture</literal>."
+"Paketdateien im angegebenen Pfad. Konfigurationselement: "
+"<literal>APT::FTPArchive::Architecture</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml
@@ -10268,11 +10296,11 @@ msgstr ""
 "Das hier definierte Format ist dem Format der von "
 "<citerefentry><refentrytitle><command>ftp</command></"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry> und ähnlichen "
-"Programmen, die mit Servern interagieren, benutzten Datei <filename>~/."
-"netrc</filename> ähnlich. Es ist eine einfaches kürzelbasiertes Format, bei "
-"dem die folgenden Kürzel erkannt werden; unbekannte Kürzel werden ignoriert. "
-"Kürzel können durch Leerzeichen, Tabulatoren oder Zeilenumbrüche voneinander "
-"getrennt werden."
+"Programmen, die mit Servern interagieren, benutzten Datei "
+"<filename>~/.netrc</filename> ähnlich. Es ist eine einfaches kürzelbasiertes "
+"Format, bei dem die folgenden Kürzel erkannt werden; unbekannte Kürzel "
+"werden ignoriert. Kürzel können durch Leerzeichen, Tabulatoren oder "
+"Zeilenumbrüche voneinander getrennt werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt_auth.conf.5.xml
@@ -10566,31 +10594,33 @@ msgid ""
 "The environment variable <envar>http_proxy</envar> is supported for system "
 "wide configuration.  Proxies specific to APT can be configured via the "
 "option <literal>Acquire::http::Proxy</literal>.  Proxies which should be "
-"used only for certain hosts can be specified via <literal>Acquire::http::"
-"Proxy::<replaceable>host</replaceable></literal>. Even more fine-grained "
-"control can be achieved via proxy autodetection, detailed further below.  "
-"All these options use the URI format <literal><replaceable>scheme</"
-"replaceable>://[[<replaceable>user</replaceable>][:<replaceable>pass</"
-"replaceable>]@]<replaceable>host</replaceable>[:<replaceable>port</"
-"replaceable>]/</literal>.  Supported URI schemes are <literal>socks5h</"
-"literal> (SOCKS5 with remote DNS resolution), <literal>http</literal> and "
-"<literal>https</literal>.  Authentication details can be supplied via &apt-"
-"authconf; instead of including it in the URI directly."
+"used only for certain hosts can be specified via "
+"<literal>Acquire::http::Proxy::<replaceable>host</replaceable></literal>. "
+"Even more fine-grained control can be achieved via proxy autodetection, "
+"detailed further below.  All these options use the URI format "
+"<literal><replaceable>scheme</replaceable>://[[<replaceable>user</"
+"replaceable>][:<replaceable>pass</replaceable>]@]<replaceable>host</"
+"replaceable>[:<replaceable>port</replaceable>]/</literal>.  Supported URI "
+"schemes are <literal>socks5h</literal> (SOCKS5 with remote DNS resolution), "
+"<literal>http</literal> and <literal>https</literal>.  Authentication "
+"details can be supplied via &apt-authconf; instead of including it in the "
+"URI directly."
 msgstr ""
 "Die Umgebungsvariable <envar>http_proxy</envar> wird zur systemweiten "
 "Konfiguration unterstützt. APT-spezifische Proxys können mittels der Option "
 "<literal>Acquire::http::Proxy</literal> konfiguriert werden. Proxys, die nur "
-"für bestimmte Rechner benutzt werden, können über <literal>Acquire::http::"
-"Proxy::<replaceable>Rechner</replaceable></literal> angegeben werden. Eine "
-"granularere Steuerung kann über die nachfolgend genauer beschriebene Proxy-"
-"Autoerkennung erreicht werden. Alle diese Optionen verwenden das URI-Format "
-"<literal><replaceable>Schema</replaceable>://[[<replaceable>Benutzer</"
-"replaceable>][:<replaceable>Passwort</replaceable>]@]<replaceable>Rechner</"
-"replaceable>[:<replaceable>Port</replaceable>]/</literal>. Untersützte URI-"
-"Schemen sind <literal>socks5h</literal> (SOCKS5 mit ferner DNS-Auflösung), "
-"<literal>http</literal> und <literal>https</literal>. "
-"Authentifizierungseinzelheiten können über &apt-authconf; bereitgestellt "
-"werden, statt sie direkt in den URI einzufügen."
+"für bestimmte Rechner benutzt werden, können über "
+"<literal>Acquire::http::Proxy::<replaceable>Rechner</replaceable></literal> "
+"angegeben werden. Eine granularere Steuerung kann über die nachfolgend "
+"genauer beschriebene Proxy-Autoerkennung erreicht werden. Alle diese "
+"Optionen verwenden das URI-Format <literal><replaceable>Schema</"
+"replaceable>://[[<replaceable>Benutzer</replaceable>][:"
+"<replaceable>Passwort</replaceable>]@]<replaceable>Rechner</replaceable>[:"
+"<replaceable>Port</replaceable>]/</literal>. Untersützte URI-Schemen sind "
+"<literal>socks5h</literal> (SOCKS5 mit ferner DNS-Auflösung), <literal>http</"
+"literal> und <literal>https</literal>. Authentifizierungseinzelheiten können "
+"über &apt-authconf; bereitgestellt werden, statt sie direkt in den URI "
+"einzufügen."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt-transport-http.1.xml
@@ -10608,14 +10638,14 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt-transport-http.1.xml
 msgid ""
-"Furthermore, there are three settings provided for cache control with "
-"HTTP/1.1 compliant proxy caches: <literal>Acquire::http::No-Cache</literal> "
-"tells the proxy not to use its cached response under any circumstances.  "
+"Furthermore, there are three settings provided for cache control with HTTP/"
+"1.1 compliant proxy caches: <literal>Acquire::http::No-Cache</literal> tells "
+"the proxy not to use its cached response under any circumstances.  "
 "<literal>Acquire::http::Max-Age</literal> sets the allowed maximum age (in "
-"seconds) of an index file in the cache of the proxy.  <literal>Acquire::"
-"http::No-Store</literal> specifies that the proxy should not store the "
-"requested archive files in its cache, which can be used to prevent the proxy "
-"from polluting its cache with (big) .deb files."
+"seconds) of an index file in the cache of the proxy.  "
+"<literal>Acquire::http::No-Store</literal> specifies that the proxy should "
+"not store the requested archive files in its cache, which can be used to "
+"prevent the proxy from polluting its cache with (big) .deb files."
 msgstr ""
 "Desweiteren werden drei Einstellungen zur Steuerung des Zwischenspeichers "
 "mit HTTP/1.1-konformen Proxy-Zwischenspeichern bereitgestellt: "
@@ -10678,11 +10708,11 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt-transport-http.1.xml
 msgid ""
-"This option takes precedence over the legacy option name <literal>Acquire::"
-"http::ProxyAutoDetect</literal>."
+"This option takes precedence over the legacy option name "
+"<literal>Acquire::http::ProxyAutoDetect</literal>."
 msgstr ""
-"Diese Option hat Vorrang vor dem veralteten Optionsnamen <literal>Acquire::"
-"http::ProxyAutoDetect</literal>."
+"Diese Option hat Vorrang vor dem veralteten Optionsnamen "
+"<literal>Acquire::http::ProxyAutoDetect</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 #: apt-transport-http.1.xml
@@ -10721,12 +10751,12 @@ msgstr ""
 #: apt-transport-http.1.xml
 msgid ""
 "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
-"enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
-"g. on high-latency connections. It specifies how many requests are sent in a "
-"pipeline.  APT tries to detect and work around misbehaving webservers and "
-"proxies at runtime, but if you know that yours does not conform to the "
-"HTTP/1.1 specification, pipelining can be disabled by setting the value to "
-"0. It is enabled by default with the value 10."
+"enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial "
+"e.g. on high-latency connections. It specifies how many requests are sent in "
+"a pipeline.  APT tries to detect and work around misbehaving webservers and "
+"proxies at runtime, but if you know that yours does not conform to the HTTP/"
+"1.1 specification, pipelining can be disabled by setting the value to 0. It "
+"is enabled by default with the value 10."
 msgstr ""
 "Die Einstellung <literal>Acquire::http::Pipeline-Depth</literal> kann "
 "verwandt werden, um HTTP-Pipelining zu aktivieren (RFC 2616 Abschnitt "
@@ -10860,9 +10890,9 @@ msgstr ""
 msgid ""
 "The HTTPS protocol is based on the HTTP protocol, so all options supported "
 "by &apt-transport-http; are also available via <literal>Acquire::https</"
-"literal> and will default to the same values specified for <literal>Acquire::"
-"http</literal>. This manpage will only document the options <emphasis>unique "
-"to https</emphasis>."
+"literal> and will default to the same values specified for "
+"<literal>Acquire::http</literal>. This manpage will only document the "
+"options <emphasis>unique to https</emphasis>."
 msgstr ""
 "Das HTTPS-Protokoll basiert auf dem HTTP-Protokoll, daher sind alle von &apt-"
 "transport-http; unterstützten Optionen auch mittels <literal>Acquire::https</"
@@ -10910,15 +10940,16 @@ msgstr ""
 #: apt-transport-https.1.xml
 msgid ""
 "A custom certificate revocation list (CRL) can be configured with the "
-"options <literal>Acquire::https::CRLFile</literal> and <literal>Acquire::"
-"https::CRLFile::<replaceable>host</replaceable></literal>.  As with the "
-"previous option, a file in PEM format needs to be specified."
+"options <literal>Acquire::https::CRLFile</literal> and "
+"<literal>Acquire::https::CRLFile::<replaceable>host</replaceable></"
+"literal>.  As with the previous option, a file in PEM format needs to be "
+"specified."
 msgstr ""
 "Eine benutzerdefinierte Zertifikatwiderrufsliste (CRL) kann mit den Optionen "
-"<literal>Acquire::https::CRLFile</literal> beziehungsweise <literal>Acquire::"
-"https::CRLFile::<replaceable>Rechner</replaceable></literal> konfiguriert "
-"werden. Wie bei der vorherigen Option muss eine Datei im PEM-Format "
-"angegeben werden."
+"<literal>Acquire::https::CRLFile</literal> beziehungsweise "
+"<literal>Acquire::https::CRLFile::<replaceable>Rechner</replaceable></"
+"literal> konfiguriert werden. Wie bei der vorherigen Option muss eine Datei "
+"im PEM-Format angegeben werden."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 #: apt-transport-https.1.xml
@@ -10941,14 +10972,14 @@ msgstr ""
 "Wenn bei der Authentifizierung des Servers die Prüfung des Zertifikats aus "
 "irgendeinem Grund fehlschlägt (abgelaufen, zurückgezogen, Mann in der Mitte, "
 "usw.) scheitert der Verbindungsaufbau. Dies ist offenkundig das, was Sie auf "
-"jeden Fall wollen und der Vorgabewert (»true«) der Option <literal>Acquire::"
-"https::Verify-Peer</literal> und was ihre rechnerspezifische Variante "
-"bereitstellt. Falls Sie <emphasis>genau</emphasis> wissen, was Sie tun, "
-"ermöglicht Ihnen das Setzen dieser Variable auf »<literal>false</literal>«, "
-"die Prüfung des Partnerzertifikats zu überspringen und den Austausch "
-"erfolgreich durchzuführen. Nochmals – diese Option dient nur der Fehlersuche "
-"und zu Testzwecken, da sie alle durch die Verwendung von HTTPS "
-"bereitgestellte Sicherheit entfernt."
+"jeden Fall wollen und der Vorgabewert (»true«) der Option "
+"<literal>Acquire::https::Verify-Peer</literal> und was ihre "
+"rechnerspezifische Variante bereitstellt. Falls Sie <emphasis>genau</"
+"emphasis> wissen, was Sie tun, ermöglicht Ihnen das Setzen dieser Variable "
+"auf »<literal>false</literal>«, die Prüfung des Partnerzertifikats zu "
+"überspringen und den Austausch erfolgreich durchzuführen. Nochmals – diese "
+"Option dient nur der Fehlersuche und zu Testzwecken, da sie alle durch die "
+"Verwendung von HTTPS bereitgestellte Sicherheit entfernt."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt-transport-https.1.xml
@@ -10985,11 +11016,11 @@ msgstr "Client-Authentifizierung"
 msgid ""
 "Besides supporting password-based authentication (see &apt-authconf;) HTTPS "
 "also supports authentication based on client certificates via "
-"<literal>Acquire::https::SSLCert</literal> and <literal>Acquire::https::"
-"SSLKey</literal>. These should be set respectively to the filename of the "
-"X.509 client certificate and the associated (unencrypted) private key, both "
-"in PEM format.  In practice the use of the host-specific variants of both "
-"options is highly recommended."
+"<literal>Acquire::https::SSLCert</literal> and "
+"<literal>Acquire::https::SSLKey</literal>. These should be set respectively "
+"to the filename of the X.509 client certificate and the associated "
+"(unencrypted) private key, both in PEM format.  In practice the use of the "
+"host-specific variants of both options is highly recommended."
 msgstr ""
 "Abseits der unterstützten passwortbasierten Authentifizierung (siehe &apt-"
 "authconf;) unterstützt HTTPS auch die Authentifizierung auf Basis von Client-"
@@ -11299,9 +11330,9 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt-transport-mirror.1.xml
 msgid ""
-"Assuming a file with this content is stored as <filename>/etc/apt/mirrorlist."
-"txt</filename> on your machine it can be used like this in &sources-list; "
-"(since apt 1.6):"
+"Assuming a file with this content is stored as <filename>/etc/apt/"
+"mirrorlist.txt</filename> on your machine it can be used like this in "
+"&sources-list; (since apt 1.6):"
 msgstr ""
 "Angenommen, eine Datei mit diesem Inhalt wäre als <filename>/etc/apt/"
 "mirrorlist.txt</filename> auf Ihrem Rechner gespeichert. Sie kann (seit APT "
@@ -12259,10 +12290,10 @@ msgstr "?narrow akzeptiert unendliche Argumente"
 #: apt-patterns.7.xml
 msgid ""
 "<code>foo</code> cannot be used as a shortform for <code>?name(foo)</code>, "
-"as this can cause typos to go unnoticed: Consider <code>?and(...,"
-"~poptional)</code>: this requires the package to have <code>required</code> "
-"priority, but if you do not type the <code>~</code>, it would require the "
-"package name to contain <code>poptional</code>."
+"as this can cause typos to go unnoticed: Consider <code>?"
+"and(...,~poptional)</code>: this requires the package to have "
+"<code>required</code> priority, but if you do not type the <code>~</code>, "
+"it would require the package name to contain <code>poptional</code>."
 msgstr ""
 "<code>foo</code> kann nicht als Kurzschreibweise für <code>?name(foo)</code> "
 "benutzt werden, da dies unbemerkte Tippfehler verursachen kann. Betrachten "
@@ -13927,19 +13958,19 @@ msgstr ""
 
 #~ msgid ""
 #~ "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP "
-#~ "URIs.  It is in the standard form of <literal>ftp://[[user][:pass]@]host[:"
-#~ "port]/</literal>.  Per host proxies can also be specified by using the "
-#~ "form <literal>ftp::Proxy::&lt;host&gt;</literal> with the special keyword "
-#~ "<literal>DIRECT</literal> meaning to use no proxies. If no one of the "
-#~ "above settings is specified, <envar>ftp_proxy</envar> environment "
-#~ "variable will be used. To use an FTP proxy you will have to set the "
-#~ "<literal>ftp::ProxyLogin</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>."
+#~ "URIs.  It is in the standard form of <literal>ftp://[[user]"
+#~ "[:pass]@]host[:port]/</literal>.  Per host proxies can also be specified "
+#~ "by using the form <literal>ftp::Proxy::&lt;host&gt;</literal> with the "
+#~ "special keyword <literal>DIRECT</literal> meaning to use no proxies. If "
+#~ "no one of the above settings is specified, <envar>ftp_proxy</envar> "
+#~ "environment variable will be used. To use an FTP proxy you will have to "
+#~ "set the <literal>ftp::ProxyLogin</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>."
 #~ msgstr ""
 #~ "<literal>ftp::Proxy</literal> setzt den Standard-Proxy, der für FTP-URIs "
 #~ "benutzt werden soll. Er wird in der Standardform <literal>ftp://"
@@ -14143,8 +14174,8 @@ msgstr ""
 #~ "<emphasis>Hinweis</emphasis>: Anstatt diesen Befehl zu benutzen, sollte "
 #~ "ein Schlüsselbund mit einem aussagekräftigen Namen und entweder "
 #~ "»<literal>gpg</literal>« oder »<literal>asc</literal>« als "
-#~ "Dateinamenserweiterung direkt im Verzeichnis <filename>/etc/apt/trusted."
-#~ "gpg.d/</filename> abgelegt werden."
+#~ "Dateinamenserweiterung direkt im Verzeichnis <filename>/etc/apt/"
+#~ "trusted.gpg.d/</filename> abgelegt werden."
 
 #, fuzzy
 #~| msgid "(deprecated)"
@@ -14233,9 +14264,9 @@ msgstr ""
 #~ "With this option it is possible to specify a particular keyring file the "
 #~ "command should operate on. The default is that a command is executed on "
 #~ "the <filename>trusted.gpg</filename> file as well as on all parts in the "
-#~ "<filename>trusted.gpg.d</filename> directory, though <filename>trusted."
-#~ "gpg</filename> is the primary keyring which means that e.g. new keys are "
-#~ "added to this one."
+#~ "<filename>trusted.gpg.d</filename> directory, though "
+#~ "<filename>trusted.gpg</filename> is the primary keyring which means that "
+#~ "e.g. new keys are added to this one."
 #~ msgstr ""
 #~ "Mit dieser Option ist es möglich, eine spezielle Schlüsselbunddatei "
 #~ "anzugeben, mit der der Befehl arbeitet. Vorgabe ist, dass ein Befehl mit "
diff --git a/doc/po/es.po b/doc/po/es.po
index 79b95783a..9d074648a 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: 2025-01-01 21:58+0100\n"
+"POT-Creation-Date: 2025-01-28 18:52+0000\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"
@@ -637,11 +637,13 @@ msgstr ""
 #. type: Plain text
 #: apt.ent
 msgid ""
-"<!-- TRANSLATOR: used as in -o=config_string e.g. -o=Debug::"
-"pkgProblemResolver=1 --> <!ENTITY synopsis-config-string \"config_string\">"
+"<!-- TRANSLATOR: used as in -o=config_string e.g. "
+"-o=Debug::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 \"config_string\">"
+"<!-- TRANSLATOR: used as in -o=config_string e.g. "
+"-o=Debug::pkgProblemResolver=1 --> <!ENTITY synopsis-config-string "
+"\"config_string\">"
 
 #. type: Plain text
 #: apt.ent
@@ -655,12 +657,12 @@ msgstr ""
 #. type: Plain text
 #: apt.ent
 msgid ""
-"<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release e.g. -"
-"t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
+"<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release e.g. "
+"-t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
 "\"target_release\">"
 msgstr ""
-"<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release e.g. -"
-"t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
+"<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release e.g. "
+"-t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
 "\"target_release\">"
 
 #. type: Plain text
@@ -711,11 +713,11 @@ msgstr ""
 #. type: Plain text
 #: apt.ent
 msgid ""
-"<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom -"
-"d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"cdrom_mount_point\">"
+"<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom "
+"-d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"cdrom_mount_point\">"
 msgstr ""
-"<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom -"
-"d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"cdrom_mount_point\">"
+"<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom "
+"-d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"cdrom_mount_point\">"
 
 #. type: Plain text
 #: apt.ent
@@ -1186,10 +1188,10 @@ msgstr ""
 "command> tiene un sistema «inteligente» de resolución de conflictos, y si es "
 "necesario tratará de actualizar los paquetes más importantes a costa de los "
 "menos importantes. Por ello, puede que la orden <literal>dist-upgrade</"
-"literal> elimine algunos paquetes. El fichero <filename>/etc/apt/sources."
-"list</filename> contiene una lista de sitios desde los que descargar los "
-"ficheros de paquetes. También puede consultar &apt-preferences; si quiere "
-"invalidar este comportamiento para paquetes individuales."
+"literal> elimine algunos paquetes. El fichero <filename>/etc/apt/"
+"sources.list</filename> contiene una lista de sitios desde los que descargar "
+"los ficheros de paquetes. También puede consultar &apt-preferences; si "
+"quiere invalidar este comportamiento para paquetes individuales."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -1697,8 +1699,8 @@ msgid ""
 "structure can be so corrupt as to require manual intervention (which usually "
 "means using <command>dpkg --remove</command> to eliminate some of the "
 "offending packages). Use of this option together with <option>-m</option> "
-"may produce an error in some situations.  Configuration Item: <literal>APT::"
-"Get::Fix-Broken</literal>."
+"may produce an error in some situations.  Configuration Item: "
+"<literal>APT::Get::Fix-Broken</literal>."
 msgstr ""
 "Intenta arreglar un sistema con dependencias actualmente rotas. Si se usa "
 "esta opción junto a «install»/«remove» se puede omitir cualquier paquete "
@@ -1814,11 +1816,11 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
-"Automatic \"no\" to all prompts.  Configuration Item: <literal>APT::Get::"
-"Assume-No</literal>."
+"Automatic \"no\" to all prompts.  Configuration Item: "
+"<literal>APT::Get::Assume-No</literal>."
 msgstr ""
-"Supone «no» a todas las consultas. Opción de configuración: <literal>APT::"
-"Get::Assume-No</literal>."
+"Supone «no» a todas las consultas. Opción de configuración: "
+"<literal>APT::Get::Assume-No</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -1854,23 +1856,23 @@ msgid ""
 "<literal>APT::Get::List-Columns</literal>."
 msgstr ""
 "Reinstala los paquetes ya instalados, incluso si son la última versión "
-"disponible del paquete. Opción de configuración: <literal>APT::Get::"
-"ReInstall</literal>."
+"disponible del paquete. Opción de configuración: "
+"<literal>APT::Get::ReInstall</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 #, fuzzy
 #| msgid ""
 #| "Select the source override file to use with the <literal>sources</"
-#| "literal> command.  Configuration Item: <literal>APT::FTPArchive::"
-#| "SourceOverride</literal>."
+#| "literal> command.  Configuration Item: "
+#| "<literal>APT::FTPArchive::SourceOverride</literal>."
 msgid ""
 "Add the given value to the <literal>Comment:</literal> field in history.log "
 "Configuration Item: <literal>APT::History::Comment</literal>."
 msgstr ""
 "Selecciona el fichero de fuentes alternativo a usar con la orden "
-"<literal>sources</literal>. Opción de configuración: <literal>APT::"
-"FTPArchive::SourceOverride</literal>."
+"<literal>sources</literal>. Opción de configuración: "
+"<literal>APT::FTPArchive::SourceOverride</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -1886,9 +1888,9 @@ msgid ""
 "This option controls the architecture packages are built for by <command>apt-"
 "get source --compile</command> and how cross-builddependencies are "
 "satisfied. By default is it not set which means that the host architecture "
-"is the same as the build architecture (which is defined by <literal>APT::"
-"Architecture</literal>).  Configuration Item: <literal>APT::Get::Host-"
-"Architecture</literal>."
+"is the same as the build architecture (which is defined by "
+"<literal>APT::Architecture</literal>).  Configuration Item: "
+"<literal>APT::Get::Host-Architecture</literal>."
 msgstr ""
 "Esta opción controla la arquitectura para la que se construyen los paquetes "
 "mediante <command>apt-get source --compile</command> y cómo se satisfacen "
@@ -1941,8 +1943,8 @@ msgstr ""
 "Ignora los paquetes retenidos. Esto hace que <command>apt-get</command> "
 "ignore toda retención impuesta a un paquete. Esto puede ser útil junto a "
 "<literal>dist-upgrade</literal> para invalidar un gran número de paquetes "
-"retenidos de manera no deseada. Opción de configuración: <literal>APT::"
-"Ignore-Hold</literal>."
+"retenidos de manera no deseada. Opción de configuración: "
+"<literal>APT::Ignore-Hold</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -2086,8 +2088,8 @@ msgid ""
 "name on the remote site! This also works with the <literal>source</literal> "
 "and <literal>update</literal> commands. When used with the <literal>update</"
 "literal> command the MD5 and size are not included, and it is up to the user "
-"to decompress any compressed files.  Configuration Item: <literal>APT::Get::"
-"Print-URIs</literal>."
+"to decompress any compressed files.  Configuration Item: "
+"<literal>APT::Get::Print-URIs</literal>."
 msgstr ""
 "Muestra los URI de los ficheros a instalar en vez de descargarlos. Cada URI "
 "contiene la dirección de dónde se obtendrá el paquete, el fichero de "
@@ -2120,8 +2122,8 @@ msgid ""
 "Configuration Item: <literal>APT::Get::ReInstall</literal>."
 msgstr ""
 "Reinstala los paquetes ya instalados, incluso si son la última versión "
-"disponible del paquete. Opción de configuración: <literal>APT::Get::"
-"ReInstall</literal>."
+"disponible del paquete. Opción de configuración: "
+"<literal>APT::Get::ReInstall</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -2130,8 +2132,8 @@ msgid ""
 "turn it off. When it is on, <command>apt-get</command> will automatically "
 "manage the contents of <filename>&statedir;/lists</filename> to ensure that "
 "obsolete files are erased.  The only reason to turn it off is if you "
-"frequently change your sources list.  Configuration Item: <literal>APT::Get::"
-"List-Cleanup</literal>."
+"frequently change your sources list.  Configuration Item: "
+"<literal>APT::Get::List-Cleanup</literal>."
 msgstr ""
 "Esta opción está activada de forma predeterminada, si quiere desactivarla "
 "utilice <literal>--no-list-cleanup</literal>. Cuando está activada "
@@ -2218,8 +2220,8 @@ msgid ""
 msgstr ""
 "Si la orden es <literal>install</literal> o <literal>remove</literal>, esta "
 "opción realiza el funcionamiento de <literal>autoremove</literal>, "
-"eliminando dependencias en desuso. Opción de configuración: <literal>APT::"
-"Get::AutomaticRemove</literal>."
+"eliminando dependencias en desuso. Opción de configuración: "
+"<literal>APT::Get::AutomaticRemove</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -2249,8 +2251,9 @@ msgid ""
 "literal>, and <literal>APT::Get::Tar-Only</literal>."
 msgstr ""
 "Descarga sólo el fichero diff, dsc o tar del archivo de fuentes. Opciones de "
-"configuración: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::"
-"Dsc-Only</literal> y <literal>APT::Get::Tar-Only</literal>."
+"configuración: <literal>APT::Get::Diff-Only</literal>, "
+"<literal>APT::Get::Dsc-Only</literal> y <literal>APT::Get::Tar-Only</"
+"literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -2819,12 +2822,12 @@ msgstr "Tenga cuidado, dotty no puede dibujar grandes conjuntos de paquetes."
 #: apt-cache.8.xml
 msgid ""
 "The same as <literal>dotty</literal>, only for xvcg from the <ulink "
-"url=\"https://www.rw.cdl.uni-saarland.de/people/sander/private/html/gsvcg1."
-"html\">VCG tool</ulink>."
+"url=\"https://www.rw.cdl.uni-saarland.de/people/sander/private/html/"
+"gsvcg1.html\">VCG tool</ulink>."
 msgstr ""
 "Lo mismo que <literal>dotty</literal>, sólo para xvcg de la <ulink "
-"url=\"https://www.rw.cdl.uni-saarland.de/people/sander/private/html/gsvcg1."
-"html\">herramienta VCG</ulink>."
+"url=\"https://www.rw.cdl.uni-saarland.de/people/sander/private/html/"
+"gsvcg1.html\">herramienta VCG</ulink>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml
@@ -2852,8 +2855,8 @@ msgid ""
 "archive management tool, <literal>madison</literal>.  It displays available "
 "versions of a package in a tabular format.  Unlike the original "
 "<literal>madison</literal>, it can only display information for the "
-"architecture for which APT has retrieved package lists (<literal>APT::"
-"Architecture</literal>)."
+"architecture for which APT has retrieved package lists "
+"(<literal>APT::Architecture</literal>)."
 msgstr ""
 "La orden <literal>madison</literal> de <literal>apt-cache</literal> intenta "
 "imitar el formato de salida y parte de la funcionalidad de la herramienta "
@@ -2867,8 +2870,8 @@ msgstr ""
 #: apt-cache.8.xml
 msgid ""
 "Select the file to store the package cache. The package cache is the primary "
-"cache used by all operations.  Configuration Item: <literal>Dir::Cache::"
-"pkgcache</literal>."
+"cache used by all operations.  Configuration Item: "
+"<literal>Dir::Cache::pkgcache</literal>."
 msgstr ""
 "Define el fichero donde guardar la caché de paquetes. La caché de paquetes "
 "es la caché primaria usada para todas las operaciones. Opción de "
@@ -2912,8 +2915,8 @@ msgid ""
 msgstr ""
 "Muestra sólo las dependencias importantes, se usa junto con <literal>unmet</"
 "literal> y <literal>depends</literal>. Hace que sólo se muestren las "
-"dependencias y pre-dependencias. Opción de configuración: <literal>APT::"
-"Cache::Important</literal>."
+"dependencias y pre-dependencias. Opción de configuración: "
+"<literal>APT::Cache::Important</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml
@@ -2927,16 +2930,16 @@ msgstr ""
 msgid ""
 "Per default the <command>depends</command> and <command>rdepends</command> "
 "print all dependencies. This can be tweaked with these flags which will omit "
-"the specified dependency type.  Configuration Item: <literal>APT::Cache::"
-"Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::"
-"Cache::ShowRecommends</literal>."
+"the specified dependency type.  Configuration Item: "
+"<literal>APT::Cache::Show<replaceable>DependencyType</replaceable></literal> "
+"e.g. <literal>APT::Cache::ShowRecommends</literal>."
 msgstr ""
 "Por omisión, <literal>depends</literal> y <literal>rdepends</literal> "
 "muestran todas las dependencias. Este comportamiento se puede modificar con "
 "los siguientes parámetros, los cuales omitirán el tipo de dependencia "
-"especificado. Opción de configuración: <literal>APT::Cache::"
-"Show<replaceable>Tipo-de Dependencia</replaceable></literal>. Por ejemplo, "
-"<literal>APT::Cache::ShowRecommends</literal>."
+"especificado. Opción de configuración: "
+"<literal>APT::Cache::Show<replaceable>Tipo-de Dependencia</replaceable></"
+"literal>. Por ejemplo, <literal>APT::Cache::ShowRecommends</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml
@@ -2984,8 +2987,8 @@ msgid ""
 msgstr ""
 "Realiza una regeneración completa de la caché de paquetes, en vez de usarla "
 "tal y como está. Esta es la opción predeterminada, para desactivarla use "
-"<option>--no-generate</option>. Opción de configuración: <literal>APT::"
-"Cache::Generate</literal>."
+"<option>--no-generate</option>. Opción de configuración: "
+"<literal>APT::Cache::Generate</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml
@@ -3004,8 +3007,8 @@ msgstr ""
 #: apt-cache.8.xml
 msgid ""
 "Make <literal>pkgnames</literal> print all names, including virtual packages "
-"and missing dependencies.  Configuration Item: <literal>APT::Cache::"
-"AllNames</literal>."
+"and missing dependencies.  Configuration Item: "
+"<literal>APT::Cache::AllNames</literal>."
 msgstr ""
 "Hace que <literal>pkgnames</literal> muestre todos los nombres, incluyendo "
 "los paquetes virtuales y las dependencias no encontradas. Opción de "
@@ -3030,8 +3033,8 @@ msgid ""
 "<literal>APT::Cache::Installed</literal>."
 msgstr ""
 "Limita la salida de <literal>depends</literal> y <literal>rdepends</literal> "
-"a paquetes actualmente instalados. Opción de configuración: <literal>APT::"
-"Cache::Installed</literal>."
+"a paquetes actualmente instalados. Opción de configuración: "
+"<literal>APT::Cache::Installed</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml
@@ -3057,8 +3060,8 @@ msgstr ""
 #: apt-cache.8.xml
 #, fuzzy
 #| msgid ""
-#| "Use source index field ordering.  Configuration Item: <literal>APT::"
-#| "SortPkgs::Source</literal>."
+#| "Use source index field ordering.  Configuration Item: "
+#| "<literal>APT::SortPkgs::Source</literal>."
 msgid ""
 "Note that these sources are treated as trusted (see &apt-secure;).  "
 "Configuration Item: <literal>APT::Sources::With</literal>."
@@ -3091,8 +3094,8 @@ msgid ""
 "<command>apt-mark</command> can be used as a unified front-end to set "
 "various settings for a package, such as marking a package as being "
 "automatically/manually installed or changing <command>dpkg</command> "
-"selections such as hold, install, deinstall and purge which are respected e."
-"g. by <command>apt-get dselect-upgrade</command> or <command>aptitude</"
+"selections such as hold, install, deinstall and purge which are respected "
+"e.g. by <command>apt-get dselect-upgrade</command> or <command>aptitude</"
 "command>."
 msgstr ""
 
@@ -3334,10 +3337,11 @@ msgstr "Configuración de usuario"
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""
-"Keys should usually be included inside their corresponding <literal>."
-"sources</literal> by embedding the ASCII-armored key in the <literal>Signed-"
-"By</literal> option.  To do so, replace the empty line with a dot, and then "
-"indent all lines by two spaces.  See &sources-list; for more information."
+"Keys should usually be included inside their corresponding "
+"<literal>.sources</literal> by embedding the ASCII-armored key in the "
+"<literal>Signed-By</literal> option.  To do so, replace the empty line with "
+"a dot, and then indent all lines by two spaces.  See &sources-list; for more "
+"information."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -3350,8 +3354,9 @@ msgid ""
 "literal> file or using <literal>deb [signed-by=/etc/apt/keyrings/example-"
 "archive-keyring.asc] ...</literal> in the legacy <literal>.list</literal> "
 "format. This may be useful for APT versions prior to 2.4, which do not "
-"support embedded keys. ASCII-armored keys must use an extension of <literal>."
-"asc</literal>, and unarmored keys an extension of <literal>.gpg</literal>."
+"support embedded keys. ASCII-armored keys must use an extension of "
+"<literal>.asc</literal>, and unarmored keys an extension of <literal>.gpg</"
+"literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -3635,12 +3640,12 @@ msgstr ""
 #: apt-secure.8.xml
 msgid ""
 "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg --"
-"clearsign -o InRelease Release</command> and <command>gpg -abs -o Release."
-"gpg Release</command>."
+"clearsign -o InRelease Release</command> and <command>gpg -abs -o "
+"Release.gpg Release</command>."
 msgstr ""
 "<emphasis>Firme el fichero</emphasis>. Para ello, puede ejecutar "
-"<command>gpg --clearsign -o InRelease Release</command> y <command>gpg -abs -"
-"o Release.gpg Release</command>."
+"<command>gpg --clearsign -o InRelease Release</command> y <command>gpg -abs "
+"-o Release.gpg Release</command>."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #: apt-secure.8.xml
@@ -3800,13 +3805,13 @@ msgstr ""
 #| "configured.  Configuration Item: <literal>Acquire::cdrom::mount</literal>."
 msgid ""
 "Do not try to auto-detect the CD-ROM path. Usually combined with the "
-"<option>--cdrom</option> option.  Configuration Item: <literal>Acquire::"
-"cdrom::AutoDetect</literal>."
+"<option>--cdrom</option> option.  Configuration Item: "
+"<literal>Acquire::cdrom::AutoDetect</literal>."
 msgstr ""
 "Punto de montaje. Define el lugar donde se debe montar el disco óptico. El "
 "punto de montaje debe aparecer en <filename>/etc/fstab</filename> y estar "
-"correctamente configurado. Opción de configuración: <literal>Acquire::cdrom::"
-"mount</literal>."
+"correctamente configurado. Opción de configuración: "
+"<literal>Acquire::cdrom::mount</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml
@@ -3817,8 +3822,8 @@ msgid ""
 msgstr ""
 "Punto de montaje. Define el lugar donde se debe montar el disco óptico. El "
 "punto de montaje debe aparecer en <filename>/etc/fstab</filename> y estar "
-"correctamente configurado. Opción de configuración: <literal>Acquire::cdrom::"
-"mount</literal>."
+"correctamente configurado. Opción de configuración: "
+"<literal>Acquire::cdrom::mount</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml
@@ -3836,8 +3841,8 @@ msgstr ""
 #: apt-cdrom.8.xml
 msgid ""
 "No mounting; prevent <command>apt-cdrom</command> from mounting and "
-"unmounting the mount point.  Configuration Item: <literal>APT::CDROM::"
-"NoMount</literal>."
+"unmounting the mount point.  Configuration Item: "
+"<literal>APT::CDROM::NoMount</literal>."
 msgstr ""
 "No montar. Evita que <command>apt-cdrom</command> monte y desmonte el punto "
 "de montaje. Opción de configuración: <literal>APT::CDROM::NoMount</literal>."
@@ -3875,8 +3880,8 @@ msgid ""
 "<literal>APT::CDROM::NoAct</literal>."
 msgstr ""
 "Sin cambios. No cambia el fichero &sources-list; y no escribe los ficheros "
-"de índice. Aun así, se revisará todo. Opción de configuración: <literal>APT::"
-"CDROM::NoAct</literal>."
+"de índice. Aun así, se revisará todo. Opción de configuración: "
+"<literal>APT::CDROM::NoAct</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-cdrom.8.xml
@@ -3942,8 +3947,8 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-config.8.xml
 msgid ""
-"This will set the shell environment variable $OPTS to the value of MyApp::"
-"options with a default of <option>-f</option>."
+"This will set the shell environment variable $OPTS to the value of "
+"MyApp::options with a default of <option>-f</option>."
 msgstr ""
 "Esto define la variable de entorno del intérprete de órdenes $OPTS con el "
 "valor de MyApp::Opciones, y con <option>-f</option> por omisión."
@@ -3991,12 +3996,12 @@ msgid ""
 "and &percnt;N by a tab. A &percnt; can be printed by using &percnt;&percnt;."
 msgstr ""
 "Define la salida de cada opción de configuración. &percnt;t se sustituye con "
-"el nombre individual, &percnt;f con el nombre jerárquico completo, y &percnt;"
-"v con su valor. Si utiliza letras mayúsculas, los caracteres especiales del "
-"valor se codificaran para garantizar su uso seguro en una cadena delimitada "
-"por comillas, como define RFC822. Además, &percnt;n se sustituye con una "
-"línea nueva, y &percnt;N con una tabulación. Se puede mostrar un &percnt; "
-"utilizando &percnt;&percnt;."
+"el nombre individual, &percnt;f con el nombre jerárquico completo, y "
+"&percnt;v con su valor. Si utiliza letras mayúsculas, los caracteres "
+"especiales del valor se codificaran para garantizar su uso seguro en una "
+"cadena delimitada por comillas, como define RFC822. Además, &percnt;n se "
+"sustituye con una línea nueva, y &percnt;N con una tabulación. Se puede "
+"mostrar un &percnt; utilizando &percnt;&percnt;."
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-config.8.xml apt-extracttemplates.1.xml apt-sortpkgs.1.xml
@@ -4072,9 +4077,9 @@ msgid ""
 "order which have either no or \"<literal>conf</literal>\" as filename "
 "extension and which only contain alphanumeric, hyphen (-), underscore (_) "
 "and period (.) characters.  Otherwise APT will print a notice that it has "
-"ignored a file, unless that file matches a pattern in the <literal>Dir::"
-"Ignore-Files-Silently</literal> configuration list - in which case it will "
-"be silently ignored."
+"ignored a file, unless that file matches a pattern in the "
+"<literal>Dir::Ignore-Files-Silently</literal> configuration list - in which "
+"case it will be silently ignored."
 msgstr ""
 "Todos los ficheros en <literal>Dir::Etc::Parts</literal> en orden "
 "alfanumérico ascendente cuya extensión de fichero no es «<literal>conf</"
@@ -4287,11 +4292,11 @@ msgid ""
 msgstr ""
 "Todas las herramientas de APT aceptan la opción «-o» que permite definir una "
 "directriz arbitraria de configuración que se define en la línea de órdenes. "
-"La sintaxis es un nombre de opción completo (por ejemplo, <literal>APT::Get::"
-"Assume-Yes</literal>) seguido por signos de igualdad y el nuevo valor de la "
-"opción. Para añadir un nuevo elemento a lista, añada <literal>::</literal> "
-"al final del nombre de la lista. (Como puede imaginar, no puede usar la "
-"sintaxis de ámbitos en la línea de órdenes)."
+"La sintaxis es un nombre de opción completo (por ejemplo, "
+"<literal>APT::Get::Assume-Yes</literal>) seguido por signos de igualdad y el "
+"nuevo valor de la opción. Para añadir un nuevo elemento a lista, añada "
+"<literal>::</literal> al final del nombre de la lista. (Como puede imaginar, "
+"no puede usar la sintaxis de ámbitos en la línea de órdenes)."
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml
@@ -4384,10 +4389,12 @@ msgstr ""
 msgid ""
 "The subscope <option>action</option> defines the colors for package lists in "
 "<option>install</option> and similar commands. The following options may be "
-"set: <option>APT::Color::Action::Upgrade</option>, <option>APT::Color::"
-"Action::Install</option>, <option>APT::Color::Action::Install-Dependencies</"
-"option>, <option>APT::Color::Action::Downgrade</option>, <option>APT::Color::"
-"Action::Remove</option>; corresponding to their lists in the &apt; output."
+"set: <option>APT::Color::Action::Upgrade</option>, "
+"<option>APT::Color::Action::Install</option>, "
+"<option>APT::Color::Action::Install-Dependencies</option>, "
+"<option>APT::Color::Action::Downgrade</option>, "
+"<option>APT::Color::Action::Remove</option>; corresponding to their lists in "
+"the &apt; output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -4680,8 +4687,8 @@ msgstr ""
 #: apt.conf.5.xml
 msgid ""
 "Define the regular expression(s) for versioned kernel packages.  Based on "
-"these expressions a rule set is injected into apt similar to APT::"
-"NeverAutoRemove regular expressions."
+"these expressions a rule set is injected into apt similar to "
+"APT::NeverAutoRemove regular expressions."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -4981,8 +4988,9 @@ msgid ""
 "For GPGV URIs the only configurable option is <literal>gpgv::Options</"
 "literal>, which passes additional parameters to gpgv."
 msgstr ""
-"Para direcciones GPGV URI, la única opción configurable es <literal>gpgv::"
-"Options</literal>, que introduce parámetros adicionales a gpgv."
+"Para direcciones GPGV URI, la única opción configurable es "
+"<literal>gpgv::Options</literal>, que introduce parámetros adicionales a "
+"gpgv."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
 #: apt.conf.5.xml
@@ -5182,9 +5190,9 @@ msgid ""
 "that these codes are not included twice in the list. If "
 "<literal>LC_MESSAGES</literal> is set to \"C\" only the "
 "<filename>Translation-en</filename> file (if available) will be used.  To "
-"force APT to use no Translation file use the setting <literal>Acquire::"
-"Languages=none</literal>. \"<literal>none</literal>\" is another special "
-"meaning code which will stop the search for a suitable "
+"force APT to use no Translation file use the setting "
+"<literal>Acquire::Languages=none</literal>. \"<literal>none</literal>\" is "
+"another special meaning code which will stop the search for a suitable "
 "<filename>Translation</filename> file.  This tells APT to download these "
 "translations too, without actually using them unless the environment "
 "specifies the languages. So the following example configuration will result "
@@ -5295,21 +5303,22 @@ msgid ""
 "<replaceable>ORIGIN</replaceable></literal> option exists and if so this "
 "value is taken. The value in the Release file can be overridden with "
 "<literal>Acquire::Changelogs::URI::Override::Label::<replaceable>LABEL</"
-"replaceable></literal> or <literal>Acquire::Changelogs::URI::Override::"
-"Origin::<replaceable>ORIGIN</replaceable></literal>.  The value should be a "
-"normal URI to a text file, except that package specific data is replaced "
-"with the placeholder <literal>@CHANGEPATH@</literal>. The value for it is: "
-"1. if the package is from a component (e.g. <literal>main</literal>)  this "
-"is the first part otherwise it is omitted, 2. the first letter of source "
-"package name, except if the source package name starts with '<literal>lib</"
-"literal>' in which case it will be the first four letters. 3. The complete "
-"source package name. 4. the complete name again and 5. the source version.  "
-"The first (if present), second, third and fourth part are separated by a "
-"slash ('<literal>/</literal>')  and between the fourth and fifth part is an "
-"underscore ('<literal>_</literal>').  The special value '<literal>no</"
-"literal>' is available for this option indicating that this source can't be "
-"used to acquire changelog files from. Another source will be tried if "
-"available in this case."
+"replaceable></literal> or "
+"<literal>Acquire::Changelogs::URI::Override::Origin::<replaceable>ORIGIN</"
+"replaceable></literal>.  The value should be a normal URI to a text file, "
+"except that package specific data is replaced with the placeholder "
+"<literal>@CHANGEPATH@</literal>. The value for it is: 1. if the package is "
+"from a component (e.g. <literal>main</literal>)  this is the first part "
+"otherwise it is omitted, 2. the first letter of source package name, except "
+"if the source package name starts with '<literal>lib</literal>' in which "
+"case it will be the first four letters. 3. The complete source package name. "
+"4. the complete name again and 5. the source version.  The first (if "
+"present), second, third and fourth part are separated by a slash ('<literal>/"
+"</literal>')  and between the fourth and fifth part is an underscore "
+"('<literal>_</literal>').  The special value '<literal>no</literal>' is "
+"available for this option indicating that this source can't be used to "
+"acquire changelog files from. Another source will be tried if available in "
+"this case."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -5319,17 +5328,19 @@ msgid ""
 "where to get them.  Preferable the Release file indicates this in a "
 "'Snapshots' field. If this isn't available the Label/Origin field of the "
 "Release file is used to check if a <literal>Acquire::Snapshots::URI::Label::"
-"<replaceable>LABEL</replaceable></literal> or <literal>Acquire::Snapshots::"
-"URI::Origin::<replaceable>ORIGIN</replaceable></literal> option exists and "
-"if so this value is taken. The value in the Release file can be overridden "
-"with <literal>Acquire::Snapshots::URI::Override::Label::<replaceable>LABEL</"
-"replaceable></literal> or <literal>Acquire::Snapshots::URI::Override::"
-"Origin::<replaceable>ORIGIN</replaceable></literal>.  The value should be a "
-"normal URI to a directory, except that the snapshot ID replaced with the "
-"placeholder <literal>@SNAPSHOTID@</literal>.  The special value "
-"'<literal>no</literal>' is available for this option indicating that this "
-"source cannot be used to acquire snapshots from. Another source will be "
-"tried if available in this case."
+"<replaceable>LABEL</replaceable></literal> or "
+"<literal>Acquire::Snapshots::URI::Origin::<replaceable>ORIGIN</replaceable></"
+"literal> option exists and if so this value is taken. The value in the "
+"Release file can be overridden with "
+"<literal>Acquire::Snapshots::URI::Override::Label::<replaceable>LABEL</"
+"replaceable></literal> or "
+"<literal>Acquire::Snapshots::URI::Override::Origin::<replaceable>ORIGIN</"
+"replaceable></literal>.  The value should be a normal URI to a directory, "
+"except that the snapshot ID replaced with the placeholder "
+"<literal>@SNAPSHOTID@</literal>.  The special value '<literal>no</literal>' "
+"is available for this option indicating that this source cannot be used to "
+"acquire snapshots from. Another source will be tried if available in this "
+"case."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
@@ -5344,9 +5355,9 @@ msgstr "Configuración de usuario"
 msgid ""
 "Especially with the introduction of the <command>apt</command> binary it can "
 "be useful to set certain options only for a specific binary as even options "
-"which look like they would effect only a certain binary like <option>APT::"
-"Get::Show-Versions</option> effect <command>apt-get</command> as well as "
-"<command>apt</command>."
+"which look like they would effect only a certain binary like "
+"<option>APT::Get::Show-Versions</option> effect <command>apt-get</command> "
+"as well as <command>apt</command>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -5420,12 +5431,13 @@ msgstr ""
 "<literal>Dir::Cache</literal> contiene las ubicaciones que afectan a la "
 "información de la caché local, como los dos cachés de paquetes "
 "<literal>srcpkgcache</literal> y <literal>pkgcache</literal>, así como a la "
-"ubicación dónde se guardan los ficheros descargados, <literal>Dir::Cache::"
-"archives</literal>. La generación de cachés se puede desactivar dejando sus "
-"nombres como una cadena vacía. Ésto hará que el arranque sea más lento, pero "
-"ahorrará espacio. Habitualmente, es preferible deshabilitar pkgcache en "
-"lugar de srcpkgcache. Al igual que con <literal>Dir::State</literal> el "
-"directorio predeterminado está en <literal>Dir::Cache</literal>"
+"ubicación dónde se guardan los ficheros descargados, "
+"<literal>Dir::Cache::archives</literal>. La generación de cachés se puede "
+"desactivar dejando sus nombres como una cadena vacía. Ésto hará que el "
+"arranque sea más lento, pero ahorrará espacio. Habitualmente, es preferible "
+"deshabilitar pkgcache en lugar de srcpkgcache. Al igual que con "
+"<literal>Dir::State</literal> el directorio predeterminado está en "
+"<literal>Dir::Cache</literal>"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml
@@ -5457,19 +5469,20 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml
 msgid ""
-"Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
-"Bin::Methods</literal> specifies the location of the method handlers and "
-"<literal>gzip</literal>, <literal>bzip2</literal>, <literal>lzma</literal>, "
-"<literal>dpkg</literal>, <literal>apt-get</literal> <literal>dpkg-source</"
-"literal> <literal>dpkg-buildpackage</literal> and <literal>apt-cache</"
-"literal> specify the location of the respective programs."
+"Binary programs are pointed to by <literal>Dir::Bin</literal>. "
+"<literal>Dir::Bin::Methods</literal> specifies the location of the method "
+"handlers and <literal>gzip</literal>, <literal>bzip2</literal>, "
+"<literal>lzma</literal>, <literal>dpkg</literal>, <literal>apt-get</literal> "
+"<literal>dpkg-source</literal> <literal>dpkg-buildpackage</literal> and "
+"<literal>apt-cache</literal> specify the location of the respective programs."
 msgstr ""
-"<literal>Dir::Bin</literal> apunta a los programas binarios. <literal>Dir::"
-"Bin::Methods</literal> define la ubicación de los gestores de los métodos y "
-"<literal>gzip</literal>, <literal>bzip2</literal>, <literal>lzma</literal>, "
-"<literal>dpkg</literal>, <literal>apt-get</literal>, <literal>dpkg-source</"
-"literal>, <literal>dpkg-buildpackage</literal> y <literal>apt-cache</"
-"literal> especifican la ubicación de sus respectivos programas."
+"<literal>Dir::Bin</literal> apunta a los programas binarios. "
+"<literal>Dir::Bin::Methods</literal> define la ubicación de los gestores de "
+"los métodos y <literal>gzip</literal>, <literal>bzip2</literal>, "
+"<literal>lzma</literal>, <literal>dpkg</literal>, <literal>apt-get</"
+"literal>, <literal>dpkg-source</literal>, <literal>dpkg-buildpackage</"
+"literal> y <literal>apt-cache</literal> especifican la ubicación de sus "
+"respectivos programas."
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml
@@ -5479,10 +5492,10 @@ msgstr ""
 #| "If set, all paths in <literal>Dir::</literal> will be relative to "
 #| "<literal>RootDir</literal>, <emphasis>even paths that are specified "
 #| "absolutely</emphasis>.  So, for instance, if <literal>RootDir</literal> "
-#| "is set to <filename>/tmp/staging</filename> and <literal>Dir::State::"
-#| "status</literal> is set to <filename>/var/lib/dpkg/status</filename>, "
-#| "then the status file will be looked up in <filename>/tmp/staging/var/lib/"
-#| "dpkg/status</filename>."
+#| "is set to <filename>/tmp/staging</filename> and "
+#| "<literal>Dir::State::status</literal> is set to <filename>/var/lib/dpkg/"
+#| "status</filename>, then the status file will be looked up in <filename>/"
+#| "tmp/staging/var/lib/dpkg/status</filename>."
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths will be relative to <literal>RootDir</literal>, "
@@ -5672,9 +5685,9 @@ msgid ""
 "literal>.  Special characters (equal signs, newlines, nonprintable "
 "characters, quotation marks, and percent signs in <literal>key</literal> and "
 "newlines, nonprintable characters, and percent signs in <literal>value</"
-"literal>) are %-encoded. Lists are represented by multiple <literal>key::"
-"=value</literal> lines with the same key. The configuration section ends "
-"with a blank line."
+"literal>) are %-encoded. Lists are represented by multiple "
+"<literal>key::=value</literal> lines with the same key. The configuration "
+"section ends with a blank line."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -5780,11 +5793,11 @@ msgid ""
 "<literal>/usr/lib/apt/apt.systemd.daily</literal> script. See the top of "
 "this script for the brief documentation of these options."
 msgstr ""
-"Los grupos de opciones <literal>APT::Periodic</literal> y <literal>APT::"
-"Archives</literal> configuran el comportamiento de las actualizaciones "
-"periódicas de apt, que se hacen mediante el script <literal>/etc/cron.daily/"
-"apt</literal>. Consulte la cabecera de este script para una breve "
-"documentación de estas opciones."
+"Los grupos de opciones <literal>APT::Periodic</literal> y "
+"<literal>APT::Archives</literal> configuran el comportamiento de las "
+"actualizaciones periódicas de apt, que se hacen mediante el script <literal>/"
+"etc/cron.daily/apt</literal>. Consulte la cabecera de este script para una "
+"breve documentación de estas opciones."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.conf.5.xml
@@ -5986,8 +5999,8 @@ msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
 "install pass performed in, e.g., <literal>apt-get install</literal>, and not "
-"to the full <literal>apt</literal> dependency resolver; see <literal>Debug::"
-"pkgProblemResolver</literal> for that."
+"to the full <literal>apt</literal> dependency resolver; see "
+"<literal>Debug::pkgProblemResolver</literal> for that."
 msgstr ""
 "Genera los mensajes de depuración que describen qué paquetes se están "
 "instalando automáticamente para resolver las dependencias. Esto corresponde "
@@ -6004,14 +6017,14 @@ msgid ""
 "may trigger additional actions; they are shown indented two additional "
 "spaces under the original entry.  The format for each line is "
 "<literal>MarkKeep</literal>, <literal>MarkDelete</literal> or "
-"<literal>MarkInstall</literal> followed by <literal>package-name &lt;a.b.c -"
-"&gt; d.e.f | x.y.z&gt; (section)</literal> where <literal>a.b.c</literal> is "
-"the current version of the package, <literal>d.e.f</literal> is the version "
-"considered for installation and <literal>x.y.z</literal> is a newer version, "
-"but not considered for installation (because of a low pin score). The later "
-"two can be omitted if there is none or if it is the same as the installed "
-"version.  <literal>section</literal> is the name of the section the package "
-"appears in."
+"<literal>MarkInstall</literal> followed by <literal>package-name &lt;a.b.c "
+"-&gt; d.e.f | x.y.z&gt; (section)</literal> where <literal>a.b.c</literal> "
+"is the current version of the package, <literal>d.e.f</literal> is the "
+"version considered for installation and <literal>x.y.z</literal> is a newer "
+"version, but not considered for installation (because of a low pin score). "
+"The later two can be omitted if there is none or if it is the same as the "
+"installed version.  <literal>section</literal> is the name of the section "
+"the package appears in."
 msgstr ""
 "Genera los mensajes de depuración que describen qué paquete se marcará como "
 "mantener/instalar/borrar mientras el solucionador de problemas "
@@ -6020,12 +6033,12 @@ msgstr ""
 "entrada original. El formato de cada línea es <literal>MarkKeep</literal>, "
 "<literal>MarkDelete</literal> o <literal>MarkInstall</literal> seguido de "
 "<literal>package-name &lt;a.b.c -&gt; d.e.f | x.y.z&gt; (sección)</literal> "
-"siendo <literal>a.b.c</literal> la versión actual del paquete, <literal>d.e."
-"f</literal> la versión considerada para instalar y <literal>x.y.z</literal> "
-"una versión nueva, pero no considerada para la instalación (por una "
-"puntuación baja). Las dos últimas se pueden omitir si no hay o si es la "
-"misma versión que la instalada. <literal>sección</literal> es el nombre de "
-"la sección en la que aparece el paquete."
+"siendo <literal>a.b.c</literal> la versión actual del paquete, "
+"<literal>d.e.f</literal> la versión considerada para instalar y "
+"<literal>x.y.z</literal> una versión nueva, pero no considerada para la "
+"instalación (por una puntuación baja). Las dos últimas se pueden omitir si "
+"no hay o si es la misma versión que la instalada. <literal>sección</literal> "
+"es el nombre de la sección en la que aparece el paquete."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
@@ -6090,8 +6103,8 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
 msgid ""
-"Print information about the vendors read from <filename>/etc/apt/vendors."
-"list</filename>."
+"Print information about the vendors read from <filename>/etc/apt/"
+"vendors.list</filename>."
 msgstr ""
 "Muestra la información de los proveedores extraída de <filename>/etc/apt/"
 "vendors.list</filename>."
@@ -6099,8 +6112,8 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
 msgid ""
-"Display the external commands that are called by apt hooks.  This includes e."
-"g. the config options <literal>DPkg::{Pre,Post}-Invoke</literal> or "
+"Display the external commands that are called by apt hooks.  This includes "
+"e.g. the config options <literal>DPkg::{Pre,Post}-Invoke</literal> or "
 "<literal>APT::Update::{Pre,Post}-Invoke</literal>."
 msgstr ""
 
@@ -6629,8 +6642,8 @@ msgstr ""
 "Una nota de aviso: la palabra clave usada aquí es «<literal>origin</"
 "literal>», el cual se puede usar para coincidir con un nombre de sistema. El "
 "siguiente registro asignará una prioridad alta a todas las versiones "
-"disponibles desde el servidor identificado con el nombre de sistema «ftp.de."
-"debian.org»."
+"disponibles desde el servidor identificado con el nombre de sistema "
+"«ftp.de.debian.org»."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 #: apt_preferences.5.xml
@@ -6896,9 +6909,9 @@ msgstr ""
 #: apt_preferences.5.xml
 msgid ""
 "The <literal>:any</literal> suffix makes sure to select binary packages from "
-"any architecture. Without that suffix, apt implicitly assumes the <literal>:"
-"native</literal> suffix which would only select packages from the native "
-"architecture."
+"any architecture. Without that suffix, apt implicitly assumes the "
+"<literal>:native</literal> suffix which would only select packages from the "
+"native architecture."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
@@ -7075,9 +7088,9 @@ msgstr "Por ello:"
 msgid ""
 "The most recent available version of the <literal>perl</literal> package "
 "will be installed, so long as that version's version number begins with "
-"\"<literal>&good-perl;</literal>\".  If <emphasis>any</emphasis> &good-perl;"
-"* version of <literal>perl</literal> is available and the installed version "
-"is &bad-perl;*, then <literal>perl</literal> will be downgraded."
+"\"<literal>&good-perl;</literal>\".  If <emphasis>any</emphasis> &good-"
+"perl;* version of <literal>perl</literal> is available and the installed "
+"version is &bad-perl;*, then <literal>perl</literal> will be downgraded."
 msgstr ""
 "La versión más reciente disponible del paquete <literal>perl</literal> se "
 "instalará siempre que el número de versión empiece con «<literal>&good-perl;"
@@ -7359,12 +7372,12 @@ msgid ""
 "files retrieved from locations listed in the &sources-list; file are stored "
 "in the directory <filename>/var/lib/apt/lists</filename>, or in the file "
 "named by the variable <literal>Dir::State::Lists</literal> in the "
-"<filename>apt.conf</filename> file.  For example, the file <filename>debian."
-"lcs.mit.edu_debian_dists_unstable_contrib_binary-i386_Release</filename> "
-"contains the <filename>Release</filename> file retrieved from the site "
-"<literal>debian.lcs.mit.edu</literal> for <literal>binary-i386</literal> "
-"architecture files from the <literal>contrib</literal> component of the "
-"<literal>unstable</literal> distribution."
+"<filename>apt.conf</filename> file.  For example, the file "
+"<filename>debian.lcs.mit.edu_debian_dists_unstable_contrib_binary-"
+"i386_Release</filename> contains the <filename>Release</filename> file "
+"retrieved from the site <literal>debian.lcs.mit.edu</literal> for "
+"<literal>binary-i386</literal> architecture files from the <literal>contrib</"
+"literal> component of the <literal>unstable</literal> distribution."
 msgstr ""
 "Todos los ficheros <filename>Packages</filename> y <filename>Release</"
 "filename> obtenidos de los recursos en «&sources-list;» se guardan en el "
@@ -7798,6 +7811,12 @@ msgid ""
 "multi-architecture support."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml
+msgid ""
+"This format is deprecated and may eventually be removed, but not before 2029."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><title>
 #: sources.list.5.xml
 msgid "deb822-Style Format"
@@ -7961,13 +7980,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</"
@@ -7977,14 +7996,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
@@ -8053,9 +8072,10 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
 msgid ""
-"As an example, the sources for your distribution could look like this in one-"
-"line-style format: <placeholder type=\"literallayout\" id=\"0\"/> or like "
-"this in deb822 style format: <placeholder type=\"literallayout\" id=\"1\"/>"
+"As an example, the sources for your distribution could look like this in the "
+"deprecated one-line-style format: <placeholder type=\"literallayout\" "
+"id=\"0\"/> or like this in deb822 style format: <placeholder "
+"type=\"literallayout\" id=\"1\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
@@ -8127,11 +8147,12 @@ msgstr ""
 msgid ""
 "<option>Targets</option> (<option>target</option>) is a multivalue option "
 "defining which download targets apt will try to acquire from this source. If "
-"not specified, the default set is defined by the <option>Acquire::"
-"IndexTargets</option> configuration scope (targets are specified by their "
-"name in the <literal>Created-By</literal> field).  Additionally, targets can "
-"be enabled or disabled by using the <literal>Identifier</literal> field as "
-"an option with a boolean value instead of using this multivalue option."
+"not specified, the default set is defined by the "
+"<option>Acquire::IndexTargets</option> configuration scope (targets are "
+"specified by their name in the <literal>Created-By</literal> field).  "
+"Additionally, targets can be enabled or disabled by using the "
+"<literal>Identifier</literal> field as an option with a boolean value "
+"instead of using this multivalue option."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
@@ -8260,8 +8281,9 @@ msgid ""
 "helps users identify mirrors which are no longer updated. However, some "
 "repositories such as historic archives are not updated any more by design, "
 "so this check can be disabled by setting this option to <literal>no</"
-"literal>.  Defaults to the value of configuration option <option>Acquire::"
-"Check-Valid-Until</option> which itself defaults to <literal>yes</literal>."
+"literal>.  Defaults to the value of configuration option "
+"<option>Acquire::Check-Valid-Until</option> which itself defaults to "
+"<literal>yes</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
@@ -8445,8 +8467,8 @@ msgid ""
 "source list."
 msgstr ""
 "El esquema «cdrom» permite a APT utilizar la unidad de CD-ROM local. Utilice "
-"el programa &apt-cdrom; para añadir entradas de un disco óptico a «sources."
-"list»."
+"el programa &apt-cdrom; para añadir entradas de un disco óptico a "
+"«sources.list»."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
@@ -8842,15 +8864,16 @@ msgstr ""
 "El fichero de plantilla y el script de configuración se escriben en el "
 "directorio temporal definido mediante la opción <option>-t</option> o "
 "<option>--tempdir</option> (<literal>APT::ExtractTemplates::TempDir</"
-"literal>), con un formato de nombre de fichero <filename>paquete.template."
-"XXXXXX</filename> y <filename>paquete.config.XXXXXX</filename>"
+"literal>), con un formato de nombre de fichero "
+"<filename>paquete.template.XXXXXX</filename> y "
+"<filename>paquete.config.XXXXXX</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-extracttemplates.1.xml
 msgid ""
 "Temporary directory in which to write extracted <command>debconf</command> "
-"template files and config scripts.  Configuration Item: <literal>APT::"
-"ExtractTemplates::TempDir</literal>"
+"template files and config scripts.  Configuration Item: "
+"<literal>APT::ExtractTemplates::TempDir</literal>"
 msgstr ""
 "El directorio temporal en el que se escribirán los ficheros de plantillas "
 "<command>debconf</command> y los scripts de configuración extraídos. Opción "
@@ -8894,8 +8917,8 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-sortpkgs.1.xml
 msgid ""
-"Use source index field ordering.  Configuration Item: <literal>APT::"
-"SortPkgs::Source</literal>."
+"Use source index field ordering.  Configuration Item: "
+"<literal>APT::SortPkgs::Source</literal>."
 msgstr ""
 "Utililza el orden por el campo de índice de fuentes. Opción de "
 "configuración: <literal>APT::SortPkgs::Source</literal>."
@@ -9044,10 +9067,10 @@ msgid ""
 "<filename>icons</filename> files as well as <filename>Release</filename>, "
 "<filename>Index</filename> and <filename>md5sum.txt</filename> files by "
 "default (<literal>APT::FTPArchive::Release::Default-Patterns</literal>).  "
-"Additional filename patterns can be added by listing them in <literal>APT::"
-"FTPArchive::Release::Patterns</literal>.  It then writes to stdout a "
-"<filename>Release</filename> file containing (by default) an MD5, SHA1, "
-"SHA256 and SHA512 digest for each file."
+"Additional filename patterns can be added by listing them in "
+"<literal>APT::FTPArchive::Release::Patterns</literal>.  It then writes to "
+"stdout a <filename>Release</filename> file containing (by default) an MD5, "
+"SHA1, SHA256 and SHA512 digest for each file."
 msgstr ""
 "La orden <literal>release</literal> genera un fichero «Release» a partir de "
 "un árbol de directorios. Analiza el directorio dado de forma recursiva en "
@@ -9076,15 +9099,16 @@ msgid ""
 "<literal>Description</literal>."
 msgstr ""
 "Los valores para los campos de metadatos adicionales en el fichero «Release» "
-"se toman de las variables correspondientes en <literal>APT::FTPArchive::"
-"Release</literal>, por ejemplo <literal>APT::FTPArchive::Release::Origin</"
-"literal>. Los campos permitidos son: <literal>Origin</literal>, "
-"<literal>Label</literal>, <literal>Suite</literal>, <literal>Version</"
-"literal>, <literal>Codename</literal>, <literal>Date</literal>, "
-"<literal>NotAutomatic</literal>, <literal>ButAutomaticUpgrades</literal>, "
-"<literal>Acquire-By-Hash</literal>, <literal>Valid-Until</literal>, "
-"<literal>Signed-By</literal>, <literal>Architectures</literal>, "
-"<literal>Components</literal> y <literal>Description</literal>."
+"se toman de las variables correspondientes en "
+"<literal>APT::FTPArchive::Release</literal>, por ejemplo "
+"<literal>APT::FTPArchive::Release::Origin</literal>. Los campos permitidos "
+"son: <literal>Origin</literal>, <literal>Label</literal>, <literal>Suite</"
+"literal>, <literal>Version</literal>, <literal>Codename</literal>, "
+"<literal>Date</literal>, <literal>NotAutomatic</literal>, "
+"<literal>ButAutomaticUpgrades</literal>, <literal>Acquire-By-Hash</literal>, "
+"<literal>Valid-Until</literal>, <literal>Signed-By</literal>, "
+"<literal>Architectures</literal>, <literal>Components</literal> y "
+"<literal>Description</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml
@@ -9313,12 +9337,12 @@ msgstr "Sección <literal>TreeDefault</literal>"
 #: apt-ftparchive.1.xml
 msgid ""
 "Sets defaults specific to <literal>Tree</literal> sections. All of these "
-"variables are substitution variables and have the strings $(DIST), "
-"$(SECTION) and $(ARCH) replaced with their respective values."
+"variables are substitution variables and have the strings $(DIST), $"
+"(SECTION) and $(ARCH) replaced with their respective values."
 msgstr ""
 "Define los valores predeterminados de las secciones <literal>Tree</literal>. "
-"Todas estas variables son variables de sustitución y reemplazan las cadenas "
-"$(DIST), $(SECTION) y $(ARCH) con sus valores respectivos."
+"Todas estas variables son variables de sustitución y reemplazan las cadenas $"
+"(DIST), $(SECTION) y $(ARCH) con sus valores respectivos."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml
@@ -9353,17 +9377,17 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml
 msgid ""
-"Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
-"$(SECTION)/binary-$(ARCH)/</filename>"
+"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>"
@@ -9383,15 +9407,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 "
@@ -9805,8 +9829,8 @@ msgstr ""
 "listado de los ficheros se extraerá también y se almacenará en la base de "
 "datos para su uso posterior. Cuando se usa la orden «generate» esta opción "
 "también permite la creación de cualquier fichero «Contents». Esta activa de "
-"forma predeterminada. Opción de configuración: <literal>APT::FTPArchive::"
-"Contents</literal>."
+"forma predeterminada. Opción de configuración: "
+"<literal>APT::FTPArchive::Contents</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml
@@ -9816,14 +9840,14 @@ msgid ""
 "literal>."
 msgstr ""
 "Selecciona el fichero de fuentes alternativo a usar con la orden "
-"<literal>sources</literal>. Opción de configuración: <literal>APT::"
-"FTPArchive::SourceOverride</literal>."
+"<literal>sources</literal>. Opción de configuración: "
+"<literal>APT::FTPArchive::SourceOverride</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml
 msgid ""
-"Make the caching databases read only.  Configuration Item: <literal>APT::"
-"FTPArchive::ReadOnlyDB</literal>."
+"Make the caching databases read only.  Configuration Item: "
+"<literal>APT::FTPArchive::ReadOnlyDB</literal>."
 msgstr ""
 "Define los permisos de las bases de datos de la caché como sólo lectura. "
 "Opción de configuración: <literal>APT::FTPArchive::ReadOnlyDB</literal>."
@@ -9837,10 +9861,10 @@ msgid ""
 "path.  Configuration Item: <literal>APT::FTPArchive::Architecture</literal>."
 msgstr ""
 "Hace que las órdenes <literal>packages</literal> y <literal>contents</"
-"literal> sólo acepten aquellos paquetes que coinciden con <literal>*_arch."
-"deb</literal> o <literal>*_all.deb</literal>, en lugar de todos los ficheros "
-"de paquete en la ruta dada. Elemento de configuración: <literal>APT::"
-"FTPArchive::Architecture</literal>."
+"literal> sólo acepten aquellos paquetes que coinciden con "
+"<literal>*_arch.deb</literal> o <literal>*_all.deb</literal>, en lugar de "
+"todos los ficheros de paquete en la ruta dada. Elemento de configuración: "
+"<literal>APT::FTPArchive::Architecture</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml
@@ -10203,16 +10227,17 @@ msgid ""
 "The environment variable <envar>http_proxy</envar> is supported for system "
 "wide configuration.  Proxies specific to APT can be configured via the "
 "option <literal>Acquire::http::Proxy</literal>.  Proxies which should be "
-"used only for certain hosts can be specified via <literal>Acquire::http::"
-"Proxy::<replaceable>host</replaceable></literal>. Even more fine-grained "
-"control can be achieved via proxy autodetection, detailed further below.  "
-"All these options use the URI format <literal><replaceable>scheme</"
-"replaceable>://[[<replaceable>user</replaceable>][:<replaceable>pass</"
-"replaceable>]@]<replaceable>host</replaceable>[:<replaceable>port</"
-"replaceable>]/</literal>.  Supported URI schemes are <literal>socks5h</"
-"literal> (SOCKS5 with remote DNS resolution), <literal>http</literal> and "
-"<literal>https</literal>.  Authentication details can be supplied via &apt-"
-"authconf; instead of including it in the URI directly."
+"used only for certain hosts can be specified via "
+"<literal>Acquire::http::Proxy::<replaceable>host</replaceable></literal>. "
+"Even more fine-grained control can be achieved via proxy autodetection, "
+"detailed further below.  All these options use the URI format "
+"<literal><replaceable>scheme</replaceable>://[[<replaceable>user</"
+"replaceable>][:<replaceable>pass</replaceable>]@]<replaceable>host</"
+"replaceable>[:<replaceable>port</replaceable>]/</literal>.  Supported URI "
+"schemes are <literal>socks5h</literal> (SOCKS5 with remote DNS resolution), "
+"<literal>http</literal> and <literal>https</literal>.  Authentication "
+"details can be supplied via &apt-authconf; instead of including it in the "
+"URI directly."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
@@ -10236,14 +10261,14 @@ msgstr ""
 #| "store the requested archive files in its cache, which can be used to "
 #| "prevent the proxy from polluting its cache with (big) .deb files."
 msgid ""
-"Furthermore, there are three settings provided for cache control with "
-"HTTP/1.1 compliant proxy caches: <literal>Acquire::http::No-Cache</literal> "
-"tells the proxy not to use its cached response under any circumstances.  "
+"Furthermore, there are three settings provided for cache control with HTTP/"
+"1.1 compliant proxy caches: <literal>Acquire::http::No-Cache</literal> tells "
+"the proxy not to use its cached response under any circumstances.  "
 "<literal>Acquire::http::Max-Age</literal> sets the allowed maximum age (in "
-"seconds) of an index file in the cache of the proxy.  <literal>Acquire::"
-"http::No-Store</literal> specifies that the proxy should not store the "
-"requested archive files in its cache, which can be used to prevent the proxy "
-"from polluting its cache with (big) .deb files."
+"seconds) of an index file in the cache of the proxy.  "
+"<literal>Acquire::http::No-Store</literal> specifies that the proxy should "
+"not store the requested archive files in its cache, which can be used to "
+"prevent the proxy from polluting its cache with (big) .deb files."
 msgstr ""
 "Se proporcionan tres opciones de configuración para el control de la caché "
 "con proxy cachés conformes an HTTP/1.1. <literal>No-Cache</literal> indica "
@@ -10290,8 +10315,8 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt-transport-http.1.xml
 msgid ""
-"This option takes precedence over the legacy option name <literal>Acquire::"
-"http::ProxyAutoDetect</literal>."
+"This option takes precedence over the legacy option name "
+"<literal>Acquire::http::ProxyAutoDetect</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
@@ -10351,12 +10376,12 @@ msgstr ""
 #| "choose to not conform to the HTTP/1.1 specification."
 msgid ""
 "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
-"enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
-"g. on high-latency connections. It specifies how many requests are sent in a "
-"pipeline.  APT tries to detect and work around misbehaving webservers and "
-"proxies at runtime, but if you know that yours does not conform to the "
-"HTTP/1.1 specification, pipelining can be disabled by setting the value to "
-"0. It is enabled by default with the value 10."
+"enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial "
+"e.g. on high-latency connections. It specifies how many requests are sent in "
+"a pipeline.  APT tries to detect and work around misbehaving webservers and "
+"proxies at runtime, but if you know that yours does not conform to the HTTP/"
+"1.1 specification, pipelining can be disabled by setting the value to 0. It "
+"is enabled by default with the value 10."
 msgstr ""
 "La opción <literal>Acquire::http::Pipeline-Depth</literal> se puede utilizar "
 "para activar HTTP pipelining (RFC 2616 sección 8.1.2.2), que puede "
@@ -10455,9 +10480,9 @@ msgstr ""
 msgid ""
 "The HTTPS protocol is based on the HTTP protocol, so all options supported "
 "by &apt-transport-http; are also available via <literal>Acquire::https</"
-"literal> and will default to the same values specified for <literal>Acquire::"
-"http</literal>. This manpage will only document the options <emphasis>unique "
-"to https</emphasis>."
+"literal> and will default to the same values specified for "
+"<literal>Acquire::http</literal>. This manpage will only document the "
+"options <emphasis>unique to https</emphasis>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
@@ -10486,9 +10511,10 @@ msgstr ""
 #: apt-transport-https.1.xml
 msgid ""
 "A custom certificate revocation list (CRL) can be configured with the "
-"options <literal>Acquire::https::CRLFile</literal> and <literal>Acquire::"
-"https::CRLFile::<replaceable>host</replaceable></literal>.  As with the "
-"previous option, a file in PEM format needs to be specified."
+"options <literal>Acquire::https::CRLFile</literal> and "
+"<literal>Acquire::https::CRLFile::<replaceable>host</replaceable></"
+"literal>.  As with the previous option, a file in PEM format needs to be "
+"specified."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
@@ -10534,11 +10560,11 @@ msgstr ""
 msgid ""
 "Besides supporting password-based authentication (see &apt-authconf;) HTTPS "
 "also supports authentication based on client certificates via "
-"<literal>Acquire::https::SSLCert</literal> and <literal>Acquire::https::"
-"SSLKey</literal>. These should be set respectively to the filename of the "
-"X.509 client certificate and the associated (unencrypted) private key, both "
-"in PEM format.  In practice the use of the host-specific variants of both "
-"options is highly recommended."
+"<literal>Acquire::https::SSLCert</literal> and "
+"<literal>Acquire::https::SSLKey</literal>. These should be set respectively "
+"to the filename of the X.509 client certificate and the associated "
+"(unencrypted) private key, both in PEM format.  In practice the use of the "
+"host-specific variants of both options is highly recommended."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
@@ -10740,9 +10766,9 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt-transport-mirror.1.xml
 msgid ""
-"Assuming a file with this content is stored as <filename>/etc/apt/mirrorlist."
-"txt</filename> on your machine it can be used like this in &sources-list; "
-"(since apt 1.6):"
+"Assuming a file with this content is stored as <filename>/etc/apt/"
+"mirrorlist.txt</filename> on your machine it can be used like this in "
+"&sources-list; (since apt 1.6):"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><literallayout>
@@ -11571,10 +11597,10 @@ msgstr ""
 #: apt-patterns.7.xml
 msgid ""
 "<code>foo</code> cannot be used as a shortform for <code>?name(foo)</code>, "
-"as this can cause typos to go unnoticed: Consider <code>?and(...,"
-"~poptional)</code>: this requires the package to have <code>required</code> "
-"priority, but if you do not type the <code>~</code>, it would require the "
-"package name to contain <code>poptional</code>."
+"as this can cause typos to go unnoticed: Consider <code>?"
+"and(...,~poptional)</code>: this requires the package to have "
+"<code>required</code> priority, but if you do not type the <code>~</code>, "
+"it would require the package name to contain <code>poptional</code>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
@@ -11806,8 +11832,8 @@ msgstr ""
 "<command>apt-get</command> ofrece una forma sencilla de instalar paquetes "
 "desde la línea de órdenes. A diferencia de <command>dpkg</command>, "
 "<command>apt-get</command> no intenta comprender los ficheros «.deb», sino "
-"que funciona con el nombre real del paquete y sólo puede instalar ficheros «."
-"deb» desde una <emphasis>fuente</emphasis>."
+"que funciona con el nombre real del paquete y sólo puede instalar ficheros "
+"«.deb» desde una <emphasis>fuente</emphasis>."
 
 #. type: Content of: <book><chapter><para><footnote><para>
 #: guide.dbk
@@ -13192,35 +13218,36 @@ msgstr "Esto utiliza los archivos del disco previamente obtenidos."
 
 #~ msgid ""
 #~ "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP "
-#~ "URIs.  It is in the standard form of <literal>ftp://[[user][:pass]@]host[:"
-#~ "port]/</literal>.  Per host proxies can also be specified by using the "
-#~ "form <literal>ftp::Proxy::&lt;host&gt;</literal> with the special keyword "
-#~ "<literal>DIRECT</literal> meaning to use no proxies. If no one of the "
-#~ "above settings is specified, <envar>ftp_proxy</envar> environment "
-#~ "variable will be used. To use an FTP proxy you will have to set the "
-#~ "<literal>ftp::ProxyLogin</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>."
+#~ "URIs.  It is in the standard form of <literal>ftp://[[user]"
+#~ "[:pass]@]host[:port]/</literal>.  Per host proxies can also be specified "
+#~ "by using the form <literal>ftp::Proxy::&lt;host&gt;</literal> with the "
+#~ "special keyword <literal>DIRECT</literal> meaning to use no proxies. If "
+#~ "no one of the above settings is specified, <envar>ftp_proxy</envar> "
+#~ "environment variable will be used. To use an FTP proxy you will have to "
+#~ "set the <literal>ftp::ProxyLogin</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>."
 #~ msgstr ""
 #~ "<literal>ftp::Proxy</literal> define el proxy predeterminado que utilizar "
 #~ "para los URI de FTP. Utiliza el formato estándar <literal>ftp://[[usuario]"
 #~ "[:contraseña]@]máquina[:puerto]/</literal>. También se puede especificar "
-#~ "un proxy por cada máquina usando la forma <literal>ftp::Proxy::&lt;"
-#~ "máquina&gt;</literal> con la palabra especial <literal>DIRECT</literal>, "
-#~ "que significa que no se use ningún proxy. La variable de entorno "
-#~ "<envar>ftp_proxy</envar> se usará en caso de no definir ninguna de las "
-#~ "opciones anteriores. Para usar un proxy FTP debe configurar el script "
-#~ "<literal>ftp::ProxyLogin</literal> en el fichero de configuración. Esta "
-#~ "entrada define las órdenes a enviar para decirle al servidor del proxy a "
-#~ "qué conectarse. Consulte &configureindex; para un ejemplo de uso. Las "
-#~ "variables de sustitución que representan el componente URI son "
-#~ "<literal>$(PROXY_USER)</literal> <literal>$(PROXY_PASS)</literal> "
-#~ "<literal>$(SITE_USER)</literal> <literal>$(SITE_PASS)</literal> "
-#~ "<literal>$(SITE)</literal> y <literal>$(SITE_PORT)</literal>."
+#~ "un proxy por cada máquina usando la forma "
+#~ "<literal>ftp::Proxy::&lt;máquina&gt;</literal> con la palabra especial "
+#~ "<literal>DIRECT</literal>, que significa que no se use ningún proxy. La "
+#~ "variable de entorno <envar>ftp_proxy</envar> se usará en caso de no "
+#~ "definir ninguna de las opciones anteriores. Para usar un proxy FTP debe "
+#~ "configurar el script <literal>ftp::ProxyLogin</literal> en el fichero de "
+#~ "configuración. Esta entrada define las órdenes a enviar para decirle al "
+#~ "servidor del proxy a qué conectarse. Consulte &configureindex; para un "
+#~ "ejemplo de uso. Las variables de sustitución que representan el "
+#~ "componente URI son <literal>$(PROXY_USER)</literal> <literal>$"
+#~ "(PROXY_PASS)</literal> <literal>$(SITE_USER)</literal> <literal>$"
+#~ "(SITE_PASS)</literal> <literal>$(SITE)</literal> y <literal>$(SITE_PORT)</"
+#~ "literal>."
 
 #~ msgid ""
 #~ "The option <literal>timeout</literal> sets the timeout timer used by the "
@@ -13398,9 +13425,9 @@ msgstr "Esto utiliza los archivos del disco previamente obtenidos."
 #~ "With this option it is possible to specify a particular keyring file the "
 #~ "command should operate on. The default is that a command is executed on "
 #~ "the <filename>trusted.gpg</filename> file as well as on all parts in the "
-#~ "<filename>trusted.gpg.d</filename> directory, though <filename>trusted."
-#~ "gpg</filename> is the primary keyring which means that e.g. new keys are "
-#~ "added to this one."
+#~ "<filename>trusted.gpg.d</filename> directory, though "
+#~ "<filename>trusted.gpg</filename> is the primary keyring which means that "
+#~ "e.g. new keys are added to this one."
 #~ msgstr ""
 #~ "Con esta opción es posible definir un fichero de registro de claves "
 #~ "específico sobre el que la orden debe actuar. Por omisión, la orden se "
@@ -13461,12 +13488,12 @@ msgstr "Esto utiliza los archivos del disco previamente obtenidos."
 
 #~ msgid ""
 #~ "<literal>http::Proxy</literal> sets the default proxy to use for HTTP "
-#~ "URIs. It is in the standard form of <literal>http://[[user][:pass]@]host[:"
-#~ "port]/</literal>.  Per host proxies can also be specified by using the "
-#~ "form <literal>http::Proxy::&lt;host&gt;</literal> with the special "
-#~ "keyword <literal>DIRECT</literal> meaning to use no proxies. If no one of "
-#~ "the above settings is specified, <envar>http_proxy</envar> environment "
-#~ "variable will be used."
+#~ "URIs. It is in the standard form of <literal>http://[[user]"
+#~ "[:pass]@]host[:port]/</literal>.  Per host proxies can also be specified "
+#~ "by using the form <literal>http::Proxy::&lt;host&gt;</literal> with the "
+#~ "special keyword <literal>DIRECT</literal> meaning to use no proxies. If "
+#~ "no one of the above settings is specified, <envar>http_proxy</envar> "
+#~ "environment variable will be used."
 #~ msgstr ""
 #~ "<literal>http::Proxy</literal> define el proxy predeterminado que "
 #~ "utilizar para direcciones HTTP URI. Utiliza el formato estándar "
@@ -13497,39 +13524,40 @@ msgstr "Esto utiliza los archivos del disco previamente obtenidos."
 #~ "info about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> "
 #~ "is the corresponding per-host option.  <literal>Verify-Peer</literal> "
 #~ "boolean suboption determines whether or not the server's host certificate "
-#~ "should be verified against trusted certificates.  <literal>&lt;host&gt;::"
-#~ "Verify-Peer</literal> is the corresponding per-host option.  "
-#~ "<literal>Verify-Host</literal> boolean suboption determines whether or "
-#~ "not the server's hostname should be verified.  <literal>&lt;host&gt;::"
-#~ "Verify-Host</literal> is the corresponding per-host option.  "
-#~ "<literal>SslCert</literal> determines what certificate to use for client "
-#~ "authentication. <literal>&lt;host&gt;::SslCert</literal> is the "
-#~ "corresponding per-host option.  <literal>SslKey</literal> determines what "
-#~ "private key to use for client authentication. <literal>&lt;host&gt;::"
-#~ "SslKey</literal> is the corresponding per-host option.  "
-#~ "<literal>SslForceVersion</literal> overrides default SSL version to use.  "
-#~ "It can contain either of the strings '<literal>TLSv1</literal>' or "
-#~ "'<literal>SSLv3</literal>'.  <literal>&lt;host&gt;::SslForceVersion</"
+#~ "should be verified against trusted certificates.  "
+#~ "<literal>&lt;host&gt;::Verify-Peer</literal> is the corresponding per-"
+#~ "host option.  <literal>Verify-Host</literal> boolean suboption determines "
+#~ "whether or not the server's hostname should be verified.  "
+#~ "<literal>&lt;host&gt;::Verify-Host</literal> is the corresponding per-"
+#~ "host option.  <literal>SslCert</literal> determines what certificate to "
+#~ "use for client authentication. <literal>&lt;host&gt;::SslCert</literal> "
+#~ "is the corresponding per-host option.  <literal>SslKey</literal> "
+#~ "determines what private key to use for client authentication. "
+#~ "<literal>&lt;host&gt;::SslKey</literal> is the corresponding per-host "
+#~ "option.  <literal>SslForceVersion</literal> overrides default SSL version "
+#~ "to use.  It can contain either of the strings '<literal>TLSv1</literal>' "
+#~ "or '<literal>SSLv3</literal>'.  <literal>&lt;host&gt;::SslForceVersion</"
 #~ "literal> is the corresponding per-host option."
 #~ msgstr ""
 #~ "La subopción <literal>CaInfo</literal> define la ubicación del fichero "
-#~ "que guarda la información sobre certificados de confianza. <literal>&lt;"
-#~ "host&gt;::CaInfo</literal> es la opción correspondiente para cada "
-#~ "servidor. La subopción booleana <literal>Verify-Peer</literal> define si "
-#~ "se debe comprobar el certificado del servidor con certificados de "
-#~ "confianza. <literal>&lt;host&gt;::Verify-Peer</literal> es la opción "
+#~ "que guarda la información sobre certificados de confianza. "
+#~ "<literal>&lt;host&gt;::CaInfo</literal> es la opción correspondiente para "
+#~ "cada servidor. La subopción booleana <literal>Verify-Peer</literal> "
+#~ "define si se debe comprobar el certificado del servidor con certificados "
+#~ "de confianza. <literal>&lt;host&gt;::Verify-Peer</literal> es la opción "
 #~ "correspondiente para cada servidor. La subopción booleana <literal>Verify-"
 #~ "Host</literal> define si se debe comprobar el «hostname» del servidor. "
 #~ "<literal>&lt;host&gt;::Verify-Host</literal> es la opción correspondiente "
 #~ "para cada servidor. <literal>SslCert</literal> define el certificado que "
-#~ "utilizar para la autenticación del cliente. <literal>&lt;host&gt;::"
-#~ "SslCert</literal> es la opción correspondiente para cada servidor. "
-#~ "<literal>SslKey</literal> define la clave privada que utilizar para la "
-#~ "autenticación del cliente. <literal>&lt;host&gt;::SslKey</literal> es la "
-#~ "opción correspondiente para cada servidor. <literal>SslForceVersion</"
-#~ "literal> sustituye la versión predeterminada de SSL que utilizar. Se "
-#~ "admiten las cadenas «<literal>TLSv1</literal>» o «<literal>SSLv3</"
-#~ "literal>». <literal>&lt;host&gt;::SslForceVersion</literal> es la opción "
+#~ "utilizar para la autenticación del cliente. "
+#~ "<literal>&lt;host&gt;::SslCert</literal> es la opción correspondiente "
+#~ "para cada servidor. <literal>SslKey</literal> define la clave privada que "
+#~ "utilizar para la autenticación del cliente. "
+#~ "<literal>&lt;host&gt;::SslKey</literal> es la opción correspondiente para "
+#~ "cada servidor. <literal>SslForceVersion</literal> sustituye la versión "
+#~ "predeterminada de SSL que utilizar. Se admiten las cadenas "
+#~ "«<literal>TLSv1</literal>» o «<literal>SSLv3</literal>». "
+#~ "<literal>&lt;host&gt;::SslForceVersion</literal> es la opción "
 #~ "correspondiente para cada servidor."
 
 #~ msgid ""
@@ -13711,14 +13739,15 @@ msgstr "Esto utiliza los archivos del disco previamente obtenidos."
 #~ "Los paquetes esenciales (y sus dependencias) se deberían configurar "
 #~ "inmediatamente después de desempaquetarlos. Se recomienda realizarlo lo "
 #~ "más pronto posible en el proceso de actualización ya que actualmente "
-#~ "estas invocaciones de configuración también necesitan <literal>DPkg::"
-#~ "TriggersPending</literal>, que ejecuta varios disparadores (que puede que "
-#~ "no sean necesarios). Los esenciales tienen, de forma predeterminada, una "
-#~ "puntuación alta pero la opción inmediata es relativamente baja (un "
-#~ "paquete que tenga pre-dependencias tiene una puntuación más alta). Puede "
-#~ "cambiar la puntuación mediante esta opción y las otras del mismo grupo. "
-#~ "El siguiente ejemplo muestra la configuración con los valores "
-#~ "predeterminados. <placeholder type=\"literallayout\" id=\"0\"/>"
+#~ "estas invocaciones de configuración también necesitan "
+#~ "<literal>DPkg::TriggersPending</literal>, que ejecuta varios disparadores "
+#~ "(que puede que no sean necesarios). Los esenciales tienen, de forma "
+#~ "predeterminada, una puntuación alta pero la opción inmediata es "
+#~ "relativamente baja (un paquete que tenga pre-dependencias tiene una "
+#~ "puntuación más alta). Puede cambiar la puntuación mediante esta opción y "
+#~ "las otras del mismo grupo. El siguiente ejemplo muestra la configuración "
+#~ "con los valores predeterminados. <placeholder type=\"literallayout\" "
+#~ "id=\"0\"/>"
 
 #~ msgid "List fingerprints of trusted keys."
 #~ msgstr "Lista las huellas digitales de las claves de confianza."
@@ -13836,21 +13865,21 @@ msgstr "Esto utiliza los archivos del disco previamente obtenidos."
 
 #~ msgid ""
 #~ "No action; perform a simulation of events that would occur but do not "
-#~ "actually change the system.  Configuration Item: <literal>APT::Get::"
-#~ "Simulate</literal>."
+#~ "actually change the system.  Configuration Item: "
+#~ "<literal>APT::Get::Simulate</literal>."
 #~ msgstr ""
 #~ "No realiza ninguna acción, simula lo que hubiese ocurrido pero sin hacer "
-#~ "cambios reales en el sistema. Opción de configuración: <literal>APT::Get::"
-#~ "Simulate</literal>."
+#~ "cambios reales en el sistema. Opción de configuración: "
+#~ "<literal>APT::Get::Simulate</literal>."
 
 #~ msgid ""
 #~ "Simulated runs performed as a user will automatically deactivate locking "
-#~ "(<literal>Debug::NoLocking</literal>), and if the option <literal>APT::"
-#~ "Get::Show-User-Simulation-Note</literal> is set (as it is by default) a "
-#~ "notice will also be displayed indicating that this is only a simulation. "
-#~ "Runs performed as root do not trigger either NoLocking or the notice - "
-#~ "superusers should know what they are doing without further warnings from "
-#~ "<literal>apt-get</literal>."
+#~ "(<literal>Debug::NoLocking</literal>), and if the option "
+#~ "<literal>APT::Get::Show-User-Simulation-Note</literal> is set (as it is "
+#~ "by default) a notice will also be displayed indicating that this is only "
+#~ "a simulation. Runs performed as root do not trigger either NoLocking or "
+#~ "the notice - superusers should know what they are doing without further "
+#~ "warnings from <literal>apt-get</literal>."
 #~ msgstr ""
 #~ "Las simulaciones de ejecución realizadas por un usuario desactivan el "
 #~ "bloqueo de forma automática (<literal>Debug::NoLocking</literal>), y si "
@@ -14020,8 +14049,8 @@ msgstr "Esto utiliza los archivos del disco previamente obtenidos."
 #~| "B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources.list>(5), "
 #~| "B<apt_preferences>(5), B<apt-secure>(8)"
 #~ msgid ""
-#~ "B<apt>(8), B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources."
-#~ "list>(5), B<apt_preferences>(5), B<apt-secure>(8)"
+#~ "B<apt>(8), B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), "
+#~ "B<sources.list>(5), B<apt_preferences>(5), B<apt-secure>(8)"
 #~ msgstr ""
 #~ "B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources.list>(5), "
 #~ "B<apt_preferences>(5), B<apt-secure>(8)"
diff --git a/doc/po/fr.po b/doc/po/fr.po
index f9d83a40d..2a426ea85 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: 2025-01-01 21:58+0100\n"
+"POT-Creation-Date: 2025-01-28 18:52+0000\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"
@@ -586,8 +586,9 @@ msgstr ""
 #. type: Plain text
 #: apt.ent
 msgid ""
-"<!-- TRANSLATOR: used as in -o=config_string e.g. -o=Debug::"
-"pkgProblemResolver=1 --> <!ENTITY synopsis-config-string \"config_string\">"
+"<!-- TRANSLATOR: used as in -o=config_string e.g. "
+"-o=Debug::pkgProblemResolver=1 --> <!ENTITY synopsis-config-string "
+"\"config_string\">"
 msgstr "<!ENTITY synopsis-config-string \"chaîne_de_configuration\">"
 
 #. type: Plain text
@@ -600,8 +601,8 @@ msgstr "<!ENTITY synopsis-config-file \"fichier_de_configuration\">"
 #. type: Plain text
 #: apt.ent
 msgid ""
-"<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release e.g. -"
-"t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
+"<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release e.g. "
+"-t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
 "\"target_release\">"
 msgstr "<!ENTITY synopsis-target-release \"publication_cible\">"
 
@@ -643,8 +644,8 @@ msgstr "<!ENTITY synopsis-regex \"expression_régulière\">"
 #. type: Plain text
 #: apt.ent
 msgid ""
-"<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom -"
-"d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"cdrom_mount_point\">"
+"<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom "
+"-d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"cdrom_mount_point\">"
 msgstr "<!ENTITY synopsis-cdrom-mount \"point_de_montage_CD-ROM\">"
 
 #. type: Plain text
@@ -1356,9 +1357,10 @@ msgstr ""
 "récupère des paquets source. APT examine les paquets disponibles pour "
 "choisir le paquet source à récupérer. Il télécharge ensuite dans le "
 "répertoire courant la version la plus récente du paquet, définie par rapport "
-"à la distribution par défaut établie soit avec l'option <literal>APT::"
-"Default-Release</literal>, soit avec l'option <option>-t</option> ou soit "
-"par paquet avec la syntaxe <literal>paquet/version</literal> si possible."
+"à la distribution par défaut établie soit avec l'option "
+"<literal>APT::Default-Release</literal>, soit avec l'option <option>-t</"
+"option> ou soit par paquet avec la syntaxe <literal>paquet/version</literal> "
+"si possible."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -1658,8 +1660,8 @@ msgid ""
 "structure can be so corrupt as to require manual intervention (which usually "
 "means using <command>dpkg --remove</command> to eliminate some of the "
 "offending packages). Use of this option together with <option>-m</option> "
-"may produce an error in some situations.  Configuration Item: <literal>APT::"
-"Get::Fix-Broken</literal>."
+"may produce an error in some situations.  Configuration Item: "
+"<literal>APT::Get::Fix-Broken</literal>."
 msgstr ""
 "Correction ; cette option demande de réparer un système où existent des "
 "dépendances défectueuses. Utilisée avec install ou remove, elle peut exclure "
@@ -1786,8 +1788,8 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
-"Automatic \"no\" to all prompts.  Configuration Item: <literal>APT::Get::"
-"Assume-No</literal>."
+"Automatic \"no\" to all prompts.  Configuration Item: "
+"<literal>APT::Get::Assume-No</literal>."
 msgstr ""
 "Répondre automatiquement négativement aux questions. Élément de "
 "configuration : <literal>APT::Get::Assume-No</literal>."
@@ -1829,15 +1831,15 @@ msgstr ""
 #, fuzzy
 #| msgid ""
 #| "Select the source override file to use with the <literal>sources</"
-#| "literal> command.  Configuration Item: <literal>APT::FTPArchive::"
-#| "SourceOverride</literal>."
+#| "literal> command.  Configuration Item: "
+#| "<literal>APT::FTPArchive::SourceOverride</literal>."
 msgid ""
 "Add the given value to the <literal>Comment:</literal> field in history.log "
 "Configuration Item: <literal>APT::History::Comment</literal>."
 msgstr ""
 "Indique le fichier d'« override » à utiliser avec la commande "
-"<literal>sources</literal>. Élément de configuration : <literal>APT::"
-"FTPArchive::SourceOverride</literal>."
+"<literal>sources</literal>. Élément de configuration : "
+"<literal>APT::FTPArchive::SourceOverride</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -1845,9 +1847,9 @@ msgid ""
 "This option controls the architecture packages are built for by <command>apt-"
 "get source --compile</command> and how cross-builddependencies are "
 "satisfied. By default is it not set which means that the host architecture "
-"is the same as the build architecture (which is defined by <literal>APT::"
-"Architecture</literal>).  Configuration Item: <literal>APT::Get::Host-"
-"Architecture</literal>."
+"is the same as the build architecture (which is defined by "
+"<literal>APT::Architecture</literal>).  Configuration Item: "
+"<literal>APT::Get::Host-Architecture</literal>."
 msgstr ""
 "Cette option contrôle comment les paquets d'architectures sont construits "
 "par <command>apt-get source --compile</command> et comment les dépendances "
@@ -1870,8 +1872,8 @@ msgstr ""
 "paquet source est construit par <command>apt-get source --compile</command> "
 "et comment les dépendances sont respectées. Par défaut, aucun profil de "
 "construction n'est actif. Plus d'un profil peut être activé en même temps en "
-"les concaténant par une virgule. Élément de configuration : <literal>APT::"
-"Build-Profiles</literal>."
+"les concaténant par une virgule. Élément de configuration : "
+"<literal>APT::Build-Profiles</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -1926,8 +1928,8 @@ msgid ""
 msgstr ""
 "Aucune mise à niveau ; quand elle est utilisée avec <literal>install</"
 "literal>, cette commande empêche les paquets mentionnés sur la ligne de "
-"commande d'être mis à niveau. Élément de configuration : <literal>APT::Get::"
-"Upgrade</literal>."
+"commande d'être mis à niveau. Élément de configuration : "
+"<literal>APT::Get::Upgrade</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -2019,8 +2021,8 @@ msgid ""
 "name on the remote site! This also works with the <literal>source</literal> "
 "and <literal>update</literal> commands. When used with the <literal>update</"
 "literal> command the MD5 and size are not included, and it is up to the user "
-"to decompress any compressed files.  Configuration Item: <literal>APT::Get::"
-"Print-URIs</literal>."
+"to decompress any compressed files.  Configuration Item: "
+"<literal>APT::Get::Print-URIs</literal>."
 msgstr ""
 "Au lieu de récupérer les paquets à installer, leurs URI sont affichées. "
 "Chaque URI a un chemin, un nom de fichier destination, une taille et une clé "
@@ -2062,8 +2064,8 @@ msgid ""
 "turn it off. When it is on, <command>apt-get</command> will automatically "
 "manage the contents of <filename>&statedir;/lists</filename> to ensure that "
 "obsolete files are erased.  The only reason to turn it off is if you "
-"frequently change your sources list.  Configuration Item: <literal>APT::Get::"
-"List-Cleanup</literal>."
+"frequently change your sources list.  Configuration Item: "
+"<literal>APT::Get::List-Cleanup</literal>."
 msgstr ""
 "Cette option est activée par défaut ; utilisez <literal>--no-list-cleanup</"
 "literal> pour la désactiver. Quand elle est activée, <command>apt-get</"
@@ -2116,8 +2118,8 @@ msgstr ""
 "Ne réalise que les opérations « triviales ». Logiquement ceci peut être "
 "considéré comme relatif à <option>--assume-yes</option>. Alors que <option>--"
 "assume-yes</option> répond oui à n'importe quelle question, <option>--"
-"trivial-only</option> répond non. Élément de configuration : <literal>APT::"
-"Get::Trivial-Only</literal>."
+"trivial-only</option> répond non. Élément de configuration : "
+"<literal>APT::Get::Trivial-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -2136,8 +2138,8 @@ msgid ""
 "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
 msgstr ""
 "Arrêter immédiatement apt-get, sans poser de questions, si des paquets "
-"doivent être supprimés. Élément de configuration : <literal>APT::Get::"
-"Remove</literal>."
+"doivent être supprimés. Élément de configuration : "
+"<literal>APT::Get::Remove</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -2220,8 +2222,8 @@ msgstr ""
 "l'authenticité des données n'est pas assurée d'une autre manière par "
 "l'utilisateur lui-même. L'utilisation de l'option <option>Trusted</option> "
 "pour les entrées de &sources-list; devrait être habituellement préférée à ce "
-"remplacement global. Élément de configuration : <literal>APT::Get::"
-"AllowUnauthenticated</literal>."
+"remplacement global. Élément de configuration : "
+"<literal>APT::Get::AllowUnauthenticated</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -2230,8 +2232,8 @@ msgstr ""
 #| "Forbid the update command to acquire unverifiable data from configured "
 #| "sources. APT will fail at the update command for repositories without "
 #| "valid cryptographically signatures. See also &apt-secure; for details on "
-#| "the concept and the implications.  Configuration Item: <literal>Acquire::"
-#| "AllowInsecureRepositories</literal>."
+#| "the concept and the implications.  Configuration Item: "
+#| "<literal>Acquire::AllowInsecureRepositories</literal>."
 msgid ""
 "Allow the update command to acquire unverifiable data from configured "
 "sources. APT will otherwise fail at the update command for repositories "
@@ -2278,8 +2280,8 @@ msgstr ""
 "uniquement pour certains champs tels que <literal>origin</literal>, "
 "<literal>label</literal>, <literal>codename</literal>, <literal>suite</"
 "literal>, <literal>version</literal> et <literal>defaultpin</literal>. Voir "
-"aussi &apt-preferences;. Élément de configuration : <literal>Acquire::"
-"AllowReleaseInfoChange</literal>."
+"aussi &apt-preferences;. Élément de configuration : "
+"<literal>Acquire::AllowReleaseInfoChange</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -2773,12 +2775,12 @@ msgstr ""
 #: apt-cache.8.xml
 msgid ""
 "The same as <literal>dotty</literal>, only for xvcg from the <ulink "
-"url=\"https://www.rw.cdl.uni-saarland.de/people/sander/private/html/gsvcg1."
-"html\">VCG tool</ulink>."
+"url=\"https://www.rw.cdl.uni-saarland.de/people/sander/private/html/"
+"gsvcg1.html\">VCG tool</ulink>."
 msgstr ""
 "Identique à <literal>dotty</literal>, mais réservé à xvcg fourni avec <ulink "
-"url=\"https://www.rw.cdl.uni-saarland.de/people/sander/private/html/gsvcg1."
-"html\">VCG tool</ulink>."
+"url=\"https://www.rw.cdl.uni-saarland.de/people/sander/private/html/"
+"gsvcg1.html\">VCG tool</ulink>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml
@@ -2806,8 +2808,8 @@ msgid ""
 "archive management tool, <literal>madison</literal>.  It displays available "
 "versions of a package in a tabular format.  Unlike the original "
 "<literal>madison</literal>, it can only display information for the "
-"architecture for which APT has retrieved package lists (<literal>APT::"
-"Architecture</literal>)."
+"architecture for which APT has retrieved package lists "
+"(<literal>APT::Architecture</literal>)."
 msgstr ""
 "La commande <literal>madison</literal> d'<literal>apt-cache</literal> "
 "cherche à mimer le format de sortie propre à l'outil debian de gestion "
@@ -2822,8 +2824,8 @@ msgstr ""
 #: apt-cache.8.xml
 msgid ""
 "Select the file to store the package cache. The package cache is the primary "
-"cache used by all operations.  Configuration Item: <literal>Dir::Cache::"
-"pkgcache</literal>."
+"cache used by all operations.  Configuration Item: "
+"<literal>Dir::Cache::pkgcache</literal>."
 msgstr ""
 "Indique le fichier servant de cache des paquets. Le cache des paquets est le "
 "cache primaire utilisé par toutes les opérations. Élément de configuration : "
@@ -2877,9 +2879,9 @@ msgstr ""
 msgid ""
 "Per default the <command>depends</command> and <command>rdepends</command> "
 "print all dependencies. This can be tweaked with these flags which will omit "
-"the specified dependency type.  Configuration Item: <literal>APT::Cache::"
-"Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::"
-"Cache::ShowRecommends</literal>."
+"the specified dependency type.  Configuration Item: "
+"<literal>APT::Cache::Show<replaceable>DependencyType</replaceable></literal> "
+"e.g. <literal>APT::Cache::ShowRecommends</literal>."
 msgstr ""
 "Par défaut, <command>depends</command> et <command>rdepends</command> "
 "affichent toutes les dépendances. Ce comportement peut être modifié avec ces "
@@ -2953,15 +2955,15 @@ msgid ""
 "descriptions.  Configuration Item: <literal>APT::Cache::NamesOnly</literal>."
 msgstr ""
 "N'effectue une recherche que sur les noms de paquets et de paquets fournis, "
-"pas sur les descriptions longues. Élément de configuration : <literal>APT::"
-"Cache::NamesOnly</literal>."
+"pas sur les descriptions longues. Élément de configuration : "
+"<literal>APT::Cache::NamesOnly</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml
 msgid ""
 "Make <literal>pkgnames</literal> print all names, including virtual packages "
-"and missing dependencies.  Configuration Item: <literal>APT::Cache::"
-"AllNames</literal>."
+"and missing dependencies.  Configuration Item: "
+"<literal>APT::Cache::AllNames</literal>."
 msgstr ""
 "Avec cette option, <literal>pkgnames</literal> affiche tous les noms, les "
 "noms des paquets virtuels et les dépendances manquantes. Élément de "
@@ -3001,11 +3003,11 @@ msgid ""
 msgstr ""
 "Ajoute le fichier donné comme source de métadonnées. La commande peut être "
 "répétée pour ajouter de multiples fichiers. Actuellement, les "
-"fichiers<literal>*.deb</literal>, <literal>*.dsc</literal>, <literal>*."
-"changes</literal>, <literal>Sources</literal> et <literal>Packages</"
-"literal>, aussi bien que les répertoires de paquets source sont pris en "
-"charge. Les correspondances de fichier sont basées sur leur nom seulement et "
-"non sur leur contenu !"
+"fichiers<literal>*.deb</literal>, <literal>*.dsc</literal>, "
+"<literal>*.changes</literal>, <literal>Sources</literal> et "
+"<literal>Packages</literal>, aussi bien que les répertoires de paquets "
+"source sont pris en charge. Les correspondances de fichier sont basées sur "
+"leur nom seulement et non sur leur contenu !"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml
@@ -3057,8 +3059,8 @@ msgid ""
 "<command>apt-mark</command> can be used as a unified front-end to set "
 "various settings for a package, such as marking a package as being "
 "automatically/manually installed or changing <command>dpkg</command> "
-"selections such as hold, install, deinstall and purge which are respected e."
-"g. by <command>apt-get dselect-upgrade</command> or <command>aptitude</"
+"selections such as hold, install, deinstall and purge which are respected "
+"e.g. by <command>apt-get dselect-upgrade</command> or <command>aptitude</"
 "command>."
 msgstr ""
 "La commande <command>apt-mark</command> peut être utilisée comme interface "
@@ -3299,10 +3301,11 @@ msgstr "Configuration utilisateur"
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""
-"Keys should usually be included inside their corresponding <literal>."
-"sources</literal> by embedding the ASCII-armored key in the <literal>Signed-"
-"By</literal> option.  To do so, replace the empty line with a dot, and then "
-"indent all lines by two spaces.  See &sources-list; for more information."
+"Keys should usually be included inside their corresponding "
+"<literal>.sources</literal> by embedding the ASCII-armored key in the "
+"<literal>Signed-By</literal> option.  To do so, replace the empty line with "
+"a dot, and then indent all lines by two spaces.  See &sources-list; for more "
+"information."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -3315,8 +3318,9 @@ msgid ""
 "literal> file or using <literal>deb [signed-by=/etc/apt/keyrings/example-"
 "archive-keyring.asc] ...</literal> in the legacy <literal>.list</literal> "
 "format. This may be useful for APT versions prior to 2.4, which do not "
-"support embedded keys. ASCII-armored keys must use an extension of <literal>."
-"asc</literal>, and unarmored keys an extension of <literal>.gpg</literal>."
+"support embedded keys. ASCII-armored keys must use an extension of "
+"<literal>.asc</literal>, and unarmored keys an extension of <literal>.gpg</"
+"literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -3409,10 +3413,10 @@ msgstr ""
 "d'une opération <command>update</command> envoie un message d'erreur à tous "
 "les clients d'APT quelle que soit l'option d'autoriser ou d'interdire "
 "l'utilisation de dépôts non sécurisés. L'erreur peut être contournée par le "
-"réglage supplémentaire de <option>Acquire::"
-"AllowDowngradeToInsecureRepositories</option> à <literal>true</literal>, ou, "
-"pour des dépôts individuels avec l'option <literal>allow-downgrade-to-"
-"insecure=yes</literal> de &sources-list;."
+"réglage supplémentaire de "
+"<option>Acquire::AllowDowngradeToInsecureRepositories</option> à "
+"<literal>true</literal>, ou, pour des dépôts individuels avec l'option "
+"<literal>allow-downgrade-to-insecure=yes</literal> de &sources-list;."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-secure.8.xml
@@ -3617,11 +3621,11 @@ msgstr ""
 #: apt-secure.8.xml
 msgid ""
 "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg --"
-"clearsign -o InRelease Release</command> and <command>gpg -abs -o Release."
-"gpg Release</command>."
+"clearsign -o InRelease Release</command> and <command>gpg -abs -o "
+"Release.gpg Release</command>."
 msgstr ""
-"<emphasis>le signer</emphasis>, avec les commandes <command>gpg --clearsign -"
-"o InRelease Release</command> et <command>gpg -abs -o Release.gpg Release</"
+"<emphasis>le signer</emphasis>, avec les commandes <command>gpg --clearsign "
+"-o InRelease Release</command> et <command>gpg -abs -o Release.gpg Release</"
 "command>."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
@@ -3781,8 +3785,8 @@ msgstr ""
 #: apt-cdrom.8.xml
 msgid ""
 "Do not try to auto-detect the CD-ROM path. Usually combined with the "
-"<option>--cdrom</option> option.  Configuration Item: <literal>Acquire::"
-"cdrom::AutoDetect</literal>."
+"<option>--cdrom</option> option.  Configuration Item: "
+"<literal>Acquire::cdrom::AutoDetect</literal>."
 msgstr ""
 "Ne pas essayer de détecter automatiquement le chemin du CD-ROM. "
 "Habituellement combiné avec l'option <option>--cdrom</option>. Élément de "
@@ -3797,8 +3801,8 @@ msgid ""
 msgstr ""
 "Point de montage ; spécifie l'emplacement de montage du CD. Ce point de "
 "montage doit être spécifié dans <filename>/etc/fstab</filename> et "
-"correctement configuré. Élément de configuration : <literal>Acquire::cdrom::"
-"mount</literal>."
+"correctement configuré. Élément de configuration : "
+"<literal>Acquire::cdrom::mount</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml
@@ -3816,12 +3820,12 @@ msgstr ""
 #: apt-cdrom.8.xml
 msgid ""
 "No mounting; prevent <command>apt-cdrom</command> from mounting and "
-"unmounting the mount point.  Configuration Item: <literal>APT::CDROM::"
-"NoMount</literal>."
+"unmounting the mount point.  Configuration Item: "
+"<literal>APT::CDROM::NoMount</literal>."
 msgstr ""
 "Pas de montage ; empêche <command>apt-cdrom</command> de monter ou démonter "
-"le point de montage. Élément de configuration : <literal >APT::CDROM::"
-"NoMount</literal>."
+"le point de montage. Élément de configuration : <literal "
+">APT::CDROM::NoMount</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml
@@ -3924,8 +3928,8 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-config.8.xml
 msgid ""
-"This will set the shell environment variable $OPTS to the value of MyApp::"
-"options with a default of <option>-f</option>."
+"This will set the shell environment variable $OPTS to the value of "
+"MyApp::options with a default of <option>-f</option>."
 msgstr ""
 "La variable d'environnement du shell $OPTS sera définie par la valeur de "
 "MyApp::Options ou, par défaut, la valeur -f."
@@ -4054,9 +4058,9 @@ msgid ""
 "order which have either no or \"<literal>conf</literal>\" as filename "
 "extension and which only contain alphanumeric, hyphen (-), underscore (_) "
 "and period (.) characters.  Otherwise APT will print a notice that it has "
-"ignored a file, unless that file matches a pattern in the <literal>Dir::"
-"Ignore-Files-Silently</literal> configuration list - in which case it will "
-"be silently ignored."
+"ignored a file, unless that file matches a pattern in the "
+"<literal>Dir::Ignore-Files-Silently</literal> configuration list - in which "
+"case it will 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</"
@@ -4275,11 +4279,12 @@ msgid ""
 msgstr ""
 "Tous les outils d'APT possèdent une option <option>-o</option> qui permet de "
 "spécifier une configuration quelconque depuis la ligne de commande. La "
-"syntaxe consiste en un nom complet d'option (par exemple <literal>APT::Get::"
-"Assume-Yes</literal>) suivi par un signe égal, puis par la nouvelle valeur "
-"de l'option. On peut compléter une liste en ajoutant un <literal>::</"
-"literal> final au nom de la liste. Comme on peut s'en douter, la syntaxe de "
-"champ d'action (« scope ») ne peut pas être indiquée à la ligne de commande."
+"syntaxe consiste en un nom complet d'option (par exemple "
+"<literal>APT::Get::Assume-Yes</literal>) suivi par un signe égal, puis par "
+"la nouvelle valeur de l'option. On peut compléter une liste en ajoutant un "
+"<literal>::</literal> final au nom de la liste. Comme on peut s'en douter, "
+"la syntaxe de champ d'action (« scope ») ne peut pas être indiquée à la "
+"ligne de commande."
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml
@@ -4374,10 +4379,12 @@ msgstr ""
 msgid ""
 "The subscope <option>action</option> defines the colors for package lists in "
 "<option>install</option> and similar commands. The following options may be "
-"set: <option>APT::Color::Action::Upgrade</option>, <option>APT::Color::"
-"Action::Install</option>, <option>APT::Color::Action::Install-Dependencies</"
-"option>, <option>APT::Color::Action::Downgrade</option>, <option>APT::Color::"
-"Action::Remove</option>; corresponding to their lists in the &apt; output."
+"set: <option>APT::Color::Action::Upgrade</option>, "
+"<option>APT::Color::Action::Install</option>, "
+"<option>APT::Color::Action::Install-Dependencies</option>, "
+"<option>APT::Color::Action::Downgrade</option>, "
+"<option>APT::Color::Action::Remove</option>; corresponding to their lists in "
+"the &apt; output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -4701,8 +4708,8 @@ msgstr ""
 #: apt.conf.5.xml
 msgid ""
 "Define the regular expression(s) for versioned kernel packages.  Based on "
-"these expressions a rule set is injected into apt similar to APT::"
-"NeverAutoRemove regular expressions."
+"these expressions a rule set is injected into apt similar to "
+"APT::NeverAutoRemove regular expressions."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -4741,12 +4748,12 @@ msgid ""
 "option> and verifying that the Date field of a release file is not in the "
 "future."
 msgstr ""
-"Les options relatives à la sécurité sont positionnées par défaut à « true »,"
-"permettant des vérifications relatives à l'heure. Leur désactivation "
-"signifie qu'on ne peut pas faire confiance à l'heure de la machine, et APT "
-"de ce fait désactivera toutes les vérifications de ce type, telles que "
-"<option>Check-Valid-Until</option> et la vérification que le champ Date d'un "
-"fichier Release n'est pas dans le futur."
+"Les options relatives à la sécurité sont positionnées par défaut à "
+"« true »,permettant des vérifications relatives à l'heure. Leur "
+"désactivation signifie qu'on ne peut pas faire confiance à l'heure de la "
+"machine, et APT de ce fait désactivera toutes les vérifications de ce type, "
+"telles que <option>Check-Valid-Until</option> et la vérification que le "
+"champ Date d'un fichier Release n'est pas dans le futur."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
@@ -5163,9 +5170,9 @@ msgid ""
 "that these codes are not included twice in the list. If "
 "<literal>LC_MESSAGES</literal> is set to \"C\" only the "
 "<filename>Translation-en</filename> file (if available) will be used.  To "
-"force APT to use no Translation file use the setting <literal>Acquire::"
-"Languages=none</literal>. \"<literal>none</literal>\" is another special "
-"meaning code which will stop the search for a suitable "
+"force APT to use no Translation file use the setting "
+"<literal>Acquire::Languages=none</literal>. \"<literal>none</literal>\" is "
+"another special meaning code which will stop the search for a suitable "
 "<filename>Translation</filename> file.  This tells APT to download these "
 "translations too, without actually using them unless the environment "
 "specifies the languages. So the following example configuration will result "
@@ -5299,21 +5306,22 @@ msgid ""
 "<replaceable>ORIGIN</replaceable></literal> option exists and if so this "
 "value is taken. The value in the Release file can be overridden with "
 "<literal>Acquire::Changelogs::URI::Override::Label::<replaceable>LABEL</"
-"replaceable></literal> or <literal>Acquire::Changelogs::URI::Override::"
-"Origin::<replaceable>ORIGIN</replaceable></literal>.  The value should be a "
-"normal URI to a text file, except that package specific data is replaced "
-"with the placeholder <literal>@CHANGEPATH@</literal>. The value for it is: "
-"1. if the package is from a component (e.g. <literal>main</literal>)  this "
-"is the first part otherwise it is omitted, 2. the first letter of source "
-"package name, except if the source package name starts with '<literal>lib</"
-"literal>' in which case it will be the first four letters. 3. The complete "
-"source package name. 4. the complete name again and 5. the source version.  "
-"The first (if present), second, third and fourth part are separated by a "
-"slash ('<literal>/</literal>')  and between the fourth and fifth part is an "
-"underscore ('<literal>_</literal>').  The special value '<literal>no</"
-"literal>' is available for this option indicating that this source can't be "
-"used to acquire changelog files from. Another source will be tried if "
-"available in this case."
+"replaceable></literal> or "
+"<literal>Acquire::Changelogs::URI::Override::Origin::<replaceable>ORIGIN</"
+"replaceable></literal>.  The value should be a normal URI to a text file, "
+"except that package specific data is replaced with the placeholder "
+"<literal>@CHANGEPATH@</literal>. The value for it is: 1. if the package is "
+"from a component (e.g. <literal>main</literal>)  this is the first part "
+"otherwise it is omitted, 2. the first letter of source package name, except "
+"if the source package name starts with '<literal>lib</literal>' in which "
+"case it will be the first four letters. 3. The complete source package name. "
+"4. the complete name again and 5. the source version.  The first (if "
+"present), second, third and fourth part are separated by a slash ('<literal>/"
+"</literal>')  and between the fourth and fifth part is an underscore "
+"('<literal>_</literal>').  The special value '<literal>no</literal>' is "
+"available for this option indicating that this source can't be used to "
+"acquire changelog files from. Another source will be tried if available in "
+"this case."
 msgstr ""
 "La récupération des journaux des modifications n'est possible que si l'URI "
 "où les télécharger est connu. De préférence, le fichier Release l'indique "
@@ -5322,24 +5330,25 @@ msgstr ""
 "<literal>Acquire::Changelogs::URI::Label::<replaceable>LABEL</replaceable></"
 "literal> ou <literal>Acquire::Changelogs::URI::Origin::<replaceable>ORIGINE</"
 "replaceable></literal> existent, et si c'est le cas, cette valeur est prise. "
-"La valeur dans le fichier Release peut être contournée par <literal>Acquire::"
-"Changelogs::URI::Override::Label::<replaceable>LABEL</replaceable></literal> "
-"ou <literal>Acquire::Changelogs::URI::Override::Origin::"
-"<replaceable>ORIGINE</replaceable></literal>. La valeur devrait être un URI "
-"normal vers un fichier texte, à l'exception que les données spécifiques du "
-"paquet sont remplacées par le paramètre <literal>@CHANGEPATH@</literal>. Sa "
-"valeur est la suivante : 1. si le paquet provient d'un composant (par "
-"exemple <literal>main</literal>) il constitue la première partie, sinon elle "
-"est omise ; 2. est la première lettre du nom du paquet source, sauf si le "
-"nom du paquet source commence par <literal>lib</literal> auquel cas les "
-"quatre premières lettres seront utilisées ; 3. le nom complet du paquet "
-"source ; 4. le nom complet une fois de plus ; 5. la version de la source. "
-"Les quatres premières parties (ou trois si le composant est absent) sont "
-"séparées par des barres obliques (« <literal>/</literal> »), et les deux "
-"dernières sont séparées par un caractère de soulignement (« <literal>_</"
-"literal> »). La valeur spéciale « <literal>no</literal> » est disponible "
-"pour indiquer que cette source ne peut être utilisée pour récupérer les "
-"fichiers changelog. Dans ce cas, une autre source sera essayée."
+"La valeur dans le fichier Release peut être contournée par "
+"<literal>Acquire::Changelogs::URI::Override::Label::<replaceable>LABEL</"
+"replaceable></literal> ou "
+"<literal>Acquire::Changelogs::URI::Override::Origin::<replaceable>ORIGINE</"
+"replaceable></literal>. La valeur devrait être un URI normal vers un fichier "
+"texte, à l'exception que les données spécifiques du paquet sont remplacées "
+"par le paramètre <literal>@CHANGEPATH@</literal>. Sa valeur est la "
+"suivante : 1. si le paquet provient d'un composant (par exemple "
+"<literal>main</literal>) il constitue la première partie, sinon elle est "
+"omise ; 2. est la première lettre du nom du paquet source, sauf si le nom du "
+"paquet source commence par <literal>lib</literal> auquel cas les quatre "
+"premières lettres seront utilisées ; 3. le nom complet du paquet source ; 4. "
+"le nom complet une fois de plus ; 5. la version de la source. Les quatres "
+"premières parties (ou trois si le composant est absent) sont séparées par "
+"des barres obliques (« <literal>/</literal> »), et les deux dernières sont "
+"séparées par un caractère de soulignement (« <literal>_</literal> »). La "
+"valeur spéciale « <literal>no</literal> » est disponible pour indiquer que "
+"cette source ne peut être utilisée pour récupérer les fichiers changelog. "
+"Dans ce cas, une autre source sera essayée."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
@@ -5349,14 +5358,15 @@ msgstr ""
 #| "get them.  Preferable the Release file indicates this in a 'Changelogs' "
 #| "field. If this isn't available the Label/Origin field of the Release file "
 #| "is used to check if a <literal>Acquire::Changelogs::URI::Label::"
-#| "<replaceable>LABEL</replaceable></literal> or <literal>Acquire::"
-#| "Changelogs::URI::Origin::<replaceable>ORIGIN</replaceable></literal> "
-#| "option exists and if so this value is taken. The value in the Release "
-#| "file can be overridden with <literal>Acquire::Changelogs::URI::Override::"
-#| "Label::<replaceable>LABEL</replaceable></literal> or <literal>Acquire::"
-#| "Changelogs::URI::Override::Origin::<replaceable>ORIGIN</replaceable></"
-#| "literal>.  The value should be a normal URI to a text file, except that "
-#| "package specific data is replaced with the placeholder "
+#| "<replaceable>LABEL</replaceable></literal> or "
+#| "<literal>Acquire::Changelogs::URI::Origin::<replaceable>ORIGIN</"
+#| "replaceable></literal> option exists and if so this value is taken. The "
+#| "value in the Release file can be overridden with "
+#| "<literal>Acquire::Changelogs::URI::Override::Label::<replaceable>LABEL</"
+#| "replaceable></literal> or "
+#| "<literal>Acquire::Changelogs::URI::Override::Origin::<replaceable>ORIGIN</"
+#| "replaceable></literal>.  The value should be a normal URI to a text file, "
+#| "except that package specific data is replaced with the placeholder "
 #| "<literal>@CHANGEPATH@</literal>. The value for it is: 1. if the package "
 #| "is from a component (e.g. <literal>main</literal>)  this is the first "
 #| "part otherwise it is omitted, 2. the first letter of source package name, "
@@ -5374,17 +5384,19 @@ msgid ""
 "where to get them.  Preferable the Release file indicates this in a "
 "'Snapshots' field. If this isn't available the Label/Origin field of the "
 "Release file is used to check if a <literal>Acquire::Snapshots::URI::Label::"
-"<replaceable>LABEL</replaceable></literal> or <literal>Acquire::Snapshots::"
-"URI::Origin::<replaceable>ORIGIN</replaceable></literal> option exists and "
-"if so this value is taken. The value in the Release file can be overridden "
-"with <literal>Acquire::Snapshots::URI::Override::Label::<replaceable>LABEL</"
-"replaceable></literal> or <literal>Acquire::Snapshots::URI::Override::"
-"Origin::<replaceable>ORIGIN</replaceable></literal>.  The value should be a "
-"normal URI to a directory, except that the snapshot ID replaced with the "
-"placeholder <literal>@SNAPSHOTID@</literal>.  The special value "
-"'<literal>no</literal>' is available for this option indicating that this "
-"source cannot be used to acquire snapshots from. Another source will be "
-"tried if available in this case."
+"<replaceable>LABEL</replaceable></literal> or "
+"<literal>Acquire::Snapshots::URI::Origin::<replaceable>ORIGIN</replaceable></"
+"literal> option exists and if so this value is taken. The value in the "
+"Release file can be overridden with "
+"<literal>Acquire::Snapshots::URI::Override::Label::<replaceable>LABEL</"
+"replaceable></literal> or "
+"<literal>Acquire::Snapshots::URI::Override::Origin::<replaceable>ORIGIN</"
+"replaceable></literal>.  The value should be a normal URI to a directory, "
+"except that the snapshot ID replaced with the placeholder "
+"<literal>@SNAPSHOTID@</literal>.  The special value '<literal>no</literal>' "
+"is available for this option indicating that this source cannot be used to "
+"acquire snapshots from. Another source will be tried if available in this "
+"case."
 msgstr ""
 "La récupération des journaux des modifications n'est possible que si l'URI "
 "où les télécharger est connu. De préférence, le fichier Release l'indique "
@@ -5393,24 +5405,25 @@ msgstr ""
 "<literal>Acquire::Changelogs::URI::Label::<replaceable>LABEL</replaceable></"
 "literal> ou <literal>Acquire::Changelogs::URI::Origin::<replaceable>ORIGINE</"
 "replaceable></literal> existent, et si c'est le cas, cette valeur est prise. "
-"La valeur dans le fichier Release peut être contournée par <literal>Acquire::"
-"Changelogs::URI::Override::Label::<replaceable>LABEL</replaceable></literal> "
-"ou <literal>Acquire::Changelogs::URI::Override::Origin::"
-"<replaceable>ORIGINE</replaceable></literal>. La valeur devrait être un URI "
-"normal vers un fichier texte, à l'exception que les données spécifiques du "
-"paquet sont remplacées par le paramètre <literal>@CHANGEPATH@</literal>. Sa "
-"valeur est la suivante : 1. si le paquet provient d'un composant (par "
-"exemple <literal>main</literal>) il constitue la première partie, sinon elle "
-"est omise ; 2. est la première lettre du nom du paquet source, sauf si le "
-"nom du paquet source commence par <literal>lib</literal> auquel cas les "
-"quatre premières lettres seront utilisées ; 3. le nom complet du paquet "
-"source ; 4. le nom complet une fois de plus ; 5. la version de la source. "
-"Les quatres premières parties (ou trois si le composant est absent) sont "
-"séparées par des barres obliques (« <literal>/</literal> »), et les deux "
-"dernières sont séparées par un caractère de soulignement (« <literal>_</"
-"literal> »). La valeur spéciale « <literal>no</literal> » est disponible "
-"pour indiquer que cette source ne peut être utilisée pour récupérer les "
-"fichiers changelog. Dans ce cas, une autre source sera essayée."
+"La valeur dans le fichier Release peut être contournée par "
+"<literal>Acquire::Changelogs::URI::Override::Label::<replaceable>LABEL</"
+"replaceable></literal> ou "
+"<literal>Acquire::Changelogs::URI::Override::Origin::<replaceable>ORIGINE</"
+"replaceable></literal>. La valeur devrait être un URI normal vers un fichier "
+"texte, à l'exception que les données spécifiques du paquet sont remplacées "
+"par le paramètre <literal>@CHANGEPATH@</literal>. Sa valeur est la "
+"suivante : 1. si le paquet provient d'un composant (par exemple "
+"<literal>main</literal>) il constitue la première partie, sinon elle est "
+"omise ; 2. est la première lettre du nom du paquet source, sauf si le nom du "
+"paquet source commence par <literal>lib</literal> auquel cas les quatre "
+"premières lettres seront utilisées ; 3. le nom complet du paquet source ; 4. "
+"le nom complet une fois de plus ; 5. la version de la source. Les quatres "
+"premières parties (ou trois si le composant est absent) sont séparées par "
+"des barres obliques (« <literal>/</literal> »), et les deux dernières sont "
+"séparées par un caractère de soulignement (« <literal>_</literal> »). La "
+"valeur spéciale « <literal>no</literal> » est disponible pour indiquer que "
+"cette source ne peut être utilisée pour récupérer les fichiers changelog. "
+"Dans ce cas, une autre source sera essayée."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.conf.5.xml
@@ -5422,9 +5435,9 @@ msgstr "Configuration spécifique d'exécutable"
 msgid ""
 "Especially with the introduction of the <command>apt</command> binary it can "
 "be useful to set certain options only for a specific binary as even options "
-"which look like they would effect only a certain binary like <option>APT::"
-"Get::Show-Versions</option> effect <command>apt-get</command> as well as "
-"<command>apt</command>."
+"which look like they would effect only a certain binary like "
+"<option>APT::Get::Show-Versions</option> effect <command>apt-get</command> "
+"as well as <command>apt</command>."
 msgstr ""
 "Particulièrement avec l'introduction de l'exécutable <command>apt</command> "
 "il peut être utile de configurer certaines options seulement pour un "
@@ -5446,8 +5459,8 @@ msgstr ""
 "réalisée en réglant l'option dans le champ d'action <option>Binary::"
 "<replaceable>exécutable-spécifique</replaceable></option>. Affecter l'option "
 "<option>APT::Get::Show-Versions</option> à <command>apt</command> seulement "
-"peut être fait, par exemple en configurant plutôt <option>Binary::apt::APT::"
-"Get::Show-Versions</option>."
+"peut être fait, par exemple en configurant plutôt "
+"<option>Binary::apt::APT::Get::Show-Versions</option>."
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml
@@ -5481,10 +5494,10 @@ msgstr ""
 "système local. <literal>lists</literal> est le répertoire où placer les "
 "listes de paquets téléchargés et <literal>status</literal> est le nom du "
 "fichier d'état de &dpkg;. <literal>preferences</literal> concerne APT : "
-"c'est le nom du fichier <filename>preferences</filename>. <literal>Dir::"
-"State</literal> contient le répertoire par défaut préfixé à tous les sous-"
-"éléments, quand ceux-ci ne commencent pas par <filename>/</filename> ou "
-"<filename>./</filename>."
+"c'est le nom du fichier <filename>preferences</filename>. "
+"<literal>Dir::State</literal> contient le répertoire par défaut préfixé à "
+"tous les sous-éléments, quand ceux-ci ne commencent pas par <filename>/</"
+"filename> ou <filename>./</filename>."
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml
@@ -5502,14 +5515,14 @@ msgstr ""
 "<literal>Dir::Cache</literal> contient les emplacements qui renseignent sur "
 "le cache local : par exemple, les deux caches de paquets "
 "<literal>srcpkgcache</literal> et <literal>pkgcache</literal>, ainsi que "
-"l'endroit où sont placées les archives téléchargées, <literal>Dir::Cache::"
-"archives</literal>. On peut empêcher la création des caches en positionnant "
-"<literal>pkgcache</literal> ou <literal>srcpkgcache</literal> à la valeur "
-"<literal>\"\"</literal>. Cela ralentit le démarrage mais économise de "
-"l'espace disque. Il vaut mieux se passer du cache <literal>pkgcache</"
-"literal> plutôt que se passer du cache <literal>srcpkgcache</literal>. Comme "
-"pour <literal>Dir::State</literal>, le répertoire par défaut est contenu "
-"dans <literal>Dir::Cache</literal>."
+"l'endroit où sont placées les archives téléchargées, "
+"<literal>Dir::Cache::archives</literal>. On peut empêcher la création des "
+"caches en positionnant <literal>pkgcache</literal> ou <literal>srcpkgcache</"
+"literal> à la valeur <literal>\"\"</literal>. Cela ralentit le démarrage "
+"mais économise de l'espace disque. Il vaut mieux se passer du cache "
+"<literal>pkgcache</literal> plutôt que se passer du cache "
+"<literal>srcpkgcache</literal>. Comme pour <literal>Dir::State</literal>, le "
+"répertoire par défaut est contenu dans <literal>Dir::Cache</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml
@@ -5540,20 +5553,20 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml
 msgid ""
-"Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
-"Bin::Methods</literal> specifies the location of the method handlers and "
-"<literal>gzip</literal>, <literal>bzip2</literal>, <literal>lzma</literal>, "
-"<literal>dpkg</literal>, <literal>apt-get</literal> <literal>dpkg-source</"
-"literal> <literal>dpkg-buildpackage</literal> and <literal>apt-cache</"
-"literal> specify the location of the respective programs."
+"Binary programs are pointed to by <literal>Dir::Bin</literal>. "
+"<literal>Dir::Bin::Methods</literal> specifies the location of the method "
+"handlers and <literal>gzip</literal>, <literal>bzip2</literal>, "
+"<literal>lzma</literal>, <literal>dpkg</literal>, <literal>apt-get</literal> "
+"<literal>dpkg-source</literal> <literal>dpkg-buildpackage</literal> and "
+"<literal>apt-cache</literal> specify the location of the respective programs."
 msgstr ""
 "Les programmes binaires sont pointés par <literal>Dir::Bin</literal>. "
-"L'emplacement des gestionnaires de méthodes est indiqué par <literal>Dir::"
-"Bin::Methods</literal> ; <literal>gzip</literal>, <literal>bzip2</literal>, "
-"<literal>lzma</literal>, <literal>dpkg</literal>, <literal>apt-get</"
-"literal>, <literal>dpkg-source</literal>, <literal>dpkg-buildpackage</"
-"literal> et <literal>apt-cache</literal> indiquent l'emplacement des "
-"programmes correspondants."
+"L'emplacement des gestionnaires de méthodes est indiqué par "
+"<literal>Dir::Bin::Methods</literal> ; <literal>gzip</literal>, "
+"<literal>bzip2</literal>, <literal>lzma</literal>, <literal>dpkg</literal>, "
+"<literal>apt-get</literal>, <literal>dpkg-source</literal>, <literal>dpkg-"
+"buildpackage</literal> et <literal>apt-cache</literal> indiquent "
+"l'emplacement des programmes correspondants."
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml
@@ -5751,9 +5764,9 @@ msgid ""
 "literal>.  Special characters (equal signs, newlines, nonprintable "
 "characters, quotation marks, and percent signs in <literal>key</literal> and "
 "newlines, nonprintable characters, and percent signs in <literal>value</"
-"literal>) are %-encoded. Lists are represented by multiple <literal>key::"
-"=value</literal> lines with the same key. The configuration section ends "
-"with a blank line."
+"literal>) are %-encoded. Lists are represented by multiple "
+"<literal>key::=value</literal> lines with the same key. The configuration "
+"section ends with a blank line."
 msgstr ""
 "Chaque ligne de directive de configuration a la forme <literal>clé=valeur</"
 "literal>. Les caractères spéciaux (signes égal, fin de ligne, caractères non "
@@ -5817,10 +5830,10 @@ msgid ""
 msgstr ""
 "La version du protocole qu'il faut utiliser pour la commande "
 "<literal><replaceable>cmd</replaceable></literal> peut être choisie en "
-"réglant <literal>DPkg::Tools::options::<replaceable>cmd</replaceable>::"
-"Version</literal> en conséquence, la version par défaut étant la première. "
-"Si APT ne gère pas la version demandée, il enverra les informations dans la "
-"version la plus haute qu'il gère."
+"réglant <literal>DPkg::Tools::options::<replaceable>cmd</"
+"replaceable>::Version</literal> en conséquence, la version par défaut étant "
+"la première. Si APT ne gère pas la version demandée, il enverra les "
+"informations dans la version la plus haute qu'il gère."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
@@ -5889,10 +5902,10 @@ msgid ""
 "<literal>/usr/lib/apt/apt.systemd.daily</literal> script. See the top of "
 "this script for the brief documentation of these options."
 msgstr ""
-"Les groupes d'options <literal>APT::Periodic</literal> et <literal>APT::"
-"Archive</literal> configurent les comportements périodiques réalisés par le "
-"script <literal>/usr/lib/apt/apt.systemd.daily</literal>, lancé "
-"quotidiennement."
+"Les groupes d'options <literal>APT::Periodic</literal> et "
+"<literal>APT::Archive</literal> configurent les comportements périodiques "
+"réalisés par le script <literal>/usr/lib/apt/apt.systemd.daily</literal>, "
+"lancé quotidiennement."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.conf.5.xml
@@ -6093,8 +6106,8 @@ msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
 "install pass performed in, e.g., <literal>apt-get install</literal>, and not "
-"to the full <literal>apt</literal> dependency resolver; see <literal>Debug::"
-"pkgProblemResolver</literal> for that."
+"to the full <literal>apt</literal> dependency resolver; see "
+"<literal>Debug::pkgProblemResolver</literal> for that."
 msgstr ""
 "Crée les informations de débogage décrivant quels paquets sont installés "
 "automatiquement pour satisfaire les dépendances. Cela concerne la passe "
@@ -6110,14 +6123,14 @@ msgid ""
 "may trigger additional actions; they are shown indented two additional "
 "spaces under the original entry.  The format for each line is "
 "<literal>MarkKeep</literal>, <literal>MarkDelete</literal> or "
-"<literal>MarkInstall</literal> followed by <literal>package-name &lt;a.b.c -"
-"&gt; d.e.f | x.y.z&gt; (section)</literal> where <literal>a.b.c</literal> is "
-"the current version of the package, <literal>d.e.f</literal> is the version "
-"considered for installation and <literal>x.y.z</literal> is a newer version, "
-"but not considered for installation (because of a low pin score). The later "
-"two can be omitted if there is none or if it is the same as the installed "
-"version.  <literal>section</literal> is the name of the section the package "
-"appears in."
+"<literal>MarkInstall</literal> followed by <literal>package-name &lt;a.b.c "
+"-&gt; d.e.f | x.y.z&gt; (section)</literal> where <literal>a.b.c</literal> "
+"is the current version of the package, <literal>d.e.f</literal> is the "
+"version considered for installation and <literal>x.y.z</literal> is a newer "
+"version, but not considered for installation (because of a low pin score). "
+"The later two can be omitted if there is none or if it is the same as the "
+"installed version.  <literal>section</literal> is the name of the section "
+"the package appears in."
 msgstr ""
 "Crée les informations de débogage décrivant quels paquets sont gardés/"
 "installés/supprimés pendant le travail de l'outil de résolution de "
@@ -6132,11 +6145,12 @@ msgstr ""
 "prévue pour être installée (à cause d'un score plus faible). Ces deux "
 "derniers éléments peuvent ne pas être mentionnés s'ils ne sont pas "
 "pertinents où lorsque ils sont identiques à la version installée. "
-"<literal>section</literal> est le nom de la section où figure le paquet."
-"automatiquement pour satisfaire les dépendances. Cela concerne la passe "
-"initiale d'installation automatique effectuée par exemple par <literal>apt-"
-"get install</literal> et pas le système de résolution de dépendances complet "
-"de APT ; voir <literal>Debug::pkgProblemResolver</literal> pour ce dernier."
+"<literal>section</literal> est le nom de la section où figure le "
+"paquet.automatiquement pour satisfaire les dépendances. Cela concerne la "
+"passe initiale d'installation automatique effectuée par exemple par "
+"<literal>apt-get install</literal> et pas le système de résolution de "
+"dépendances complet de APT ; voir <literal>Debug::pkgProblemResolver</"
+"literal> pour ce dernier."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
@@ -6200,22 +6214,23 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
 msgid ""
-"Print information about the vendors read from <filename>/etc/apt/vendors."
-"list</filename>."
+"Print information about the vendors read from <filename>/etc/apt/"
+"vendors.list</filename>."
 msgstr ""
-"Affiche les fournisseurs déclarés dans le fichier <filename>/etc/apt/vendors."
-"list</filename>."
+"Affiche les fournisseurs déclarés dans le fichier <filename>/etc/apt/"
+"vendors.list</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
 msgid ""
-"Display the external commands that are called by apt hooks.  This includes e."
-"g. the config options <literal>DPkg::{Pre,Post}-Invoke</literal> or "
+"Display the external commands that are called by apt hooks.  This includes "
+"e.g. the config options <literal>DPkg::{Pre,Post}-Invoke</literal> or "
 "<literal>APT::Update::{Pre,Post}-Invoke</literal>."
 msgstr ""
 "Affiche les commandes externes qui sont appelés par le point d'entrée apt. "
-"Cela inclut par exemple les options de configuration <literal>DPkg::{Pre,"
-"Post}-Invoke</literal> ou <literal>APT::Update::{Pre,Post}-Invoke</literal>."
+"Cela inclut par exemple les options de configuration <literal>DPkg::"
+"{Pre,Post}-Invoke</literal> ou <literal>APT::Update::{Pre,Post}-Invoke</"
+"literal>."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml apt-ftparchive.1.xml
@@ -6328,15 +6343,15 @@ msgid ""
 "<literal>Dir::Ignore-Files-Silently</literal> configuration list - in which "
 "case it will be silently ignored."
 msgstr ""
-"Veuillez noter que les fichiers du répertoire <filename>/etc/apt/preferences."
-"d</filename> sont analysés par ordre alphanumérique ascendant, doivent avoir "
-"l'extension \"<literal>pref</literal>\" ou aucune extension et ne peuvent "
-"contenir que des caractères alphanumériques, des tirets (-), des caractères "
-"de soulignement (_) et des points (.). Dans le cas contraire, APT affichera "
-"un avertissement indiquant qu'il a ignoré un fichier si celui-ci ne "
-"correspond par à un motif défini dans <literal>Dir::Ignore-Files-Silently</"
-"literal> (les fichiers correspondant à cette variable de configuration "
-"étant, eux, ignorés silencieusemennt)."
+"Veuillez noter que les fichiers du répertoire <filename>/etc/apt/"
+"preferences.d</filename> sont analysés par ordre alphanumérique ascendant, "
+"doivent avoir l'extension \"<literal>pref</literal>\" ou aucune extension et "
+"ne peuvent contenir que des caractères alphanumériques, des tirets (-), des "
+"caractères de soulignement (_) et des points (.). Dans le cas contraire, APT "
+"affichera un avertissement indiquant qu'il a ignoré un fichier si celui-ci "
+"ne correspond par à un motif défini dans <literal>Dir::Ignore-Files-"
+"Silently</literal> (les fichiers correspondant à cette variable de "
+"configuration étant, eux, ignorés silencieusemennt)."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 #: apt_preferences.5.xml
@@ -7005,9 +7020,9 @@ msgstr ""
 #: apt_preferences.5.xml
 msgid ""
 "The <literal>:any</literal> suffix makes sure to select binary packages from "
-"any architecture. Without that suffix, apt implicitly assumes the <literal>:"
-"native</literal> suffix which would only select packages from the native "
-"architecture."
+"any architecture. Without that suffix, apt implicitly assumes the "
+"<literal>:native</literal> suffix which would only select packages from the "
+"native architecture."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
@@ -7176,9 +7191,9 @@ msgstr "Alors :"
 msgid ""
 "The most recent available version of the <literal>perl</literal> package "
 "will be installed, so long as that version's version number begins with "
-"\"<literal>&good-perl;</literal>\".  If <emphasis>any</emphasis> &good-perl;"
-"* version of <literal>perl</literal> is available and the installed version "
-"is &bad-perl;*, then <literal>perl</literal> will be downgraded."
+"\"<literal>&good-perl;</literal>\".  If <emphasis>any</emphasis> &good-"
+"perl;* version of <literal>perl</literal> is available and the installed "
+"version is &bad-perl;*, then <literal>perl</literal> will be downgraded."
 msgstr ""
 "La version la plus récente du paquet <literal>perl</literal> sera installé "
 "pour autant que son numéro de version commence par <literal>&good-perl;</"
@@ -7458,19 +7473,20 @@ msgid ""
 "files retrieved from locations listed in the &sources-list; file are stored "
 "in the directory <filename>/var/lib/apt/lists</filename>, or in the file "
 "named by the variable <literal>Dir::State::Lists</literal> in the "
-"<filename>apt.conf</filename> file.  For example, the file <filename>debian."
-"lcs.mit.edu_debian_dists_unstable_contrib_binary-i386_Release</filename> "
-"contains the <filename>Release</filename> file retrieved from the site "
-"<literal>debian.lcs.mit.edu</literal> for <literal>binary-i386</literal> "
-"architecture files from the <literal>contrib</literal> component of the "
-"<literal>unstable</literal> distribution."
+"<filename>apt.conf</filename> file.  For example, the file "
+"<filename>debian.lcs.mit.edu_debian_dists_unstable_contrib_binary-"
+"i386_Release</filename> contains the <filename>Release</filename> file "
+"retrieved from the site <literal>debian.lcs.mit.edu</literal> for "
+"<literal>binary-i386</literal> architecture files from the <literal>contrib</"
+"literal> component of the <literal>unstable</literal> distribution."
 msgstr ""
 "Tous les fichiers <filename>Packages</filename> et <filename>Release</"
 "filename> récupérés dans des sources indiquées dans le fichier &sources-"
 "list; sont conservés dans le répertoire <filename>/var/lib/apt/lists</"
-"filename> ou dans le fichier spécifié par la variable <literal>Dir::State::"
-"Lists</literal> dans le fichier <filename>apt.conf</filename>. Par exemple, "
-"le fichier <filename>debian.lcs.mit.edu_debian_dists_unstable_contrib_binary-"
+"filename> ou dans le fichier spécifié par la variable "
+"<literal>Dir::State::Lists</literal> dans le fichier <filename>apt.conf</"
+"filename>. Par exemple, le fichier "
+"<filename>debian.lcs.mit.edu_debian_dists_unstable_contrib_binary-"
 "i386_Release</filename> contient le fichier <filename>Release</filename> du "
 "site <literal>debian.lcs.mit.edu</literal>, architecture <literal>binary-"
 "i386</literal> et composant <literal>contrib</literal> de la distribution "
@@ -7825,14 +7841,15 @@ msgstr ""
 "Le répertoire <filename>/etc/apt/sources.list.d</filename> permet de "
 "spécifier des sources de paquets dans des fichiers distincts. Deux formats "
 "de fichiers différents sont permis comme cela est décrit dans les deux "
-"sections suivantes. Les noms de fichier doivent se terminer par <filename>."
-"list</filename> ou par <filename>.sources</filename> selon le format fourni. "
-"Ils ne peuvent contenir que des lettres (a-z et A-Z), des chiffres (0-9), "
-"des caractères de soulignement (_), des tirets (-) et des points (.). Dans "
-"le cas contraire, APT affichera un avertissement indiquant qu'il a ignoré un "
-"fichier si celui-ci ne correspond par à un motif défini dans <literal>Dir::"
-"Ignore-Files-Silently</literal> (les fichiers correspondant à cette variable "
-"de configuration étant, eux, ignorés silencieusement)."
+"sections suivantes. Les noms de fichier doivent se terminer par "
+"<filename>.list</filename> ou par <filename>.sources</filename> selon le "
+"format fourni. Ils ne peuvent contenir que des lettres (a-z et A-Z), des "
+"chiffres (0-9), des caractères de soulignement (_), des tirets (-) et des "
+"points (.). Dans le cas contraire, APT affichera un avertissement indiquant "
+"qu'il a ignoré un fichier si celui-ci ne correspond par à un motif défini "
+"dans <literal>Dir::Ignore-Files-Silently</literal> (les fichiers "
+"correspondant à cette variable de configuration étant, eux, ignorés "
+"silencieusement)."
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
@@ -7899,6 +7916,12 @@ msgstr ""
 "pas à rencontrer des options qui étaient rares avant l'introduction de la "
 "prise en charge multi-architecture."
 
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml
+msgid ""
+"This format is deprecated and may eventually be removed, but not before 2029."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><title>
 #: sources.list.5.xml
 msgid "deb822-Style Format"
@@ -8147,10 +8170,17 @@ msgstr "&sourceslist-sources-format;"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
-msgid ""
-"As an example, the sources for your distribution could look like this in one-"
-"line-style format: <placeholder type=\"literallayout\" id=\"0\"/> or like "
-"this in deb822 style format: <placeholder type=\"literallayout\" id=\"1\"/>"
+#, fuzzy
+#| msgid ""
+#| "As an example, the sources for your distribution could look like this in "
+#| "one-line-style format: <placeholder type=\"literallayout\" id=\"0\"/> or "
+#| "like this in deb822 style format: <placeholder type=\"literallayout\" "
+#| "id=\"1\"/>"
+msgid ""
+"As an example, the sources for your distribution could look like this in the "
+"deprecated one-line-style format: <placeholder type=\"literallayout\" "
+"id=\"0\"/> or like this in deb822 style format: <placeholder "
+"type=\"literallayout\" id=\"1\"/>"
 msgstr ""
 "À titre d'exemple, les sources de votre distribution au format « One-Line-"
 "Style » pourraient ressembler à ceci : <placeholder type=\"literallayout\" "
@@ -8222,20 +8252,22 @@ msgstr ""
 msgid ""
 "<option>Targets</option> (<option>target</option>) is a multivalue option "
 "defining which download targets apt will try to acquire from this source. If "
-"not specified, the default set is defined by the <option>Acquire::"
-"IndexTargets</option> configuration scope (targets are specified by their "
-"name in the <literal>Created-By</literal> field).  Additionally, targets can "
-"be enabled or disabled by using the <literal>Identifier</literal> field as "
-"an option with a boolean value instead of using this multivalue option."
+"not specified, the default set is defined by the "
+"<option>Acquire::IndexTargets</option> configuration scope (targets are "
+"specified by their name in the <literal>Created-By</literal> field).  "
+"Additionally, targets can be enabled or disabled by using the "
+"<literal>Identifier</literal> field as an option with a boolean value "
+"instead of using this multivalue option."
 msgstr ""
 "<option>Targets</option> (<option>target</option>) est une option "
 "multivaleur pour définir les cibles qu'apt essaiera d’acquérir à partir de "
 "cette source. Si cette option n'est pas spécifiée, la configuration par "
-"défaut est définie par le champ d'action de configuration <option>Acquire::"
-"IndexTargets</option> (les cibles sont définies par leur nom dans le champ "
-"<literal>Created-By</literal>). De plus, les cibles peuvent être activées ou "
-"désactivées en utilisant le champ <literal>Identifier</literal> comme option "
-"avec une valeur booléenne plutôt que d'utiliser cette option multivaleur."
+"défaut est définie par le champ d'action de configuration "
+"<option>Acquire::IndexTargets</option> (les cibles sont définies par leur "
+"nom dans le champ <literal>Created-By</literal>). De plus, les cibles "
+"peuvent être activées ou désactivées en utilisant le champ "
+"<literal>Identifier</literal> comme option avec une valeur booléenne plutôt "
+"que d'utiliser cette option multivaleur."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #: sources.list.5.xml
@@ -8254,10 +8286,10 @@ msgstr ""
 "anciens plutôt que de télécharger les nouveaux index en totalité. La valeur "
 "de cette option est ignorée si le dépôt n'annonce pas la disponibilité de "
 "PDiffs. Elle a, par défaut, la valeur de l'option du même nom pour un "
-"fichier particulier défini dans le champ d'action <option>Acquire::"
-"IndexTargets</option>, qui prend lui-même par défaut la valeur de l'option "
-"de configuration <option>Acquire::PDiffs</option>, dont la valeur par défaut "
-"est <literal>yes</literal>."
+"fichier particulier défini dans le champ d'action "
+"<option>Acquire::IndexTargets</option>, qui prend lui-même par défaut la "
+"valeur de l'option de configuration <option>Acquire::PDiffs</option>, dont "
+"la valeur par défaut est <literal>yes</literal>."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #: sources.list.5.xml
@@ -8450,8 +8482,9 @@ msgid ""
 "helps users identify mirrors which are no longer updated. However, some "
 "repositories such as historic archives are not updated any more by design, "
 "so this check can be disabled by setting this option to <literal>no</"
-"literal>.  Defaults to the value of configuration option <option>Acquire::"
-"Check-Valid-Until</option> which itself defaults to <literal>yes</literal>."
+"literal>.  Defaults to the value of configuration option "
+"<option>Acquire::Check-Valid-Until</option> which itself defaults to "
+"<literal>yes</literal>."
 msgstr ""
 "<option>Check-Valid-Until</option> (<option>check-valid-until</option>) est "
 "une valeur yes/no qui détermine si APT doit tenter de détecter les attaques "
@@ -9110,8 +9143,8 @@ msgstr ""
 #: apt-extracttemplates.1.xml
 msgid ""
 "Temporary directory in which to write extracted <command>debconf</command> "
-"template files and config scripts.  Configuration Item: <literal>APT::"
-"ExtractTemplates::TempDir</literal>"
+"template files and config scripts.  Configuration Item: "
+"<literal>APT::ExtractTemplates::TempDir</literal>"
 msgstr ""
 "Répertoire temporaire dans lequel écrire les scripts de configuration et "
 "modèles d'écrans pour <command>debconf</command>. Élément de configuration : "
@@ -9155,8 +9188,8 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-sortpkgs.1.xml
 msgid ""
-"Use source index field ordering.  Configuration Item: <literal>APT::"
-"SortPkgs::Source</literal>."
+"Use source index field ordering.  Configuration Item: "
+"<literal>APT::SortPkgs::Source</literal>."
 msgstr ""
 "Utiliser un index de sources pour le tri des champs. Élément de "
 "configuration : <literal>APT::SortPkgs::Source</literal>."
@@ -9292,10 +9325,10 @@ msgid ""
 "<filename>icons</filename> files as well as <filename>Release</filename>, "
 "<filename>Index</filename> and <filename>md5sum.txt</filename> files by "
 "default (<literal>APT::FTPArchive::Release::Default-Patterns</literal>).  "
-"Additional filename patterns can be added by listing them in <literal>APT::"
-"FTPArchive::Release::Patterns</literal>.  It then writes to stdout a "
-"<filename>Release</filename> file containing (by default) an MD5, SHA1, "
-"SHA256 and SHA512 digest for each file."
+"Additional filename patterns can be added by listing them in "
+"<literal>APT::FTPArchive::Release::Patterns</literal>.  It then writes to "
+"stdout a <filename>Release</filename> file containing (by default) an MD5, "
+"SHA1, SHA256 and SHA512 digest for each file."
 msgstr ""
 "La commande <literal>release</literal> crée un fichier Release à partir "
 "d'une arborescence. Elle recherche récursivement dans le répertoire indiqué "
@@ -9303,13 +9336,13 @@ msgstr ""
 "<filename>Contents</filename>, <filename>Components</filename> et "
 "<filename>icons</filename> non compressés et compressés ainsi que des "
 "fichiers <filename>Release</filename>, <filename>Index</filename> et "
-"<filename>md5sum.txt</filename> par défaut (<literal>APT::FTPArchive::"
-"Release::Default-Patterns</literal>). Des motifs supplémentaires pour les "
-"noms de fichiers peuvent être ajoutés en les mentionnant dans <literal>APT::"
-"FTPArchive::Release::Patterns</literal>. Le fichier <filename>Release</"
-"filename> est ensuite affiché sur la sortie standard et comporte (par "
-"défaut) des sommes de contrôle MD5, SHA1 et SHA256 et SHA512 pour chaque "
-"fichier."
+"<filename>md5sum.txt</filename> par défaut "
+"(<literal>APT::FTPArchive::Release::Default-Patterns</literal>). Des motifs "
+"supplémentaires pour les noms de fichiers peuvent être ajoutés en les "
+"mentionnant dans <literal>APT::FTPArchive::Release::Patterns</literal>. Le "
+"fichier <filename>Release</filename> est ensuite affiché sur la sortie "
+"standard et comporte (par défaut) des sommes de contrôle MD5, SHA1 et SHA256 "
+"et SHA512 pour chaque fichier."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml
@@ -9553,8 +9586,8 @@ msgstr "La section <literal>TreeDefault</literal>"
 #: apt-ftparchive.1.xml
 msgid ""
 "Sets defaults specific to <literal>Tree</literal> sections. All of these "
-"variables are substitution variables and have the strings $(DIST), "
-"$(SECTION) and $(ARCH) replaced with their respective values."
+"variables are substitution variables and have the strings $(DIST), $"
+"(SECTION) and $(ARCH) replaced with their respective values."
 msgstr ""
 "Indique les valeurs par défaut particulières à la section <literal>Tree</"
 "literal>. Toutes ces variables sont des variables de substitution ; les "
@@ -9593,8 +9626,8 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml
 msgid ""
-"Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
-"$(SECTION)/binary-$(ARCH)/</filename>"
+"Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/$"
+"(SECTION)/binary-$(ARCH)/</filename>"
 msgstr ""
 "Indique la racine de l'arborescence des « .deb ». Par défaut, c'est "
 "<filename>$(DIST)/$(SECTION)/binary-$(ARCH)/</filename>."
@@ -9602,8 +9635,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>."
@@ -9614,8 +9647,8 @@ msgid ""
 "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "binary-$(ARCH)/Packages</filename>"
 msgstr ""
-"Indique le fichier « Packages » créé. Par défaut, c'est <filename>$(DIST)/"
-"$(SECTION)/binary-$(ARCH)/Packages</filename>."
+"Indique le fichier « Packages » créé. Par défaut, c'est <filename>$(DIST)/$"
+"(SECTION)/binary-$(ARCH)/Packages</filename>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml
@@ -9623,15 +9656,15 @@ msgid ""
 "Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "source/Sources</filename>"
 msgstr ""
-"Indique le fichier « Sources » créé. Par défaut, c'est <filename>$(DIST)/"
-"$(SECTION)/source/Sources</filename>."
+"Indique le fichier « Sources » créé. Par défaut, c'est <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 ""
 "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 "
@@ -10062,14 +10095,14 @@ msgid ""
 "literal>."
 msgstr ""
 "Indique le fichier d'« override » à utiliser avec la commande "
-"<literal>sources</literal>. Élément de configuration : <literal>APT::"
-"FTPArchive::SourceOverride</literal>."
+"<literal>sources</literal>. Élément de configuration : "
+"<literal>APT::FTPArchive::SourceOverride</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml
 msgid ""
-"Make the caching databases read only.  Configuration Item: <literal>APT::"
-"FTPArchive::ReadOnlyDB</literal>."
+"Make the caching databases read only.  Configuration Item: "
+"<literal>APT::FTPArchive::ReadOnlyDB</literal>."
 msgstr ""
 "N'autoriser que la lecture pour les bases de données de cache. Élément de "
 "configuration : <literal>APT::FTPArchive::ReadOnlyDB</literal>."
@@ -10368,8 +10401,8 @@ msgstr ""
 "<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=\"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 "
@@ -10436,8 +10469,8 @@ msgid ""
 "Configuration Item: <literal>Dir::Etc::netrcparts</literal>."
 msgstr ""
 "Informations de connexion pour les sources et les mandataires d'APT dans un "
-"format de type netrc. Élément de configuration : <literal>Dir::Etc::"
-"netrcparts</literal>."
+"format de type netrc. Élément de configuration : "
+"<literal>Dir::Etc::netrcparts</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt_auth.conf.5.xml
@@ -10510,16 +10543,17 @@ msgid ""
 "The environment variable <envar>http_proxy</envar> is supported for system "
 "wide configuration.  Proxies specific to APT can be configured via the "
 "option <literal>Acquire::http::Proxy</literal>.  Proxies which should be "
-"used only for certain hosts can be specified via <literal>Acquire::http::"
-"Proxy::<replaceable>host</replaceable></literal>. Even more fine-grained "
-"control can be achieved via proxy autodetection, detailed further below.  "
-"All these options use the URI format <literal><replaceable>scheme</"
-"replaceable>://[[<replaceable>user</replaceable>][:<replaceable>pass</"
-"replaceable>]@]<replaceable>host</replaceable>[:<replaceable>port</"
-"replaceable>]/</literal>.  Supported URI schemes are <literal>socks5h</"
-"literal> (SOCKS5 with remote DNS resolution), <literal>http</literal> and "
-"<literal>https</literal>.  Authentication details can be supplied via &apt-"
-"authconf; instead of including it in the URI directly."
+"used only for certain hosts can be specified via "
+"<literal>Acquire::http::Proxy::<replaceable>host</replaceable></literal>. "
+"Even more fine-grained control can be achieved via proxy autodetection, "
+"detailed further below.  All these options use the URI format "
+"<literal><replaceable>scheme</replaceable>://[[<replaceable>user</"
+"replaceable>][:<replaceable>pass</replaceable>]@]<replaceable>host</"
+"replaceable>[:<replaceable>port</replaceable>]/</literal>.  Supported URI "
+"schemes are <literal>socks5h</literal> (SOCKS5 with remote DNS resolution), "
+"<literal>http</literal> and <literal>https</literal>.  Authentication "
+"details can be supplied via &apt-authconf; instead of including it in the "
+"URI directly."
 msgstr ""
 "La variable d'environnement <envar>http_proxy</envar> est prise en charge "
 "pour une configuration au niveau du système. Les mandataires particuliers à "
@@ -10553,14 +10587,14 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt-transport-http.1.xml
 msgid ""
-"Furthermore, there are three settings provided for cache control with "
-"HTTP/1.1 compliant proxy caches: <literal>Acquire::http::No-Cache</literal> "
-"tells the proxy not to use its cached response under any circumstances.  "
+"Furthermore, there are three settings provided for cache control with HTTP/"
+"1.1 compliant proxy caches: <literal>Acquire::http::No-Cache</literal> tells "
+"the proxy not to use its cached response under any circumstances.  "
 "<literal>Acquire::http::Max-Age</literal> sets the allowed maximum age (in "
-"seconds) of an index file in the cache of the proxy.  <literal>Acquire::"
-"http::No-Store</literal> specifies that the proxy should not store the "
-"requested archive files in its cache, which can be used to prevent the proxy "
-"from polluting its cache with (big) .deb files."
+"seconds) of an index file in the cache of the proxy.  "
+"<literal>Acquire::http::No-Store</literal> specifies that the proxy should "
+"not store the requested archive files in its cache, which can be used to "
+"prevent the proxy from polluting its cache with (big) .deb files."
 msgstr ""
 "De plus, il y a trois options de configuration fournies pour le contrôle des "
 "caches mandataire compatibles avec HTTP/1.1 : <literal>Acquire::http::No-"
@@ -10604,8 +10638,8 @@ msgid ""
 "<replaceable>host</replaceable></literal>."
 msgstr ""
 "Notez que l'auto-détection ne sera pas exécutée si une configuration "
-"spécifique de mandataire hôte a déjà été établie par <literal>Acquire::http::"
-"Proxy::<replaceable>hôte</replaceable></literal>."
+"spécifique de mandataire hôte a déjà été établie par "
+"<literal>Acquire::http::Proxy::<replaceable>hôte</replaceable></literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt-transport-http.1.xml
@@ -10619,11 +10653,11 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt-transport-http.1.xml
 msgid ""
-"This option takes precedence over the legacy option name <literal>Acquire::"
-"http::ProxyAutoDetect</literal>."
+"This option takes precedence over the legacy option name "
+"<literal>Acquire::http::ProxyAutoDetect</literal>."
 msgstr ""
-"Cette option prend le pas sur l'ancien nom d'option <literal>Acquire::http::"
-"ProxyAutoDetect</literal>."
+"Cette option prend le pas sur l'ancien nom d'option "
+"<literal>Acquire::http::ProxyAutoDetect</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 #: apt-transport-http.1.xml
@@ -10661,12 +10695,12 @@ msgstr ""
 #: apt-transport-http.1.xml
 msgid ""
 "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
-"enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
-"g. on high-latency connections. It specifies how many requests are sent in a "
-"pipeline.  APT tries to detect and work around misbehaving webservers and "
-"proxies at runtime, but if you know that yours does not conform to the "
-"HTTP/1.1 specification, pipelining can be disabled by setting the value to "
-"0. It is enabled by default with the value 10."
+"enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial "
+"e.g. on high-latency connections. It specifies how many requests are sent in "
+"a pipeline.  APT tries to detect and work around misbehaving webservers and "
+"proxies at runtime, but if you know that yours does not conform to the HTTP/"
+"1.1 specification, pipelining can be disabled by setting the value to 0. It "
+"is enabled by default with the value 10."
 msgstr ""
 "Le réglage <literal>Acquire::http::Pipeline-Depth</literal> permet "
 "d'utiliser l'enchaînement HTTP (« HTTP pipelining », RFC 2616 "
@@ -10798,9 +10832,9 @@ msgstr ""
 msgid ""
 "The HTTPS protocol is based on the HTTP protocol, so all options supported "
 "by &apt-transport-http; are also available via <literal>Acquire::https</"
-"literal> and will default to the same values specified for <literal>Acquire::"
-"http</literal>. This manpage will only document the options <emphasis>unique "
-"to https</emphasis>."
+"literal> and will default to the same values specified for "
+"<literal>Acquire::http</literal>. This manpage will only document the "
+"options <emphasis>unique to https</emphasis>."
 msgstr ""
 "Le protocole HTTPS est basé sur le protocole HTTP, aussi toutes les options "
 "prises en charge par &apt-transport-http; sont aussi disponibles au moyen de "
@@ -10846,9 +10880,10 @@ msgstr ""
 #: apt-transport-https.1.xml
 msgid ""
 "A custom certificate revocation list (CRL) can be configured with the "
-"options <literal>Acquire::https::CRLFile</literal> and <literal>Acquire::"
-"https::CRLFile::<replaceable>host</replaceable></literal>.  As with the "
-"previous option, a file in PEM format needs to be specified."
+"options <literal>Acquire::https::CRLFile</literal> and "
+"<literal>Acquire::https::CRLFile::<replaceable>host</replaceable></"
+"literal>.  As with the previous option, a file in PEM format needs to be "
+"specified."
 msgstr ""
 "Une liste de révocation de certificats (CRL) personnalisée peut être "
 "configurée avec l'option <literal>Acquire::https::CRLFile</literal> et "
@@ -10920,11 +10955,11 @@ msgstr "Authentification du client"
 msgid ""
 "Besides supporting password-based authentication (see &apt-authconf;) HTTPS "
 "also supports authentication based on client certificates via "
-"<literal>Acquire::https::SSLCert</literal> and <literal>Acquire::https::"
-"SSLKey</literal>. These should be set respectively to the filename of the "
-"X.509 client certificate and the associated (unencrypted) private key, both "
-"in PEM format.  In practice the use of the host-specific variants of both "
-"options is highly recommended."
+"<literal>Acquire::https::SSLCert</literal> and "
+"<literal>Acquire::https::SSLKey</literal>. These should be set respectively "
+"to the filename of the X.509 client certificate and the associated "
+"(unencrypted) private key, both in PEM format.  In practice the use of the "
+"host-specific variants of both options is highly recommended."
 msgstr ""
 "Outre la gestion de l'authentification basée sur les mots de passe (voir "
 "&apt-authconf;) HTTPS prend aussi en charge l'authentification basée sur les "
@@ -11229,9 +11264,9 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt-transport-mirror.1.xml
 msgid ""
-"Assuming a file with this content is stored as <filename>/etc/apt/mirrorlist."
-"txt</filename> on your machine it can be used like this in &sources-list; "
-"(since apt 1.6):"
+"Assuming a file with this content is stored as <filename>/etc/apt/"
+"mirrorlist.txt</filename> on your machine it can be used like this in "
+"&sources-list; (since apt 1.6):"
 msgstr ""
 "Si un fichier avec ce contenu est stocké sur la machine sous le nom de "
 "<filename>/etc/apt/mirrorlist.txt</filename>, il peut être utilisé comme "
@@ -12099,10 +12134,10 @@ msgstr ""
 #: apt-patterns.7.xml
 msgid ""
 "<code>foo</code> cannot be used as a shortform for <code>?name(foo)</code>, "
-"as this can cause typos to go unnoticed: Consider <code>?and(...,"
-"~poptional)</code>: this requires the package to have <code>required</code> "
-"priority, but if you do not type the <code>~</code>, it would require the "
-"package name to contain <code>poptional</code>."
+"as this can cause typos to go unnoticed: Consider <code>?"
+"and(...,~poptional)</code>: this requires the package to have "
+"<code>required</code> priority, but if you do not type the <code>~</code>, "
+"it would require the package name to contain <code>poptional</code>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
@@ -13757,19 +13792,19 @@ msgstr "Cette commande utilisera les fichiers récupérés sur le disque."
 
 #~ msgid ""
 #~ "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP "
-#~ "URIs.  It is in the standard form of <literal>ftp://[[user][:pass]@]host[:"
-#~ "port]/</literal>.  Per host proxies can also be specified by using the "
-#~ "form <literal>ftp::Proxy::&lt;host&gt;</literal> with the special keyword "
-#~ "<literal>DIRECT</literal> meaning to use no proxies. If no one of the "
-#~ "above settings is specified, <envar>ftp_proxy</envar> environment "
-#~ "variable will be used. To use an FTP proxy you will have to set the "
-#~ "<literal>ftp::ProxyLogin</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>."
+#~ "URIs.  It is in the standard form of <literal>ftp://[[user]"
+#~ "[:pass]@]host[:port]/</literal>.  Per host proxies can also be specified "
+#~ "by using the form <literal>ftp::Proxy::&lt;host&gt;</literal> with the "
+#~ "special keyword <literal>DIRECT</literal> meaning to use no proxies. If "
+#~ "no one of the above settings is specified, <envar>ftp_proxy</envar> "
+#~ "environment variable will be used. To use an FTP proxy you will have to "
+#~ "set the <literal>ftp::ProxyLogin</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>."
 #~ 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 : "
@@ -14064,9 +14099,9 @@ msgstr "Cette commande utilisera les fichiers récupérés sur le disque."
 #~ "With this option it is possible to specify a particular keyring file the "
 #~ "command should operate on. The default is that a command is executed on "
 #~ "the <filename>trusted.gpg</filename> file as well as on all parts in the "
-#~ "<filename>trusted.gpg.d</filename> directory, though <filename>trusted."
-#~ "gpg</filename> is the primary keyring which means that e.g. new keys are "
-#~ "added to this one."
+#~ "<filename>trusted.gpg.d</filename> directory, though "
+#~ "<filename>trusted.gpg</filename> is the primary keyring which means that "
+#~ "e.g. new keys are added to this one."
 #~ msgstr ""
 #~ "Cette option permet d'indiquer le fichier porte-clés sur lequel la "
 #~ "commande doit agir. Par défaut, une commande sera exécutée sur le fichier "
@@ -14142,12 +14177,12 @@ msgstr "Cette commande utilisera les fichiers récupérés sur le disque."
 
 #~ msgid ""
 #~ "<literal>http::Proxy</literal> sets the default proxy to use for HTTP "
-#~ "URIs. It is in the standard form of <literal>http://[[user][:pass]@]host[:"
-#~ "port]/</literal>.  Per host proxies can also be specified by using the "
-#~ "form <literal>http::Proxy::&lt;host&gt;</literal> with the special "
-#~ "keyword <literal>DIRECT</literal> meaning to use no proxies. If no one of "
-#~ "the above settings is specified, <envar>http_proxy</envar> environment "
-#~ "variable will be used."
+#~ "URIs. It is in the standard form of <literal>http://[[user]"
+#~ "[:pass]@]host[:port]/</literal>.  Per host proxies can also be specified "
+#~ "by using the form <literal>http::Proxy::&lt;host&gt;</literal> with the "
+#~ "special keyword <literal>DIRECT</literal> meaning to use no proxies. If "
+#~ "no one of the above settings is specified, <envar>http_proxy</envar> "
+#~ "environment variable will be used."
 #~ msgstr ""
 #~ "<literal>http::Proxy</literal> est le mandataire (proxy) HTTP à utiliser "
 #~ "par défaut pour les URI HTTP. Il se présente sous la forme standard : "
@@ -14179,19 +14214,19 @@ msgstr "Cette commande utilisera les fichiers récupérés sur le disque."
 #~ "info about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> "
 #~ "is the corresponding per-host option.  <literal>Verify-Peer</literal> "
 #~ "boolean suboption determines whether or not the server's host certificate "
-#~ "should be verified against trusted certificates.  <literal>&lt;host&gt;::"
-#~ "Verify-Peer</literal> is the corresponding per-host option.  "
-#~ "<literal>Verify-Host</literal> boolean suboption determines whether or "
-#~ "not the server's hostname should be verified.  <literal>&lt;host&gt;::"
-#~ "Verify-Host</literal> is the corresponding per-host option.  "
-#~ "<literal>SslCert</literal> determines what certificate to use for client "
-#~ "authentication. <literal>&lt;host&gt;::SslCert</literal> is the "
-#~ "corresponding per-host option.  <literal>SslKey</literal> determines what "
-#~ "private key to use for client authentication. <literal>&lt;host&gt;::"
-#~ "SslKey</literal> is the corresponding per-host option.  "
-#~ "<literal>SslForceVersion</literal> overrides default SSL version to use.  "
-#~ "It can contain either of the strings '<literal>TLSv1</literal>' or "
-#~ "'<literal>SSLv3</literal>'.  <literal>&lt;host&gt;::SslForceVersion</"
+#~ "should be verified against trusted certificates.  "
+#~ "<literal>&lt;host&gt;::Verify-Peer</literal> is the corresponding per-"
+#~ "host option.  <literal>Verify-Host</literal> boolean suboption determines "
+#~ "whether or not the server's hostname should be verified.  "
+#~ "<literal>&lt;host&gt;::Verify-Host</literal> is the corresponding per-"
+#~ "host option.  <literal>SslCert</literal> determines what certificate to "
+#~ "use for client authentication. <literal>&lt;host&gt;::SslCert</literal> "
+#~ "is the corresponding per-host option.  <literal>SslKey</literal> "
+#~ "determines what private key to use for client authentication. "
+#~ "<literal>&lt;host&gt;::SslKey</literal> is the corresponding per-host "
+#~ "option.  <literal>SslForceVersion</literal> overrides default SSL version "
+#~ "to use.  It can contain either of the strings '<literal>TLSv1</literal>' "
+#~ "or '<literal>SSLv3</literal>'.  <literal>&lt;host&gt;::SslForceVersion</"
 #~ "literal> is the corresponding per-host option."
 #~ msgstr ""
 #~ "La sous-option <literal>CaInfo</literal> spécifie le fichier contenant "
@@ -14218,8 +14253,8 @@ msgstr "Cette commande utilisera les fichiers récupérés sur le disque."
 #~ "Le procédé <literal>http</literal> indique un serveur HTTP comme archive. "
 #~ "Si une variable d'environnement <envar>http_proxy</envar> (au format "
 #~ "http://server:port/)  existe, le serveur mandataire indiqué par "
-#~ "<envar>http_proxy</envar> est utilisé.  Quand un serveur mandataire "
-#~ "HTTP/1.1 demande une authentification, on peut utiliser la chaîne http://"
+#~ "<envar>http_proxy</envar> est utilisé.  Quand un serveur mandataire HTTP/"
+#~ "1.1 demande une authentification, on peut utiliser la chaîne http://"
 #~ "user:pass@server:port/. Notez qu'il s'agit d'une méthode "
 #~ "d'authentification peu sûre."
 
@@ -14228,9 +14263,10 @@ msgstr "Cette commande utilisera les fichiers récupérés sur le disque."
 #~ "it encounters unauthenticated archives to give a slightly longer grace "
 #~ "period on this backward compatibility effecting change. This exception "
 #~ "will be removed in future releases and you can opt-out of this grace "
-#~ "period by setting the configuration option <option>Binary::apt-get::"
-#~ "Acquire::AllowInsecureRepositories</option> to <literal>false</literal> "
-#~ "or <option>--no-allow-insecure-repositories</option> on the command line."
+#~ "period by setting the configuration option <option>Binary::apt-"
+#~ "get::Acquire::AllowInsecureRepositories</option> to <literal>false</"
+#~ "literal> or <option>--no-allow-insecure-repositories</option> on the "
+#~ "command line."
 #~ msgstr ""
 #~ "Comme exception temporaire, &apt-get; (pas &apt; !) émet seulement une "
 #~ "mise en garde s'il rencontre des archives non authentifiées pour accorder "
@@ -14406,15 +14442,16 @@ msgstr "Cette commande utilisera les fichiers récupérés sur le disque."
 #~ "Les paquets essentiels (et leurs dépendances) devraient être configurés "
 #~ "après avoir été décompressés. Il est conseillé que cette opération ait "
 #~ "lieu le plus tôt possible dans le processus de mise à jour car ces "
-#~ "opérations de configuration nécessitent également <literal>DPkg::"
-#~ "TriggersPending</literal>, ce qui peut conduire à l'exécution de certains "
-#~ "actions différées qui ne sont pas nécessairement utiles. Les paquets "
-#~ "essentiels obtiennent par défaut un score élevé mais le marqueur "
-#~ "« immédiat » implique un score assez bas (par exemple un paquet qui "
-#~ "comporte des prédépendances obtient un score plus élevé). Cette option et "
-#~ "les options du même groupe permettent de modifier la façon d'attribuer un "
-#~ "score. L'exemple ci-dessous indique ces réglages avec leurs valeurs par "
-#~ "défaut. <placeholder type=\"literallayout\" id=\"0\"/>"
+#~ "opérations de configuration nécessitent également "
+#~ "<literal>DPkg::TriggersPending</literal>, ce qui peut conduire à "
+#~ "l'exécution de certains actions différées qui ne sont pas nécessairement "
+#~ "utiles. Les paquets essentiels obtiennent par défaut un score élevé mais "
+#~ "le marqueur « immédiat » implique un score assez bas (par exemple un "
+#~ "paquet qui comporte des prédépendances obtient un score plus élevé). "
+#~ "Cette option et les options du même groupe permettent de modifier la "
+#~ "façon d'attribuer un score. L'exemple ci-dessous indique ces réglages "
+#~ "avec leurs valeurs par défaut. <placeholder type=\"literallayout\" "
+#~ "id=\"0\"/>"
 
 #~ msgid "List fingerprints of trusted keys."
 #~ msgstr "Afficher les empreintes des clés fiables."
@@ -14558,8 +14595,8 @@ msgstr "Cette commande utilisera les fichiers récupérés sur le disque."
 
 #~ msgid ""
 #~ "No action; perform a simulation of events that would occur but do not "
-#~ "actually change the system.  Configuration Item: <literal>APT::Get::"
-#~ "Simulate</literal>."
+#~ "actually change the system.  Configuration Item: "
+#~ "<literal>APT::Get::Simulate</literal>."
 #~ msgstr ""
 #~ "Pas d'action ; simule les événements qui devraient se produire sans "
 #~ "effectuer de changement réel sur le système. Élément de configuration : "
@@ -14567,12 +14604,12 @@ msgstr "Cette commande utilisera les fichiers récupérés sur le disque."
 
 #~ msgid ""
 #~ "Simulated runs performed as a user will automatically deactivate locking "
-#~ "(<literal>Debug::NoLocking</literal>), and if the option <literal>APT::"
-#~ "Get::Show-User-Simulation-Note</literal> is set (as it is by default) a "
-#~ "notice will also be displayed indicating that this is only a simulation. "
-#~ "Runs performed as root do not trigger either NoLocking or the notice - "
-#~ "superusers should know what they are doing without further warnings from "
-#~ "<literal>apt-get</literal>."
+#~ "(<literal>Debug::NoLocking</literal>), and if the option "
+#~ "<literal>APT::Get::Show-User-Simulation-Note</literal> is set (as it is "
+#~ "by default) a notice will also be displayed indicating that this is only "
+#~ "a simulation. Runs performed as root do not trigger either NoLocking or "
+#~ "the notice - superusers should know what they are doing without further "
+#~ "warnings from <literal>apt-get</literal>."
 #~ msgstr ""
 #~ "Lorsque la simulation est effectuée par un utilisateur sans privilège, le "
 #~ "verrouillage sera désactivé automatiquement (<literal>Debug::NoLocking</"
@@ -14591,8 +14628,8 @@ msgstr "Cette commande utilisera les fichiers récupérés sur le disque."
 #~ msgstr ""
 #~ "Ignorer le fait que les paquets ne peuvent pas être authentifiés ; ne le "
 #~ "signale pas à l'utilisateur. Cette option est très utile pour certains "
-#~ "outils comme pbuilder. Élément de configuration : <literal>APT::Get::"
-#~ "AllowUnauthenticated</literal>."
+#~ "outils comme pbuilder. Élément de configuration : "
+#~ "<literal>APT::Get::AllowUnauthenticated</literal>."
 
 #~ msgid ""
 #~ "Version 2 of this protocol dumps more information, including the protocol "
@@ -14761,8 +14798,8 @@ msgstr "Cette commande utilisera les fichiers récupérés sur le disque."
 #~| "B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources.list>(5), "
 #~| "B<apt_preferences>(5), B<apt-secure>(8)"
 #~ msgid ""
-#~ "B<apt>(8), B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources."
-#~ "list>(5), B<apt_preferences>(5), B<apt-secure>(8)"
+#~ "B<apt>(8), B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), "
+#~ "B<sources.list>(5), B<apt_preferences>(5), B<apt-secure>(8)"
 #~ msgstr ""
 #~ "B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources.list>(5), "
 #~ "B<apt_preferences>(5), B<apt-secure>(8)"
@@ -14787,16 +14824,16 @@ msgstr "Cette commande utilisera les fichiers récupérés sur le disque."
 #~ "B<reportbug>(1)  command."
 #~ msgstr ""
 #~ "Voir E<lt>https://bugs.debian.org/aptE<gt>. Si vous souhaitez signaler un "
-#~ "bogue dans B<apt>, veuillez lire I</usr/share/doc/debian/bug-reporting."
-#~ "txt> ou utiliser la commande B<reportbug>(1)."
+#~ "bogue dans B<apt>, veuillez lire I</usr/share/doc/debian/bug-"
+#~ "reporting.txt> ou utiliser la commande B<reportbug>(1)."
 
 #~ msgid "AUTHOR"
 #~ msgstr "AUTEURS"
 
 #~ msgid "apt was written by the APT team E<lt>apt@packages.debian.orgE<gt>."
 #~ msgstr ""
-#~ "apt a été écrit par l'équipe de développement APT E<lt>apt@packages."
-#~ "debian.orgE<gt>."
+#~ "apt a été écrit par l'équipe de développement APT "
+#~ "E<lt>apt@packages.debian.orgE<gt>."
 
 #~ msgid "Package resource list for APT"
 #~ msgstr "Liste des sources de paquets"
@@ -14902,8 +14939,8 @@ msgstr "Cette commande utilisera les fichiers récupérés sur le disque."
 #~ "La liste des sources de paquets indique où trouver les archives du "
 #~ "système de distribution de paquets utilisé. Pour l'instant, cette page de "
 #~ "manuel ne documente que le système d'empaquetage utilisé par le système "
-#~ "Debian GNU/Linux. Ce fichier de contrôle est <filename>/etc/apt/sources."
-#~ "list</filename>."
+#~ "Debian GNU/Linux. Ce fichier de contrôle est <filename>/etc/apt/"
+#~ "sources.list</filename>."
 
 #~ msgid ""
 #~ "The source list is designed to support any number of active sources and a "
@@ -15001,8 +15038,8 @@ msgstr "Cette commande utilisera les fichiers récupérés sur le disque."
 #~ msgstr ""
 #~ "Créer la somme de contrôle MD5. Cette option est activée par défaut. "
 #~ "Quand elle est désactivée, les fichiers d'index n'ont pas les champs "
-#~ "MD5Sum là où c'est possible. Élément de configuration : <literal>APT::"
-#~ "FTPArchive::MD5</literal>."
+#~ "MD5Sum là où c'est possible. Élément de configuration : "
+#~ "<literal>APT::FTPArchive::MD5</literal>."
 
 #~ msgid "Show a short usage summary."
 #~ msgstr "Affiche un résumé de l'aide"
@@ -15134,10 +15171,10 @@ msgstr "Cette commande utilisera les fichiers récupérés sur le disque."
 #~ "uniforme. Quand un outil d'APT démarre, il lit la configuration désignée "
 #~ "par variable d'environnement <envar>APT_CONFIG</envar> (si elle existe), "
 #~ "puis il lit les fichiers situés dans <literal>Dir::Etc::Parts</literal> "
-#~ "ainsi que le principal fichier de configuration indiqué par <literal>Dir::"
-#~ "Etc::main</literal> ; enfin il applique les options de la ligne de "
-#~ "commande qui prévalent sur les directives de configuration, chargeant si "
-#~ "nécessaire d'autres fichiers de configuration."
+#~ "ainsi que le principal fichier de configuration indiqué par "
+#~ "<literal>Dir::Etc::main</literal> ; enfin il applique les options de la "
+#~ "ligne de commande qui prévalent sur les directives de configuration, "
+#~ "chargeant si nécessaire d'autres fichiers de configuration."
 
 #~ msgid ""
 #~ "Disable Immediate Configuration; This dangerous option disables some of "
diff --git a/doc/po/it.po b/doc/po/it.po
index 5520933f9..aaa37caaa 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: 2025-01-01 21:58+0100\n"
+"POT-Creation-Date: 2025-01-28 18:52+0000\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"
@@ -595,11 +595,13 @@ msgstr ""
 #. type: Plain text
 #: apt.ent
 msgid ""
-"<!-- TRANSLATOR: used as in -o=config_string e.g. -o=Debug::"
-"pkgProblemResolver=1 --> <!ENTITY synopsis-config-string \"config_string\">"
+"<!-- TRANSLATOR: used as in -o=config_string e.g. "
+"-o=Debug::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 \"stringa_config\">"
+"<!-- TRANSLATOR: used as in -o=config_string e.g. "
+"-o=Debug::pkgProblemResolver=1 --> <!ENTITY synopsis-config-string "
+"\"stringa_config\">"
 
 #. type: Plain text
 #: apt.ent
@@ -613,12 +615,12 @@ msgstr ""
 #. type: Plain text
 #: apt.ent
 msgid ""
-"<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release e.g. -"
-"t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
+"<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release e.g. "
+"-t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
 "\"target_release\">"
 msgstr ""
-"<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release e.g. -"
-"t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
+"<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release e.g. "
+"-t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
 "\"rilascio_obiettivo\">"
 
 #. type: Plain text
@@ -669,11 +671,11 @@ msgstr ""
 #. type: Plain text
 #: apt.ent
 msgid ""
-"<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom -"
-"d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"cdrom_mount_point\">"
+"<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom "
+"-d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"cdrom_mount_point\">"
 msgstr ""
-"<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom -"
-"d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"punto_mount_cdrom\">"
+"<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom "
+"-d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"punto_mount_cdrom\">"
 
 #. type: Plain text
 #: apt.ent
@@ -1154,11 +1156,11 @@ msgid ""
 msgstr ""
 "<literal>update</literal> è usato per sincronizzare nuovamente i file degli "
 "indici dei pacchetti dalle loro fonti. Gli indici dei pacchetti disponibili "
-"sono scaricati dalle posizioni specificate in <filename>/etc/apt/sources."
-"list</filename>. Per esempio, quando si usa un archivio Debian, questo "
-"comando recupera e analizza i file <filename>Packages.gz</filename>, in modo "
-"da rendere disponibili informazioni sui pacchetti nuovi e quelli aggiornati. "
-"Si dovrebbe sempre fare un <literal>update</literal> prima di un "
+"sono scaricati dalle posizioni specificate in <filename>/etc/apt/"
+"sources.list</filename>. Per esempio, quando si usa un archivio Debian, "
+"questo comando recupera e analizza i file <filename>Packages.gz</filename>, "
+"in modo da rendere disponibili informazioni sui pacchetti nuovi e quelli "
+"aggiornati. Si dovrebbe sempre fare un <literal>update</literal> prima di un "
 "<literal>upgrade</literal> o <literal>dist-upgrade</literal>. Notare che "
 "l'indicatore di avanzamento globale non è preciso perché è impossibile "
 "conoscere in anticipo la dimensione dei file degli indici dei pacchetti."
@@ -1682,8 +1684,8 @@ msgid ""
 "Configuration Item: <literal>APT::Get::Download-Only</literal>."
 msgstr ""
 "Scarica solamente; i file di pacchetto sono solo recuperati e non "
-"spacchettati o installati. Voce di configurazione: <literal>APT::Get::"
-"Download-Only</literal>."
+"spacchettati o installati. Voce di configurazione: "
+"<literal>APT::Get::Download-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -1697,8 +1699,8 @@ msgid ""
 "structure can be so corrupt as to require manual intervention (which usually "
 "means using <command>dpkg --remove</command> to eliminate some of the "
 "offending packages). Use of this option together with <option>-m</option> "
-"may produce an error in some situations.  Configuration Item: <literal>APT::"
-"Get::Fix-Broken</literal>."
+"may produce an error in some situations.  Configuration Item: "
+"<literal>APT::Get::Fix-Broken</literal>."
 msgstr ""
 "Aggiusta; cerca di correggere un sistema che ha dipendenze non soddisfatte. "
 "Questa opzione, quando usata con install o remove, può omettere qualsiasi "
@@ -1779,15 +1781,15 @@ msgid ""
 msgstr ""
 "Nessuna azione; effettua una simulazione degli eventi che avverrebbero sulla "
 "base dello stato attuale del sistema, ma non fa nulla per cambiare "
-"effettivamente il sistema. Il lock viene disabilitato (<option>Debug::"
-"NoLocking</option>) perciò lo stato del sistema può cambiare durante "
-"l'esecuzione di <command>apt-get</command>. Le simulazioni possono anche "
-"essere eseguite da utenti non privilegiati che potrebbero non aver accesso "
-"in lettura a tutta la configurazione di apt, rendendo perciò distorta la "
-"simulazione. Per gli utenti diversi da root viene mostrata in modo "
-"predefinito una notifica che avverte di questo (<option>APT::Get::Show-User-"
-"Simulation-Note</option>). Voce di configurazione: <literal>APT::Get::"
-"Simulate</literal>."
+"effettivamente il sistema. Il lock viene disabilitato "
+"(<option>Debug::NoLocking</option>) perciò lo stato del sistema può cambiare "
+"durante l'esecuzione di <command>apt-get</command>. Le simulazioni possono "
+"anche essere eseguite da utenti non privilegiati che potrebbero non aver "
+"accesso in lettura a tutta la configurazione di apt, rendendo perciò "
+"distorta la simulazione. Per gli utenti diversi da root viene mostrata in "
+"modo predefinito una notifica che avverte di questo (<option>APT::Get::Show-"
+"User-Simulation-Note</option>). Voce di configurazione: "
+"<literal>APT::Get::Simulate</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -1825,8 +1827,8 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
-"Automatic \"no\" to all prompts.  Configuration Item: <literal>APT::Get::"
-"Assume-No</literal>."
+"Automatic \"no\" to all prompts.  Configuration Item: "
+"<literal>APT::Get::Assume-No</literal>."
 msgstr ""
 "Rispondi automaticamente «no» a tutti i prompt. Voce di configurazione: "
 "<literal>APT::Get::Assume-No</literal>."
@@ -1868,15 +1870,15 @@ msgstr ""
 #, fuzzy
 #| msgid ""
 #| "Select the source override file to use with the <literal>sources</"
-#| "literal> command.  Configuration Item: <literal>APT::FTPArchive::"
-#| "SourceOverride</literal>."
+#| "literal> command.  Configuration Item: "
+#| "<literal>APT::FTPArchive::SourceOverride</literal>."
 msgid ""
 "Add the given value to the <literal>Comment:</literal> field in history.log "
 "Configuration Item: <literal>APT::History::Comment</literal>."
 msgstr ""
 "Seleziona il file override sorgente da usare con il comando "
-"<literal>sources</literal>. Voce di configurazione <literal>APT::FTPArchive::"
-"SourceOverride</literal>."
+"<literal>sources</literal>. Voce di configurazione "
+"<literal>APT::FTPArchive::SourceOverride</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -1884,9 +1886,9 @@ msgid ""
 "This option controls the architecture packages are built for by <command>apt-"
 "get source --compile</command> and how cross-builddependencies are "
 "satisfied. By default is it not set which means that the host architecture "
-"is the same as the build architecture (which is defined by <literal>APT::"
-"Architecture</literal>).  Configuration Item: <literal>APT::Get::Host-"
-"Architecture</literal>."
+"is the same as the build architecture (which is defined by "
+"<literal>APT::Architecture</literal>).  Configuration Item: "
+"<literal>APT::Get::Host-Architecture</literal>."
 msgstr ""
 "Questa opzione controlla l'architettura per la quale <command>apt-get source "
 "--compile</command> compila i pacchetti e come le dipendenze di compilazione "
@@ -2063,8 +2065,8 @@ msgid ""
 "name on the remote site! This also works with the <literal>source</literal> "
 "and <literal>update</literal> commands. When used with the <literal>update</"
 "literal> command the MD5 and size are not included, and it is up to the user "
-"to decompress any compressed files.  Configuration Item: <literal>APT::Get::"
-"Print-URIs</literal>."
+"to decompress any compressed files.  Configuration Item: "
+"<literal>APT::Get::Print-URIs</literal>."
 msgstr ""
 "Invece di scaricare i file per l'installazione, stampa i loro URI. Ogni URI "
 "ha il percorso, il nome del file di destinazione, la dimensione e l'hash MD5 "
@@ -2104,8 +2106,8 @@ msgid ""
 "turn it off. When it is on, <command>apt-get</command> will automatically "
 "manage the contents of <filename>&statedir;/lists</filename> to ensure that "
 "obsolete files are erased.  The only reason to turn it off is if you "
-"frequently change your sources list.  Configuration Item: <literal>APT::Get::"
-"List-Cleanup</literal>."
+"frequently change your sources list.  Configuration Item: "
+"<literal>APT::Get::List-Cleanup</literal>."
 msgstr ""
 "Questa opzione è attivata in modo predefinito; usare <literal>--no-list-"
 "cleanup</literal> per disabilitarla. Quando è attivata <command>apt-get</"
@@ -2179,8 +2181,8 @@ msgid ""
 "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
 msgstr ""
 "Se un qualsiasi pacchetto dovrebbe essere rimosso, apt-get immediatamente "
-"annulla l'operazione senza chiedere. Voce di configurazione: <literal>APT::"
-"Get::Remove</literal>."
+"annulla l'operazione senza chiedere. Voce di configurazione: "
+"<literal>APT::Get::Remove</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -2223,8 +2225,9 @@ msgid ""
 "literal>, and <literal>APT::Get::Tar-Only</literal>."
 msgstr ""
 "Scarica solo il file diff, dsc o tar di un archivio sorgente. Voce di "
-"configurazione: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::"
-"Dsc-Only</literal> e <literal>APT::Get::Tar-Only</literal>."
+"configurazione: <literal>APT::Get::Diff-Only</literal>, "
+"<literal>APT::Get::Dsc-Only</literal> e <literal>APT::Get::Tar-Only</"
+"literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -2269,8 +2272,8 @@ msgstr ""
 #| "Forbid the update command to acquire unverifiable data from configured "
 #| "sources. APT will fail at the update command for repositories without "
 #| "valid cryptographically signatures. See also &apt-secure; for details on "
-#| "the concept and the implications.  Configuration Item: <literal>Acquire::"
-#| "AllowInsecureRepositories</literal>."
+#| "the concept and the implications.  Configuration Item: "
+#| "<literal>Acquire::AllowInsecureRepositories</literal>."
 msgid ""
 "Allow the update command to acquire unverifiable data from configured "
 "sources. APT will otherwise fail at the update command for repositories "
@@ -2281,8 +2284,8 @@ msgstr ""
 "Impedisce al comando update di acquisire dati non verificabili dalle fonti "
 "configurate. Il comando update di Apt fallirà per i repository senza firme "
 "crittografiche valide. Vedere anche &apt-secure; per i dettagli sul concetto "
-"e sulle implicazioni. Voce di configurazione: <literal>Acquire::"
-"AllowInsecureRepositories</literal>."
+"e sulle implicazioni. Voce di configurazione: "
+"<literal>Acquire::AllowInsecureRepositories</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -2794,12 +2797,12 @@ msgstr ""
 #: apt-cache.8.xml
 msgid ""
 "The same as <literal>dotty</literal>, only for xvcg from the <ulink "
-"url=\"https://www.rw.cdl.uni-saarland.de/people/sander/private/html/gsvcg1."
-"html\">VCG tool</ulink>."
+"url=\"https://www.rw.cdl.uni-saarland.de/people/sander/private/html/"
+"gsvcg1.html\">VCG tool</ulink>."
 msgstr ""
 "Stessa cosa di <literal>dotty</literal>, ma per xvcg dello <ulink "
-"url=\"https://www.rw.cdl.uni-saarland.de/people/sander/private/html/gsvcg1."
-"html\">strumento VCG</ulink>."
+"url=\"https://www.rw.cdl.uni-saarland.de/people/sander/private/html/"
+"gsvcg1.html\">strumento VCG</ulink>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml
@@ -2827,8 +2830,8 @@ msgid ""
 "archive management tool, <literal>madison</literal>.  It displays available "
 "versions of a package in a tabular format.  Unlike the original "
 "<literal>madison</literal>, it can only display information for the "
-"architecture for which APT has retrieved package lists (<literal>APT::"
-"Architecture</literal>)."
+"architecture for which APT has retrieved package lists "
+"(<literal>APT::Architecture</literal>)."
 msgstr ""
 "Il comando <literal>madison</literal> di <literal>apt-cache</literal> cerca "
 "di imitare il formato di uscita e un sottoinsieme delle funzionalità di "
@@ -2842,8 +2845,8 @@ msgstr ""
 #: apt-cache.8.xml
 msgid ""
 "Select the file to store the package cache. The package cache is the primary "
-"cache used by all operations.  Configuration Item: <literal>Dir::Cache::"
-"pkgcache</literal>."
+"cache used by all operations.  Configuration Item: "
+"<literal>Dir::Cache::pkgcache</literal>."
 msgstr ""
 "Seleziona il file in cui memorizzare la cache dei pacchetti. Questa è la "
 "cache primaria usata da tutte le operazioni. Voce di configurazione: "
@@ -2888,17 +2891,17 @@ msgid ""
 msgstr ""
 "Stampa solo le dipendenze importanti; da usarsi con <literal>unmet</literal> "
 "e <literal>depends</literal>. Fa sì che vengano stampate solo le relazioni "
-"Depends e Pre-Depends. Voce di configurazione: <literal>APT::Cache::"
-"Important</literal>."
+"Depends e Pre-Depends. Voce di configurazione: "
+"<literal>APT::Cache::Important</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml
 msgid ""
 "Per default the <command>depends</command> and <command>rdepends</command> "
 "print all dependencies. This can be tweaked with these flags which will omit "
-"the specified dependency type.  Configuration Item: <literal>APT::Cache::"
-"Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::"
-"Cache::ShowRecommends</literal>."
+"the specified dependency type.  Configuration Item: "
+"<literal>APT::Cache::Show<replaceable>DependencyType</replaceable></literal> "
+"e.g. <literal>APT::Cache::ShowRecommends</literal>."
 msgstr ""
 "In modo predefinito <command>depends</command> e <command>rdepends</command> "
 "stampano tutte le dipendenze. Ciò può essere modificato con queste opzioni "
@@ -2921,8 +2924,8 @@ msgstr ""
 "opzione mostrano anche le dipendenze aggiunte implicitamente sulla base dei "
 "dati incontrati. Ad esempio un <literal>Conflicts: pippo</literal> esprime "
 "implicitamente che questo pacchetto va in conflitto anche con il pacchetto "
-"pippo da qualsiasi altra architettura. Voce di configurazione: <literal>APT::"
-"Cache::ShowImplicit</literal>."
+"pippo da qualsiasi altra architettura. Voce di configurazione: "
+"<literal>APT::Cache::ShowImplicit</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml
@@ -2948,8 +2951,8 @@ msgstr ""
 "versions</option>. Se si specifica <option>--no-all-versions</option>, verrà "
 "visualizzata solo la versione candidata (quella che sarebbe scelta per "
 "l'installazione). Questa opzione è applicabile solo al comando "
-"<literal>show</literal>. Voce di configurazione: <literal>APT::Cache::"
-"AllVersions</literal>."
+"<literal>show</literal>. Voce di configurazione: "
+"<literal>APT::Cache::AllVersions</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml
@@ -2977,8 +2980,8 @@ msgstr ""
 #: apt-cache.8.xml
 msgid ""
 "Make <literal>pkgnames</literal> print all names, including virtual packages "
-"and missing dependencies.  Configuration Item: <literal>APT::Cache::"
-"AllNames</literal>."
+"and missing dependencies.  Configuration Item: "
+"<literal>APT::Cache::AllNames</literal>."
 msgstr ""
 "Fai sì che <literal>pkgnames</literal> stampi tutti i nomi, inclusi i "
 "pacchetti virtuali e le dipendenze mancanti. Voce di configurazione: "
@@ -3003,8 +3006,8 @@ msgid ""
 "<literal>APT::Cache::Installed</literal>."
 msgstr ""
 "Limita l'output di <literal>depends</literal> e <literal>rdepends</literal> "
-"ai pacchetti attualmente installati. Voce di configurazione: <literal>APT::"
-"Cache::Installed</literal>."
+"ai pacchetti attualmente installati. Voce di configurazione: "
+"<literal>APT::Cache::Installed</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml
@@ -3071,8 +3074,8 @@ msgid ""
 "<command>apt-mark</command> can be used as a unified front-end to set "
 "various settings for a package, such as marking a package as being "
 "automatically/manually installed or changing <command>dpkg</command> "
-"selections such as hold, install, deinstall and purge which are respected e."
-"g. by <command>apt-get dselect-upgrade</command> or <command>aptitude</"
+"selections such as hold, install, deinstall and purge which are respected "
+"e.g. by <command>apt-get dselect-upgrade</command> or <command>aptitude</"
 "command>."
 msgstr ""
 "<command>apt-mark</command> può essere usato come fronted unificato per "
@@ -3324,10 +3327,11 @@ msgstr "Configurazione utente"
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""
-"Keys should usually be included inside their corresponding <literal>."
-"sources</literal> by embedding the ASCII-armored key in the <literal>Signed-"
-"By</literal> option.  To do so, replace the empty line with a dot, and then "
-"indent all lines by two spaces.  See &sources-list; for more information."
+"Keys should usually be included inside their corresponding "
+"<literal>.sources</literal> by embedding the ASCII-armored key in the "
+"<literal>Signed-By</literal> option.  To do so, replace the empty line with "
+"a dot, and then indent all lines by two spaces.  See &sources-list; for more "
+"information."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -3340,8 +3344,9 @@ msgid ""
 "literal> file or using <literal>deb [signed-by=/etc/apt/keyrings/example-"
 "archive-keyring.asc] ...</literal> in the legacy <literal>.list</literal> "
 "format. This may be useful for APT versions prior to 2.4, which do not "
-"support embedded keys. ASCII-armored keys must use an extension of <literal>."
-"asc</literal>, and unarmored keys an extension of <literal>.gpg</literal>."
+"support embedded keys. ASCII-armored keys must use an extension of "
+"<literal>.asc</literal>, and unarmored keys an extension of <literal>.gpg</"
+"literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -3638,8 +3643,8 @@ msgstr ""
 #: apt-secure.8.xml
 msgid ""
 "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg --"
-"clearsign -o InRelease Release</command> and <command>gpg -abs -o Release."
-"gpg Release</command>."
+"clearsign -o InRelease Release</command> and <command>gpg -abs -o "
+"Release.gpg Release</command>."
 msgstr ""
 "<emphasis>Firmarlo</emphasis>. Lo si può fare eseguendo <command>gpg --"
 "clearsign -o InRelease Release</command> e <command>gpg -abs -o Release.gpg "
@@ -3804,8 +3809,8 @@ msgstr ""
 #: apt-cdrom.8.xml
 msgid ""
 "Do not try to auto-detect the CD-ROM path. Usually combined with the "
-"<option>--cdrom</option> option.  Configuration Item: <literal>Acquire::"
-"cdrom::AutoDetect</literal>."
+"<option>--cdrom</option> option.  Configuration Item: "
+"<literal>Acquire::cdrom::AutoDetect</literal>."
 msgstr ""
 "Non cercare di rilevare automaticamente il percorso del CD-ROM. Solitamente "
 "usato insieme all'opzione <option>--cdrom</option>. Voce di configurazione: "
@@ -3820,8 +3825,8 @@ msgid ""
 msgstr ""
 "Punto di mount; specifica la posizione in cui montare il CD-ROM. Questo "
 "punto di mount deve essere elencato nel file <filename>/etc/fstab</filename> "
-"e configurato correttamente. Voce di configurazione: <literal>Acquire::"
-"cdrom::mount</literal>."
+"e configurato correttamente. Voce di configurazione: "
+"<literal>Acquire::cdrom::mount</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml
@@ -3832,15 +3837,15 @@ msgid ""
 msgstr ""
 "Rinomina un disco; cambia l'etichetta di un disco o soppianta l'etichetta "
 "originale del disco. Questa opzione farà sì che <command>apt-cdrom</command> "
-"chieda una nuova etichetta. Voce di configurazione: <literal>APT::CDROM::"
-"Rename</literal>."
+"chieda una nuova etichetta. Voce di configurazione: "
+"<literal>APT::CDROM::Rename</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml
 msgid ""
 "No mounting; prevent <command>apt-cdrom</command> from mounting and "
-"unmounting the mount point.  Configuration Item: <literal>APT::CDROM::"
-"NoMount</literal>."
+"unmounting the mount point.  Configuration Item: "
+"<literal>APT::CDROM::NoMount</literal>."
 msgstr ""
 "Non montare; impedisce ad <command>apt-cdrom</command> di montare e smontare "
 "il punto di mount. Voce di configurazione: <literal>APT::CDROM::NoMount</"
@@ -3945,8 +3950,8 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-config.8.xml
 msgid ""
-"This will set the shell environment variable $OPTS to the value of MyApp::"
-"options with a default of <option>-f</option>."
+"This will set the shell environment variable $OPTS to the value of "
+"MyApp::options with a default of <option>-f</option>."
 msgstr ""
 "In questo modo la variabile d'ambiente $OPZIONI della shell verrà impostata "
 "al valore di MiaApp::opzioni con un valore predefinito di <option>-f</"
@@ -3998,8 +4003,8 @@ msgstr ""
 "nel valore verranno codificati per assicurare che possano essere usati senza "
 "problemi in una stringa tra virgolette, come definito nella RFC822. In "
 "aggiunta &percnt;n verrà sostituito da un ritorno a capo e &percnt;N da una "
-"tabulazione. Un carattere &percnt; può essere prodotto usando &percnt;"
-"&percnt;. "
+"tabulazione. Un carattere &percnt; può essere prodotto usando "
+"&percnt;&percnt;. "
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-config.8.xml apt-extracttemplates.1.xml apt-sortpkgs.1.xml
@@ -4075,9 +4080,9 @@ msgid ""
 "order which have either no or \"<literal>conf</literal>\" as filename "
 "extension and which only contain alphanumeric, hyphen (-), underscore (_) "
 "and period (.) characters.  Otherwise APT will print a notice that it has "
-"ignored a file, unless that file matches a pattern in the <literal>Dir::"
-"Ignore-Files-Silently</literal> configuration list - in which case it will "
-"be silently ignored."
+"ignored a file, unless that file matches a pattern in the "
+"<literal>Dir::Ignore-Files-Silently</literal> configuration list - in which "
+"case it will be silently ignored."
 msgstr ""
 "tutti i file in <literal>Dir::Etc::Parts</literal>, in ordine alfanumerico "
 "crescente, se il loro nome file non ha estensione o ha «<literal>conf</"
@@ -4166,12 +4171,12 @@ msgstr ""
 "quello usato dagli strumenti ISC come bind e dhcp. Le righe che iniziano con "
 "<literal>//</literal> vengono trattate come commenti (ignorate), così come "
 "tutto il testo racchiuso tra <literal>/*</literal> e <literal>*/</literal>, "
-"proprio come i commenti C/C++. Ogni riga ha la forma <literal>APT::Get::"
-"Assume-Yes \"true\";</literal>. Le virgolette e il punto e virgola finale "
-"sono obbligatori. I valori non possono includere barre inverse (\\) o "
-"ulteriori virgolette. I nomi delle opzioni sono costituiti da caratteri "
-"alfanumerici e dai caratteri «/-:._+». Un nuovo ambito può essere aperto con "
-"parentesi graffe come in:"
+"proprio come i commenti C/C++. Ogni riga ha la forma "
+"<literal>APT::Get::Assume-Yes \"true\";</literal>. Le virgolette e il punto "
+"e virgola finale sono obbligatori. I valori non possono includere barre "
+"inverse (\\) o ulteriori virgolette. I nomi delle opzioni sono costituiti da "
+"caratteri alfanumerici e dai caratteri «/-:._+». Un nuovo ambito può essere "
+"aperto con parentesi graffe come in:"
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
 #: apt.conf.5.xml
@@ -4292,12 +4297,12 @@ msgid ""
 msgstr ""
 "Tutti gli strumenti APT accettano un'opzione -o che permette di specificare "
 "una direttiva di configurazione arbitraria nella riga di comando. La "
-"sintassi è un nome completo di opzione (per esempio <literal>APT::Get::"
-"Assume-Yes</literal>) seguito da un segno di uguaglianza e quindi il nuovo "
-"valore dell'opzione. Per aggiungere un nuovo elemento ad un elenco, "
-"aggiungere <literal>::</literal> alla fine del nome dell'elenco. (Come si "
-"può immaginare, la sintassi per gli ambiti non può essere usata nella riga "
-"di comando.)"
+"sintassi è un nome completo di opzione (per esempio "
+"<literal>APT::Get::Assume-Yes</literal>) seguito da un segno di uguaglianza "
+"e quindi il nuovo valore dell'opzione. Per aggiungere un nuovo elemento ad "
+"un elenco, aggiungere <literal>::</literal> alla fine del nome dell'elenco. "
+"(Come si può immaginare, la sintassi per gli ambiti non può essere usata "
+"nella riga di comando.)"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml
@@ -4390,10 +4395,12 @@ msgstr ""
 msgid ""
 "The subscope <option>action</option> defines the colors for package lists in "
 "<option>install</option> and similar commands. The following options may be "
-"set: <option>APT::Color::Action::Upgrade</option>, <option>APT::Color::"
-"Action::Install</option>, <option>APT::Color::Action::Install-Dependencies</"
-"option>, <option>APT::Color::Action::Downgrade</option>, <option>APT::Color::"
-"Action::Remove</option>; corresponding to their lists in the &apt; output."
+"set: <option>APT::Color::Action::Upgrade</option>, "
+"<option>APT::Color::Action::Install</option>, "
+"<option>APT::Color::Action::Install-Dependencies</option>, "
+"<option>APT::Color::Action::Downgrade</option>, "
+"<option>APT::Color::Action::Remove</option>; corresponding to their lists in "
+"the &apt; output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -4711,8 +4718,8 @@ msgstr ""
 #: apt.conf.5.xml
 msgid ""
 "Define the regular expression(s) for versioned kernel packages.  Based on "
-"these expressions a rule set is injected into apt similar to APT::"
-"NeverAutoRemove regular expressions."
+"these expressions a rule set is injected into apt similar to "
+"APT::NeverAutoRemove regular expressions."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -5020,9 +5027,9 @@ msgstr ""
 "possono decomprimere e ricomprimere molti formati comuni come <command>xz</"
 "command> e <command>gzip</command>; con questa impostazione si possono "
 "ottenere informazioni sui formati supportati, si può modificarli oltre ad "
-"aggiungere il supporto per altri formati (vedere anche <option>APT::"
-"Compressor</option>). La sintassi è: <placeholder type=\"synopsis\" id=\"0\"/"
-">"
+"aggiungere il supporto per altri formati (vedere anche "
+"<option>APT::Compressor</option>). La sintassi è: <placeholder "
+"type=\"synopsis\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
 #: apt.conf.5.xml
@@ -5161,9 +5168,9 @@ msgid ""
 "that these codes are not included twice in the list. If "
 "<literal>LC_MESSAGES</literal> is set to \"C\" only the "
 "<filename>Translation-en</filename> file (if available) will be used.  To "
-"force APT to use no Translation file use the setting <literal>Acquire::"
-"Languages=none</literal>. \"<literal>none</literal>\" is another special "
-"meaning code which will stop the search for a suitable "
+"force APT to use no Translation file use the setting "
+"<literal>Acquire::Languages=none</literal>. \"<literal>none</literal>\" is "
+"another special meaning code which will stop the search for a suitable "
 "<filename>Translation</filename> file.  This tells APT to download these "
 "translations too, without actually using them unless the environment "
 "specifies the languages. So the following example configuration will result "
@@ -5295,21 +5302,22 @@ msgid ""
 "<replaceable>ORIGIN</replaceable></literal> option exists and if so this "
 "value is taken. The value in the Release file can be overridden with "
 "<literal>Acquire::Changelogs::URI::Override::Label::<replaceable>LABEL</"
-"replaceable></literal> or <literal>Acquire::Changelogs::URI::Override::"
-"Origin::<replaceable>ORIGIN</replaceable></literal>.  The value should be a "
-"normal URI to a text file, except that package specific data is replaced "
-"with the placeholder <literal>@CHANGEPATH@</literal>. The value for it is: "
-"1. if the package is from a component (e.g. <literal>main</literal>)  this "
-"is the first part otherwise it is omitted, 2. the first letter of source "
-"package name, except if the source package name starts with '<literal>lib</"
-"literal>' in which case it will be the first four letters. 3. The complete "
-"source package name. 4. the complete name again and 5. the source version.  "
-"The first (if present), second, third and fourth part are separated by a "
-"slash ('<literal>/</literal>')  and between the fourth and fifth part is an "
-"underscore ('<literal>_</literal>').  The special value '<literal>no</"
-"literal>' is available for this option indicating that this source can't be "
-"used to acquire changelog files from. Another source will be tried if "
-"available in this case."
+"replaceable></literal> or "
+"<literal>Acquire::Changelogs::URI::Override::Origin::<replaceable>ORIGIN</"
+"replaceable></literal>.  The value should be a normal URI to a text file, "
+"except that package specific data is replaced with the placeholder "
+"<literal>@CHANGEPATH@</literal>. The value for it is: 1. if the package is "
+"from a component (e.g. <literal>main</literal>)  this is the first part "
+"otherwise it is omitted, 2. the first letter of source package name, except "
+"if the source package name starts with '<literal>lib</literal>' in which "
+"case it will be the first four letters. 3. The complete source package name. "
+"4. the complete name again and 5. the source version.  The first (if "
+"present), second, third and fourth part are separated by a slash ('<literal>/"
+"</literal>')  and between the fourth and fifth part is an underscore "
+"('<literal>_</literal>').  The special value '<literal>no</literal>' is "
+"available for this option indicating that this source can't be used to "
+"acquire changelog files from. Another source will be tried if available in "
+"this case."
 msgstr ""
 "L'acquisizione di changelog è possibile solamente se è noto un URI da cui "
 "ottenerli. Il file Release indica questa informazione preferibilmente in un "
@@ -5320,22 +5328,22 @@ msgstr ""
 "<replaceable>ORIGINE</replaceable></literal> e, se è così, viene preso "
 "questo valore. Il valore nel file Release può essere scavalcato con "
 "<literal>Acquire::Changelogs::URI::Override::Label::<replaceable>ETICHETTA</"
-"replaceable></literal> or <literal>Acquire::Changelogs::URI::Override::"
-"Origin::<replaceable>ORIGINE</replaceable></literal>. Il valore deve essere "
-"un URI normale verso un file di testo, tranne per il fatto che dati "
-"specifici di pacchetto sono sostituito con il segnaposto "
-"<literal>@CHANGEPATH@</literal>. Il valore per esso è: 1. se il pacchetto è "
-"da una componente (es. <literal>main</literal>) è la prima parte, altrimenti "
-"viene omesso; 2. la prima lettera del nome del pacchetto sorgente, tranne "
-"per i pacchetti sorgente con nome che inizia con «<literal>lib</literal>», "
-"nel qual caso saranno le prime quattro lettere; 3. il nome completo del "
-"pacchetto sorgente; 4. il nome completo di nuovo e 5. la versione sorgente. "
-"La prima (se presente), la seconda, la terza e la quarta parte sono separate "
-"da una sbarra («<literal>/</literal>») e tra la quarta e la quinta parte c'è "
-"un trattino basso («<literal>_</literal>»). Per questa opzione è disponibile "
-"il valore speciale «<literal>no</literal>» che indica che questa fonte non "
-"può essere usata per acquisire file changelog. In questo caso viene provata "
-"un'altra fonte, se disponibile."
+"replaceable></literal> or "
+"<literal>Acquire::Changelogs::URI::Override::Origin::<replaceable>ORIGINE</"
+"replaceable></literal>. Il valore deve essere un URI normale verso un file "
+"di testo, tranne per il fatto che dati specifici di pacchetto sono "
+"sostituito con il segnaposto <literal>@CHANGEPATH@</literal>. Il valore per "
+"esso è: 1. se il pacchetto è da una componente (es. <literal>main</literal>) "
+"è la prima parte, altrimenti viene omesso; 2. la prima lettera del nome del "
+"pacchetto sorgente, tranne per i pacchetti sorgente con nome che inizia con "
+"«<literal>lib</literal>», nel qual caso saranno le prime quattro lettere; 3. "
+"il nome completo del pacchetto sorgente; 4. il nome completo di nuovo e 5. "
+"la versione sorgente. La prima (se presente), la seconda, la terza e la "
+"quarta parte sono separate da una sbarra («<literal>/</literal>») e tra la "
+"quarta e la quinta parte c'è un trattino basso («<literal>_</literal>»). Per "
+"questa opzione è disponibile il valore speciale «<literal>no</literal>» che "
+"indica che questa fonte non può essere usata per acquisire file changelog. "
+"In questo caso viene provata un'altra fonte, se disponibile."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
@@ -5345,14 +5353,15 @@ msgstr ""
 #| "get them.  Preferable the Release file indicates this in a 'Changelogs' "
 #| "field. If this isn't available the Label/Origin field of the Release file "
 #| "is used to check if a <literal>Acquire::Changelogs::URI::Label::"
-#| "<replaceable>LABEL</replaceable></literal> or <literal>Acquire::"
-#| "Changelogs::URI::Origin::<replaceable>ORIGIN</replaceable></literal> "
-#| "option exists and if so this value is taken. The value in the Release "
-#| "file can be overridden with <literal>Acquire::Changelogs::URI::Override::"
-#| "Label::<replaceable>LABEL</replaceable></literal> or <literal>Acquire::"
-#| "Changelogs::URI::Override::Origin::<replaceable>ORIGIN</replaceable></"
-#| "literal>.  The value should be a normal URI to a text file, except that "
-#| "package specific data is replaced with the placeholder "
+#| "<replaceable>LABEL</replaceable></literal> or "
+#| "<literal>Acquire::Changelogs::URI::Origin::<replaceable>ORIGIN</"
+#| "replaceable></literal> option exists and if so this value is taken. The "
+#| "value in the Release file can be overridden with "
+#| "<literal>Acquire::Changelogs::URI::Override::Label::<replaceable>LABEL</"
+#| "replaceable></literal> or "
+#| "<literal>Acquire::Changelogs::URI::Override::Origin::<replaceable>ORIGIN</"
+#| "replaceable></literal>.  The value should be a normal URI to a text file, "
+#| "except that package specific data is replaced with the placeholder "
 #| "<literal>@CHANGEPATH@</literal>. The value for it is: 1. if the package "
 #| "is from a component (e.g. <literal>main</literal>)  this is the first "
 #| "part otherwise it is omitted, 2. the first letter of source package name, "
@@ -5370,17 +5379,19 @@ msgid ""
 "where to get them.  Preferable the Release file indicates this in a "
 "'Snapshots' field. If this isn't available the Label/Origin field of the "
 "Release file is used to check if a <literal>Acquire::Snapshots::URI::Label::"
-"<replaceable>LABEL</replaceable></literal> or <literal>Acquire::Snapshots::"
-"URI::Origin::<replaceable>ORIGIN</replaceable></literal> option exists and "
-"if so this value is taken. The value in the Release file can be overridden "
-"with <literal>Acquire::Snapshots::URI::Override::Label::<replaceable>LABEL</"
-"replaceable></literal> or <literal>Acquire::Snapshots::URI::Override::"
-"Origin::<replaceable>ORIGIN</replaceable></literal>.  The value should be a "
-"normal URI to a directory, except that the snapshot ID replaced with the "
-"placeholder <literal>@SNAPSHOTID@</literal>.  The special value "
-"'<literal>no</literal>' is available for this option indicating that this "
-"source cannot be used to acquire snapshots from. Another source will be "
-"tried if available in this case."
+"<replaceable>LABEL</replaceable></literal> or "
+"<literal>Acquire::Snapshots::URI::Origin::<replaceable>ORIGIN</replaceable></"
+"literal> option exists and if so this value is taken. The value in the "
+"Release file can be overridden with "
+"<literal>Acquire::Snapshots::URI::Override::Label::<replaceable>LABEL</"
+"replaceable></literal> or "
+"<literal>Acquire::Snapshots::URI::Override::Origin::<replaceable>ORIGIN</"
+"replaceable></literal>.  The value should be a normal URI to a directory, "
+"except that the snapshot ID replaced with the placeholder "
+"<literal>@SNAPSHOTID@</literal>.  The special value '<literal>no</literal>' "
+"is available for this option indicating that this source cannot be used to "
+"acquire snapshots from. Another source will be tried if available in this "
+"case."
 msgstr ""
 "L'acquisizione di changelog è possibile solamente se è noto un URI da cui "
 "ottenerli. Il file Release indica questa informazione preferibilmente in un "
@@ -5391,22 +5402,22 @@ msgstr ""
 "<replaceable>ORIGINE</replaceable></literal> e, se è così, viene preso "
 "questo valore. Il valore nel file Release può essere scavalcato con "
 "<literal>Acquire::Changelogs::URI::Override::Label::<replaceable>ETICHETTA</"
-"replaceable></literal> or <literal>Acquire::Changelogs::URI::Override::"
-"Origin::<replaceable>ORIGINE</replaceable></literal>. Il valore deve essere "
-"un URI normale verso un file di testo, tranne per il fatto che dati "
-"specifici di pacchetto sono sostituito con il segnaposto "
-"<literal>@CHANGEPATH@</literal>. Il valore per esso è: 1. se il pacchetto è "
-"da una componente (es. <literal>main</literal>) è la prima parte, altrimenti "
-"viene omesso; 2. la prima lettera del nome del pacchetto sorgente, tranne "
-"per i pacchetti sorgente con nome che inizia con «<literal>lib</literal>», "
-"nel qual caso saranno le prime quattro lettere; 3. il nome completo del "
-"pacchetto sorgente; 4. il nome completo di nuovo e 5. la versione sorgente. "
-"La prima (se presente), la seconda, la terza e la quarta parte sono separate "
-"da una sbarra («<literal>/</literal>») e tra la quarta e la quinta parte c'è "
-"un trattino basso («<literal>_</literal>»). Per questa opzione è disponibile "
-"il valore speciale «<literal>no</literal>» che indica che questa fonte non "
-"può essere usata per acquisire file changelog. In questo caso viene provata "
-"un'altra fonte, se disponibile."
+"replaceable></literal> or "
+"<literal>Acquire::Changelogs::URI::Override::Origin::<replaceable>ORIGINE</"
+"replaceable></literal>. Il valore deve essere un URI normale verso un file "
+"di testo, tranne per il fatto che dati specifici di pacchetto sono "
+"sostituito con il segnaposto <literal>@CHANGEPATH@</literal>. Il valore per "
+"esso è: 1. se il pacchetto è da una componente (es. <literal>main</literal>) "
+"è la prima parte, altrimenti viene omesso; 2. la prima lettera del nome del "
+"pacchetto sorgente, tranne per i pacchetti sorgente con nome che inizia con "
+"«<literal>lib</literal>», nel qual caso saranno le prime quattro lettere; 3. "
+"il nome completo del pacchetto sorgente; 4. il nome completo di nuovo e 5. "
+"la versione sorgente. La prima (se presente), la seconda, la terza e la "
+"quarta parte sono separate da una sbarra («<literal>/</literal>») e tra la "
+"quarta e la quinta parte c'è un trattino basso («<literal>_</literal>»). Per "
+"questa opzione è disponibile il valore speciale «<literal>no</literal>» che "
+"indica che questa fonte non può essere usata per acquisire file changelog. "
+"In questo caso viene provata un'altra fonte, se disponibile."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.conf.5.xml
@@ -5418,9 +5429,9 @@ msgstr "Configurazione specifica per binari"
 msgid ""
 "Especially with the introduction of the <command>apt</command> binary it can "
 "be useful to set certain options only for a specific binary as even options "
-"which look like they would effect only a certain binary like <option>APT::"
-"Get::Show-Versions</option> effect <command>apt-get</command> as well as "
-"<command>apt</command>."
+"which look like they would effect only a certain binary like "
+"<option>APT::Get::Show-Versions</option> effect <command>apt-get</command> "
+"as well as <command>apt</command>."
 msgstr ""
 "Specialmente con l'introduzione del binario <command>apt</command> può "
 "essere utile impostare determinate opzioni solamente per uno specifico "
@@ -5496,13 +5507,14 @@ msgstr ""
 "<literal>Dir::Cache</literal> contiene le posizioni relative alle "
 "informazioni della cache locale, come le due cache dei pacchetti "
 "<literal>srcpkgcache</literal> e <literal>pkgcache</literal>, così come la "
-"posizione in cui mettere gli archivi scaricati: <literal>Dir::Cache::"
-"archives</literal>. La generazione delle cache può essere disattivata "
-"impostando <literal>pkgcache</literal> o <literal>srcpkgcache</literal> a "
-"<literal>\"\"</literal>. Questo rallenta l'avvio ma fa risparmiare spazio su "
-"disco. È probabilmente preferibile disattivare pkgcache piuttosto che "
-"srcpkgcache. Come per <literal>Dir::State</literal>, la directory "
-"predefinita è contenuta in <literal>Dir::Cache</literal>"
+"posizione in cui mettere gli archivi scaricati: "
+"<literal>Dir::Cache::archives</literal>. La generazione delle cache può "
+"essere disattivata impostando <literal>pkgcache</literal> o "
+"<literal>srcpkgcache</literal> a <literal>\"\"</literal>. Questo rallenta "
+"l'avvio ma fa risparmiare spazio su disco. È probabilmente preferibile "
+"disattivare pkgcache piuttosto che srcpkgcache. Come per "
+"<literal>Dir::State</literal>, la directory predefinita è contenuta in "
+"<literal>Dir::Cache</literal>"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml
@@ -5533,19 +5545,19 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml
 msgid ""
-"Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
-"Bin::Methods</literal> specifies the location of the method handlers and "
-"<literal>gzip</literal>, <literal>bzip2</literal>, <literal>lzma</literal>, "
-"<literal>dpkg</literal>, <literal>apt-get</literal> <literal>dpkg-source</"
-"literal> <literal>dpkg-buildpackage</literal> and <literal>apt-cache</"
-"literal> specify the location of the respective programs."
+"Binary programs are pointed to by <literal>Dir::Bin</literal>. "
+"<literal>Dir::Bin::Methods</literal> specifies the location of the method "
+"handlers and <literal>gzip</literal>, <literal>bzip2</literal>, "
+"<literal>lzma</literal>, <literal>dpkg</literal>, <literal>apt-get</literal> "
+"<literal>dpkg-source</literal> <literal>dpkg-buildpackage</literal> and "
+"<literal>apt-cache</literal> specify the location of the respective programs."
 msgstr ""
-"<literal>Dir::Bin</literal> punta ai programmi binari; <literal>Dir::Bin::"
-"Methods</literal> specifica la posizione dei gestori dei metodi e "
-"<literal>gzip</literal>, <literal>bzip2</literal>, <literal>lzma</literal>, "
-"<literal>dpkg</literal>, <literal>apt-get</literal> <literal>dpkg-source</"
-"literal> <literal>dpkg-buildpackage</literal> e <literal>apt-cache</literal> "
-"specificano la posizione dei rispettivi programmi."
+"<literal>Dir::Bin</literal> punta ai programmi binari; "
+"<literal>Dir::Bin::Methods</literal> specifica la posizione dei gestori dei "
+"metodi e <literal>gzip</literal>, <literal>bzip2</literal>, <literal>lzma</"
+"literal>, <literal>dpkg</literal>, <literal>apt-get</literal> <literal>dpkg-"
+"source</literal> <literal>dpkg-buildpackage</literal> e <literal>apt-cache</"
+"literal> specificano la posizione dei rispettivi programmi."
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml
@@ -5563,11 +5575,11 @@ msgstr ""
 "speciale. Se impostata, tutti i percorsi saranno relativi a "
 "<literal>RootDir</literal>, <emphasis>anche i percorsi che sono specificati "
 "in modo assoluto</emphasis>. Perciò, ad esempio, se <literal>RootDir</"
-"literal> è impostata a <filename>/tmp/staging</filename> e <literal>Dir::"
-"State::status</literal> è impostata a <filename>/var/lib/dpkg/status</"
-"filename>, allora il file di stato verrà cercato in <filename>/tmp/staging/"
-"var/lib/dpkg/status</filename>. Se si desidera un prefisso solo per i "
-"percorsi relativi, impostare invece <literal>Dir</literal>."
+"literal> è impostata a <filename>/tmp/staging</filename> e "
+"<literal>Dir::State::status</literal> è impostata a <filename>/var/lib/dpkg/"
+"status</filename>, allora il file di stato verrà cercato in <filename>/tmp/"
+"staging/var/lib/dpkg/status</filename>. Se si desidera un prefisso solo per "
+"i percorsi relativi, impostare invece <literal>Dir</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml
@@ -5739,9 +5751,9 @@ msgid ""
 "literal>.  Special characters (equal signs, newlines, nonprintable "
 "characters, quotation marks, and percent signs in <literal>key</literal> and "
 "newlines, nonprintable characters, and percent signs in <literal>value</"
-"literal>) are %-encoded. Lists are represented by multiple <literal>key::"
-"=value</literal> lines with the same key. The configuration section ends "
-"with a blank line."
+"literal>) are %-encoded. Lists are represented by multiple "
+"<literal>key::=value</literal> lines with the same key. The configuration "
+"section ends with a blank line."
 msgstr ""
 "Ogni riga con una direttiva di configurazione ha la forma "
 "<literal>chiave=valore</literal>. I caratteri speciali (segno di uguale, a "
@@ -5820,12 +5832,12 @@ msgid ""
 "contains the number of the used file descriptor as a confirmation."
 msgstr ""
 "Il descrittore di file da usare per inviare le informazioni può essere "
-"richiesto con <literal>DPkg::Tools::options::<replaceable>cmd</replaceable>::"
-"InfoFD</literal> che è in modo predefinito <literal>0</literal> per lo "
-"standard input ed è disponibile a partire dalla versione 0.9.11. Il supporto "
-"per l'opzione può essere controllato guardando la variabile d'ambiente "
-"<envar>APT_HOOK_INFO_FD</envar> che contiene il numero del descrittore di "
-"file usato per conferma."
+"richiesto con <literal>DPkg::Tools::options::<replaceable>cmd</"
+"replaceable>::InfoFD</literal> che è in modo predefinito <literal>0</"
+"literal> per lo standard input ed è disponibile a partire dalla versione "
+"0.9.11. Il supporto per l'opzione può essere controllato guardando la "
+"variabile d'ambiente <envar>APT_HOOK_INFO_FD</envar> che contiene il numero "
+"del descrittore di file usato per conferma."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
@@ -5875,11 +5887,11 @@ msgid ""
 "<literal>/usr/lib/apt/apt.systemd.daily</literal> script. See the top of "
 "this script for the brief documentation of these options."
 msgstr ""
-"I gruppi di opzioni <literal>APT::Periodic</literal> e <literal>APT::"
-"Archives</literal> configurano il comportamento degli aggiornamenti "
-"periodici di apt, ciò viene fatto attraverso lo script <literal>/etc/cron."
-"daily/apt</literal>. Per una breve documentazione di queste opzioni, vedere "
-"all'inizio dello script."
+"I gruppi di opzioni <literal>APT::Periodic</literal> e "
+"<literal>APT::Archives</literal> configurano il comportamento degli "
+"aggiornamenti periodici di apt, ciò viene fatto attraverso lo script "
+"<literal>/etc/cron.daily/apt</literal>. Per una breve documentazione di "
+"queste opzioni, vedere all'inizio dello script."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.conf.5.xml
@@ -6078,15 +6090,15 @@ msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
 "install pass performed in, e.g., <literal>apt-get install</literal>, and not "
-"to the full <literal>apt</literal> dependency resolver; see <literal>Debug::"
-"pkgProblemResolver</literal> for that."
+"to the full <literal>apt</literal> dependency resolver; see "
+"<literal>Debug::pkgProblemResolver</literal> for that."
 msgstr ""
 "Genera messaggi di debug che descrivono quali pacchetti vengono "
 "automaticamente installati per risolvere delle dipendenze. Corrisponde al "
 "passo iniziale di installazione automatica effettuato, ad esempio, in "
 "<literal>apt-get install</literal> e non all'intero risolutore di dipendenze "
-"di <literal>apt</literal>; per quello vedere <literal>Debug::"
-"pkgProblemResolver</literal>."
+"di <literal>apt</literal>; per quello vedere "
+"<literal>Debug::pkgProblemResolver</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
@@ -6096,14 +6108,14 @@ msgid ""
 "may trigger additional actions; they are shown indented two additional "
 "spaces under the original entry.  The format for each line is "
 "<literal>MarkKeep</literal>, <literal>MarkDelete</literal> or "
-"<literal>MarkInstall</literal> followed by <literal>package-name &lt;a.b.c -"
-"&gt; d.e.f | x.y.z&gt; (section)</literal> where <literal>a.b.c</literal> is "
-"the current version of the package, <literal>d.e.f</literal> is the version "
-"considered for installation and <literal>x.y.z</literal> is a newer version, "
-"but not considered for installation (because of a low pin score). The later "
-"two can be omitted if there is none or if it is the same as the installed "
-"version.  <literal>section</literal> is the name of the section the package "
-"appears in."
+"<literal>MarkInstall</literal> followed by <literal>package-name &lt;a.b.c "
+"-&gt; d.e.f | x.y.z&gt; (section)</literal> where <literal>a.b.c</literal> "
+"is the current version of the package, <literal>d.e.f</literal> is the "
+"version considered for installation and <literal>x.y.z</literal> is a newer "
+"version, but not considered for installation (because of a low pin score). "
+"The later two can be omitted if there is none or if it is the same as the "
+"installed version.  <literal>section</literal> is the name of the section "
+"the package appears in."
 msgstr ""
 "Genera messaggi di debug che descrivono quali pacchetto vengono "
 "contrassegnati per essere mantenuti/installati/rimossi mentre il "
@@ -6184,8 +6196,8 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
 msgid ""
-"Print information about the vendors read from <filename>/etc/apt/vendors."
-"list</filename>."
+"Print information about the vendors read from <filename>/etc/apt/"
+"vendors.list</filename>."
 msgstr ""
 "Stampa informazioni sui fornitori lette da <filename>/etc/apt/vendors.list</"
 "filename>."
@@ -6193,8 +6205,8 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
 msgid ""
-"Display the external commands that are called by apt hooks.  This includes e."
-"g. the config options <literal>DPkg::{Pre,Post}-Invoke</literal> or "
+"Display the external commands that are called by apt hooks.  This includes "
+"e.g. the config options <literal>DPkg::{Pre,Post}-Invoke</literal> or "
 "<literal>APT::Update::{Pre,Post}-Invoke</literal>."
 msgstr ""
 "Visualizza i comandi esterni che sono richiamati dagli hook di apt. Ciò "
@@ -6997,9 +7009,9 @@ msgstr ""
 #: apt_preferences.5.xml
 msgid ""
 "The <literal>:any</literal> suffix makes sure to select binary packages from "
-"any architecture. Without that suffix, apt implicitly assumes the <literal>:"
-"native</literal> suffix which would only select packages from the native "
-"architecture."
+"any architecture. Without that suffix, apt implicitly assumes the "
+"<literal>:native</literal> suffix which would only select packages from the "
+"native architecture."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
@@ -7172,9 +7184,9 @@ msgstr "Allora:"
 msgid ""
 "The most recent available version of the <literal>perl</literal> package "
 "will be installed, so long as that version's version number begins with "
-"\"<literal>&good-perl;</literal>\".  If <emphasis>any</emphasis> &good-perl;"
-"* version of <literal>perl</literal> is available and the installed version "
-"is &bad-perl;*, then <literal>perl</literal> will be downgraded."
+"\"<literal>&good-perl;</literal>\".  If <emphasis>any</emphasis> &good-"
+"perl;* version of <literal>perl</literal> is available and the installed "
+"version is &bad-perl;*, then <literal>perl</literal> will be downgraded."
 msgstr ""
 "Verrà installata la più recente versione disponibile del pacchetto "
 "<literal>perl</literal>, fintanto che il suo numero di versione inizia con "
@@ -7452,23 +7464,23 @@ msgid ""
 "files retrieved from locations listed in the &sources-list; file are stored "
 "in the directory <filename>/var/lib/apt/lists</filename>, or in the file "
 "named by the variable <literal>Dir::State::Lists</literal> in the "
-"<filename>apt.conf</filename> file.  For example, the file <filename>debian."
-"lcs.mit.edu_debian_dists_unstable_contrib_binary-i386_Release</filename> "
-"contains the <filename>Release</filename> file retrieved from the site "
-"<literal>debian.lcs.mit.edu</literal> for <literal>binary-i386</literal> "
-"architecture files from the <literal>contrib</literal> component of the "
-"<literal>unstable</literal> distribution."
+"<filename>apt.conf</filename> file.  For example, the file "
+"<filename>debian.lcs.mit.edu_debian_dists_unstable_contrib_binary-"
+"i386_Release</filename> contains the <filename>Release</filename> file "
+"retrieved from the site <literal>debian.lcs.mit.edu</literal> for "
+"<literal>binary-i386</literal> architecture files from the <literal>contrib</"
+"literal> component of the <literal>unstable</literal> distribution."
 msgstr ""
 "Tutti i file <filename>Packages</filename> e <filename>Release</filename> "
 "recuperati dalle posizioni elencate nel file &sources-list; sono memorizzati "
 "nella directory <filename>/var/lib/apt/lists</filename> o nel file indicato "
-"dalla variabile <literal>Dir::State::Lists</literal> nel file <filename>apt."
-"conf</filename>. Per esempio, il file <filename>debian.lcs.mit."
-"edu_debian_dists_unstable_contrib_binary-i386_Release</filename> contiene il "
-"file <filename>Release</filename> recuperato dal sito <literal>debian.lcs."
-"mit.edu</literal> per i file dell'architettura <literal>binary-i386</"
-"literal> nella componente <literal>contrib</literal> della distribuzione "
-"<literal>unstable</literal>."
+"dalla variabile <literal>Dir::State::Lists</literal> nel file "
+"<filename>apt.conf</filename>. Per esempio, il file "
+"<filename>debian.lcs.mit.edu_debian_dists_unstable_contrib_binary-"
+"i386_Release</filename> contiene il file <filename>Release</filename> "
+"recuperato dal sito <literal>debian.lcs.mit.edu</literal> per i file "
+"dell'architettura <literal>binary-i386</literal> nella componente "
+"<literal>contrib</literal> della distribuzione <literal>unstable</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 #: apt_preferences.5.xml
@@ -7899,6 +7911,12 @@ msgstr ""
 "incontrare opzioni, dato che erano non comuni prima dell'introduzione del "
 "supporto multiarchitettura."
 
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml
+msgid ""
+"This format is deprecated and may eventually be removed, but not before 2029."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><title>
 #: sources.list.5.xml
 msgid "deb822-Style Format"
@@ -8161,10 +8179,17 @@ msgstr "&sourceslist-sources-format;"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
-msgid ""
-"As an example, the sources for your distribution could look like this in one-"
-"line-style format: <placeholder type=\"literallayout\" id=\"0\"/> or like "
-"this in deb822 style format: <placeholder type=\"literallayout\" id=\"1\"/>"
+#, fuzzy
+#| msgid ""
+#| "As an example, the sources for your distribution could look like this in "
+#| "one-line-style format: <placeholder type=\"literallayout\" id=\"0\"/> or "
+#| "like this in deb822 style format: <placeholder type=\"literallayout\" "
+#| "id=\"1\"/>"
+msgid ""
+"As an example, the sources for your distribution could look like this in the "
+"deprecated one-line-style format: <placeholder type=\"literallayout\" "
+"id=\"0\"/> or like 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 "
@@ -8234,11 +8259,12 @@ msgstr ""
 msgid ""
 "<option>Targets</option> (<option>target</option>) is a multivalue option "
 "defining which download targets apt will try to acquire from this source. If "
-"not specified, the default set is defined by the <option>Acquire::"
-"IndexTargets</option> configuration scope (targets are specified by their "
-"name in the <literal>Created-By</literal> field).  Additionally, targets can "
-"be enabled or disabled by using the <literal>Identifier</literal> field as "
-"an option with a boolean value instead of using this multivalue option."
+"not specified, the default set is defined by the "
+"<option>Acquire::IndexTargets</option> configuration scope (targets are "
+"specified by their name in the <literal>Created-By</literal> field).  "
+"Additionally, targets can be enabled or disabled by using the "
+"<literal>Identifier</literal> field as an option with a boolean value "
+"instead of using this multivalue option."
 msgstr ""
 "<option>Targets</option> (<option>target</option>) è un'opzione multivalore "
 "che definisce quali rilasci obiettivo di scaricamento apt cercherà di "
@@ -8449,8 +8475,9 @@ msgid ""
 "helps users identify mirrors which are no longer updated. However, some "
 "repositories such as historic archives are not updated any more by design, "
 "so this check can be disabled by setting this option to <literal>no</"
-"literal>.  Defaults to the value of configuration option <option>Acquire::"
-"Check-Valid-Until</option> which itself defaults to <literal>yes</literal>."
+"literal>.  Defaults to the value of configuration option "
+"<option>Acquire::Check-Valid-Until</option> which itself defaults to "
+"<literal>yes</literal>."
 msgstr ""
 "<option>Check-Valid-Until</option> (<option>check-valid-until</option>)  è "
 "un valore «yes»/«no» che determina se  APT debba cercare di rilevare "
@@ -8493,8 +8520,9 @@ msgstr ""
 "raramente di un archivio aggiornato più frequentemente ma meno raggiungibile "
 "(che è anch'esso nel sources.list) invece di disabilitare completamente il "
 "controllo. I valori assunti in modo predefinito sono quelli delle opzioni di "
-"configurazione <option>Acquire::Min-ValidTime</option> e <option>Acquire::"
-"Max-ValidTime</option> che sono entrambe non impostate in modo predefinito."
+"configurazione <option>Acquire::Min-ValidTime</option> e "
+"<option>Acquire::Max-ValidTime</option> che sono entrambe non impostate in "
+"modo predefinito."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #: sources.list.5.xml
@@ -9066,8 +9094,8 @@ msgstr ""
 #: apt-extracttemplates.1.xml
 msgid ""
 "Temporary directory in which to write extracted <command>debconf</command> "
-"template files and config scripts.  Configuration Item: <literal>APT::"
-"ExtractTemplates::TempDir</literal>"
+"template files and config scripts.  Configuration Item: "
+"<literal>APT::ExtractTemplates::TempDir</literal>"
 msgstr ""
 "Directory temporanea dove scrivere gli script di configurazione e i file "
 "template di <command>debconf</command> estratti. Voce di configurazione: "
@@ -9110,8 +9138,8 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-sortpkgs.1.xml
 msgid ""
-"Use source index field ordering.  Configuration Item: <literal>APT::"
-"SortPkgs::Source</literal>."
+"Use source index field ordering.  Configuration Item: "
+"<literal>APT::SortPkgs::Source</literal>."
 msgstr ""
 "Usa l'ordinamento dei campi dell'indice dei sorgenti. Voce di "
 "configurazione: <literal>APT::SortPkgs::Source</literal>."
@@ -9245,22 +9273,22 @@ msgid ""
 "<filename>icons</filename> files as well as <filename>Release</filename>, "
 "<filename>Index</filename> and <filename>md5sum.txt</filename> files by "
 "default (<literal>APT::FTPArchive::Release::Default-Patterns</literal>).  "
-"Additional filename patterns can be added by listing them in <literal>APT::"
-"FTPArchive::Release::Patterns</literal>.  It then writes to stdout a "
-"<filename>Release</filename> file containing (by default) an MD5, SHA1, "
-"SHA256 and SHA512 digest for each file."
+"Additional filename patterns can be added by listing them in "
+"<literal>APT::FTPArchive::Release::Patterns</literal>.  It then writes to "
+"stdout a <filename>Release</filename> file containing (by default) an MD5, "
+"SHA1, SHA256 and SHA512 digest for each file."
 msgstr ""
 "Il comando <literal>release</literal> genera un file Release da un albero di "
 "directory. In modo predefinito cerca ricorsivamente nella directory data i "
 "file <filename>Packages</filename>, <filename>Sources</filename>, "
 "<filename>Contents</filename>, <filename>Components</filename> e "
 "<filename>icons</filename> compressi e non compressi, come anche i file "
-"<filename>Release</filename>, <filename>Index</filename> e <filename>md5sum."
-"txt</filename> (<literal>APT::FTPArchive::Release::Default-Patterns</"
-"literal>). Si possono aggiungere ulteriori modelli per i nomi di file "
-"elencandoli in <literal>APT::FTPArchive::Release::Patterns</literal>. Scrive "
-"poi sullo stdout un file <filename>Release</filename> contenente (in modo "
-"predefinito) per ogni file un digest MD5, SHA1, SHA256 e SHA512."
+"<filename>Release</filename>, <filename>Index</filename> e "
+"<filename>md5sum.txt</filename> (<literal>APT::FTPArchive::Release::Default-"
+"Patterns</literal>). Si possono aggiungere ulteriori modelli per i nomi di "
+"file elencandoli in <literal>APT::FTPArchive::Release::Patterns</literal>. "
+"Scrive poi sullo stdout un file <filename>Release</filename> contenente (in "
+"modo predefinito) per ogni file un digest MD5, SHA1, SHA256 e SHA512."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml
@@ -9505,12 +9533,12 @@ msgstr "Sezione <literal>TreeDefault</literal>"
 #: apt-ftparchive.1.xml
 msgid ""
 "Sets defaults specific to <literal>Tree</literal> sections. All of these "
-"variables are substitution variables and have the strings $(DIST), "
-"$(SECTION) and $(ARCH) replaced with their respective values."
+"variables are substitution variables and have the strings $(DIST), $"
+"(SECTION) and $(ARCH) replaced with their respective values."
 msgstr ""
 "Imposta valori predefiniti specifici per le sezioni <literal>Tree</literal>. "
-"Tutte queste variabili sono variabili di sostituzione in cui le stringhe "
-"$(DIST), $(SECTION) e $(ARCH) verranno sostituite dai loro rispettivi valori."
+"Tutte queste variabili sono variabili di sostituzione in cui le stringhe $"
+"(DIST), $(SECTION) e $(ARCH) verranno sostituite dai loro rispettivi valori."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml
@@ -9545,8 +9573,8 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml
 msgid ""
-"Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
-"$(SECTION)/binary-$(ARCH)/</filename>"
+"Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/$"
+"(SECTION)/binary-$(ARCH)/</filename>"
 msgstr ""
 "Imposta la radice dell'albero della directory dei .deb. Il valore "
 "predefinito è <filename>$(DIST)/$(SECTION)/binary-$(ARCH)/</filename>."
@@ -9554,8 +9582,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>."
@@ -9566,8 +9594,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
@@ -9582,8 +9610,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 "
@@ -9609,11 +9637,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
@@ -9986,8 +10014,8 @@ msgstr ""
 "Effettua il de-collegamento. Se viene usata l'impostazione <literal>External-"
 "Links</literal> allora questa opzione abilita di fatto il de-collegamento "
 "dei file. È attiva in modo predefinito e può essere disabilitata con "
-"<option>--no-delink</option>. Voce di configurazione: <literal>APT::"
-"FTPArchive::DeLinkAct</literal>."
+"<option>--no-delink</option>. Voce di configurazione: "
+"<literal>APT::FTPArchive::DeLinkAct</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml
@@ -10013,14 +10041,14 @@ msgid ""
 "literal>."
 msgstr ""
 "Seleziona il file override sorgente da usare con il comando "
-"<literal>sources</literal>. Voce di configurazione <literal>APT::FTPArchive::"
-"SourceOverride</literal>."
+"<literal>sources</literal>. Voce di configurazione "
+"<literal>APT::FTPArchive::SourceOverride</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml
 msgid ""
-"Make the caching databases read only.  Configuration Item: <literal>APT::"
-"FTPArchive::ReadOnlyDB</literal>."
+"Make the caching databases read only.  Configuration Item: "
+"<literal>APT::FTPArchive::ReadOnlyDB</literal>."
 msgstr ""
 "Rende i database delle cache in sola lettura. Voce di configurazione: "
 "<literal>APT::FTPArchive::ReadOnlyDB</literal>."
@@ -10036,8 +10064,8 @@ msgstr ""
 "Accetta per i comandi <literal>packages</literal> e <literal>contents</"
 "literal> solo i file di pacchetto che corrispondono a <literal>*_arch.deb</"
 "literal> o <literal>*_all.deb</literal> invece di tutti i file di pacchetto "
-"nel percorso specificato. Voce di configurazione: <literal>APT::FTPArchive::"
-"Architecture</literal>."
+"nel percorso specificato. Voce di configurazione: "
+"<literal>APT::FTPArchive::Architecture</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml
@@ -10399,16 +10427,17 @@ msgid ""
 "The environment variable <envar>http_proxy</envar> is supported for system "
 "wide configuration.  Proxies specific to APT can be configured via the "
 "option <literal>Acquire::http::Proxy</literal>.  Proxies which should be "
-"used only for certain hosts can be specified via <literal>Acquire::http::"
-"Proxy::<replaceable>host</replaceable></literal>. Even more fine-grained "
-"control can be achieved via proxy autodetection, detailed further below.  "
-"All these options use the URI format <literal><replaceable>scheme</"
-"replaceable>://[[<replaceable>user</replaceable>][:<replaceable>pass</"
-"replaceable>]@]<replaceable>host</replaceable>[:<replaceable>port</"
-"replaceable>]/</literal>.  Supported URI schemes are <literal>socks5h</"
-"literal> (SOCKS5 with remote DNS resolution), <literal>http</literal> and "
-"<literal>https</literal>.  Authentication details can be supplied via &apt-"
-"authconf; instead of including it in the URI directly."
+"used only for certain hosts can be specified via "
+"<literal>Acquire::http::Proxy::<replaceable>host</replaceable></literal>. "
+"Even more fine-grained control can be achieved via proxy autodetection, "
+"detailed further below.  All these options use the URI format "
+"<literal><replaceable>scheme</replaceable>://[[<replaceable>user</"
+"replaceable>][:<replaceable>pass</replaceable>]@]<replaceable>host</"
+"replaceable>[:<replaceable>port</replaceable>]/</literal>.  Supported URI "
+"schemes are <literal>socks5h</literal> (SOCKS5 with remote DNS resolution), "
+"<literal>http</literal> and <literal>https</literal>.  Authentication "
+"details can be supplied via &apt-authconf; instead of including it in the "
+"URI directly."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
@@ -10432,14 +10461,14 @@ msgstr ""
 #| "store the requested archive files in its cache, which can be used to "
 #| "prevent the proxy from polluting its cache with (big) .deb files."
 msgid ""
-"Furthermore, there are three settings provided for cache control with "
-"HTTP/1.1 compliant proxy caches: <literal>Acquire::http::No-Cache</literal> "
-"tells the proxy not to use its cached response under any circumstances.  "
+"Furthermore, there are three settings provided for cache control with HTTP/"
+"1.1 compliant proxy caches: <literal>Acquire::http::No-Cache</literal> tells "
+"the proxy not to use its cached response under any circumstances.  "
 "<literal>Acquire::http::Max-Age</literal> sets the allowed maximum age (in "
-"seconds) of an index file in the cache of the proxy.  <literal>Acquire::"
-"http::No-Store</literal> specifies that the proxy should not store the "
-"requested archive files in its cache, which can be used to prevent the proxy "
-"from polluting its cache with (big) .deb files."
+"seconds) of an index file in the cache of the proxy.  "
+"<literal>Acquire::http::No-Store</literal> specifies that the proxy should "
+"not store the requested archive files in its cache, which can be used to "
+"prevent the proxy from polluting its cache with (big) .deb files."
 msgstr ""
 "Sono fornite tre impostazioni per il controllo della cache in proxy con "
 "cache conformi an HTTP/1.1. <literal>No-Cache</literal> indica al proxy di "
@@ -10469,11 +10498,11 @@ msgstr "Configurazione utente"
 #| "</literal> or the word <literal>DIRECT</literal> if no proxy should be "
 #| "used. No output indicates that the generic proxy settings should be "
 #| "used.  Note that auto-detection will not be used for a host if a host-"
-#| "specific proxy configuration is already set via <literal>Acquire::http::"
-#| "Proxy::<replaceable>HOST</replaceable></literal>.  See the &squid-deb-"
-#| "proxy-client; package for an example implementation that uses avahi.  "
-#| "This option takes precedence over the legacy option name "
-#| "<literal>ProxyAutoDetect</literal>."
+#| "specific proxy configuration is already set via "
+#| "<literal>Acquire::http::Proxy::<replaceable>HOST</replaceable></"
+#| "literal>.  See the &squid-deb-proxy-client; package for an example "
+#| "implementation that uses avahi.  This option takes precedence over the "
+#| "legacy option name <literal>ProxyAutoDetect</literal>."
 msgid ""
 "<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to specify "
 "an external command to discover the HTTP proxy to use. The first and only "
@@ -10516,8 +10545,8 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt-transport-http.1.xml
 msgid ""
-"This option takes precedence over the legacy option name <literal>Acquire::"
-"http::ProxyAutoDetect</literal>."
+"This option takes precedence over the legacy option name "
+"<literal>Acquire::http::ProxyAutoDetect</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
@@ -10558,11 +10587,11 @@ msgid ""
 "bandwidth. Note that this option implicitly disables downloading from "
 "multiple servers at the same time."
 msgstr ""
-"La quantità di banda utilizzata può essere limitata con <literal>Acquire::"
-"http::Dl-Limit</literal> che accetta valori interi in kilobyte al secondo. "
-"Il valore predefinito è 0 che disattiva il limite e cerca di usare tutta la "
-"banda disponibile. Notare che questa opzione implicitamente disabilita lo "
-"scaricamento da più server contemporaneamente."
+"La quantità di banda utilizzata può essere limitata con "
+"<literal>Acquire::http::Dl-Limit</literal> che accetta valori interi in "
+"kilobyte al secondo. Il valore predefinito è 0 che disattiva il limite e "
+"cerca di usare tutta la banda disponibile. Notare che questa opzione "
+"implicitamente disabilita lo scaricamento da più server contemporaneamente."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt-transport-http.1.xml
@@ -10577,12 +10606,12 @@ msgstr ""
 #| "by setting the value to 0. It is enabled by default with the value 10."
 msgid ""
 "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
-"enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
-"g. on high-latency connections. It specifies how many requests are sent in a "
-"pipeline.  APT tries to detect and work around misbehaving webservers and "
-"proxies at runtime, but if you know that yours does not conform to the "
-"HTTP/1.1 specification, pipelining can be disabled by setting the value to "
-"0. It is enabled by default with the value 10."
+"enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial "
+"e.g. on high-latency connections. It specifies how many requests are sent in "
+"a pipeline.  APT tries to detect and work around misbehaving webservers and "
+"proxies at runtime, but if you know that yours does not conform to the HTTP/"
+"1.1 specification, pipelining can be disabled by setting the value to 0. It "
+"is enabled by default with the value 10."
 msgstr ""
 "L'impostazione <literal>Acquire::http::Pipeline-Depth</literal> può essere "
 "usata per abilitare le pipeline HTTP (RFC 2616, sezione 8.1.2.2) che possono "
@@ -10683,9 +10712,9 @@ msgstr ""
 msgid ""
 "The HTTPS protocol is based on the HTTP protocol, so all options supported "
 "by &apt-transport-http; are also available via <literal>Acquire::https</"
-"literal> and will default to the same values specified for <literal>Acquire::"
-"http</literal>. This manpage will only document the options <emphasis>unique "
-"to https</emphasis>."
+"literal> and will default to the same values specified for "
+"<literal>Acquire::http</literal>. This manpage will only document the "
+"options <emphasis>unique to https</emphasis>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
@@ -10714,9 +10743,10 @@ msgstr ""
 #: apt-transport-https.1.xml
 msgid ""
 "A custom certificate revocation list (CRL) can be configured with the "
-"options <literal>Acquire::https::CRLFile</literal> and <literal>Acquire::"
-"https::CRLFile::<replaceable>host</replaceable></literal>.  As with the "
-"previous option, a file in PEM format needs to be specified."
+"options <literal>Acquire::https::CRLFile</literal> and "
+"<literal>Acquire::https::CRLFile::<replaceable>host</replaceable></"
+"literal>.  As with the previous option, a file in PEM format needs to be "
+"specified."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
@@ -10762,11 +10792,11 @@ msgstr ""
 msgid ""
 "Besides supporting password-based authentication (see &apt-authconf;) HTTPS "
 "also supports authentication based on client certificates via "
-"<literal>Acquire::https::SSLCert</literal> and <literal>Acquire::https::"
-"SSLKey</literal>. These should be set respectively to the filename of the "
-"X.509 client certificate and the associated (unencrypted) private key, both "
-"in PEM format.  In practice the use of the host-specific variants of both "
-"options is highly recommended."
+"<literal>Acquire::https::SSLCert</literal> and "
+"<literal>Acquire::https::SSLKey</literal>. These should be set respectively "
+"to the filename of the X.509 client certificate and the associated "
+"(unencrypted) private key, both in PEM format.  In practice the use of the "
+"host-specific variants of both options is highly recommended."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
@@ -10968,9 +10998,9 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt-transport-mirror.1.xml
 msgid ""
-"Assuming a file with this content is stored as <filename>/etc/apt/mirrorlist."
-"txt</filename> on your machine it can be used like this in &sources-list; "
-"(since apt 1.6):"
+"Assuming a file with this content is stored as <filename>/etc/apt/"
+"mirrorlist.txt</filename> on your machine it can be used like this in "
+"&sources-list; (since apt 1.6):"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><literallayout>
@@ -11907,10 +11937,10 @@ msgstr ""
 #: apt-patterns.7.xml
 msgid ""
 "<code>foo</code> cannot be used as a shortform for <code>?name(foo)</code>, "
-"as this can cause typos to go unnoticed: Consider <code>?and(...,"
-"~poptional)</code>: this requires the package to have <code>required</code> "
-"priority, but if you do not type the <code>~</code>, it would require the "
-"package name to contain <code>poptional</code>."
+"as this can cause typos to go unnoticed: Consider <code>?"
+"and(...,~poptional)</code>: this requires the package to have "
+"<code>required</code> priority, but if you do not type the <code>~</code>, "
+"it would require the package name to contain <code>poptional</code>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
@@ -13542,35 +13572,36 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
 
 #~ msgid ""
 #~ "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP "
-#~ "URIs.  It is in the standard form of <literal>ftp://[[user][:pass]@]host[:"
-#~ "port]/</literal>.  Per host proxies can also be specified by using the "
-#~ "form <literal>ftp::Proxy::&lt;host&gt;</literal> with the special keyword "
-#~ "<literal>DIRECT</literal> meaning to use no proxies. If no one of the "
-#~ "above settings is specified, <envar>ftp_proxy</envar> environment "
-#~ "variable will be used. To use an FTP proxy you will have to set the "
-#~ "<literal>ftp::ProxyLogin</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>."
+#~ "URIs.  It is in the standard form of <literal>ftp://[[user]"
+#~ "[:pass]@]host[:port]/</literal>.  Per host proxies can also be specified "
+#~ "by using the form <literal>ftp::Proxy::&lt;host&gt;</literal> with the "
+#~ "special keyword <literal>DIRECT</literal> meaning to use no proxies. If "
+#~ "no one of the above settings is specified, <envar>ftp_proxy</envar> "
+#~ "environment variable will be used. To use an FTP proxy you will have to "
+#~ "set the <literal>ftp::ProxyLogin</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>."
 #~ msgstr ""
 #~ "<literal>ftp::Proxy</literal> imposta il proxy predefinito da usare per "
-#~ "gli URI FTP. È nella forma standard <literal>ftp://[[utente][:"
-#~ "password]@]host[:porta]/</literal>. Si possono anche specificare proxy "
+#~ "gli URI FTP. È nella forma standard <literal>ftp://[[utente]"
+#~ "[:password]@]host[:porta]/</literal>. Si possono anche specificare proxy "
 #~ "per ciascun host usando la forma <literal>ftp::Proxy::&lt;host&gt;</"
 #~ "literal> con la speciale parola chiave <literal>DIRECT</literal> che "
 #~ "indica di non usare proxy. Se nessuna delle opzioni precedenti è "
 #~ "impostata, viene usata la variabile d'ambiente <envar>ftp_proxy</envar>. "
-#~ "Per usare un proxy FTP è necessario impostare lo script <literal>ftp::"
-#~ "ProxyLogin</literal> nel file di configurazione. Questa voce specifica i "
-#~ "comandi da inviare per dire al 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>."
+#~ "Per usare un proxy FTP è necessario impostare lo script "
+#~ "<literal>ftp::ProxyLogin</literal> nel file di configurazione. Questa "
+#~ "voce specifica i comandi da inviare per dire al 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>."
 
 #~ msgid ""
 #~ "The option <literal>timeout</literal> sets the timeout timer used by the "
@@ -13840,9 +13871,9 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
 #~ "With this option it is possible to specify a particular keyring file the "
 #~ "command should operate on. The default is that a command is executed on "
 #~ "the <filename>trusted.gpg</filename> file as well as on all parts in the "
-#~ "<filename>trusted.gpg.d</filename> directory, though <filename>trusted."
-#~ "gpg</filename> is the primary keyring which means that e.g. new keys are "
-#~ "added to this one."
+#~ "<filename>trusted.gpg.d</filename> directory, though "
+#~ "<filename>trusted.gpg</filename> is the primary keyring which means that "
+#~ "e.g. new keys are added to this one."
 #~ msgstr ""
 #~ "Con questa opzione è possibile specificare un particolare file "
 #~ "portachiavi su cui deve operare il comando. Il comportamento predefinito "
@@ -13917,16 +13948,16 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
 
 #~ msgid ""
 #~ "<literal>http::Proxy</literal> sets the default proxy to use for HTTP "
-#~ "URIs. It is in the standard form of <literal>http://[[user][:pass]@]host[:"
-#~ "port]/</literal>.  Per host proxies can also be specified by using the "
-#~ "form <literal>http::Proxy::&lt;host&gt;</literal> with the special "
-#~ "keyword <literal>DIRECT</literal> meaning to use no proxies. If no one of "
-#~ "the above settings is specified, <envar>http_proxy</envar> environment "
-#~ "variable will be used."
+#~ "URIs. It is in the standard form of <literal>http://[[user]"
+#~ "[:pass]@]host[:port]/</literal>.  Per host proxies can also be specified "
+#~ "by using the form <literal>http::Proxy::&lt;host&gt;</literal> with the "
+#~ "special keyword <literal>DIRECT</literal> meaning to use no proxies. If "
+#~ "no one of the above settings is specified, <envar>http_proxy</envar> "
+#~ "environment variable will be used."
 #~ msgstr ""
 #~ "<literal>http::Proxy</literal> imposta il proxy predefinito da usare per "
-#~ "gli URI HTTP. È nella forma standard <literal>http://[[utente][:"
-#~ "password]@]host[:porta]/</literal>. Possono anche essere specificati "
+#~ "gli URI HTTP. È nella forma standard <literal>http://[[utente]"
+#~ "[:password]@]host[:porta]/</literal>. Possono anche essere specificati "
 #~ "proxy per ciascun host usando la forma <literal>http::Proxy::&lt;host&gt;"
 #~ "</literal> con la speciale parola chiave <literal>DIRECT</literal> che "
 #~ "significa di non usare un proxy. Se non viene specificata alcuna delle "
@@ -13953,41 +13984,42 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
 #~ "info about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> "
 #~ "is the corresponding per-host option.  <literal>Verify-Peer</literal> "
 #~ "boolean suboption determines whether or not the server's host certificate "
-#~ "should be verified against trusted certificates.  <literal>&lt;host&gt;::"
-#~ "Verify-Peer</literal> is the corresponding per-host option.  "
-#~ "<literal>Verify-Host</literal> boolean suboption determines whether or "
-#~ "not the server's hostname should be verified.  <literal>&lt;host&gt;::"
-#~ "Verify-Host</literal> is the corresponding per-host option.  "
-#~ "<literal>SslCert</literal> determines what certificate to use for client "
-#~ "authentication. <literal>&lt;host&gt;::SslCert</literal> is the "
-#~ "corresponding per-host option.  <literal>SslKey</literal> determines what "
-#~ "private key to use for client authentication. <literal>&lt;host&gt;::"
-#~ "SslKey</literal> is the corresponding per-host option.  "
-#~ "<literal>SslForceVersion</literal> overrides default SSL version to use.  "
-#~ "It can contain either of the strings '<literal>TLSv1</literal>' or "
-#~ "'<literal>SSLv3</literal>'.  <literal>&lt;host&gt;::SslForceVersion</"
+#~ "should be verified against trusted certificates.  "
+#~ "<literal>&lt;host&gt;::Verify-Peer</literal> is the corresponding per-"
+#~ "host option.  <literal>Verify-Host</literal> boolean suboption determines "
+#~ "whether or not the server's hostname should be verified.  "
+#~ "<literal>&lt;host&gt;::Verify-Host</literal> is the corresponding per-"
+#~ "host option.  <literal>SslCert</literal> determines what certificate to "
+#~ "use for client authentication. <literal>&lt;host&gt;::SslCert</literal> "
+#~ "is the corresponding per-host option.  <literal>SslKey</literal> "
+#~ "determines what private key to use for client authentication. "
+#~ "<literal>&lt;host&gt;::SslKey</literal> is the corresponding per-host "
+#~ "option.  <literal>SslForceVersion</literal> overrides default SSL version "
+#~ "to use.  It can contain either of the strings '<literal>TLSv1</literal>' "
+#~ "or '<literal>SSLv3</literal>'.  <literal>&lt;host&gt;::SslForceVersion</"
 #~ "literal> is the corresponding per-host option."
 #~ msgstr ""
 #~ "La sotto-opzione <literal>CaInfo</literal> specifica la posizione del "
-#~ "file che contiene le informazioni sui certificati fidati; <literal>&lt;"
-#~ "host&gt;::CaInfo</literal> è la corrispondente opzione specifica per "
-#~ "ciascun host. La sotto-opzione booleana <literal>Verify-Peer</literal> "
-#~ "determina se il certificato host del server deve o non deve essere "
-#~ "verificato usando i certificati fidati; <literal>&lt;host&gt;::Verify-"
-#~ "Peer</literal> è la corrispondente opzione specifica per ciascun host. La "
-#~ "sotto-opzione booleana <literal>Verify-Host</literal> determina se il "
-#~ "nome host del server deve o non deve essere verificato; <literal>&lt;"
-#~ "host&gt;::Verify-Host</literal> è la corrispondente opzione specifica per "
-#~ "ciascun host. <literal>SslCert</literal> determina quale certificato "
-#~ "usare per l'autenticazione client; <literal>&lt;host&gt;::SslCert</"
-#~ "literal> è la corrispondente opzione specifica per ciascun host. "
-#~ "<literal>SslKey</literal> determina quale chiave privata usare per "
-#~ "l'autenticazione client; <literal>&lt;host&gt;::SslKey</literal> è la "
-#~ "corrispondente opzione specifica per ciascun host. "
-#~ "<literal>SslForceVersion</literal> scavalca la versione predefinita SSL "
-#~ "da usare e può contenere la stringa «<literal>TLSv1</literal>» o "
-#~ "«<literal>SSLv3</literal>»;  <literal>&lt;host&gt;::SslForceVersion</"
-#~ "literal> è la corrispondente opzione specifica per ciascun host."
+#~ "file che contiene le informazioni sui certificati fidati; "
+#~ "<literal>&lt;host&gt;::CaInfo</literal> è la corrispondente opzione "
+#~ "specifica per ciascun host. La sotto-opzione booleana <literal>Verify-"
+#~ "Peer</literal> determina se il certificato host del server deve o non "
+#~ "deve essere verificato usando i certificati fidati; "
+#~ "<literal>&lt;host&gt;::Verify-Peer</literal> è la corrispondente opzione "
+#~ "specifica per ciascun host. La sotto-opzione booleana <literal>Verify-"
+#~ "Host</literal> determina se il nome host del server deve o non deve "
+#~ "essere verificato; <literal>&lt;host&gt;::Verify-Host</literal> è la "
+#~ "corrispondente opzione specifica per ciascun host. <literal>SslCert</"
+#~ "literal> determina quale certificato usare per l'autenticazione client; "
+#~ "<literal>&lt;host&gt;::SslCert</literal> è la corrispondente opzione "
+#~ "specifica per ciascun host. <literal>SslKey</literal> determina quale "
+#~ "chiave privata usare per l'autenticazione client; "
+#~ "<literal>&lt;host&gt;::SslKey</literal> è la corrispondente opzione "
+#~ "specifica per ciascun host. <literal>SslForceVersion</literal> scavalca "
+#~ "la versione predefinita SSL da usare e può contenere la stringa "
+#~ "«<literal>TLSv1</literal>» o «<literal>SSLv3</literal>»;  "
+#~ "<literal>&lt;host&gt;::SslForceVersion</literal> è la corrispondente "
+#~ "opzione specifica per ciascun host."
 
 #~ msgid ""
 #~ "The http scheme specifies an HTTP server for the archive. If an "
@@ -14001,27 +14033,29 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
 #~ "variabile d'ambiente <envar>http_proxy</envar> con il formato http://"
 #~ "server:porta/, verrà usato il server proxy specificato in "
 #~ "<envar>http_proxy</envar>. Gli utenti con proxy HTTP/1.1 con "
-#~ "autenticazione possono usare una stringa nel formato http://utente:"
-#~ "password@server:porta/. Notare che questo è un metodo di autenticazione "
-#~ "non sicuro."
+#~ "autenticazione possono usare una stringa nel formato http://"
+#~ "utente:password@server:porta/. Notare che questo è un metodo di "
+#~ "autenticazione non sicuro."
 
 #~ msgid ""
 #~ "As a temporary exception &apt-get; (not &apt;!) raises warnings only if "
 #~ "it encounters unauthenticated archives to give a slightly longer grace "
 #~ "period on this backward compatibility effecting change. This exception "
 #~ "will be removed in future releases and you can opt-out of this grace "
-#~ "period by setting the configuration option <option>Binary::apt-get::"
-#~ "Acquire::AllowInsecureRepositories</option> to <literal>false</literal> "
-#~ "or <option>--no-allow-insecure-repositories</option> on the command line."
+#~ "period by setting the configuration option <option>Binary::apt-"
+#~ "get::Acquire::AllowInsecureRepositories</option> to <literal>false</"
+#~ "literal> or <option>--no-allow-insecure-repositories</option> on the "
+#~ "command line."
 #~ msgstr ""
 #~ "Come eccezione temporanea &apt-get; (non &apt;!) dà solo avvertimenti se "
 #~ "incrontra archivi non autenticati, per fornire un periodo di grazia "
 #~ "leggermente più lungo per questa modifica che influenza sulla "
 #~ "compatibilità all'indietro. Questa eccezione sarà rimossa nei rilasci "
 #~ "futuri e si può rinunciare a questo periodo di grazia ipostando l'opzione "
-#~ "di configurazione <option>Binary::apt-get::Acquire::"
-#~ "AllowInsecureRepositories</option> a <literal>false</literal> o <option>--"
-#~ "no-allow-insecure-repositories</option> nella riga di comando."
+#~ "di configurazione <option>Binary::apt-"
+#~ "get::Acquire::AllowInsecureRepositories</option> a <literal>false</"
+#~ "literal> o <option>--no-allow-insecure-repositories</option> nella riga "
+#~ "di comando."
 
 #~ msgid "Archive Configuration"
 #~ msgstr "Configurazione dell'archivio"
@@ -14225,8 +14259,9 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
 #~ "In futuro APT si rifiuterà in modo predefinito di lavorare con repository "
 #~ "non autenticati fino a quando il supporto per essi sarà completamente "
 #~ "rimosso. Gli utenti hanno l'opzione di passare di già a questo "
-#~ "comportamento impostando l'opzione di configurazione <option>Acquire::"
-#~ "AllowInsecureRepositories</option> a <literal>false</literal>."
+#~ "comportamento impostando l'opzione di configurazione "
+#~ "<option>Acquire::AllowInsecureRepositories</option> a <literal>false</"
+#~ "literal>."
 
 #~ msgid ""
 #~ "Allow the update operation to load data files from a repository without a "
@@ -14365,8 +14400,8 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
 
 #~ msgid ""
 #~ "No action; perform a simulation of events that would occur but do not "
-#~ "actually change the system.  Configuration Item: <literal>APT::Get::"
-#~ "Simulate</literal>."
+#~ "actually change the system.  Configuration Item: "
+#~ "<literal>APT::Get::Simulate</literal>."
 #~ msgstr ""
 #~ "Nessuna azione; effettua una simulazione degli eventi che si "
 #~ "verificherebbero, ma non cambia realmente il sistema. Voce di "
@@ -14374,12 +14409,12 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
 
 #~ msgid ""
 #~ "Simulated runs performed as a user will automatically deactivate locking "
-#~ "(<literal>Debug::NoLocking</literal>), and if the option <literal>APT::"
-#~ "Get::Show-User-Simulation-Note</literal> is set (as it is by default) a "
-#~ "notice will also be displayed indicating that this is only a simulation. "
-#~ "Runs performed as root do not trigger either NoLocking or the notice - "
-#~ "superusers should know what they are doing without further warnings from "
-#~ "<literal>apt-get</literal>."
+#~ "(<literal>Debug::NoLocking</literal>), and if the option "
+#~ "<literal>APT::Get::Show-User-Simulation-Note</literal> is set (as it is "
+#~ "by default) a notice will also be displayed indicating that this is only "
+#~ "a simulation. Runs performed as root do not trigger either NoLocking or "
+#~ "the notice - superusers should know what they are doing without further "
+#~ "warnings from <literal>apt-get</literal>."
 #~ msgstr ""
 #~ "Le esecuzioni simulate effettuate da un utente disattivano "
 #~ "automaticamente il lock (<literal>Debug::NoLocking</literal>) e se è "
@@ -14568,8 +14603,8 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
 #~| "B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources.list>(5), "
 #~| "B<apt_preferences>(5), B<apt-secure>(8)"
 #~ msgid ""
-#~ "B<apt>(8), B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources."
-#~ "list>(5), B<apt_preferences>(5), B<apt-secure>(8)"
+#~ "B<apt>(8), B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), "
+#~ "B<sources.list>(5), B<apt_preferences>(5), B<apt-secure>(8)"
 #~ msgstr ""
 #~ "B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources.list>(5), "
 #~ "B<apt_preferences>(5), B<apt-secure>(8)"
@@ -15437,8 +15472,8 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
 #~ "versions</option>. Se si specifica <option>--no-all-versions</option>, "
 #~ "verrà visualizzata solo la versione candidata (quella che sarebbe scelta "
 #~ "per l'installazione). Questa opzione è applicabile solo al comando "
-#~ "<literal>show</literal>. Voce di configurazione: <literal>APT::Cache::"
-#~ "AllVersions</literal>."
+#~ "<literal>show</literal>. Voce di configurazione: "
+#~ "<literal>APT::Cache::AllVersions</literal>."
 
 #~ msgid "<option>-g</option>"
 #~ msgstr "<option>-g</option>"
@@ -15673,16 +15708,16 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
 
 #~ msgid ""
 #~ "template-file and config-script are written to the temporary directory "
-#~ "specified by the -t or --tempdir (<literal>APT::ExtractTemplates::"
-#~ "TempDir</literal>)  directory, with filenames of the form "
-#~ "<filename>package.template.XXXX</filename> and <filename>package.config."
-#~ "XXXX</filename>"
+#~ "specified by the -t or --tempdir "
+#~ "(<literal>APT::ExtractTemplates::TempDir</literal>)  directory, with "
+#~ "filenames of the form <filename>package.template.XXXX</filename> and "
+#~ "<filename>package.config.XXXX</filename>"
 #~ msgstr ""
 #~ "file-template e script-di-configurazione sono scritti nella directory "
-#~ "temporanea specificata da -t o --tempdir (<literal>APT::ExtractTemplates::"
-#~ "TempDir</literal>) directory, con i nomi dei file nella forma "
-#~ "<filename>pacchetto.template.XXXX</filename> e <filename>pacchetto.config."
-#~ "XXXX</filename>"
+#~ "temporanea specificata da -t o --tempdir "
+#~ "(<literal>APT::ExtractTemplates::TempDir</literal>) directory, con i nomi "
+#~ "dei file nella forma <filename>pacchetto.template.XXXX</filename> e "
+#~ "<filename>pacchetto.config.XXXX</filename>"
 
 #~ msgid "<option>-t</option>"
 #~ msgstr "<option>-t</option>"
@@ -15692,12 +15727,12 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
 
 #~ msgid ""
 #~ "Temporary directory in which to write extracted debconf template files "
-#~ "and config scripts.  Configuration Item: <literal>APT::ExtractTemplates::"
-#~ "TempDir</literal>"
+#~ "and config scripts.  Configuration Item: "
+#~ "<literal>APT::ExtractTemplates::TempDir</literal>"
 #~ msgstr ""
 #~ "Directory temporanea dove scrivere i file template di debconf e gli "
-#~ "script di configurazione estratti. Voce di configurazione: <literal>APT::"
-#~ "ExtractTemplates::TempDir</literal>."
+#~ "script di configurazione estratti. Voce di configurazione: "
+#~ "<literal>APT::ExtractTemplates::TempDir</literal>."
 
 #~ msgid ""
 #~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
@@ -15774,10 +15809,10 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
 #~ "MD5 digest and SHA1 digest for each file."
 #~ msgstr ""
 #~ "Il comando <literal>release</literal> genera un file Release da un albero "
-#~ "di directory. Cerca ricorivamente file Packages, Packages.gz, Packages."
-#~ "bz2, Sources, Sources.gz, Sources.bz2, Release e md5sum.txt nella "
-#~ "directory data. Quindi scrive su stdout un file Release che contiene un "
-#~ "digest MD5 e SHA1 per ciascun file."
+#~ "di directory. Cerca ricorivamente file Packages, Packages.gz, "
+#~ "Packages.bz2, Sources, Sources.gz, Sources.bz2, Release e md5sum.txt "
+#~ "nella directory data. Quindi scrive su stdout un file Release che "
+#~ "contiene un digest MD5 e SHA1 per ciascun file."
 
 #~ msgid ""
 #~ "Values for the additional metadata fields in the Release file are taken "
@@ -15886,16 +15921,16 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
 #~ msgstr "Contents"
 
 #~ msgid ""
-#~ "Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-"
-#~ "$(ARCH)</filename>. If this setting causes multiple Packages files to map "
+#~ "Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$"
+#~ "(ARCH)</filename>. If this setting causes multiple Packages files to map "
 #~ "onto a single Contents file (such as the default)  then <command>apt-"
 #~ "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 fffbf92aa..73812d6b4 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: 2025-01-01 21:58+0100\n"
+"POT-Creation-Date: 2025-01-28 18:52+0000\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"
@@ -599,11 +599,13 @@ msgstr ""
 #. type: Plain text
 #: apt.ent
 msgid ""
-"<!-- TRANSLATOR: used as in -o=config_string e.g. -o=Debug::"
-"pkgProblemResolver=1 --> <!ENTITY synopsis-config-string \"config_string\">"
+"<!-- TRANSLATOR: used as in -o=config_string e.g. "
+"-o=Debug::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 \"設定文字列\">"
+"<!-- TRANSLATOR: used as in -o=config_string e.g. "
+"-o=Debug::pkgProblemResolver=1 --> <!ENTITY synopsis-config-string \"設定文字"
+"列\">"
 
 #. type: Plain text
 #: apt.ent
@@ -617,12 +619,12 @@ msgstr ""
 #. type: Plain text
 #: apt.ent
 msgid ""
-"<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release e.g. -"
-"t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
+"<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release e.g. "
+"-t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
 "\"target_release\">"
 msgstr ""
-"<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release e.g. -"
-"t=squeeze apt/experimental --> <!ENTITY synopsis-target-release \"対象リリー"
+"<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release e.g. "
+"-t=squeeze apt/experimental --> <!ENTITY synopsis-target-release \"対象リリー"
 "ス\">"
 
 #. type: Plain text
@@ -673,11 +675,11 @@ msgstr ""
 #. type: Plain text
 #: apt.ent
 msgid ""
-"<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom -"
-"d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"cdrom_mount_point\">"
+"<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom "
+"-d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"cdrom_mount_point\">"
 msgstr ""
-"<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom -"
-"d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"CDROMマウントポイント\">"
+"<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom "
+"-d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"CDROMマウントポイント\">"
 
 #. type: Plain text
 #: apt.ent
@@ -1234,10 +1236,10 @@ msgid ""
 msgstr ""
 "<literal>install</literal> の後には、インストールや更新したいパッケージを 1 "
 "つ以上指定します。指定するパッケージは、完全なファイル名ではなくパッケージ名"
-"です (例えば Debian システムでは、<filename>apt-utils_&apt-product-version;"
-"_amd64.deb</filename> ではなく <package>apt-utils</package> を引数として与え"
-"ます)。インストールするよう指定したすべてのパッケージに対し、依存パッケージも"
-"含めて取得・インストールを行います。<filename>/etc/apt/sources.list</"
+"です (例えば Debian システムでは、<filename>apt-utils_&apt-product-"
+"version;_amd64.deb</filename> ではなく <package>apt-utils</package> を引数と"
+"して与えます)。インストールするよう指定したすべてのパッケージに対し、依存パッ"
+"ケージも含めて取得・インストールを行います。<filename>/etc/apt/sources.list</"
 "filename> ファイルを、要求するパッケージの場所を特定するのに使用します。パッ"
 "ケージ名の後ろに (空白を含まず) ハイフンが追加されている場合、そのパッケージ"
 "がインストールされていれば削除します。同様に、インストールするパッケージを明"
@@ -1659,8 +1661,8 @@ msgid ""
 "structure can be so corrupt as to require manual intervention (which usually "
 "means using <command>dpkg --remove</command> to eliminate some of the "
 "offending packages). Use of this option together with <option>-m</option> "
-"may produce an error in some situations.  Configuration Item: <literal>APT::"
-"Get::Fix-Broken</literal>."
+"may produce an error in some situations.  Configuration Item: "
+"<literal>APT::Get::Fix-Broken</literal>."
 msgstr ""
 "修復 - 依存関係が壊れたシステムの修正を試みます。このオプションを install や "
 "remove と一緒に使うときは、APT が解決法を推測するので、パッケージを指定しなく"
@@ -1670,8 +1672,8 @@ msgstr ""
 "の依存関係構造にかなり問題がある場合は、手動で修正するよう要求することもあり"
 "ます。(通常は、問題のあるパッケージを取り除くのに <command>dpkg --remove</"
 "command> を使用します) このオプションを <option>-m</option> オプションと同時"
-"に使用すると、エラーになる状況があるかもしれません。設定項目: <literal>APT::"
-"Get::Fix-Broken</literal>"
+"に使用すると、エラーになる状況があるかもしれません。設定項目: "
+"<literal>APT::Get::Fix-Broken</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -1689,8 +1691,8 @@ msgstr ""
 "で処理を続けます。このオプションを <option>-f</option> オプションと同時に使用"
 "すると、エラーになる状況があるかもしれません。パッケージをインストールするよ"
 "う選択している (特にコマンドラインでの操作する) 場合や、ダウンロードできな"
-"かった場合に、なにも表示せず保留することになります。設定項目: <literal>APT::"
-"Get::Fix-Missing</literal>"
+"かった場合に、なにも表示せず保留することになります。設定項目: "
+"<literal>APT::Get::Fix-Missing</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -1736,13 +1738,13 @@ msgid ""
 "literal>."
 msgstr ""
 "何もしない - 現在のシステム状態に基づいて起こるイベントのシミュレーションを行"
-"い、実際にはシステムを変更しません。ロックは無効になる (<option>Debug::"
-"NoLocking</option>) ので、<command>apt-get</command> 実行中にシステムの状態が"
-"変化する可能性があります。シミュレーションは root 以外のユーザが実行できます"
-"が、シミュレーションを歪めるすべての apt 設定への読み取りアクセス権を持ってい"
-"ない可能性があります。この警告を表す通知は、root 以外のユーザではデフォルトで"
-"表示されます (<option>APT::Get::Show-User-Simulation-Note</option>)。設定項"
-"目: <literal>APT::Get::Simulate</literal>"
+"い、実際にはシステムを変更しません。ロックは無効になる "
+"(<option>Debug::NoLocking</option>) ので、<command>apt-get</command> 実行中に"
+"システムの状態が変化する可能性があります。シミュレーションは root 以外のユー"
+"ザが実行できますが、シミュレーションを歪めるすべての apt 設定への読み取りアク"
+"セス権を持っていない可能性があります。この警告を表す通知は、root 以外のユーザ"
+"ではデフォルトで表示されます (<option>APT::Get::Show-User-Simulation-Note</"
+"option>)。設定項目: <literal>APT::Get::Simulate</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -1775,11 +1777,11 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
-"Automatic \"no\" to all prompts.  Configuration Item: <literal>APT::Get::"
-"Assume-No</literal>."
+"Automatic \"no\" to all prompts.  Configuration Item: "
+"<literal>APT::Get::Assume-No</literal>."
 msgstr ""
-"全ての質問に、自動的に \"no\" と答えます。設定項目: <literal>APT::Get::"
-"Assume-No</literal>"
+"全ての質問に、自動的に \"no\" と答えます。設定項目: "
+"<literal>APT::Get::Assume-No</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -1818,8 +1820,8 @@ msgstr ""
 #, fuzzy
 #| msgid ""
 #| "Select the source override file to use with the <literal>sources</"
-#| "literal> command.  Configuration Item: <literal>APT::FTPArchive::"
-#| "SourceOverride</literal>."
+#| "literal> command.  Configuration Item: "
+#| "<literal>APT::FTPArchive::SourceOverride</literal>."
 msgid ""
 "Add the given value to the <literal>Comment:</literal> field in history.log "
 "Configuration Item: <literal>APT::History::Comment</literal>."
@@ -1833,15 +1835,16 @@ msgid ""
 "This option controls the architecture packages are built for by <command>apt-"
 "get source --compile</command> and how cross-builddependencies are "
 "satisfied. By default is it not set which means that the host architecture "
-"is the same as the build architecture (which is defined by <literal>APT::"
-"Architecture</literal>).  Configuration Item: <literal>APT::Get::Host-"
-"Architecture</literal>."
+"is the same as the build architecture (which is defined by "
+"<literal>APT::Architecture</literal>).  Configuration Item: "
+"<literal>APT::Get::Host-Architecture</literal>."
 msgstr ""
 "このオプションは、<command>apt-get source --compile</command> で構築するパッ"
 "ケージのアーキテクチャや、どのようにクロス依存関係を解決するかを制御します。"
-"デフォルトでは未定義で、これはホストアーキテクチャは、(<literal>APT::"
-"Architecture</literal> で定義した) ビルドアーキテクチャと同じという意味になり"
-"ます。設定項目: <literal>APT::Get::Host-Architecture</literal>。"
+"デフォルトでは未定義で、これはホストアーキテクチャは、"
+"(<literal>APT::Architecture</literal> で定義した) ビルドアーキテクチャと同じ"
+"という意味になります。設定項目: <literal>APT::Get::Host-Architecture</"
+"literal>。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -1864,8 +1867,8 @@ msgid ""
 "Compile source packages after downloading them.  Configuration Item: "
 "<literal>APT::Get::Compile</literal>."
 msgstr ""
-"ソースパッケージをダウンロード後、コンパイルします。設定項目: <literal>APT::"
-"Get::Compile</literal>"
+"ソースパッケージをダウンロード後、コンパイルします。設定項目: "
+"<literal>APT::Get::Compile</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -1909,8 +1912,8 @@ msgid ""
 msgstr ""
 "パッケージ更新なし -  <literal>install</literal> と同時に使用すると、"
 "<literal>no-upgrade</literal> は、コマンドラインで指定したパッケージが、すで"
-"にインストールしてある場合に更新を行いません。設定項目: <literal>APT::Get::"
-"Upgrade</literal>"
+"にインストールしてある場合に更新を行いません。設定項目: "
+"<literal>APT::Get::Upgrade</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -1964,8 +1967,9 @@ msgid ""
 msgstr ""
 "強制承諾 - 保持されたパッケージを変更する場合でも、確認なしで実行してしまう危"
 "険なオプションです。よほどの状況でなければ、使うべきではありません。このオプ"
-"ションを使うと、システムを破壊しかねません! 設定項目: <literal>APT::Get::"
-"allow-change-held-packages</literal>。APT 1.1 で導入されました。"
+"ションを使うと、システムを破壊しかねません! 設定項目: "
+"<literal>APT::Get::allow-change-held-packages</literal>。APT 1.1 で導入されま"
+"した。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -2004,8 +2008,8 @@ msgid ""
 "name on the remote site! This also works with the <literal>source</literal> "
 "and <literal>update</literal> commands. When used with the <literal>update</"
 "literal> command the MD5 and size are not included, and it is up to the user "
-"to decompress any compressed files.  Configuration Item: <literal>APT::Get::"
-"Print-URIs</literal>."
+"to decompress any compressed files.  Configuration Item: "
+"<literal>APT::Get::Print-URIs</literal>."
 msgstr ""
 "インストールするファイルを取得する代わりに、その URI を表示します。URI には、"
 "パス、対象ファイル名、ファイルサイズ、予測される MD5 ハッシュが含まれていま"
@@ -2013,8 +2017,8 @@ msgstr ""
 "い、ということに注意してください! これは <literal>source</literal> コマンド、"
 "<literal>update</literal> コマンドでも動作します。<literal>update</literal> "
 "で使用したときには、MD5 やファイルサイズを含みません。このとき、圧縮ファイル"
-"の展開はユーザの責任において行ってください。設定項目: <literal>APT::Get::"
-"Print-URIs</literal>"
+"の展開はユーザの責任において行ってください。設定項目: "
+"<literal>APT::Get::Print-URIs</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -2045,8 +2049,8 @@ msgid ""
 "turn it off. When it is on, <command>apt-get</command> will automatically "
 "manage the contents of <filename>&statedir;/lists</filename> to ensure that "
 "obsolete files are erased.  The only reason to turn it off is if you "
-"frequently change your sources list.  Configuration Item: <literal>APT::Get::"
-"List-Cleanup</literal>."
+"frequently change your sources list.  Configuration Item: "
+"<literal>APT::Get::List-Cleanup</literal>."
 msgstr ""
 "この機能はデフォルトで ON になっています。OFF にするには <literal>--no-list-"
 "cleanup</literal> としてください。ON の場合、<command>apt-get</command> は古"
@@ -2083,9 +2087,9 @@ msgstr ""
 "pin で留めるのを明示されたパッケージには、このオプションの値は影響を与えませ"
 "ん。つまりこのオプションで、どの配布パッケージを取得するかを簡単に管理しま"
 "す。一般的な例としては、<option>-t '2.1*'</option>, <option>-t unstable</"
-"option>, <option>-t sid</option> のようになります。設定項目: <literal>APT::"
-"Default-Release</literal>。&apt-preferences; のマニュアルページも参照してくだ"
-"さい。"
+"option>, <option>-t sid</option> のようになります。設定項目: "
+"<literal>APT::Default-Release</literal>。&apt-preferences; のマニュアルページ"
+"も参照してください。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -2193,8 +2197,8 @@ msgstr ""
 "ローカルリポジトリでの作業中には有用ですが、ユーザ自身が別の方法でデータの信"
 "憑性を確保していない場合は、セキュリティ上の重大なリスクになります。&sources-"
 "list; エントリ用の <option>Trusted</option> オプションの使用は、通常グローバ"
-"ルオーバーライドよりも優先されるはずです。設定項目: <literal>APT::Get::"
-"AllowUnauthenticated</literal>"
+"ルオーバーライドよりも優先されるはずです。設定項目: "
+"<literal>APT::Get::AllowUnauthenticated</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -2203,8 +2207,8 @@ msgstr ""
 #| "Forbid the update command to acquire unverifiable data from configured "
 #| "sources. APT will fail at the update command for repositories without "
 #| "valid cryptographically signatures. See also &apt-secure; for details on "
-#| "the concept and the implications.  Configuration Item: <literal>Acquire::"
-#| "AllowInsecureRepositories</literal>."
+#| "the concept and the implications.  Configuration Item: "
+#| "<literal>Acquire::AllowInsecureRepositories</literal>."
 msgid ""
 "Allow the update command to acquire unverifiable data from configured "
 "sources. APT will otherwise fail at the update command for repositories "
@@ -2708,8 +2712,8 @@ msgstr "注意) dotty は、パッケージのより大きなセットのグラ�
 #: apt-cache.8.xml
 msgid ""
 "The same as <literal>dotty</literal>, only for xvcg from the <ulink "
-"url=\"https://www.rw.cdl.uni-saarland.de/people/sander/private/html/gsvcg1."
-"html\">VCG tool</ulink>."
+"url=\"https://www.rw.cdl.uni-saarland.de/people/sander/private/html/"
+"gsvcg1.html\">VCG tool</ulink>."
 msgstr ""
 "<literal>dotty</literal> と同様ですが、<ulink url=\"https://www.rw.cdl.uni-"
 "saarland.de/people/sander/private/html/gsvcg1.html\">VCG tool</ulink> の "
@@ -2740,8 +2744,8 @@ msgid ""
 "archive management tool, <literal>madison</literal>.  It displays available "
 "versions of a package in a tabular format.  Unlike the original "
 "<literal>madison</literal>, it can only display information for the "
-"architecture for which APT has retrieved package lists (<literal>APT::"
-"Architecture</literal>)."
+"architecture for which APT has retrieved package lists "
+"(<literal>APT::Architecture</literal>)."
 msgstr ""
 "<literal>apt-cache</literal> の <literal>madison</literal> コマンドは、"
 "Debian アーカイブ管理ツール <literal>madison</literal> の機能のサブセットで、"
@@ -2754,12 +2758,12 @@ msgstr ""
 #: apt-cache.8.xml
 msgid ""
 "Select the file to store the package cache. The package cache is the primary "
-"cache used by all operations.  Configuration Item: <literal>Dir::Cache::"
-"pkgcache</literal>."
+"cache used by all operations.  Configuration Item: "
+"<literal>Dir::Cache::pkgcache</literal>."
 msgstr ""
 "パッケージキャッシュを格納するファイルを選択します。パッケージキャッシュは、"
-"すべての操作で使用される一次キャッシュです。設定項目: <literal>Dir::Cache::"
-"pkgcache</literal>"
+"すべての操作で使用される一次キャッシュです。設定項目: "
+"<literal>Dir::Cache::pkgcache</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml
@@ -2805,9 +2809,9 @@ msgstr ""
 msgid ""
 "Per default the <command>depends</command> and <command>rdepends</command> "
 "print all dependencies. This can be tweaked with these flags which will omit "
-"the specified dependency type.  Configuration Item: <literal>APT::Cache::"
-"Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::"
-"Cache::ShowRecommends</literal>."
+"the specified dependency type.  Configuration Item: "
+"<literal>APT::Cache::Show<replaceable>DependencyType</replaceable></literal> "
+"e.g. <literal>APT::Cache::ShowRecommends</literal>."
 msgstr ""
 "デフォルトでは <command>depends</command> や <command>rdepends</command> は全"
 "依存関係を出力します。この挙動を、ここに挙げたフラグで指定した依存関係を省略"
@@ -2837,8 +2841,8 @@ msgid ""
 "Print full package records when searching.  Configuration Item: "
 "<literal>APT::Cache::ShowFull</literal>."
 msgstr ""
-"search 時に全パッケージレコードを表示します。設定項目: <literal>APT::Cache::"
-"ShowFull</literal>"
+"search 時に全パッケージレコードを表示します。設定項目: "
+"<literal>APT::Cache::ShowFull</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml
@@ -2854,8 +2858,8 @@ msgstr ""
 "効にするには <option>--no-all-versions</option> を使用してください。"
 "<option>--no-all-versions</option> を指定すると、候補バージョン (インストール"
 "の際に選択されるもの) だけ表示します。このオプションは、<literal>show</"
-"literal> コマンドでのみ適用できます。設定項目: <literal>APT::Cache::"
-"AllVersions</literal>"
+"literal> コマンドでのみ適用できます。設定項目: "
+"<literal>APT::Cache::AllVersions</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml
@@ -2881,8 +2885,8 @@ msgstr ""
 #: apt-cache.8.xml
 msgid ""
 "Make <literal>pkgnames</literal> print all names, including virtual packages "
-"and missing dependencies.  Configuration Item: <literal>APT::Cache::"
-"AllNames</literal>."
+"and missing dependencies.  Configuration Item: "
+"<literal>APT::Cache::AllNames</literal>."
 msgstr ""
 "<literal>pkgnames</literal> で、仮想パッケージや欠落依存関係を含めた全名称を"
 "表示します。設定項目: <literal>APT::Cache::AllNames</literal>"
@@ -2895,8 +2899,8 @@ msgid ""
 "<literal>APT::Cache::RecurseDepends</literal>."
 msgstr ""
 "<literal>depends</literal> や <literal>rdepends</literal> で、指定した全パッ"
-"ケージを再帰的に一度に表示します。設定項目: <literal>APT::Cache::"
-"RecurseDepends</literal>"
+"ケージを再帰的に一度に表示します。設定項目: "
+"<literal>APT::Cache::RecurseDepends</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml
@@ -2906,8 +2910,8 @@ msgid ""
 "<literal>APT::Cache::Installed</literal>."
 msgstr ""
 "<literal>depends</literal> や <literal>rdepends</literal> の出力を、現在イン"
-"ストールされているパッケージに限定します。設定項目: <literal>APT::Cache::"
-"Installed</literal>"
+"ストールされているパッケージに限定します。設定項目: "
+"<literal>APT::Cache::Installed</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml
@@ -2937,8 +2941,8 @@ msgstr ""
 "<literal>Sources</literal> 及び <literal>Packages</literal> は正しい拡張子を"
 "付けていれば APT がサポートする任意の形式で圧縮できます。このファイルを同じ"
 "ディレクトリに複数置く必要がある場合は、自分が付ける名前の部分の最後尾にアン"
-"ダースコア (「<literal>_</literal>」) を付加したものを先頭に付けます。例: my."
-"example_Packages.xz"
+"ダースコア (「<literal>_</literal>」) を付加したものを先頭に付けます。例: "
+"my.example_Packages.xz"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml
@@ -2974,8 +2978,8 @@ msgid ""
 "<command>apt-mark</command> can be used as a unified front-end to set "
 "various settings for a package, such as marking a package as being "
 "automatically/manually installed or changing <command>dpkg</command> "
-"selections such as hold, install, deinstall and purge which are respected e."
-"g. by <command>apt-get dselect-upgrade</command> or <command>aptitude</"
+"selections such as hold, install, deinstall and purge which are respected "
+"e.g. by <command>apt-get dselect-upgrade</command> or <command>aptitude</"
 "command>."
 msgstr ""
 "統合フロントエンドとして使用することができます。例えば、パッケージを自動/手動"
@@ -3215,10 +3219,11 @@ msgstr "ユーザ設定"
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""
-"Keys should usually be included inside their corresponding <literal>."
-"sources</literal> by embedding the ASCII-armored key in the <literal>Signed-"
-"By</literal> option.  To do so, replace the empty line with a dot, and then "
-"indent all lines by two spaces.  See &sources-list; for more information."
+"Keys should usually be included inside their corresponding "
+"<literal>.sources</literal> by embedding the ASCII-armored key in the "
+"<literal>Signed-By</literal> option.  To do so, replace the empty line with "
+"a dot, and then indent all lines by two spaces.  See &sources-list; for more "
+"information."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -3231,8 +3236,9 @@ msgid ""
 "literal> file or using <literal>deb [signed-by=/etc/apt/keyrings/example-"
 "archive-keyring.asc] ...</literal> in the legacy <literal>.list</literal> "
 "format. This may be useful for APT versions prior to 2.4, which do not "
-"support embedded keys. ASCII-armored keys must use an extension of <literal>."
-"asc</literal>, and unarmored keys an extension of <literal>.gpg</literal>."
+"support embedded keys. ASCII-armored keys must use an extension of "
+"<literal>.asc</literal>, and unarmored keys an extension of <literal>.gpg</"
+"literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -3521,8 +3527,8 @@ msgstr ""
 #: apt-secure.8.xml
 msgid ""
 "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg --"
-"clearsign -o InRelease Release</command> and <command>gpg -abs -o Release."
-"gpg Release</command>."
+"clearsign -o InRelease Release</command> and <command>gpg -abs -o "
+"Release.gpg Release</command>."
 msgstr ""
 "<emphasis>署名</emphasis>します。<command>gpg --clearsign -o InRelease "
 "Release</command> や <command>gpg -abs -o Release.gpg Release</command> を実"
@@ -3653,9 +3659,9 @@ msgid ""
 msgstr ""
 "<literal>add</literal> は、新しいディスクを取得元リストに追加します。CD-ROM "
 "デバイスのアンマウントやディスク挿入のプロンプト表示の後に、ディスクのスキャ"
-"ンとインデックスファイルのコピーを行います。ディスクに正しい <filename>."
-"disk</filename> ディレクトリが存在しない場合、タイトルを入力するよう促しま"
-"す。"
+"ンとインデックスファイルのコピーを行います。ディスクに正しい "
+"<filename>.disk</filename> ディレクトリが存在しない場合、タイトルを入力するよ"
+"う促します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml
@@ -3681,8 +3687,8 @@ msgstr ""
 #: apt-cdrom.8.xml
 msgid ""
 "Do not try to auto-detect the CD-ROM path. Usually combined with the "
-"<option>--cdrom</option> option.  Configuration Item: <literal>Acquire::"
-"cdrom::AutoDetect</literal>."
+"<option>--cdrom</option> option.  Configuration Item: "
+"<literal>Acquire::cdrom::AutoDetect</literal>."
 msgstr ""
 "CD-ROM パスの自動検出を試行しません。通常、<option>--cdrom</option> オプショ"
 "ンと組み合わせて使います。設定項目: <literal>Acquire::cdrom::AutoDetect</"
@@ -3714,8 +3720,8 @@ msgstr ""
 #: apt-cdrom.8.xml
 msgid ""
 "No mounting; prevent <command>apt-cdrom</command> from mounting and "
-"unmounting the mount point.  Configuration Item: <literal>APT::CDROM::"
-"NoMount</literal>."
+"unmounting the mount point.  Configuration Item: "
+"<literal>APT::CDROM::NoMount</literal>."
 msgstr ""
 "マウントなし - <command>apt-cdrom</command> が、マウントポイントにマウント・"
 "アンマウントしないようにします。設定項目: <literal>APT::CDROM::NoMount</"
@@ -3754,8 +3760,8 @@ msgid ""
 "<literal>APT::CDROM::NoAct</literal>."
 msgstr ""
 "変更なし - &sources-list; ファイルの変更や、インデックスファイルの書き込みを"
-"行いません。とはいえ、すべてのチェックは行います。設定項目: <literal>APT::"
-"CDROM::NoAct</literal>"
+"行いません。とはいえ、すべてのチェックは行います。設定項目: "
+"<literal>APT::CDROM::NoAct</literal>"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-cdrom.8.xml
@@ -3818,8 +3824,8 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-config.8.xml
 msgid ""
-"This will set the shell environment variable $OPTS to the value of MyApp::"
-"options with a default of <option>-f</option>."
+"This will set the shell environment variable $OPTS to the value of "
+"MyApp::options with a default of <option>-f</option>."
 msgstr ""
 "これは、MyApp::options の値をシェル環境変数 $OPTS にセットします。デフォルト"
 "値は <option>-f</option> となります。"
@@ -3867,9 +3873,9 @@ msgstr ""
 "各設定オプションの出力を定義します。&percnt;t はオプション名に、&percnt;f は"
 "完全オプション名に、&percnt;v はオプションの値に置換されます。大文字や特殊文"
 "字を使用する値は、安全を保証するために、RFC822 で定義されている quoted-"
-"string でエンコードされることになります。さらに、&percnt;n は改行に、&percnt;"
-"N はタブ文字になります。&percnt; を出力するには、&percnt;&percnt; としてくだ"
-"さい。"
+"string でエンコードされることになります。さらに、&percnt;n は改行に、"
+"&percnt;N はタブ文字になります。&percnt; を出力するには、&percnt;&percnt; と"
+"してください。"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-config.8.xml apt-extracttemplates.1.xml apt-sortpkgs.1.xml
@@ -3940,9 +3946,9 @@ msgid ""
 "order which have either no or \"<literal>conf</literal>\" as filename "
 "extension and which only contain alphanumeric, hyphen (-), underscore (_) "
 "and period (.) characters.  Otherwise APT will print a notice that it has "
-"ignored a file, unless that file matches a pattern in the <literal>Dir::"
-"Ignore-Files-Silently</literal> configuration list - in which case it will "
-"be silently ignored."
+"ignored a file, unless that file matches a pattern in the "
+"<literal>Dir::Ignore-Files-Silently</literal> configuration list - in which "
+"case it will be silently ignored."
 msgstr ""
 "<literal>Dir::Etc::Parts</literal> にあるすべてのファイルを英数字の昇順になり"
 "ます。ファイル名には拡張子がないか、\"<literal>conf</literal>\" となってお"
@@ -3990,9 +3996,9 @@ msgid ""
 "their parent groups."
 msgstr ""
 "設定ファイルは、機能グループごとに系統立てられたオプションを木構造で表しま"
-"す。オプションの指定は、2 つのコロンで区切ります。例えば <literal>APT::Get::"
-"Assume-Yes</literal> は、APT ツールグループの Get ツール用オプションです。オ"
-"プションは、親グループからは継承しません。"
+"す。オプションの指定は、2 つのコロンで区切ります。例えば "
+"<literal>APT::Get::Assume-Yes</literal> は、APT ツールグループの Get ツール用"
+"オプションです。オプションは、親グループからは継承しません。"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml
@@ -4239,10 +4245,12 @@ msgstr ""
 msgid ""
 "The subscope <option>action</option> defines the colors for package lists in "
 "<option>install</option> and similar commands. The following options may be "
-"set: <option>APT::Color::Action::Upgrade</option>, <option>APT::Color::"
-"Action::Install</option>, <option>APT::Color::Action::Install-Dependencies</"
-"option>, <option>APT::Color::Action::Downgrade</option>, <option>APT::Color::"
-"Action::Remove</option>; corresponding to their lists in the &apt; output."
+"set: <option>APT::Color::Action::Upgrade</option>, "
+"<option>APT::Color::Action::Install</option>, "
+"<option>APT::Color::Action::Install-Dependencies</option>, "
+"<option>APT::Color::Action::Downgrade</option>, "
+"<option>APT::Color::Action::Remove</option>; corresponding to their lists in "
+"the &apt; output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -4541,8 +4549,8 @@ msgstr ""
 #: apt.conf.5.xml
 msgid ""
 "Define the regular expression(s) for versioned kernel packages.  Based on "
-"these expressions a rule set is injected into apt similar to APT::"
-"NeverAutoRemove regular expressions."
+"these expressions a rule set is injected into apt similar to "
+"APT::NeverAutoRemove regular expressions."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -4793,12 +4801,12 @@ msgid ""
 msgstr ""
 "<literal>cdrom</literal> メソッドを利用する URI では、設定できるオプションは"
 "マウントポイントだけです。<filename>/etc/fstab</filename> で設定されているよ"
-"うに、CD-ROM (または DVD など) ドライブのマウントポイントを <literal>cdrom::"
-"Mount</literal> に設定しなければなりません。マウントポイントが fstab に記述で"
-"きない場合、かわりにマウント・アンマウントコマンドも使用できます。構文は、"
-"<literal>cdrom</literal> ブロックを <placeholder type=\"literallayout\" "
-"id=\"0\"/> の形で記述します。スラッシュを後につけるのが重要です。アンマウント"
-"コマンドは UMount で指定することができます。"
+"うに、CD-ROM (または DVD など) ドライブのマウントポイントを "
+"<literal>cdrom::Mount</literal> に設定しなければなりません。マウントポイント"
+"が fstab に記述できない場合、かわりにマウント・アンマウントコマンドも使用でき"
+"ます。構文は、<literal>cdrom</literal> ブロックを <placeholder "
+"type=\"literallayout\" id=\"0\"/> の形で記述します。スラッシュを後につけるの"
+"が重要です。アンマウントコマンドは UMount で指定することができます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
@@ -4964,9 +4972,9 @@ msgid ""
 "that these codes are not included twice in the list. If "
 "<literal>LC_MESSAGES</literal> is set to \"C\" only the "
 "<filename>Translation-en</filename> file (if available) will be used.  To "
-"force APT to use no Translation file use the setting <literal>Acquire::"
-"Languages=none</literal>. \"<literal>none</literal>\" is another special "
-"meaning code which will stop the search for a suitable "
+"force APT to use no Translation file use the setting "
+"<literal>Acquire::Languages=none</literal>. \"<literal>none</literal>\" is "
+"another special meaning code which will stop the search for a suitable "
 "<filename>Translation</filename> file.  This tells APT to download these "
 "translations too, without actually using them unless the environment "
 "specifies the languages. So the following example configuration will result "
@@ -4975,21 +4983,21 @@ msgid ""
 "locale (where the order would be \"fr, de, en\").  <placeholder "
 "type=\"programlisting\" id=\"0\"/>"
 msgstr ""
-"デフォルトのリストには \"environment\" と \"en\" がありま"
-"す。\"<literal>environment</literal>\" はここでは特殊な意味があります。これは"
-"実行時に、<literal>LC_MESSAGES</literal> 環境変数から取得した言語コードに置換"
-"されます。また、このリストには、同じコードが2度現れないように確認してくださ"
-"い。<literal>LC_MESSAGES</literal> が \"C\" に設定されているだけの場合、"
+"デフォルトのリストには \"environment\" と \"en\" があります。"
+"\"<literal>environment</literal>\" はここでは特殊な意味があります。これは実行"
+"時に、<literal>LC_MESSAGES</literal> 環境変数から取得した言語コードに置換され"
+"ます。また、このリストには、同じコードが2度現れないように確認してください。"
+"<literal>LC_MESSAGES</literal> が \"C\" に設定されているだけの場合、"
 "<filename>Translation-en</filename> ファイルを (利用可能であれば) 使用しま"
 "す。強制的に APT が Translation ファイルを使用しないようにするには、"
-"<literal>Acquire::Languages=none</literal> と設定してくださ"
-"い。\"<literal>none</literal>\" はもうひとつの特殊な意味を持つコードで、適切"
-"な <filename>Translation</filename> ファイルの検索を中止します。環境から実際"
-"の言語を指定されなかった場合、この値を用いて APT に翻訳をダウンロードさせま"
-"す。そのため、以下の設定例では、英語ロケールの場合 \"en, de\" の順になり、ド"
-"イツ語ロケールの場合 \"de, en\" の順になります。\"fr\" はダウンロードされます"
-"が、フランス語ロケール (\"fr, de, en\" の順になる) でないと、APT が使用しない"
-"ことに注意してください。<placeholder type=\"programlisting\" id=\"0\"/>"
+"<literal>Acquire::Languages=none</literal> と設定してください。"
+"\"<literal>none</literal>\" はもうひとつの特殊な意味を持つコードで、適切な "
+"<filename>Translation</filename> ファイルの検索を中止します。環境から実際の言"
+"語を指定されなかった場合、この値を用いて APT に翻訳をダウンロードさせます。そ"
+"のため、以下の設定例では、英語ロケールの場合 \"en, de\" の順になり、ドイツ語"
+"ロケールの場合 \"de, en\" の順になります。\"fr\" はダウンロードされますが、フ"
+"ランス語ロケール (\"fr, de, en\" の順になる) でないと、APT が使用しないことに"
+"注意してください。<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
@@ -5091,44 +5099,46 @@ msgid ""
 "<replaceable>ORIGIN</replaceable></literal> option exists and if so this "
 "value is taken. The value in the Release file can be overridden with "
 "<literal>Acquire::Changelogs::URI::Override::Label::<replaceable>LABEL</"
-"replaceable></literal> or <literal>Acquire::Changelogs::URI::Override::"
-"Origin::<replaceable>ORIGIN</replaceable></literal>.  The value should be a "
-"normal URI to a text file, except that package specific data is replaced "
-"with the placeholder <literal>@CHANGEPATH@</literal>. The value for it is: "
-"1. if the package is from a component (e.g. <literal>main</literal>)  this "
-"is the first part otherwise it is omitted, 2. the first letter of source "
-"package name, except if the source package name starts with '<literal>lib</"
-"literal>' in which case it will be the first four letters. 3. The complete "
-"source package name. 4. the complete name again and 5. the source version.  "
-"The first (if present), second, third and fourth part are separated by a "
-"slash ('<literal>/</literal>')  and between the fourth and fifth part is an "
-"underscore ('<literal>_</literal>').  The special value '<literal>no</"
-"literal>' is available for this option indicating that this source can't be "
-"used to acquire changelog files from. Another source will be tried if "
-"available in this case."
+"replaceable></literal> or "
+"<literal>Acquire::Changelogs::URI::Override::Origin::<replaceable>ORIGIN</"
+"replaceable></literal>.  The value should be a normal URI to a text file, "
+"except that package specific data is replaced with the placeholder "
+"<literal>@CHANGEPATH@</literal>. The value for it is: 1. if the package is "
+"from a component (e.g. <literal>main</literal>)  this is the first part "
+"otherwise it is omitted, 2. the first letter of source package name, except "
+"if the source package name starts with '<literal>lib</literal>' in which "
+"case it will be the first four letters. 3. The complete source package name. "
+"4. the complete name again and 5. the source version.  The first (if "
+"present), second, third and fourth part are separated by a slash ('<literal>/"
+"</literal>')  and between the fourth and fifth part is an underscore "
+"('<literal>_</literal>').  The special value '<literal>no</literal>' is "
+"available for this option indicating that this source can't be used to "
+"acquire changelog files from. Another source will be tried if available in "
+"this case."
 msgstr ""
 "URI は、それらを取得する場所から知られている場合は、変更履歴の取得のみ行うこ"
 "とができます。好ましいリリースファイルは、「変更履歴」フィールドでこのことを"
 "示します。これが利用できない場合、<literal>Acquire::Changelogs::URI::Label::"
-"<replaceable>LABEL</replaceable></literal> または <literal>Acquire::"
-"Changelogs::URI::Origin::<replaceable>ORIGIN</replaceable></literal> オプショ"
-"ンが存在し、そしてこの値が取られてる場合は、リリースファイルの Label/Origin "
-"フィールドが確認するために使用されます。リリースファイル内の値は、"
-"<literal>Acquire::Changelogs::URI::Override::Label::<replaceable>LABEL</"
-"replaceable></literal> または <literal>Acquire::Changelogs::URI::Override::"
-"Origin::<replaceable>ORIGIN</replaceable></literal> で上書きできます。その"
-"パッケージ固有のデータが <literal>@CHANGEPATH@</literal> プレースホルダに置き"
-"換えられている場合以外は、値はテキストファイルへの正常な URI にする必要があり"
-"ます。値は次の通りです: 1. パッケージがコンポーネント (例えば、"
-"<literal>main</literal>) からのものである場合、それ以外の場合は省略されている"
-"最初の部分です、2. ソースパッケージ名の最初の文字。ただし、ソースパッケージ名"
-"が '<literal>lib</literal>' で始まる場合を除きます (その場合は 最初の 4 文字"
-"になります)。3. 完全なソースパッケージ名。4. 再び完全な名前および 5. ソースの"
-"バージョン。(存在する場合は) 最初、第二、第三、第四の部分はスラッシュ "
-"('<literal>/</literal>') で区切られ、第四と第五の部分の間はアンダースコア "
-"('<literal>_</literal>') です。このソースから変更履歴を取得することができない"
-"ことを示す特別な値 '<literal>no</literal>' がこのオプションで利用可能です。こ"
-"の場合、可能であれば別のソースが試行されます。"
+"<replaceable>LABEL</replaceable></literal> または "
+"<literal>Acquire::Changelogs::URI::Origin::<replaceable>ORIGIN</"
+"replaceable></literal> オプションが存在し、そしてこの値が取られてる場合は、リ"
+"リースファイルの Label/Origin フィールドが確認するために使用されます。リリー"
+"スファイル内の値は、<literal>Acquire::Changelogs::URI::Override::Label::"
+"<replaceable>LABEL</replaceable></literal> または "
+"<literal>Acquire::Changelogs::URI::Override::Origin::<replaceable>ORIGIN</"
+"replaceable></literal> で上書きできます。そのパッケージ固有のデータが "
+"<literal>@CHANGEPATH@</literal> プレースホルダに置き換えられている場合以外"
+"は、値はテキストファイルへの正常な URI にする必要があります。値は次の通りで"
+"す: 1. パッケージがコンポーネント (例えば、<literal>main</literal>) からのも"
+"のである場合、それ以外の場合は省略されている最初の部分です、2. ソースパッケー"
+"ジ名の最初の文字。ただし、ソースパッケージ名が '<literal>lib</literal>' で始"
+"まる場合を除きます (その場合は 最初の 4 文字になります)。3. 完全なソースパッ"
+"ケージ名。4. 再び完全な名前および 5. ソースのバージョン。(存在する場合は) 最"
+"初、第二、第三、第四の部分はスラッシュ ('<literal>/</literal>') で区切られ、"
+"第四と第五の部分の間はアンダースコア ('<literal>_</literal>') です。このソー"
+"スから変更履歴を取得することができないことを示す特別な値 '<literal>no</"
+"literal>' がこのオプションで利用可能です。この場合、可能であれば別のソースが"
+"試行されます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
@@ -5138,14 +5148,15 @@ msgstr ""
 #| "get them.  Preferable the Release file indicates this in a 'Changelogs' "
 #| "field. If this isn't available the Label/Origin field of the Release file "
 #| "is used to check if a <literal>Acquire::Changelogs::URI::Label::"
-#| "<replaceable>LABEL</replaceable></literal> or <literal>Acquire::"
-#| "Changelogs::URI::Origin::<replaceable>ORIGIN</replaceable></literal> "
-#| "option exists and if so this value is taken. The value in the Release "
-#| "file can be overridden with <literal>Acquire::Changelogs::URI::Override::"
-#| "Label::<replaceable>LABEL</replaceable></literal> or <literal>Acquire::"
-#| "Changelogs::URI::Override::Origin::<replaceable>ORIGIN</replaceable></"
-#| "literal>.  The value should be a normal URI to a text file, except that "
-#| "package specific data is replaced with the placeholder "
+#| "<replaceable>LABEL</replaceable></literal> or "
+#| "<literal>Acquire::Changelogs::URI::Origin::<replaceable>ORIGIN</"
+#| "replaceable></literal> option exists and if so this value is taken. The "
+#| "value in the Release file can be overridden with "
+#| "<literal>Acquire::Changelogs::URI::Override::Label::<replaceable>LABEL</"
+#| "replaceable></literal> or "
+#| "<literal>Acquire::Changelogs::URI::Override::Origin::<replaceable>ORIGIN</"
+#| "replaceable></literal>.  The value should be a normal URI to a text file, "
+#| "except that package specific data is replaced with the placeholder "
 #| "<literal>@CHANGEPATH@</literal>. The value for it is: 1. if the package "
 #| "is from a component (e.g. <literal>main</literal>)  this is the first "
 #| "part otherwise it is omitted, 2. the first letter of source package name, "
@@ -5163,40 +5174,43 @@ msgid ""
 "where to get them.  Preferable the Release file indicates this in a "
 "'Snapshots' field. If this isn't available the Label/Origin field of the "
 "Release file is used to check if a <literal>Acquire::Snapshots::URI::Label::"
-"<replaceable>LABEL</replaceable></literal> or <literal>Acquire::Snapshots::"
-"URI::Origin::<replaceable>ORIGIN</replaceable></literal> option exists and "
-"if so this value is taken. The value in the Release file can be overridden "
-"with <literal>Acquire::Snapshots::URI::Override::Label::<replaceable>LABEL</"
-"replaceable></literal> or <literal>Acquire::Snapshots::URI::Override::"
-"Origin::<replaceable>ORIGIN</replaceable></literal>.  The value should be a "
-"normal URI to a directory, except that the snapshot ID replaced with the "
-"placeholder <literal>@SNAPSHOTID@</literal>.  The special value "
-"'<literal>no</literal>' is available for this option indicating that this "
-"source cannot be used to acquire snapshots from. Another source will be "
-"tried if available in this case."
+"<replaceable>LABEL</replaceable></literal> or "
+"<literal>Acquire::Snapshots::URI::Origin::<replaceable>ORIGIN</replaceable></"
+"literal> option exists and if so this value is taken. The value in the "
+"Release file can be overridden with "
+"<literal>Acquire::Snapshots::URI::Override::Label::<replaceable>LABEL</"
+"replaceable></literal> or "
+"<literal>Acquire::Snapshots::URI::Override::Origin::<replaceable>ORIGIN</"
+"replaceable></literal>.  The value should be a normal URI to a directory, "
+"except that the snapshot ID replaced with the placeholder "
+"<literal>@SNAPSHOTID@</literal>.  The special value '<literal>no</literal>' "
+"is available for this option indicating that this source cannot be used to "
+"acquire snapshots from. Another source will be tried if available in this "
+"case."
 msgstr ""
 "URI は、それらを取得する場所から知られている場合は、変更履歴の取得のみ行うこ"
 "とができます。好ましいリリースファイルは、「変更履歴」フィールドでこのことを"
 "示します。これが利用できない場合、<literal>Acquire::Changelogs::URI::Label::"
-"<replaceable>LABEL</replaceable></literal> または <literal>Acquire::"
-"Changelogs::URI::Origin::<replaceable>ORIGIN</replaceable></literal> オプショ"
-"ンが存在し、そしてこの値が取られてる場合は、リリースファイルの Label/Origin "
-"フィールドが確認するために使用されます。リリースファイル内の値は、"
-"<literal>Acquire::Changelogs::URI::Override::Label::<replaceable>LABEL</"
-"replaceable></literal> または <literal>Acquire::Changelogs::URI::Override::"
-"Origin::<replaceable>ORIGIN</replaceable></literal> で上書きできます。その"
-"パッケージ固有のデータが <literal>@CHANGEPATH@</literal> プレースホルダに置き"
-"換えられている場合以外は、値はテキストファイルへの正常な URI にする必要があり"
-"ます。値は次の通りです: 1. パッケージがコンポーネント (例えば、"
-"<literal>main</literal>) からのものである場合、それ以外の場合は省略されている"
-"最初の部分です、2. ソースパッケージ名の最初の文字。ただし、ソースパッケージ名"
-"が '<literal>lib</literal>' で始まる場合を除きます (その場合は 最初の 4 文字"
-"になります)。3. 完全なソースパッケージ名。4. 再び完全な名前および 5. ソースの"
-"バージョン。(存在する場合は) 最初、第二、第三、第四の部分はスラッシュ "
-"('<literal>/</literal>') で区切られ、第四と第五の部分の間はアンダースコア "
-"('<literal>_</literal>') です。このソースから変更履歴を取得することができない"
-"ことを示す特別な値 '<literal>no</literal>' がこのオプションで利用可能です。こ"
-"の場合、可能であれば別のソースが試行されます。"
+"<replaceable>LABEL</replaceable></literal> または "
+"<literal>Acquire::Changelogs::URI::Origin::<replaceable>ORIGIN</"
+"replaceable></literal> オプションが存在し、そしてこの値が取られてる場合は、リ"
+"リースファイルの Label/Origin フィールドが確認するために使用されます。リリー"
+"スファイル内の値は、<literal>Acquire::Changelogs::URI::Override::Label::"
+"<replaceable>LABEL</replaceable></literal> または "
+"<literal>Acquire::Changelogs::URI::Override::Origin::<replaceable>ORIGIN</"
+"replaceable></literal> で上書きできます。そのパッケージ固有のデータが "
+"<literal>@CHANGEPATH@</literal> プレースホルダに置き換えられている場合以外"
+"は、値はテキストファイルへの正常な URI にする必要があります。値は次の通りで"
+"す: 1. パッケージがコンポーネント (例えば、<literal>main</literal>) からのも"
+"のである場合、それ以外の場合は省略されている最初の部分です、2. ソースパッケー"
+"ジ名の最初の文字。ただし、ソースパッケージ名が '<literal>lib</literal>' で始"
+"まる場合を除きます (その場合は 最初の 4 文字になります)。3. 完全なソースパッ"
+"ケージ名。4. 再び完全な名前および 5. ソースのバージョン。(存在する場合は) 最"
+"初、第二、第三、第四の部分はスラッシュ ('<literal>/</literal>') で区切られ、"
+"第四と第五の部分の間はアンダースコア ('<literal>_</literal>') です。このソー"
+"スから変更履歴を取得することができないことを示す特別な値 '<literal>no</"
+"literal>' がこのオプションで利用可能です。この場合、可能であれば別のソースが"
+"試行されます。"
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.conf.5.xml
@@ -5208,9 +5222,9 @@ msgstr "バイナリユーザ設定"
 msgid ""
 "Especially with the introduction of the <command>apt</command> binary it can "
 "be useful to set certain options only for a specific binary as even options "
-"which look like they would effect only a certain binary like <option>APT::"
-"Get::Show-Versions</option> effect <command>apt-get</command> as well as "
-"<command>apt</command>."
+"which look like they would effect only a certain binary like "
+"<option>APT::Get::Show-Versions</option> effect <command>apt-get</command> "
+"as well as <command>apt</command>."
 msgstr ""
 "特に、<command>apt</command> のバイナリの導入では、<option>APT::Get::Show-"
 "Versions</option> が <command>apt</command> と同様に <command>apt-get</"
@@ -5282,15 +5296,15 @@ msgid ""
 "the default directory is contained in <literal>Dir::Cache</literal>"
 msgstr ""
 "<literal>Dir::Cache</literal> は、ローカルキャッシュ情報に関する場所を格納し"
-"ています。これは、ダウンロード済アーカイブの場所を示す <literal>Dir::Cache::"
-"archives</literal> と同様に、<literal>srcpkgcache</literal> と "
-"<literal>pkgcache</literal> のパッケージキャッシュの場所になります。"
-"<literal>pkgcache</literal> や <literal>srcpkgcache</literal> に "
+"ています。これは、ダウンロード済アーカイブの場所を示す "
+"<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> はデフォルトディレクト"
-"リを含んでいます。"
+"srcpkgcache よりも pkgcache を無効にすることが多いと思います。"
+"<literal>Dir::State</literal> と同様、<literal>Dir::Cache</literal> はデフォ"
+"ルトディレクトリを含んでいます。"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml
@@ -5320,19 +5334,19 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml
 msgid ""
-"Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
-"Bin::Methods</literal> specifies the location of the method handlers and "
+"Binary programs are pointed to by <literal>Dir::Bin</literal>. "
+"<literal>Dir::Bin::Methods</literal> specifies the location of the method "
+"handlers and <literal>gzip</literal>, <literal>bzip2</literal>, "
+"<literal>lzma</literal>, <literal>dpkg</literal>, <literal>apt-get</literal> "
+"<literal>dpkg-source</literal> <literal>dpkg-buildpackage</literal> and "
+"<literal>apt-cache</literal> specify the location of the respective programs."
+msgstr ""
+"バイナリプログラムは <literal>Dir::Bin</literal> で指定します。"
+"<literal>Dir::Bin::Methods</literal> はメソッドハンドラの場所を指定し、"
 "<literal>gzip</literal>, <literal>bzip2</literal>, <literal>lzma</literal>, "
 "<literal>dpkg</literal>, <literal>apt-get</literal> <literal>dpkg-source</"
-"literal> <literal>dpkg-buildpackage</literal> and <literal>apt-cache</"
-"literal> specify the location of the respective programs."
-msgstr ""
-"バイナリプログラムは <literal>Dir::Bin</literal> で指定します。<literal>Dir::"
-"Bin::Methods</literal> はメソッドハンドラの場所を指定し、<literal>gzip</"
-"literal>, <literal>bzip2</literal>, <literal>lzma</literal>, <literal>dpkg</"
-"literal>, <literal>apt-get</literal> <literal>dpkg-source</literal> "
-"<literal>dpkg-buildpackage</literal>, <literal>apt-cache</literal> はそれぞれ"
-"プログラムの場所を指定します。"
+"literal> <literal>dpkg-buildpackage</literal>, <literal>apt-cache</literal> "
+"はそれぞれプログラムの場所を指定します。"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml
@@ -5515,9 +5529,9 @@ msgid ""
 "literal>.  Special characters (equal signs, newlines, nonprintable "
 "characters, quotation marks, and percent signs in <literal>key</literal> and "
 "newlines, nonprintable characters, and percent signs in <literal>value</"
-"literal>) are %-encoded. Lists are represented by multiple <literal>key::"
-"=value</literal> lines with the same key. The configuration section ends "
-"with a blank line."
+"literal>) are %-encoded. Lists are represented by multiple "
+"<literal>key::=value</literal> lines with the same key. The configuration "
+"section ends with a blank line."
 msgstr ""
 "各設定ディレクティブ行は、<literal>key=value</literal> 形式です。特殊文字 "
 "(<literal>key</literal> 中のイコール記号、改行、非印字可能文字、引用符、およ"
@@ -5559,11 +5573,10 @@ 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
@@ -5644,10 +5657,11 @@ msgid ""
 "<literal>/usr/lib/apt/apt.systemd.daily</literal> script. See the top of "
 "this script for the brief documentation of these options."
 msgstr ""
-"オプションの <literal>APT::Periodic</literal> グループと <literal>APT::"
-"Archives</literal> グループは、<literal>/usr/lib/apt/apt.systemd.daily</"
-"literal> スクリプトを使用して、apt の定期更新の挙動を設定します。このオプショ"
-"ンのドキュメントは、このスクリプトの先頭を参照してください。"
+"オプションの <literal>APT::Periodic</literal> グループと "
+"<literal>APT::Archives</literal> グループは、<literal>/usr/lib/apt/"
+"apt.systemd.daily</literal> スクリプトを使用して、apt の定期更新の挙動を設定"
+"します。このオプションのドキュメントは、このスクリプトの先頭を参照してくださ"
+"い。"
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.conf.5.xml
@@ -5834,8 +5848,8 @@ msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
 "install pass performed in, e.g., <literal>apt-get install</literal>, and not "
-"to the full <literal>apt</literal> dependency resolver; see <literal>Debug::"
-"pkgProblemResolver</literal> for that."
+"to the full <literal>apt</literal> dependency resolver; see "
+"<literal>Debug::pkgProblemResolver</literal> for that."
 msgstr ""
 "依存関係解決のために、どのパッケージが自動的にインストールされたかのデバッグ"
 "メッセージを生成します。これは完全な <literal>apt</literal> 依存関係解決プロ"
@@ -5851,26 +5865,27 @@ msgid ""
 "may trigger additional actions; they are shown indented two additional "
 "spaces under the original entry.  The format for each line is "
 "<literal>MarkKeep</literal>, <literal>MarkDelete</literal> or "
-"<literal>MarkInstall</literal> followed by <literal>package-name &lt;a.b.c -"
-"&gt; d.e.f | x.y.z&gt; (section)</literal> where <literal>a.b.c</literal> is "
-"the current version of the package, <literal>d.e.f</literal> is the version "
-"considered for installation and <literal>x.y.z</literal> is a newer version, "
-"but not considered for installation (because of a low pin score). The later "
-"two can be omitted if there is none or if it is the same as the installed "
-"version.  <literal>section</literal> is the name of the section the package "
-"appears in."
+"<literal>MarkInstall</literal> followed by <literal>package-name &lt;a.b.c "
+"-&gt; d.e.f | x.y.z&gt; (section)</literal> where <literal>a.b.c</literal> "
+"is the current version of the package, <literal>d.e.f</literal> is the "
+"version considered for installation and <literal>x.y.z</literal> is a newer "
+"version, but not considered for installation (because of a low pin score). "
+"The later two can be omitted if there is none or if it is the same as the "
+"installed version.  <literal>section</literal> is the name of the section "
+"the package appears in."
 msgstr ""
 "ProblemResolver が動作する際に、一時保留・インストール・削除としてマークされ"
 "たパッケージに関する、デバッグメッセージを生成します。各追加・削除は追加アク"
 "ションのトリガとなり、これをオリジナルのエントリの下に、空白 2 個でインデント"
 "して表示します。各行は、<literal>MarkKeep</literal>, <literal>MarkDelete</"
-"literal>, <literal>MarkInstall</literal> となり、<literal>package-name &lt;a."
-"b.c -&gt; d.e.f | x.y.z&gt; (section)</literal> が続きます。ここで、"
-"<literal>a.b.c</literal> は、そのパッケージの現在のバージョン、<literal>d.e."
-"f</literal>は、インストール予定のバージョン、<literal>x.y.z</literal> はより"
-"新しいけれどインストール対象外のバージョン (pin のスコアが低いため) です。後"
-"のふたつは、存在しない、ないしインストール中のバージョンと同じ場合、省略され"
-"ます。<literal>section</literal> はパッケージが現れるセクション名です。"
+"literal>, <literal>MarkInstall</literal> となり、<literal>package-name "
+"&lt;a.b.c -&gt; d.e.f | x.y.z&gt; (section)</literal> が続きます。ここで、"
+"<literal>a.b.c</literal> は、そのパッケージの現在のバージョン、"
+"<literal>d.e.f</literal>は、インストール予定のバージョン、<literal>x.y.z</"
+"literal> はより新しいけれどインストール対象外のバージョン (pin のスコアが低い"
+"ため) です。後のふたつは、存在しない、ないしインストール中のバージョンと同じ"
+"場合、省略されます。<literal>section</literal> はパッケージが現れるセクション"
+"名です。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
@@ -5933,8 +5948,8 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
 msgid ""
-"Print information about the vendors read from <filename>/etc/apt/vendors."
-"list</filename>."
+"Print information about the vendors read from <filename>/etc/apt/"
+"vendors.list</filename>."
 msgstr ""
 "<filename>/etc/apt/vendors.list</filename> から読み込んだ、ベンダの情報を出力"
 "します。"
@@ -5942,8 +5957,8 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
 msgid ""
-"Display the external commands that are called by apt hooks.  This includes e."
-"g. the config options <literal>DPkg::{Pre,Post}-Invoke</literal> or "
+"Display the external commands that are called by apt hooks.  This includes "
+"e.g. the config options <literal>DPkg::{Pre,Post}-Invoke</literal> or "
 "<literal>APT::Update::{Pre,Post}-Invoke</literal>."
 msgstr ""
 "aptのフックにより呼び出される外部コマンドを表示します。これには例えば、設定オ"
@@ -6143,9 +6158,9 @@ msgid ""
 "phased on this systems."
 msgstr ""
 "Debian の <literal>experimental</literal> アーカイブのように、"
-"<filename>Release</filename> ファイルに \"NotAutomatic: yes\" とマークさ"
-"れ、\"ButAutomaticUpgrades: yes\" とマークされて<emphasis>いない</emphasis>"
-"アーカイブ由来のバージョン。"
+"<filename>Release</filename> ファイルに \"NotAutomatic: yes\" とマークされ、"
+"\"ButAutomaticUpgrades: yes\" とマークされて<emphasis>いない</emphasis>アーカ"
+"イブ由来のバージョン。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 #: apt_preferences.5.xml
@@ -6454,9 +6469,9 @@ msgid ""
 "hostname \"ftp.de.debian.org\""
 msgstr ""
 "注意: ここで使われるキーワードは、ホスト名にマッチするのに使われる "
-"\"<literal>origin</literal>\" です。以下のレコードは、ホスト名が \"ftp.de."
-"debian.org\" で識別されるサーバ由来のすべてのバージョンに、高い優先度を割り当"
-"てます。"
+"\"<literal>origin</literal>\" です。以下のレコードは、ホスト名が "
+"\"ftp.de.debian.org\" で識別されるサーバ由来のすべてのバージョンに、高い優先"
+"度を割り当てます。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 #: apt_preferences.5.xml
@@ -6720,9 +6735,9 @@ msgstr ""
 #: apt_preferences.5.xml
 msgid ""
 "The <literal>:any</literal> suffix makes sure to select binary packages from "
-"any architecture. Without that suffix, apt implicitly assumes the <literal>:"
-"native</literal> suffix which would only select packages from the native "
-"architecture."
+"any architecture. Without that suffix, apt implicitly assumes the "
+"<literal>:native</literal> suffix which would only select packages from the "
+"native architecture."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
@@ -6890,9 +6905,9 @@ msgstr "すると、以下のように動作します。"
 msgid ""
 "The most recent available version of the <literal>perl</literal> package "
 "will be installed, so long as that version's version number begins with "
-"\"<literal>&good-perl;</literal>\".  If <emphasis>any</emphasis> &good-perl;"
-"* version of <literal>perl</literal> is available and the installed version "
-"is &bad-perl;*, then <literal>perl</literal> will be downgraded."
+"\"<literal>&good-perl;</literal>\".  If <emphasis>any</emphasis> &good-"
+"perl;* version of <literal>perl</literal> is available and the installed "
+"version is &bad-perl;*, then <literal>perl</literal> will be downgraded."
 msgstr ""
 "バージョン番号が \"<literal>&good-perl;</literal>\" で始まっていれば、"
 "<literal>perl</literal> の最新の利用可能パッケージがインストールされます。"
@@ -7013,8 +7028,8 @@ msgid ""
 "archive.  Specifying this value in the APT preferences file would require "
 "the line:"
 msgstr ""
-"このディレクトリツリーに属する全パッケージのアーカイブ名です。例え"
-"ば、\"Archive: stable\" や \"Suite: stable\" という行は、<filename>Release</"
+"このディレクトリツリーに属する全パッケージのアーカイブ名です。例えば、"
+"\"Archive: stable\" や \"Suite: stable\" という行は、<filename>Release</"
 "filename> ファイルの親ディレクトリツリー以下にある全パッケージが、"
 "<literal>stable</literal> アーカイブだと指定します。APT プリファレンスファイ"
 "ルでこの値を指定するには、以下の行が必要になります。"
@@ -7040,8 +7055,8 @@ msgid ""
 "testing-codename;</literal>.  Specifying this value in the APT preferences "
 "file would require the line:"
 msgstr ""
-"このディレクトリツリーに属する全パッケージのコード名です。たとえ"
-"ば、\"Codename: &debian-testing-codename;\" という行は、<filename>Release</"
+"このディレクトリツリーに属する全パッケージのコード名です。たとえば、"
+"\"Codename: &debian-testing-codename;\" という行は、<filename>Release</"
 "filename> ファイルの親ディレクトリツリー以下にある全パッケージが、"
 "<literal>&debian-testing-codename;</literal> と名前のついたバージョンであると"
 "指定します。APT プリファレンスファイルでこの値を指定するには、以下の行が必要"
@@ -7163,23 +7178,23 @@ msgid ""
 "files retrieved from locations listed in the &sources-list; file are stored "
 "in the directory <filename>/var/lib/apt/lists</filename>, or in the file "
 "named by the variable <literal>Dir::State::Lists</literal> in the "
-"<filename>apt.conf</filename> file.  For example, the file <filename>debian."
-"lcs.mit.edu_debian_dists_unstable_contrib_binary-i386_Release</filename> "
-"contains the <filename>Release</filename> file retrieved from the site "
-"<literal>debian.lcs.mit.edu</literal> for <literal>binary-i386</literal> "
-"architecture files from the <literal>contrib</literal> component of the "
-"<literal>unstable</literal> distribution."
+"<filename>apt.conf</filename> file.  For example, the file "
+"<filename>debian.lcs.mit.edu_debian_dists_unstable_contrib_binary-"
+"i386_Release</filename> contains the <filename>Release</filename> file "
+"retrieved from the site <literal>debian.lcs.mit.edu</literal> for "
+"<literal>binary-i386</literal> architecture files from the <literal>contrib</"
+"literal> component of the <literal>unstable</literal> distribution."
 msgstr ""
 "&sources-list; ファイルに列挙された場所から取得した <filename>Packages</"
 "filename> ファイルや <filename>Release</filename> ファイルはすべて、"
 "<filename>/var/lib/apt/lists</filename> ディレクトリや、<filename>apt.conf</"
 "filename> ファイルの <literal>Dir::State::Lists</literal> 変数で指定した場所"
-"に取得されます。例えば、<filename>debian.lcs.mit."
-"edu_debian_dists_unstable_contrib_binary-i386_Release</filename> ファイルは、"
-"<literal>debian.lcs.mit.edu</literal> から取得した、<literal>unstable</"
-"literal> ディストリビューションで、<literal>contrib</literal> コンポーネント"
-"な、<literal>binary-i386</literal> アーキテクチャ用の <filename>Release</"
-"filename> ファイルを含んでいます。"
+"に取得されます。例えば、"
+"<filename>debian.lcs.mit.edu_debian_dists_unstable_contrib_binary-"
+"i386_Release</filename> ファイルは、<literal>debian.lcs.mit.edu</literal> か"
+"ら取得した、<literal>unstable</literal> ディストリビューションで、"
+"<literal>contrib</literal> コンポーネントな、<literal>binary-i386</literal> "
+"アーキテクチャ用の <filename>Release</filename> ファイルを含んでいます。"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 #: apt_preferences.5.xml
@@ -7595,6 +7610,12 @@ msgstr ""
 "するので、マルチアーキテクチャのサポートの導入前には珍しいオプションに遭遇す"
 "ることを期待しないかもしれないことに注意してください。"
 
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml
+msgid ""
+"This format is deprecated and may eventually be removed, but not before 2029."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><title>
 #: sources.list.5.xml
 msgid "deb822-Style Format"
@@ -7846,10 +7867,17 @@ msgstr "&sourceslist-sources-format;"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
-msgid ""
-"As an example, the sources for your distribution could look like this in one-"
-"line-style format: <placeholder type=\"literallayout\" id=\"0\"/> or like "
-"this in deb822 style format: <placeholder type=\"literallayout\" id=\"1\"/>"
+#, fuzzy
+#| msgid ""
+#| "As an example, the sources for your distribution could look like this in "
+#| "one-line-style format: <placeholder type=\"literallayout\" id=\"0\"/> or "
+#| "like this in deb822 style format: <placeholder type=\"literallayout\" "
+#| "id=\"1\"/>"
+msgid ""
+"As an example, the sources for your distribution could look like this in the "
+"deprecated one-line-style format: <placeholder type=\"literallayout\" "
+"id=\"0\"/> or like this in deb822 style format: <placeholder "
+"type=\"literallayout\" id=\"1\"/>"
 msgstr ""
 "例として、あなたのディストリビューション用のソースは、1 行スタイル形式で次の"
 "ようになります: <placeholder type=\"literallayout\" id=\"0\"/> または deb822 "
@@ -7915,11 +7943,12 @@ msgstr ""
 msgid ""
 "<option>Targets</option> (<option>target</option>) is a multivalue option "
 "defining which download targets apt will try to acquire from this source. If "
-"not specified, the default set is defined by the <option>Acquire::"
-"IndexTargets</option> configuration scope (targets are specified by their "
-"name in the <literal>Created-By</literal> field).  Additionally, targets can "
-"be enabled or disabled by using the <literal>Identifier</literal> field as "
-"an option with a boolean value instead of using this multivalue option."
+"not specified, the default set is defined by the "
+"<option>Acquire::IndexTargets</option> configuration scope (targets are "
+"specified by their name in the <literal>Created-By</literal> field).  "
+"Additionally, targets can be enabled or disabled by using the "
+"<literal>Identifier</literal> field as an option with a boolean value "
+"instead of using this multivalue option."
 msgstr ""
 "<option>Targets</option> (<option>target</option>) は値を複数取るオプション"
 "で、apt がその取得元から取得するダウンロード対象を定義します。指定しない場合"
@@ -8119,8 +8148,9 @@ msgid ""
 "helps users identify mirrors which are no longer updated. However, some "
 "repositories such as historic archives are not updated any more by design, "
 "so this check can be disabled by setting this option to <literal>no</"
-"literal>.  Defaults to the value of configuration option <option>Acquire::"
-"Check-Valid-Until</option> which itself defaults to <literal>yes</literal>."
+"literal>.  Defaults to the value of configuration option "
+"<option>Acquire::Check-Valid-Until</option> which itself defaults to "
+"<literal>yes</literal>."
 msgstr ""
 "<option>Check-Valid-Until</option> (<option>check-valid-until</option>) は、"
 "APT がリプレイ攻撃を検出するかどうかを制御する yes/no 値です。リポジトリの作"
@@ -8157,9 +8187,9 @@ msgstr ""
 "Until フィールドがないものを提供する場合、-Max は特に有用です。-Min は完全に"
 "チェックを無効にする代わりに (sources.list 同様にある) より頻繁に更新があるミ"
 "ラーの、あまりアクセスされないアーカイブの有効期間を増やすことができます。設"
-"定オプション <option>Acquire::Min-ValidTime</option> および <option>Acquire::"
-"Max-ValidTime</option> の値がデフォルトになり、その両方のデフォルト値は "
-"unset です。"
+"定オプション <option>Acquire::Min-ValidTime</option> および "
+"<option>Acquire::Max-ValidTime</option> の値がデフォルトになり、その両方のデ"
+"フォルト値は unset です。"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #: sources.list.5.xml
@@ -8717,17 +8747,17 @@ msgid ""
 "<filename>package.config.XXXXXX</filename>"
 msgstr ""
 "テンプレートファイルや、設定スクリプトは、<option>-t</option> や <option>--"
-"tempdir</option> で指定した一時ディレクトリ (<literal>APT::ExtractTemplates::"
-"TempDir</literal>) に書き出され、ファイル名は、<filename>package.template."
-"XXXXXX</filename> や <filename>package.config.XXXXXX</filename> といった形に"
-"なります。"
+"tempdir</option> で指定した一時ディレクトリ "
+"(<literal>APT::ExtractTemplates::TempDir</literal>) に書き出され、ファイル名"
+"は、<filename>package.template.XXXXXX</filename> や "
+"<filename>package.config.XXXXXX</filename> といった形になります。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-extracttemplates.1.xml
 msgid ""
 "Temporary directory in which to write extracted <command>debconf</command> "
-"template files and config scripts.  Configuration Item: <literal>APT::"
-"ExtractTemplates::TempDir</literal>"
+"template files and config scripts.  Configuration Item: "
+"<literal>APT::ExtractTemplates::TempDir</literal>"
 msgstr ""
 "抽出した <command>debconf</command> テンプレートファイルや設定スクリプトを書"
 "き出す一時ディレクトリ。設定項目: <literal>APT::ExtractTemplates::TempDir</"
@@ -8769,8 +8799,8 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-sortpkgs.1.xml
 msgid ""
-"Use source index field ordering.  Configuration Item: <literal>APT::"
-"SortPkgs::Source</literal>."
+"Use source index field ordering.  Configuration Item: "
+"<literal>APT::SortPkgs::Source</literal>."
 msgstr ""
 "ソースインデックスフィールド順に並べ替えに使用します。設定項目: "
 "<literal>APT::SortPkgs::Source</literal>"
@@ -8899,10 +8929,10 @@ msgid ""
 "<filename>icons</filename> files as well as <filename>Release</filename>, "
 "<filename>Index</filename> and <filename>md5sum.txt</filename> files by "
 "default (<literal>APT::FTPArchive::Release::Default-Patterns</literal>).  "
-"Additional filename patterns can be added by listing them in <literal>APT::"
-"FTPArchive::Release::Patterns</literal>.  It then writes to stdout a "
-"<filename>Release</filename> file containing (by default) an MD5, SHA1, "
-"SHA256 and SHA512 digest for each file."
+"Additional filename patterns can be added by listing them in "
+"<literal>APT::FTPArchive::Release::Patterns</literal>.  It then writes to "
+"stdout a <filename>Release</filename> file containing (by default) an MD5, "
+"SHA1, SHA256 and SHA512 digest for each file."
 msgstr ""
 "<literal>release</literal> コマンドは、ディレクトリツリーから Release ファイ"
 "ルを生成します。与えたディレクトリを再帰的に検索し、未圧縮の "
@@ -8930,15 +8960,16 @@ msgid ""
 "<literal>Architectures</literal>, <literal>Components</literal> and "
 "<literal>Description</literal>."
 msgstr ""
-"Release ファイルの追加メタデータフィールドの値は、<literal>APT::FTPArchive::"
-"Release</literal> 以下の相当する値 (例: <literal>APT::FTPArchive::Release::"
-"Origin</literal>) をとります。サポートするフィールドは、<literal>Origin</"
-"literal>, <literal>Label</literal>, <literal>Suite</literal>, "
-"<literal>Version</literal>, <literal>Codename</literal>, <literal>Date</"
-"literal>, <literal>NotAutomatic</literal>, <literal>ButAutomaticUpgrades</"
-"literal>, <literal>Acquire-By-Hash</literal>, <literal>Valid-Until</"
-"literal>, <literal>Signed-By</literal>, <literal>Architectures</literal>, "
-"<literal>Components</literal>, <literal>Description</literal> です。"
+"Release ファイルの追加メタデータフィールドの値は、"
+"<literal>APT::FTPArchive::Release</literal> 以下の相当する値 (例: "
+"<literal>APT::FTPArchive::Release::Origin</literal>) をとります。サポートする"
+"フィールドは、<literal>Origin</literal>, <literal>Label</literal>, "
+"<literal>Suite</literal>, <literal>Version</literal>, <literal>Codename</"
+"literal>, <literal>Date</literal>, <literal>NotAutomatic</literal>, "
+"<literal>ButAutomaticUpgrades</literal>, <literal>Acquire-By-Hash</literal>, "
+"<literal>Valid-Until</literal>, <literal>Signed-By</literal>, "
+"<literal>Architectures</literal>, <literal>Components</literal>, "
+"<literal>Description</literal> です。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml
@@ -9073,8 +9104,8 @@ msgid ""
 "Sets the default list of file extensions that are package files.  This "
 "defaults to '.deb'."
 msgstr ""
-"パッケージファイル拡張子のデフォルト値を列挙します。このデフォルト値は '."
-"deb' です。"
+"パッケージファイル拡張子のデフォルト値を列挙します。このデフォルト値は "
+"'.deb' です。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml
@@ -9151,8 +9182,8 @@ msgstr "<literal>TreeDefault</literal> セクション"
 #: apt-ftparchive.1.xml
 msgid ""
 "Sets defaults specific to <literal>Tree</literal> sections. All of these "
-"variables are substitution variables and have the strings $(DIST), "
-"$(SECTION) and $(ARCH) replaced with their respective values."
+"variables are substitution variables and have the strings $(DIST), $"
+"(SECTION) and $(ARCH) replaced with their respective values."
 msgstr ""
 "特定の <literal>Tree</literal> セクションのデフォルトを設定します。これらの変"
 "数はすべて置換変数であり、文字列 $(DIST), $(SECTION), $(ARCH) をそれぞれの値"
@@ -9187,17 +9218,17 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml
 msgid ""
-"Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
-"$(SECTION)/binary-$(ARCH)/</filename>"
+"Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/$"
+"(SECTION)/binary-$(ARCH)/</filename>"
 msgstr ""
-".deb ディレクトリツリーの先頭を設定します。デフォルトは <filename>$(DIST)/"
-"$(SECTION)/binary-$(ARCH)/</filename> です。"
+".deb ディレクトリツリーの先頭を設定します。デフォルトは <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 ""
 "ソースパッケージディレクトリツリーの先頭を設定します。デフォルトは "
 "<filename>$(DIST)/$(SECTION)/source/</filename> です。"
@@ -9208,8 +9239,8 @@ msgid ""
 "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "binary-$(ARCH)/Packages</filename>"
 msgstr ""
-"Packages ファイルの出力先を設定します。デフォルトは <filename>$(DIST)/"
-"$(SECTION)/binary-$(ARCH)/Packages</filename> です。"
+"Packages ファイルの出力先を設定します。デフォルトは <filename>$(DIST)/$"
+"(SECTION)/binary-$(ARCH)/Packages</filename> です。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml
@@ -9217,19 +9248,19 @@ msgid ""
 "Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "source/Sources</filename>"
 msgstr ""
-"Sources ファイルの出力先を設定します。デフォルトは <filename>$(DIST)/"
-"$(SECTION)/source/Sources</filename> です。"
+"Sources ファイルの出力先を設定します。デフォルトは <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 ""
 "万一 Packages ファイルに含まれていない場合、長い説明文がある Translation-en "
-"マスターファイルの出力先を設定します。デフォルトは、<filename>$(DIST)/"
-"$(SECTION)/i18n/Translation-en</filename> です。"
+"マスターファイルの出力先を設定します。デフォルトは、<filename>$(DIST)/$"
+"(SECTION)/i18n/Translation-en</filename> です。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml
@@ -9250,8 +9281,8 @@ msgid ""
 "ftparchive</command> will integrate those package files together "
 "automatically."
 msgstr ""
-"Contents ファイルの出力先を設定します。デフォルトは、<filename>$(DIST)/"
-"$(SECTION)/Contents-$(ARCH)</filename> です。複数の Packages ファイルをひとつ"
+"Contents ファイルの出力先を設定します。デフォルトは、<filename>$(DIST)/$"
+"(SECTION)/Contents-$(ARCH)</filename> です。複数の Packages ファイルをひとつ"
 "の Contents ファイルにまとめられる設定 (デフォルト) の場合、<command>apt-"
 "ftparchive</command> は自動でパッケージファイルをまとめます。"
 
@@ -9645,11 +9676,11 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml
 msgid ""
-"Make the caching databases read only.  Configuration Item: <literal>APT::"
-"FTPArchive::ReadOnlyDB</literal>."
+"Make the caching databases read only.  Configuration Item: "
+"<literal>APT::FTPArchive::ReadOnlyDB</literal>."
 msgstr ""
-"キャッシュデータベースを読み取り専用にします。設定項目: <literal>APT::"
-"FTPArchive::ReadOnlyDB</literal>"
+"キャッシュデータベースを読み取り専用にします。設定項目: "
+"<literal>APT::FTPArchive::ReadOnlyDB</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml
@@ -10018,16 +10049,17 @@ msgid ""
 "The environment variable <envar>http_proxy</envar> is supported for system "
 "wide configuration.  Proxies specific to APT can be configured via the "
 "option <literal>Acquire::http::Proxy</literal>.  Proxies which should be "
-"used only for certain hosts can be specified via <literal>Acquire::http::"
-"Proxy::<replaceable>host</replaceable></literal>. Even more fine-grained "
-"control can be achieved via proxy autodetection, detailed further below.  "
-"All these options use the URI format <literal><replaceable>scheme</"
-"replaceable>://[[<replaceable>user</replaceable>][:<replaceable>pass</"
-"replaceable>]@]<replaceable>host</replaceable>[:<replaceable>port</"
-"replaceable>]/</literal>.  Supported URI schemes are <literal>socks5h</"
-"literal> (SOCKS5 with remote DNS resolution), <literal>http</literal> and "
-"<literal>https</literal>.  Authentication details can be supplied via &apt-"
-"authconf; instead of including it in the URI directly."
+"used only for certain hosts can be specified via "
+"<literal>Acquire::http::Proxy::<replaceable>host</replaceable></literal>. "
+"Even more fine-grained control can be achieved via proxy autodetection, "
+"detailed further below.  All these options use the URI format "
+"<literal><replaceable>scheme</replaceable>://[[<replaceable>user</"
+"replaceable>][:<replaceable>pass</replaceable>]@]<replaceable>host</"
+"replaceable>[:<replaceable>port</replaceable>]/</literal>.  Supported URI "
+"schemes are <literal>socks5h</literal> (SOCKS5 with remote DNS resolution), "
+"<literal>http</literal> and <literal>https</literal>.  Authentication "
+"details can be supplied via &apt-authconf; instead of including it in the "
+"URI directly."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
@@ -10051,14 +10083,14 @@ msgstr ""
 #| "store the requested archive files in its cache, which can be used to "
 #| "prevent the proxy from polluting its cache with (big) .deb files."
 msgid ""
-"Furthermore, there are three settings provided for cache control with "
-"HTTP/1.1 compliant proxy caches: <literal>Acquire::http::No-Cache</literal> "
-"tells the proxy not to use its cached response under any circumstances.  "
+"Furthermore, there are three settings provided for cache control with HTTP/"
+"1.1 compliant proxy caches: <literal>Acquire::http::No-Cache</literal> tells "
+"the proxy not to use its cached response under any circumstances.  "
 "<literal>Acquire::http::Max-Age</literal> sets the allowed maximum age (in "
-"seconds) of an index file in the cache of the proxy.  <literal>Acquire::"
-"http::No-Store</literal> specifies that the proxy should not store the "
-"requested archive files in its cache, which can be used to prevent the proxy "
-"from polluting its cache with (big) .deb files."
+"seconds) of an index file in the cache of the proxy.  "
+"<literal>Acquire::http::No-Store</literal> specifies that the proxy should "
+"not store the requested archive files in its cache, which can be used to "
+"prevent the proxy from polluting its cache with (big) .deb files."
 msgstr ""
 "HTTP/1.1 準拠のプロキシキャッシュの制御について 3 種類の設定があります。"
 "<literal>No-Cache</literal> はプロキシに対して、いかなる時もキャッシュを使用"
@@ -10087,11 +10119,11 @@ msgstr "ユーザ設定"
 #| "</literal> or the word <literal>DIRECT</literal> if no proxy should be "
 #| "used. No output indicates that the generic proxy settings should be "
 #| "used.  Note that auto-detection will not be used for a host if a host-"
-#| "specific proxy configuration is already set via <literal>Acquire::http::"
-#| "Proxy::<replaceable>HOST</replaceable></literal>.  See the &squid-deb-"
-#| "proxy-client; package for an example implementation that uses avahi.  "
-#| "This option takes precedence over the legacy option name "
-#| "<literal>ProxyAutoDetect</literal>."
+#| "specific proxy configuration is already set via "
+#| "<literal>Acquire::http::Proxy::<replaceable>HOST</replaceable></"
+#| "literal>.  See the &squid-deb-proxy-client; package for an example "
+#| "implementation that uses avahi.  This option takes precedence over the "
+#| "legacy option name <literal>ProxyAutoDetect</literal>."
 msgid ""
 "<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to specify "
 "an external command to discover the HTTP proxy to use. The first and only "
@@ -10131,8 +10163,8 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt-transport-http.1.xml
 msgid ""
-"This option takes precedence over the legacy option name <literal>Acquire::"
-"http::ProxyAutoDetect</literal>."
+"This option takes precedence over the legacy option name "
+"<literal>Acquire::http::ProxyAutoDetect</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
@@ -10191,12 +10223,12 @@ msgstr ""
 #| "by setting the value to 0. It is enabled by default with the value 10."
 msgid ""
 "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
-"enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
-"g. on high-latency connections. It specifies how many requests are sent in a "
-"pipeline.  APT tries to detect and work around misbehaving webservers and "
-"proxies at runtime, but if you know that yours does not conform to the "
-"HTTP/1.1 specification, pipelining can be disabled by setting the value to "
-"0. It is enabled by default with the value 10."
+"enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial "
+"e.g. on high-latency connections. It specifies how many requests are sent in "
+"a pipeline.  APT tries to detect and work around misbehaving webservers and "
+"proxies at runtime, but if you know that yours does not conform to the HTTP/"
+"1.1 specification, pipelining can be disabled by setting the value to 0. It "
+"is enabled by default with the value 10."
 msgstr ""
 "<literal>Acquire::http::Pipeline-Depth</literal> の設定は、例えばレイテンシの"
 "高い接続で有益な HTTP パイプライン (RFC 2616 8.1.2.2 節) を有効にするのに使用"
@@ -10293,9 +10325,9 @@ msgstr ""
 msgid ""
 "The HTTPS protocol is based on the HTTP protocol, so all options supported "
 "by &apt-transport-http; are also available via <literal>Acquire::https</"
-"literal> and will default to the same values specified for <literal>Acquire::"
-"http</literal>. This manpage will only document the options <emphasis>unique "
-"to https</emphasis>."
+"literal> and will default to the same values specified for "
+"<literal>Acquire::http</literal>. This manpage will only document the "
+"options <emphasis>unique to https</emphasis>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
@@ -10324,9 +10356,10 @@ msgstr ""
 #: apt-transport-https.1.xml
 msgid ""
 "A custom certificate revocation list (CRL) can be configured with the "
-"options <literal>Acquire::https::CRLFile</literal> and <literal>Acquire::"
-"https::CRLFile::<replaceable>host</replaceable></literal>.  As with the "
-"previous option, a file in PEM format needs to be specified."
+"options <literal>Acquire::https::CRLFile</literal> and "
+"<literal>Acquire::https::CRLFile::<replaceable>host</replaceable></"
+"literal>.  As with the previous option, a file in PEM format needs to be "
+"specified."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
@@ -10372,11 +10405,11 @@ msgstr ""
 msgid ""
 "Besides supporting password-based authentication (see &apt-authconf;) HTTPS "
 "also supports authentication based on client certificates via "
-"<literal>Acquire::https::SSLCert</literal> and <literal>Acquire::https::"
-"SSLKey</literal>. These should be set respectively to the filename of the "
-"X.509 client certificate and the associated (unencrypted) private key, both "
-"in PEM format.  In practice the use of the host-specific variants of both "
-"options is highly recommended."
+"<literal>Acquire::https::SSLCert</literal> and "
+"<literal>Acquire::https::SSLKey</literal>. These should be set respectively "
+"to the filename of the X.509 client certificate and the associated "
+"(unencrypted) private key, both in PEM format.  In practice the use of the "
+"host-specific variants of both options is highly recommended."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
@@ -10578,9 +10611,9 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt-transport-mirror.1.xml
 msgid ""
-"Assuming a file with this content is stored as <filename>/etc/apt/mirrorlist."
-"txt</filename> on your machine it can be used like this in &sources-list; "
-"(since apt 1.6):"
+"Assuming a file with this content is stored as <filename>/etc/apt/"
+"mirrorlist.txt</filename> on your machine it can be used like this in "
+"&sources-list; (since apt 1.6):"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><literallayout>
@@ -11413,10 +11446,10 @@ msgstr ""
 #: apt-patterns.7.xml
 msgid ""
 "<code>foo</code> cannot be used as a shortform for <code>?name(foo)</code>, "
-"as this can cause typos to go unnoticed: Consider <code>?and(...,"
-"~poptional)</code>: this requires the package to have <code>required</code> "
-"priority, but if you do not type the <code>~</code>, it would require the "
-"package name to contain <code>poptional</code>."
+"as this can cause typos to go unnoticed: Consider <code>?"
+"and(...,~poptional)</code>: this requires the package to have "
+"<code>required</code> priority, but if you do not type the <code>~</code>, "
+"it would require the package name to contain <code>poptional</code>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
@@ -11987,8 +12020,8 @@ msgid ""
 "<literal>Dselect::clean \"prompt\";</literal> in /etc/apt/apt.conf."
 msgstr ""
 "デフォルトで APT はインストールに成功したパッケージ (.deb) ファイルを自動的に"
-"削除します。この挙動を変更するには /etc/apt/apt.conf 中に <literal>Dselect::"
-"clean \"prompt\";</literal> と記述します。"
+"削除します。この挙動を変更するには /etc/apt/apt.conf 中に "
+"<literal>Dselect::clean \"prompt\";</literal> と記述します。"
 
 #. type: Content of: <book><chapter><title>
 #: guide.dbk
@@ -12992,33 +13025,33 @@ msgstr "これで、ディスクにある取得済みのアーカイブを使用
 
 #~ msgid ""
 #~ "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP "
-#~ "URIs.  It is in the standard form of <literal>ftp://[[user][:pass]@]host[:"
-#~ "port]/</literal>.  Per host proxies can also be specified by using the "
-#~ "form <literal>ftp::Proxy::&lt;host&gt;</literal> with the special keyword "
-#~ "<literal>DIRECT</literal> meaning to use no proxies. If no one of the "
-#~ "above settings is specified, <envar>ftp_proxy</envar> environment "
-#~ "variable will be used. To use an FTP proxy you will have to set the "
-#~ "<literal>ftp::ProxyLogin</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>."
+#~ "URIs.  It is in the standard form of <literal>ftp://[[user]"
+#~ "[:pass]@]host[:port]/</literal>.  Per host proxies can also be specified "
+#~ "by using the form <literal>ftp::Proxy::&lt;host&gt;</literal> with the "
+#~ "special keyword <literal>DIRECT</literal> meaning to use no proxies. If "
+#~ "no one of the above settings is specified, <envar>ftp_proxy</envar> "
+#~ "environment variable will be used. To use an FTP proxy you will have to "
+#~ "set the <literal>ftp::ProxyLogin</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>."
 #~ msgstr ""
 #~ "<literal>ftp::Proxy</literal> は、FTP URI を使用する際のデフォルトプロキシ"
 #~ "を設定します。<literal>ftp://[[user][:pass]@]host[:port]/</literal> という"
-#~ "標準形で表します。ホストごとのプロキシを、<literal>ftp::Proxy::&lt;"
-#~ "host&gt;</literal> という形で指定できます。この時、プロキシを使用しないと"
-#~ "いう意味の特殊キーワード <literal>DIRECT</literal> も使用できます。上記の"
-#~ "設定をなにも指定しないと、環境変数 <envar>ftp_proxy</envar> を使用します。"
-#~ "FTP プロキシを使用するには、設定ファイルに <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>ftp::Proxy::&lt;host&gt;</literal> という形で指定できます。この"
+#~ "時、プロキシを使用しないという意味の特殊キーワード <literal>DIRECT</"
+#~ "literal> も使用できます。上記の設定をなにも指定しないと、環境変数 "
+#~ "<envar>ftp_proxy</envar> を使用します。FTP プロキシを使用するには、設定"
+#~ "ファイルに <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> です。"
 
 #~ msgid ""
@@ -13286,9 +13319,9 @@ msgstr "これで、ディスクにある取得済みのアーカイブを使用
 #~ "With this option it is possible to specify a particular keyring file the "
 #~ "command should operate on. The default is that a command is executed on "
 #~ "the <filename>trusted.gpg</filename> file as well as on all parts in the "
-#~ "<filename>trusted.gpg.d</filename> directory, though <filename>trusted."
-#~ "gpg</filename> is the primary keyring which means that e.g. new keys are "
-#~ "added to this one."
+#~ "<filename>trusted.gpg.d</filename> directory, though "
+#~ "<filename>trusted.gpg</filename> is the primary keyring which means that "
+#~ "e.g. new keys are added to this one."
 #~ msgstr ""
 #~ "このオプションでは、コマンドが操作するべき特定のキーリングファイルを指定で"
 #~ "きます。デフォルトでは、<filename>trusted.gpg</filename> と "
@@ -13330,8 +13363,9 @@ msgstr "これで、ディスクにある取得済みのアーカイブを使用
 #~ "得する際には、信頼できる通信チャネルを使用するよう、特に留意してくださ"
 #~ "い)。取得したキーを、<command>apt-key</command> で追加し、<command>apt-"
 #~ "get update</command> を実行してください。以上により、apt は設定済みのアー"
-#~ "カイブから、<filename>InRelease</filename> ファイルや <filename>Release."
-#~ "gpg</filename> ファイルをダウンロード・検証できるようになります。"
+#~ "カイブから、<filename>InRelease</filename> ファイルや "
+#~ "<filename>Release.gpg</filename> ファイルをダウンロード・検証できるように"
+#~ "なります。"
 
 #~ msgid "Describes the process of resolving build-dependencies in &apt-get;."
 #~ msgstr "&apt-get; での構築依存関係解決のプロセスを説明します。"
@@ -13359,20 +13393,20 @@ msgstr "これで、ディスクにある取得済みのアーカイブを使用
 
 #~ msgid ""
 #~ "<literal>http::Proxy</literal> sets the default proxy to use for HTTP "
-#~ "URIs. It is in the standard form of <literal>http://[[user][:pass]@]host[:"
-#~ "port]/</literal>.  Per host proxies can also be specified by using the "
-#~ "form <literal>http::Proxy::&lt;host&gt;</literal> with the special "
-#~ "keyword <literal>DIRECT</literal> meaning to use no proxies. If no one of "
-#~ "the above settings is specified, <envar>http_proxy</envar> environment "
-#~ "variable will be used."
+#~ "URIs. It is in the standard form of <literal>http://[[user]"
+#~ "[:pass]@]host[:port]/</literal>.  Per host proxies can also be specified "
+#~ "by using the form <literal>http::Proxy::&lt;host&gt;</literal> with the "
+#~ "special keyword <literal>DIRECT</literal> meaning to use no proxies. If "
+#~ "no one of the above settings is specified, <envar>http_proxy</envar> "
+#~ "environment variable will be used."
 #~ msgstr ""
 #~ "<literal>http::Proxy</literal> には、HTTP URI で使用するデフォルトプロキシ"
 #~ "を設定します。<literal>http://[[user][:pass]@]host[:port]/</literal> とい"
-#~ "う標準形で表します。ホストごとのプロキシを、<literal>http::Proxy::&lt;"
-#~ "host&gt;</literal> という形で指定できます。この時、プロキシを使用しないと"
-#~ "いう意味の特殊キーワード <literal>DIRECT</literal> も使用できます。上記の"
-#~ "設定をなにも指定しないと、環境変数 <envar>http_proxy</envar> を使用しま"
-#~ "す。"
+#~ "う標準形で表します。ホストごとのプロキシを、"
+#~ "<literal>http::Proxy::&lt;host&gt;</literal> という形で指定できます。この"
+#~ "時、プロキシを使用しないという意味の特殊キーワード <literal>DIRECT</"
+#~ "literal> も使用できます。上記の設定をなにも指定しないと、環境変数 "
+#~ "<envar>http_proxy</envar> を使用します。"
 
 #~ msgid ""
 #~ "The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
@@ -13394,19 +13428,19 @@ msgstr "これで、ディスクにある取得済みのアーカイブを使用
 #~ "info about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> "
 #~ "is the corresponding per-host option.  <literal>Verify-Peer</literal> "
 #~ "boolean suboption determines whether or not the server's host certificate "
-#~ "should be verified against trusted certificates.  <literal>&lt;host&gt;::"
-#~ "Verify-Peer</literal> is the corresponding per-host option.  "
-#~ "<literal>Verify-Host</literal> boolean suboption determines whether or "
-#~ "not the server's hostname should be verified.  <literal>&lt;host&gt;::"
-#~ "Verify-Host</literal> is the corresponding per-host option.  "
-#~ "<literal>SslCert</literal> determines what certificate to use for client "
-#~ "authentication. <literal>&lt;host&gt;::SslCert</literal> is the "
-#~ "corresponding per-host option.  <literal>SslKey</literal> determines what "
-#~ "private key to use for client authentication. <literal>&lt;host&gt;::"
-#~ "SslKey</literal> is the corresponding per-host option.  "
-#~ "<literal>SslForceVersion</literal> overrides default SSL version to use.  "
-#~ "It can contain either of the strings '<literal>TLSv1</literal>' or "
-#~ "'<literal>SSLv3</literal>'.  <literal>&lt;host&gt;::SslForceVersion</"
+#~ "should be verified against trusted certificates.  "
+#~ "<literal>&lt;host&gt;::Verify-Peer</literal> is the corresponding per-"
+#~ "host option.  <literal>Verify-Host</literal> boolean suboption determines "
+#~ "whether or not the server's hostname should be verified.  "
+#~ "<literal>&lt;host&gt;::Verify-Host</literal> is the corresponding per-"
+#~ "host option.  <literal>SslCert</literal> determines what certificate to "
+#~ "use for client authentication. <literal>&lt;host&gt;::SslCert</literal> "
+#~ "is the corresponding per-host option.  <literal>SslKey</literal> "
+#~ "determines what private key to use for client authentication. "
+#~ "<literal>&lt;host&gt;::SslKey</literal> is the corresponding per-host "
+#~ "option.  <literal>SslForceVersion</literal> overrides default SSL version "
+#~ "to use.  It can contain either of the strings '<literal>TLSv1</literal>' "
+#~ "or '<literal>SSLv3</literal>'.  <literal>&lt;host&gt;::SslForceVersion</"
 #~ "literal> is the corresponding per-host option."
 #~ msgstr ""
 #~ "<literal>CaInfo</literal> サブオプションは、信頼済み証明書情報の保持場所を"
@@ -13417,14 +13451,15 @@ msgstr "これで、ディスクにある取得済みのアーカイブを使用
 #~ "ションです。<literal>Verify-Host</literal> 真偽値サブオプションは、サーバ"
 #~ "のホスト名を検証するかどうかを決定します。<literal>&lt;host&gt;::Verify-"
 #~ "Host</literal> は、同様のホストごとのオプションです。<literal>SslCert</"
-#~ "literal> は、クライアント認証に使用する証明書を決定します。<literal>&lt;"
-#~ "host&gt;::SslCert</literal> は、同様のホストごとのオプションです。"
-#~ "<literal>SslKey</literal> は、クライアント認証に使用する秘密鍵を決定しま"
-#~ "す。<literal>&lt;host&gt;::SslKey</literal> は、同様のホストごとのオプショ"
-#~ "ンです。<literal>SslForceVersion</literal> は、デフォルトで使用する SSL の"
-#~ "バージョンを上書きします。'<literal>TLSv1</literal>' か '<literal>SSLv3</"
-#~ "literal>' という文字列を指定できます。<literal>&lt;host&gt;::"
-#~ "SslForceVersion</literal> は、同様のホストごとのオプションです。"
+#~ "literal> は、クライアント認証に使用する証明書を決定します。"
+#~ "<literal>&lt;host&gt;::SslCert</literal> は、同様のホストごとのオプション"
+#~ "です。<literal>SslKey</literal> は、クライアント認証に使用する秘密鍵を決定"
+#~ "します。<literal>&lt;host&gt;::SslKey</literal> は、同様のホストごとのオプ"
+#~ "ションです。<literal>SslForceVersion</literal> は、デフォルトで使用する "
+#~ "SSL のバージョンを上書きします。'<literal>TLSv1</literal>' か "
+#~ "'<literal>SSLv3</literal>' という文字列を指定できます。"
+#~ "<literal>&lt;host&gt;::SslForceVersion</literal> は、同様のホストごとのオ"
+#~ "プションです。"
 
 #~ msgid ""
 #~ "The http scheme specifies an HTTP server for the archive. If an "
@@ -13445,9 +13480,10 @@ msgstr "これで、ディスクにある取得済みのアーカイブを使用
 #~ "it encounters unauthenticated archives to give a slightly longer grace "
 #~ "period on this backward compatibility effecting change. This exception "
 #~ "will be removed in future releases and you can opt-out of this grace "
-#~ "period by setting the configuration option <option>Binary::apt-get::"
-#~ "Acquire::AllowInsecureRepositories</option> to <literal>false</literal> "
-#~ "or <option>--no-allow-insecure-repositories</option> on the command line."
+#~ "period by setting the configuration option <option>Binary::apt-"
+#~ "get::Acquire::AllowInsecureRepositories</option> to <literal>false</"
+#~ "literal> or <option>--no-allow-insecure-repositories</option> on the "
+#~ "command line."
 #~ msgstr ""
 #~ "一時的な例外として &apt-get; (not &apt;!) はこの後方互換性に影響のある変更"
 #~ "に対応するための少しばかり長い猶予期間として、証明されていないアーカイブに"
diff --git a/doc/po/nl.po b/doc/po/nl.po
index 379968799..8def60f55 100644
--- a/doc/po/nl.po
+++ b/doc/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 2.9.10\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2025-01-01 21:58+0100\n"
+"POT-Creation-Date: 2025-01-28 18:52+0000\n"
 "PO-Revision-Date: 2024-11-05 21:48+0100\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
@@ -564,11 +564,12 @@ msgstr ""
 #. type: Plain text
 #: apt.ent
 msgid ""
-"<!-- TRANSLATOR: used as in -o=config_string e.g. -o=Debug::"
-"pkgProblemResolver=1 --> <!ENTITY synopsis-config-string \"config_string\">"
+"<!-- TRANSLATOR: used as in -o=config_string e.g. "
+"-o=Debug::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 "
+"<!-- TRANSLATOR: used as in -o=config_string e.g. "
+"-o=Debug::pkgProblemResolver=1 --> <!ENTITY synopsis-config-string "
 "\"configuratietekenreeks\">"
 
 #. type: Plain text
@@ -583,12 +584,12 @@ msgstr ""
 #. type: Plain text
 #: apt.ent
 msgid ""
-"<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release e.g. -"
-"t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
+"<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release e.g. "
+"-t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
 "\"target_release\">"
 msgstr ""
-"<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release e.g. -"
-"t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
+"<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release e.g. "
+"-t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
 "\"doelrelease\">"
 
 #. type: Plain text
@@ -639,11 +640,11 @@ msgstr ""
 #. type: Plain text
 #: apt.ent
 msgid ""
-"<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom -"
-"d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"cdrom_mount_point\">"
+"<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom "
+"-d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"cdrom_mount_point\">"
 msgstr ""
-"<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom -"
-"d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"cd-aankoppelpunt\">"
+"<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom "
+"-d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"cd-aankoppelpunt\">"
 
 #. type: Plain text
 #: apt.ent
@@ -1128,9 +1129,9 @@ msgid ""
 msgstr ""
 "<literal>update</literal> wordt gebruikt om de indexbestanden van "
 "beschikbare pakketten terug te synchroniseren met hun pakketbronnen. De "
-"indexen worden opgehaald van de locatie(s) die in <filename>/etc/apt/sources."
-"list</filename> opgegeven werden. Indien bijvoorbeeld een Debian-archief "
-"gebruikt wordt, zal dit commando de bestanden <filename>Packages.gz</"
+"indexen worden opgehaald van de locatie(s) die in <filename>/etc/apt/"
+"sources.list</filename> opgegeven werden. Indien bijvoorbeeld een Debian-"
+"archief gebruikt wordt, zal dit commando de bestanden <filename>Packages.gz</"
 "filename> ophalen en doorzoeken zodat de informatie over nieuwe en "
 "bijgewerkte pakketten beschikbaar wordt. Een <literal>update</literal> moet "
 "altijd uitgevoerd worden voor een <literal>upgrade</literal> of een "
@@ -1501,8 +1502,8 @@ msgid ""
 "Example: <literal>apt-get satisfy \"foo\" \"Conflicts: bar\" \"baz (&gt;&gt; "
 "1.0) | bar (= 2.0), moo\"</literal>"
 msgstr ""
-"Voorbeeld: <literal>apt-get satisfy \"foo\" \"Conflicts: bar\" \"baz (&gt;"
-"&gt; 1.0) | bar (= 2.0), moo\"</literal>"
+"Voorbeeld: <literal>apt-get satisfy \"foo\" \"Conflicts: bar\" \"baz "
+"(&gt;&gt; 1.0) | bar (= 2.0), moo\"</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -1699,8 +1700,8 @@ msgid ""
 "structure can be so corrupt as to require manual intervention (which usually "
 "means using <command>dpkg --remove</command> to eliminate some of the "
 "offending packages). Use of this option together with <option>-m</option> "
-"may produce an error in some situations.  Configuration Item: <literal>APT::"
-"Get::Fix-Broken</literal>."
+"may produce an error in some situations.  Configuration Item: "
+"<literal>APT::Get::Fix-Broken</literal>."
 msgstr ""
 "Herstellen; proberen een systeem met defecte vereisten te repareren. Als "
 "deze optie gebruikt wordt samen met install/remove, kan ze elk pakket "
@@ -1746,8 +1747,8 @@ msgid ""
 msgstr ""
 "Schakelt het downloaden van pakketten uit. Dit wordt best gebruikt samen met "
 "<option>--ignore-missing</option> om APT te verplichten enkel .debs te "
-"gebruiken die het al gedownload heeft. Configuratie-item: <literal>APT::Get::"
-"Download</literal>."
+"gebruiken die het al gedownload heeft. Configuratie-item: "
+"<literal>APT::Get::Download</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -1791,9 +1792,9 @@ msgstr ""
 "bezig is. Ook een niet-systeembeheerder (non-root) kan simulaties uitvoeren "
 "en als die geen leestoegang heeft tot alle configuraties van apt, kan dit de "
 "simulatie vertekenen. Niet-systeembeheerders krijgen standaard ook een "
-"opmerking te zien waarin deze waarschuwing gegeven wordt (<option>APT::Get::"
-"Show-User-Simulation-Note</option>).  Configuratie-item: <literal>APT::Get::"
-"Simulate</literal>."
+"opmerking te zien waarin deze waarschuwing gegeven wordt "
+"(<option>APT::Get::Show-User-Simulation-Note</option>).  Configuratie-item: "
+"<literal>APT::Get::Simulate</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -1825,17 +1826,17 @@ msgstr ""
 "situatie voordoet, zoals het wijzigen van een op zijn huidige versie "
 "vastgehouden pakket, een poging om een niet-geauthenticeerd pakket te "
 "installeren of het verwijderen van een essentieel pakket, zal <literal>apt-"
-"get</literal> afgebroken worden. Configuratie-item: <literal>APT::Get::"
-"Assume-Yes</literal>."
+"get</literal> afgebroken worden. Configuratie-item: "
+"<literal>APT::Get::Assume-Yes</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
-"Automatic \"no\" to all prompts.  Configuration Item: <literal>APT::Get::"
-"Assume-No</literal>."
+"Automatic \"no\" to all prompts.  Configuration Item: "
+"<literal>APT::Get::Assume-No</literal>."
 msgstr ""
-"Een automatisch \"neen\" op alle vragen. Configuratie-item: <literal>APT::"
-"Get::Assume-No</literal>."
+"Een automatisch \"neen\" op alle vragen. Configuratie-item: "
+"<literal>APT::Get::Assume-No</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -1871,15 +1872,15 @@ msgstr ""
 #, fuzzy
 #| msgid ""
 #| "Select the source override file to use with the <literal>sources</"
-#| "literal> command.  Configuration Item: <literal>APT::FTPArchive::"
-#| "SourceOverride</literal>."
+#| "literal> command.  Configuration Item: "
+#| "<literal>APT::FTPArchive::SourceOverride</literal>."
 msgid ""
 "Add the given value to the <literal>Comment:</literal> field in history.log "
 "Configuration Item: <literal>APT::History::Comment</literal>."
 msgstr ""
 "Het override-bestand voor broncode selecteren om met het commando "
-"<literal>sources</literal> te gebruiken. Configuratie-item: <literal>APT::"
-"FTPArchive::SourceOverride</literal>."
+"<literal>sources</literal> te gebruiken. Configuratie-item: "
+"<literal>APT::FTPArchive::SourceOverride</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -1887,9 +1888,9 @@ msgid ""
 "This option controls the architecture packages are built for by <command>apt-"
 "get source --compile</command> and how cross-builddependencies are "
 "satisfied. By default is it not set which means that the host architecture "
-"is the same as the build architecture (which is defined by <literal>APT::"
-"Architecture</literal>).  Configuration Item: <literal>APT::Get::Host-"
-"Architecture</literal>."
+"is the same as the build architecture (which is defined by "
+"<literal>APT::Architecture</literal>).  Configuration Item: "
+"<literal>APT::Get::Host-Architecture</literal>."
 msgstr ""
 "Deze optie regelt voor welke architectuur pakketten gebouwd worden met de "
 "opdracht <command>apt-get source --compile</command> en hoe aan kruiselingse "
@@ -1912,8 +1913,8 @@ msgstr ""
 "gebouwd wordt met <command>apt-get source --compile</command>. Ze regelt ook "
 "hoe voldaan wordt aan de bouwvereisten. Standaard is geen enkel bouwprofiel "
 "actief. Er kan meer dan een bouwprofiel tegelijk geactiveerd worden door ze "
-"gescheiden door en komma samen te voegen. Configuratie-item: <literal>APT::"
-"Build-Profiles</literal>."
+"gescheiden door en komma samen te voegen. Configuratie-item: "
+"<literal>APT::Build-Profiles</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -1921,8 +1922,8 @@ msgid ""
 "Compile source packages after downloading them.  Configuration Item: "
 "<literal>APT::Get::Compile</literal>."
 msgstr ""
-"Bronpakketten na het downloaden compileren. Configuratie-item: <literal>APT::"
-"Get::Compile</literal>."
+"Bronpakketten na het downloaden compileren. Configuratie-item: "
+"<literal>APT::Get::Compile</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -1983,8 +1984,8 @@ msgstr ""
 "Geen nieuwe pakketten installeren; wanneer <literal>only-upgrade</literal> "
 "gebruikt wordt in combinatie met <literal>install</literal>, zal het enkel "
 "voor reeds geïnstalleerde pakketten opwaarderingen installeren en verzoeken "
-"om nieuwe pakketten te installeren negeren. Configuratie-item: <literal>APT::"
-"Get::Only-Upgrade</literal>."
+"om nieuwe pakketten te installeren negeren. Configuratie-item: "
+"<literal>APT::Get::Only-Upgrade</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -1997,8 +1998,8 @@ msgstr ""
 "Dit is een gevaarlijke optie die er voor zorgt dat apt zonder vragen "
 "voortgaat als het downgradings doorvoert. U zou dit niet moeten gebruiken "
 "behalve in zeer bijzondere situaties. Dit gebruiken kan mogelijkerwijs tot "
-"de vernietiging van uw systeem leiden! Configuratie-item: <literal>APT::Get::"
-"allow-downgrades</literal>. Geïntroduceerd in APT 1.1."
+"de vernietiging van uw systeem leiden! Configuratie-item: "
+"<literal>APT::Get::allow-downgrades</literal>. Geïntroduceerd in APT 1.1."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -2063,8 +2064,8 @@ msgid ""
 "name on the remote site! This also works with the <literal>source</literal> "
 "and <literal>update</literal> commands. When used with the <literal>update</"
 "literal> command the MD5 and size are not included, and it is up to the user "
-"to decompress any compressed files.  Configuration Item: <literal>APT::Get::"
-"Print-URIs</literal>."
+"to decompress any compressed files.  Configuration Item: "
+"<literal>APT::Get::Print-URIs</literal>."
 msgstr ""
 "In plaats van pakketten op te halen om ze te installeren wordt hun URI "
 "weergegeven. Elke URI bevat het pad en de naam van het doelbestand, zijn "
@@ -2087,8 +2088,8 @@ msgstr ""
 "Purge gebruiken in plaats van remove voor alles wat verwijderd zou worden. "
 "Er zal een sterretje (\"*\") staan naast de pakketten die ingepland staan om "
 "opgeruimd te worden. <option>remove --purge</option> is het equivalent van "
-"het commando <option>purge</option>. Configuratie-item: <literal>APT::Get::"
-"Purge</literal>."
+"het commando <option>purge</option>. Configuratie-item: "
+"<literal>APT::Get::Purge</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -2106,16 +2107,16 @@ msgid ""
 "turn it off. When it is on, <command>apt-get</command> will automatically "
 "manage the contents of <filename>&statedir;/lists</filename> to ensure that "
 "obsolete files are erased.  The only reason to turn it off is if you "
-"frequently change your sources list.  Configuration Item: <literal>APT::Get::"
-"List-Cleanup</literal>."
+"frequently change your sources list.  Configuration Item: "
+"<literal>APT::Get::List-Cleanup</literal>."
 msgstr ""
 "Deze optie is standaard aangezet; gebruik <literal>--no-list-cleanup</"
 "literal> om ze uit te zetten. Indien ze geactiveerd is, zal <command>apt-"
 "get</command> automatisch de inhoud van <filename>&statedir;/lists</"
 "filename> beheren om te garanderen dat in onbruik geraakte bestanden "
 "verwijderd worden. De enige reden waarom u dit zou uitzetten is wanneer u "
-"vaak het bestand sources.list wijzigt. Configuratie-item: <literal>APT::Get::"
-"List-Cleanup</literal>."
+"vaak het bestand sources.list wijzigt. Configuratie-item: "
+"<literal>APT::Get::List-Cleanup</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -2237,8 +2238,9 @@ msgid ""
 "literal>, and <literal>APT::Get::Tar-Only</literal>."
 msgstr ""
 "Enkel het diff-, dsc- of tar-bestand van een bronarchief downloaden. "
-"Configuratie-item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::"
-"Get::Dsc-Only</literal>, en <literal>APT::Get::Tar-Only</literal>."
+"Configuratie-item: <literal>APT::Get::Diff-Only</literal>, "
+"<literal>APT::Get::Dsc-Only</literal>, en <literal>APT::Get::Tar-Only</"
+"literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -2836,12 +2838,12 @@ msgstr ""
 #: apt-cache.8.xml
 msgid ""
 "The same as <literal>dotty</literal>, only for xvcg from the <ulink "
-"url=\"https://www.rw.cdl.uni-saarland.de/people/sander/private/html/gsvcg1."
-"html\">VCG tool</ulink>."
+"url=\"https://www.rw.cdl.uni-saarland.de/people/sander/private/html/"
+"gsvcg1.html\">VCG tool</ulink>."
 msgstr ""
 "Hetzelfde als <literal>dotty</literal>, maar dan voor xvcg uit het <ulink "
-"url=\"https://www.rw.cdl.uni-saarland.de/people/sander/private/html/gsvcg1."
-"html\">VCG gereedschap</ulink>."
+"url=\"https://www.rw.cdl.uni-saarland.de/people/sander/private/html/"
+"gsvcg1.html\">VCG gereedschap</ulink>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml
@@ -2870,8 +2872,8 @@ msgid ""
 "archive management tool, <literal>madison</literal>.  It displays available "
 "versions of a package in a tabular format.  Unlike the original "
 "<literal>madison</literal>, it can only display information for the "
-"architecture for which APT has retrieved package lists (<literal>APT::"
-"Architecture</literal>)."
+"architecture for which APT has retrieved package lists "
+"(<literal>APT::Architecture</literal>)."
 msgstr ""
 "Het commando <literal>madison</literal> van <literal>apt-cache</literal>  "
 "tracht het uitvoerformaat en een deel van de functionaliteit na te bootsen "
@@ -2885,8 +2887,8 @@ msgstr ""
 #: apt-cache.8.xml
 msgid ""
 "Select the file to store the package cache. The package cache is the primary "
-"cache used by all operations.  Configuration Item: <literal>Dir::Cache::"
-"pkgcache</literal>."
+"cache used by all operations.  Configuration Item: "
+"<literal>Dir::Cache::pkgcache</literal>."
 msgstr ""
 "Het bestand waarin de pakketcache opgeslagen wordt kiezen. De pakketcache is "
 "de primaire cache die door alle operaties aangesproken wordt. Configuratie-"
@@ -2940,9 +2942,9 @@ msgstr ""
 msgid ""
 "Per default the <command>depends</command> and <command>rdepends</command> "
 "print all dependencies. This can be tweaked with these flags which will omit "
-"the specified dependency type.  Configuration Item: <literal>APT::Cache::"
-"Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::"
-"Cache::ShowRecommends</literal>."
+"the specified dependency type.  Configuration Item: "
+"<literal>APT::Cache::Show<replaceable>DependencyType</replaceable></literal> "
+"e.g. <literal>APT::Cache::ShowRecommends</literal>."
 msgstr ""
 "Standaard geven de opdrachten <literal>depends</literal> en "
 "<literal>rdepends</literal> alle vereisten weer. Met deze opties kan dit "
@@ -3005,8 +3007,8 @@ msgid ""
 msgstr ""
 "Automatisch een nieuwe pakketcache genereren, eerder dan de bestaande "
 "pakketcache te gebruiken. Dit is de standaard. Om dit uit te schakelen moet "
-"u <option>--no-generate</option> gebruiken. Configuratie-item: <literal>APT::"
-"Cache::Generate</literal>."
+"u <option>--no-generate</option> gebruiken. Configuratie-item: "
+"<literal>APT::Cache::Generate</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml
@@ -3015,19 +3017,19 @@ msgid ""
 "descriptions.  Configuration Item: <literal>APT::Cache::NamesOnly</literal>."
 msgstr ""
 "Enkel zoeken in de pakketnamen en in de pakketnamen waarin voorzien wordt en "
-"niet in de uitgebreide beschrijvingen. Configuratie-item: <literal>APT::"
-"Cache::NamesOnly</literal>."
+"niet in de uitgebreide beschrijvingen. Configuratie-item: "
+"<literal>APT::Cache::NamesOnly</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml
 msgid ""
 "Make <literal>pkgnames</literal> print all names, including virtual packages "
-"and missing dependencies.  Configuration Item: <literal>APT::Cache::"
-"AllNames</literal>."
+"and missing dependencies.  Configuration Item: "
+"<literal>APT::Cache::AllNames</literal>."
 msgstr ""
 "<literal>pkgnames</literal> alle namen laten weergeven, inclusief virtuele "
-"pakketten en ontbrekende vereisten. Configuratie-item: <literal>APT::Cache::"
-"AllNames</literal>."
+"pakketten en ontbrekende vereisten. Configuratie-item: "
+"<literal>APT::Cache::AllNames</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml
@@ -3119,8 +3121,8 @@ msgid ""
 "<command>apt-mark</command> can be used as a unified front-end to set "
 "various settings for a package, such as marking a package as being "
 "automatically/manually installed or changing <command>dpkg</command> "
-"selections such as hold, install, deinstall and purge which are respected e."
-"g. by <command>apt-get dselect-upgrade</command> or <command>aptitude</"
+"selections such as hold, install, deinstall and purge which are respected "
+"e.g. by <command>apt-get dselect-upgrade</command> or <command>aptitude</"
 "command>."
 msgstr ""
 "<command>apt-mark</command> kan gebruikt worden als een geïntegreerd "
@@ -3366,10 +3368,11 @@ msgstr "Configuratie op gebruikersniveau"
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""
-"Keys should usually be included inside their corresponding <literal>."
-"sources</literal> by embedding the ASCII-armored key in the <literal>Signed-"
-"By</literal> option.  To do so, replace the empty line with a dot, and then "
-"indent all lines by two spaces.  See &sources-list; for more information."
+"Keys should usually be included inside their corresponding "
+"<literal>.sources</literal> by embedding the ASCII-armored key in the "
+"<literal>Signed-By</literal> option.  To do so, replace the empty line with "
+"a dot, and then indent all lines by two spaces.  See &sources-list; for more "
+"information."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -3382,8 +3385,9 @@ msgid ""
 "literal> file or using <literal>deb [signed-by=/etc/apt/keyrings/example-"
 "archive-keyring.asc] ...</literal> in the legacy <literal>.list</literal> "
 "format. This may be useful for APT versions prior to 2.4, which do not "
-"support embedded keys. ASCII-armored keys must use an extension of <literal>."
-"asc</literal>, and unarmored keys an extension of <literal>.gpg</literal>."
+"support embedded keys. ASCII-armored keys must use an extension of "
+"<literal>.asc</literal>, and unarmored keys an extension of <literal>.gpg</"
+"literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -3477,10 +3481,11 @@ msgstr ""
 "geval van een <command>update</command>-operatie bij alle APT-clients een "
 "foutmelding opleveren, ongeacht het feit of een optie het gebruik van "
 "onveilige pakketbronnen toestaat of verbiedt. Een dergelijke fout kan "
-"voorkomen worden door bijkomend de optie <option>Acquire::"
-"AllowDowngradeToInsecureRepositories</option> op <literal>true</literal> in "
-"te stellen of voor individuele pakketbronnen door de optie <literal>allow-"
-"downgrade-to-insecure=yes</literal> te gebruiken in &sources-list;."
+"voorkomen worden door bijkomend de optie "
+"<option>Acquire::AllowDowngradeToInsecureRepositories</option> op "
+"<literal>true</literal> in te stellen of voor individuele pakketbronnen door "
+"de optie <literal>allow-downgrade-to-insecure=yes</literal> te gebruiken in "
+"&sources-list;."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-secure.8.xml
@@ -3691,8 +3696,8 @@ msgstr ""
 #: apt-secure.8.xml
 msgid ""
 "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg --"
-"clearsign -o InRelease Release</command> and <command>gpg -abs -o Release."
-"gpg Release</command>."
+"clearsign -o InRelease Release</command> and <command>gpg -abs -o "
+"Release.gpg Release</command>."
 msgstr ""
 "<emphasis>Onderteken het</emphasis>. U doet dit door het uitvoeren van de "
 "commando's <command>gpg --clearsign -o InRelease Release</command> en "
@@ -3768,8 +3773,8 @@ msgid ""
 "Distribution HOWTO</ulink> by V. Alex Brennen."
 msgstr ""
 "Voor bijkomende achtergrondinformatie kunt u het hoofdstuk raadplegen over "
-"de beveiligingsinfrastructuur van Debian, <ulink url=\"https://www.debian."
-"org/doc/manuals/securing-debian-manual/ch07\">Debian Security "
+"de beveiligingsinfrastructuur van Debian, <ulink url=\"https://"
+"www.debian.org/doc/manuals/securing-debian-manual/ch07\">Debian Security "
 "Infrastructure</ulink>, uit de Securing Debian Manual (ook te vinden in het "
 "pakket harden-doc), alsook de <ulink url=\"http://www.cryptnet.net/fdp/"
 "crypto/strong_distro.html\" >Strong Distribution HOWTO</ulink> door V. Alex "
@@ -3859,8 +3864,8 @@ msgstr ""
 #: apt-cdrom.8.xml
 msgid ""
 "Do not try to auto-detect the CD-ROM path. Usually combined with the "
-"<option>--cdrom</option> option.  Configuration Item: <literal>Acquire::"
-"cdrom::AutoDetect</literal>."
+"<option>--cdrom</option> option.  Configuration Item: "
+"<literal>Acquire::cdrom::AutoDetect</literal>."
 msgstr ""
 "Niet automatisch het CD-pad trachten te achterhalen. Meestal wordt dit "
 "gecombineerd met de optie <option>--cdrom</option>. Configuratie-item: "
@@ -3875,8 +3880,8 @@ msgid ""
 msgstr ""
 "Aankoppelpunt; de locatie waar de CD aangekoppeld moet worden opgeven. Dit "
 "aankoppelpunt moet in <filename>/etc/fstab</filename> vermeld worden en "
-"correct geconfigureerd zijn. Configuratie-item: <literal>Acquire::cdrom::"
-"mount</literal>."
+"correct geconfigureerd zijn. Configuratie-item: "
+"<literal>Acquire::cdrom::mount</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml
@@ -3894,12 +3899,12 @@ msgstr ""
 #: apt-cdrom.8.xml
 msgid ""
 "No mounting; prevent <command>apt-cdrom</command> from mounting and "
-"unmounting the mount point.  Configuration Item: <literal>APT::CDROM::"
-"NoMount</literal>."
+"unmounting the mount point.  Configuration Item: "
+"<literal>APT::CDROM::NoMount</literal>."
 msgstr ""
 "Niet aankoppelen; <command>apt-cdrom</command> verhinderen om het "
-"aankoppelpunt aan en af te koppelen. Configuratie-item: <literal>APT::CDROM::"
-"NoMount</literal>."
+"aankoppelpunt aan en af te koppelen. Configuratie-item: "
+"<literal>APT::CDROM::NoMount</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml
@@ -4001,11 +4006,11 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-config.8.xml
 msgid ""
-"This will set the shell environment variable $OPTS to the value of MyApp::"
-"options with a default of <option>-f</option>."
+"This will set the shell environment variable $OPTS to the value of "
+"MyApp::options with a default of <option>-f</option>."
 msgstr ""
-"Dit zal aan de shell-omgevingsvariabele $OPTS de waarde toekennen van MyApp::"
-"options met een standaard van <option>-f</option>."
+"Dit zal aan de shell-omgevingsvariabele $OPTS de waarde toekennen van "
+"MyApp::options met een standaard van <option>-f</option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-config.8.xml
@@ -4131,9 +4136,9 @@ msgid ""
 "order which have either no or \"<literal>conf</literal>\" as filename "
 "extension and which only contain alphanumeric, hyphen (-), underscore (_) "
 "and period (.) characters.  Otherwise APT will print a notice that it has "
-"ignored a file, unless that file matches a pattern in the <literal>Dir::"
-"Ignore-Files-Silently</literal> configuration list - in which case it will "
-"be silently ignored."
+"ignored a file, unless that file matches a pattern in the "
+"<literal>Dir::Ignore-Files-Silently</literal> configuration list - in which "
+"case it will be silently ignored."
 msgstr ""
 "alle bestanden uit <literal>Dir::Etc::Parts</literal> in oplopende "
 "alfabetische volgorde die ofwel geen extensie of \"<literal>conf</literal>\" "
@@ -4272,8 +4277,8 @@ msgid ""
 "example you could use <literal>dpkg::pre-install-pkgs</literal>."
 msgstr ""
 "In de namen van configuratie-items speelt het gebruik van hoofd- of kleine "
-"letters geen rol. In het voorgaande voorbeeld zou u dus ook <literal>dpkg::"
-"pre-install-pkgs</literal> kunnen gebruiken."
+"letters geen rol. In het voorgaande voorbeeld zou u dus ook "
+"<literal>dpkg::pre-install-pkgs</literal> kunnen gebruiken."
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml
@@ -4444,18 +4449,21 @@ msgstr ""
 msgid ""
 "The subscope <option>action</option> defines the colors for package lists in "
 "<option>install</option> and similar commands. The following options may be "
-"set: <option>APT::Color::Action::Upgrade</option>, <option>APT::Color::"
-"Action::Install</option>, <option>APT::Color::Action::Install-Dependencies</"
-"option>, <option>APT::Color::Action::Downgrade</option>, <option>APT::Color::"
-"Action::Remove</option>; corresponding to their lists in the &apt; output."
+"set: <option>APT::Color::Action::Upgrade</option>, "
+"<option>APT::Color::Action::Install</option>, "
+"<option>APT::Color::Action::Install-Dependencies</option>, "
+"<option>APT::Color::Action::Downgrade</option>, "
+"<option>APT::Color::Action::Remove</option>; corresponding to their lists in "
+"the &apt; output."
 msgstr ""
 "De subscoop <option>action</option> definieert de kleuren voor pakketlijsten "
 "in <option>install</option> en gelijkaardige commando's. De volgende opties "
 "kunnen ingesteld worden: <option>APT::Color::Action::Upgrade</option>, "
-"<option>APT::Color::Action::Install</option>, <option>APT::Color::Action::"
-"Install-Dependencies</option>, <option>APT::Color::Action::Downgrade</"
-"option>, <option>APT::Color::Action::Remove</option>; die overeenkomen met "
-"hun lijsten in de uitvoer van &apt;."
+"<option>APT::Color::Action::Install</option>, "
+"<option>APT::Color::Action::Install-Dependencies</option>, "
+"<option>APT::Color::Action::Downgrade</option>, "
+"<option>APT::Color::Action::Remove</option>; die overeenkomen met hun "
+"lijsten in de uitvoer van &apt;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
@@ -4796,8 +4804,8 @@ msgstr ""
 #: apt.conf.5.xml
 msgid ""
 "Define the regular expression(s) for versioned kernel packages.  Based on "
-"these expressions a rule set is injected into apt similar to APT::"
-"NeverAutoRemove regular expressions."
+"these expressions a rule set is injected into apt similar to "
+"APT::NeverAutoRemove regular expressions."
 msgstr ""
 "De reguliere expressie(s) definiëren voor kernelpakketten met versiebeheer. "
 "Op basis van deze expressies wordt een regelset in apt geïnjecteerd, "
@@ -5271,9 +5279,9 @@ msgid ""
 "that these codes are not included twice in the list. If "
 "<literal>LC_MESSAGES</literal> is set to \"C\" only the "
 "<filename>Translation-en</filename> file (if available) will be used.  To "
-"force APT to use no Translation file use the setting <literal>Acquire::"
-"Languages=none</literal>. \"<literal>none</literal>\" is another special "
-"meaning code which will stop the search for a suitable "
+"force APT to use no Translation file use the setting "
+"<literal>Acquire::Languages=none</literal>. \"<literal>none</literal>\" is "
+"another special meaning code which will stop the search for a suitable "
 "<filename>Translation</filename> file.  This tells APT to download these "
 "translations too, without actually using them unless the environment "
 "specifies the languages. So the following example configuration will result "
@@ -5289,17 +5297,18 @@ msgstr ""
 "deze niet tweemaal voorkomen in de lijst. Als <literal>LC_MESSAGES</literal> "
 "op \"C\" ingesteld staat, wordt enkel het bestand <filename>Translation-en</"
 "filename> (als het beschikbaar is) gebruikt.Om APT te dwingen geen "
-"Translation-bestand te gebruiken, moet u de instelling <literal>Acquire::"
-"Languages=none</literal> gebruiken. Ook de code \"<literal>none</literal>\" "
-"is er een met een speciale betekenis. Ze zorgt ervoor dat niet verder "
-"gezocht wordt naar een passend <filename>Translation</filename>-bestand. Ze "
-"vertelt APT ook om die vertalingen wel te downloaden zonder ze effectief te "
-"gebruiken tenzij er in de omgeving talen gespecificeerd worden. Het volgende "
-"voorbeeld zal dus in de context van een Engelse lokalisatie resulteren in de "
-"volgorde \"en, de\" en in een Duitse lokalisatie in \"de, en\". Merk op dat "
-"\"fr\" wel gedownload wordt, maar niet gebruikt tenzij APT in de context van "
-"een Franse lokalisatie gebruikt wordt (in dat geval zou de volgorde \"fr, "
-"de, en\" zijn). <placeholder type=\"programlisting\" id=\"0\"/>"
+"Translation-bestand te gebruiken, moet u de instelling "
+"<literal>Acquire::Languages=none</literal> gebruiken. Ook de code "
+"\"<literal>none</literal>\" is er een met een speciale betekenis. Ze zorgt "
+"ervoor dat niet verder gezocht wordt naar een passend <filename>Translation</"
+"filename>-bestand. Ze vertelt APT ook om die vertalingen wel te downloaden "
+"zonder ze effectief te gebruiken tenzij er in de omgeving talen "
+"gespecificeerd worden. Het volgende voorbeeld zal dus in de context van een "
+"Engelse lokalisatie resulteren in de volgorde \"en, de\" en in een Duitse "
+"lokalisatie in \"de, en\". Merk op dat \"fr\" wel gedownload wordt, maar "
+"niet gebruikt tenzij APT in de context van een Franse lokalisatie gebruikt "
+"wordt (in dat geval zou de volgorde \"fr, de, en\" zijn). <placeholder "
+"type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
@@ -5409,21 +5418,22 @@ msgid ""
 "<replaceable>ORIGIN</replaceable></literal> option exists and if so this "
 "value is taken. The value in the Release file can be overridden with "
 "<literal>Acquire::Changelogs::URI::Override::Label::<replaceable>LABEL</"
-"replaceable></literal> or <literal>Acquire::Changelogs::URI::Override::"
-"Origin::<replaceable>ORIGIN</replaceable></literal>.  The value should be a "
-"normal URI to a text file, except that package specific data is replaced "
-"with the placeholder <literal>@CHANGEPATH@</literal>. The value for it is: "
-"1. if the package is from a component (e.g. <literal>main</literal>)  this "
-"is the first part otherwise it is omitted, 2. the first letter of source "
-"package name, except if the source package name starts with '<literal>lib</"
-"literal>' in which case it will be the first four letters. 3. The complete "
-"source package name. 4. the complete name again and 5. the source version.  "
-"The first (if present), second, third and fourth part are separated by a "
-"slash ('<literal>/</literal>')  and between the fourth and fifth part is an "
-"underscore ('<literal>_</literal>').  The special value '<literal>no</"
-"literal>' is available for this option indicating that this source can't be "
-"used to acquire changelog files from. Another source will be tried if "
-"available in this case."
+"replaceable></literal> or "
+"<literal>Acquire::Changelogs::URI::Override::Origin::<replaceable>ORIGIN</"
+"replaceable></literal>.  The value should be a normal URI to a text file, "
+"except that package specific data is replaced with the placeholder "
+"<literal>@CHANGEPATH@</literal>. The value for it is: 1. if the package is "
+"from a component (e.g. <literal>main</literal>)  this is the first part "
+"otherwise it is omitted, 2. the first letter of source package name, except "
+"if the source package name starts with '<literal>lib</literal>' in which "
+"case it will be the first four letters. 3. The complete source package name. "
+"4. the complete name again and 5. the source version.  The first (if "
+"present), second, third and fourth part are separated by a slash ('<literal>/"
+"</literal>')  and between the fourth and fifth part is an underscore "
+"('<literal>_</literal>').  The special value '<literal>no</literal>' is "
+"available for this option indicating that this source can't be used to "
+"acquire changelog files from. Another source will be tried if available in "
+"this case."
 msgstr ""
 "Het ophalen van changelogs (bestanden met de registratie van aangebrachte "
 "wijzigingen) kan enkel gebeuren als er een URI gekend is waar ze opgehaald "
@@ -5435,23 +5445,24 @@ msgstr ""
 "replaceable></literal> bestaat en als dat het geval is, wordt die waarde "
 "gebruikt. De waarde in het Release-bestand kan vervangen worden door "
 "<literal>Acquire::Changelogs::URI::Override::Label::<replaceable>LABEL</"
-"replaceable></literal> of <literal>Acquire::Changelogs::URI::Override::"
-"Origin::<replaceable>ORIGINE</replaceable></literal>. De waarde ervan zou "
-"een normale URI naar een tekstbestand moeten zijn, behalve dat de "
-"pakketspecifieke gegevens vervangen worden door de plaatshouder "
-"<literal>@CHANGEPATH@</literal>. De waarde daarvan is: 1. als het pakket uit "
-"een onderdeel afkomstig is (bijv. <literal>main</literal>), vormt dit het "
-"eerste deel, anders wordt het weggelaten, 2. de eerste letter van de "
-"pakketnaam van het bronpakket, behalve als de naam van het bronpakket begint "
-"met '<literal>lib</literal>'. In dat laatste geval zullen het de eerste vier "
-"letters zijn. 3. De volledige naam van het bronpakket. 4. nogmaals de "
-"volledige naam en 5. de versie van de broncode. Het eerste (in voorkomend "
-"geval), tweede, derde en vierde deel worden gescheiden door een slash "
-"('<literal>/</literal>') en tussen het het vierde en het vijfde deel staat "
-"een laag liggend streepje ('<literal>_</literal>'). De speciale waarde "
-"'<literal>no</literal>' kan gebruikt worden voor deze optie om aan te geven "
-"dat deze bron niet gebruikt kan worden om er changelog-bestanden op te "
-"halen. In dat geval zal een andere bron geprobeerd worden als die er is."
+"replaceable></literal> of "
+"<literal>Acquire::Changelogs::URI::Override::Origin::<replaceable>ORIGINE</"
+"replaceable></literal>. De waarde ervan zou een normale URI naar een "
+"tekstbestand moeten zijn, behalve dat de pakketspecifieke gegevens vervangen "
+"worden door de plaatshouder <literal>@CHANGEPATH@</literal>. De waarde "
+"daarvan is: 1. als het pakket uit een onderdeel afkomstig is (bijv. "
+"<literal>main</literal>), vormt dit het eerste deel, anders wordt het "
+"weggelaten, 2. de eerste letter van de pakketnaam van het bronpakket, "
+"behalve als de naam van het bronpakket begint met '<literal>lib</literal>'. "
+"In dat laatste geval zullen het de eerste vier letters zijn. 3. De volledige "
+"naam van het bronpakket. 4. nogmaals de volledige naam en 5. de versie van "
+"de broncode. Het eerste (in voorkomend geval), tweede, derde en vierde deel "
+"worden gescheiden door een slash ('<literal>/</literal>') en tussen het het "
+"vierde en het vijfde deel staat een laag liggend streepje ('<literal>_</"
+"literal>'). De speciale waarde '<literal>no</literal>' kan gebruikt worden "
+"voor deze optie om aan te geven dat deze bron niet gebruikt kan worden om er "
+"changelog-bestanden op te halen. In dat geval zal een andere bron geprobeerd "
+"worden als die er is."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
@@ -5460,17 +5471,19 @@ msgid ""
 "where to get them.  Preferable the Release file indicates this in a "
 "'Snapshots' field. If this isn't available the Label/Origin field of the "
 "Release file is used to check if a <literal>Acquire::Snapshots::URI::Label::"
-"<replaceable>LABEL</replaceable></literal> or <literal>Acquire::Snapshots::"
-"URI::Origin::<replaceable>ORIGIN</replaceable></literal> option exists and "
-"if so this value is taken. The value in the Release file can be overridden "
-"with <literal>Acquire::Snapshots::URI::Override::Label::<replaceable>LABEL</"
-"replaceable></literal> or <literal>Acquire::Snapshots::URI::Override::"
-"Origin::<replaceable>ORIGIN</replaceable></literal>.  The value should be a "
-"normal URI to a directory, except that the snapshot ID replaced with the "
-"placeholder <literal>@SNAPSHOTID@</literal>.  The special value "
-"'<literal>no</literal>' is available for this option indicating that this "
-"source cannot be used to acquire snapshots from. Another source will be "
-"tried if available in this case."
+"<replaceable>LABEL</replaceable></literal> or "
+"<literal>Acquire::Snapshots::URI::Origin::<replaceable>ORIGIN</replaceable></"
+"literal> option exists and if so this value is taken. The value in the "
+"Release file can be overridden with "
+"<literal>Acquire::Snapshots::URI::Override::Label::<replaceable>LABEL</"
+"replaceable></literal> or "
+"<literal>Acquire::Snapshots::URI::Override::Origin::<replaceable>ORIGIN</"
+"replaceable></literal>.  The value should be a normal URI to a directory, "
+"except that the snapshot ID replaced with the placeholder "
+"<literal>@SNAPSHOTID@</literal>.  The special value '<literal>no</literal>' "
+"is available for this option indicating that this source cannot be used to "
+"acquire snapshots from. Another source will be tried if available in this "
+"case."
 msgstr ""
 "Zoals changelogs (bestanden met de registratie van aangebrachte wijzigingen) "
 "kunnen momentopnames enkel verkregen worden als er een URI gekend is waar ze "
@@ -5482,14 +5495,14 @@ msgstr ""
 "replaceable></literal> bestaat en als dat het geval is, wordt die waarde "
 "gebruikt. De waarde in het Release-bestand kan vervangen worden door "
 "<literal>Acquire::Snapshots::URI::Override::Label::<replaceable>LABEL</"
-"replaceable></literal> of <literal>Acquire::Snapshots::URI::Override::"
-"Origin::<replaceable>ORIGINE</replaceable></literal>. De waarde ervan zou "
-"een normale URI naar een map moeten zijn, behalve dat het momentopname-ID "
-"vervangen wordt door de plaatshouder <literal>@SNAPSHOTID@</literal>. De "
-"speciale waarde '<literal>no</literal>' kan gebruikt worden voor deze optie "
-"om aan te geven dat deze bron niet gebruikt kan worden om er momentopnames "
-"van op te halen. In dat geval zal een andere bron geprobeerd worden als die "
-"er is."
+"replaceable></literal> of "
+"<literal>Acquire::Snapshots::URI::Override::Origin::<replaceable>ORIGINE</"
+"replaceable></literal>. De waarde ervan zou een normale URI naar een map "
+"moeten zijn, behalve dat het momentopname-ID vervangen wordt door de "
+"plaatshouder <literal>@SNAPSHOTID@</literal>. De speciale waarde "
+"'<literal>no</literal>' kan gebruikt worden voor deze optie om aan te geven "
+"dat deze bron niet gebruikt kan worden om er momentopnames van op te halen. "
+"In dat geval zal een andere bron geprobeerd worden als die er is."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.conf.5.xml
@@ -5501,9 +5514,9 @@ msgstr "Programmaspecifieke configuratie"
 msgid ""
 "Especially with the introduction of the <command>apt</command> binary it can "
 "be useful to set certain options only for a specific binary as even options "
-"which look like they would effect only a certain binary like <option>APT::"
-"Get::Show-Versions</option> effect <command>apt-get</command> as well as "
-"<command>apt</command>."
+"which look like they would effect only a certain binary like "
+"<option>APT::Get::Show-Versions</option> effect <command>apt-get</command> "
+"as well as <command>apt</command>."
 msgstr ""
 "In het bijzonder omwille van de introductie van het binaire programma "
 "<command>apt</command>, kan het zinvol zijn om bepaalde opties enkel voor "
@@ -5525,8 +5538,8 @@ msgstr ""
 "worden door die optie in te stellen binnen het bereik <option>Binary::"
 "<replaceable>specifiek-programma</replaceable></option>. De optie "
 "<option>APT::Get::Show-Versions</option> enkel voor <command>apt</command> "
-"instellen, kan bijvoorbeeld gebeuren door in plaats daarvan <option>Binary::"
-"apt::APT::Get::Show-Versions</option> in te stellen."
+"instellen, kan bijvoorbeeld gebeuren door in plaats daarvan "
+"<option>Binary::apt::APT::Get::Show-Versions</option> in te stellen."
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml
@@ -5618,12 +5631,12 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml
 msgid ""
-"Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
-"Bin::Methods</literal> specifies the location of the method handlers and "
-"<literal>gzip</literal>, <literal>bzip2</literal>, <literal>lzma</literal>, "
-"<literal>dpkg</literal>, <literal>apt-get</literal> <literal>dpkg-source</"
-"literal> <literal>dpkg-buildpackage</literal> and <literal>apt-cache</"
-"literal> specify the location of the respective programs."
+"Binary programs are pointed to by <literal>Dir::Bin</literal>. "
+"<literal>Dir::Bin::Methods</literal> specifies the location of the method "
+"handlers and <literal>gzip</literal>, <literal>bzip2</literal>, "
+"<literal>lzma</literal>, <literal>dpkg</literal>, <literal>apt-get</literal> "
+"<literal>dpkg-source</literal> <literal>dpkg-buildpackage</literal> and "
+"<literal>apt-cache</literal> specify the location of the respective programs."
 msgstr ""
 "Naar binaire programma's wordt verwezen door <literal>Dir::Bin</literal>. "
 "<literal>Dir::Bin::Methods</literal> geeft de locatie op van de "
@@ -5833,18 +5846,18 @@ msgid ""
 "literal>.  Special characters (equal signs, newlines, nonprintable "
 "characters, quotation marks, and percent signs in <literal>key</literal> and "
 "newlines, nonprintable characters, and percent signs in <literal>value</"
-"literal>) are %-encoded. Lists are represented by multiple <literal>key::"
-"=value</literal> lines with the same key. The configuration section ends "
-"with a blank line."
+"literal>) are %-encoded. Lists are represented by multiple "
+"<literal>key::=value</literal> lines with the same key. The configuration "
+"section ends with a blank line."
 msgstr ""
 "Elke regel met een configuratierichtlijn heeft de vorm <literal>key=value</"
 "literal> (sleutel=waarde). Bijzondere tekens (gelijkheidstekens, "
 "regeleinden, niet-afdrukbare tekens, aanhalingstekens en percenttekens in "
 "<literal>key</literal> en regeleinden, niet-afdrukbare tekens en "
 "percenttekens in <literal>value</literal>) worden met % gecodeerd. Lijsten "
-"worden voorgesteld door meerdere <literal>key::=value</literal> (sleutel::"
-"=waarde) regels met eenzelfde sleutel. De configuratiesectie eindigt met een "
-"lege regel."
+"worden voorgesteld door meerdere <literal>key::=value</literal> "
+"(sleutel::=waarde) regels met eenzelfde sleutel. De configuratiesectie "
+"eindigt met een lege regel."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
@@ -5975,9 +5988,9 @@ msgid ""
 msgstr ""
 "De optiegroepen <literal>APT::Periodic</literal> en <literal>APT::Archives</"
 "literal> configureren het gedrag van de periodieke bijwerkingen die door apt "
-"uitgevoerd worden en die door het script <literal>/usr/lib/apt/apt.systemd."
-"daily</literal> uitgelokt worden. Raadpleeg het begin van dit script voor "
-"een beknopte documentatie over deze opties."
+"uitgevoerd worden en die door het script <literal>/usr/lib/apt/"
+"apt.systemd.daily</literal> uitgelokt worden. Raadpleeg het begin van dit "
+"script voor een beknopte documentatie over deze opties."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.conf.5.xml
@@ -6182,16 +6195,16 @@ msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
 "install pass performed in, e.g., <literal>apt-get install</literal>, and not "
-"to the full <literal>apt</literal> dependency resolver; see <literal>Debug::"
-"pkgProblemResolver</literal> for that."
+"to the full <literal>apt</literal> dependency resolver; see "
+"<literal>Debug::pkgProblemResolver</literal> for that."
 msgstr ""
 "Debug-berichten genereren waarin beschreven wordt welke pakketten "
 "automatisch geïnstalleerd worden om aan vereisten te voldoen. Dit komt "
 "overeen met de initiële doorloop van het type auto-install die bijvoorbeeld "
 "door <literal>apt-get install</literal> uitgevoerd wordt. Het komt niet "
 "overeen met het volledige systeem van apt voor het oplossen van "
-"vereistenproblemen. Raadpleeg in dat verband <literal>Debug::"
-"pkgProblemResolver</literal>."
+"vereistenproblemen. Raadpleeg in dat verband "
+"<literal>Debug::pkgProblemResolver</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
@@ -6201,14 +6214,14 @@ msgid ""
 "may trigger additional actions; they are shown indented two additional "
 "spaces under the original entry.  The format for each line is "
 "<literal>MarkKeep</literal>, <literal>MarkDelete</literal> or "
-"<literal>MarkInstall</literal> followed by <literal>package-name &lt;a.b.c -"
-"&gt; d.e.f | x.y.z&gt; (section)</literal> where <literal>a.b.c</literal> is "
-"the current version of the package, <literal>d.e.f</literal> is the version "
-"considered for installation and <literal>x.y.z</literal> is a newer version, "
-"but not considered for installation (because of a low pin score). The later "
-"two can be omitted if there is none or if it is the same as the installed "
-"version.  <literal>section</literal> is the name of the section the package "
-"appears in."
+"<literal>MarkInstall</literal> followed by <literal>package-name &lt;a.b.c "
+"-&gt; d.e.f | x.y.z&gt; (section)</literal> where <literal>a.b.c</literal> "
+"is the current version of the package, <literal>d.e.f</literal> is the "
+"version considered for installation and <literal>x.y.z</literal> is a newer "
+"version, but not considered for installation (because of a low pin score). "
+"The later two can be omitted if there is none or if it is the same as the "
+"installed version.  <literal>section</literal> is the name of the section "
+"the package appears in."
 msgstr ""
 "Debug-berichten genereren waarin beschreven wordt welke pakketten een "
 "markering krijgen van het type keep/install/remove (vasthouden/installeren/"
@@ -6287,23 +6300,23 @@ msgid ""
 msgstr ""
 "Een lijst weergeven van alle geïnstalleerde pakketten met hun berekende "
 "scores zoals die door de pkgProblemResolver gebruikt worden. De "
-"pakketbeschrijving is identiek aan wat in <literal>Debug::pkgDepCache::"
-"Marker</literal> beschreven werd"
+"pakketbeschrijving is identiek aan wat in "
+"<literal>Debug::pkgDepCache::Marker</literal> beschreven werd"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
 msgid ""
-"Print information about the vendors read from <filename>/etc/apt/vendors."
-"list</filename>."
+"Print information about the vendors read from <filename>/etc/apt/"
+"vendors.list</filename>."
 msgstr ""
-"Informatie weergeven over de leveranciers die in <filename>/etc/apt/vendors."
-"list</filename> vermeld worden."
+"Informatie weergeven over de leveranciers die in <filename>/etc/apt/"
+"vendors.list</filename> vermeld worden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
 msgid ""
-"Display the external commands that are called by apt hooks.  This includes e."
-"g. the config options <literal>DPkg::{Pre,Post}-Invoke</literal> or "
+"Display the external commands that are called by apt hooks.  This includes "
+"e.g. the config options <literal>DPkg::{Pre,Post}-Invoke</literal> or "
 "<literal>APT::Update::{Pre,Post}-Invoke</literal>."
 msgstr ""
 "De externe commando's tonen die aangeroepen worden door apt-uitbreidingen. "
@@ -6725,10 +6738,10 @@ msgid ""
 msgstr ""
 "Als u meerdere systemen heeft waarvan u wilt dat deze dezelfde set updates "
 "ontvangen, kunt u <code>APT::Machine-ID</code> instellen op een UUID zodat "
-"ze allemaal dezelfde fasering toepassen, of u kunt de instelling <code>APT::"
-"Get::Never-include-Phased-Updates</code> gebruiken of <code>APT::Get::Always-"
-"include-Phased-Updates</code> instellen op true zodat APT nooit/altijd "
-"gefaseerde updates zal overwegen."
+"ze allemaal dezelfde fasering toepassen, of u kunt de instelling "
+"<code>APT::Get::Never-include-Phased-Updates</code> gebruiken of "
+"<code>APT::Get::Always-include-Phased-Updates</code> instellen op true zodat "
+"APT nooit/altijd gefaseerde updates zal overwegen."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 #: apt_preferences.5.xml
@@ -6846,8 +6859,8 @@ msgstr ""
 "Een aanmaning tot voorzichtigheid: het gebruikte trefwoord hier is "
 "\"<literal>origin</literal>\" dat gebruikt kan worden om een computernaam te "
 "vergelijken. De volgende structuur kent een hoge prioriteit toe aan alle "
-"versies die te verkrijgen zijn op de server die met de computernaam \"ftp.de."
-"debian.org\" geïdentificeerd wordt."
+"versies die te verkrijgen zijn op de server die met de computernaam "
+"\"ftp.de.debian.org\" geïdentificeerd wordt."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 #: apt_preferences.5.xml
@@ -7125,9 +7138,9 @@ msgstr ""
 #: apt_preferences.5.xml
 msgid ""
 "The <literal>:any</literal> suffix makes sure to select binary packages from "
-"any architecture. Without that suffix, apt implicitly assumes the <literal>:"
-"native</literal> suffix which would only select packages from the native "
-"architecture."
+"any architecture. Without that suffix, apt implicitly assumes the "
+"<literal>:native</literal> suffix which would only select packages from the "
+"native architecture."
 msgstr ""
 "Het achtervoegsel <literal>:any</literal> zorgt ervoor dat binaire pakketten "
 "uit elke architectuur worden geselecteerd. Zonder dat achtervoegsel neemt "
@@ -7304,9 +7317,9 @@ msgstr "Dan is dit het gevolg:"
 msgid ""
 "The most recent available version of the <literal>perl</literal> package "
 "will be installed, so long as that version's version number begins with "
-"\"<literal>&good-perl;</literal>\".  If <emphasis>any</emphasis> &good-perl;"
-"* version of <literal>perl</literal> is available and the installed version "
-"is &bad-perl;*, then <literal>perl</literal> will be downgraded."
+"\"<literal>&good-perl;</literal>\".  If <emphasis>any</emphasis> &good-"
+"perl;* version of <literal>perl</literal> is available and the installed "
+"version is &bad-perl;*, then <literal>perl</literal> will be downgraded."
 msgstr ""
 "De meest recente beschikbare versie van het pakket <literal>perl</literal> "
 "zal geïnstalleerd worden, zolang het versienummer van die versie begint met "
@@ -7590,25 +7603,25 @@ msgid ""
 "files retrieved from locations listed in the &sources-list; file are stored "
 "in the directory <filename>/var/lib/apt/lists</filename>, or in the file "
 "named by the variable <literal>Dir::State::Lists</literal> in the "
-"<filename>apt.conf</filename> file.  For example, the file <filename>debian."
-"lcs.mit.edu_debian_dists_unstable_contrib_binary-i386_Release</filename> "
-"contains the <filename>Release</filename> file retrieved from the site "
-"<literal>debian.lcs.mit.edu</literal> for <literal>binary-i386</literal> "
-"architecture files from the <literal>contrib</literal> component of the "
-"<literal>unstable</literal> distribution."
+"<filename>apt.conf</filename> file.  For example, the file "
+"<filename>debian.lcs.mit.edu_debian_dists_unstable_contrib_binary-"
+"i386_Release</filename> contains the <filename>Release</filename> file "
+"retrieved from the site <literal>debian.lcs.mit.edu</literal> for "
+"<literal>binary-i386</literal> architecture files from the <literal>contrib</"
+"literal> component of the <literal>unstable</literal> distribution."
 msgstr ""
 "Alle <filename>Packages</filename>- en <filename>Release</filename>-"
 "bestanden die opgehaald worden van locaties die in het bestand &sources-"
 "list; vermeld staan, worden opgeslagen in de map <filename>/var/lib/apt/"
 "lists</filename> of in het bestand dat in het bestand <filename>apt.conf</"
 "filename> door de variabele <literal>Dir::State::Lists</literal> genoemd "
-"wordt. Het bestand <filename>debian.lcs.mit."
-"edu_debian_dists_unstable_contrib_binary-i386_Release</filename> bevat "
-"bijvoorbeeld het <filename>Release</filename>-bestand dat opgehaald werd van "
-"de site <literal>debian.lcs.mit.edu</literal> en dat betrekking heeft op "
-"bestanden voor de architectuur <literal>binary-i386</literal> uit de "
-"component <literal>contrib</literal> van de distributie <literal>unstable</"
-"literal>."
+"wordt. Het bestand "
+"<filename>debian.lcs.mit.edu_debian_dists_unstable_contrib_binary-"
+"i386_Release</filename> bevat bijvoorbeeld het <filename>Release</filename>-"
+"bestand dat opgehaald werd van de site <literal>debian.lcs.mit.edu</literal> "
+"en dat betrekking heeft op bestanden voor de architectuur <literal>binary-"
+"i386</literal> uit de component <literal>contrib</literal> van de "
+"distributie <literal>unstable</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 #: apt_preferences.5.xml
@@ -7860,8 +7873,8 @@ msgstr ""
 "Het volgende preferences-bestand van APT doet APT een hogere prioriteit dan "
 "standaard (500) toekennen aan alle pakketversies die tot een distributie met "
 "de opgegeven codenaam behoren en een buitensporig lage prioriteit aan "
-"pakketversies die tot andere <literal>Debian</literal>-distributies, -"
-"codenamen en -archieven behoren. Merk op dat met deze APT-voorkeur APT de "
+"pakketversies die tot andere <literal>Debian</literal>-distributies, "
+"-codenamen en -archieven behoren. Merk op dat met deze APT-voorkeur APT de "
 "overgang van een release zal volgen vanuit het archief <literal>testing</"
 "literal> naar <literal>stable</literal> en later <literal>oldstable</"
 "literal>. Indien u bijvoorbeeld de voortgang in <literal>testing</literal> "
@@ -7966,12 +7979,12 @@ msgstr ""
 "De map <filename>/etc/apt/sources.list.d</filename> biedt de mogelijkheid om "
 "items voor sources.list in afzonderlijke bestanden toe te voegen. Zoals "
 "beschreven wordt in de volgende twee secties, zijn twee verschillende "
-"bestandsindelingen toegelaten. Bestandsnamen moeten eindigen op <filename>."
-"list</filename> of <filename>.sources</filename>, afhankelijk van welke "
-"indeling ze bevatten. De bestandsnamen mogen enkel letters (a-z en A-Z), "
-"cijfers (0-9), lage streepjes (_), koppeltekens (-) en punten (.) bevatten. "
-"Is dit niet het geval, dan zal APT melden dat het een bestand overgeslagen "
-"heeft, tenzij dat bestand beantwoordt aan een patroon uit de "
+"bestandsindelingen toegelaten. Bestandsnamen moeten eindigen op "
+"<filename>.list</filename> of <filename>.sources</filename>, afhankelijk van "
+"welke indeling ze bevatten. De bestandsnamen mogen enkel letters (a-z en A-"
+"Z), cijfers (0-9), lage streepjes (_), koppeltekens (-) en punten (.) "
+"bevatten. Is dit niet het geval, dan zal APT melden dat het een bestand "
+"overgeslagen heeft, tenzij dat bestand beantwoordt aan een patroon uit de "
 "configuratielijst <literal>Dir::Ignore-Files-Silently</literal> - in dat "
 "geval zal het stilzwijgend overgeslagen worden."
 
@@ -8044,6 +8057,12 @@ msgstr ""
 "zullen verwachten, aangezien die ongebruikelijk waren voor de invoering van "
 "multi-architectuurondersteuning."
 
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml
+msgid ""
+"This format is deprecated and may eventually be removed, but not before 2029."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><title>
 #: sources.list.5.xml
 msgid "deb822-Style Format"
@@ -8236,10 +8255,11 @@ msgstr ""
 "<literal>suite</literal> kan ook een variabele, <literal>$(ARCH)</literal>, "
 "bevatten, die omgezet wordt naar de Debian architectuur (zoals "
 "<literal>amd64</literal> of <literal>armel</literal>) die op het systeem in "
-"gebruik is. Dit laat toe om archtectuuronafhankelijke <filename>sources."
-"list</filename>-bestanden te gebruiken. Over het algemeen is dit enkel van "
-"belang wanneer een exact pad opgegeven wordt. Anders zal <literal>APT</"
-"literal> automatisch een URI genereren met de huidige architectuur."
+"gebruik is. Dit laat toe om archtectuuronafhankelijke "
+"<filename>sources.list</filename>-bestanden te gebruiken. Over het algemeen "
+"is dit enkel van belang wanneer een exact pad opgegeven wordt. Anders zal "
+"<literal>APT</literal> automatisch een URI genereren met de huidige "
+"architectuur."
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
@@ -8295,10 +8315,17 @@ msgstr "&sourceslist-sources-format;"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "As an example, the sources for your distribution could look like this in "
+#| "one-line-style format: <placeholder type=\"literallayout\" id=\"0\"/> or "
+#| "like this in deb822 style format: <placeholder type=\"literallayout\" "
+#| "id=\"1\"/>"
 msgid ""
-"As an example, the sources for your distribution could look like this in one-"
-"line-style format: <placeholder type=\"literallayout\" id=\"0\"/> or like "
-"this in deb822 style format: <placeholder type=\"literallayout\" id=\"1\"/>"
+"As an example, the sources for your distribution could look like this in the "
+"deprecated one-line-style format: <placeholder type=\"literallayout\" "
+"id=\"0\"/> or like 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 "
@@ -8346,8 +8373,8 @@ msgstr ""
 "<option>Architectures</option> (<option>arch</option>) is een multi-waarde "
 "optie waarmee opgegeven wordt voor welke architecturen er informatie "
 "opgehaald moet worden. Indien deze optie niet ingesteld werd, geldt als "
-"standaard alle architecturen die in de configuratieoptie <literal>APT::"
-"Architectures</literal> gedefinieerd zijn."
+"standaard alle architecturen die in de configuratieoptie "
+"<literal>APT::Architectures</literal> gedefinieerd zijn."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #: sources.list.5.xml
@@ -8369,19 +8396,20 @@ msgstr ""
 msgid ""
 "<option>Targets</option> (<option>target</option>) is a multivalue option "
 "defining which download targets apt will try to acquire from this source. If "
-"not specified, the default set is defined by the <option>Acquire::"
-"IndexTargets</option> configuration scope (targets are specified by their "
-"name in the <literal>Created-By</literal> field).  Additionally, targets can "
-"be enabled or disabled by using the <literal>Identifier</literal> field as "
-"an option with a boolean value instead of using this multivalue option."
+"not specified, the default set is defined by the "
+"<option>Acquire::IndexTargets</option> configuration scope (targets are "
+"specified by their name in the <literal>Created-By</literal> field).  "
+"Additionally, targets can be enabled or disabled by using the "
+"<literal>Identifier</literal> field as an option with a boolean value "
+"instead of using this multivalue option."
 msgstr ""
 "<option>Targets</option> (<option>target</option>) is een multi-waarde optie "
 "waarmee opgegeven wordt welke downloadtargets apt uit deze pakketbron zal "
 "trachten op te halen. Indien deze optie niet gespecificeerd werd, wordt de "
-"standaardset gedefinieerd door het configuratiebereik <option>Acquire::"
-"IndexTargets</option> (targets worden aan de hand van hun naam gepreciseerd "
-"in het veld <literal>Created-By</literal>). Daarenboven kunnen specifieke "
-"targets geactiveerd of gedeactiveerd worden door het veld "
+"standaardset gedefinieerd door het configuratiebereik "
+"<option>Acquire::IndexTargets</option> (targets worden aan de hand van hun "
+"naam gepreciseerd in het veld <literal>Created-By</literal>). Daarenboven "
+"kunnen specifieke targets geactiveerd of gedeactiveerd worden door het veld "
 "<literal>Identifier</literal> als een optie met een booleaanse waarde te "
 "gebruiken in plaats van op deze multi-waarde optie beroep te doen."
 
@@ -8631,8 +8659,9 @@ msgid ""
 "helps users identify mirrors which are no longer updated. However, some "
 "repositories such as historic archives are not updated any more by design, "
 "so this check can be disabled by setting this option to <literal>no</"
-"literal>.  Defaults to the value of configuration option <option>Acquire::"
-"Check-Valid-Until</option> which itself defaults to <literal>yes</literal>."
+"literal>.  Defaults to the value of configuration option "
+"<option>Acquire::Check-Valid-Until</option> which itself defaults to "
+"<literal>yes</literal>."
 msgstr ""
 "<option>Check-Valid-Until</option> (<option>check-valid-until</option>) is "
 "een yes/no (ja/nee) waarde die regelt of APT moet proberen om replay-"
@@ -8803,10 +8832,10 @@ msgstr ""
 "gegeven worden aan het gebruik van &apt-authconf;. De methode biedt ook "
 "ondersteuning voor SOCKS5- en HTTP(S)-proxy's, ofwel geconfigureerd via een "
 "apt-specifieke configuratie, of gespecificeerd met de omgevingsvariabele "
-"<envar>http_proxy</envar> volgens de indeling <replaceable>http://gebruiker:"
-"wachtwoord@server:poort/</replaceable> (er vanuit gaand dat het om een HTTP-"
-"proxy gaat die authenticatie vereist). De authenticatie-informatie voor "
-"proxy's kan ook verstrekt worden via &apt-authconf;."
+"<envar>http_proxy</envar> volgens de indeling <replaceable>http://"
+"gebruiker:wachtwoord@server:poort/</replaceable> (er vanuit gaand dat het om "
+"een HTTP-proxy gaat die authenticatie vereist). De authenticatie-informatie "
+"voor proxy's kan ook verstrekt worden via &apt-authconf;."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
@@ -9303,8 +9332,8 @@ msgstr ""
 #: apt-extracttemplates.1.xml
 msgid ""
 "Temporary directory in which to write extracted <command>debconf</command> "
-"template files and config scripts.  Configuration Item: <literal>APT::"
-"ExtractTemplates::TempDir</literal>"
+"template files and config scripts.  Configuration Item: "
+"<literal>APT::ExtractTemplates::TempDir</literal>"
 msgstr ""
 "Tijdelijke map om er geëxtraheerde sjabloonbestanden en configuratiescripts "
 "voor <command>debconf</command> in op te slaan. Configuratie-item: "
@@ -9348,8 +9377,8 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-sortpkgs.1.xml
 msgid ""
-"Use source index field ordering.  Configuration Item: <literal>APT::"
-"SortPkgs::Source</literal>."
+"Use source index field ordering.  Configuration Item: "
+"<literal>APT::SortPkgs::Source</literal>."
 msgstr ""
 "Veldordening gebruiken bij een broncode-index. Configuratie-item: "
 "<literal>APT::SortPkgs::Source</literal>."
@@ -9444,9 +9473,9 @@ msgid ""
 msgstr ""
 "Het commando <literal>sources</literal> maakt vertrekkend vanuit een "
 "mappenboom een indexbestand over broncodebestanden aan. Het begint bij de "
-"opgegeven map en doorzoekt de onderliggende mappen op de aanwezigheid van ."
-"dsc-bestanden en schrijft voor elk ervan een broncodebestandsfiche weg naar "
-"de standaarduitvoer. Dit commando is bij benadering analoog aan &dpkg-"
+"opgegeven map en doorzoekt de onderliggende mappen op de aanwezigheid "
+"van .dsc-bestanden en schrijft voor elk ervan een broncodebestandsfiche weg "
+"naar de standaarduitvoer. Dit commando is bij benadering analoog aan &dpkg-"
 "scansources;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -9490,10 +9519,10 @@ msgid ""
 "<filename>icons</filename> files as well as <filename>Release</filename>, "
 "<filename>Index</filename> and <filename>md5sum.txt</filename> files by "
 "default (<literal>APT::FTPArchive::Release::Default-Patterns</literal>).  "
-"Additional filename patterns can be added by listing them in <literal>APT::"
-"FTPArchive::Release::Patterns</literal>.  It then writes to stdout a "
-"<filename>Release</filename> file containing (by default) an MD5, SHA1, "
-"SHA256 and SHA512 digest for each file."
+"Additional filename patterns can be added by listing them in "
+"<literal>APT::FTPArchive::Release::Patterns</literal>.  It then writes to "
+"stdout a <filename>Release</filename> file containing (by default) an MD5, "
+"SHA1, SHA256 and SHA512 digest for each file."
 msgstr ""
 "Het commando <literal>release</literal> maakt voor een mappenboom een "
 "Release-bestand aan. Het begint bij de opgegeven map en zoekt daar en in de "
@@ -9524,15 +9553,16 @@ msgid ""
 "<literal>Description</literal>."
 msgstr ""
 "De waarden voor de bijkomende velden met metagegevens in het Release-bestand "
-"worden ontleend aan de overeenkomstige variabelen uit <literal>APT::"
-"FTPArchive::Release</literal>, bijvoorbeeld <literal>APT::FTPArchive::"
-"Release::Origin</literal>. De ondersteunde velden zijn: <literal>Origin</"
-"literal>, <literal>Label</literal>, <literal>Suite</literal>, "
-"<literal>Version</literal>, <literal>Codename</literal>, <literal>Date</"
-"literal>, <literal>NotAutomatic</literal>, <literal>ButAutomaticUpgrades</"
-"literal>, <literal>Acquire-By-Hash</literal>, <literal>Valid-Until</"
-"literal>, <literal>Signed-By</literal>, <literal>Architectures</literal>, "
-"<literal>Components</literal> en <literal>Description</literal>."
+"worden ontleend aan de overeenkomstige variabelen uit "
+"<literal>APT::FTPArchive::Release</literal>, bijvoorbeeld "
+"<literal>APT::FTPArchive::Release::Origin</literal>. De ondersteunde velden "
+"zijn: <literal>Origin</literal>, <literal>Label</literal>, <literal>Suite</"
+"literal>, <literal>Version</literal>, <literal>Codename</literal>, "
+"<literal>Date</literal>, <literal>NotAutomatic</literal>, "
+"<literal>ButAutomaticUpgrades</literal>, <literal>Acquire-By-Hash</literal>, "
+"<literal>Valid-Until</literal>, <literal>Signed-By</literal>, "
+"<literal>Architectures</literal>, <literal>Components</literal> en "
+"<literal>Description</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml
@@ -9754,8 +9784,8 @@ msgstr "De sectie <literal>TreeDefault</literal>"
 #: apt-ftparchive.1.xml
 msgid ""
 "Sets defaults specific to <literal>Tree</literal> sections. All of these "
-"variables are substitution variables and have the strings $(DIST), "
-"$(SECTION) and $(ARCH) replaced with their respective values."
+"variables are substitution variables and have the strings $(DIST), $"
+"(SECTION) and $(ARCH) replaced with their respective values."
 msgstr ""
 "Stelt standaarden in die specifiek zijn voor de secties <literal>Tree</"
 "literal>. Al deze variabelen zijn substitutievariabelen waarbij de "
@@ -9796,8 +9826,8 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml
 msgid ""
-"Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
-"$(SECTION)/binary-$(ARCH)/</filename>"
+"Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/$"
+"(SECTION)/binary-$(ARCH)/</filename>"
 msgstr ""
 "Stelt de basis van de .deb-mappenboom in. Standaard is dat <filename>$(DIST)/"
 "$(SECTION)/binary-$(ARCH)/</filename>"
@@ -9805,8 +9835,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>"
@@ -9833,8 +9863,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 "
@@ -10202,15 +10232,15 @@ msgid ""
 msgstr ""
 "De vermelde controlesom genereren. Standaard staan deze opties aan. Indien "
 "ze uitgezet worden, dan zal het aangemaakte indexbestand zo mogelijk geen "
-"velden voor de controlesom bevatten. Configuratie-items: <literal>APT::"
-"FTPArchive::<replaceable>Checksum</replaceable></literal> en <literal>APT::"
-"FTPArchive::<replaceable>Index</replaceable>::<replaceable>Checksum</"
-"replaceable></literal> waarbij <literal><replaceable>Index</replaceable></"
-"literal> kan bestaan uit <literal>Packages</literal>, <literal>Sources</"
-"literal> of <literal>Release</literal> en <literal><replaceable>Checksum</"
-"replaceable></literal> kan bestaan uit <literal>MD5</literal>, "
-"<literal>SHA1</literal>, <literal>SHA256</literal> of <literal>SHA512</"
-"literal>."
+"velden voor de controlesom bevatten. Configuratie-items: "
+"<literal>APT::FTPArchive::<replaceable>Checksum</replaceable></literal> en "
+"<literal>APT::FTPArchive::<replaceable>Index</replaceable>::"
+"<replaceable>Checksum</replaceable></literal> waarbij "
+"<literal><replaceable>Index</replaceable></literal> kan bestaan uit "
+"<literal>Packages</literal>, <literal>Sources</literal> of <literal>Release</"
+"literal> en <literal><replaceable>Checksum</replaceable></literal> kan "
+"bestaan uit <literal>MD5</literal>, <literal>SHA1</literal>, "
+"<literal>SHA256</literal> of <literal>SHA512</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml
@@ -10247,8 +10277,8 @@ msgstr ""
 "Ontkoppelingen uitvoeren. Indien de instelling <literal>External-Links</"
 "literal> gebruikt wordt, dan maakt deze optie het eigenlijk mogelijk om de "
 "bestanden te ontkoppelen. Standaard staat dit aangezet en het kan uitgezet "
-"worden met <option>--no-delink</option>.  Configuratie-item: <literal>APT::"
-"FTPArchive::DeLinkAct</literal>."
+"worden met <option>--no-delink</option>.  Configuratie-item: "
+"<literal>APT::FTPArchive::DeLinkAct</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml
@@ -10274,14 +10304,14 @@ msgid ""
 "literal>."
 msgstr ""
 "Het override-bestand voor broncode selecteren om met het commando "
-"<literal>sources</literal> te gebruiken. Configuratie-item: <literal>APT::"
-"FTPArchive::SourceOverride</literal>."
+"<literal>sources</literal> te gebruiken. Configuratie-item: "
+"<literal>APT::FTPArchive::SourceOverride</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml
 msgid ""
-"Make the caching databases read only.  Configuration Item: <literal>APT::"
-"FTPArchive::ReadOnlyDB</literal>."
+"Make the caching databases read only.  Configuration Item: "
+"<literal>APT::FTPArchive::ReadOnlyDB</literal>."
 msgstr ""
 "De bufferende databases alleen lezen maken. Configuration Item: "
 "<literal>APT::FTPArchive::ReadOnlyDB</literal>."
@@ -10295,10 +10325,10 @@ msgid ""
 "path.  Configuration Item: <literal>APT::FTPArchive::Architecture</literal>."
 msgstr ""
 "Voor de commando's <literal>packages</literal> en <literal>contents</"
-"literal> enkel pakketbestanden toelaten die overeenkomen met <literal>*_arch."
-"deb</literal> of <literal>*_all.deb</literal> in plaats van alle "
-"pakketbestanden in het opgegeven pad. Configuratie-item: <literal>APT::"
-"FTPArchive::Architecture</literal>."
+"literal> enkel pakketbestanden toelaten die overeenkomen met "
+"<literal>*_arch.deb</literal> of <literal>*_all.deb</literal> in plaats van "
+"alle pakketbestanden in het opgegeven pad. Configuratie-item: "
+"<literal>APT::FTPArchive::Architecture</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml
@@ -10396,10 +10426,10 @@ msgid ""
 "files inside <filename>/etc/apt/auth.conf.d</filename> can be used to store "
 "login information in a netrc-like format with restrictive file permissions."
 msgstr ""
-"Het bestand auth.conf van APT, <filename>/etc/apt/auth.conf</filename>, en ."
-"conf-bestanden in de map <filename>/etc/apt/auth.conf.d</filename> kunnen "
-"gebruikt worden om er login-informatie in op te slaan in een netrc-achtige "
-"indeling met restrictieve bestandspermissies."
+"Het bestand auth.conf van APT, <filename>/etc/apt/auth.conf</filename>, "
+"en .conf-bestanden in de map <filename>/etc/apt/auth.conf.d</filename> "
+"kunnen gebruikt worden om er login-informatie in op te slaan in een netrc-"
+"achtige indeling met restrictieve bestandspermissies."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt_auth.conf.5.xml
@@ -10573,8 +10603,8 @@ msgstr ""
 "<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=\"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 "
@@ -10719,16 +10749,17 @@ msgid ""
 "The environment variable <envar>http_proxy</envar> is supported for system "
 "wide configuration.  Proxies specific to APT can be configured via the "
 "option <literal>Acquire::http::Proxy</literal>.  Proxies which should be "
-"used only for certain hosts can be specified via <literal>Acquire::http::"
-"Proxy::<replaceable>host</replaceable></literal>. Even more fine-grained "
-"control can be achieved via proxy autodetection, detailed further below.  "
-"All these options use the URI format <literal><replaceable>scheme</"
-"replaceable>://[[<replaceable>user</replaceable>][:<replaceable>pass</"
-"replaceable>]@]<replaceable>host</replaceable>[:<replaceable>port</"
-"replaceable>]/</literal>.  Supported URI schemes are <literal>socks5h</"
-"literal> (SOCKS5 with remote DNS resolution), <literal>http</literal> and "
-"<literal>https</literal>.  Authentication details can be supplied via &apt-"
-"authconf; instead of including it in the URI directly."
+"used only for certain hosts can be specified via "
+"<literal>Acquire::http::Proxy::<replaceable>host</replaceable></literal>. "
+"Even more fine-grained control can be achieved via proxy autodetection, "
+"detailed further below.  All these options use the URI format "
+"<literal><replaceable>scheme</replaceable>://[[<replaceable>user</"
+"replaceable>][:<replaceable>pass</replaceable>]@]<replaceable>host</"
+"replaceable>[:<replaceable>port</replaceable>]/</literal>.  Supported URI "
+"schemes are <literal>socks5h</literal> (SOCKS5 with remote DNS resolution), "
+"<literal>http</literal> and <literal>https</literal>.  Authentication "
+"details can be supplied via &apt-authconf; instead of including it in the "
+"URI directly."
 msgstr ""
 "De omgevingsvariabele <envar>http_proxy</envar> wordt gebruikt voor de "
 "configuratie die op het hele systeem van toepassing is. Proxy's die "
@@ -10762,14 +10793,14 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt-transport-http.1.xml
 msgid ""
-"Furthermore, there are three settings provided for cache control with "
-"HTTP/1.1 compliant proxy caches: <literal>Acquire::http::No-Cache</literal> "
-"tells the proxy not to use its cached response under any circumstances.  "
+"Furthermore, there are three settings provided for cache control with HTTP/"
+"1.1 compliant proxy caches: <literal>Acquire::http::No-Cache</literal> tells "
+"the proxy not to use its cached response under any circumstances.  "
 "<literal>Acquire::http::Max-Age</literal> sets the allowed maximum age (in "
-"seconds) of an index file in the cache of the proxy.  <literal>Acquire::"
-"http::No-Store</literal> specifies that the proxy should not store the "
-"requested archive files in its cache, which can be used to prevent the proxy "
-"from polluting its cache with (big) .deb files."
+"seconds) of an index file in the cache of the proxy.  "
+"<literal>Acquire::http::No-Store</literal> specifies that the proxy should "
+"not store the requested archive files in its cache, which can be used to "
+"prevent the proxy from polluting its cache with (big) .deb files."
 msgstr ""
 "Daarenboven worden drie instellingen voorzien om HTTP/1.1-compatibele proxy-"
 "caches te beheren: <literal>Acquire::http::No-Cache</literal> zegt de proxy "
@@ -10830,11 +10861,11 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt-transport-http.1.xml
 msgid ""
-"This option takes precedence over the legacy option name <literal>Acquire::"
-"http::ProxyAutoDetect</literal>."
+"This option takes precedence over the legacy option name "
+"<literal>Acquire::http::ProxyAutoDetect</literal>."
 msgstr ""
-"Deze optie heeft voorrang op de verouderde optienaam <literal>Acquire::http::"
-"ProxyAutoDetect</literal>."
+"Deze optie heeft voorrang op de verouderde optienaam "
+"<literal>Acquire::http::ProxyAutoDetect</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 #: apt-transport-http.1.xml
@@ -10873,12 +10904,12 @@ msgstr ""
 #: apt-transport-http.1.xml
 msgid ""
 "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
-"enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
-"g. on high-latency connections. It specifies how many requests are sent in a "
-"pipeline.  APT tries to detect and work around misbehaving webservers and "
-"proxies at runtime, but if you know that yours does not conform to the "
-"HTTP/1.1 specification, pipelining can be disabled by setting the value to "
-"0. It is enabled by default with the value 10."
+"enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial "
+"e.g. on high-latency connections. It specifies how many requests are sent in "
+"a pipeline.  APT tries to detect and work around misbehaving webservers and "
+"proxies at runtime, but if you know that yours does not conform to the HTTP/"
+"1.1 specification, pipelining can be disabled by setting the value to 0. It "
+"is enabled by default with the value 10."
 msgstr ""
 "De instelling <literal>Acquire::http::Pipeline-Depth</literal> kan gebruikt "
 "worden om de pijplijnmethode van HTTP (RFC 2616 sectie 8.1.2.2) toe te "
@@ -11012,9 +11043,9 @@ msgstr ""
 msgid ""
 "The HTTPS protocol is based on the HTTP protocol, so all options supported "
 "by &apt-transport-http; are also available via <literal>Acquire::https</"
-"literal> and will default to the same values specified for <literal>Acquire::"
-"http</literal>. This manpage will only document the options <emphasis>unique "
-"to https</emphasis>."
+"literal> and will default to the same values specified for "
+"<literal>Acquire::http</literal>. This manpage will only document the "
+"options <emphasis>unique to https</emphasis>."
 msgstr ""
 "Het HTTPS-protocol is gebaseerd op het HTTP-protocol, en dus zijn alle "
 "opties die ondersteund worden door &apt-transport-http; ook beschikbaar via "
@@ -11061,15 +11092,17 @@ msgstr ""
 #: apt-transport-https.1.xml
 msgid ""
 "A custom certificate revocation list (CRL) can be configured with the "
-"options <literal>Acquire::https::CRLFile</literal> and <literal>Acquire::"
-"https::CRLFile::<replaceable>host</replaceable></literal>.  As with the "
-"previous option, a file in PEM format needs to be specified."
+"options <literal>Acquire::https::CRLFile</literal> and "
+"<literal>Acquire::https::CRLFile::<replaceable>host</replaceable></"
+"literal>.  As with the previous option, a file in PEM format needs to be "
+"specified."
 msgstr ""
 "Er kan een aangepaste lijst van herroepen certificaten (certificate "
-"revocation list - CRL) geconfigureerd worden met de opties <literal>Acquire::"
-"https::CRLFile</literal> en <literal>Acquire::https::CRLFile::"
-"<replaceable>computer</replaceable></literal>. Zoals bij de vorige optie "
-"moet een bestand opgegeven worden in PEM-indeling."
+"revocation list - CRL) geconfigureerd worden met de opties "
+"<literal>Acquire::https::CRLFile</literal> en "
+"<literal>Acquire::https::CRLFile::<replaceable>computer</replaceable></"
+"literal>. Zoals bij de vorige optie moet een bestand opgegeven worden in PEM-"
+"indeling."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 #: apt-transport-https.1.xml
@@ -11137,11 +11170,11 @@ msgstr "Cliëntauthenticatie"
 msgid ""
 "Besides supporting password-based authentication (see &apt-authconf;) HTTPS "
 "also supports authentication based on client certificates via "
-"<literal>Acquire::https::SSLCert</literal> and <literal>Acquire::https::"
-"SSLKey</literal>. These should be set respectively to the filename of the "
-"X.509 client certificate and the associated (unencrypted) private key, both "
-"in PEM format.  In practice the use of the host-specific variants of both "
-"options is highly recommended."
+"<literal>Acquire::https::SSLCert</literal> and "
+"<literal>Acquire::https::SSLKey</literal>. These should be set respectively "
+"to the filename of the X.509 client certificate and the associated "
+"(unencrypted) private key, both in PEM format.  In practice the use of the "
+"host-specific variants of both options is highly recommended."
 msgstr ""
 "Behalve de geboden ondersteuning voor authenticatie via een wachtwoord (zie "
 "&apt-authconf;), ondersteunt HTTPS ook authenticatie op basis van "
@@ -11453,9 +11486,9 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt-transport-mirror.1.xml
 msgid ""
-"Assuming a file with this content is stored as <filename>/etc/apt/mirrorlist."
-"txt</filename> on your machine it can be used like this in &sources-list; "
-"(since apt 1.6):"
+"Assuming a file with this content is stored as <filename>/etc/apt/"
+"mirrorlist.txt</filename> on your machine it can be used like this in "
+"&sources-list; (since apt 1.6):"
 msgstr ""
 "In de veronderstelling dat een bestand met deze inhoud op uw computer "
 "opgeslagen werd als <filename>/etc/apt/mirrorlist.txt</filename>, kan het op "
@@ -12408,10 +12441,10 @@ msgstr "?narrow accepteert een oneindig aantal argumenten"
 #: apt-patterns.7.xml
 msgid ""
 "<code>foo</code> cannot be used as a shortform for <code>?name(foo)</code>, "
-"as this can cause typos to go unnoticed: Consider <code>?and(...,"
-"~poptional)</code>: this requires the package to have <code>required</code> "
-"priority, but if you do not type the <code>~</code>, it would require the "
-"package name to contain <code>poptional</code>."
+"as this can cause typos to go unnoticed: Consider <code>?"
+"and(...,~poptional)</code>: this requires the package to have "
+"<code>required</code> priority, but if you do not type the <code>~</code>, "
+"it would require the package name to contain <code>poptional</code>."
 msgstr ""
 "<code>foo</code> kan niet gebruikt worden als een verkorte vorm van <code>?"
 "name(foo)</code>, omdat dit ertoe kan leiden dat typefouten onopgemerkt "
@@ -13867,8 +13900,8 @@ msgid ""
 "emphasis>."
 msgstr ""
 "U krijgt meer details als u de man-pagina apt.conf raadpleegt en het "
-"voorbeeldconfiguratiebestand in <emphasis>/usr/share/doc/apt/examples/apt."
-"conf</emphasis>."
+"voorbeeldconfiguratiebestand in <emphasis>/usr/share/doc/apt/examples/"
+"apt.conf</emphasis>."
 
 #. type: Content of: <book><chapter><section><para>
 #: offline.dbk
@@ -14092,19 +14125,19 @@ msgstr ""
 
 #~ msgid ""
 #~ "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP "
-#~ "URIs.  It is in the standard form of <literal>ftp://[[user][:pass]@]host[:"
-#~ "port]/</literal>.  Per host proxies can also be specified by using the "
-#~ "form <literal>ftp::Proxy::&lt;host&gt;</literal> with the special keyword "
-#~ "<literal>DIRECT</literal> meaning to use no proxies. If no one of the "
-#~ "above settings is specified, <envar>ftp_proxy</envar> environment "
-#~ "variable will be used. To use an FTP proxy you will have to set the "
-#~ "<literal>ftp::ProxyLogin</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>."
+#~ "URIs.  It is in the standard form of <literal>ftp://[[user]"
+#~ "[:pass]@]host[:port]/</literal>.  Per host proxies can also be specified "
+#~ "by using the form <literal>ftp::Proxy::&lt;host&gt;</literal> with the "
+#~ "special keyword <literal>DIRECT</literal> meaning to use no proxies. If "
+#~ "no one of the above settings is specified, <envar>ftp_proxy</envar> "
+#~ "environment variable will be used. To use an FTP proxy you will have to "
+#~ "set the <literal>ftp::ProxyLogin</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>."
 #~ 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://"
@@ -14119,10 +14152,10 @@ msgstr ""
 #~ "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>."
 
 #~ msgid ""
 #~ "The option <literal>timeout</literal> sets the timeout timer used by the "
@@ -14331,9 +14364,9 @@ msgstr ""
 #~ "or \"<literal>asc</literal>\" as file extension."
 #~ msgstr ""
 #~ "<emphasis>Opmerking</emphasis>: In plaats van dit commando te gebruiken "
-#~ "zou u een sleutelbos rechtstreeks in de map <filename>/etc/apt/trusted."
-#~ "gpg.d/</filename> moeten plaatsen met een descriptieve naam en ofwel "
-#~ "\"<literal>gpg</literal>\" of \"<literal>asc</literal>\" als "
+#~ "zou u een sleutelbos rechtstreeks in de map <filename>/etc/apt/"
+#~ "trusted.gpg.d/</filename> moeten plaatsen met een descriptieve naam en "
+#~ "ofwel \"<literal>gpg</literal>\" of \"<literal>asc</literal>\" als "
 #~ "bestandsextensie."
 
 #~ msgid "(mostly deprecated)"
@@ -14421,9 +14454,9 @@ msgstr ""
 #~ "With this option it is possible to specify a particular keyring file the "
 #~ "command should operate on. The default is that a command is executed on "
 #~ "the <filename>trusted.gpg</filename> file as well as on all parts in the "
-#~ "<filename>trusted.gpg.d</filename> directory, though <filename>trusted."
-#~ "gpg</filename> is the primary keyring which means that e.g. new keys are "
-#~ "added to this one."
+#~ "<filename>trusted.gpg.d</filename> directory, though "
+#~ "<filename>trusted.gpg</filename> is the primary keyring which means that "
+#~ "e.g. new keys are added to this one."
 #~ msgstr ""
 #~ "Met deze optie kunt u een specifiek sleutelbosbestand opgeven waarmee het "
 #~ "commando moet werken. Standaard wordt een commando uitgevoerd op het "
@@ -14452,11 +14485,11 @@ msgstr ""
 #~ "gelijkaardigs is aan dit:"
 
 #~ msgid ""
-#~ "<literal>wget -qO- https://myrepo.example/myrepo.asc | sudo apt-key add -"
-#~ "</literal>"
+#~ "<literal>wget -qO- https://myrepo.example/myrepo.asc | sudo apt-key add "
+#~ "-</literal>"
 #~ msgstr ""
-#~ "<literal>wget -qO- https://myrepo.example/myrepo.asc | sudo apt-key add -"
-#~ "</literal>"
+#~ "<literal>wget -qO- https://myrepo.example/myrepo.asc | sudo apt-key add "
+#~ "-</literal>"
 
 #~ msgid ""
 #~ "Then you can directly replace this with (though note the recommendation "
diff --git a/doc/po/pl.po b/doc/po/pl.po
index 8feba425f..a86a1feae 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: 2025-01-01 21:58+0100\n"
+"POT-Creation-Date: 2025-01-28 18:52+0000\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"
@@ -593,11 +593,12 @@ msgstr ""
 #. type: Plain text
 #: apt.ent
 msgid ""
-"<!-- TRANSLATOR: used as in -o=config_string e.g. -o=Debug::"
-"pkgProblemResolver=1 --> <!ENTITY synopsis-config-string \"config_string\">"
+"<!-- TRANSLATOR: used as in -o=config_string e.g. "
+"-o=Debug::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 "
+"<!-- TRANSLATOR: used as in -o=config_string e.g. "
+"-o=Debug::pkgProblemResolver=1 --> <!ENTITY synopsis-config-string "
 "\"opcja_konfiguracji\">"
 
 #. type: Plain text
@@ -612,12 +613,12 @@ msgstr ""
 #. type: Plain text
 #: apt.ent
 msgid ""
-"<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release e.g. -"
-"t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
+"<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release e.g. "
+"-t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
 "\"target_release\">"
 msgstr ""
-"<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release e.g. -"
-"t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
+"<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release e.g. "
+"-t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
 "\"wydanie_docelowe\">"
 
 #. type: Plain text
@@ -668,11 +669,11 @@ msgstr ""
 #. type: Plain text
 #: apt.ent
 msgid ""
-"<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom -"
-"d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"cdrom_mount_point\">"
+"<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom "
+"-d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"cdrom_mount_point\">"
 msgstr ""
-"<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom -"
-"d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"pkt_montowania_cdromu\">"
+"<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom "
+"-d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"pkt_montowania_cdromu\">"
 
 #. type: Plain text
 #: apt.ent
@@ -1351,10 +1352,10 @@ msgstr ""
 "pakiety ze źródłami. APT na podstawie listy dostępnych pakietów decyduje, "
 "który pakiet źródłowy ściągnąć. Następnie szuka najnowszej dostępnej wersji "
 "pakietu źródłowego i pobiera ją do bieżącego katalogu. Jeśli jest to "
-"możliwe, to APT bierze pod uwagę domyślne wydanie, ustawione w <literal>APT::"
-"Default-Release</literal> w pliku konfiguracyjnym albo określone w opcji "
-"<option>-t</option>, albo podane przy użyciu składni <literal>pakiet/"
-"wydanie</literal>."
+"możliwe, to APT bierze pod uwagę domyślne wydanie, ustawione w "
+"<literal>APT::Default-Release</literal> w pliku konfiguracyjnym albo "
+"określone w opcji <option>-t</option>, albo podane przy użyciu składni "
+"<literal>pakiet/wydanie</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -1600,12 +1601,12 @@ msgstr ""
 "<literal>changelog</literal> pobiera dziennik zmian pakietu i wyświetla go, "
 "używając polecenia  <command>sensible-pager</command>. Nazwa serwera i "
 "katalog bazowy jest definiowany w zmiennej <literal>APT::Changelogs::Server</"
-"literal> (np. <ulink url=\"http://packages.debian.org/changelogs\">packages."
-"debian.org/changelogs</ulink> dla Debiana lub <ulink url=\"http://changelogs."
-"ubuntu.com/changelogs\">changelogs.ubuntu.com/changelogs</ulink> dla "
-"Ubuntu). Domyślnie wyświetlany jest dziennik zmian wersji, która już jest "
-"zainstalowana. Jednakże można to zmienić, używając takich samych opcji, jak "
-"te dla polecenia <option>install</option>."
+"literal> (np. <ulink url=\"http://packages.debian.org/"
+"changelogs\">packages.debian.org/changelogs</ulink> dla Debiana lub <ulink "
+"url=\"http://changelogs.ubuntu.com/changelogs\">changelogs.ubuntu.com/"
+"changelogs</ulink> dla Ubuntu). Domyślnie wyświetlany jest dziennik zmian "
+"wersji, która już jest zainstalowana. Jednakże można to zmienić, używając "
+"takich samych opcji, jak te dla polecenia <option>install</option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -1653,8 +1654,8 @@ msgid ""
 "Configuration Item: <literal>APT::Get::Download-Only</literal>."
 msgstr ""
 "Tylko pobieranie; pliki z pakietami są tylko ściągane, ale nie rozpakowywane "
-"czy instalowane.  Pozycja w pliku konfiguracyjnym: <literal>APT::Get::"
-"Download-Only</literal>."
+"czy instalowane.  Pozycja w pliku konfiguracyjnym: "
+"<literal>APT::Get::Download-Only</literal>."
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -1682,8 +1683,8 @@ msgid ""
 "structure can be so corrupt as to require manual intervention (which usually "
 "means using <command>dpkg --remove</command> to eliminate some of the "
 "offending packages). Use of this option together with <option>-m</option> "
-"may produce an error in some situations.  Configuration Item: <literal>APT::"
-"Get::Fix-Broken</literal>."
+"may produce an error in some situations.  Configuration Item: "
+"<literal>APT::Get::Fix-Broken</literal>."
 msgstr ""
 "Popraw; podejmuje próbę poprawienia zepsutych zależności. Używanie tej opcji "
 "z install/remove może spowodować pominięcie któregokolwiek z pakietów "
@@ -1727,8 +1728,8 @@ msgid ""
 msgstr ""
 "Wyłącza pobierania pakietów. Najlepiej stosować z <option>--ignore-missing</"
 "option>, aby wymusić na APT używanie tylko tych plików .deb, które zostały "
-"wcześniej ściągnięte.  Pozycja w pliku konfiguracyjnym: <literal>APT::Get::"
-"Download</literal>."
+"wcześniej ściągnięte.  Pozycja w pliku konfiguracyjnym: "
+"<literal>APT::Get::Download</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -1745,8 +1746,8 @@ msgstr ""
 "wskaźniki postępu. Więcej znaków q spowoduje jeszcze bardziej ciche wyjście, "
 "maksimum jest 2. Można także ustawić poziom cichości za pomocą <option>-q=#</"
 "option>, nadpisując tym samym opcję z pliku konfiguracyjnego. Należy "
-"zauważyć, że poziom cichości równy 2 implikuje <option>-y</option>, dlatego -"
-"qq nigdy nie powinno być używane bez opcji typu -d, --print-uris lub -s, "
+"zauważyć, że poziom cichości równy 2 implikuje <option>-y</option>, dlatego "
+"-qq nigdy nie powinno być używane bez opcji typu -d, --print-uris lub -s, "
 "gdyż APT może zadecydować o zrobieniu czegoś, czego użytkownik się nie "
 "spodziewa. Pozycja w pliku konfiguracyjnym: <literal>quiet</literal>."
 
@@ -1794,14 +1795,14 @@ msgstr ""
 "wszelkie pytania, uruchamia się w trybie nieinteraktywnym. Jeśli wystąpi "
 "jakaś niepożądana sytuacja, na przykład zmiana wstrzymanego pakietu lub "
 "usunięcie pakietu mającego status Essential, <literal>apt-get</literal> "
-"przerwie działanie.  Pozycja w pliku konfiguracyjnym: <literal>APT::Get::"
-"Assume-Yes</literal>."
+"przerwie działanie.  Pozycja w pliku konfiguracyjnym: "
+"<literal>APT::Get::Assume-Yes</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
-"Automatic \"no\" to all prompts.  Configuration Item: <literal>APT::Get::"
-"Assume-No</literal>."
+"Automatic \"no\" to all prompts.  Configuration Item: "
+"<literal>APT::Get::Assume-No</literal>."
 msgstr ""
 "Automatycznie odpowiada \"nie\" na wszystkie zapytania. Pozycja w pliku "
 "konfiguracyjnym: <literal>APT::Get::Assume-No</literal>."
@@ -1872,17 +1873,17 @@ msgid ""
 "This option controls the architecture packages are built for by <command>apt-"
 "get source --compile</command> and how cross-builddependencies are "
 "satisfied. By default is it not set which means that the host architecture "
-"is the same as the build architecture (which is defined by <literal>APT::"
-"Architecture</literal>).  Configuration Item: <literal>APT::Get::Host-"
-"Architecture</literal>."
+"is the same as the build architecture (which is defined by "
+"<literal>APT::Architecture</literal>).  Configuration Item: "
+"<literal>APT::Get::Host-Architecture</literal>."
 msgstr ""
 "Za pomocą tej opcji można określić architekturę pakietów budowanych przez "
 "<command>apt-get source --compile</command> i sposób, w jaki są spełniane "
 "międzyarchitekturowe zależności czasu budowania. Domyślnie nie jest "
 "ustawiona, co oznacza, że architektura budowanych pakietów jest taka sama "
-"jak architektura bieżącego komputera (definiowana przez <literal>APT::"
-"Architecture</literal>). Pozycja w pliku konfiguracyjnym: <literal>APT::Get::"
-"Host-Architecture</literal>."
+"jak architektura bieżącego komputera (definiowana przez "
+"<literal>APT::Architecture</literal>). Pozycja w pliku konfiguracyjnym: "
+"<literal>APT::Get::Host-Architecture</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -1905,9 +1906,9 @@ msgstr ""
 "<command>apt-get source --compile</command> i sposób, w jaki są spełniane "
 "międzyarchitekturowe zależności czasu budowania. Domyślnie nie jest "
 "ustawiona, co oznacza, że architektura budowanych pakietów jest taka sama "
-"jak architektura bieżącego komputera (definiowana przez <literal>APT::"
-"Architecture</literal>). Pozycja w pliku konfiguracyjnym: <literal>APT::Get::"
-"Host-Architecture</literal>."
+"jak architektura bieżącego komputera (definiowana przez "
+"<literal>APT::Architecture</literal>). Pozycja w pliku konfiguracyjnym: "
+"<literal>APT::Get::Host-Architecture</literal>."
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -1993,8 +1994,8 @@ msgstr ""
 "kontynuuje swoje działanie bez żadnej interakcji z użytkownikiem, nawet "
 "jeśli robi coś, co może być szkodliwe. Nie powinna być używana, z wyjątkiem "
 "bardzo szczególnych sytuacji. Używanie <literal>force-yes</literal> może "
-"zniszczyć Twój system! Pozycja w pliku konfiguracyjnym: <literal>APT::Get::"
-"force-yes</literal>."
+"zniszczyć Twój system! Pozycja w pliku konfiguracyjnym: "
+"<literal>APT::Get::force-yes</literal>."
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -2017,8 +2018,8 @@ msgstr ""
 "kontynuuje swoje działanie bez żadnej interakcji z użytkownikiem, nawet "
 "jeśli robi coś, co może być szkodliwe. Nie powinna być używana, z wyjątkiem "
 "bardzo szczególnych sytuacji. Używanie <literal>force-yes</literal> może "
-"zniszczyć Twój system! Pozycja w pliku konfiguracyjnym: <literal>APT::Get::"
-"force-yes</literal>."
+"zniszczyć Twój system! Pozycja w pliku konfiguracyjnym: "
+"<literal>APT::Get::force-yes</literal>."
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -2041,8 +2042,8 @@ msgstr ""
 "kontynuuje swoje działanie bez żadnej interakcji z użytkownikiem, nawet "
 "jeśli robi coś, co może być szkodliwe. Nie powinna być używana, z wyjątkiem "
 "bardzo szczególnych sytuacji. Używanie <literal>force-yes</literal> może "
-"zniszczyć Twój system! Pozycja w pliku konfiguracyjnym: <literal>APT::Get::"
-"force-yes</literal>."
+"zniszczyć Twój system! Pozycja w pliku konfiguracyjnym: "
+"<literal>APT::Get::force-yes</literal>."
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -2068,8 +2069,8 @@ msgstr ""
 "kontynuuje swoje działanie bez żadnej interakcji z użytkownikiem, nawet "
 "jeśli robi coś, co może być szkodliwe. Nie powinna być używana, z wyjątkiem "
 "bardzo szczególnych sytuacji. Używanie <literal>force-yes</literal> może "
-"zniszczyć Twój system! Pozycja w pliku konfiguracyjnym: <literal>APT::Get::"
-"force-yes</literal>."
+"zniszczyć Twój system! Pozycja w pliku konfiguracyjnym: "
+"<literal>APT::Get::force-yes</literal>."
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -2081,8 +2082,8 @@ msgid ""
 "name on the remote site! This also works with the <literal>source</literal> "
 "and <literal>update</literal> commands. When used with the <literal>update</"
 "literal> command the MD5 and size are not included, and it is up to the user "
-"to decompress any compressed files.  Configuration Item: <literal>APT::Get::"
-"Print-URIs</literal>."
+"to decompress any compressed files.  Configuration Item: "
+"<literal>APT::Get::Print-URIs</literal>."
 msgstr ""
 "Nie ściąga pakietów do zainstalowania, tylko wypisuje ich URI. Każdy URI "
 "składa się z lokalizacji, nazwy pliku przeznaczenia, rozmiaru oraz "
@@ -2126,8 +2127,8 @@ msgid ""
 "turn it off. When it is on, <command>apt-get</command> will automatically "
 "manage the contents of <filename>&statedir;/lists</filename> to ensure that "
 "obsolete files are erased.  The only reason to turn it off is if you "
-"frequently change your sources list.  Configuration Item: <literal>APT::Get::"
-"List-Cleanup</literal>."
+"frequently change your sources list.  Configuration Item: "
+"<literal>APT::Get::List-Cleanup</literal>."
 msgstr ""
 "Ta opcja jest domyślnie włączona, można ją wyłączyć używając <literal>--no-"
 "list-cleanup</literal>. Jeżeli jest włączona, <command>apt-get</command> "
@@ -2182,8 +2183,8 @@ msgstr ""
 "Wykonuje tylko \"banalne\" (ang. \"trivial\") operacje. Tę opcję można "
 "porównać z <option>--assume-yes</option>, ale tam gdzie <option>--assume-"
 "yes</option> odpowiedziałoby \"tak\" na pytanie, <option>--trivial-only</"
-"option> odpowie \"nie\".  Pozycja w pliku konfiguracyjnym: <literal>APT::"
-"Get::Trivial-Only</literal>."
+"option> odpowie \"nie\".  Pozycja w pliku konfiguracyjnym: "
+"<literal>APT::Get::Trivial-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -2217,8 +2218,8 @@ msgstr ""
 "Jeżeli polecenie to albo <literal>install</literal>, albo <literal>remove</"
 "literal>, to ta opcja działa tak, jak uruchomienie polecenia "
 "<literal>autoremove</literal> i usuwa pakiety mające nieużywane już "
-"zależności. Pozycja w pliku konfiguracyjnym: <literal>APT::Get::"
-"AutomaticRemove</literal>."
+"zależności. Pozycja w pliku konfiguracyjnym: "
+"<literal>APT::Get::AutomaticRemove</literal>."
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -2235,10 +2236,10 @@ msgstr ""
 "Ma znaczenie tylko dla poleceń <literal>source</literal> i <literal>build-"
 "dep</literal>. Wskazuje na to, że podane nazwy pakietów źródłowych nie "
 "powinny być mapowane w tabeli pakietów binarnych. Oznacza to, że gdy podano "
-"tę opcję, to powyższe polecenia zaakceptują tylko nazwy pakietów źródłowych."
-"Nie będą akceptować nazw pakietów binarnych ani wyszukiwać odpowiadających "
-"im pakietów źródłowych. Pozycja w pliku konfiguracyjnym: <literal>APT::Get::"
-"Only-Source</literal>."
+"tę opcję, to powyższe polecenia zaakceptują tylko nazwy pakietów "
+"źródłowych.Nie będą akceptować nazw pakietów binarnych ani wyszukiwać "
+"odpowiadających im pakietów źródłowych. Pozycja w pliku konfiguracyjnym: "
+"<literal>APT::Get::Only-Source</literal>."
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -2249,8 +2250,9 @@ msgid ""
 "literal>, and <literal>APT::Get::Tar-Only</literal>."
 msgstr ""
 "Ściągnij tylko plik diff, dsc albo tar pakietu źródłowego.  Pozycje w pliku "
-"konfiguracyjnym:  <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::"
-"Dsc-Only</literal> oraz <literal>APT::Get::Tar-Only</literal>."
+"konfiguracyjnym:  <literal>APT::Get::Diff-Only</literal>, "
+"<literal>APT::Get::Dsc-Only</literal> oraz <literal>APT::Get::Tar-Only</"
+"literal>."
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -2846,12 +2848,12 @@ msgstr "Uwaga: dotty nie potrafi narysować większego zbioru pakietów."
 #: apt-cache.8.xml
 msgid ""
 "The same as <literal>dotty</literal>, only for xvcg from the <ulink "
-"url=\"https://www.rw.cdl.uni-saarland.de/people/sander/private/html/gsvcg1."
-"html\">VCG tool</ulink>."
+"url=\"https://www.rw.cdl.uni-saarland.de/people/sander/private/html/"
+"gsvcg1.html\">VCG tool</ulink>."
 msgstr ""
 "Robi to samo, co <literal>dotty</literal>, tylko dla xvcg z <ulink "
-"url=\"https://www.rw.cdl.uni-saarland.de/people/sander/private/html/gsvcg1."
-"html\">narzędzia VCG</ulink>."
+"url=\"https://www.rw.cdl.uni-saarland.de/people/sander/private/html/"
+"gsvcg1.html\">narzędzia VCG</ulink>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml
@@ -2881,8 +2883,8 @@ msgid ""
 "archive management tool, <literal>madison</literal>.  It displays available "
 "versions of a package in a tabular format.  Unlike the original "
 "<literal>madison</literal>, it can only display information for the "
-"architecture for which APT has retrieved package lists (<literal>APT::"
-"Architecture</literal>)."
+"architecture for which APT has retrieved package lists "
+"(<literal>APT::Architecture</literal>)."
 msgstr ""
 "polecenie <literal>madison</literal> z <literal>apt-cache</literal> próbuje "
 "naśladować format wyjścia i część funkcjonalności programu <literal>madison</"
@@ -2896,8 +2898,8 @@ msgstr ""
 #: apt-cache.8.xml
 msgid ""
 "Select the file to store the package cache. The package cache is the primary "
-"cache used by all operations.  Configuration Item: <literal>Dir::Cache::"
-"pkgcache</literal>."
+"cache used by all operations.  Configuration Item: "
+"<literal>Dir::Cache::pkgcache</literal>."
 msgstr ""
 "Podaje nazwę pliku to przechowywania bufora pakietów, który jest podstawowym "
 "buforem używanym we wszystkich operacjach.  Pozycja w pliku konfiguracyjnym: "
@@ -2917,8 +2919,8 @@ msgstr ""
 "akcję <literal>gencaches</literal> i przechowuje sparsowaną wersję "
 "informacji o pakietach pobraną ze zdalnych źródeł. Podczas budowania bufora "
 "pakietów, bufor źródeł jest używany w celu uniknięcia ponownego parsowania "
-"wszystkich plików pakietów.  Pozycja w pliku konfiguracyjnym: <literal>Dir::"
-"Cache::srcpkgcache</literal>."
+"wszystkich plików pakietów.  Pozycja w pliku konfiguracyjnym: "
+"<literal>Dir::Cache::srcpkgcache</literal>."
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -2944,8 +2946,8 @@ msgid ""
 msgstr ""
 "Wyświetla tylko ważne zależności; do używania z akcjami <literal>unmet</"
 "literal> o <literal>depends</literal>. Powoduje wypisanie tylko zależności "
-"typu Depends i Pre-Depends. Pozycja w pliku konfiguracyjnym: <literal>APT::"
-"Cache::Important</literal>."
+"typu Depends i Pre-Depends. Pozycja w pliku konfiguracyjnym: "
+"<literal>APT::Cache::Important</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml
@@ -2959,9 +2961,9 @@ msgstr ""
 msgid ""
 "Per default the <command>depends</command> and <command>rdepends</command> "
 "print all dependencies. This can be tweaked with these flags which will omit "
-"the specified dependency type.  Configuration Item: <literal>APT::Cache::"
-"Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::"
-"Cache::ShowRecommends</literal>."
+"the specified dependency type.  Configuration Item: "
+"<literal>APT::Cache::Show<replaceable>DependencyType</replaceable></literal> "
+"e.g. <literal>APT::Cache::ShowRecommends</literal>."
 msgstr ""
 "Domyślnie <literal>depends</literal> i <literal>rdepends</literal> wypisują "
 "wszystkie zależności. Można to zmienić, używając tych flag, które spowodują "
@@ -3040,8 +3042,8 @@ msgstr ""
 #: apt-cache.8.xml
 msgid ""
 "Make <literal>pkgnames</literal> print all names, including virtual packages "
-"and missing dependencies.  Configuration Item: <literal>APT::Cache::"
-"AllNames</literal>."
+"and missing dependencies.  Configuration Item: "
+"<literal>APT::Cache::AllNames</literal>."
 msgstr ""
 "Powoduje, że akcja <literal>pkgnames</literal> wypisze nazwy wszystkich "
 "pakietów, łącznie z pakietami wirtualnymi oraz pakietami mającymi brakujące "
@@ -3098,8 +3100,8 @@ msgstr ""
 #: apt-cache.8.xml
 #, fuzzy
 #| msgid ""
-#| "Use source index field ordering.  Configuration Item: <literal>APT::"
-#| "SortPkgs::Source</literal>."
+#| "Use source index field ordering.  Configuration Item: "
+#| "<literal>APT::SortPkgs::Source</literal>."
 msgid ""
 "Note that these sources are treated as trusted (see &apt-secure;).  "
 "Configuration Item: <literal>APT::Sources::With</literal>."
@@ -3134,8 +3136,8 @@ msgid ""
 "<command>apt-mark</command> can be used as a unified front-end to set "
 "various settings for a package, such as marking a package as being "
 "automatically/manually installed or changing <command>dpkg</command> "
-"selections such as hold, install, deinstall and purge which are respected e."
-"g. by <command>apt-get dselect-upgrade</command> or <command>aptitude</"
+"selections such as hold, install, deinstall and purge which are respected "
+"e.g. by <command>apt-get dselect-upgrade</command> or <command>aptitude</"
 "command>."
 msgstr ""
 
@@ -3381,10 +3383,11 @@ msgstr "Konfiguracja użytkownika"
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""
-"Keys should usually be included inside their corresponding <literal>."
-"sources</literal> by embedding the ASCII-armored key in the <literal>Signed-"
-"By</literal> option.  To do so, replace the empty line with a dot, and then "
-"indent all lines by two spaces.  See &sources-list; for more information."
+"Keys should usually be included inside their corresponding "
+"<literal>.sources</literal> by embedding the ASCII-armored key in the "
+"<literal>Signed-By</literal> option.  To do so, replace the empty line with "
+"a dot, and then indent all lines by two spaces.  See &sources-list; for more "
+"information."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -3397,8 +3400,9 @@ msgid ""
 "literal> file or using <literal>deb [signed-by=/etc/apt/keyrings/example-"
 "archive-keyring.asc] ...</literal> in the legacy <literal>.list</literal> "
 "format. This may be useful for APT versions prior to 2.4, which do not "
-"support embedded keys. ASCII-armored keys must use an extension of <literal>."
-"asc</literal>, and unarmored keys an extension of <literal>.gpg</literal>."
+"support embedded keys. ASCII-armored keys must use an extension of "
+"<literal>.asc</literal>, and unarmored keys an extension of <literal>.gpg</"
+"literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -3680,12 +3684,12 @@ msgstr ""
 #: apt-secure.8.xml
 msgid ""
 "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg --"
-"clearsign -o InRelease Release</command> and <command>gpg -abs -o Release."
-"gpg Release</command>."
+"clearsign -o InRelease Release</command> and <command>gpg -abs -o "
+"Release.gpg Release</command>."
 msgstr ""
 "<emphasis>Podpisać go</emphasis>. Można to zrobić za pomocą poleceń "
-"<command>gpg --clearsign -o InRelease Release</command> i <command>gpg -abs -"
-"o Release.gpg Release</command>."
+"<command>gpg --clearsign -o InRelease Release</command> i <command>gpg -abs "
+"-o Release.gpg Release</command>."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #: apt-secure.8.xml
@@ -3757,12 +3761,12 @@ msgid ""
 "url=\"http://www.cryptnet.net/fdp/crypto/strong_distro.html\" >Strong "
 "Distribution HOWTO</ulink> by V. Alex Brennen."
 msgstr ""
-"Więcej informacji można znaleźć w rozdziale \"<ulink url=\"http://www.debian."
-"org/doc/manuals/securing-debian-manual/ch07\">Debian Security "
+"Więcej informacji można znaleźć w rozdziale \"<ulink url=\"http://"
+"www.debian.org/doc/manuals/securing-debian-manual/ch07\">Debian Security "
 "Infrastructure</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."
+"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>
 #: apt-secure.8.xml
@@ -3858,8 +3862,8 @@ msgstr ""
 #| "configured.  Configuration Item: <literal>Acquire::cdrom::mount</literal>."
 msgid ""
 "Do not try to auto-detect the CD-ROM path. Usually combined with the "
-"<option>--cdrom</option> option.  Configuration Item: <literal>Acquire::"
-"cdrom::AutoDetect</literal>."
+"<option>--cdrom</option> option.  Configuration Item: "
+"<literal>Acquire::cdrom::AutoDetect</literal>."
 msgstr ""
 "Punkt montowania. Podaje lokalizację katalogu, w którym będzie zamontowany "
 "CD-ROM. Musi istnieć odpowiednia konfiguracja dla tego punktu montowania w "
@@ -3889,20 +3893,20 @@ msgid ""
 msgstr ""
 "Przemianuj dysk. Zmienia etykietę dysku lub unieważnia etykietę wcześniej "
 "daną dyskowi. Podanie tej opcji spowoduje, że <command>apt-cdrom</command>  "
-"spyta się o nową etykietę.  Pozycja w pliku konfiguracyjnym: <literal>APT::"
-"CDROM::Rename</literal>."
+"spyta się o nową etykietę.  Pozycja w pliku konfiguracyjnym: "
+"<literal>APT::CDROM::Rename</literal>."
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml
 msgid ""
 "No mounting; prevent <command>apt-cdrom</command> from mounting and "
-"unmounting the mount point.  Configuration Item: <literal>APT::CDROM::"
-"NoMount</literal>."
+"unmounting the mount point.  Configuration Item: "
+"<literal>APT::CDROM::NoMount</literal>."
 msgstr ""
 "Nie montuj. Uniemożliwia programowi <command>apt-cdrom</command> montowanie "
-"i odmontowywanie CDROM-u.  Pozycja w pliku konfiguracyjnym: <literal>APT::"
-"CDROM::NoMount</literal>."
+"i odmontowywanie CDROM-u.  Pozycja w pliku konfiguracyjnym: "
+"<literal>APT::CDROM::NoMount</literal>."
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -3916,8 +3920,8 @@ msgstr ""
 "Szybkie kopiowanie. Zakłada, że pliki z pakietami są poprawne i nie sprawdza "
 "każdego pakietu. Ta opcja powinna być używana tylko wtedy, jeżeli "
 "<command>apt-cdrom</command> był już uruchomiony na danym dysku i nie wykrył "
-"na nim żadnych błędów.  Pozycja w pliku konfiguracyjnym: <literal>APT::"
-"CDROM::Fast</literal>."
+"na nim żadnych błędów.  Pozycja w pliku konfiguracyjnym: "
+"<literal>APT::CDROM::Fast</literal>."
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -4008,8 +4012,8 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-config.8.xml
 msgid ""
-"This will set the shell environment variable $OPTS to the value of MyApp::"
-"options with a default of <option>-f</option>."
+"This will set the shell environment variable $OPTS to the value of "
+"MyApp::options with a default of <option>-f</option>."
 msgstr ""
 "Powyższe ustawi wartość zmiennej środowiskowej powłoki $OPTS na wartość "
 "zmiennej MojaAplikacja::opcje, z domyślną wartością <option>-f</option>."
@@ -4138,9 +4142,9 @@ msgid ""
 "order which have either no or \"<literal>conf</literal>\" as filename "
 "extension and which only contain alphanumeric, hyphen (-), underscore (_) "
 "and period (.) characters.  Otherwise APT will print a notice that it has "
-"ignored a file, unless that file matches a pattern in the <literal>Dir::"
-"Ignore-Files-Silently</literal> configuration list - in which case it will "
-"be silently ignored."
+"ignored a file, unless that file matches a pattern in the "
+"<literal>Dir::Ignore-Files-Silently</literal> configuration list - in which "
+"case it will be silently ignored."
 msgstr ""
 "wszystkie pliki w <literal>Dir::Etc::Parts</literal> w rosnącym porządku "
 "alfanumerycznym, których nazwy nie mają rozszerzenia lub mają rozszerzenie "
@@ -4364,10 +4368,12 @@ msgstr ""
 msgid ""
 "The subscope <option>action</option> defines the colors for package lists in "
 "<option>install</option> and similar commands. The following options may be "
-"set: <option>APT::Color::Action::Upgrade</option>, <option>APT::Color::"
-"Action::Install</option>, <option>APT::Color::Action::Install-Dependencies</"
-"option>, <option>APT::Color::Action::Downgrade</option>, <option>APT::Color::"
-"Action::Remove</option>; corresponding to their lists in the &apt; output."
+"set: <option>APT::Color::Action::Upgrade</option>, "
+"<option>APT::Color::Action::Install</option>, "
+"<option>APT::Color::Action::Install-Dependencies</option>, "
+"<option>APT::Color::Action::Downgrade</option>, "
+"<option>APT::Color::Action::Remove</option>; corresponding to their lists in "
+"the &apt; output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -4585,8 +4591,8 @@ msgstr ""
 #: apt.conf.5.xml
 msgid ""
 "Define the regular expression(s) for versioned kernel packages.  Based on "
-"these expressions a rule set is injected into apt similar to APT::"
-"NeverAutoRemove regular expressions."
+"these expressions a rule set is injected into apt similar to "
+"APT::NeverAutoRemove regular expressions."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -4890,9 +4896,9 @@ msgid ""
 "that these codes are not included twice in the list. If "
 "<literal>LC_MESSAGES</literal> is set to \"C\" only the "
 "<filename>Translation-en</filename> file (if available) will be used.  To "
-"force APT to use no Translation file use the setting <literal>Acquire::"
-"Languages=none</literal>. \"<literal>none</literal>\" is another special "
-"meaning code which will stop the search for a suitable "
+"force APT to use no Translation file use the setting "
+"<literal>Acquire::Languages=none</literal>. \"<literal>none</literal>\" is "
+"another special meaning code which will stop the search for a suitable "
 "<filename>Translation</filename> file.  This tells APT to download these "
 "translations too, without actually using them unless the environment "
 "specifies the languages. So the following example configuration will result "
@@ -4981,21 +4987,22 @@ msgid ""
 "<replaceable>ORIGIN</replaceable></literal> option exists and if so this "
 "value is taken. The value in the Release file can be overridden with "
 "<literal>Acquire::Changelogs::URI::Override::Label::<replaceable>LABEL</"
-"replaceable></literal> or <literal>Acquire::Changelogs::URI::Override::"
-"Origin::<replaceable>ORIGIN</replaceable></literal>.  The value should be a "
-"normal URI to a text file, except that package specific data is replaced "
-"with the placeholder <literal>@CHANGEPATH@</literal>. The value for it is: "
-"1. if the package is from a component (e.g. <literal>main</literal>)  this "
-"is the first part otherwise it is omitted, 2. the first letter of source "
-"package name, except if the source package name starts with '<literal>lib</"
-"literal>' in which case it will be the first four letters. 3. The complete "
-"source package name. 4. the complete name again and 5. the source version.  "
-"The first (if present), second, third and fourth part are separated by a "
-"slash ('<literal>/</literal>')  and between the fourth and fifth part is an "
-"underscore ('<literal>_</literal>').  The special value '<literal>no</"
-"literal>' is available for this option indicating that this source can't be "
-"used to acquire changelog files from. Another source will be tried if "
-"available in this case."
+"replaceable></literal> or "
+"<literal>Acquire::Changelogs::URI::Override::Origin::<replaceable>ORIGIN</"
+"replaceable></literal>.  The value should be a normal URI to a text file, "
+"except that package specific data is replaced with the placeholder "
+"<literal>@CHANGEPATH@</literal>. The value for it is: 1. if the package is "
+"from a component (e.g. <literal>main</literal>)  this is the first part "
+"otherwise it is omitted, 2. the first letter of source package name, except "
+"if the source package name starts with '<literal>lib</literal>' in which "
+"case it will be the first four letters. 3. The complete source package name. "
+"4. the complete name again and 5. the source version.  The first (if "
+"present), second, third and fourth part are separated by a slash ('<literal>/"
+"</literal>')  and between the fourth and fifth part is an underscore "
+"('<literal>_</literal>').  The special value '<literal>no</literal>' is "
+"available for this option indicating that this source can't be used to "
+"acquire changelog files from. Another source will be tried if available in "
+"this case."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -5005,17 +5012,19 @@ msgid ""
 "where to get them.  Preferable the Release file indicates this in a "
 "'Snapshots' field. If this isn't available the Label/Origin field of the "
 "Release file is used to check if a <literal>Acquire::Snapshots::URI::Label::"
-"<replaceable>LABEL</replaceable></literal> or <literal>Acquire::Snapshots::"
-"URI::Origin::<replaceable>ORIGIN</replaceable></literal> option exists and "
-"if so this value is taken. The value in the Release file can be overridden "
-"with <literal>Acquire::Snapshots::URI::Override::Label::<replaceable>LABEL</"
-"replaceable></literal> or <literal>Acquire::Snapshots::URI::Override::"
-"Origin::<replaceable>ORIGIN</replaceable></literal>.  The value should be a "
-"normal URI to a directory, except that the snapshot ID replaced with the "
-"placeholder <literal>@SNAPSHOTID@</literal>.  The special value "
-"'<literal>no</literal>' is available for this option indicating that this "
-"source cannot be used to acquire snapshots from. Another source will be "
-"tried if available in this case."
+"<replaceable>LABEL</replaceable></literal> or "
+"<literal>Acquire::Snapshots::URI::Origin::<replaceable>ORIGIN</replaceable></"
+"literal> option exists and if so this value is taken. The value in the "
+"Release file can be overridden with "
+"<literal>Acquire::Snapshots::URI::Override::Label::<replaceable>LABEL</"
+"replaceable></literal> or "
+"<literal>Acquire::Snapshots::URI::Override::Origin::<replaceable>ORIGIN</"
+"replaceable></literal>.  The value should be a normal URI to a directory, "
+"except that the snapshot ID replaced with the placeholder "
+"<literal>@SNAPSHOTID@</literal>.  The special value '<literal>no</literal>' "
+"is available for this option indicating that this source cannot be used to "
+"acquire snapshots from. Another source will be tried if available in this "
+"case."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
@@ -5030,9 +5039,9 @@ msgstr "Konfiguracja użytkownika"
 msgid ""
 "Especially with the introduction of the <command>apt</command> binary it can "
 "be useful to set certain options only for a specific binary as even options "
-"which look like they would effect only a certain binary like <option>APT::"
-"Get::Show-Versions</option> effect <command>apt-get</command> as well as "
-"<command>apt</command>."
+"which look like they would effect only a certain binary like "
+"<option>APT::Get::Show-Versions</option> effect <command>apt-get</command> "
+"as well as <command>apt</command>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -5105,12 +5114,12 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml
 msgid ""
-"Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
-"Bin::Methods</literal> specifies the location of the method handlers and "
-"<literal>gzip</literal>, <literal>bzip2</literal>, <literal>lzma</literal>, "
-"<literal>dpkg</literal>, <literal>apt-get</literal> <literal>dpkg-source</"
-"literal> <literal>dpkg-buildpackage</literal> and <literal>apt-cache</"
-"literal> specify the location of the respective programs."
+"Binary programs are pointed to by <literal>Dir::Bin</literal>. "
+"<literal>Dir::Bin::Methods</literal> specifies the location of the method "
+"handlers and <literal>gzip</literal>, <literal>bzip2</literal>, "
+"<literal>lzma</literal>, <literal>dpkg</literal>, <literal>apt-get</literal> "
+"<literal>dpkg-source</literal> <literal>dpkg-buildpackage</literal> and "
+"<literal>apt-cache</literal> specify the location of the respective programs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -5248,9 +5257,9 @@ msgid ""
 "literal>.  Special characters (equal signs, newlines, nonprintable "
 "characters, quotation marks, and percent signs in <literal>key</literal> and "
 "newlines, nonprintable characters, and percent signs in <literal>value</"
-"literal>) are %-encoded. Lists are represented by multiple <literal>key::"
-"=value</literal> lines with the same key. The configuration section ends "
-"with a blank line."
+"literal>) are %-encoded. Lists are represented by multiple "
+"<literal>key::=value</literal> lines with the same key. The configuration "
+"section ends with a blank line."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -5492,8 +5501,8 @@ msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
 "install pass performed in, e.g., <literal>apt-get install</literal>, and not "
-"to the full <literal>apt</literal> dependency resolver; see <literal>Debug::"
-"pkgProblemResolver</literal> for that."
+"to the full <literal>apt</literal> dependency resolver; see "
+"<literal>Debug::pkgProblemResolver</literal> for that."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -5504,14 +5513,14 @@ msgid ""
 "may trigger additional actions; they are shown indented two additional "
 "spaces under the original entry.  The format for each line is "
 "<literal>MarkKeep</literal>, <literal>MarkDelete</literal> or "
-"<literal>MarkInstall</literal> followed by <literal>package-name &lt;a.b.c -"
-"&gt; d.e.f | x.y.z&gt; (section)</literal> where <literal>a.b.c</literal> is "
-"the current version of the package, <literal>d.e.f</literal> is the version "
-"considered for installation and <literal>x.y.z</literal> is a newer version, "
-"but not considered for installation (because of a low pin score). The later "
-"two can be omitted if there is none or if it is the same as the installed "
-"version.  <literal>section</literal> is the name of the section the package "
-"appears in."
+"<literal>MarkInstall</literal> followed by <literal>package-name &lt;a.b.c "
+"-&gt; d.e.f | x.y.z&gt; (section)</literal> where <literal>a.b.c</literal> "
+"is the current version of the package, <literal>d.e.f</literal> is the "
+"version considered for installation and <literal>x.y.z</literal> is a newer "
+"version, but not considered for installation (because of a low pin score). "
+"The later two can be omitted if there is none or if it is the same as the "
+"installed version.  <literal>section</literal> is the name of the section "
+"the package appears in."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -5564,15 +5573,15 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
 msgid ""
-"Print information about the vendors read from <filename>/etc/apt/vendors."
-"list</filename>."
+"Print information about the vendors read from <filename>/etc/apt/"
+"vendors.list</filename>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
 msgid ""
-"Display the external commands that are called by apt hooks.  This includes e."
-"g. the config options <literal>DPkg::{Pre,Post}-Invoke</literal> or "
+"Display the external commands that are called by apt hooks.  This includes "
+"e.g. the config options <literal>DPkg::{Pre,Post}-Invoke</literal> or "
 "<literal>APT::Update::{Pre,Post}-Invoke</literal>."
 msgstr ""
 
@@ -6363,9 +6372,9 @@ msgstr ""
 #: apt_preferences.5.xml
 msgid ""
 "The <literal>:any</literal> suffix makes sure to select binary packages from "
-"any architecture. Without that suffix, apt implicitly assumes the <literal>:"
-"native</literal> suffix which would only select packages from the native "
-"architecture."
+"any architecture. Without that suffix, apt implicitly assumes the "
+"<literal>:native</literal> suffix which would only select packages from the "
+"native architecture."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
@@ -6543,9 +6552,9 @@ msgstr "Wtedy:"
 msgid ""
 "The most recent available version of the <literal>perl</literal> package "
 "will be installed, so long as that version's version number begins with "
-"\"<literal>&good-perl;</literal>\".  If <emphasis>any</emphasis> &good-perl;"
-"* version of <literal>perl</literal> is available and the installed version "
-"is &bad-perl;*, then <literal>perl</literal> will be downgraded."
+"\"<literal>&good-perl;</literal>\".  If <emphasis>any</emphasis> &good-"
+"perl;* version of <literal>perl</literal> is available and the installed "
+"version is &bad-perl;*, then <literal>perl</literal> will be downgraded."
 msgstr ""
 "Zostanie zainstalowana najnowsza dostępna wersja pakietu <literal>perl</"
 "literal>, jeśli tylko numer tej wersji zaczyna się od \"<literal>&good-perl;"
@@ -6824,21 +6833,21 @@ msgid ""
 "files retrieved from locations listed in the &sources-list; file are stored "
 "in the directory <filename>/var/lib/apt/lists</filename>, or in the file "
 "named by the variable <literal>Dir::State::Lists</literal> in the "
-"<filename>apt.conf</filename> file.  For example, the file <filename>debian."
-"lcs.mit.edu_debian_dists_unstable_contrib_binary-i386_Release</filename> "
-"contains the <filename>Release</filename> file retrieved from the site "
-"<literal>debian.lcs.mit.edu</literal> for <literal>binary-i386</literal> "
-"architecture files from the <literal>contrib</literal> component of the "
-"<literal>unstable</literal> distribution."
+"<filename>apt.conf</filename> file.  For example, the file "
+"<filename>debian.lcs.mit.edu_debian_dists_unstable_contrib_binary-"
+"i386_Release</filename> contains the <filename>Release</filename> file "
+"retrieved from the site <literal>debian.lcs.mit.edu</literal> for "
+"<literal>binary-i386</literal> architecture files from the <literal>contrib</"
+"literal> component of the <literal>unstable</literal> distribution."
 msgstr ""
 "Wszystkie pliki <filename>Packages</filename> i <filename>Release</filename> "
 "pobierane z lokalizacji podanych w pliku &sources-list; są przechowywane w "
 "katalogu <filename>/var/lib/apt/lists</filename> lub w pliku o nazwie "
 "będącej wartością zmiennej <literal>Dir::State::Lists</literal> z pliku "
-"<filename>apt.conf</filename>. Na przykład plik o nazwie <filename>debian."
-"lcs.mit.edu_debian_dists_unstable_contrib_binary-i386_Release</filename> "
-"zawiera plik <filename>Release</filename> pobrany z komputera "
-"<literal>debian.lcs.mit.edu</literal> dla plików komponentu "
+"<filename>apt.conf</filename>. Na przykład plik o nazwie "
+"<filename>debian.lcs.mit.edu_debian_dists_unstable_contrib_binary-"
+"i386_Release</filename> zawiera plik <filename>Release</filename> pobrany z "
+"komputera <literal>debian.lcs.mit.edu</literal> dla plików komponentu "
 "<literal>contrib</literal> architektury <literal>binary-i386</literal> "
 "dystrybucji <literal>unstable</literal> ."
 
@@ -7263,6 +7272,12 @@ msgid ""
 "multi-architecture support."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml
+msgid ""
+"This format is deprecated and may eventually be removed, but not before 2029."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><title>
 #: sources.list.5.xml
 msgid "deb822-Style Format"
@@ -7426,13 +7441,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</"
@@ -7520,9 +7535,10 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
 msgid ""
-"As an example, the sources for your distribution could look like this in one-"
-"line-style format: <placeholder type=\"literallayout\" id=\"0\"/> or like "
-"this in deb822 style format: <placeholder type=\"literallayout\" id=\"1\"/>"
+"As an example, the sources for your distribution could look like this in the "
+"deprecated one-line-style format: <placeholder type=\"literallayout\" "
+"id=\"0\"/> or like this in deb822 style format: <placeholder "
+"type=\"literallayout\" id=\"1\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
@@ -7594,11 +7610,12 @@ msgstr ""
 msgid ""
 "<option>Targets</option> (<option>target</option>) is a multivalue option "
 "defining which download targets apt will try to acquire from this source. If "
-"not specified, the default set is defined by the <option>Acquire::"
-"IndexTargets</option> configuration scope (targets are specified by their "
-"name in the <literal>Created-By</literal> field).  Additionally, targets can "
-"be enabled or disabled by using the <literal>Identifier</literal> field as "
-"an option with a boolean value instead of using this multivalue option."
+"not specified, the default set is defined by the "
+"<option>Acquire::IndexTargets</option> configuration scope (targets are "
+"specified by their name in the <literal>Created-By</literal> field).  "
+"Additionally, targets can be enabled or disabled by using the "
+"<literal>Identifier</literal> field as an option with a boolean value "
+"instead of using this multivalue option."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
@@ -7727,8 +7744,9 @@ msgid ""
 "helps users identify mirrors which are no longer updated. However, some "
 "repositories such as historic archives are not updated any more by design, "
 "so this check can be disabled by setting this option to <literal>no</"
-"literal>.  Defaults to the value of configuration option <option>Acquire::"
-"Check-Valid-Until</option> which itself defaults to <literal>yes</literal>."
+"literal>.  Defaults to the value of configuration option "
+"<option>Acquire::Check-Valid-Until</option> which itself defaults to "
+"<literal>yes</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
@@ -7914,8 +7932,8 @@ msgid ""
 "source list."
 msgstr ""
 "Schemat cdrom pozwala APT na użycie lokalnego dysku CD-ROM ze zmianą dysków. "
-"Prosimy używać programu &apt-cdrom; do dodawania takich wpisów w sources."
-"list."
+"Prosimy używać programu &apt-cdrom; do dodawania takich wpisów w "
+"sources.list."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
@@ -8051,9 +8069,9 @@ msgid ""
 "<literal>APT::Architectures</literal> while the second always retrieves "
 "<literal>amd64</literal> and <literal>armel</literal>."
 msgstr ""
-"Pierwsza linia pobiera informacje o pakiecie dla architektur w <literal>APT::"
-"Architectures</literal> , podczas gdy druga zawsze pobiera <literal>amd64</"
-"literal> i <literal>armel</literal>."
+"Pierwsza linia pobiera informacje o pakiecie dla architektur w "
+"<literal>APT::Architectures</literal> , podczas gdy druga zawsze pobiera "
+"<literal>amd64</literal> i <literal>armel</literal>."
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
@@ -8097,8 +8115,8 @@ msgid ""
 "Uses HTTP to access the archive at archive.debian.org, and uses only the "
 "hamm/main area."
 msgstr ""
-"Użycie HTTP do uzyskania dostępu do archiwum na komputerze archive.debian."
-"org i dystrybucji hamm/main."
+"Użycie HTTP do uzyskania dostępu do archiwum na komputerze "
+"archive.debian.org i dystrybucji hamm/main."
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
@@ -8221,11 +8239,11 @@ msgid ""
 "archives are not structured like this] <placeholder type=\"literallayout\" "
 "id=\"0\"/> <placeholder type=\"literallayout\" id=\"1\"/>"
 msgstr ""
-"Użycie HTTP do uzyskania dostępu do archiwum na komputerze ftp.tlh.debian."
-"org, w katalogu universe. Dla komputerów i386 używa tylko plików "
-"znalezionych w podkatalogu <filename>unstable/binary-i386</filename>, a dla "
-"komputerów amd64 - <filename>unstable/binary-amd64</filename> i tak dalej "
-"dla innych obsługiwanych architektur. (Uwaga: ten przykład jest tylko "
+"Użycie HTTP do uzyskania dostępu do archiwum na komputerze "
+"ftp.tlh.debian.org, w katalogu universe. Dla komputerów i386 używa tylko "
+"plików znalezionych w podkatalogu <filename>unstable/binary-i386</filename>, "
+"a dla komputerów amd64 - <filename>unstable/binary-amd64</filename> i tak "
+"dalej dla innych obsługiwanych architektur. (Uwaga: ten przykład jest tylko "
 "ilustracją, jak używać zmiennych podstawienia, oficjalne archiwum Debiana "
 "nie zawiera takiej struktury). <placeholder type=\"literallayout\" id=\"0\"/>"
 
@@ -8310,15 +8328,15 @@ msgstr ""
 "plik-template i skrypt-config są zapisywane w katalogu tymczasowym podanym "
 "jako argument opcji <option>-t</option> lub <option>--tempdir</option> "
 "(<literal>APT::ExtractTemplates::TempDir</literal>). Nazwy tych plików są w "
-"postaci <filename>pakiet.template.XXXXXX</filename> oraz <filename>pakiet."
-"config.XXXXXX</filename>."
+"postaci <filename>pakiet.template.XXXXXX</filename> oraz "
+"<filename>pakiet.config.XXXXXX</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-extracttemplates.1.xml
 msgid ""
 "Temporary directory in which to write extracted <command>debconf</command> "
-"template files and config scripts.  Configuration Item: <literal>APT::"
-"ExtractTemplates::TempDir</literal>"
+"template files and config scripts.  Configuration Item: "
+"<literal>APT::ExtractTemplates::TempDir</literal>"
 msgstr ""
 "Katalog tymczasowy, w którym zapisywane będą wyciągnięte szablony "
 "<command>debconf</command> i pliki konfiguracyjne. Pozycja w pliku "
@@ -8364,8 +8382,8 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-sortpkgs.1.xml
 msgid ""
-"Use source index field ordering.  Configuration Item: <literal>APT::"
-"SortPkgs::Source</literal>."
+"Use source index field ordering.  Configuration Item: "
+"<literal>APT::SortPkgs::Source</literal>."
 msgstr ""
 "Używa kolejności pól indeksu pliku Source. Pozycja w pliku konfiguracji: "
 "<literal>APT::SortPkgs::Source</literal>."
@@ -8471,10 +8489,10 @@ msgid ""
 "<filename>icons</filename> files as well as <filename>Release</filename>, "
 "<filename>Index</filename> and <filename>md5sum.txt</filename> files by "
 "default (<literal>APT::FTPArchive::Release::Default-Patterns</literal>).  "
-"Additional filename patterns can be added by listing them in <literal>APT::"
-"FTPArchive::Release::Patterns</literal>.  It then writes to stdout a "
-"<filename>Release</filename> file containing (by default) an MD5, SHA1, "
-"SHA256 and SHA512 digest for each file."
+"Additional filename patterns can be added by listing them in "
+"<literal>APT::FTPArchive::Release::Patterns</literal>.  It then writes to "
+"stdout a <filename>Release</filename> file containing (by default) an MD5, "
+"SHA1, SHA256 and SHA512 digest for each file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -8666,8 +8684,8 @@ msgstr "linia <literal>Label:</literal>"
 #: apt-ftparchive.1.xml
 msgid ""
 "Sets defaults specific to <literal>Tree</literal> sections. All of these "
-"variables are substitution variables and have the strings $(DIST), "
-"$(SECTION) and $(ARCH) replaced with their respective values."
+"variables are substitution variables and have the strings $(DIST), $"
+"(SECTION) and $(ARCH) replaced with their respective values."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
@@ -8692,15 +8710,15 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml
 msgid ""
-"Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
-"$(SECTION)/binary-$(ARCH)/</filename>"
+"Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/$"
+"(SECTION)/binary-$(ARCH)/</filename>"
 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>
@@ -8721,8 +8739,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>
@@ -9080,8 +9098,8 @@ msgstr ""
 #: apt-ftparchive.1.xml
 #, fuzzy
 msgid ""
-"Make the caching databases read only.  Configuration Item: <literal>APT::"
-"FTPArchive::ReadOnlyDB</literal>."
+"Make the caching databases read only.  Configuration Item: "
+"<literal>APT::FTPArchive::ReadOnlyDB</literal>."
 msgstr ""
 "Przeszukaj tylko nazwy pakietów, pomijając szczegółowe opisy.  Pozycja w "
 "pliku konfiguracyjnym: <literal>APT::Cache::NamesOnly</literal>."
@@ -9103,8 +9121,8 @@ msgstr ""
 "Jeżeli polecenie to albo <literal>install</literal>, albo <literal>remove</"
 "literal>, to ta opcja działa tak, jak uruchomienie polecenia "
 "<literal>autoremove</literal> i usuwa pakiety mające nieużywane już "
-"zależności. Pozycja w pliku konfiguracyjnym: <literal>APT::Get::"
-"AutomaticRemove</literal>."
+"zależności. Pozycja w pliku konfiguracyjnym: "
+"<literal>APT::Get::AutomaticRemove</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml
@@ -9452,16 +9470,17 @@ msgid ""
 "The environment variable <envar>http_proxy</envar> is supported for system "
 "wide configuration.  Proxies specific to APT can be configured via the "
 "option <literal>Acquire::http::Proxy</literal>.  Proxies which should be "
-"used only for certain hosts can be specified via <literal>Acquire::http::"
-"Proxy::<replaceable>host</replaceable></literal>. Even more fine-grained "
-"control can be achieved via proxy autodetection, detailed further below.  "
-"All these options use the URI format <literal><replaceable>scheme</"
-"replaceable>://[[<replaceable>user</replaceable>][:<replaceable>pass</"
-"replaceable>]@]<replaceable>host</replaceable>[:<replaceable>port</"
-"replaceable>]/</literal>.  Supported URI schemes are <literal>socks5h</"
-"literal> (SOCKS5 with remote DNS resolution), <literal>http</literal> and "
-"<literal>https</literal>.  Authentication details can be supplied via &apt-"
-"authconf; instead of including it in the URI directly."
+"used only for certain hosts can be specified via "
+"<literal>Acquire::http::Proxy::<replaceable>host</replaceable></literal>. "
+"Even more fine-grained control can be achieved via proxy autodetection, "
+"detailed further below.  All these options use the URI format "
+"<literal><replaceable>scheme</replaceable>://[[<replaceable>user</"
+"replaceable>][:<replaceable>pass</replaceable>]@]<replaceable>host</"
+"replaceable>[:<replaceable>port</replaceable>]/</literal>.  Supported URI "
+"schemes are <literal>socks5h</literal> (SOCKS5 with remote DNS resolution), "
+"<literal>http</literal> and <literal>https</literal>.  Authentication "
+"details can be supplied via &apt-authconf; instead of including it in the "
+"URI directly."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
@@ -9476,14 +9495,14 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt-transport-http.1.xml
 msgid ""
-"Furthermore, there are three settings provided for cache control with "
-"HTTP/1.1 compliant proxy caches: <literal>Acquire::http::No-Cache</literal> "
-"tells the proxy not to use its cached response under any circumstances.  "
+"Furthermore, there are three settings provided for cache control with HTTP/"
+"1.1 compliant proxy caches: <literal>Acquire::http::No-Cache</literal> tells "
+"the proxy not to use its cached response under any circumstances.  "
 "<literal>Acquire::http::Max-Age</literal> sets the allowed maximum age (in "
-"seconds) of an index file in the cache of the proxy.  <literal>Acquire::"
-"http::No-Store</literal> specifies that the proxy should not store the "
-"requested archive files in its cache, which can be used to prevent the proxy "
-"from polluting its cache with (big) .deb files."
+"seconds) of an index file in the cache of the proxy.  "
+"<literal>Acquire::http::No-Store</literal> specifies that the proxy should "
+"not store the requested archive files in its cache, which can be used to "
+"prevent the proxy from polluting its cache with (big) .deb files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
@@ -9523,8 +9542,8 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt-transport-http.1.xml
 msgid ""
-"This option takes precedence over the legacy option name <literal>Acquire::"
-"http::ProxyAutoDetect</literal>."
+"This option takes precedence over the legacy option name "
+"<literal>Acquire::http::ProxyAutoDetect</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
@@ -9556,12 +9575,12 @@ msgstr ""
 #: apt-transport-http.1.xml
 msgid ""
 "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
-"enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
-"g. on high-latency connections. It specifies how many requests are sent in a "
-"pipeline.  APT tries to detect and work around misbehaving webservers and "
-"proxies at runtime, but if you know that yours does not conform to the "
-"HTTP/1.1 specification, pipelining can be disabled by setting the value to "
-"0. It is enabled by default with the value 10."
+"enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial "
+"e.g. on high-latency connections. It specifies how many requests are sent in "
+"a pipeline.  APT tries to detect and work around misbehaving webservers and "
+"proxies at runtime, but if you know that yours does not conform to the HTTP/"
+"1.1 specification, pipelining can be disabled by setting the value to 0. It "
+"is enabled by default with the value 10."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
@@ -9648,9 +9667,9 @@ msgstr ""
 msgid ""
 "The HTTPS protocol is based on the HTTP protocol, so all options supported "
 "by &apt-transport-http; are also available via <literal>Acquire::https</"
-"literal> and will default to the same values specified for <literal>Acquire::"
-"http</literal>. This manpage will only document the options <emphasis>unique "
-"to https</emphasis>."
+"literal> and will default to the same values specified for "
+"<literal>Acquire::http</literal>. This manpage will only document the "
+"options <emphasis>unique to https</emphasis>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
@@ -9679,9 +9698,10 @@ msgstr ""
 #: apt-transport-https.1.xml
 msgid ""
 "A custom certificate revocation list (CRL) can be configured with the "
-"options <literal>Acquire::https::CRLFile</literal> and <literal>Acquire::"
-"https::CRLFile::<replaceable>host</replaceable></literal>.  As with the "
-"previous option, a file in PEM format needs to be specified."
+"options <literal>Acquire::https::CRLFile</literal> and "
+"<literal>Acquire::https::CRLFile::<replaceable>host</replaceable></"
+"literal>.  As with the previous option, a file in PEM format needs to be "
+"specified."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
@@ -9727,11 +9747,11 @@ msgstr ""
 msgid ""
 "Besides supporting password-based authentication (see &apt-authconf;) HTTPS "
 "also supports authentication based on client certificates via "
-"<literal>Acquire::https::SSLCert</literal> and <literal>Acquire::https::"
-"SSLKey</literal>. These should be set respectively to the filename of the "
-"X.509 client certificate and the associated (unencrypted) private key, both "
-"in PEM format.  In practice the use of the host-specific variants of both "
-"options is highly recommended."
+"<literal>Acquire::https::SSLCert</literal> and "
+"<literal>Acquire::https::SSLKey</literal>. These should be set respectively "
+"to the filename of the X.509 client certificate and the associated "
+"(unencrypted) private key, both in PEM format.  In practice the use of the "
+"host-specific variants of both options is highly recommended."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
@@ -9933,9 +9953,9 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt-transport-mirror.1.xml
 msgid ""
-"Assuming a file with this content is stored as <filename>/etc/apt/mirrorlist."
-"txt</filename> on your machine it can be used like this in &sources-list; "
-"(since apt 1.6):"
+"Assuming a file with this content is stored as <filename>/etc/apt/"
+"mirrorlist.txt</filename> on your machine it can be used like this in "
+"&sources-list; (since apt 1.6):"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><literallayout>
@@ -10764,10 +10784,10 @@ msgstr ""
 #: apt-patterns.7.xml
 msgid ""
 "<code>foo</code> cannot be used as a shortform for <code>?name(foo)</code>, "
-"as this can cause typos to go unnoticed: Consider <code>?and(...,"
-"~poptional)</code>: this requires the package to have <code>required</code> "
-"priority, but if you do not type the <code>~</code>, it would require the "
-"package name to contain <code>poptional</code>."
+"as this can cause typos to go unnoticed: Consider <code>?"
+"and(...,~poptional)</code>: this requires the package to have "
+"<code>required</code> priority, but if you do not type the <code>~</code>, "
+"it would require the package name to contain <code>poptional</code>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
@@ -11355,8 +11375,8 @@ msgid ""
 "<literal>Dselect::clean \"prompt\";</literal> in /etc/apt/apt.conf."
 msgstr ""
 "Domyślnie APT automatycznie usunie pliki pakietów (.deb), gdy tylko zostaną "
-"zainstalowane. Aby zmienić to zachowanie, proszę umieścić  <literal>Dselect::"
-"clean \"prompt\";</literal> w /etc/apt/apt.conf."
+"zainstalowane. Aby zmienić to zachowanie, proszę umieścić  "
+"<literal>Dselect::clean \"prompt\";</literal> w /etc/apt/apt.conf."
 
 #. type: Content of: <book><chapter><title>
 #: guide.dbk
@@ -12101,11 +12121,11 @@ msgid ""
 "file URIs."
 msgstr ""
 "Plik konfiguracyjny powinien informować program APT, aby przechowywał swoje "
-"pliki na dysku, a także używał plików konfiguracyjnych z dysku. Plik sources."
-"list powinien zawierać prawidłowe odnośniki, których należy użyć na zdalnym "
-"komputerze, a plik status powinien być kopią <emphasis>/var/lib/dpkg/status</"
-"emphasis>. Należy zauważyć, że podczas używania lokalnego archiwum trzeba "
-"użyć tych samych odnośników o identycznej składni."
+"pliki na dysku, a także używał plików konfiguracyjnych z dysku. Plik "
+"sources.list powinien zawierać prawidłowe odnośniki, których należy użyć na "
+"zdalnym komputerze, a plik status powinien być kopią <emphasis>/var/lib/dpkg/"
+"status</emphasis>. Należy zauważyć, że podczas używania lokalnego archiwum "
+"trzeba użyć tych samych odnośników o identycznej składni."
 
 #. type: Content of: <book><chapter><section><para>
 #: offline.dbk
@@ -12176,8 +12196,8 @@ msgid ""
 "emphasis>."
 msgstr ""
 "Więcej szczegółów można zobaczyć w stronie podręcznika apt.conf i w "
-"przykładowym pliku konfiguracyjnym <emphasis>/usr/share/doc/apt/examples/apt."
-"conf</emphasis>."
+"przykładowym pliku konfiguracyjnym <emphasis>/usr/share/doc/apt/examples/"
+"apt.conf</emphasis>."
 
 #. type: Content of: <book><chapter><section><para>
 #: offline.dbk
@@ -12523,9 +12543,9 @@ msgstr "Które użyje pobranych uprzednio archiwów z dysku."
 #~ "With this option it is possible to specify a particular keyring file the "
 #~ "command should operate on. The default is that a command is executed on "
 #~ "the <filename>trusted.gpg</filename> file as well as on all parts in the "
-#~ "<filename>trusted.gpg.d</filename> directory, though <filename>trusted."
-#~ "gpg</filename> is the primary keyring which means that e.g. new keys are "
-#~ "added to this one."
+#~ "<filename>trusted.gpg.d</filename> directory, though "
+#~ "<filename>trusted.gpg</filename> is the primary keyring which means that "
+#~ "e.g. new keys are added to this one."
 #~ msgstr ""
 #~ "Opcja pozwala na podanie pliku składnicy kluczy publicznych używanego w "
 #~ "programie. Domyślnie program używa pliku <filename>trusted.gpg</filename> "
@@ -12731,8 +12751,8 @@ msgstr "Które użyje pobranych uprzednio archiwów z dysku."
 #
 #~ msgid ""
 #~ "No action; perform a simulation of events that would occur but do not "
-#~ "actually change the system.  Configuration Item: <literal>APT::Get::"
-#~ "Simulate</literal>."
+#~ "actually change the system.  Configuration Item: "
+#~ "<literal>APT::Get::Simulate</literal>."
 #~ msgstr ""
 #~ "Brak akcji; wykonuje symulację zdarzeń, które mogłyby się przytrafić, ale "
 #~ "nic nie zmienia w systemie.  Pozycja w pliku konfiguracyjnym: "
@@ -12740,12 +12760,12 @@ msgstr "Które użyje pobranych uprzednio archiwów z dysku."
 
 #~ msgid ""
 #~ "Simulated runs performed as a user will automatically deactivate locking "
-#~ "(<literal>Debug::NoLocking</literal>), and if the option <literal>APT::"
-#~ "Get::Show-User-Simulation-Note</literal> is set (as it is by default) a "
-#~ "notice will also be displayed indicating that this is only a simulation. "
-#~ "Runs performed as root do not trigger either NoLocking or the notice - "
-#~ "superusers should know what they are doing without further warnings from "
-#~ "<literal>apt-get</literal>."
+#~ "(<literal>Debug::NoLocking</literal>), and if the option "
+#~ "<literal>APT::Get::Show-User-Simulation-Note</literal> is set (as it is "
+#~ "by default) a notice will also be displayed indicating that this is only "
+#~ "a simulation. Runs performed as root do not trigger either NoLocking or "
+#~ "the notice - superusers should know what they are doing without further "
+#~ "warnings from <literal>apt-get</literal>."
 #~ msgstr ""
 #~ "Symulowane uruchomienia przeprowadzane przez przez zwykłego użytkownika "
 #~ "automatycznie wyłączą blokady (<literal>Debug::NoLocking</literal>). "
@@ -12892,8 +12912,8 @@ msgstr "Które użyje pobranych uprzednio archiwów z dysku."
 #~| "B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources.list>(5), "
 #~| "B<apt_preferences>(5), B<apt-secure>(8)"
 #~ msgid ""
-#~ "B<apt>(8), B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources."
-#~ "list>(5), B<apt_preferences>(5), B<apt-secure>(8)"
+#~ "B<apt>(8), B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), "
+#~ "B<sources.list>(5), B<apt_preferences>(5), B<apt-secure>(8)"
 #~ msgstr ""
 #~ "B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources.list>(5), "
 #~ "B<apt_preferences>(5), B<apt-secure>(8)"
@@ -13003,8 +13023,8 @@ msgstr "Które użyje pobranych uprzednio archiwów z dysku."
 #~ "Uses HTTP to access the archive at nonus.debian.org, under the debian-non-"
 #~ "US directory."
 #~ msgstr ""
-#~ "Użycie HTTP do uzyskania dostępu do archiwum na komputerze  nonus.debian."
-#~ "org, w katalogu debian-non-US."
+#~ "Użycie HTTP do uzyskania dostępu do archiwum na komputerze  "
+#~ "nonus.debian.org, w katalogu debian-non-US."
 
 #~ msgid ""
 #~ "Status list of auto-installed packages.  Configuration Item: "
diff --git a/doc/po/pt.po b/doc/po/pt.po
index 4090862f5..83a7985b1 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 2.9.10\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2025-01-01 21:58+0100\n"
+"POT-Creation-Date: 2025-01-28 18:52+0000\n"
 "PO-Revision-Date: 2024-10-29 23:10+0000\n"
 "Last-Translator: Américo Monteiro <a_monteiro@gmx.com>\n"
 "Language-Team: Portuguese <>\n"
@@ -559,11 +559,13 @@ msgstr ""
 #. type: Plain text
 #: apt.ent
 msgid ""
-"<!-- TRANSLATOR: used as in -o=config_string e.g. -o=Debug::"
-"pkgProblemResolver=1 --> <!ENTITY synopsis-config-string \"config_string\">"
+"<!-- TRANSLATOR: used as in -o=config_string e.g. "
+"-o=Debug::pkgProblemResolver=1 --> <!ENTITY synopsis-config-string "
+"\"config_string\">"
 msgstr ""
-"<!-- TRANSLATOR: usado como -o=config_string ex. -o=Debug::"
-"pkgProblemResolver=1 --> <!ENTITY synopsis-config-string \"config_string\">"
+"<!-- TRANSLATOR: usado como -o=config_string ex. "
+"-o=Debug::pkgProblemResolver=1 --> <!ENTITY synopsis-config-string "
+"\"config_string\">"
 
 #. type: Plain text
 #: apt.ent
@@ -577,13 +579,13 @@ msgstr ""
 #. type: Plain text
 #: apt.ent
 msgid ""
-"<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release e.g. -"
-"t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
+"<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release e.g. "
+"-t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
 "\"target_release\">"
 msgstr ""
-"<!-- TRANSLATOR: usado como -t=target_release ou pkg/target_release ex. -"
-"t=squeeze apt/experimental --> <!ENTITY synopsis-target-release \"lançamento-"
-"alvo\">"
+"<!-- TRANSLATOR: usado como -t=target_release ou pkg/target_release ex. "
+"-t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
+"\"lançamento-alvo\">"
 
 #. type: Plain text
 #: apt.ent
@@ -633,8 +635,8 @@ msgstr ""
 #. type: Plain text
 #: apt.ent
 msgid ""
-"<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom -"
-"d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"cdrom_mount_point\">"
+"<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom "
+"-d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"cdrom_mount_point\">"
 msgstr ""
 "<!-- TRANSLATOR: usado como apt-cdrom -d=cdrom_mount_point ex. apt-cdrom -d=/"
 "media/cdrom --> <!ENTITY synopsis-cdrom-mount \"ponto_de_montagem-do_cdrom\">"
@@ -1164,10 +1166,10 @@ msgstr ""
 "command> tem um sistema de resolução de conflitos 'inteligente', que irá "
 "tentar actualizar os pacotes mais importantes a custo dos pacotes menos "
 "importantes, caso necessário. Portanto, o comando <literal>dist-upgrade</"
-"literal> pode remover alguns pacotes. O ficheiro <filename>/etc/apt/sources."
-"list</filename> contém uma lista de localizações de onde obter os ficheiros "
-"de pacotes desejados. Veja também &apt-preferences; para um mecanismo para "
-"sobrepor as definições gerais em pacotes individuais."
+"literal> pode remover alguns pacotes. O ficheiro <filename>/etc/apt/"
+"sources.list</filename> contém uma lista de localizações de onde obter os "
+"ficheiros de pacotes desejados. Veja também &apt-preferences; para um "
+"mecanismo para sobrepor as definições gerais em pacotes individuais."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -1405,8 +1407,8 @@ msgstr ""
 "Uma versão fonte específica pode ser obtida ao pós-fixar o nome da fonte com "
 "um igual (=) e depois a versão a procurar, semelhante ao mecanismo usado "
 "para os ficheiros de pacotes. Isto activa a correspondência exacta do pacote "
-"fonte, nome e versão, activando implicitamente a opção <literal>APT::Get::"
-"Only-Source</literal>."
+"fonte, nome e versão, activando implicitamente a opção "
+"<literal>APT::Get::Only-Source</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -1647,8 +1649,8 @@ msgid ""
 "Configuration Item: <literal>APT::Get::Download-Only</literal>."
 msgstr ""
 "Apenas descarrega; os ficheiros pacotes são apenas obtidos, não são "
-"desempacotados nem instalados. Item de Configuração: <literal>APT::Get::"
-"Download-Only</literal>."
+"desempacotados nem instalados. Item de Configuração: "
+"<literal>APT::Get::Download-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -1662,8 +1664,8 @@ msgid ""
 "structure can be so corrupt as to require manual intervention (which usually "
 "means using <command>dpkg --remove</command> to eliminate some of the "
 "offending packages). Use of this option together with <option>-m</option> "
-"may produce an error in some situations.  Configuration Item: <literal>APT::"
-"Get::Fix-Broken</literal>."
+"may produce an error in some situations.  Configuration Item: "
+"<literal>APT::Get::Fix-Broken</literal>."
 msgstr ""
 "Corrige; tenta corrigir um sistema com dependências quebradas no lugar. Esta "
 "opção, quando usada com install/remove, pode omitir quaisquer pacotes para "
@@ -1749,8 +1751,8 @@ msgstr ""
 "os quais podem não ter acesso de leitura a todas as configurações do apt "
 "distorcendo a simulação. Também é mostrada por predefinição uma nota "
 "expressando este aviso aos utilizadores não-root. (<option>APT::Get::Show-"
-"User-Simulation-Note</option>). Item de Configuração: <literal>APT::Get::"
-"Simulate</literal>."
+"User-Simulation-Note</option>). Item de Configuração: "
+"<literal>APT::Get::Simulate</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -1786,8 +1788,8 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
-"Automatic \"no\" to all prompts.  Configuration Item: <literal>APT::Get::"
-"Assume-No</literal>."
+"Automatic \"no\" to all prompts.  Configuration Item: "
+"<literal>APT::Get::Assume-No</literal>."
 msgstr ""
 "Resposta \"Não\" automática a todos os avisos. Item de Configuração: "
 "<literal>APT::Get::Assume-No</literal>."
@@ -1827,15 +1829,15 @@ msgstr ""
 #, fuzzy
 #| msgid ""
 #| "Select the source override file to use with the <literal>sources</"
-#| "literal> command.  Configuration Item: <literal>APT::FTPArchive::"
-#| "SourceOverride</literal>."
+#| "literal> command.  Configuration Item: "
+#| "<literal>APT::FTPArchive::SourceOverride</literal>."
 msgid ""
 "Add the given value to the <literal>Comment:</literal> field in history.log "
 "Configuration Item: <literal>APT::History::Comment</literal>."
 msgstr ""
 "Seleciona o ficheiro de sobreposição de fonte a usar com o comando "
-"<literal>sources</literal>. Item de Configuração: <literal>APT::FTPArchive::"
-"SourceOverride</literal>."
+"<literal>sources</literal>. Item de Configuração: "
+"<literal>APT::FTPArchive::SourceOverride</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -1843,9 +1845,9 @@ msgid ""
 "This option controls the architecture packages are built for by <command>apt-"
 "get source --compile</command> and how cross-builddependencies are "
 "satisfied. By default is it not set which means that the host architecture "
-"is the same as the build architecture (which is defined by <literal>APT::"
-"Architecture</literal>).  Configuration Item: <literal>APT::Get::Host-"
-"Architecture</literal>."
+"is the same as the build architecture (which is defined by "
+"<literal>APT::Architecture</literal>).  Configuration Item: "
+"<literal>APT::Get::Host-Architecture</literal>."
 msgstr ""
 "Esta opção controla a arquitectura para que os pacotes são compilados pelo "
 "<command>apt-get source --compile</command> e como as dependências cruzadas "
@@ -2011,8 +2013,8 @@ msgid ""
 "name on the remote site! This also works with the <literal>source</literal> "
 "and <literal>update</literal> commands. When used with the <literal>update</"
 "literal> command the MD5 and size are not included, and it is up to the user "
-"to decompress any compressed files.  Configuration Item: <literal>APT::Get::"
-"Print-URIs</literal>."
+"to decompress any compressed files.  Configuration Item: "
+"<literal>APT::Get::Print-URIs</literal>."
 msgstr ""
 "Ao invés de ir buscar os ficheiros para instalar, escreve os seus URIs. Cada "
 "URI irá ter o caminho, o nome de ficheiro de destino, o tamanho e o hash MD5 "
@@ -2053,8 +2055,8 @@ msgid ""
 "turn it off. When it is on, <command>apt-get</command> will automatically "
 "manage the contents of <filename>&statedir;/lists</filename> to ensure that "
 "obsolete files are erased.  The only reason to turn it off is if you "
-"frequently change your sources list.  Configuration Item: <literal>APT::Get::"
-"List-Cleanup</literal>."
+"frequently change your sources list.  Configuration Item: "
+"<literal>APT::Get::List-Cleanup</literal>."
 msgstr ""
 "Esta opção está ligada por predefinição; use <literal>--no-list-cleanup</"
 "literal> para a desligar. Quando ligada o <command>apt-get</command> irá "
@@ -2075,8 +2077,8 @@ msgstr ""
 "Esta opção controla o instantâneo escolhido para arquivos com "
 "<literal>Snapshot: enable</literal> na entrada de fonte. Por exemplo, "
 "<option>-S 20220102T030405Z</option> seleciona um instantâneo de 2 de "
-"Janeiro de 0022 às 03:04:05 UTC. Item de Configuração: <literal>APT::"
-"Snapshot</literal>; veja também o manual &sources-list;."
+"Janeiro de 0022 às 03:04:05 UTC. Item de Configuração: "
+"<literal>APT::Snapshot</literal>; veja também o manual &sources-list;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -2112,8 +2114,8 @@ msgstr ""
 "Apenas executa operações 'triviais'. Na lógica isto pode ser considerado "
 "relacionado ao <option>--assume-yes</option>, onde <option>--assume-yes</"
 "option> irá responder 'sim' a todos os avisos, <option>--trivial-only</"
-"option> irá responder 'não'. Item de Configuração: <literal>APT::Get::"
-"Trivial-Only</literal>."
+"option> irá responder 'não'. Item de Configuração: "
+"<literal>APT::Get::Trivial-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -2217,8 +2219,8 @@ msgstr ""
 "risco de segurança se a autenticidade dos dados não poder ser assegurada de "
 "outro modo pelo próprio utilizador. A utilização da opção <option>Trusted</"
 "option> para entradas da &sources-list; deve normalmente ser preferida em "
-"vez desta sobreposição global. Item de configuração: <literal>APT::Get::"
-"AllowUnauthenticated</literal>."
+"vez desta sobreposição global. Item de configuração: "
+"<literal>APT::Get::AllowUnauthenticated</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -2267,8 +2269,8 @@ msgstr ""
 "apenas para certos campos como <literal>origin</literal>, <literal>label</"
 "literal>, <literal>codename</literal>, <literal>suite</literal>, "
 "<literal>version</literal> e <literal>defaultpin</literal>. Veja também &apt-"
-"preferences;. Item de Configuração: <literal>Acquire::"
-"AllowReleaseInfoChange</literal>."
+"preferences;. Item de Configuração: "
+"<literal>Acquire::AllowReleaseInfoChange</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -2282,8 +2284,8 @@ msgstr ""
 "Mostra informação de progresso compreensível para o utilizador na janela de "
 "terminal quando os pacotes são instalados, actualizados ou removidos. Para "
 "uma versão \"analisável por máquina\" destes dados veja o  README.progress-"
-"reporting no directório doc do apt. Itens de Configuração:  <literal>Dpkg::"
-"Progress</literal> e <literal>Dpkg::Progress-Fancy</literal>."
+"reporting no directório doc do apt. Itens de Configuração:  "
+"<literal>Dpkg::Progress</literal> e <literal>Dpkg::Progress-Fancy</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -2338,8 +2340,8 @@ msgstr ""
 "Embargo: Devido a limitações técnicas, as trancas são adquiridas "
 "individualmente para cada fase, assim uma instalação pode falhar ao adquirir "
 "tranca após executar com sucesso a actualização. Até que isto seja "
-"resolvido, isto é meramente açúcar sintático para <literal>apt update &amp;"
-"&amp; apt install</literal>"
+"resolvido, isto é meramente açúcar sintático para <literal>apt update "
+"&amp;&amp; apt install</literal>"
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml apt-cache.8.xml apt-mark.8.xml apt.conf.5.xml
@@ -2771,12 +2773,12 @@ msgstr ""
 #: apt-cache.8.xml
 msgid ""
 "The same as <literal>dotty</literal>, only for xvcg from the <ulink "
-"url=\"https://www.rw.cdl.uni-saarland.de/people/sander/private/html/gsvcg1."
-"html\">VCG tool</ulink>."
+"url=\"https://www.rw.cdl.uni-saarland.de/people/sander/private/html/"
+"gsvcg1.html\">VCG tool</ulink>."
 msgstr ""
 "O mesmo que <literal>dotty</literal>, apenas para xvcg a partir de <ulink "
-"url=\"https://www.rw.cdl.uni-saarland.de/people/sander/private/html/gsvcg1."
-"html\">Ferramenta VCG</ulink>."
+"url=\"https://www.rw.cdl.uni-saarland.de/people/sander/private/html/"
+"gsvcg1.html\">Ferramenta VCG</ulink>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml
@@ -2804,23 +2806,23 @@ msgid ""
 "archive management tool, <literal>madison</literal>.  It displays available "
 "versions of a package in a tabular format.  Unlike the original "
 "<literal>madison</literal>, it can only display information for the "
-"architecture for which APT has retrieved package lists (<literal>APT::"
-"Architecture</literal>)."
+"architecture for which APT has retrieved package lists "
+"(<literal>APT::Architecture</literal>)."
 msgstr ""
 "O comando <literal>madison</literal> do <literal>apt-cache</literal> tenta "
 "imitar o formato de saída e um subconjunto das funcionalidades da ferramenta "
 "<literal>madison</literal> de gestão de pacotes da Debian. Mostra versões "
 "disponíveis de um pacote num formato tabular. Ao contrário do "
 "<literal>madison</literal> original, apenas pode mostrar informação para a "
-"arquitectura que o APT recolheu listas de pacotes (<literal>APT::"
-"Architecture</literal>)."
+"arquitectura que o APT recolheu listas de pacotes "
+"(<literal>APT::Architecture</literal>)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml
 msgid ""
 "Select the file to store the package cache. The package cache is the primary "
-"cache used by all operations.  Configuration Item: <literal>Dir::Cache::"
-"pkgcache</literal>."
+"cache used by all operations.  Configuration Item: "
+"<literal>Dir::Cache::pkgcache</literal>."
 msgstr ""
 "Seleciona o ficheiro para armazenar a cache do pacote. A cache do pacote é a "
 "cache principal usada por todas as operações. Item de Configuração: "
@@ -2864,17 +2866,17 @@ msgid ""
 msgstr ""
 "Escreve apenas dependências importantes; para usar com <literal>unmet</"
 "literal> e <literal>depends</literal>. Separa apenas relações de Depends e "
-"Pre-Depends para serem escritas. Item de Configuração: <literal>APT::Cache::"
-"Important</literal>."
+"Pre-Depends para serem escritas. Item de Configuração: "
+"<literal>APT::Cache::Important</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml
 msgid ""
 "Per default the <command>depends</command> and <command>rdepends</command> "
 "print all dependencies. This can be tweaked with these flags which will omit "
-"the specified dependency type.  Configuration Item: <literal>APT::Cache::"
-"Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::"
-"Cache::ShowRecommends</literal>."
+"the specified dependency type.  Configuration Item: "
+"<literal>APT::Cache::Show<replaceable>DependencyType</replaceable></literal> "
+"e.g. <literal>APT::Cache::ShowRecommends</literal>."
 msgstr ""
 "Por predefinição o <command>depends</command> and <command>rdepends</"
 "command> escrevem todas as dependências. Isto pode ser \"afinado\" com estas "
@@ -2952,8 +2954,8 @@ msgstr ""
 #: apt-cache.8.xml
 msgid ""
 "Make <literal>pkgnames</literal> print all names, including virtual packages "
-"and missing dependencies.  Configuration Item: <literal>APT::Cache::"
-"AllNames</literal>."
+"and missing dependencies.  Configuration Item: "
+"<literal>APT::Cache::AllNames</literal>."
 msgstr ""
 "Faz com que o <literal>pkgnames</literal> escreva todos os nomes, incluindo "
 "pacotes virtuais e dependências em falta. Item de configuração: "
@@ -2992,10 +2994,11 @@ msgid ""
 msgstr ""
 "Adiciona o ficheiro fornecido como a fonte para meta-dados. Pode ser "
 "repetido para adicionar múltiplos ficheiros. Presentemente são suportados "
-"ficheiros <literal>*.deb</literal>, <literal>*.dsc</literal>, <literal>*."
-"changes</literal>, <literal>Sources</literal> e <literal>Packages</literal> "
-"assim como directórios de pacotes fonte: A correspondência dos ficheiros é "
-"baseada apenas com base no seu nome, não no seu conteúdo."
+"ficheiros <literal>*.deb</literal>, <literal>*.dsc</literal>, "
+"<literal>*.changes</literal>, <literal>Sources</literal> e "
+"<literal>Packages</literal> assim como directórios de pacotes fonte: A "
+"correspondência dos ficheiros é baseada apenas com base no seu nome, não no "
+"seu conteúdo."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml
@@ -3046,8 +3049,8 @@ msgid ""
 "<command>apt-mark</command> can be used as a unified front-end to set "
 "various settings for a package, such as marking a package as being "
 "automatically/manually installed or changing <command>dpkg</command> "
-"selections such as hold, install, deinstall and purge which are respected e."
-"g. by <command>apt-get dselect-upgrade</command> or <command>aptitude</"
+"selections such as hold, install, deinstall and purge which are respected "
+"e.g. by <command>apt-get dselect-upgrade</command> or <command>aptitude</"
 "command>."
 msgstr ""
 "<command>apt-mark</command> pode ser usado como um front-end unificado para "
@@ -3287,10 +3290,11 @@ msgstr "Configuração do Utilizador"
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""
-"Keys should usually be included inside their corresponding <literal>."
-"sources</literal> by embedding the ASCII-armored key in the <literal>Signed-"
-"By</literal> option.  To do so, replace the empty line with a dot, and then "
-"indent all lines by two spaces.  See &sources-list; for more information."
+"Keys should usually be included inside their corresponding "
+"<literal>.sources</literal> by embedding the ASCII-armored key in the "
+"<literal>Signed-By</literal> option.  To do so, replace the empty line with "
+"a dot, and then indent all lines by two spaces.  See &sources-list; for more "
+"information."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -3303,8 +3307,9 @@ msgid ""
 "literal> file or using <literal>deb [signed-by=/etc/apt/keyrings/example-"
 "archive-keyring.asc] ...</literal> in the legacy <literal>.list</literal> "
 "format. This may be useful for APT versions prior to 2.4, which do not "
-"support embedded keys. ASCII-armored keys must use an extension of <literal>."
-"asc</literal>, and unarmored keys an extension of <literal>.gpg</literal>."
+"support embedded keys. ASCII-armored keys must use an extension of "
+"<literal>.asc</literal>, and unarmored keys an extension of <literal>.gpg</"
+"literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -3603,12 +3608,12 @@ msgstr ""
 #: apt-secure.8.xml
 msgid ""
 "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg --"
-"clearsign -o InRelease Release</command> and <command>gpg -abs -o Release."
-"gpg Release</command>."
+"clearsign -o InRelease Release</command> and <command>gpg -abs -o "
+"Release.gpg Release</command>."
 msgstr ""
 "<emphasis>Assina-lo</emphasis>. Você pode fazer isso ao correr <command>gpg "
-"--clearsign -o InRelease Release</command> e <command>gpg -abs -o Release."
-"gpg Release</command>."
+"--clearsign -o InRelease Release</command> e <command>gpg -abs -o "
+"Release.gpg Release</command>."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #: apt-secure.8.xml
@@ -3680,8 +3685,8 @@ msgstr ""
 "Para mais informação de fundo você deve querer reler a <ulink url=\"https://"
 "www.debian.org/doc/manuals/securing-debian-manual/ch07\">Infraestrutura de "
 "Segurança da Debian</ulink> no capítulo do Manual Debian de Segurança "
-"(disponível também no pacote harden-doc) e o <ulink url=\"http://www."
-"cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution HOWTO</"
+"(disponível também no pacote harden-doc) e o <ulink url=\"http://"
+"www.cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution HOWTO</"
 "ulink> de V. Alex Brennen."
 
 #. type: Content of: <refentry><refsect1><title>
@@ -3751,8 +3756,8 @@ msgid ""
 "filename>"
 msgstr ""
 "O APT usa um ID de CD-ROM para acompanhar qual disco está actualmente na "
-"drive e mantêm uma base de dados desses IDs em <filename>&statedir;/cdroms."
-"list</filename>"
+"drive e mantêm uma base de dados desses IDs em <filename>&statedir;/"
+"cdroms.list</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml
@@ -3767,12 +3772,12 @@ msgstr ""
 #: apt-cdrom.8.xml
 msgid ""
 "Do not try to auto-detect the CD-ROM path. Usually combined with the "
-"<option>--cdrom</option> option.  Configuration Item: <literal>Acquire::"
-"cdrom::AutoDetect</literal>."
+"<option>--cdrom</option> option.  Configuration Item: "
+"<literal>Acquire::cdrom::AutoDetect</literal>."
 msgstr ""
 "Não tente a auto-detecção do caminho do CD-ROM. Normalmente combinada com a "
-"opção <option>--cdrom</option>.  Item de Configuração: <literal>Acquire::"
-"cdrom::AutoDetect</literal>."
+"opção <option>--cdrom</option>.  Item de Configuração: "
+"<literal>Acquire::cdrom::AutoDetect</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml
@@ -3783,8 +3788,8 @@ msgid ""
 msgstr ""
 "Ponto de Montagem; especifica a localização para montar o cdrom. Este ponto "
 "de montagem deve estar listado em <filename>/etc/fstab</filename> e "
-"configurado apropriadamente. Item de configuração: <literal>Acquire::cdrom::"
-"mount</literal>."
+"configurado apropriadamente. Item de configuração: "
+"<literal>Acquire::cdrom::mount</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml
@@ -3795,19 +3800,19 @@ msgid ""
 msgstr ""
 "Renomear um disco; muda a etiqueta de um disco ou sobrepõe a etiqueta "
 "fornecida do disco. Esta opção irá fazer com que o <command>apt-cdrom</"
-"command> pergunte por uma nova etiqueta. Item de configuração: <literal>APT::"
-"CDROM::Rename</literal>."
+"command> pergunte por uma nova etiqueta. Item de configuração: "
+"<literal>APT::CDROM::Rename</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml
 msgid ""
 "No mounting; prevent <command>apt-cdrom</command> from mounting and "
-"unmounting the mount point.  Configuration Item: <literal>APT::CDROM::"
-"NoMount</literal>."
+"unmounting the mount point.  Configuration Item: "
+"<literal>APT::CDROM::NoMount</literal>."
 msgstr ""
 "Nenhuma montagem; impede o <command>apt-cdrom</command> de montar e "
-"desmontar o ponto de montagem. Item de configuração: <literal>APT::CDROM::"
-"NoMount</literal>."
+"desmontar o ponto de montagem. Item de configuração: "
+"<literal>APT::CDROM::NoMount</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml
@@ -3906,11 +3911,11 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-config.8.xml
 msgid ""
-"This will set the shell environment variable $OPTS to the value of MyApp::"
-"options with a default of <option>-f</option>."
+"This will set the shell environment variable $OPTS to the value of "
+"MyApp::options with a default of <option>-f</option>."
 msgstr ""
-"Isto irá definir a variável de ambiente shell $OPTS ao valor de MyApp::"
-"options com uma predefinição de <option>-f</option>."
+"Isto irá definir a variável de ambiente shell $OPTS ao valor de "
+"MyApp::options com uma predefinição de <option>-f</option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-config.8.xml
@@ -4035,9 +4040,9 @@ msgid ""
 "order which have either no or \"<literal>conf</literal>\" as filename "
 "extension and which only contain alphanumeric, hyphen (-), underscore (_) "
 "and period (.) characters.  Otherwise APT will print a notice that it has "
-"ignored a file, unless that file matches a pattern in the <literal>Dir::"
-"Ignore-Files-Silently</literal> configuration list - in which case it will "
-"be silently ignored."
+"ignored a file, unless that file matches a pattern in the "
+"<literal>Dir::Ignore-Files-Silently</literal> configuration list - in which "
+"case it will be silently ignored."
 msgstr ""
 "todos os ficheiros em <literal>Dir::Etc::Parts</literal> em ordem ascendente "
 "alfa-numérica não têm extensão ou têm \"<literal>conf</literal>\" como "
@@ -4052,8 +4057,8 @@ msgstr ""
 msgid ""
 "the main configuration file specified by <literal>Dir::Etc::main</literal>"
 msgstr ""
-"o ficheiro de configuração principal especificado por <literal>Dir::Etc::"
-"main</literal>"
+"o ficheiro de configuração principal especificado por "
+"<literal>Dir::Etc::main</literal>"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
 #: apt.conf.5.xml
@@ -4113,12 +4118,13 @@ msgstr ""
 "<literal>//</literal> são tratadas como comentários (ignoradas), assim como "
 "todo o texto entre <literal>/*</literal> e <literal>*/</literal>, tal como "
 "os comentários de C/C++. As linhas começadas com <literal>#</literal> são "
-"também tratadas como comentários. Cada linha é do formato <literal>APT::Get::"
-"Assume-Yes \"true\";</literal>. As aspas e o ponto-e-vírgula final são "
-"necessários. O valor deve estar em uma linha, e não existe nenhum tipo de "
-"concatenação de string. Os valores não podem incluir barras invertidas ou "
-"aspas extras. Os nomes das opções são feitos de caracteres alfa-numéricos e "
-"os caracteres \"/-:._+\". Um novo scope pode ser aberto com chavetas, assim:"
+"também tratadas como comentários. Cada linha é do formato "
+"<literal>APT::Get::Assume-Yes \"true\";</literal>. As aspas e o ponto-e-"
+"vírgula final são necessários. O valor deve estar em uma linha, e não existe "
+"nenhum tipo de concatenação de string. Os valores não podem incluir barras "
+"invertidas ou aspas extras. Os nomes das opções são feitos de caracteres "
+"alfa-numéricos e os caracteres \"/-:._+\". Um novo scope pode ser aberto com "
+"chavetas, assim:"
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
 #: apt.conf.5.xml
@@ -4172,8 +4178,8 @@ msgid ""
 "example you could use <literal>dpkg::pre-install-pkgs</literal>."
 msgstr ""
 "Maiúsculas e minúsculas não são significativas nos nomes dos items de "
-"configuração, portanto no exemplo prévio você poderia usar <literal>dpkg::"
-"pre-install-pkgs</literal>."
+"configuração, portanto no exemplo prévio você poderia usar "
+"<literal>dpkg::pre-install-pkgs</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml
@@ -4341,18 +4347,21 @@ msgstr ""
 msgid ""
 "The subscope <option>action</option> defines the colors for package lists in "
 "<option>install</option> and similar commands. The following options may be "
-"set: <option>APT::Color::Action::Upgrade</option>, <option>APT::Color::"
-"Action::Install</option>, <option>APT::Color::Action::Install-Dependencies</"
-"option>, <option>APT::Color::Action::Downgrade</option>, <option>APT::Color::"
-"Action::Remove</option>; corresponding to their lists in the &apt; output."
+"set: <option>APT::Color::Action::Upgrade</option>, "
+"<option>APT::Color::Action::Install</option>, "
+"<option>APT::Color::Action::Install-Dependencies</option>, "
+"<option>APT::Color::Action::Downgrade</option>, "
+"<option>APT::Color::Action::Remove</option>; corresponding to their lists in "
+"the &apt; output."
 msgstr ""
 "O sub-escopo <option>action</option> define as cores para listas de pacotes "
 "em <option>install</option> e comandos semelhantes. As seguintes opções "
 "podem ser definidas: <option>APT::Color::Action::Upgrade</option>, "
-"<option>APT::Color::Action::Install</option>, <option>APT::Color::Action::"
-"Install-Dependencies</option>, <option>APT::Color::Action::Downgrade</"
-"option>, <option>APT::Color::Action::Remove</option>; correspondendo às suas "
-"listas no resultado do &apt;."
+"<option>APT::Color::Action::Install</option>, "
+"<option>APT::Color::Action::Install-Dependencies</option>, "
+"<option>APT::Color::Action::Downgrade</option>, "
+"<option>APT::Color::Action::Remove</option>; correspondendo às suas listas "
+"no resultado do &apt;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
@@ -4472,8 +4481,8 @@ msgid ""
 msgstr ""
 "Instantâneo a usar para todos os repositórios configurados com "
 "<literal>Snapshot: yes</literal>. Veja também &sources-list;, a opção "
-"<option>--snapshot</option> que define este valor, e <option>Acquire::"
-"Snapshots::URI</option> em baixo."
+"<option>--snapshot</option> que define este valor, e "
+"<option>Acquire::Snapshots::URI</option> em baixo."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
@@ -4683,8 +4692,8 @@ msgstr ""
 #: apt.conf.5.xml
 msgid ""
 "Define the regular expression(s) for versioned kernel packages.  Based on "
-"these expressions a rule set is injected into apt similar to APT::"
-"NeverAutoRemove regular expressions."
+"these expressions a rule set is injected into apt similar to "
+"APT::NeverAutoRemove regular expressions."
 msgstr ""
 "Define as expressão(ões) regulares para pacotes de kernel versionados.  Com "
 "base nestas expressões um conjunto de regras é injetado no apt semelhante às "
@@ -5139,9 +5148,9 @@ msgid ""
 "that these codes are not included twice in the list. If "
 "<literal>LC_MESSAGES</literal> is set to \"C\" only the "
 "<filename>Translation-en</filename> file (if available) will be used.  To "
-"force APT to use no Translation file use the setting <literal>Acquire::"
-"Languages=none</literal>. \"<literal>none</literal>\" is another special "
-"meaning code which will stop the search for a suitable "
+"force APT to use no Translation file use the setting "
+"<literal>Acquire::Languages=none</literal>. \"<literal>none</literal>\" is "
+"another special meaning code which will stop the search for a suitable "
 "<filename>Translation</filename> file.  This tells APT to download these "
 "translations too, without actually using them unless the environment "
 "specifies the languages. So the following example configuration will result "
@@ -5273,38 +5282,40 @@ msgid ""
 "<replaceable>ORIGIN</replaceable></literal> option exists and if so this "
 "value is taken. The value in the Release file can be overridden with "
 "<literal>Acquire::Changelogs::URI::Override::Label::<replaceable>LABEL</"
-"replaceable></literal> or <literal>Acquire::Changelogs::URI::Override::"
-"Origin::<replaceable>ORIGIN</replaceable></literal>.  The value should be a "
-"normal URI to a text file, except that package specific data is replaced "
-"with the placeholder <literal>@CHANGEPATH@</literal>. The value for it is: "
-"1. if the package is from a component (e.g. <literal>main</literal>)  this "
-"is the first part otherwise it is omitted, 2. the first letter of source "
-"package name, except if the source package name starts with '<literal>lib</"
-"literal>' in which case it will be the first four letters. 3. The complete "
-"source package name. 4. the complete name again and 5. the source version.  "
-"The first (if present), second, third and fourth part are separated by a "
-"slash ('<literal>/</literal>')  and between the fourth and fifth part is an "
-"underscore ('<literal>_</literal>').  The special value '<literal>no</"
-"literal>' is available for this option indicating that this source can't be "
-"used to acquire changelog files from. Another source will be tried if "
-"available in this case."
+"replaceable></literal> or "
+"<literal>Acquire::Changelogs::URI::Override::Origin::<replaceable>ORIGIN</"
+"replaceable></literal>.  The value should be a normal URI to a text file, "
+"except that package specific data is replaced with the placeholder "
+"<literal>@CHANGEPATH@</literal>. The value for it is: 1. if the package is "
+"from a component (e.g. <literal>main</literal>)  this is the first part "
+"otherwise it is omitted, 2. the first letter of source package name, except "
+"if the source package name starts with '<literal>lib</literal>' in which "
+"case it will be the first four letters. 3. The complete source package name. "
+"4. the complete name again and 5. the source version.  The first (if "
+"present), second, third and fourth part are separated by a slash ('<literal>/"
+"</literal>')  and between the fourth and fifth part is an underscore "
+"('<literal>_</literal>').  The special value '<literal>no</literal>' is "
+"available for this option indicating that this source can't be used to "
+"acquire changelog files from. Another source will be tried if available in "
+"this case."
 msgstr ""
 "Adquirir changelogs só pode ser feito se for conhecido um URL de onde os "
 "obter. De preferência o ficheiro Release indica isto num campo 'Changelogs'. "
 "Se isto não estiver disponível, é usado o campo Label/Origin do ficheiro "
-"Release para verificar se uma opção <literal>Acquire::Changelogs::URI::"
-"Label::<replaceable>LABEL</replaceable></literal> ou <literal>Acquire::"
-"Changelogs::URI::Origin::<replaceable>ORIGIN</replaceable></literal> existem "
-"e se sim é utilizado este valor. Este valor no ficheiro Release pode ser "
-"sobreposto com <literal>Acquire::Changelogs::URI::Override::Label::"
-"<replaceable>LABEL</replaceable></literal> ou <literal>Acquire::Changelogs::"
-"URI::Override::Origin::<replaceable>ORIGIN</replaceable></literal>. O valor "
-"deve ser um URI normal para um ficheiro de texto, excepto se os dados desse "
-"pacote específico for substituído pelo marcador de posição "
-"<literal>@CHANGEPATH@</literal>. O valor para isto é: 1. se o pacote "
-"pertence a um componente (ex. <literal>main</literal>) esta é a primeira "
-"parte, caso contrário é omitida. 2. a primeira letra do nome do pacote "
-"fonte, excepto se o nome do pacote fonte começar com '<literal>lib</"
+"Release para verificar se uma opção "
+"<literal>Acquire::Changelogs::URI::Label::<replaceable>LABEL</replaceable></"
+"literal> ou <literal>Acquire::Changelogs::URI::Origin::<replaceable>ORIGIN</"
+"replaceable></literal> existem e se sim é utilizado este valor. Este valor "
+"no ficheiro Release pode ser sobreposto com "
+"<literal>Acquire::Changelogs::URI::Override::Label::<replaceable>LABEL</"
+"replaceable></literal> ou "
+"<literal>Acquire::Changelogs::URI::Override::Origin::<replaceable>ORIGIN</"
+"replaceable></literal>. O valor deve ser um URI normal para um ficheiro de "
+"texto, excepto se os dados desse pacote específico for substituído pelo "
+"marcador de posição <literal>@CHANGEPATH@</literal>. O valor para isto é: 1. "
+"se o pacote pertence a um componente (ex. <literal>main</literal>) esta é a "
+"primeira parte, caso contrário é omitida. 2. a primeira letra do nome do "
+"pacote fonte, excepto se o nome do pacote fonte começar com '<literal>lib</"
 "literal>' e neste caso será as primeiras quatro letras. 3. O nome completo "
 "do pacote fonte. 4. O nome completo outra vez e 5. a versão da fonte. A "
 "primeira (se presente), segunda, terceira e quarta partes são separadas por "
@@ -5321,17 +5332,19 @@ msgid ""
 "where to get them.  Preferable the Release file indicates this in a "
 "'Snapshots' field. If this isn't available the Label/Origin field of the "
 "Release file is used to check if a <literal>Acquire::Snapshots::URI::Label::"
-"<replaceable>LABEL</replaceable></literal> or <literal>Acquire::Snapshots::"
-"URI::Origin::<replaceable>ORIGIN</replaceable></literal> option exists and "
-"if so this value is taken. The value in the Release file can be overridden "
-"with <literal>Acquire::Snapshots::URI::Override::Label::<replaceable>LABEL</"
-"replaceable></literal> or <literal>Acquire::Snapshots::URI::Override::"
-"Origin::<replaceable>ORIGIN</replaceable></literal>.  The value should be a "
-"normal URI to a directory, except that the snapshot ID replaced with the "
-"placeholder <literal>@SNAPSHOTID@</literal>.  The special value "
-"'<literal>no</literal>' is available for this option indicating that this "
-"source cannot be used to acquire snapshots from. Another source will be "
-"tried if available in this case."
+"<replaceable>LABEL</replaceable></literal> or "
+"<literal>Acquire::Snapshots::URI::Origin::<replaceable>ORIGIN</replaceable></"
+"literal> option exists and if so this value is taken. The value in the "
+"Release file can be overridden with "
+"<literal>Acquire::Snapshots::URI::Override::Label::<replaceable>LABEL</"
+"replaceable></literal> or "
+"<literal>Acquire::Snapshots::URI::Override::Origin::<replaceable>ORIGIN</"
+"replaceable></literal>.  The value should be a normal URI to a directory, "
+"except that the snapshot ID replaced with the placeholder "
+"<literal>@SNAPSHOTID@</literal>.  The special value '<literal>no</literal>' "
+"is available for this option indicating that this source cannot be used to "
+"acquire snapshots from. Another source will be tried if available in this "
+"case."
 msgstr ""
 "Tal como changelogs, os instantâneos só podem ser adquiridos se for "
 "conhecido um URI de onde os obter. Preferencialmente o ficheiro Release "
@@ -5340,8 +5353,9 @@ msgstr ""
 "<literal>Acquire::Snapshots::URI::Label::<replaceable>LABEL</replaceable></"
 "literal> ou <literal>Acquire::Snapshots::URI::Origin::<replaceable>ORIGIN</"
 "replaceable></literal> existe e se sim esse valor é tomado. O valor no "
-"ficheiro Release pode ser sobreposto com <literal>Acquire::Snapshots::URI::"
-"Override::Label::<replaceable>LABEL</replaceable></literal> ou "
+"ficheiro Release pode ser sobreposto com "
+"<literal>Acquire::Snapshots::URI::Override::Label::<replaceable>LABEL</"
+"replaceable></literal> ou "
 "<literal>Acquire::Snapshots::URI::Override::Origin::<replaceable>ORIGIN</"
 "replaceable></literal>. O valor deve ser um URI normal para um directório, "
 "excepto com o ID de instantâneo substituído pelo marcador de posição "
@@ -5360,15 +5374,15 @@ msgstr "Configuração específica de binário"
 msgid ""
 "Especially with the introduction of the <command>apt</command> binary it can "
 "be useful to set certain options only for a specific binary as even options "
-"which look like they would effect only a certain binary like <option>APT::"
-"Get::Show-Versions</option> effect <command>apt-get</command> as well as "
-"<command>apt</command>."
+"which look like they would effect only a certain binary like "
+"<option>APT::Get::Show-Versions</option> effect <command>apt-get</command> "
+"as well as <command>apt</command>."
 msgstr ""
 "Especialmente com a introdução do binário <command>apt</command> pode ser "
 "útil para definir certas opções apenas para um binário específico mesmo como "
-"opções que parecessem apenas afectar um certo binário como <option>APT::Get::"
-"Show-Versions</option> afecta <command>apt-get</command> assim como "
-"<command>apt</command>."
+"opções que parecessem apenas afectar um certo binário como "
+"<option>APT::Get::Show-Versions</option> afecta <command>apt-get</command> "
+"assim como <command>apt</command>."
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml
@@ -5473,12 +5487,12 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml
 msgid ""
-"Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
-"Bin::Methods</literal> specifies the location of the method handlers and "
-"<literal>gzip</literal>, <literal>bzip2</literal>, <literal>lzma</literal>, "
-"<literal>dpkg</literal>, <literal>apt-get</literal> <literal>dpkg-source</"
-"literal> <literal>dpkg-buildpackage</literal> and <literal>apt-cache</"
-"literal> specify the location of the respective programs."
+"Binary programs are pointed to by <literal>Dir::Bin</literal>. "
+"<literal>Dir::Bin::Methods</literal> specifies the location of the method "
+"handlers and <literal>gzip</literal>, <literal>bzip2</literal>, "
+"<literal>lzma</literal>, <literal>dpkg</literal>, <literal>apt-get</literal> "
+"<literal>dpkg-source</literal> <literal>dpkg-buildpackage</literal> and "
+"<literal>apt-cache</literal> specify the location of the respective programs."
 msgstr ""
 "Programas binários são apontados por <literal>Dir::Bin</literal>. "
 "<literal>Dir::Bin::Methods</literal> especifica a localização dos "
@@ -5504,11 +5518,11 @@ msgstr ""
 "especial. Se definido, todos os caminhos serão relativos a <literal>RootDir</"
 "literal>, <emphasis>mesmo caminhos que estão absolutamente especificados</"
 "emphasis>. Então, por exemplo, se <literal>RootDir</literal> estiver "
-"definido para <filename>/tmp/staging</filename> e <literal>Dir::State::"
-"status</literal> estiver definido para <filename>/var/lib/dpkg/status</"
-"filename>, então o ficheiro status será procurado em <filename>/tmp/staging/"
-"var/lib/dpkg/status</filename>. Se desejar usar como prefixo apenas caminhos "
-"relativos, defina antes <literal>Dir</literal>."
+"definido para <filename>/tmp/staging</filename> e "
+"<literal>Dir::State::status</literal> estiver definido para <filename>/var/"
+"lib/dpkg/status</filename>, então o ficheiro status será procurado em "
+"<filename>/tmp/staging/var/lib/dpkg/status</filename>. Se desejar usar como "
+"prefixo apenas caminhos relativos, defina antes <literal>Dir</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml
@@ -5523,10 +5537,10 @@ msgstr ""
 "A lista <literal>Ignore-Files-Silently</literal> pode ser usada para "
 "especificar quais os ficheiros que o APT deve ignorar em silêncio enquanto "
 "analisa os ficheiros nos directórios de fragmento. Por predefinição que "
-"termine com <literal>.disabled</literal>, <literal>~</literal>, <literal>."
-"bak</literal> ou <literal>.dpkg-[a-z]+</literal> é ignorado em silêncio. "
-"Como visto no último valor predefinido, estes padrões podem usar sintaxe de "
-"expressão regular."
+"termine com <literal>.disabled</literal>, <literal>~</literal>, "
+"<literal>.bak</literal> ou <literal>.dpkg-[a-z]+</literal> é ignorado em "
+"silêncio. Como visto no último valor predefinido, estes padrões podem usar "
+"sintaxe de expressão regular."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.conf.5.xml
@@ -5681,9 +5695,9 @@ msgid ""
 "literal>.  Special characters (equal signs, newlines, nonprintable "
 "characters, quotation marks, and percent signs in <literal>key</literal> and "
 "newlines, nonprintable characters, and percent signs in <literal>value</"
-"literal>) are %-encoded. Lists are represented by multiple <literal>key::"
-"=value</literal> lines with the same key. The configuration section ends "
-"with a blank line."
+"literal>) are %-encoded. Lists are represented by multiple "
+"<literal>key::=value</literal> lines with the same key. The configuration "
+"section ends with a blank line."
 msgstr ""
 "Cada linha directiva de configuração tem a forma <literal>chave=valor</"
 "literal>. Caracteres especiais (sinais de igual, novas-linhas, caracteres "
@@ -5744,10 +5758,11 @@ msgid ""
 "has support for instead."
 msgstr ""
 "A versão do protocolo a ser usado para o comando <literal><replaceable>cmd</"
-"replaceable></literal> pode ser escolhida ao definir <literal>DPkg::Tools::"
-"options::<replaceable>cmd</replaceable>::Version</literal> correctamente, "
-"sendo a predefinição a versão 1. Se o APT não suportar a versão requisitada "
-"irá então enviar a informação na versão mais alta que suporta."
+"replaceable></literal> pode ser escolhida ao definir "
+"<literal>DPkg::Tools::options::<replaceable>cmd</replaceable>::Version</"
+"literal> correctamente, sendo a predefinição a versão 1. Se o APT não "
+"suportar a versão requisitada irá então enviar a informação na versão mais "
+"alta que suporta."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
@@ -5814,11 +5829,11 @@ msgid ""
 "<literal>/usr/lib/apt/apt.systemd.daily</literal> script. See the top of "
 "this script for the brief documentation of these options."
 msgstr ""
-"Os grupos de opções <literal>APT::Periodic</literal> e <literal>APT::"
-"Archives</literal> configuram o comportamento das actualizações periódicas "
-"do APT, o que é feito pelo script <literal>/usr/lib/apt/apt.systemd.daily</"
-"literal>. Veja o cabeçalho deste script para uma breve documentação das suas "
-"opções."
+"Os grupos de opções <literal>APT::Periodic</literal> e "
+"<literal>APT::Archives</literal> configuram o comportamento das "
+"actualizações periódicas do APT, o que é feito pelo script <literal>/usr/lib/"
+"apt/apt.systemd.daily</literal>. Veja o cabeçalho deste script para uma "
+"breve documentação das suas opções."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.conf.5.xml
@@ -6016,8 +6031,8 @@ msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
 "install pass performed in, e.g., <literal>apt-get install</literal>, and not "
-"to the full <literal>apt</literal> dependency resolver; see <literal>Debug::"
-"pkgProblemResolver</literal> for that."
+"to the full <literal>apt</literal> dependency resolver; see "
+"<literal>Debug::pkgProblemResolver</literal> for that."
 msgstr ""
 "Gera mensagens de depuração descrevendo quais pacotes estão a ser instalados "
 "automaticamente para resolver dependências. Isto corresponde ao passo de "
@@ -6033,14 +6048,14 @@ msgid ""
 "may trigger additional actions; they are shown indented two additional "
 "spaces under the original entry.  The format for each line is "
 "<literal>MarkKeep</literal>, <literal>MarkDelete</literal> or "
-"<literal>MarkInstall</literal> followed by <literal>package-name &lt;a.b.c -"
-"&gt; d.e.f | x.y.z&gt; (section)</literal> where <literal>a.b.c</literal> is "
-"the current version of the package, <literal>d.e.f</literal> is the version "
-"considered for installation and <literal>x.y.z</literal> is a newer version, "
-"but not considered for installation (because of a low pin score). The later "
-"two can be omitted if there is none or if it is the same as the installed "
-"version.  <literal>section</literal> is the name of the section the package "
-"appears in."
+"<literal>MarkInstall</literal> followed by <literal>package-name &lt;a.b.c "
+"-&gt; d.e.f | x.y.z&gt; (section)</literal> where <literal>a.b.c</literal> "
+"is the current version of the package, <literal>d.e.f</literal> is the "
+"version considered for installation and <literal>x.y.z</literal> is a newer "
+"version, but not considered for installation (because of a low pin score). "
+"The later two can be omitted if there is none or if it is the same as the "
+"installed version.  <literal>section</literal> is the name of the section "
+"the package appears in."
 msgstr ""
 "Gera mensagens de depuração descrevendo qual pacote está marcado como manter/"
 "instalar/remover enquanto o \"solucionador-de-problemas\" faz o seu "
@@ -6120,8 +6135,8 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
 msgid ""
-"Print information about the vendors read from <filename>/etc/apt/vendors."
-"list</filename>."
+"Print information about the vendors read from <filename>/etc/apt/"
+"vendors.list</filename>."
 msgstr ""
 "Escreve informação acerca dos fornecedores lida de <filename>/etc/apt/"
 "vendors.list</filename>."
@@ -6129,8 +6144,8 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
 msgid ""
-"Display the external commands that are called by apt hooks.  This includes e."
-"g. the config options <literal>DPkg::{Pre,Post}-Invoke</literal> or "
+"Display the external commands that are called by apt hooks.  This includes "
+"e.g. the config options <literal>DPkg::{Pre,Post}-Invoke</literal> or "
 "<literal>APT::Update::{Pre,Post}-Invoke</literal>."
 msgstr ""
 "Mostra os comandos externos que são chamados por hooks do apt. Isto inclui "
@@ -6662,8 +6677,8 @@ 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\""
+"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
@@ -6935,9 +6950,9 @@ msgstr ""
 #: apt_preferences.5.xml
 msgid ""
 "The <literal>:any</literal> suffix makes sure to select binary packages from "
-"any architecture. Without that suffix, apt implicitly assumes the <literal>:"
-"native</literal> suffix which would only select packages from the native "
-"architecture."
+"any architecture. Without that suffix, apt implicitly assumes the "
+"<literal>:native</literal> suffix which would only select packages from the "
+"native architecture."
 msgstr ""
 "O sufixo <literal>:any</literal> certifica a selecção de pacotes binários de "
 "qualquer arquitectura. Sem este sufixo, o apt assume implicitamente o sufixo "
@@ -7114,9 +7129,9 @@ msgstr "Então:"
 msgid ""
 "The most recent available version of the <literal>perl</literal> package "
 "will be installed, so long as that version's version number begins with "
-"\"<literal>&good-perl;</literal>\".  If <emphasis>any</emphasis> &good-perl;"
-"* version of <literal>perl</literal> is available and the installed version "
-"is &bad-perl;*, then <literal>perl</literal> will be downgraded."
+"\"<literal>&good-perl;</literal>\".  If <emphasis>any</emphasis> &good-"
+"perl;* version of <literal>perl</literal> is available and the installed "
+"version is &bad-perl;*, then <literal>perl</literal> will be downgraded."
 msgstr ""
 "Será instalada a versão mais recente disponível do pacote <literal>perl</"
 "literal>, desde que o número da versão comece com \"<literal>&good-perl;</"
@@ -7395,12 +7410,12 @@ msgid ""
 "files retrieved from locations listed in the &sources-list; file are stored "
 "in the directory <filename>/var/lib/apt/lists</filename>, or in the file "
 "named by the variable <literal>Dir::State::Lists</literal> in the "
-"<filename>apt.conf</filename> file.  For example, the file <filename>debian."
-"lcs.mit.edu_debian_dists_unstable_contrib_binary-i386_Release</filename> "
-"contains the <filename>Release</filename> file retrieved from the site "
-"<literal>debian.lcs.mit.edu</literal> for <literal>binary-i386</literal> "
-"architecture files from the <literal>contrib</literal> component of the "
-"<literal>unstable</literal> distribution."
+"<filename>apt.conf</filename> file.  For example, the file "
+"<filename>debian.lcs.mit.edu_debian_dists_unstable_contrib_binary-"
+"i386_Release</filename> contains the <filename>Release</filename> file "
+"retrieved from the site <literal>debian.lcs.mit.edu</literal> for "
+"<literal>binary-i386</literal> architecture files from the <literal>contrib</"
+"literal> component of the <literal>unstable</literal> distribution."
 msgstr ""
 "Todos os ficheiros <filename>Packages</filename> e <filename>Release</"
 "filename> obtidos das localizações listadas no ficheiro &sources-list; são "
@@ -7765,10 +7780,10 @@ msgstr ""
 "O directório <filename>/etc/apt/sources.list.d</filename> disponibiliza um "
 "modo de adicionar entradas na sources.list em ficheiros separados. São "
 "permitidos dois formatos diferentes de ficheiro como descrito nas próximas "
-"duas secções. Os nomes de ficheiros precisam de ter ou a extensão <filename>."
-"list</filename> ou <filename>.sources</filename> dependendo do formato "
-"contido. Os nomes dos ficheiros podem apenas conter letras (a-z e A-Z), "
-"dígitos (0-9), e os caracteres underscore (_), menos (-) e ponto (.). De "
+"duas secções. Os nomes de ficheiros precisam de ter ou a extensão "
+"<filename>.list</filename> ou <filename>.sources</filename> dependendo do "
+"formato contido. Os nomes dos ficheiros podem apenas conter letras (a-z e A-"
+"Z), dígitos (0-9), e os caracteres underscore (_), menos (-) e ponto (.). De "
 "outro modo o APT irá escrever um aviso de que ignorou um ficheiro, a menos "
 "que esse ficheiro coincida com um padrão na lista de configuração "
 "<literal>Dir::Ignore-Files-Silently</literal> - que neste caso serão "
@@ -7840,6 +7855,12 @@ msgstr ""
 "formato por si mesmas podem não esperar encontrar opções pois estas não eram "
 "comuns antes da introdução do suporte a multi-arquitecturas."
 
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml
+msgid ""
+"This format is deprecated and may eventually be removed, but not before 2029."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><title>
 #: sources.list.5.xml
 msgid "deb822-Style Format"
@@ -8083,10 +8104,17 @@ msgstr "&sourceslist-sources-format;"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "As an example, the sources for your distribution could look like this in "
+#| "one-line-style format: <placeholder type=\"literallayout\" id=\"0\"/> or "
+#| "like this in deb822 style format: <placeholder type=\"literallayout\" "
+#| "id=\"1\"/>"
 msgid ""
-"As an example, the sources for your distribution could look like this in one-"
-"line-style format: <placeholder type=\"literallayout\" id=\"0\"/> or like "
-"this in deb822 style format: <placeholder type=\"literallayout\" id=\"1\"/>"
+"As an example, the sources for your distribution could look like this in the "
+"deprecated one-line-style format: <placeholder type=\"literallayout\" "
+"id=\"0\"/> or like this in deb822 style format: <placeholder "
+"type=\"literallayout\" id=\"1\"/>"
 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 "
@@ -8154,11 +8182,12 @@ msgstr ""
 msgid ""
 "<option>Targets</option> (<option>target</option>) is a multivalue option "
 "defining which download targets apt will try to acquire from this source. If "
-"not specified, the default set is defined by the <option>Acquire::"
-"IndexTargets</option> configuration scope (targets are specified by their "
-"name in the <literal>Created-By</literal> field).  Additionally, targets can "
-"be enabled or disabled by using the <literal>Identifier</literal> field as "
-"an option with a boolean value instead of using this multivalue option."
+"not specified, the default set is defined by the "
+"<option>Acquire::IndexTargets</option> configuration scope (targets are "
+"specified by their name in the <literal>Created-By</literal> field).  "
+"Additionally, targets can be enabled or disabled by using the "
+"<literal>Identifier</literal> field as an option with a boolean value "
+"instead of using this multivalue option."
 msgstr ""
 "<option>Targets</option> (<option>target</option>) é uma opção multi-valor "
 "que define quais alvos de download o apt irá tentar adquirir a partir desta "
@@ -8187,8 +8216,9 @@ msgstr ""
 "se o repositório não anunciar a disponibilidade de PDiffs. Usa por "
 "predefinição o valor da opção com o mesmo nome para um ficheiro índice "
 "específico definido no scope <option>Acquire::IndexTargets</option>, o qual "
-"usa por predefinição o valor da opção de configuração <option>Acquire::"
-"PDiffs</option> o qual usa por predefinição <literal>yes</literal>."
+"usa por predefinição o valor da opção de configuração "
+"<option>Acquire::PDiffs</option> o qual usa por predefinição <literal>yes</"
+"literal>."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #: sources.list.5.xml
@@ -8216,10 +8246,10 @@ msgstr ""
 "funcionalidade se esta fonte indicar suporte para tal, enquanto "
 "<literal>force</literal> irá activar a funcionalidade independentemente do "
 "que a fonte indique. Recorre à predefinição do valor da opção com o mesmo "
-"nome para um ficheiro index específico definido no scope <option>Acquire::"
-"IndexTargets</option>, que o próprio usa por predefinição o valor da opção "
-"de configuração <option>Acquire::By-Hash</option> a qual é predefinida para "
-"<literal>yes</literal>."
+"nome para um ficheiro index específico definido no scope "
+"<option>Acquire::IndexTargets</option>, que o próprio usa por predefinição o "
+"valor da opção de configuração <option>Acquire::By-Hash</option> a qual é "
+"predefinida para <literal>yes</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
@@ -8406,8 +8436,9 @@ msgid ""
 "helps users identify mirrors which are no longer updated. However, some "
 "repositories such as historic archives are not updated any more by design, "
 "so this check can be disabled by setting this option to <literal>no</"
-"literal>.  Defaults to the value of configuration option <option>Acquire::"
-"Check-Valid-Until</option> which itself defaults to <literal>yes</literal>."
+"literal>.  Defaults to the value of configuration option "
+"<option>Acquire::Check-Valid-Until</option> which itself defaults to "
+"<literal>yes</literal>."
 msgstr ""
 "<option>Check-Valid-Until</option> (<option>check-valid-until</option>)  é "
 "um valor yes/no que controla se o APT deverá tentar detectar ataques de "
@@ -8450,8 +8481,9 @@ msgstr ""
 "actualizados (locais) de um arquivo mais frequentemente actualizado mas "
 "menos acessível (o qual está também em sources.list) em vez de desactivar "
 "completamente a verificação. Usa por predefinição o valor das opções de "
-"configuração <option>Acquire::Min-ValidTime</option> and <option>Acquire::"
-"Max-ValidTime</option> que estão ambas não definidas por predefinição."
+"configuração <option>Acquire::Min-ValidTime</option> and "
+"<option>Acquire::Max-ValidTime</option> que estão ambas não definidas por "
+"predefinição."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #: sources.list.5.xml
@@ -9067,8 +9099,8 @@ msgstr ""
 #: apt-extracttemplates.1.xml
 msgid ""
 "Temporary directory in which to write extracted <command>debconf</command> "
-"template files and config scripts.  Configuration Item: <literal>APT::"
-"ExtractTemplates::TempDir</literal>"
+"template files and config scripts.  Configuration Item: "
+"<literal>APT::ExtractTemplates::TempDir</literal>"
 msgstr ""
 "Directório temporário para onde escrever ficheiros <command>debconf</"
 "command> modelo extraídos e scripts de configuração. Item de Configuração: "
@@ -9112,11 +9144,11 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-sortpkgs.1.xml
 msgid ""
-"Use source index field ordering.  Configuration Item: <literal>APT::"
-"SortPkgs::Source</literal>."
+"Use source index field ordering.  Configuration Item: "
+"<literal>APT::SortPkgs::Source</literal>."
 msgstr ""
-"Usa ordenação de campo de índice Source. Item de Configuração: <literal>APT::"
-"SortPkgs::Source</literal>."
+"Usa ordenação de campo de índice Source. Item de Configuração: "
+"<literal>APT::SortPkgs::Source</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-sortpkgs.1.xml
@@ -9249,10 +9281,10 @@ msgid ""
 "<filename>icons</filename> files as well as <filename>Release</filename>, "
 "<filename>Index</filename> and <filename>md5sum.txt</filename> files by "
 "default (<literal>APT::FTPArchive::Release::Default-Patterns</literal>).  "
-"Additional filename patterns can be added by listing them in <literal>APT::"
-"FTPArchive::Release::Patterns</literal>.  It then writes to stdout a "
-"<filename>Release</filename> file containing (by default) an MD5, SHA1, "
-"SHA256 and SHA512 digest for each file."
+"Additional filename patterns can be added by listing them in "
+"<literal>APT::FTPArchive::Release::Patterns</literal>.  It then writes to "
+"stdout a <filename>Release</filename> file containing (by default) an MD5, "
+"SHA1, SHA256 and SHA512 digest for each file."
 msgstr ""
 "O comando <literal>release</literal> gera um ficheiro Release a partir de "
 "uma árvore de directórios. Por predefinição, procura recursivamente no "
@@ -9283,13 +9315,14 @@ msgid ""
 "<literal>Description</literal>."
 msgstr ""
 "Valores para os campos de metadados adicionais no ficheiro Release são "
-"tomados a partir das variáveis correspondentes sob <literal>APT::FTPArchive::"
-"Release</literal>, ex. <literal>APT::FTPArchive::Release::Origin</literal>.  "
-"Os campos suportados são <literal>Origin</literal>, <literal>Label</"
-"literal>, <literal>Suite</literal>, <literal>Version</literal>, "
-"<literal>Codename</literal>, <literal>Date</literal>, <literal>NotAutomatic</"
-"literal>, <literal>ButAutomaticUpgrades</literal>, <literal>Acquire-By-Hash</"
-"literal>, <literal>Valid-Until</literal>, <literal>Signed-By</literal>, "
+"tomados a partir das variáveis correspondentes sob "
+"<literal>APT::FTPArchive::Release</literal>, ex. "
+"<literal>APT::FTPArchive::Release::Origin</literal>.  Os campos suportados "
+"são <literal>Origin</literal>, <literal>Label</literal>, <literal>Suite</"
+"literal>, <literal>Version</literal>, <literal>Codename</literal>, "
+"<literal>Date</literal>, <literal>NotAutomatic</literal>, "
+"<literal>ButAutomaticUpgrades</literal>, <literal>Acquire-By-Hash</literal>, "
+"<literal>Valid-Until</literal>, <literal>Signed-By</literal>, "
 "<literal>Architectures</literal>, <literal>Components</literal> e "
 "<literal>Description</literal>."
 
@@ -9512,12 +9545,12 @@ msgstr "Secção <literal>TreeDefault</literal>"
 #: apt-ftparchive.1.xml
 msgid ""
 "Sets defaults specific to <literal>Tree</literal> sections. All of these "
-"variables are substitution variables and have the strings $(DIST), "
-"$(SECTION) and $(ARCH) replaced with their respective values."
+"variables are substitution variables and have the strings $(DIST), $"
+"(SECTION) and $(ARCH) replaced with their respective values."
 msgstr ""
 "Define predefinições específicas para as secções <literal>Tree</literal>. "
-"Todas estas variáveis são variáveis de substituição e têm as strings "
-"$(DIST), $(SECTION) e $(ARCH) substituídas pelos seus respectivos valores."
+"Todas estas variáveis são variáveis de substituição e têm as strings $"
+"(DIST), $(SECTION) e $(ARCH) substituídas pelos seus respectivos valores."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml
@@ -9551,17 +9584,17 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml
 msgid ""
-"Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
-"$(SECTION)/binary-$(ARCH)/</filename>"
+"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>"
@@ -9572,8 +9605,8 @@ msgid ""
 "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "binary-$(ARCH)/Packages</filename>"
 msgstr ""
-"Define o ficheiro Packages de saída. A predefinição é <filename>$(DIST)/"
-"$(SECTION)/binary-$(ARCH)/Packages</filename>"
+"Define o ficheiro Packages de saída. A predefinição é <filename>$(DIST)/$"
+"(SECTION)/binary-$(ARCH)/Packages</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml
@@ -9581,19 +9614,19 @@ msgid ""
 "Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "source/Sources</filename>"
 msgstr ""
-"Define o ficheiro Sources de saída. A predefinição é <filename>$(DIST)/"
-"$(SECTION)/source/Sources</filename>"
+"Define o ficheiro Sources de saída. A predefinição é <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 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
@@ -9603,8 +9636,8 @@ msgid ""
 "filename>"
 msgstr ""
 "Define o prefixo de caminho que causa que um symlink seja considerado um "
-"link interno em vez de um link externo. A predefinição é <filename>$(DIST)/"
-"$(SECTION)/</filename>"
+"link interno em vez de um link externo. A predefinição é <filename>$(DIST)/$"
+"(SECTION)/</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml
@@ -10018,14 +10051,14 @@ msgid ""
 "literal>."
 msgstr ""
 "Seleciona o ficheiro de sobreposição de fonte a usar com o comando "
-"<literal>sources</literal>. Item de Configuração: <literal>APT::FTPArchive::"
-"SourceOverride</literal>."
+"<literal>sources</literal>. Item de Configuração: "
+"<literal>APT::FTPArchive::SourceOverride</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml
 msgid ""
-"Make the caching databases read only.  Configuration Item: <literal>APT::"
-"FTPArchive::ReadOnlyDB</literal>."
+"Make the caching databases read only.  Configuration Item: "
+"<literal>APT::FTPArchive::ReadOnlyDB</literal>."
 msgstr ""
 "Torna as bases de dados de cache apenas de leitura. Item de Configuração: "
 "<literal>APT::FTPArchive::ReadOnlyDB</literal>."
@@ -10041,8 +10074,8 @@ msgstr ""
 "Aceita nos comandos <literal>packages</literal> e <literal>contents</"
 "literal> apenas ficheiros de pacotes que condizem com <literal>*_arch.deb</"
 "literal> ou <literal>*_all.deb</literal> em vez de todos os ficheiros de "
-"pacotes presentes no caminho fornecido. Item de Configuração: <literal>APT::"
-"FTPArchive::Architecture</literal>."
+"pacotes presentes no caminho fornecido. Item de Configuração: "
+"<literal>APT::FTPArchive::Architecture</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml
@@ -10157,9 +10190,10 @@ msgid ""
 "following tokens being recognized; Unknown tokens will be ignored. Tokens "
 "may be separated by spaces, tabs or newlines."
 msgstr ""
-"O formato definido aqui é semelhante ao formato do ficheiro <filename>~/."
-"netrc</filename> usado pelo <citerefentry><refentrytitle><command>ftp</"
-"command></refentrytitle><manvolnum>1</manvolnum></citerefentry> e programas "
+"O formato definido aqui é semelhante ao formato do ficheiro "
+"<filename>~/.netrc</filename> usado pelo "
+"<citerefentry><refentrytitle><command>ftp</command></"
+"refentrytitle><manvolnum>1</manvolnum></citerefentry> e programas "
 "semelhantes que interagem com servidores. É um formato simples baseado em "
 "token com os seguintes tokens a serem reconhecidos. Os tokens desconhecidos "
 "serão ignorados. Os tokens podem ser separados por espaços, tabs ou nova-"
@@ -10454,16 +10488,17 @@ msgid ""
 "The environment variable <envar>http_proxy</envar> is supported for system "
 "wide configuration.  Proxies specific to APT can be configured via the "
 "option <literal>Acquire::http::Proxy</literal>.  Proxies which should be "
-"used only for certain hosts can be specified via <literal>Acquire::http::"
-"Proxy::<replaceable>host</replaceable></literal>. Even more fine-grained "
-"control can be achieved via proxy autodetection, detailed further below.  "
-"All these options use the URI format <literal><replaceable>scheme</"
-"replaceable>://[[<replaceable>user</replaceable>][:<replaceable>pass</"
-"replaceable>]@]<replaceable>host</replaceable>[:<replaceable>port</"
-"replaceable>]/</literal>.  Supported URI schemes are <literal>socks5h</"
-"literal> (SOCKS5 with remote DNS resolution), <literal>http</literal> and "
-"<literal>https</literal>.  Authentication details can be supplied via &apt-"
-"authconf; instead of including it in the URI directly."
+"used only for certain hosts can be specified via "
+"<literal>Acquire::http::Proxy::<replaceable>host</replaceable></literal>. "
+"Even more fine-grained control can be achieved via proxy autodetection, "
+"detailed further below.  All these options use the URI format "
+"<literal><replaceable>scheme</replaceable>://[[<replaceable>user</"
+"replaceable>][:<replaceable>pass</replaceable>]@]<replaceable>host</"
+"replaceable>[:<replaceable>port</replaceable>]/</literal>.  Supported URI "
+"schemes are <literal>socks5h</literal> (SOCKS5 with remote DNS resolution), "
+"<literal>http</literal> and <literal>https</literal>.  Authentication "
+"details can be supplied via &apt-authconf; instead of including it in the "
+"URI directly."
 msgstr ""
 "A variável de ambiente <envar>http_proxy</envar> é suportada pela "
 "configuração de todo o sistema. Proxies específicos para o APT podem ser "
@@ -10496,14 +10531,14 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt-transport-http.1.xml
 msgid ""
-"Furthermore, there are three settings provided for cache control with "
-"HTTP/1.1 compliant proxy caches: <literal>Acquire::http::No-Cache</literal> "
-"tells the proxy not to use its cached response under any circumstances.  "
+"Furthermore, there are three settings provided for cache control with HTTP/"
+"1.1 compliant proxy caches: <literal>Acquire::http::No-Cache</literal> tells "
+"the proxy not to use its cached response under any circumstances.  "
 "<literal>Acquire::http::Max-Age</literal> sets the allowed maximum age (in "
-"seconds) of an index file in the cache of the proxy.  <literal>Acquire::"
-"http::No-Store</literal> specifies that the proxy should not store the "
-"requested archive files in its cache, which can be used to prevent the proxy "
-"from polluting its cache with (big) .deb files."
+"seconds) of an index file in the cache of the proxy.  "
+"<literal>Acquire::http::No-Store</literal> specifies that the proxy should "
+"not store the requested archive files in its cache, which can be used to "
+"prevent the proxy from polluting its cache with (big) .deb files."
 msgstr ""
 "Mais ainda, existem três definições disponibilizadas para controle de cache "
 "como caches de proxy compatíveis com HTTP/1.1. <literal>Acquire::http::No-"
@@ -10512,8 +10547,8 @@ msgstr ""
 "idade máxima permitida (em segundos) de um ficheiro índice na cache do "
 "proxy. <literal>Acquire::http::No-Store</literal> especifica que o proxy não "
 "deve armazenar os ficheiros de arquivo pedidos na sua cache, o que pode ser "
-"usado para prevenir que o proxy polua a sua cache com (grandes) ficheiros ."
-"deb."
+"usado para prevenir que o proxy polua a sua cache com (grandes) "
+"ficheiros .deb."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 #: apt-transport-http.1.xml
@@ -10548,8 +10583,8 @@ msgid ""
 "<replaceable>host</replaceable></literal>."
 msgstr ""
 "Note que a auto-detecção não será usada para uma máquina se uma configuração "
-"de proxy específica de máquina já estiver definida via <literal>Acquire::"
-"http::Proxy::<replaceable>máquina</replaceable></literal>."
+"de proxy específica de máquina já estiver definida via "
+"<literal>Acquire::http::Proxy::<replaceable>máquina</replaceable></literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt-transport-http.1.xml
@@ -10563,11 +10598,11 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt-transport-http.1.xml
 msgid ""
-"This option takes precedence over the legacy option name <literal>Acquire::"
-"http::ProxyAutoDetect</literal>."
+"This option takes precedence over the legacy option name "
+"<literal>Acquire::http::ProxyAutoDetect</literal>."
 msgstr ""
-"Esta opção toma precedência sobre a opção antiga de nome <literal>Acquire::"
-"http::ProxyAutoDetect</literal>."
+"Esta opção toma precedência sobre a opção antiga de nome "
+"<literal>Acquire::http::ProxyAutoDetect</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 #: apt-transport-http.1.xml
@@ -10604,12 +10639,12 @@ msgstr ""
 #: apt-transport-http.1.xml
 msgid ""
 "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
-"enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
-"g. on high-latency connections. It specifies how many requests are sent in a "
-"pipeline.  APT tries to detect and work around misbehaving webservers and "
-"proxies at runtime, but if you know that yours does not conform to the "
-"HTTP/1.1 specification, pipelining can be disabled by setting the value to "
-"0. It is enabled by default with the value 10."
+"enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial "
+"e.g. on high-latency connections. It specifies how many requests are sent in "
+"a pipeline.  APT tries to detect and work around misbehaving webservers and "
+"proxies at runtime, but if you know that yours does not conform to the HTTP/"
+"1.1 specification, pipelining can be disabled by setting the value to 0. It "
+"is enabled by default with the value 10."
 msgstr ""
 "A definição <literal>Acquire::http::Pipeline-Depth</literal> pode ser usada "
 "para activar o 'pipelining' de HTTP (RFC 2616 secção 8.1.2.2) a qual pode "
@@ -10739,9 +10774,9 @@ msgstr ""
 msgid ""
 "The HTTPS protocol is based on the HTTP protocol, so all options supported "
 "by &apt-transport-http; are also available via <literal>Acquire::https</"
-"literal> and will default to the same values specified for <literal>Acquire::"
-"http</literal>. This manpage will only document the options <emphasis>unique "
-"to https</emphasis>."
+"literal> and will default to the same values specified for "
+"<literal>Acquire::http</literal>. This manpage will only document the "
+"options <emphasis>unique to https</emphasis>."
 msgstr ""
 "O protocolo HTTPS é baseado no protocolo HTTP, assim todas as opções "
 "suportadas pelo &apt-transport-http; são também suportadas via "
@@ -10788,9 +10823,10 @@ msgstr ""
 #: apt-transport-https.1.xml
 msgid ""
 "A custom certificate revocation list (CRL) can be configured with the "
-"options <literal>Acquire::https::CRLFile</literal> and <literal>Acquire::"
-"https::CRLFile::<replaceable>host</replaceable></literal>.  As with the "
-"previous option, a file in PEM format needs to be specified."
+"options <literal>Acquire::https::CRLFile</literal> and "
+"<literal>Acquire::https::CRLFile::<replaceable>host</replaceable></"
+"literal>.  As with the previous option, a file in PEM format needs to be "
+"specified."
 msgstr ""
 "Uma lista de revogação de certificados personalizada (CRL) pode ser "
 "configurada com as opções <literal>Acquire::https::CRLFile</literal> e "
@@ -10861,19 +10897,19 @@ msgstr "Autenticação do cliente"
 msgid ""
 "Besides supporting password-based authentication (see &apt-authconf;) HTTPS "
 "also supports authentication based on client certificates via "
-"<literal>Acquire::https::SSLCert</literal> and <literal>Acquire::https::"
-"SSLKey</literal>. These should be set respectively to the filename of the "
-"X.509 client certificate and the associated (unencrypted) private key, both "
-"in PEM format.  In practice the use of the host-specific variants of both "
-"options is highly recommended."
+"<literal>Acquire::https::SSLCert</literal> and "
+"<literal>Acquire::https::SSLKey</literal>. These should be set respectively "
+"to the filename of the X.509 client certificate and the associated "
+"(unencrypted) private key, both in PEM format.  In practice the use of the "
+"host-specific variants of both options is highly recommended."
 msgstr ""
 "Para além de suportar autenticação baseada em palavra-passe (veja &apt-"
 "authconf;) o HTTPS também suporta autenticação baseada em certificados do "
-"cliente via <literal>Acquire::https::SSLCert</literal> e <literal>Acquire::"
-"https::SSLKey</literal>. Estes devem ser definidos respetivamente no nome de "
-"ficheiro do certificado de cliente X.509 e a chave privada (não encriptada) "
-"associada, ambos em formato PEM. Na prática o uso de variantes especificas "
-"da máquina de ambas opções é altamente recomendado."
+"cliente via <literal>Acquire::https::SSLCert</literal> e "
+"<literal>Acquire::https::SSLKey</literal>. Estes devem ser definidos "
+"respetivamente no nome de ficheiro do certificado de cliente X.509 e a chave "
+"privada (não encriptada) associada, ambos em formato PEM. Na prática o uso "
+"de variantes especificas da máquina de ambas opções é altamente recomendado."
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: apt-transport-https.1.xml
@@ -11162,9 +11198,9 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt-transport-mirror.1.xml
 msgid ""
-"Assuming a file with this content is stored as <filename>/etc/apt/mirrorlist."
-"txt</filename> on your machine it can be used like this in &sources-list; "
-"(since apt 1.6):"
+"Assuming a file with this content is stored as <filename>/etc/apt/"
+"mirrorlist.txt</filename> on your machine it can be used like this in "
+"&sources-list; (since apt 1.6):"
 msgstr ""
 "Assumindo que um ficheiro com este conteúdo está armazenado em <filename>/"
 "etc/apt/mirrorlist.txt</filename> na sua máquina, pode ser usado desta "
@@ -11184,9 +11220,9 @@ msgid ""
 "literal> the sources.list entry from above could instead be written as:"
 msgstr ""
 "Todas as versões do método mirror suportam uma mirrorlist acessível via "
-"HTTP, portanto assumindo que está disponível em <literal>http://apt.example."
-"org/mirror.lst</literal> a entrada sources.list de cima poderá, em vez "
-"dessa, ser escrita como:"
+"HTTP, portanto assumindo que está disponível em <literal>http://"
+"apt.example.org/mirror.lst</literal> a entrada sources.list de cima poderá, "
+"em vez dessa, ser escrita como:"
 
 #. type: Content of: <refentry><refsect1><refsect2><literallayout>
 #: apt-transport-mirror.1.xml
@@ -12100,10 +12136,10 @@ msgstr "?narrow aceita argumentos infinitos"
 #: apt-patterns.7.xml
 msgid ""
 "<code>foo</code> cannot be used as a shortform for <code>?name(foo)</code>, "
-"as this can cause typos to go unnoticed: Consider <code>?and(...,"
-"~poptional)</code>: this requires the package to have <code>required</code> "
-"priority, but if you do not type the <code>~</code>, it would require the "
-"package name to contain <code>poptional</code>."
+"as this can cause typos to go unnoticed: Consider <code>?"
+"and(...,~poptional)</code>: this requires the package to have "
+"<code>required</code> priority, but if you do not type the <code>~</code>, "
+"it would require the package name to contain <code>poptional</code>."
 msgstr ""
 "<code>foo</code> não pode ser usado como abreviatura para <code>?name(foo)</"
 "code>, pois isto pode fazer com que erros de escrita passem despercebidos: "
@@ -12685,8 +12721,8 @@ msgid ""
 "have been successfully installed. To change this behavior place "
 "<literal>Dselect::clean \"prompt\";</literal> in /etc/apt/apt.conf."
 msgstr ""
-"Por predefinição o APT irá automaticamente remover o ficheiro de pacote (."
-"deb) assim que ele tenha sido instalado com sucesso. Para alterar este "
+"Por predefinição o APT irá automaticamente remover o ficheiro de pacote "
+"(.deb) assim que ele tenha sido instalado com sucesso. Para alterar este "
 "comportamento coloque <literal>Dselect::clean \"prompt\";</literal> em /etc/"
 "apt/apt.conf."
 
@@ -13500,8 +13536,8 @@ msgid ""
 "emphasis>."
 msgstr ""
 "Mais detalhes podem ser vistos ao examinar o manual do apt.conf e o exemplo "
-"de ficheiro de configuração em <emphasis>/usr/share/doc/apt/examples/apt."
-"conf</emphasis>."
+"de ficheiro de configuração em <emphasis>/usr/share/doc/apt/examples/"
+"apt.conf</emphasis>."
 
 #. type: Content of: <book><chapter><section><para>
 #: offline.dbk
@@ -13718,35 +13754,36 @@ msgstr "O qual irá usar os arquivos já obtidos e que estão no disco."
 
 #~ msgid ""
 #~ "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP "
-#~ "URIs.  It is in the standard form of <literal>ftp://[[user][:pass]@]host[:"
-#~ "port]/</literal>.  Per host proxies can also be specified by using the "
-#~ "form <literal>ftp::Proxy::&lt;host&gt;</literal> with the special keyword "
-#~ "<literal>DIRECT</literal> meaning to use no proxies. If no one of the "
-#~ "above settings is specified, <envar>ftp_proxy</envar> environment "
-#~ "variable will be used. To use an FTP proxy you will have to set the "
-#~ "<literal>ftp::ProxyLogin</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>."
+#~ "URIs.  It is in the standard form of <literal>ftp://[[user]"
+#~ "[:pass]@]host[:port]/</literal>.  Per host proxies can also be specified "
+#~ "by using the form <literal>ftp::Proxy::&lt;host&gt;</literal> with the "
+#~ "special keyword <literal>DIRECT</literal> meaning to use no proxies. If "
+#~ "no one of the above settings is specified, <envar>ftp_proxy</envar> "
+#~ "environment variable will be used. To use an FTP proxy you will have to "
+#~ "set the <literal>ftp::ProxyLogin</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>."
 #~ 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]/</literal>. Os proxies por máquina podem também ser especificados "
-#~ "ao usar o formato <literal>ftp::Proxy::&lt;host&gt;</literal> com a "
-#~ "palavra chave especial <literal>DIRECT</literal> que significa não usar "
-#~ "nenhum proxy. Se nenhuma das definições acima for especificada, será "
-#~ "usada a variável de ambiente <envar>ftp_proxy</envar>. Para usar um proxy "
-#~ "FTP você tem que definir o script <literal>ftp::ProxyLogin</literal> no "
-#~ "ficheiro de 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>."
+#~ "FTP. Está no formato standard de <literal>ftp://[[user]"
+#~ "[:pass]@]host[:port]/</literal>. Os proxies por máquina podem também ser "
+#~ "especificados ao usar o formato <literal>ftp::Proxy::&lt;host&gt;</"
+#~ "literal> com a palavra chave especial <literal>DIRECT</literal> que "
+#~ "significa não usar nenhum proxy. Se nenhuma das definições acima for "
+#~ "especificada, será usada a variável de ambiente <envar>ftp_proxy</envar>. "
+#~ "Para usar um proxy FTP você tem que definir o script "
+#~ "<literal>ftp::ProxyLogin</literal> no ficheiro de 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>."
 
 #~ msgid ""
 #~ "The option <literal>timeout</literal> sets the timeout timer used by the "
@@ -13945,9 +13982,9 @@ msgstr "O qual irá usar os arquivos já obtidos e que estão no disco."
 #~ "or \"<literal>asc</literal>\" as file extension."
 #~ msgstr ""
 #~ "<emphasis>Note</emphasis>: Em vez de se usar este comando, deve-se "
-#~ "colocar um chaveiro directamente no directório <filename>/etc/apt/trusted."
-#~ "gpg.d/</filename> com um nome descritivo e com \"<literal>gpg</literal>\" "
-#~ "ou \"<literal>asc</literal>\" como extensão de ficheiro."
+#~ "colocar um chaveiro directamente no directório <filename>/etc/apt/"
+#~ "trusted.gpg.d/</filename> com um nome descritivo e com \"<literal>gpg</"
+#~ "literal>\" ou \"<literal>asc</literal>\" como extensão de ficheiro."
 
 #~ msgid "(mostly deprecated)"
 #~ msgstr "(maioritariamente descontinuado)"
@@ -14030,9 +14067,9 @@ msgstr "O qual irá usar os arquivos já obtidos e que estão no disco."
 #~ "With this option it is possible to specify a particular keyring file the "
 #~ "command should operate on. The default is that a command is executed on "
 #~ "the <filename>trusted.gpg</filename> file as well as on all parts in the "
-#~ "<filename>trusted.gpg.d</filename> directory, though <filename>trusted."
-#~ "gpg</filename> is the primary keyring which means that e.g. new keys are "
-#~ "added to this one."
+#~ "<filename>trusted.gpg.d</filename> directory, though "
+#~ "<filename>trusted.gpg</filename> is the primary keyring which means that "
+#~ "e.g. new keys are added to this one."
 #~ msgstr ""
 #~ "Com esta opção é possível especificar um ficheiro de chaveiro específico "
 #~ "com o qual o comando deve operar. A predefinição é que um comando é "
@@ -14061,11 +14098,11 @@ msgstr "O qual irá usar os arquivos já obtidos e que estão no disco."
 #~ "isto:"
 
 #~ msgid ""
-#~ "<literal>wget -qO- https://myrepo.example/myrepo.asc | sudo apt-key add -"
-#~ "</literal>"
+#~ "<literal>wget -qO- https://myrepo.example/myrepo.asc | sudo apt-key add "
+#~ "-</literal>"
 #~ msgstr ""
-#~ "<literal>wget -qO- https://myrepo.example/myrepo.asc | sudo apt-key add -"
-#~ "</literal>"
+#~ "<literal>wget -qO- https://myrepo.example/myrepo.asc | sudo apt-key add "
+#~ "-</literal>"
 
 #~ msgid ""
 #~ "Then you can directly replace this with (though note the recommendation "
@@ -14201,20 +14238,20 @@ msgstr "O qual irá usar os arquivos já obtidos e que estão no disco."
 
 #~ msgid ""
 #~ "<literal>http::Proxy</literal> sets the default proxy to use for HTTP "
-#~ "URIs. It is in the standard form of <literal>http://[[user][:pass]@]host[:"
-#~ "port]/</literal>.  Per host proxies can also be specified by using the "
-#~ "form <literal>http::Proxy::&lt;host&gt;</literal> with the special "
-#~ "keyword <literal>DIRECT</literal> meaning to use no proxies. If no one of "
-#~ "the above settings is specified, <envar>http_proxy</envar> environment "
-#~ "variable will be used."
+#~ "URIs. It is in the standard form of <literal>http://[[user]"
+#~ "[:pass]@]host[:port]/</literal>.  Per host proxies can also be specified "
+#~ "by using the form <literal>http::Proxy::&lt;host&gt;</literal> with the "
+#~ "special keyword <literal>DIRECT</literal> meaning to use no proxies. If "
+#~ "no one of the above settings is specified, <envar>http_proxy</envar> "
+#~ "environment variable will be used."
 #~ msgstr ""
 #~ "<literal>http::Proxy</literal> define o proxy http predefinido a usar "
-#~ "para URIs de HTTP. Está no formato standard de <literal>http://[[user][:"
-#~ "pass]@]host[:port]/</literal>. Também podem ser especificados proxies por "
-#~ "máquina ao usar o formato <literal>http::Proxy::&lt;host&gt;</literal> "
-#~ "com a palavra chave especial <literal>DIRECT</literal> que significa não "
-#~ "usar proxies. Se nenhuma das definições acima for especificada, será "
-#~ "usada a variável de ambiente <envar>http_proxy</envar>."
+#~ "para URIs de HTTP. Está no formato standard de <literal>http://[[user]"
+#~ "[:pass]@]host[:port]/</literal>. Também podem ser especificados proxies "
+#~ "por máquina ao usar o formato <literal>http::Proxy::&lt;host&gt;</"
+#~ "literal> com a palavra chave especial <literal>DIRECT</literal> que "
+#~ "significa não usar proxies. Se nenhuma das definições acima for "
+#~ "especificada, será usada a variável de ambiente <envar>http_proxy</envar>."
 
 #~ msgid ""
 #~ "The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
@@ -14236,39 +14273,40 @@ msgstr "O qual irá usar os arquivos já obtidos e que estão no disco."
 #~ "info about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> "
 #~ "is the corresponding per-host option.  <literal>Verify-Peer</literal> "
 #~ "boolean suboption determines whether or not the server's host certificate "
-#~ "should be verified against trusted certificates.  <literal>&lt;host&gt;::"
-#~ "Verify-Peer</literal> is the corresponding per-host option.  "
-#~ "<literal>Verify-Host</literal> boolean suboption determines whether or "
-#~ "not the server's hostname should be verified.  <literal>&lt;host&gt;::"
-#~ "Verify-Host</literal> is the corresponding per-host option.  "
-#~ "<literal>SslCert</literal> determines what certificate to use for client "
-#~ "authentication. <literal>&lt;host&gt;::SslCert</literal> is the "
-#~ "corresponding per-host option.  <literal>SslKey</literal> determines what "
-#~ "private key to use for client authentication. <literal>&lt;host&gt;::"
-#~ "SslKey</literal> is the corresponding per-host option.  "
-#~ "<literal>SslForceVersion</literal> overrides default SSL version to use.  "
-#~ "It can contain either of the strings '<literal>TLSv1</literal>' or "
-#~ "'<literal>SSLv3</literal>'.  <literal>&lt;host&gt;::SslForceVersion</"
+#~ "should be verified against trusted certificates.  "
+#~ "<literal>&lt;host&gt;::Verify-Peer</literal> is the corresponding per-"
+#~ "host option.  <literal>Verify-Host</literal> boolean suboption determines "
+#~ "whether or not the server's hostname should be verified.  "
+#~ "<literal>&lt;host&gt;::Verify-Host</literal> is the corresponding per-"
+#~ "host option.  <literal>SslCert</literal> determines what certificate to "
+#~ "use for client authentication. <literal>&lt;host&gt;::SslCert</literal> "
+#~ "is the corresponding per-host option.  <literal>SslKey</literal> "
+#~ "determines what private key to use for client authentication. "
+#~ "<literal>&lt;host&gt;::SslKey</literal> is the corresponding per-host "
+#~ "option.  <literal>SslForceVersion</literal> overrides default SSL version "
+#~ "to use.  It can contain either of the strings '<literal>TLSv1</literal>' "
+#~ "or '<literal>SSLv3</literal>'.  <literal>&lt;host&gt;::SslForceVersion</"
 #~ "literal> is the corresponding per-host option."
 #~ msgstr ""
 #~ "A sub-opção <literal>CaInfo</literal> especifica o lugar do ficheiro que "
-#~ "contém informação acerca de certificados de confiança. <literal>&lt;"
-#~ "host&gt;::CaInfo</literal> é a opção 'por máquina' correspondente. A sub-"
-#~ "opção booleana <literal>Verify-Peer</literal> determina se o certificado "
-#~ "da máquina anfitriã deve ou não ser verificado com certificados de "
-#~ "confiança. <literal>&lt;host&gt;::Verify-Peer</literal> é a opção 'por "
-#~ "máquina' correspondente. A sub-opção booleana <literal>Verify-Host</"
-#~ "literal> determina se o nome da máquina servidora deve ao não ser "
-#~ "verificado. <literal>&lt;host&gt;::Verify-Host</literal> é a opção 'por "
-#~ "máquina' correspondente. <literal>SslCert</literal> determina qual "
-#~ "certificado a usar para autenticação de clientes. <literal>&lt;host&gt;::"
-#~ "SslCert</literal> é a opção 'por máquina' correspondente. "
-#~ "<literal>SslKey</literal> determina qual a chave privada a usar para "
-#~ "autenticação de clientes. <literal>&lt;host&gt;::SslKey</literal> é a "
-#~ "opção 'por máquina' correspondente. <literal>SslForceVersion</literal> "
-#~ "sobrepõe a versão SSL predefinida a usar. Pode conter qualquer uma das "
-#~ "strings 'TLSv1' ou 'SSLv3'. <literal>&lt;host&gt;::SslForceVersion</"
-#~ "literal> é a opção 'por máquina' correspondente."
+#~ "contém informação acerca de certificados de confiança. "
+#~ "<literal>&lt;host&gt;::CaInfo</literal> é a opção 'por máquina' "
+#~ "correspondente. A sub-opção booleana <literal>Verify-Peer</literal> "
+#~ "determina se o certificado da máquina anfitriã deve ou não ser verificado "
+#~ "com certificados de confiança. <literal>&lt;host&gt;::Verify-Peer</"
+#~ "literal> é a opção 'por máquina' correspondente. A sub-opção booleana "
+#~ "<literal>Verify-Host</literal> determina se o nome da máquina servidora "
+#~ "deve ao não ser verificado. <literal>&lt;host&gt;::Verify-Host</literal> "
+#~ "é a opção 'por máquina' correspondente. <literal>SslCert</literal> "
+#~ "determina qual certificado a usar para autenticação de clientes. "
+#~ "<literal>&lt;host&gt;::SslCert</literal> é a opção 'por máquina' "
+#~ "correspondente. <literal>SslKey</literal> determina qual a chave privada "
+#~ "a usar para autenticação de clientes. <literal>&lt;host&gt;::SslKey</"
+#~ "literal> é a opção 'por máquina' correspondente. "
+#~ "<literal>SslForceVersion</literal> sobrepõe a versão SSL predefinida a "
+#~ "usar. Pode conter qualquer uma das strings 'TLSv1' ou 'SSLv3'. "
+#~ "<literal>&lt;host&gt;::SslForceVersion</literal> é a opção 'por máquina' "
+#~ "correspondente."
 
 #~ msgid ""
 #~ "The http scheme specifies an HTTP server for the archive. If an "
@@ -14282,8 +14320,9 @@ msgstr "O qual irá usar os arquivos já obtidos e que estão no disco."
 #~ "variável de ambiente <envar>http_proxy</envar> estiver definida com o "
 #~ "formato http://server:port/, será usado o servidor proxy especificado em "
 #~ "<envar>http_proxy</envar>. Os utilizadores de proxies HTTP/1.1 "
-#~ "autenticados pode usar uma string do formato http://user:pass@server:"
-#~ "port/. Note que este não é um método de autenticação seguro."
+#~ "autenticados pode usar uma string do formato http://"
+#~ "user:pass@server:port/. Note que este não é um método de autenticação "
+#~ "seguro."
 
 #~ msgid "Archive Configuration"
 #~ msgstr "Configuração de Arquivo"
@@ -14595,21 +14634,21 @@ msgstr "O qual irá usar os arquivos já obtidos e que estão no disco."
 
 #~ msgid ""
 #~ "No action; perform a simulation of events that would occur but do not "
-#~ "actually change the system.  Configuration Item: <literal>APT::Get::"
-#~ "Simulate</literal>."
+#~ "actually change the system.  Configuration Item: "
+#~ "<literal>APT::Get::Simulate</literal>."
 #~ msgstr ""
 #~ "Nenhuma acção; executa uma simulação dos eventos que irão ocorrer mas na "
-#~ "realidade não altera o sistema. Item de Configuração: <literal>APT::Get::"
-#~ "Simulate</literal>."
+#~ "realidade não altera o sistema. Item de Configuração: "
+#~ "<literal>APT::Get::Simulate</literal>."
 
 #~ msgid ""
 #~ "Simulated runs performed as a user will automatically deactivate locking "
-#~ "(<literal>Debug::NoLocking</literal>), and if the option <literal>APT::"
-#~ "Get::Show-User-Simulation-Note</literal> is set (as it is by default) a "
-#~ "notice will also be displayed indicating that this is only a simulation. "
-#~ "Runs performed as root do not trigger either NoLocking or the notice - "
-#~ "superusers should know what they are doing without further warnings from "
-#~ "<literal>apt-get</literal>."
+#~ "(<literal>Debug::NoLocking</literal>), and if the option "
+#~ "<literal>APT::Get::Show-User-Simulation-Note</literal> is set (as it is "
+#~ "by default) a notice will also be displayed indicating that this is only "
+#~ "a simulation. Runs performed as root do not trigger either NoLocking or "
+#~ "the notice - superusers should know what they are doing without further "
+#~ "warnings from <literal>apt-get</literal>."
 #~ msgstr ""
 #~ "As simulações executadas como um utilizador irão desactivar "
 #~ "automaticamente o bloqueio (<literal>Debug::NoLocking</literal>), e se a "
@@ -14750,18 +14789,20 @@ msgstr "O qual irá usar os arquivos já obtidos e que estão no disco."
 #~ "it encounters unauthenticated archives to give a slightly longer grace "
 #~ "period on this backward compatibility effecting change. This exception "
 #~ "will be removed in future releases and you can opt-out of this grace "
-#~ "period by setting the configuration option <option>Binary::apt-get::"
-#~ "Acquire::AllowInsecureRepositories</option> to <literal>false</literal> "
-#~ "or <option>--no-allow-insecure-repositories</option> on the command line."
+#~ "period by setting the configuration option <option>Binary::apt-"
+#~ "get::Acquire::AllowInsecureRepositories</option> to <literal>false</"
+#~ "literal> or <option>--no-allow-insecure-repositories</option> on the "
+#~ "command line."
 #~ msgstr ""
 #~ "Como uma excepção temporária o &apt-get; (não o &apt;!) dispara avisos "
 #~ "apenas se encontrar arquivos não autenticados para dar um período de "
 #~ "graça ligeiramente mais longo nesta alteração que afecta a "
 #~ "compatibilidade com versões anteriores. Esta excepção será removida em "
 #~ "lançamentos futuros e você pode optar por não usar este período de graça "
-#~ "ao definir a opção de configuração <option>Binary::apt-get::Acquire::"
-#~ "AllowInsecureRepositories</option> para <literal>false</literal> ou "
-#~ "<option>--no-allow-insecure-repositories</option> na linha de comandos."
+#~ "ao definir a opção de configuração <option>Binary::apt-"
+#~ "get::Acquire::AllowInsecureRepositories</option> para <literal>false</"
+#~ "literal> ou <option>--no-allow-insecure-repositories</option> na linha de "
+#~ "comandos."
 
 #~ msgid ""
 #~ "In the future APT will refuse to work with unauthenticated repositories "
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index 020993be2..7b12b6d6b 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: 2025-01-01 21:58+0100\n"
+"POT-Creation-Date: 2025-01-28 18:52+0000\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"
@@ -395,8 +395,9 @@ msgstr ""
 #. type: Plain text
 #: apt.ent
 msgid ""
-"<!-- TRANSLATOR: used as in -o=config_string e.g. -o=Debug::"
-"pkgProblemResolver=1 --> <!ENTITY synopsis-config-string \"config_string\">"
+"<!-- TRANSLATOR: used as in -o=config_string e.g. "
+"-o=Debug::pkgProblemResolver=1 --> <!ENTITY synopsis-config-string "
+"\"config_string\">"
 msgstr ""
 
 #. type: Plain text
@@ -409,8 +410,8 @@ msgstr ""
 #. type: Plain text
 #: apt.ent
 msgid ""
-"<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release e.g. -"
-"t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
+"<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release e.g. "
+"-t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
 "\"target_release\">"
 msgstr ""
 
@@ -452,8 +453,8 @@ msgstr ""
 #. type: Plain text
 #: apt.ent
 msgid ""
-"<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom -"
-"d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"cdrom_mount_point\">"
+"<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom "
+"-d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"cdrom_mount_point\">"
 msgstr ""
 
 #. type: Plain text
@@ -1188,8 +1189,8 @@ msgid ""
 "structure can be so corrupt as to require manual intervention (which usually "
 "means using <command>dpkg --remove</command> to eliminate some of the "
 "offending packages). Use of this option together with <option>-m</option> "
-"may produce an error in some situations.  Configuration Item: <literal>APT::"
-"Get::Fix-Broken</literal>."
+"may produce an error in some situations.  Configuration Item: "
+"<literal>APT::Get::Fix-Broken</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -1261,8 +1262,8 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
-"Automatic \"no\" to all prompts.  Configuration Item: <literal>APT::Get::"
-"Assume-No</literal>."
+"Automatic \"no\" to all prompts.  Configuration Item: "
+"<literal>APT::Get::Assume-No</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -1300,9 +1301,9 @@ msgid ""
 "This option controls the architecture packages are built for by <command>apt-"
 "get source --compile</command> and how cross-builddependencies are "
 "satisfied. By default is it not set which means that the host architecture "
-"is the same as the build architecture (which is defined by <literal>APT::"
-"Architecture</literal>).  Configuration Item: <literal>APT::Get::Host-"
-"Architecture</literal>."
+"is the same as the build architecture (which is defined by "
+"<literal>APT::Architecture</literal>).  Configuration Item: "
+"<literal>APT::Get::Host-Architecture</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -1412,8 +1413,8 @@ msgid ""
 "name on the remote site! This also works with the <literal>source</literal> "
 "and <literal>update</literal> commands. When used with the <literal>update</"
 "literal> command the MD5 and size are not included, and it is up to the user "
-"to decompress any compressed files.  Configuration Item: <literal>APT::Get::"
-"Print-URIs</literal>."
+"to decompress any compressed files.  Configuration Item: "
+"<literal>APT::Get::Print-URIs</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -1439,8 +1440,8 @@ msgid ""
 "turn it off. When it is on, <command>apt-get</command> will automatically "
 "manage the contents of <filename>&statedir;/lists</filename> to ensure that "
 "obsolete files are erased.  The only reason to turn it off is if you "
-"frequently change your sources list.  Configuration Item: <literal>APT::Get::"
-"List-Cleanup</literal>."
+"frequently change your sources list.  Configuration Item: "
+"<literal>APT::Get::List-Cleanup</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -1928,8 +1929,8 @@ msgstr ""
 #: apt-cache.8.xml
 msgid ""
 "The same as <literal>dotty</literal>, only for xvcg from the <ulink "
-"url=\"https://www.rw.cdl.uni-saarland.de/people/sander/private/html/gsvcg1."
-"html\">VCG tool</ulink>."
+"url=\"https://www.rw.cdl.uni-saarland.de/people/sander/private/html/"
+"gsvcg1.html\">VCG tool</ulink>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
@@ -1954,16 +1955,16 @@ msgid ""
 "archive management tool, <literal>madison</literal>.  It displays available "
 "versions of a package in a tabular format.  Unlike the original "
 "<literal>madison</literal>, it can only display information for the "
-"architecture for which APT has retrieved package lists (<literal>APT::"
-"Architecture</literal>)."
+"architecture for which APT has retrieved package lists "
+"(<literal>APT::Architecture</literal>)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml
 msgid ""
 "Select the file to store the package cache. The package cache is the primary "
-"cache used by all operations.  Configuration Item: <literal>Dir::Cache::"
-"pkgcache</literal>."
+"cache used by all operations.  Configuration Item: "
+"<literal>Dir::Cache::pkgcache</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -1998,9 +1999,9 @@ msgstr ""
 msgid ""
 "Per default the <command>depends</command> and <command>rdepends</command> "
 "print all dependencies. This can be tweaked with these flags which will omit "
-"the specified dependency type.  Configuration Item: <literal>APT::Cache::"
-"Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::"
-"Cache::ShowRecommends</literal>."
+"the specified dependency type.  Configuration Item: "
+"<literal>APT::Cache::Show<replaceable>DependencyType</replaceable></literal> "
+"e.g. <literal>APT::Cache::ShowRecommends</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -2051,8 +2052,8 @@ msgstr ""
 #: apt-cache.8.xml
 msgid ""
 "Make <literal>pkgnames</literal> print all names, including virtual packages "
-"and missing dependencies.  Configuration Item: <literal>APT::Cache::"
-"AllNames</literal>."
+"and missing dependencies.  Configuration Item: "
+"<literal>APT::Cache::AllNames</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -2121,8 +2122,8 @@ msgid ""
 "<command>apt-mark</command> can be used as a unified front-end to set "
 "various settings for a package, such as marking a package as being "
 "automatically/manually installed or changing <command>dpkg</command> "
-"selections such as hold, install, deinstall and purge which are respected e."
-"g. by <command>apt-get dselect-upgrade</command> or <command>aptitude</"
+"selections such as hold, install, deinstall and purge which are respected "
+"e.g. by <command>apt-get dselect-upgrade</command> or <command>aptitude</"
 "command>."
 msgstr ""
 
@@ -2293,10 +2294,11 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml
 msgid ""
-"Keys should usually be included inside their corresponding <literal>."
-"sources</literal> by embedding the ASCII-armored key in the <literal>Signed-"
-"By</literal> option.  To do so, replace the empty line with a dot, and then "
-"indent all lines by two spaces.  See &sources-list; for more information."
+"Keys should usually be included inside their corresponding "
+"<literal>.sources</literal> by embedding the ASCII-armored key in the "
+"<literal>Signed-By</literal> option.  To do so, replace the empty line with "
+"a dot, and then indent all lines by two spaces.  See &sources-list; for more "
+"information."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -2309,8 +2311,9 @@ msgid ""
 "literal> file or using <literal>deb [signed-by=/etc/apt/keyrings/example-"
 "archive-keyring.asc] ...</literal> in the legacy <literal>.list</literal> "
 "format. This may be useful for APT versions prior to 2.4, which do not "
-"support embedded keys. ASCII-armored keys must use an extension of <literal>."
-"asc</literal>, and unarmored keys an extension of <literal>.gpg</literal>."
+"support embedded keys. ASCII-armored keys must use an extension of "
+"<literal>.asc</literal>, and unarmored keys an extension of <literal>.gpg</"
+"literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -2515,8 +2518,8 @@ msgstr ""
 #: apt-secure.8.xml
 msgid ""
 "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg --"
-"clearsign -o InRelease Release</command> and <command>gpg -abs -o Release."
-"gpg Release</command>."
+"clearsign -o InRelease Release</command> and <command>gpg -abs -o "
+"Release.gpg Release</command>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
@@ -2629,8 +2632,8 @@ msgstr ""
 #: apt-cdrom.8.xml
 msgid ""
 "Do not try to auto-detect the CD-ROM path. Usually combined with the "
-"<option>--cdrom</option> option.  Configuration Item: <literal>Acquire::"
-"cdrom::AutoDetect</literal>."
+"<option>--cdrom</option> option.  Configuration Item: "
+"<literal>Acquire::cdrom::AutoDetect</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -2653,8 +2656,8 @@ msgstr ""
 #: apt-cdrom.8.xml
 msgid ""
 "No mounting; prevent <command>apt-cdrom</command> from mounting and "
-"unmounting the mount point.  Configuration Item: <literal>APT::CDROM::"
-"NoMount</literal>."
+"unmounting the mount point.  Configuration Item: "
+"<literal>APT::CDROM::NoMount</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -2730,8 +2733,8 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-config.8.xml
 msgid ""
-"This will set the shell environment variable $OPTS to the value of MyApp::"
-"options with a default of <option>-f</option>."
+"This will set the shell environment variable $OPTS to the value of "
+"MyApp::options with a default of <option>-f</option>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -2833,9 +2836,9 @@ msgid ""
 "order which have either no or \"<literal>conf</literal>\" as filename "
 "extension and which only contain alphanumeric, hyphen (-), underscore (_) "
 "and period (.) characters.  Otherwise APT will print a notice that it has "
-"ignored a file, unless that file matches a pattern in the <literal>Dir::"
-"Ignore-Files-Silently</literal> configuration list - in which case it will "
-"be silently ignored."
+"ignored a file, unless that file matches a pattern in the "
+"<literal>Dir::Ignore-Files-Silently</literal> configuration list - in which "
+"case it will be silently ignored."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
@@ -3037,10 +3040,12 @@ msgstr ""
 msgid ""
 "The subscope <option>action</option> defines the colors for package lists in "
 "<option>install</option> and similar commands. The following options may be "
-"set: <option>APT::Color::Action::Upgrade</option>, <option>APT::Color::"
-"Action::Install</option>, <option>APT::Color::Action::Install-Dependencies</"
-"option>, <option>APT::Color::Action::Downgrade</option>, <option>APT::Color::"
-"Action::Remove</option>; corresponding to their lists in the &apt; output."
+"set: <option>APT::Color::Action::Upgrade</option>, "
+"<option>APT::Color::Action::Install</option>, "
+"<option>APT::Color::Action::Install-Dependencies</option>, "
+"<option>APT::Color::Action::Downgrade</option>, "
+"<option>APT::Color::Action::Remove</option>; corresponding to their lists in "
+"the &apt; output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -3258,8 +3263,8 @@ msgstr ""
 #: apt.conf.5.xml
 msgid ""
 "Define the regular expression(s) for versioned kernel packages.  Based on "
-"these expressions a rule set is injected into apt similar to APT::"
-"NeverAutoRemove regular expressions."
+"these expressions a rule set is injected into apt similar to "
+"APT::NeverAutoRemove regular expressions."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -3562,9 +3567,9 @@ msgid ""
 "that these codes are not included twice in the list. If "
 "<literal>LC_MESSAGES</literal> is set to \"C\" only the "
 "<filename>Translation-en</filename> file (if available) will be used.  To "
-"force APT to use no Translation file use the setting <literal>Acquire::"
-"Languages=none</literal>. \"<literal>none</literal>\" is another special "
-"meaning code which will stop the search for a suitable "
+"force APT to use no Translation file use the setting "
+"<literal>Acquire::Languages=none</literal>. \"<literal>none</literal>\" is "
+"another special meaning code which will stop the search for a suitable "
 "<filename>Translation</filename> file.  This tells APT to download these "
 "translations too, without actually using them unless the environment "
 "specifies the languages. So the following example configuration will result "
@@ -3653,21 +3658,22 @@ msgid ""
 "<replaceable>ORIGIN</replaceable></literal> option exists and if so this "
 "value is taken. The value in the Release file can be overridden with "
 "<literal>Acquire::Changelogs::URI::Override::Label::<replaceable>LABEL</"
-"replaceable></literal> or <literal>Acquire::Changelogs::URI::Override::"
-"Origin::<replaceable>ORIGIN</replaceable></literal>.  The value should be a "
-"normal URI to a text file, except that package specific data is replaced "
-"with the placeholder <literal>@CHANGEPATH@</literal>. The value for it is: "
-"1. if the package is from a component (e.g. <literal>main</literal>)  this "
-"is the first part otherwise it is omitted, 2. the first letter of source "
-"package name, except if the source package name starts with '<literal>lib</"
-"literal>' in which case it will be the first four letters. 3. The complete "
-"source package name. 4. the complete name again and 5. the source version.  "
-"The first (if present), second, third and fourth part are separated by a "
-"slash ('<literal>/</literal>')  and between the fourth and fifth part is an "
-"underscore ('<literal>_</literal>').  The special value '<literal>no</"
-"literal>' is available for this option indicating that this source can't be "
-"used to acquire changelog files from. Another source will be tried if "
-"available in this case."
+"replaceable></literal> or "
+"<literal>Acquire::Changelogs::URI::Override::Origin::<replaceable>ORIGIN</"
+"replaceable></literal>.  The value should be a normal URI to a text file, "
+"except that package specific data is replaced with the placeholder "
+"<literal>@CHANGEPATH@</literal>. The value for it is: 1. if the package is "
+"from a component (e.g. <literal>main</literal>)  this is the first part "
+"otherwise it is omitted, 2. the first letter of source package name, except "
+"if the source package name starts with '<literal>lib</literal>' in which "
+"case it will be the first four letters. 3. The complete source package name. "
+"4. the complete name again and 5. the source version.  The first (if "
+"present), second, third and fourth part are separated by a slash ('<literal>/"
+"</literal>')  and between the fourth and fifth part is an underscore "
+"('<literal>_</literal>').  The special value '<literal>no</literal>' is "
+"available for this option indicating that this source can't be used to "
+"acquire changelog files from. Another source will be tried if available in "
+"this case."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -3677,17 +3683,19 @@ msgid ""
 "where to get them.  Preferable the Release file indicates this in a "
 "'Snapshots' field. If this isn't available the Label/Origin field of the "
 "Release file is used to check if a <literal>Acquire::Snapshots::URI::Label::"
-"<replaceable>LABEL</replaceable></literal> or <literal>Acquire::Snapshots::"
-"URI::Origin::<replaceable>ORIGIN</replaceable></literal> option exists and "
-"if so this value is taken. The value in the Release file can be overridden "
-"with <literal>Acquire::Snapshots::URI::Override::Label::<replaceable>LABEL</"
-"replaceable></literal> or <literal>Acquire::Snapshots::URI::Override::"
-"Origin::<replaceable>ORIGIN</replaceable></literal>.  The value should be a "
-"normal URI to a directory, except that the snapshot ID replaced with the "
-"placeholder <literal>@SNAPSHOTID@</literal>.  The special value "
-"'<literal>no</literal>' is available for this option indicating that this "
-"source cannot be used to acquire snapshots from. Another source will be "
-"tried if available in this case."
+"<replaceable>LABEL</replaceable></literal> or "
+"<literal>Acquire::Snapshots::URI::Origin::<replaceable>ORIGIN</replaceable></"
+"literal> option exists and if so this value is taken. The value in the "
+"Release file can be overridden with "
+"<literal>Acquire::Snapshots::URI::Override::Label::<replaceable>LABEL</"
+"replaceable></literal> or "
+"<literal>Acquire::Snapshots::URI::Override::Origin::<replaceable>ORIGIN</"
+"replaceable></literal>.  The value should be a normal URI to a directory, "
+"except that the snapshot ID replaced with the placeholder "
+"<literal>@SNAPSHOTID@</literal>.  The special value '<literal>no</literal>' "
+"is available for this option indicating that this source cannot be used to "
+"acquire snapshots from. Another source will be tried if available in this "
+"case."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
@@ -3700,9 +3708,9 @@ msgstr ""
 msgid ""
 "Especially with the introduction of the <command>apt</command> binary it can "
 "be useful to set certain options only for a specific binary as even options "
-"which look like they would effect only a certain binary like <option>APT::"
-"Get::Show-Versions</option> effect <command>apt-get</command> as well as "
-"<command>apt</command>."
+"which look like they would effect only a certain binary like "
+"<option>APT::Get::Show-Versions</option> effect <command>apt-get</command> "
+"as well as <command>apt</command>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -3775,12 +3783,12 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml
 msgid ""
-"Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
-"Bin::Methods</literal> specifies the location of the method handlers and "
-"<literal>gzip</literal>, <literal>bzip2</literal>, <literal>lzma</literal>, "
-"<literal>dpkg</literal>, <literal>apt-get</literal> <literal>dpkg-source</"
-"literal> <literal>dpkg-buildpackage</literal> and <literal>apt-cache</"
-"literal> specify the location of the respective programs."
+"Binary programs are pointed to by <literal>Dir::Bin</literal>. "
+"<literal>Dir::Bin::Methods</literal> specifies the location of the method "
+"handlers and <literal>gzip</literal>, <literal>bzip2</literal>, "
+"<literal>lzma</literal>, <literal>dpkg</literal>, <literal>apt-get</literal> "
+"<literal>dpkg-source</literal> <literal>dpkg-buildpackage</literal> and "
+"<literal>apt-cache</literal> specify the location of the respective programs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -3918,9 +3926,9 @@ msgid ""
 "literal>.  Special characters (equal signs, newlines, nonprintable "
 "characters, quotation marks, and percent signs in <literal>key</literal> and "
 "newlines, nonprintable characters, and percent signs in <literal>value</"
-"literal>) are %-encoded. Lists are represented by multiple <literal>key::"
-"=value</literal> lines with the same key. The configuration section ends "
-"with a blank line."
+"literal>) are %-encoded. Lists are represented by multiple "
+"<literal>key::=value</literal> lines with the same key. The configuration "
+"section ends with a blank line."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -4158,8 +4166,8 @@ msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
 "install pass performed in, e.g., <literal>apt-get install</literal>, and not "
-"to the full <literal>apt</literal> dependency resolver; see <literal>Debug::"
-"pkgProblemResolver</literal> for that."
+"to the full <literal>apt</literal> dependency resolver; see "
+"<literal>Debug::pkgProblemResolver</literal> for that."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -4170,14 +4178,14 @@ msgid ""
 "may trigger additional actions; they are shown indented two additional "
 "spaces under the original entry.  The format for each line is "
 "<literal>MarkKeep</literal>, <literal>MarkDelete</literal> or "
-"<literal>MarkInstall</literal> followed by <literal>package-name &lt;a.b.c -"
-"&gt; d.e.f | x.y.z&gt; (section)</literal> where <literal>a.b.c</literal> is "
-"the current version of the package, <literal>d.e.f</literal> is the version "
-"considered for installation and <literal>x.y.z</literal> is a newer version, "
-"but not considered for installation (because of a low pin score). The later "
-"two can be omitted if there is none or if it is the same as the installed "
-"version.  <literal>section</literal> is the name of the section the package "
-"appears in."
+"<literal>MarkInstall</literal> followed by <literal>package-name &lt;a.b.c "
+"-&gt; d.e.f | x.y.z&gt; (section)</literal> where <literal>a.b.c</literal> "
+"is the current version of the package, <literal>d.e.f</literal> is the "
+"version considered for installation and <literal>x.y.z</literal> is a newer "
+"version, but not considered for installation (because of a low pin score). "
+"The later two can be omitted if there is none or if it is the same as the "
+"installed version.  <literal>section</literal> is the name of the section "
+"the package appears in."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -4230,15 +4238,15 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
 msgid ""
-"Print information about the vendors read from <filename>/etc/apt/vendors."
-"list</filename>."
+"Print information about the vendors read from <filename>/etc/apt/"
+"vendors.list</filename>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
 msgid ""
-"Display the external commands that are called by apt hooks.  This includes e."
-"g. the config options <literal>DPkg::{Pre,Post}-Invoke</literal> or "
+"Display the external commands that are called by apt hooks.  This includes "
+"e.g. the config options <literal>DPkg::{Pre,Post}-Invoke</literal> or "
 "<literal>APT::Update::{Pre,Post}-Invoke</literal>."
 msgstr ""
 
@@ -4991,9 +4999,9 @@ msgstr ""
 #: apt_preferences.5.xml
 msgid ""
 "The <literal>:any</literal> suffix makes sure to select binary packages from "
-"any architecture. Without that suffix, apt implicitly assumes the <literal>:"
-"native</literal> suffix which would only select packages from the native "
-"architecture."
+"any architecture. Without that suffix, apt implicitly assumes the "
+"<literal>:native</literal> suffix which would only select packages from the "
+"native architecture."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
@@ -5176,9 +5184,9 @@ msgstr ""
 msgid ""
 "The most recent available version of the <literal>perl</literal> package "
 "will be installed, so long as that version's version number begins with "
-"\"<literal>&good-perl;</literal>\".  If <emphasis>any</emphasis> &good-perl;"
-"* version of <literal>perl</literal> is available and the installed version "
-"is &bad-perl;*, then <literal>perl</literal> will be downgraded."
+"\"<literal>&good-perl;</literal>\".  If <emphasis>any</emphasis> &good-"
+"perl;* version of <literal>perl</literal> is available and the installed "
+"version is &bad-perl;*, then <literal>perl</literal> will be downgraded."
 msgstr ""
 "A versão mais recente disponível do pacote <literal>perl</literal> será "
 "instalado, contanto que esse número de versão da versão inicie com "
@@ -5479,23 +5487,23 @@ msgid ""
 "files retrieved from locations listed in the &sources-list; file are stored "
 "in the directory <filename>/var/lib/apt/lists</filename>, or in the file "
 "named by the variable <literal>Dir::State::Lists</literal> in the "
-"<filename>apt.conf</filename> file.  For example, the file <filename>debian."
-"lcs.mit.edu_debian_dists_unstable_contrib_binary-i386_Release</filename> "
-"contains the <filename>Release</filename> file retrieved from the site "
-"<literal>debian.lcs.mit.edu</literal> for <literal>binary-i386</literal> "
-"architecture files from the <literal>contrib</literal> component of the "
-"<literal>unstable</literal> distribution."
+"<filename>apt.conf</filename> file.  For example, the file "
+"<filename>debian.lcs.mit.edu_debian_dists_unstable_contrib_binary-"
+"i386_Release</filename> contains the <filename>Release</filename> file "
+"retrieved from the site <literal>debian.lcs.mit.edu</literal> for "
+"<literal>binary-i386</literal> architecture files from the <literal>contrib</"
+"literal> component of the <literal>unstable</literal> distribution."
 msgstr ""
 "Todos os arquivos <filename>Packages</filename> e <filename>Release</"
 "filename> obtidos das localidades listadas no arquivo &sources-list; são "
 "mantidos no diretório <filename>/var/lib/apt/lists</filename> ou no arquivo "
 "indicado pela variável <literal>Dir::State::Lists</literal> no arquivo "
-"<filename>apt.conf</filename>. Por exemplo, o arquivo <filename>debian.lcs."
-"mit.edu_debian_dists_unstable_contrib_binary-i386_Release</filename> contém "
-"o arquivo <filename>Release</filename> obtido do site <literal>debian.lcs."
-"mit.edu</literal> para a arquitetura <literal>binary-i386</literal>, "
-"arquivos do componente <literal>contrib</literal> da distribuição "
-"<literal>unstable</literal>."
+"<filename>apt.conf</filename>. Por exemplo, o arquivo "
+"<filename>debian.lcs.mit.edu_debian_dists_unstable_contrib_binary-"
+"i386_Release</filename> contém o arquivo <filename>Release</filename> obtido "
+"do site <literal>debian.lcs.mit.edu</literal> para a arquitetura "
+"<literal>binary-i386</literal>, arquivos do componente <literal>contrib</"
+"literal> da distribuição <literal>unstable</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 #: apt_preferences.5.xml
@@ -5877,6 +5885,12 @@ msgid ""
 "multi-architecture support."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml
+msgid ""
+"This format is deprecated and may eventually be removed, but not before 2029."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><title>
 #: sources.list.5.xml
 msgid "deb822-Style Format"
@@ -6038,9 +6052,10 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
 msgid ""
-"As an example, the sources for your distribution could look like this in one-"
-"line-style format: <placeholder type=\"literallayout\" id=\"0\"/> or like "
-"this in deb822 style format: <placeholder type=\"literallayout\" id=\"1\"/>"
+"As an example, the sources for your distribution could look like this in the "
+"deprecated one-line-style format: <placeholder type=\"literallayout\" "
+"id=\"0\"/> or like this in deb822 style format: <placeholder "
+"type=\"literallayout\" id=\"1\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
@@ -6086,11 +6101,12 @@ msgstr ""
 msgid ""
 "<option>Targets</option> (<option>target</option>) is a multivalue option "
 "defining which download targets apt will try to acquire from this source. If "
-"not specified, the default set is defined by the <option>Acquire::"
-"IndexTargets</option> configuration scope (targets are specified by their "
-"name in the <literal>Created-By</literal> field).  Additionally, targets can "
-"be enabled or disabled by using the <literal>Identifier</literal> field as "
-"an option with a boolean value instead of using this multivalue option."
+"not specified, the default set is defined by the "
+"<option>Acquire::IndexTargets</option> configuration scope (targets are "
+"specified by their name in the <literal>Created-By</literal> field).  "
+"Additionally, targets can be enabled or disabled by using the "
+"<literal>Identifier</literal> field as an option with a boolean value "
+"instead of using this multivalue option."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
@@ -6219,8 +6235,9 @@ msgid ""
 "helps users identify mirrors which are no longer updated. However, some "
 "repositories such as historic archives are not updated any more by design, "
 "so this check can be disabled by setting this option to <literal>no</"
-"literal>.  Defaults to the value of configuration option <option>Acquire::"
-"Check-Valid-Until</option> which itself defaults to <literal>yes</literal>."
+"literal>.  Defaults to the value of configuration option "
+"<option>Acquire::Check-Valid-Until</option> which itself defaults to "
+"<literal>yes</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
@@ -6692,8 +6709,8 @@ msgstr ""
 #: apt-extracttemplates.1.xml
 msgid ""
 "Temporary directory in which to write extracted <command>debconf</command> "
-"template files and config scripts.  Configuration Item: <literal>APT::"
-"ExtractTemplates::TempDir</literal>"
+"template files and config scripts.  Configuration Item: "
+"<literal>APT::ExtractTemplates::TempDir</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -6726,8 +6743,8 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-sortpkgs.1.xml
 msgid ""
-"Use source index field ordering.  Configuration Item: <literal>APT::"
-"SortPkgs::Source</literal>."
+"Use source index field ordering.  Configuration Item: "
+"<literal>APT::SortPkgs::Source</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -6824,10 +6841,10 @@ msgid ""
 "<filename>icons</filename> files as well as <filename>Release</filename>, "
 "<filename>Index</filename> and <filename>md5sum.txt</filename> files by "
 "default (<literal>APT::FTPArchive::Release::Default-Patterns</literal>).  "
-"Additional filename patterns can be added by listing them in <literal>APT::"
-"FTPArchive::Release::Patterns</literal>.  It then writes to stdout a "
-"<filename>Release</filename> file containing (by default) an MD5, SHA1, "
-"SHA256 and SHA512 digest for each file."
+"Additional filename patterns can be added by listing them in "
+"<literal>APT::FTPArchive::Release::Patterns</literal>.  It then writes to "
+"stdout a <filename>Release</filename> file containing (by default) an MD5, "
+"SHA1, SHA256 and SHA512 digest for each file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -7015,8 +7032,8 @@ msgstr "a linha <literal>Label:</literal>"
 #: apt-ftparchive.1.xml
 msgid ""
 "Sets defaults specific to <literal>Tree</literal> sections. All of these "
-"variables are substitution variables and have the strings $(DIST), "
-"$(SECTION) and $(ARCH) replaced with their respective values."
+"variables are substitution variables and have the strings $(DIST), $"
+"(SECTION) and $(ARCH) replaced with their respective values."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
@@ -7041,15 +7058,15 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml
 msgid ""
-"Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
-"$(SECTION)/binary-$(ARCH)/</filename>"
+"Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/$"
+"(SECTION)/binary-$(ARCH)/</filename>"
 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>
@@ -7070,8 +7087,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>
@@ -7398,8 +7415,8 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml
 msgid ""
-"Make the caching databases read only.  Configuration Item: <literal>APT::"
-"FTPArchive::ReadOnlyDB</literal>."
+"Make the caching databases read only.  Configuration Item: "
+"<literal>APT::FTPArchive::ReadOnlyDB</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -7726,16 +7743,17 @@ msgid ""
 "The environment variable <envar>http_proxy</envar> is supported for system "
 "wide configuration.  Proxies specific to APT can be configured via the "
 "option <literal>Acquire::http::Proxy</literal>.  Proxies which should be "
-"used only for certain hosts can be specified via <literal>Acquire::http::"
-"Proxy::<replaceable>host</replaceable></literal>. Even more fine-grained "
-"control can be achieved via proxy autodetection, detailed further below.  "
-"All these options use the URI format <literal><replaceable>scheme</"
-"replaceable>://[[<replaceable>user</replaceable>][:<replaceable>pass</"
-"replaceable>]@]<replaceable>host</replaceable>[:<replaceable>port</"
-"replaceable>]/</literal>.  Supported URI schemes are <literal>socks5h</"
-"literal> (SOCKS5 with remote DNS resolution), <literal>http</literal> and "
-"<literal>https</literal>.  Authentication details can be supplied via &apt-"
-"authconf; instead of including it in the URI directly."
+"used only for certain hosts can be specified via "
+"<literal>Acquire::http::Proxy::<replaceable>host</replaceable></literal>. "
+"Even more fine-grained control can be achieved via proxy autodetection, "
+"detailed further below.  All these options use the URI format "
+"<literal><replaceable>scheme</replaceable>://[[<replaceable>user</"
+"replaceable>][:<replaceable>pass</replaceable>]@]<replaceable>host</"
+"replaceable>[:<replaceable>port</replaceable>]/</literal>.  Supported URI "
+"schemes are <literal>socks5h</literal> (SOCKS5 with remote DNS resolution), "
+"<literal>http</literal> and <literal>https</literal>.  Authentication "
+"details can be supplied via &apt-authconf; instead of including it in the "
+"URI directly."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
@@ -7750,14 +7768,14 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt-transport-http.1.xml
 msgid ""
-"Furthermore, there are three settings provided for cache control with "
-"HTTP/1.1 compliant proxy caches: <literal>Acquire::http::No-Cache</literal> "
-"tells the proxy not to use its cached response under any circumstances.  "
+"Furthermore, there are three settings provided for cache control with HTTP/"
+"1.1 compliant proxy caches: <literal>Acquire::http::No-Cache</literal> tells "
+"the proxy not to use its cached response under any circumstances.  "
 "<literal>Acquire::http::Max-Age</literal> sets the allowed maximum age (in "
-"seconds) of an index file in the cache of the proxy.  <literal>Acquire::"
-"http::No-Store</literal> specifies that the proxy should not store the "
-"requested archive files in its cache, which can be used to prevent the proxy "
-"from polluting its cache with (big) .deb files."
+"seconds) of an index file in the cache of the proxy.  "
+"<literal>Acquire::http::No-Store</literal> specifies that the proxy should "
+"not store the requested archive files in its cache, which can be used to "
+"prevent the proxy from polluting its cache with (big) .deb files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
@@ -7795,8 +7813,8 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt-transport-http.1.xml
 msgid ""
-"This option takes precedence over the legacy option name <literal>Acquire::"
-"http::ProxyAutoDetect</literal>."
+"This option takes precedence over the legacy option name "
+"<literal>Acquire::http::ProxyAutoDetect</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
@@ -7826,12 +7844,12 @@ msgstr ""
 #: apt-transport-http.1.xml
 msgid ""
 "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
-"enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
-"g. on high-latency connections. It specifies how many requests are sent in a "
-"pipeline.  APT tries to detect and work around misbehaving webservers and "
-"proxies at runtime, but if you know that yours does not conform to the "
-"HTTP/1.1 specification, pipelining can be disabled by setting the value to "
-"0. It is enabled by default with the value 10."
+"enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial "
+"e.g. on high-latency connections. It specifies how many requests are sent in "
+"a pipeline.  APT tries to detect and work around misbehaving webservers and "
+"proxies at runtime, but if you know that yours does not conform to the HTTP/"
+"1.1 specification, pipelining can be disabled by setting the value to 0. It "
+"is enabled by default with the value 10."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
@@ -7917,9 +7935,9 @@ msgstr ""
 msgid ""
 "The HTTPS protocol is based on the HTTP protocol, so all options supported "
 "by &apt-transport-http; are also available via <literal>Acquire::https</"
-"literal> and will default to the same values specified for <literal>Acquire::"
-"http</literal>. This manpage will only document the options <emphasis>unique "
-"to https</emphasis>."
+"literal> and will default to the same values specified for "
+"<literal>Acquire::http</literal>. This manpage will only document the "
+"options <emphasis>unique to https</emphasis>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
@@ -7948,9 +7966,10 @@ msgstr ""
 #: apt-transport-https.1.xml
 msgid ""
 "A custom certificate revocation list (CRL) can be configured with the "
-"options <literal>Acquire::https::CRLFile</literal> and <literal>Acquire::"
-"https::CRLFile::<replaceable>host</replaceable></literal>.  As with the "
-"previous option, a file in PEM format needs to be specified."
+"options <literal>Acquire::https::CRLFile</literal> and "
+"<literal>Acquire::https::CRLFile::<replaceable>host</replaceable></"
+"literal>.  As with the previous option, a file in PEM format needs to be "
+"specified."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
@@ -7996,11 +8015,11 @@ msgstr ""
 msgid ""
 "Besides supporting password-based authentication (see &apt-authconf;) HTTPS "
 "also supports authentication based on client certificates via "
-"<literal>Acquire::https::SSLCert</literal> and <literal>Acquire::https::"
-"SSLKey</literal>. These should be set respectively to the filename of the "
-"X.509 client certificate and the associated (unencrypted) private key, both "
-"in PEM format.  In practice the use of the host-specific variants of both "
-"options is highly recommended."
+"<literal>Acquire::https::SSLCert</literal> and "
+"<literal>Acquire::https::SSLKey</literal>. These should be set respectively "
+"to the filename of the X.509 client certificate and the associated "
+"(unencrypted) private key, both in PEM format.  In practice the use of the "
+"host-specific variants of both options is highly recommended."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
@@ -8202,9 +8221,9 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt-transport-mirror.1.xml
 msgid ""
-"Assuming a file with this content is stored as <filename>/etc/apt/mirrorlist."
-"txt</filename> on your machine it can be used like this in &sources-list; "
-"(since apt 1.6):"
+"Assuming a file with this content is stored as <filename>/etc/apt/"
+"mirrorlist.txt</filename> on your machine it can be used like this in "
+"&sources-list; (since apt 1.6):"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><literallayout>
@@ -9032,10 +9051,10 @@ msgstr ""
 #: apt-patterns.7.xml
 msgid ""
 "<code>foo</code> cannot be used as a shortform for <code>?name(foo)</code>, "
-"as this can cause typos to go unnoticed: Consider <code>?and(...,"
-"~poptional)</code>: this requires the package to have <code>required</code> "
-"priority, but if you do not type the <code>~</code>, it would require the "
-"package name to contain <code>poptional</code>."
+"as this can cause typos to go unnoticed: Consider <code>?"
+"and(...,~poptional)</code>: this requires the package to have "
+"<code>required</code> priority, but if you do not type the <code>~</code>, "
+"it would require the package name to contain <code>poptional</code>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml
index eb734215b..6153adfc4 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>2025-01-05T00:00:00Z</date>
+   <date>2025-01-28T00:00:00Z</date>
  </refentryinfo>
  
  <refmeta>
diff --git a/po/apt-all.pot b/po/apt-all.pot
index 7ecbc4815..028b7a414 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -5,9 +5,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: apt 2.9.25\n"
+"Project-Id-Version: apt 2.9.26\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2025-01-22 10:57+0000\n"
+"POT-Creation-Date: 2025-01-28 18:52+0000\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"
@@ -2290,7 +2290,7 @@ msgid "Y"
 msgstr ""
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc
+#: apt-private/private-output.cc apt-private/private-sources.cc
 msgid "N"
 msgstr ""
 
@@ -2501,6 +2501,11 @@ msgstr ""
 msgid "Your '%s' file changed, please run 'apt-get update'.\n"
 msgstr ""
 
+#: apt-private/private-sources.cc
+#, c-format
+msgid "Rewrite %zu sources?"
+msgstr ""
+
 #: apt-private/private-unmet.cc
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
@@ -2521,6 +2526,12 @@ msgstr ""
 #. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
 #: apt-private/private-update.cc
 #, c-format
+msgid "The %s entry for '%s' should be upgraded to deb822 .sources"
+msgstr ""
+
+#. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
 msgid "Missing Signed-By in the %s entry for '%s'"
 msgstr ""
 
@@ -2536,7 +2547,11 @@ msgid ""
 msgstr ""
 
 #: apt-private/private-update.cc
-msgid "See apt-secure(7) for best practices in configuring repository signing."
+msgid "See apt-secure(8) for best practices in configuring repository signing."
+msgstr ""
+
+#: apt-private/private-update.cc
+msgid "Some sources can be modernized. Run 'apt modernize-sources' to do so."
 msgstr ""
 
 #: apt-private/private-update.cc
@@ -3098,6 +3113,10 @@ msgid "edit the source information file"
 msgstr ""
 
 #: cmdline/apt.cc
+msgid "modernize .list files to .sources files"
+msgstr ""
+
+#: cmdline/apt.cc
 msgid "satisfy dependency strings"
 msgstr ""
 
diff --git a/po/ar.po b/po/ar.po
index 164ed1924..72601c385 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2025-01-21 11:21+0000\n"
+"POT-Creation-Date: 2025-01-28 18:52+0000\n"
 "PO-Revision-Date: 2006-10-20 21:28+0300\n"
 "Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
 "Language-Team: Arabic <support@arabeyes.org>\n"
@@ -2344,7 +2344,7 @@ msgid "Y"
 msgstr "Y"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc
+#: apt-private/private-output.cc apt-private/private-sources.cc
 msgid "N"
 msgstr ""
 
@@ -2556,6 +2556,11 @@ msgstr "فشل تغيير اسم %s إلى %s"
 msgid "Your '%s' file changed, please run 'apt-get update'.\n"
 msgstr ""
 
+#: apt-private/private-sources.cc
+#, c-format
+msgid "Rewrite %zu sources?"
+msgstr ""
+
 #: apt-private/private-unmet.cc
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
@@ -2576,6 +2581,12 @@ msgstr ""
 #. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
 #: apt-private/private-update.cc
 #, c-format
+msgid "The %s entry for '%s' should be upgraded to deb822 .sources"
+msgstr ""
+
+#. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
 msgid "Missing Signed-By in the %s entry for '%s'"
 msgstr ""
 
@@ -2591,7 +2602,11 @@ msgid ""
 msgstr ""
 
 #: apt-private/private-update.cc
-msgid "See apt-secure(7) for best practices in configuring repository signing."
+msgid "See apt-secure(8) for best practices in configuring repository signing."
+msgstr ""
+
+#: apt-private/private-update.cc
+msgid "Some sources can be modernized. Run 'apt modernize-sources' to do so."
 msgstr ""
 
 #: apt-private/private-update.cc
@@ -3177,6 +3192,10 @@ msgid "edit the source information file"
 msgstr "دمج المعلومات المتوفرة"
 
 #: cmdline/apt.cc
+msgid "modernize .list files to .sources files"
+msgstr ""
+
+#: cmdline/apt.cc
 msgid "satisfy dependency strings"
 msgstr ""
 
diff --git a/po/ast.po b/po/ast.po
index 5b04908f9..0c30422ec 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.18\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2025-01-21 11:21+0000\n"
+"POT-Creation-Date: 2025-01-28 18:52+0000\n"
 "PO-Revision-Date: 2010-10-02 23:35+0100\n"
 "Last-Translator: Iñigo Varela <ivarela@softastur.org>\n"
 "Language-Team: Asturian (ast)\n"
@@ -2422,7 +2422,7 @@ msgid "Y"
 msgstr "S"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc
+#: apt-private/private-output.cc apt-private/private-sources.cc
 msgid "N"
 msgstr ""
 
@@ -2642,6 +2642,11 @@ msgstr "Nun pudo renomase %s como %s"
 msgid "Your '%s' file changed, please run 'apt-get update'.\n"
 msgstr ""
 
+#: apt-private/private-sources.cc
+#, c-format
+msgid "Rewrite %zu sources?"
+msgstr ""
+
 #: apt-private/private-unmet.cc
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
@@ -2662,6 +2667,12 @@ msgstr ""
 #. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
 #: apt-private/private-update.cc
 #, c-format
+msgid "The %s entry for '%s' should be upgraded to deb822 .sources"
+msgstr ""
+
+#. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
 msgid "Missing Signed-By in the %s entry for '%s'"
 msgstr ""
 
@@ -2677,7 +2688,11 @@ msgid ""
 msgstr ""
 
 #: apt-private/private-update.cc
-msgid "See apt-secure(7) for best practices in configuring repository signing."
+msgid "See apt-secure(8) for best practices in configuring repository signing."
+msgstr ""
+
+#: apt-private/private-update.cc
+msgid "Some sources can be modernized. Run 'apt modernize-sources' to do so."
 msgstr ""
 
 #: apt-private/private-update.cc
@@ -3310,6 +3325,10 @@ msgid "edit the source information file"
 msgstr "Lleendo información d'estáu"
 
 #: cmdline/apt.cc
+msgid "modernize .list files to .sources files"
+msgstr ""
+
+#: cmdline/apt.cc
 #, fuzzy
 #| msgid "Failed to satisfy %s dependency for %s: %s"
 msgid "satisfy dependency strings"
diff --git a/po/bg.po b/po/bg.po
index ee3a8fbf0..e9ae7e0b0 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.21\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2025-01-21 11:21+0000\n"
+"POT-Creation-Date: 2025-01-28 18:52+0000\n"
 "PO-Revision-Date: 2012-06-25 17:23+0300\n"
 "Last-Translator: Damyan Ivanov <dmn@debian.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -2467,7 +2467,7 @@ msgid "Y"
 msgstr "Y"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc
+#: apt-private/private-output.cc apt-private/private-sources.cc
 msgid "N"
 msgstr "N"
 
@@ -2691,6 +2691,11 @@ msgstr "Неуспех при преименуването на %s на %s"
 msgid "Your '%s' file changed, please run 'apt-get update'.\n"
 msgstr ""
 
+#: apt-private/private-sources.cc
+#, c-format
+msgid "Rewrite %zu sources?"
+msgstr ""
+
 #: apt-private/private-unmet.cc
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
@@ -2711,6 +2716,12 @@ msgstr ""
 #. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
 #: apt-private/private-update.cc
 #, c-format
+msgid "The %s entry for '%s' should be upgraded to deb822 .sources"
+msgstr ""
+
+#. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
 msgid "Missing Signed-By in the %s entry for '%s'"
 msgstr ""
 
@@ -2726,7 +2737,11 @@ msgid ""
 msgstr ""
 
 #: apt-private/private-update.cc
-msgid "See apt-secure(7) for best practices in configuring repository signing."
+msgid "See apt-secure(8) for best practices in configuring repository signing."
+msgstr ""
+
+#: apt-private/private-update.cc
+msgid "Some sources can be modernized. Run 'apt modernize-sources' to do so."
 msgstr ""
 
 #: apt-private/private-update.cc
@@ -3363,6 +3378,10 @@ msgid "edit the source information file"
 msgstr "Четене на информацията за състоянието"
 
 #: cmdline/apt.cc
+msgid "modernize .list files to .sources files"
+msgstr ""
+
+#: cmdline/apt.cc
 #, fuzzy
 #| msgid "Failed to satisfy %s dependency for %s: %s"
 msgid "satisfy dependency strings"
diff --git a/po/bs.po b/po/bs.po
index 38f8f0cef..9be404b90 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.5.26\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2025-01-21 11:21+0000\n"
+"POT-Creation-Date: 2025-01-28 18:52+0000\n"
 "PO-Revision-Date: 2004-05-06 15:25+0100\n"
 "Last-Translator: Safir Šećerović <sapphire@linux.org.ba>\n"
 "Language-Team: Bosnian <lokal@lugbih.org>\n"
@@ -2327,7 +2327,7 @@ msgid "Y"
 msgstr ""
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc
+#: apt-private/private-output.cc apt-private/private-sources.cc
 msgid "N"
 msgstr ""
 
@@ -2538,6 +2538,11 @@ msgstr "Ne mogu otvoriti %s"
 msgid "Your '%s' file changed, please run 'apt-get update'.\n"
 msgstr ""
 
+#: apt-private/private-sources.cc
+#, c-format
+msgid "Rewrite %zu sources?"
+msgstr ""
+
 #: apt-private/private-unmet.cc
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
@@ -2558,6 +2563,12 @@ msgstr ""
 #. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
 #: apt-private/private-update.cc
 #, c-format
+msgid "The %s entry for '%s' should be upgraded to deb822 .sources"
+msgstr ""
+
+#. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
 msgid "Missing Signed-By in the %s entry for '%s'"
 msgstr ""
 
@@ -2573,7 +2584,11 @@ msgid ""
 msgstr ""
 
 #: apt-private/private-update.cc
-msgid "See apt-secure(7) for best practices in configuring repository signing."
+msgid "See apt-secure(8) for best practices in configuring repository signing."
+msgstr ""
+
+#: apt-private/private-update.cc
+msgid "Some sources can be modernized. Run 'apt modernize-sources' to do so."
 msgstr ""
 
 #: apt-private/private-update.cc
@@ -3162,6 +3177,10 @@ msgid "edit the source information file"
 msgstr "Sastavljam dostupne informacije"
 
 #: cmdline/apt.cc
+msgid "modernize .list files to .sources files"
+msgstr ""
+
+#: cmdline/apt.cc
 #, fuzzy
 #| msgid "Building dependency tree"
 msgid "satisfy dependency strings"
diff --git a/po/ca.po b/po/ca.po
index 20b3c88d8..54c816f88 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.4~beta1\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2025-01-21 11:21+0000\n"
+"POT-Creation-Date: 2025-01-28 18:52+0000\n"
 "PO-Revision-Date: 2024-08-08 22:47+0100\n"
 "Last-Translator: Carles Pina i Estany <cpina@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -2514,7 +2514,7 @@ msgid "Y"
 msgstr "S"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc
+#: apt-private/private-output.cc apt-private/private-sources.cc
 msgid "N"
 msgstr "N"
 
@@ -2745,6 +2745,11 @@ msgstr "No s'ha pogut analitzar %s. Voleu tornar a editar-lo? "
 msgid "Your '%s' file changed, please run 'apt-get update'.\n"
 msgstr "El fitxer «%s» ha canviat, executeu «apt-get update».\n"
 
+#: apt-private/private-sources.cc
+#, c-format
+msgid "Rewrite %zu sources?"
+msgstr ""
+
 #: apt-private/private-unmet.cc
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
@@ -2767,6 +2772,12 @@ msgstr ""
 #. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
 #: apt-private/private-update.cc
 #, c-format
+msgid "The %s entry for '%s' should be upgraded to deb822 .sources"
+msgstr ""
+
+#. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
 msgid "Missing Signed-By in the %s entry for '%s'"
 msgstr "No hi ha «Signed-By» a l'entrada %s de «%s»"
 
@@ -2786,12 +2797,16 @@ msgstr ""
 #| msgid ""
 #| "See apt-secure(8) manpage for repository creation and user configuration "
 #| "details."
-msgid "See apt-secure(7) for best practices in configuring repository signing."
+msgid "See apt-secure(8) for best practices in configuring repository signing."
 msgstr ""
 "Consulteu la pàgina de manual apt-secure(8) per obtenir detalls sobre la "
 "creació de dipòsits i la configuració d'usuaris."
 
 #: apt-private/private-update.cc
+msgid "Some sources can be modernized. Run 'apt modernize-sources' to do so."
+msgstr ""
+
+#: apt-private/private-update.cc
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
 msgid_plural ""
@@ -3444,6 +3459,10 @@ msgid "edit the source information file"
 msgstr "edita el fitxer d'informació d'origen"
 
 #: cmdline/apt.cc
+msgid "modernize .list files to .sources files"
+msgstr ""
+
+#: cmdline/apt.cc
 msgid "satisfy dependency strings"
 msgstr "satisfà cadenes de dependència"
 
diff --git a/po/cs.po b/po/cs.po
index eb354da0e..5e7f5c6a7 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 2.9.10\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2025-01-21 11:21+0000\n"
+"POT-Creation-Date: 2025-01-28 18:52+0000\n"
 "PO-Revision-Date: 2024-11-09 20:38+0100\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -2430,7 +2430,7 @@ msgid "Y"
 msgstr "Y"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc
+#: apt-private/private-output.cc apt-private/private-sources.cc
 msgid "N"
 msgstr "N"
 
@@ -2652,6 +2652,11 @@ msgstr "Nepodařilo se zpracovat %s. Zkusit znovu upravit?"
 msgid "Your '%s' file changed, please run 'apt-get update'.\n"
 msgstr "Soubor „%s“ se změnil, spusťte prosím „apt-get update“.\n"
 
+#: apt-private/private-sources.cc
+#, c-format
+msgid "Rewrite %zu sources?"
+msgstr ""
+
 #: apt-private/private-unmet.cc
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
@@ -2674,6 +2679,12 @@ msgstr ""
 #. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
 #: apt-private/private-update.cc
 #, c-format
+msgid "The %s entry for '%s' should be upgraded to deb822 .sources"
+msgstr ""
+
+#. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
 msgid "Missing Signed-By in the %s entry for '%s'"
 msgstr "Chybí Signed-By v %s pro „%s“"
 
@@ -2693,12 +2704,16 @@ msgstr ""
 #| msgid ""
 #| "See apt-secure(8) manpage for repository creation and user configuration "
 #| "details."
-msgid "See apt-secure(7) for best practices in configuring repository signing."
+msgid "See apt-secure(8) for best practices in configuring repository signing."
 msgstr ""
 "Podrobnosti o vytváření a nastavení repozitářů naleznete v manuálové stránce "
 "apt-secure(8)."
 
 #: apt-private/private-update.cc
+msgid "Some sources can be modernized. Run 'apt modernize-sources' to do so."
+msgstr ""
+
+#: apt-private/private-update.cc
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
 msgid_plural ""
@@ -3333,6 +3348,10 @@ msgid "edit the source information file"
 msgstr "upraví soubor se zdroji balíků"
 
 #: cmdline/apt.cc
+msgid "modernize .list files to .sources files"
+msgstr ""
+
+#: cmdline/apt.cc
 msgid "satisfy dependency strings"
 msgstr "splní řetězec závislostí"
 
diff --git a/po/cy.po b/po/cy.po
index d38c1572c..ef691a163 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2025-01-21 11:21+0000\n"
+"POT-Creation-Date: 2025-01-28 18:52+0000\n"
 "PO-Revision-Date: 2005-06-06 13:46+0100\n"
 "Last-Translator: Dafydd Harries <daf@muse.19inch.net>\n"
 "Language-Team: Welsh <cy@pengwyn.linux.org.uk>\n"
@@ -2405,7 +2405,7 @@ msgid "Y"
 msgstr "I"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc
+#: apt-private/private-output.cc apt-private/private-sources.cc
 msgid "N"
 msgstr ""
 
@@ -2621,6 +2621,11 @@ msgstr "Methwyd ailenwi %s at %s"
 msgid "Your '%s' file changed, please run 'apt-get update'.\n"
 msgstr ""
 
+#: apt-private/private-sources.cc
+#, c-format
+msgid "Rewrite %zu sources?"
+msgstr ""
+
 #: apt-private/private-unmet.cc
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
@@ -2641,6 +2646,12 @@ msgstr ""
 #. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
 #: apt-private/private-update.cc
 #, c-format
+msgid "The %s entry for '%s' should be upgraded to deb822 .sources"
+msgstr ""
+
+#. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
 msgid "Missing Signed-By in the %s entry for '%s'"
 msgstr ""
 
@@ -2656,7 +2667,11 @@ msgid ""
 msgstr ""
 
 #: apt-private/private-update.cc
-msgid "See apt-secure(7) for best practices in configuring repository signing."
+msgid "See apt-secure(8) for best practices in configuring repository signing."
+msgstr ""
+
+#: apt-private/private-update.cc
+msgid "Some sources can be modernized. Run 'apt modernize-sources' to do so."
 msgstr ""
 
 #: apt-private/private-update.cc
@@ -3309,6 +3324,10 @@ msgid "edit the source information file"
 msgstr "Yn cyfuno manylion Ar Gael"
 
 #: cmdline/apt.cc
+msgid "modernize .list files to .sources files"
+msgstr ""
+
+#: cmdline/apt.cc
 #, fuzzy
 #| msgid "Failed to satisfy %s dependency for %s: %s"
 msgid "satisfy dependency strings"
diff --git a/po/da.po b/po/da.po
index 99adb0679..5efe39aee 100644
--- a/po/da.po
+++ b/po/da.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.4~rc2\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2025-01-21 11:21+0000\n"
+"POT-Creation-Date: 2025-01-28 18:52+0000\n"
 "PO-Revision-Date: 2017-03-02 23:51+0200\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
@@ -2474,7 +2474,7 @@ msgid "Y"
 msgstr "J"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc
+#: apt-private/private-output.cc apt-private/private-sources.cc
 msgid "N"
 msgstr "N"
 
@@ -2696,6 +2696,11 @@ msgstr "Kunne ikke fortolke %s. Rediger igen? "
 msgid "Your '%s' file changed, please run 'apt-get update'.\n"
 msgstr "Din »%s« fil blev ændret, kør venligst »apt-get update«.\n"
 
+#: apt-private/private-sources.cc
+#, c-format
+msgid "Rewrite %zu sources?"
+msgstr ""
+
 #: apt-private/private-unmet.cc
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
@@ -2716,6 +2721,12 @@ msgstr ""
 #. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
 #: apt-private/private-update.cc
 #, c-format
+msgid "The %s entry for '%s' should be upgraded to deb822 .sources"
+msgstr ""
+
+#. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
 msgid "Missing Signed-By in the %s entry for '%s'"
 msgstr ""
 
@@ -2735,12 +2746,16 @@ msgstr ""
 #| msgid ""
 #| "See apt-secure(8) manpage for repository creation and user configuration "
 #| "details."
-msgid "See apt-secure(7) for best practices in configuring repository signing."
+msgid "See apt-secure(8) for best practices in configuring repository signing."
 msgstr ""
 "Se apt-secure(8)-manualsiden for detaljer om arkivoprettelse og "
 "brugerkonfiguration."
 
 #: apt-private/private-update.cc
+msgid "Some sources can be modernized. Run 'apt modernize-sources' to do so."
+msgstr ""
+
+#: apt-private/private-update.cc
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
 msgid_plural ""
@@ -3397,6 +3412,10 @@ msgid "edit the source information file"
 msgstr "rediger source-informationsfilen (kildefilen)"
 
 #: cmdline/apt.cc
+msgid "modernize .list files to .sources files"
+msgstr ""
+
+#: cmdline/apt.cc
 #, fuzzy
 #| msgid "Building dependency tree"
 msgid "satisfy dependency strings"
diff --git a/po/de.po b/po/de.po
index fb4f81c57..ef6036a3f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 2.7.2\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2025-01-21 11:21+0000\n"
+"POT-Creation-Date: 2025-01-28 18:52+0000\n"
 "PO-Revision-Date: 2023-07-17 19:13+0200\n"
 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -2554,7 +2554,7 @@ msgid "Y"
 msgstr "J"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc
+#: apt-private/private-output.cc apt-private/private-sources.cc
 msgid "N"
 msgstr "N"
 
@@ -2791,6 +2791,11 @@ msgid "Your '%s' file changed, please run 'apt-get update'.\n"
 msgstr ""
 "Ihre »%s«-Datei wurde verändert, bitte führen Sie »apt-get update« aus.\n"
 
+#: apt-private/private-sources.cc
+#, c-format
+msgid "Rewrite %zu sources?"
+msgstr ""
+
 #: apt-private/private-unmet.cc
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
@@ -2813,6 +2818,12 @@ msgstr ""
 #. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
 #: apt-private/private-update.cc
 #, c-format
+msgid "The %s entry for '%s' should be upgraded to deb822 .sources"
+msgstr ""
+
+#. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
 msgid "Missing Signed-By in the %s entry for '%s'"
 msgstr "Fehlendes Signed-By im Eintrag %s für »%s«"
 
@@ -2832,12 +2843,16 @@ msgstr ""
 #| msgid ""
 #| "See apt-secure(8) manpage for repository creation and user configuration "
 #| "details."
-msgid "See apt-secure(7) for best practices in configuring repository signing."
+msgid "See apt-secure(8) for best practices in configuring repository signing."
 msgstr ""
 "Weitere Details zur Erzeugung von Paketdepots sowie zu deren "
 "Benutzerkonfiguration finden Sie in der Handbuchseite apt-secure(8)."
 
 #: apt-private/private-update.cc
+msgid "Some sources can be modernized. Run 'apt modernize-sources' to do so."
+msgstr ""
+
+#: apt-private/private-update.cc
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
 msgid_plural ""
@@ -3511,6 +3526,10 @@ msgid "edit the source information file"
 msgstr "die Datei für die Paketquellen bearbeiten"
 
 #: cmdline/apt.cc
+msgid "modernize .list files to .sources files"
+msgstr ""
+
+#: cmdline/apt.cc
 msgid "satisfy dependency strings"
 msgstr "Abhängigkeitszeichenketten erfüllen"
 
diff --git a/po/dz.po b/po/dz.po
index 9fc50c64a..6704efb18 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2025-01-21 11:21+0000\n"
+"POT-Creation-Date: 2025-01-28 18:52+0000\n"
 "PO-Revision-Date: 2006-09-19 09:49+0530\n"
 "Last-Translator: Kinley Tshering <gasepkuenden2k3@hotmail.com>\n"
 "Language-Team: Dzongkha <pgeyleg@dit.gov.bt>\n"
@@ -2383,7 +2383,7 @@ msgid "Y"
 msgstr "ཝའི།"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc
+#: apt-private/private-output.cc apt-private/private-sources.cc
 msgid "N"
 msgstr ""
 
@@ -2596,6 +2596,11 @@ msgstr "%s་ལུ་%s་བསྐྱར་མིང་བཏགས་ནི�
 msgid "Your '%s' file changed, please run 'apt-get update'.\n"
 msgstr ""
 
+#: apt-private/private-sources.cc
+#, c-format
+msgid "Rewrite %zu sources?"
+msgstr ""
+
 #: apt-private/private-unmet.cc
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
@@ -2616,6 +2621,12 @@ msgstr ""
 #. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
 #: apt-private/private-update.cc
 #, c-format
+msgid "The %s entry for '%s' should be upgraded to deb822 .sources"
+msgstr ""
+
+#. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
 msgid "Missing Signed-By in the %s entry for '%s'"
 msgstr ""
 
@@ -2631,7 +2642,11 @@ msgid ""
 msgstr ""
 
 #: apt-private/private-update.cc
-msgid "See apt-secure(7) for best practices in configuring repository signing."
+msgid "See apt-secure(8) for best practices in configuring repository signing."
+msgstr ""
+
+#: apt-private/private-update.cc
+msgid "Some sources can be modernized. Run 'apt modernize-sources' to do so."
 msgstr ""
 
 #: apt-private/private-update.cc
@@ -3266,6 +3281,10 @@ msgid "edit the source information file"
 msgstr "འཐོབ་ཚུགས་པའི་བརྡ་དོན་མཉམ་བསྡོམས་འབད་དོ།"
 
 #: cmdline/apt.cc
+msgid "modernize .list files to .sources files"
+msgstr ""
+
+#: cmdline/apt.cc
 #, fuzzy
 #| msgid "Failed to satisfy %s dependency for %s: %s"
 msgid "satisfy dependency strings"
diff --git a/po/el.po b/po/el.po
index e18041f49..392079226 100644
--- a/po/el.po
+++ b/po/el.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2025-01-21 11:21+0000\n"
+"POT-Creation-Date: 2025-01-28 18:52+0000\n"
 "PO-Revision-Date: 2020-12-30 12:20+0200\n"
 "Last-Translator: Vangelis Skarmoutsos <skarmoutsosv@gmail.com>\n"
 "Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
@@ -2411,7 +2411,7 @@ msgid "Y"
 msgstr "Y"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc
+#: apt-private/private-output.cc apt-private/private-sources.cc
 msgid "N"
 msgstr "Ο"
 
@@ -2626,6 +2626,11 @@ msgstr "Αποτυχία ανάλυσης του %s. Επεξεργασία ξα
 msgid "Your '%s' file changed, please run 'apt-get update'.\n"
 msgstr "Το αρχείο '%s' άλλαξε, παρακαλώ τρέξτε το 'apt-get update'.\n"
 
+#: apt-private/private-sources.cc
+#, c-format
+msgid "Rewrite %zu sources?"
+msgstr ""
+
 #: apt-private/private-unmet.cc
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
@@ -2646,6 +2651,12 @@ msgstr ""
 #. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
 #: apt-private/private-update.cc
 #, c-format
+msgid "The %s entry for '%s' should be upgraded to deb822 .sources"
+msgstr ""
+
+#. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
 msgid "Missing Signed-By in the %s entry for '%s'"
 msgstr ""
 
@@ -2661,7 +2672,11 @@ msgid ""
 msgstr ""
 
 #: apt-private/private-update.cc
-msgid "See apt-secure(7) for best practices in configuring repository signing."
+msgid "See apt-secure(8) for best practices in configuring repository signing."
+msgstr ""
+
+#: apt-private/private-update.cc
+msgid "Some sources can be modernized. Run 'apt modernize-sources' to do so."
 msgstr ""
 
 #: apt-private/private-update.cc
@@ -3266,6 +3281,10 @@ msgid "edit the source information file"
 msgstr "επεξεργασία του αρχείου με τις πληροφορίες πηγής"
 
 #: cmdline/apt.cc
+msgid "modernize .list files to .sources files"
+msgstr ""
+
+#: cmdline/apt.cc
 msgid "satisfy dependency strings"
 msgstr "εκπλήρωση των συμβολοσειρών εξαρτήσεων"
 
diff --git a/po/es.po b/po/es.po
index c7e3cf985..d90c373e1 100644
--- a/po/es.po
+++ b/po/es.po
@@ -37,7 +37,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.8.10\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2025-01-21 11:21+0000\n"
+"POT-Creation-Date: 2025-01-28 18:52+0000\n"
 "PO-Revision-Date: 2016-01-26 01:51+0100\n"
 "Last-Translator: Manuel \"Venturi\" Porras Peralta "
 "<venturi@openmailbox.org>\n"
@@ -2582,7 +2582,7 @@ msgid "Y"
 msgstr "S"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc
+#: apt-private/private-output.cc apt-private/private-sources.cc
 msgid "N"
 msgstr "N"
 
@@ -2809,6 +2809,11 @@ msgstr "Fallo al analizar %s. ¿Editar de nuevo?"
 msgid "Your '%s' file changed, please run 'apt-get update'.\n"
 msgstr "El fichero «%s» cambió, ejecute «apt-get update».\n"
 
+#: apt-private/private-sources.cc
+#, c-format
+msgid "Rewrite %zu sources?"
+msgstr ""
+
 #: apt-private/private-unmet.cc
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
@@ -2829,6 +2834,12 @@ msgstr ""
 #. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
 #: apt-private/private-update.cc
 #, c-format
+msgid "The %s entry for '%s' should be upgraded to deb822 .sources"
+msgstr ""
+
+#. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
 msgid "Missing Signed-By in the %s entry for '%s'"
 msgstr ""
 
@@ -2848,12 +2859,16 @@ msgstr ""
 #| msgid ""
 #| "See apt-secure(8) manpage for repository creation and user configuration "
 #| "details."
-msgid "See apt-secure(7) for best practices in configuring repository signing."
+msgid "See apt-secure(8) for best practices in configuring repository signing."
 msgstr ""
 "Vea la página de manual apt-secure(8) para los detalles sobre la creación de "
 "repositorios y la configuración de usuarios."
 
 #: apt-private/private-update.cc
+msgid "Some sources can be modernized. Run 'apt modernize-sources' to do so."
+msgstr ""
+
+#: apt-private/private-update.cc
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
 msgid_plural ""
@@ -3516,6 +3531,10 @@ msgid "edit the source information file"
 msgstr "edita el fichero de información de fuentes"
 
 #: cmdline/apt.cc
+msgid "modernize .list files to .sources files"
+msgstr ""
+
+#: cmdline/apt.cc
 #, fuzzy
 #| msgid "Failed to satisfy %s dependency for %s: %s"
 msgid "satisfy dependency strings"
diff --git a/po/eu.po b/po/eu.po
index 37d8497f0..95bf6c82b 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2025-01-21 11:21+0000\n"
+"POT-Creation-Date: 2025-01-28 18:52+0000\n"
 "PO-Revision-Date: 2009-05-17 00:41+0200\n"
 "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
 "Language-Team: Euskara <debian-l10n-basque@lists.debian.org>\n"
@@ -2386,7 +2386,7 @@ msgid "Y"
 msgstr ""
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc
+#: apt-private/private-output.cc apt-private/private-sources.cc
 msgid "N"
 msgstr ""
 
@@ -2602,6 +2602,11 @@ msgstr "Huts egin du %s izenaren ordez %s ipintzean"
 msgid "Your '%s' file changed, please run 'apt-get update'.\n"
 msgstr ""
 
+#: apt-private/private-sources.cc
+#, c-format
+msgid "Rewrite %zu sources?"
+msgstr ""
+
 #: apt-private/private-unmet.cc
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
@@ -2622,6 +2627,12 @@ msgstr ""
 #. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
 #: apt-private/private-update.cc
 #, c-format
+msgid "The %s entry for '%s' should be upgraded to deb822 .sources"
+msgstr ""
+
+#. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
 msgid "Missing Signed-By in the %s entry for '%s'"
 msgstr ""
 
@@ -2637,7 +2648,11 @@ msgid ""
 msgstr ""
 
 #: apt-private/private-update.cc
-msgid "See apt-secure(7) for best practices in configuring repository signing."
+msgid "See apt-secure(8) for best practices in configuring repository signing."
+msgstr ""
+
+#: apt-private/private-update.cc
+msgid "Some sources can be modernized. Run 'apt modernize-sources' to do so."
 msgstr ""
 
 #: apt-private/private-update.cc
@@ -3270,6 +3285,10 @@ msgid "edit the source information file"
 msgstr "Egoera argibideak irakurtzen"
 
 #: cmdline/apt.cc
+msgid "modernize .list files to .sources files"
+msgstr ""
+
+#: cmdline/apt.cc
 #, fuzzy
 #| msgid "Failed to satisfy %s dependency for %s: %s"
 msgid "satisfy dependency strings"
diff --git a/po/fi.po b/po/fi.po
index 48d8bcb2d..45e3833b8 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.5.26\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2025-01-21 11:21+0000\n"
+"POT-Creation-Date: 2025-01-28 18:52+0000\n"
 "PO-Revision-Date: 2008-12-11 14:52+0200\n"
 "Last-Translator: Tapio Lehtonen <tale@debian.org>\n"
 "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -2382,7 +2382,7 @@ msgid "Y"
 msgstr "K"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc
+#: apt-private/private-output.cc apt-private/private-sources.cc
 msgid "N"
 msgstr ""
 
@@ -2595,6 +2595,11 @@ msgstr "Nimen muuttaminen %s -> %s ei onnistunut"
 msgid "Your '%s' file changed, please run 'apt-get update'.\n"
 msgstr ""
 
+#: apt-private/private-sources.cc
+#, c-format
+msgid "Rewrite %zu sources?"
+msgstr ""
+
 #: apt-private/private-unmet.cc
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
@@ -2615,6 +2620,12 @@ msgstr ""
 #. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
 #: apt-private/private-update.cc
 #, c-format
+msgid "The %s entry for '%s' should be upgraded to deb822 .sources"
+msgstr ""
+
+#. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
 msgid "Missing Signed-By in the %s entry for '%s'"
 msgstr ""
 
@@ -2630,7 +2641,11 @@ msgid ""
 msgstr ""
 
 #: apt-private/private-update.cc
-msgid "See apt-secure(7) for best practices in configuring repository signing."
+msgid "See apt-secure(8) for best practices in configuring repository signing."
+msgstr ""
+
+#: apt-private/private-update.cc
+msgid "Some sources can be modernized. Run 'apt modernize-sources' to do so."
 msgstr ""
 
 #: apt-private/private-update.cc
@@ -3262,6 +3277,10 @@ msgid "edit the source information file"
 msgstr "Luetaan tilatiedot"
 
 #: cmdline/apt.cc
+msgid "modernize .list files to .sources files"
+msgstr ""
+
+#: cmdline/apt.cc
 #, fuzzy
 #| msgid "Failed to satisfy %s dependency for %s: %s"
 msgid "satisfy dependency strings"
diff --git a/po/fr.po b/po/fr.po
index 560f86d95..349d5d46a 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2025-01-21 11:21+0000\n"
+"POT-Creation-Date: 2025-01-28 18:52+0000\n"
 "PO-Revision-Date: 2019-01-21 09:19+0100\n"
 "Last-Translator: Julien Patriarca <leatherface@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -2565,7 +2565,7 @@ msgid "Y"
 msgstr "O"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc
+#: apt-private/private-output.cc apt-private/private-sources.cc
 msgid "N"
 msgstr "N"
 
@@ -2798,6 +2798,11 @@ msgstr "Impossible de lire %s. Faut-il l'éditer à nouveau ?"
 msgid "Your '%s' file changed, please run 'apt-get update'.\n"
 msgstr "Votre fichier « %s » a changé, veuillez lancer « apt-get update ».\n"
 
+#: apt-private/private-sources.cc
+#, c-format
+msgid "Rewrite %zu sources?"
+msgstr ""
+
 #: apt-private/private-unmet.cc
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
@@ -2820,6 +2825,12 @@ msgstr ""
 #. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
 #: apt-private/private-update.cc
 #, c-format
+msgid "The %s entry for '%s' should be upgraded to deb822 .sources"
+msgstr ""
+
+#. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
 msgid "Missing Signed-By in the %s entry for '%s'"
 msgstr ""
 
@@ -2839,12 +2850,16 @@ msgstr ""
 #| msgid ""
 #| "See apt-secure(8) manpage for repository creation and user configuration "
 #| "details."
-msgid "See apt-secure(7) for best practices in configuring repository signing."
+msgid "See apt-secure(8) for best practices in configuring repository signing."
 msgstr ""
 "Voir les pages de manuel d'apt-secure(8) pour la création des dépôts et les "
 "détails de configuration d'un utilisateur."
 
 #: apt-private/private-update.cc
+msgid "Some sources can be modernized. Run 'apt modernize-sources' to do so."
+msgstr ""
+
+#: apt-private/private-update.cc
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
 msgid_plural ""
@@ -3529,6 +3544,10 @@ msgid "edit the source information file"
 msgstr "édite le fichier d'information source"
 
 #: cmdline/apt.cc
+msgid "modernize .list files to .sources files"
+msgstr ""
+
+#: cmdline/apt.cc
 #, fuzzy
 #| msgid "Failed to satisfy %s dependency for %s: %s"
 msgid "satisfy dependency strings"
diff --git a/po/gl.po b/po/gl.po
index 81d5ecace..7808bb701 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2025-01-21 11:21+0000\n"
+"POT-Creation-Date: 2025-01-28 18:52+0000\n"
 "PO-Revision-Date: 2011-05-12 15:28+0100\n"
 "Last-Translator: Miguel Anxo Bouzada <mbouzada@gmail.com>\n"
 "Language-Team: galician <proxecto@trasno.net>\n"
@@ -2456,7 +2456,7 @@ msgid "Y"
 msgstr "S"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc
+#: apt-private/private-output.cc apt-private/private-sources.cc
 msgid "N"
 msgstr "N"
 
@@ -2677,6 +2677,11 @@ msgstr "Non foi posíbel cambiar o nome de %s a %s"
 msgid "Your '%s' file changed, please run 'apt-get update'.\n"
 msgstr ""
 
+#: apt-private/private-sources.cc
+#, c-format
+msgid "Rewrite %zu sources?"
+msgstr ""
+
 #: apt-private/private-unmet.cc
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
@@ -2697,6 +2702,12 @@ msgstr ""
 #. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
 #: apt-private/private-update.cc
 #, c-format
+msgid "The %s entry for '%s' should be upgraded to deb822 .sources"
+msgstr ""
+
+#. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
 msgid "Missing Signed-By in the %s entry for '%s'"
 msgstr ""
 
@@ -2712,7 +2723,11 @@ msgid ""
 msgstr ""
 
 #: apt-private/private-update.cc
-msgid "See apt-secure(7) for best practices in configuring repository signing."
+msgid "See apt-secure(8) for best practices in configuring repository signing."
+msgstr ""
+
+#: apt-private/private-update.cc
+msgid "Some sources can be modernized. Run 'apt modernize-sources' to do so."
 msgstr ""
 
 #: apt-private/private-update.cc
@@ -3345,6 +3360,10 @@ msgid "edit the source information file"
 msgstr "Lendo a información do estado"
 
 #: cmdline/apt.cc
+msgid "modernize .list files to .sources files"
+msgstr ""
+
+#: cmdline/apt.cc
 #, fuzzy
 #| msgid "Failed to satisfy %s dependency for %s: %s"
 msgid "satisfy dependency strings"
diff --git a/po/hu.po b/po/hu.po
index 6839e8d3a..39b558863 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2025-01-21 11:21+0000\n"
+"POT-Creation-Date: 2025-01-28 18:52+0000\n"
 "PO-Revision-Date: 2016-04-10 19:46+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng@ubuntu.com>\n"
 "Language-Team: Hungarian <gnome-hu-list@gnome.org>\n"
@@ -2498,7 +2498,7 @@ msgid "Y"
 msgstr "I"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc
+#: apt-private/private-output.cc apt-private/private-sources.cc
 msgid "N"
 msgstr "N"
 
@@ -2724,6 +2724,11 @@ msgstr "%s feldolgozása sikertelen. Újra szerkeszti? "
 msgid "Your '%s' file changed, please run 'apt-get update'.\n"
 msgstr "A(z) „%s” fájl megváltozott, adja ki az „apt-get update” parancsot.\n"
 
+#: apt-private/private-sources.cc
+#, c-format
+msgid "Rewrite %zu sources?"
+msgstr ""
+
 #: apt-private/private-unmet.cc
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
@@ -2744,6 +2749,12 @@ msgstr ""
 #. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
 #: apt-private/private-update.cc
 #, c-format
+msgid "The %s entry for '%s' should be upgraded to deb822 .sources"
+msgstr ""
+
+#. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
 msgid "Missing Signed-By in the %s entry for '%s'"
 msgstr ""
 
@@ -2763,12 +2774,16 @@ msgstr ""
 #| msgid ""
 #| "See apt-secure(8) manpage for repository creation and user configuration "
 #| "details."
-msgid "See apt-secure(7) for best practices in configuring repository signing."
+msgid "See apt-secure(8) for best practices in configuring repository signing."
 msgstr ""
 "Lásd az apt-secure(8) kézikönyvoldalt a tárolólétrehozással és felhasználói "
 "beállításokkal kapcsolatos részletekért."
 
 #: apt-private/private-update.cc
+msgid "Some sources can be modernized. Run 'apt modernize-sources' to do so."
+msgstr ""
+
+#: apt-private/private-update.cc
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
 msgid_plural ""
@@ -3420,6 +3435,10 @@ msgid "edit the source information file"
 msgstr "a forrásinformációs fájl szerkesztése"
 
 #: cmdline/apt.cc
+msgid "modernize .list files to .sources files"
+msgstr ""
+
+#: cmdline/apt.cc
 #, fuzzy
 #| msgid "Failed to satisfy %s dependency for %s: %s"
 msgid "satisfy dependency strings"
diff --git a/po/it.po b/po/it.po
index 4952a0fdb..163b98194 100644
--- a/po/it.po
+++ b/po/it.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2025-01-21 11:21+0000\n"
+"POT-Creation-Date: 2025-01-28 18:52+0000\n"
 "PO-Revision-Date: 2024-09-06 10:21+0100\n"
 "Last-Translator: Luca Vercelli <luca.vercelli.to@gmail.com>\n"
 "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
@@ -2526,7 +2526,7 @@ msgid "Y"
 msgstr "S"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc
+#: apt-private/private-output.cc apt-private/private-sources.cc
 msgid "N"
 msgstr "N"
 
@@ -2759,6 +2759,11 @@ msgid "Your '%s' file changed, please run 'apt-get update'.\n"
 msgstr ""
 "Il proprio file \"%s\" è stato modificato: eseguire \"apt-get update\".\n"
 
+#: apt-private/private-sources.cc
+#, c-format
+msgid "Rewrite %zu sources?"
+msgstr ""
+
 #: apt-private/private-unmet.cc
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
@@ -2781,6 +2786,12 @@ msgstr ""
 #. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
 #: apt-private/private-update.cc
 #, c-format
+msgid "The %s entry for '%s' should be upgraded to deb822 .sources"
+msgstr ""
+
+#. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
 msgid "Missing Signed-By in the %s entry for '%s'"
 msgstr "Clausola Signed-By mancante nella voce %s per \"%s\""
 
@@ -2800,12 +2811,16 @@ msgstr ""
 #| msgid ""
 #| "See apt-secure(8) manpage for repository creation and user configuration "
 #| "details."
-msgid "See apt-secure(7) for best practices in configuring repository signing."
+msgid "See apt-secure(8) for best practices in configuring repository signing."
 msgstr ""
 "Consultare la pagina man apt-secure(8) per la creazione di repository e la "
 "configurazione utente."
 
 #: apt-private/private-update.cc
+msgid "Some sources can be modernized. Run 'apt modernize-sources' to do so."
+msgstr ""
+
+#: apt-private/private-update.cc
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
 msgid_plural ""
@@ -3467,6 +3482,10 @@ msgid "edit the source information file"
 msgstr "Modifica il file sulle informazioni delle sorgenti"
 
 #: cmdline/apt.cc
+msgid "modernize .list files to .sources files"
+msgstr ""
+
+#: cmdline/apt.cc
 msgid "satisfy dependency strings"
 msgstr "Risolve stringhe di dipendenze"
 
diff --git a/po/ja.po b/po/ja.po
index 5c5c631f9..2c45edc06 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 2.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2025-01-21 11:21+0000\n"
+"POT-Creation-Date: 2025-01-28 18:52+0000\n"
 "PO-Revision-Date: 2022-08-14 14:30+0900\n"
 "Last-Translator: Hideki Yamane <henrich@debian.org>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -2490,7 +2490,7 @@ msgid "Y"
 msgstr "Y"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc
+#: apt-private/private-output.cc apt-private/private-sources.cc
 msgid "N"
 msgstr "N"
 
@@ -2714,6 +2714,11 @@ msgid "Your '%s' file changed, please run 'apt-get update'.\n"
 msgstr ""
 "'%s' ファイルが変更されています。「apt-get update」を実行してください。\n"
 
+#: apt-private/private-sources.cc
+#, c-format
+msgid "Rewrite %zu sources?"
+msgstr ""
+
 #: apt-private/private-unmet.cc
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
@@ -2734,6 +2739,12 @@ msgstr ""
 #. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
 #: apt-private/private-update.cc
 #, c-format
+msgid "The %s entry for '%s' should be upgraded to deb822 .sources"
+msgstr ""
+
+#. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
 msgid "Missing Signed-By in the %s entry for '%s'"
 msgstr ""
 
@@ -2753,12 +2764,16 @@ msgstr ""
 #| msgid ""
 #| "See apt-secure(8) manpage for repository creation and user configuration "
 #| "details."
-msgid "See apt-secure(7) for best practices in configuring repository signing."
+msgid "See apt-secure(8) for best practices in configuring repository signing."
 msgstr ""
 "リポジトリの作成とユーザ設定の詳細は、apt-secure(8) man ページを参照してくだ"
 "さい。"
 
 #: apt-private/private-update.cc
+msgid "Some sources can be modernized. Run 'apt modernize-sources' to do so."
+msgstr ""
+
+#: apt-private/private-update.cc
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
 msgid_plural ""
@@ -3414,6 +3429,10 @@ msgid "edit the source information file"
 msgstr "ソース情報ファイルを編集"
 
 #: cmdline/apt.cc
+msgid "modernize .list files to .sources files"
+msgstr ""
+
+#: cmdline/apt.cc
 #, fuzzy
 #| msgid "Building dependency tree"
 msgid "satisfy dependency strings"
diff --git a/po/km.po b/po/km.po
index 68c2fc623..6603a51f7 100644
--- a/po/km.po
+++ b/po/km.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2025-01-21 11:21+0000\n"
+"POT-Creation-Date: 2025-01-28 18:52+0000\n"
 "PO-Revision-Date: 2006-10-10 09:48+0700\n"
 "Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n"
 "Language-Team: Khmer <support@khmeros.info>\n"
@@ -2370,7 +2370,7 @@ msgid "Y"
 msgstr "Y"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc
+#: apt-private/private-output.cc apt-private/private-sources.cc
 msgid "N"
 msgstr ""
 
@@ -2582,6 +2582,11 @@ msgstr "បរាជ័យ​ក្នុង​ការ​ប្តូរ​ឈ
 msgid "Your '%s' file changed, please run 'apt-get update'.\n"
 msgstr ""
 
+#: apt-private/private-sources.cc
+#, c-format
+msgid "Rewrite %zu sources?"
+msgstr ""
+
 #: apt-private/private-unmet.cc
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
@@ -2602,6 +2607,12 @@ msgstr ""
 #. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
 #: apt-private/private-update.cc
 #, c-format
+msgid "The %s entry for '%s' should be upgraded to deb822 .sources"
+msgstr ""
+
+#. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
 msgid "Missing Signed-By in the %s entry for '%s'"
 msgstr ""
 
@@ -2617,7 +2628,11 @@ msgid ""
 msgstr ""
 
 #: apt-private/private-update.cc
-msgid "See apt-secure(7) for best practices in configuring repository signing."
+msgid "See apt-secure(8) for best practices in configuring repository signing."
+msgstr ""
+
+#: apt-private/private-update.cc
+msgid "Some sources can be modernized. Run 'apt modernize-sources' to do so."
 msgstr ""
 
 #: apt-private/private-update.cc
@@ -3251,6 +3266,10 @@ msgid "edit the source information file"
 msgstr "បញ្ចូល​​ព័ត៌មាន​ដែលមាន​ចូល​គ្នា"
 
 #: cmdline/apt.cc
+msgid "modernize .list files to .sources files"
+msgstr ""
+
+#: cmdline/apt.cc
 #, fuzzy
 #| msgid "Failed to satisfy %s dependency for %s: %s"
 msgid "satisfy dependency strings"
diff --git a/po/ko.po b/po/ko.po
index 2af857a6f..61416db35 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2025-01-21 11:21+0000\n"
+"POT-Creation-Date: 2025-01-28 18:52+0000\n"
 "PO-Revision-Date: 2010-08-30 02:31+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n"
@@ -2393,7 +2393,7 @@ msgid "Y"
 msgstr "Y"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc
+#: apt-private/private-output.cc apt-private/private-sources.cc
 msgid "N"
 msgstr ""
 
@@ -2608,6 +2608,11 @@ msgstr "%s 파일의 이름을 %s(으)로 바꾸는데 실패했습니다"
 msgid "Your '%s' file changed, please run 'apt-get update'.\n"
 msgstr ""
 
+#: apt-private/private-sources.cc
+#, c-format
+msgid "Rewrite %zu sources?"
+msgstr ""
+
 #: apt-private/private-unmet.cc
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
@@ -2628,6 +2633,12 @@ msgstr ""
 #. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
 #: apt-private/private-update.cc
 #, c-format
+msgid "The %s entry for '%s' should be upgraded to deb822 .sources"
+msgstr ""
+
+#. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
 msgid "Missing Signed-By in the %s entry for '%s'"
 msgstr ""
 
@@ -2643,7 +2654,11 @@ msgid ""
 msgstr ""
 
 #: apt-private/private-update.cc
-msgid "See apt-secure(7) for best practices in configuring repository signing."
+msgid "See apt-secure(8) for best practices in configuring repository signing."
+msgstr ""
+
+#: apt-private/private-update.cc
+msgid "Some sources can be modernized. Run 'apt modernize-sources' to do so."
 msgstr ""
 
 #: apt-private/private-update.cc
@@ -3271,6 +3286,10 @@ msgid "edit the source information file"
 msgstr "상태 정보를 읽는 중입니다"
 
 #: cmdline/apt.cc
+msgid "modernize .list files to .sources files"
+msgstr ""
+
+#: cmdline/apt.cc
 #, fuzzy
 #| msgid "Failed to satisfy %s dependency for %s: %s"
 msgid "satisfy dependency strings"
diff --git a/po/ku.po b/po/ku.po
index 844e78261..3b3002e57 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2025-01-21 11:21+0000\n"
+"POT-Creation-Date: 2025-01-28 18:52+0000\n"
 "PO-Revision-Date: 2008-05-08 12:48+0200\n"
 "Last-Translator: Erdal Ronahi <erdal.ronahi@gmail.com>\n"
 "Language-Team: ku <ubuntu-l10n-kur@lists.ubuntu.com>\n"
@@ -2320,7 +2320,7 @@ msgid "Y"
 msgstr "E"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc
+#: apt-private/private-output.cc apt-private/private-sources.cc
 msgid "N"
 msgstr ""
 
@@ -2532,6 +2532,11 @@ msgstr "%s ji hev nehate veçirandin"
 msgid "Your '%s' file changed, please run 'apt-get update'.\n"
 msgstr ""
 
+#: apt-private/private-sources.cc
+#, c-format
+msgid "Rewrite %zu sources?"
+msgstr ""
+
 #: apt-private/private-unmet.cc
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
@@ -2552,6 +2557,12 @@ msgstr ""
 #. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
 #: apt-private/private-update.cc
 #, c-format
+msgid "The %s entry for '%s' should be upgraded to deb822 .sources"
+msgstr ""
+
+#. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
 msgid "Missing Signed-By in the %s entry for '%s'"
 msgstr ""
 
@@ -2567,7 +2578,11 @@ msgid ""
 msgstr ""
 
 #: apt-private/private-update.cc
-msgid "See apt-secure(7) for best practices in configuring repository signing."
+msgid "See apt-secure(8) for best practices in configuring repository signing."
+msgstr ""
+
+#: apt-private/private-update.cc
+msgid "Some sources can be modernized. Run 'apt modernize-sources' to do so."
 msgstr ""
 
 #: apt-private/private-update.cc
@@ -3178,6 +3193,10 @@ msgid "edit the source information file"
 msgstr ""
 
 #: cmdline/apt.cc
+msgid "modernize .list files to .sources files"
+msgstr ""
+
+#: cmdline/apt.cc
 msgid "satisfy dependency strings"
 msgstr ""
 
diff --git a/po/lt.po b/po/lt.po
index f49fd29b9..91e957242 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2025-01-21 11:21+0000\n"
+"POT-Creation-Date: 2025-01-28 18:52+0000\n"
 "PO-Revision-Date: 2008-08-02 01:47-0400\n"
 "Last-Translator: Gintautas Miliauskas <gintas@akl.lt>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -2357,7 +2357,7 @@ msgid "Y"
 msgstr "T"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc
+#: apt-private/private-output.cc apt-private/private-sources.cc
 msgid "N"
 msgstr ""
 
@@ -2568,6 +2568,11 @@ msgstr "Nepavyko pervadinti %s į %s"
 msgid "Your '%s' file changed, please run 'apt-get update'.\n"
 msgstr ""
 
+#: apt-private/private-sources.cc
+#, c-format
+msgid "Rewrite %zu sources?"
+msgstr ""
+
 #: apt-private/private-unmet.cc
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
@@ -2588,6 +2593,12 @@ msgstr ""
 #. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
 #: apt-private/private-update.cc
 #, c-format
+msgid "The %s entry for '%s' should be upgraded to deb822 .sources"
+msgstr ""
+
+#. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
 msgid "Missing Signed-By in the %s entry for '%s'"
 msgstr ""
 
@@ -2603,7 +2614,11 @@ msgid ""
 msgstr ""
 
 #: apt-private/private-update.cc
-msgid "See apt-secure(7) for best practices in configuring repository signing."
+msgid "See apt-secure(8) for best practices in configuring repository signing."
+msgstr ""
+
+#: apt-private/private-update.cc
+msgid "Some sources can be modernized. Run 'apt modernize-sources' to do so."
 msgstr ""
 
 #: apt-private/private-update.cc
@@ -3232,6 +3247,10 @@ msgid "edit the source information file"
 msgstr "Skaitoma būsenos informacija"
 
 #: cmdline/apt.cc
+msgid "modernize .list files to .sources files"
+msgstr ""
+
+#: cmdline/apt.cc
 #, fuzzy
 #| msgid "Failed to satisfy %s dependency for %s: %s"
 msgid "satisfy dependency strings"
diff --git a/po/mr.po b/po/mr.po
index c99645d57..c18bb1442 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2025-01-21 11:21+0000\n"
+"POT-Creation-Date: 2025-01-28 18:52+0000\n"
 "PO-Revision-Date: 2008-11-20 23:27+0530\n"
 "Last-Translator: Sampada <sampadanakhare@gmail.com>\n"
 "Language-Team: Marathi, janabhaaratii, C-DAC, Mumbai, India "
@@ -2376,7 +2376,7 @@ msgid "Y"
 msgstr "होय"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc
+#: apt-private/private-output.cc apt-private/private-sources.cc
 msgid "N"
 msgstr ""
 
@@ -2588,6 +2588,11 @@ msgstr "%s ला पुनर्नामांकन %s करण्यास
 msgid "Your '%s' file changed, please run 'apt-get update'.\n"
 msgstr ""
 
+#: apt-private/private-sources.cc
+#, c-format
+msgid "Rewrite %zu sources?"
+msgstr ""
+
 #: apt-private/private-unmet.cc
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
@@ -2608,6 +2613,12 @@ msgstr ""
 #. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
 #: apt-private/private-update.cc
 #, c-format
+msgid "The %s entry for '%s' should be upgraded to deb822 .sources"
+msgstr ""
+
+#. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
 msgid "Missing Signed-By in the %s entry for '%s'"
 msgstr ""
 
@@ -2623,7 +2634,11 @@ msgid ""
 msgstr ""
 
 #: apt-private/private-update.cc
-msgid "See apt-secure(7) for best practices in configuring repository signing."
+msgid "See apt-secure(8) for best practices in configuring repository signing."
+msgstr ""
+
+#: apt-private/private-update.cc
+msgid "Some sources can be modernized. Run 'apt modernize-sources' to do so."
 msgstr ""
 
 #: apt-private/private-update.cc
@@ -3251,6 +3266,10 @@ msgid "edit the source information file"
 msgstr "स्थिती माहिती वाचत आहे"
 
 #: cmdline/apt.cc
+msgid "modernize .list files to .sources files"
+msgstr ""
+
+#: cmdline/apt.cc
 #, fuzzy
 #| msgid "Failed to satisfy %s dependency for %s: %s"
 msgid "satisfy dependency strings"
diff --git a/po/nb.po b/po/nb.po
index 21056ca75..8d90a6b25 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2025-01-21 11:21+0000\n"
+"POT-Creation-Date: 2025-01-28 18:52+0000\n"
 "PO-Revision-Date: 2018-10-30 20:53+0100\n"
 "Last-Translator: Petter Reinholdtsen <pere@hungry.com>\n"
 "Language-Team: Norwegian Bokmål <i18n-no@lister.ping.uio.no>\n"
@@ -2443,7 +2443,7 @@ msgid "Y"
 msgstr "J"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc
+#: apt-private/private-output.cc apt-private/private-sources.cc
 msgid "N"
 msgstr "N"
 
@@ -2665,6 +2665,11 @@ msgstr "Klarte ikke å endre navnet på %s til %s"
 msgid "Your '%s' file changed, please run 'apt-get update'.\n"
 msgstr "'%s'-filen din ble endret, vær så snill å kjør 'apt-get update'.\n"
 
+#: apt-private/private-sources.cc
+#, c-format
+msgid "Rewrite %zu sources?"
+msgstr ""
+
 #: apt-private/private-unmet.cc
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
@@ -2685,6 +2690,12 @@ msgstr ""
 #. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
 #: apt-private/private-update.cc
 #, c-format
+msgid "The %s entry for '%s' should be upgraded to deb822 .sources"
+msgstr ""
+
+#. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
 msgid "Missing Signed-By in the %s entry for '%s'"
 msgstr ""
 
@@ -2704,12 +2715,16 @@ msgstr ""
 #| msgid ""
 #| "See apt-secure(8) manpage for repository creation and user configuration "
 #| "details."
-msgid "See apt-secure(7) for best practices in configuring repository signing."
+msgid "See apt-secure(8) for best practices in configuring repository signing."
 msgstr ""
 "Se manualsiden apt-secure(8) for detaljer om oppretting av depote og "
 "brukeroppsett."
 
 #: apt-private/private-update.cc
+msgid "Some sources can be modernized. Run 'apt modernize-sources' to do so."
+msgstr ""
+
+#: apt-private/private-update.cc
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
 msgid_plural ""
@@ -3345,6 +3360,10 @@ msgid "edit the source information file"
 msgstr "Leser tilstandsinformasjon"
 
 #: cmdline/apt.cc
+msgid "modernize .list files to .sources files"
+msgstr ""
+
+#: cmdline/apt.cc
 #, fuzzy
 #| msgid "Failed to satisfy %s dependency for %s: %s"
 msgid "satisfy dependency strings"
diff --git a/po/ne.po b/po/ne.po
index c2e8355e8..8fe570e9b 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2025-01-21 11:21+0000\n"
+"POT-Creation-Date: 2025-01-28 18:52+0000\n"
 "PO-Revision-Date: 2006-06-12 14:35+0545\n"
 "Last-Translator: Shiva Pokharel <pokharelshiva@hotmail.com>\n"
 "Language-Team: Nepali <info@mpp.org.np>\n"
@@ -2367,7 +2367,7 @@ msgid "Y"
 msgstr ""
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc
+#: apt-private/private-output.cc apt-private/private-sources.cc
 msgid "N"
 msgstr ""
 
@@ -2579,6 +2579,11 @@ msgstr " %s मा  %s  पुन:नामकरण असफल भयो"
 msgid "Your '%s' file changed, please run 'apt-get update'.\n"
 msgstr ""
 
+#: apt-private/private-sources.cc
+#, c-format
+msgid "Rewrite %zu sources?"
+msgstr ""
+
 #: apt-private/private-unmet.cc
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
@@ -2599,6 +2604,12 @@ msgstr ""
 #. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
 #: apt-private/private-update.cc
 #, c-format
+msgid "The %s entry for '%s' should be upgraded to deb822 .sources"
+msgstr ""
+
+#. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
 msgid "Missing Signed-By in the %s entry for '%s'"
 msgstr ""
 
@@ -2614,7 +2625,11 @@ msgid ""
 msgstr ""
 
 #: apt-private/private-update.cc
-msgid "See apt-secure(7) for best practices in configuring repository signing."
+msgid "See apt-secure(8) for best practices in configuring repository signing."
+msgstr ""
+
+#: apt-private/private-update.cc
+msgid "Some sources can be modernized. Run 'apt modernize-sources' to do so."
 msgstr ""
 
 #: apt-private/private-update.cc
@@ -3247,6 +3262,10 @@ msgid "edit the source information file"
 msgstr "उपलब्ध सूचना गाँभिदैछ"
 
 #: cmdline/apt.cc
+msgid "modernize .list files to .sources files"
+msgstr ""
+
+#: cmdline/apt.cc
 #, fuzzy
 #| msgid "Failed to satisfy %s dependency for %s: %s"
 msgid "satisfy dependency strings"
diff --git a/po/nl.po b/po/nl.po
index 6274bb060..2ccb1ee40 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 2.9.10\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2025-01-21 11:21+0000\n"
+"POT-Creation-Date: 2025-01-28 18:52+0000\n"
 "PO-Revision-Date: 2024-11-05 18:11+0100\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
@@ -2511,7 +2511,7 @@ msgid "Y"
 msgstr "J"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc
+#: apt-private/private-output.cc apt-private/private-sources.cc
 msgid "N"
 msgstr "N"
 
@@ -2740,6 +2740,11 @@ msgstr "Verwerken van %s is mislukt. Opnieuw bewerken? "
 msgid "Your '%s' file changed, please run 'apt-get update'.\n"
 msgstr "Uw bestand '%s' is gewijzigd. Voer 'apt-get update' uit.\n"
 
+#: apt-private/private-sources.cc
+#, c-format
+msgid "Rewrite %zu sources?"
+msgstr ""
+
 #: apt-private/private-unmet.cc
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
@@ -2762,6 +2767,12 @@ msgstr ""
 #. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
 #: apt-private/private-update.cc
 #, c-format
+msgid "The %s entry for '%s' should be upgraded to deb822 .sources"
+msgstr ""
+
+#. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
 msgid "Missing Signed-By in the %s entry for '%s'"
 msgstr "Ontbrekende Signed-By in het item %s voor '%s'"
 
@@ -2781,12 +2792,16 @@ msgstr ""
 #| msgid ""
 #| "See apt-secure(8) manpage for repository creation and user configuration "
 #| "details."
-msgid "See apt-secure(7) for best practices in configuring repository signing."
+msgid "See apt-secure(8) for best practices in configuring repository signing."
 msgstr ""
 "Zie de man-pagina apt-secure(8) voor details over het aanmaken van een "
 "pakketbron en over de configuratie langs gebruikerskant."
 
 #: apt-private/private-update.cc
+msgid "Some sources can be modernized. Run 'apt modernize-sources' to do so."
+msgstr ""
+
+#: apt-private/private-update.cc
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
 msgid_plural ""
@@ -3444,6 +3459,10 @@ msgid "edit the source information file"
 msgstr "het bestand met informatie over de pakketbronnen bewerken"
 
 #: cmdline/apt.cc
+msgid "modernize .list files to .sources files"
+msgstr ""
+
+#: cmdline/apt.cc
 msgid "satisfy dependency strings"
 msgstr "voldoen aan vereistentekenreeksen"
 
diff --git a/po/nn.po b/po/nn.po
index 8db2c2c0b..ad39a7f8c 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2025-01-21 11:21+0000\n"
+"POT-Creation-Date: 2025-01-28 18:52+0000\n"
 "PO-Revision-Date: 2005-02-14 23:30+0100\n"
 "Last-Translator: Havard Korsvoll <korsvoll@skulelinux.no>\n"
 "Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -2381,7 +2381,7 @@ msgid "Y"
 msgstr "J"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc
+#: apt-private/private-output.cc apt-private/private-sources.cc
 msgid "N"
 msgstr "N"
 
@@ -2593,6 +2593,11 @@ msgstr "Klarte ikkje endra namnet p� %s til %s"
 msgid "Your '%s' file changed, please run 'apt-get update'.\n"
 msgstr ""
 
+#: apt-private/private-sources.cc
+#, c-format
+msgid "Rewrite %zu sources?"
+msgstr ""
+
 #: apt-private/private-unmet.cc
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
@@ -2613,6 +2618,12 @@ msgstr ""
 #. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
 #: apt-private/private-update.cc
 #, c-format
+msgid "The %s entry for '%s' should be upgraded to deb822 .sources"
+msgstr ""
+
+#. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
 msgid "Missing Signed-By in the %s entry for '%s'"
 msgstr ""
 
@@ -2628,7 +2639,11 @@ msgid ""
 msgstr ""
 
 #: apt-private/private-update.cc
-msgid "See apt-secure(7) for best practices in configuring repository signing."
+msgid "See apt-secure(8) for best practices in configuring repository signing."
+msgstr ""
+
+#: apt-private/private-update.cc
+msgid "Some sources can be modernized. Run 'apt modernize-sources' to do so."
 msgstr ""
 
 #: apt-private/private-update.cc
@@ -3265,6 +3280,10 @@ msgid "edit the source information file"
 msgstr "Flettar informasjon om tilgjengelege pakkar"
 
 #: cmdline/apt.cc
+msgid "modernize .list files to .sources files"
+msgstr ""
+
+#: cmdline/apt.cc
 #, fuzzy
 #| msgid "Failed to satisfy %s dependency for %s: %s"
 msgid "satisfy dependency strings"
diff --git a/po/pl.po b/po/pl.po
index ce3ee4b5a..6a9469e71 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.9.7.3\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2025-01-21 11:21+0000\n"
+"POT-Creation-Date: 2025-01-28 18:52+0000\n"
 "PO-Revision-Date: 2024-07-08 17:53+0200\n"
 "Last-Translator: Michał Kułach <michal.kulach@gmail.com>\n"
 "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -2522,7 +2522,7 @@ msgid "Y"
 msgstr "T"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc
+#: apt-private/private-output.cc apt-private/private-sources.cc
 msgid "N"
 msgstr "N"
 
@@ -2756,6 +2756,11 @@ msgstr "Nie udało się przeanalizować %s. Edytować ponownie? "
 msgid "Your '%s' file changed, please run 'apt-get update'.\n"
 msgstr "Plik \"%s\" uległ zmianie, proszę wykonać \"apt-get update\".\n"
 
+#: apt-private/private-sources.cc
+#, c-format
+msgid "Rewrite %zu sources?"
+msgstr ""
+
 #: apt-private/private-unmet.cc
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
@@ -2778,6 +2783,12 @@ msgstr ""
 #. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
 #: apt-private/private-update.cc
 #, c-format
+msgid "The %s entry for '%s' should be upgraded to deb822 .sources"
+msgstr ""
+
+#. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
 msgid "Missing Signed-By in the %s entry for '%s'"
 msgstr "Brakuje Signed-By (podpisu) we wpisie %s dla \"%s\""
 
@@ -2797,12 +2808,16 @@ msgstr ""
 #| msgid ""
 #| "See apt-secure(8) manpage for repository creation and user configuration "
 #| "details."
-msgid "See apt-secure(7) for best practices in configuring repository signing."
+msgid "See apt-secure(8) for best practices in configuring repository signing."
 msgstr ""
 "Więcej informacji o tworzeniu repozytorium i szczegółach konfiguracji "
 "użytkownika znajduje się w podręczniku apt-secure(8)."
 
 #: apt-private/private-update.cc
+msgid "Some sources can be modernized. Run 'apt modernize-sources' to do so."
+msgstr ""
+
+#: apt-private/private-update.cc
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
 msgid_plural ""
@@ -3454,6 +3469,10 @@ msgid "edit the source information file"
 msgstr "edytuje plik z informacjami o źródłach"
 
 #: cmdline/apt.cc
+msgid "modernize .list files to .sources files"
+msgstr ""
+
+#: cmdline/apt.cc
 msgid "satisfy dependency strings"
 msgstr "spełnia łańcuchy zależności"
 
diff --git a/po/pt.po b/po/pt.po
index 5948a403b..0c8c78845 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2025-01-21 11:21+0000\n"
+"POT-Creation-Date: 2025-01-28 18:52+0000\n"
 "PO-Revision-Date: 2012-06-29 15:45+0100\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -2470,7 +2470,7 @@ msgid "Y"
 msgstr "S"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc
+#: apt-private/private-output.cc apt-private/private-sources.cc
 msgid "N"
 msgstr "N"
 
@@ -2694,6 +2694,11 @@ msgstr "Falha ao baixar %s  %s\n"
 msgid "Your '%s' file changed, please run 'apt-get update'.\n"
 msgstr ""
 
+#: apt-private/private-sources.cc
+#, c-format
+msgid "Rewrite %zu sources?"
+msgstr ""
+
 #: apt-private/private-unmet.cc
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
@@ -2714,6 +2719,12 @@ msgstr ""
 #. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
 #: apt-private/private-update.cc
 #, c-format
+msgid "The %s entry for '%s' should be upgraded to deb822 .sources"
+msgstr ""
+
+#. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
 msgid "Missing Signed-By in the %s entry for '%s'"
 msgstr ""
 
@@ -2729,7 +2740,11 @@ msgid ""
 msgstr ""
 
 #: apt-private/private-update.cc
-msgid "See apt-secure(7) for best practices in configuring repository signing."
+msgid "See apt-secure(8) for best practices in configuring repository signing."
+msgstr ""
+
+#: apt-private/private-update.cc
+msgid "Some sources can be modernized. Run 'apt modernize-sources' to do so."
 msgstr ""
 
 #: apt-private/private-update.cc
@@ -3368,6 +3383,10 @@ msgid "edit the source information file"
 msgstr "A ler a informação de estado"
 
 #: cmdline/apt.cc
+msgid "modernize .list files to .sources files"
+msgstr ""
+
+#: cmdline/apt.cc
 #, fuzzy
 #| msgid "Failed to satisfy %s dependency for %s: %s"
 msgid "satisfy dependency strings"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index ac1dd150d..56e14e0c7 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2025-01-21 11:21+0000\n"
+"POT-Creation-Date: 2025-01-28 18:52+0000\n"
 "PO-Revision-Date: 2008-11-17 02:33-0200\n"
 "Last-Translator: Felipe Augusto van de Wiel (faw) <faw@debian.org>\n"
 "Language-Team: Brazilian Portuguese <debian-l10n-"
@@ -2395,7 +2395,7 @@ msgid "Y"
 msgstr "S"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc
+#: apt-private/private-output.cc apt-private/private-sources.cc
 msgid "N"
 msgstr ""
 
@@ -2611,6 +2611,11 @@ msgstr "Falha ao baixar %s  %s\n"
 msgid "Your '%s' file changed, please run 'apt-get update'.\n"
 msgstr ""
 
+#: apt-private/private-sources.cc
+#, c-format
+msgid "Rewrite %zu sources?"
+msgstr ""
+
 #: apt-private/private-unmet.cc
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
@@ -2631,6 +2636,12 @@ msgstr ""
 #. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
 #: apt-private/private-update.cc
 #, c-format
+msgid "The %s entry for '%s' should be upgraded to deb822 .sources"
+msgstr ""
+
+#. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
 msgid "Missing Signed-By in the %s entry for '%s'"
 msgstr ""
 
@@ -2646,7 +2657,11 @@ msgid ""
 msgstr ""
 
 #: apt-private/private-update.cc
-msgid "See apt-secure(7) for best practices in configuring repository signing."
+msgid "See apt-secure(8) for best practices in configuring repository signing."
+msgstr ""
+
+#: apt-private/private-update.cc
+msgid "Some sources can be modernized. Run 'apt modernize-sources' to do so."
 msgstr ""
 
 #: apt-private/private-update.cc
@@ -3283,6 +3298,10 @@ msgid "edit the source information file"
 msgstr "Lendo informação de estado"
 
 #: cmdline/apt.cc
+msgid "modernize .list files to .sources files"
+msgstr ""
+
+#: cmdline/apt.cc
 #, fuzzy
 #| msgid "Failed to satisfy %s dependency for %s: %s"
 msgid "satisfy dependency strings"
diff --git a/po/ro.po b/po/ro.po
index 3b5047c2a..6ef46ae9f 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -27,7 +27,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 2.9.8\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2025-01-21 11:21+0000\n"
+"POT-Creation-Date: 2025-01-28 18:52+0000\n"
 "PO-Revision-Date: 2024-09-02 00:21+0200\n"
 "Last-Translator: Remus-Gabriel Chelu <remusgabriel.chelu@disroot.org>\n"
 "Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
@@ -2590,7 +2590,7 @@ msgid "Y"
 msgstr "D"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc
+#: apt-private/private-output.cc apt-private/private-sources.cc
 msgid "N"
 msgstr "N"
 
@@ -2828,6 +2828,11 @@ msgstr "Nu s-a putut analiza %s. Editați din nou? "
 msgid "Your '%s' file changed, please run 'apt-get update'.\n"
 msgstr "Fișierul „%s” s-a modificat, executați «apt-get update».\n"
 
+#: apt-private/private-sources.cc
+#, c-format
+msgid "Rewrite %zu sources?"
+msgstr ""
+
 #: apt-private/private-unmet.cc
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
@@ -2847,6 +2852,12 @@ msgstr ""
 "Utilizarea lui %s ar trebui să fie preferată în locul încorporării "
 "informațiilor de autentificare direct în intrarea %s pentru „%s”."
 
+#. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
+msgid "The %s entry for '%s' should be upgraded to deb822 .sources"
+msgstr ""
+
 # R-GC, scrie:
 # mesaj, tradus cu ajutorul lui
 # David Kalnischkies, actualul
@@ -2873,12 +2884,16 @@ msgstr ""
 #| msgid ""
 #| "See apt-secure(8) manpage for repository creation and user configuration "
 #| "details."
-msgid "See apt-secure(7) for best practices in configuring repository signing."
+msgid "See apt-secure(8) for best practices in configuring repository signing."
 msgstr ""
 "Consultați pagina de manual apt-secure(8) pentru detalii privind crearea "
 "depozitului și configurarea utilizatorilor."
 
 #: apt-private/private-update.cc
+msgid "Some sources can be modernized. Run 'apt modernize-sources' to do so."
+msgstr ""
+
+#: apt-private/private-update.cc
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
 msgid_plural ""
@@ -3537,6 +3552,10 @@ msgid "edit the source information file"
 msgstr "editează fișierul cu informații despre surse"
 
 #: cmdline/apt.cc
+msgid "modernize .list files to .sources files"
+msgstr ""
+
+#: cmdline/apt.cc
 msgid "satisfy dependency strings"
 msgstr "efectuează operațiile pentru satisfacerea lanțurilor de dependențe"
 
diff --git a/po/ru.po b/po/ru.po
index 9e5fd8691..92b1a8b28 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 2.9.11\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2025-01-21 11:21+0000\n"
+"POT-Creation-Date: 2025-01-28 18:52+0000\n"
 "PO-Revision-Date: 2024-11-18 23:14+0300\n"
 "Last-Translator: Алексей Шилин <shilin.aleksej@gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -2505,7 +2505,7 @@ msgid "Y"
 msgstr "Д"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc
+#: apt-private/private-output.cc apt-private/private-sources.cc
 msgid "N"
 msgstr "Н"
 
@@ -2731,6 +2731,11 @@ msgstr "Не удалось разобрать содержимое %s. Повт
 msgid "Your '%s' file changed, please run 'apt-get update'.\n"
 msgstr "Файл «%s» изменён, запустите «apt-get update».\n"
 
+#: apt-private/private-sources.cc
+#, c-format
+msgid "Rewrite %zu sources?"
+msgstr ""
+
 #: apt-private/private-unmet.cc
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
@@ -2753,6 +2758,12 @@ msgstr ""
 #. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
 #: apt-private/private-update.cc
 #, c-format
+msgid "The %s entry for '%s' should be upgraded to deb822 .sources"
+msgstr ""
+
+#. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
 msgid "Missing Signed-By in the %s entry for '%s'"
 msgstr "Отсутствует поле Signed-By в записи %s для '%s'"
 
@@ -2772,12 +2783,16 @@ msgstr ""
 #| msgid ""
 #| "See apt-secure(8) manpage for repository creation and user configuration "
 #| "details."
-msgid "See apt-secure(7) for best practices in configuring repository signing."
+msgid "See apt-secure(8) for best practices in configuring repository signing."
 msgstr ""
 "Информацию о создании репозитория и настройках пользователя смотрите в "
 "справочной странице apt-secure(8)."
 
 #: apt-private/private-update.cc
+msgid "Some sources can be modernized. Run 'apt modernize-sources' to do so."
+msgstr ""
+
+#: apt-private/private-update.cc
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
 msgid_plural ""
@@ -3429,6 +3444,10 @@ msgid "edit the source information file"
 msgstr "редактировать файл с источниками пакетов"
 
 #: cmdline/apt.cc
+msgid "modernize .list files to .sources files"
+msgstr ""
+
+#: cmdline/apt.cc
 msgid "satisfy dependency strings"
 msgstr "удовлетворить строки зависимостей"
 
diff --git a/po/sk.po b/po/sk.po
index b7820afa2..d1458fb11 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2025-01-21 11:21+0000\n"
+"POT-Creation-Date: 2025-01-28 18:52+0000\n"
 "PO-Revision-Date: 2012-06-28 20:49+0100\n"
 "Last-Translator: Ivan Masár <helix84@centrum.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -2440,7 +2440,7 @@ msgid "Y"
 msgstr ""
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc
+#: apt-private/private-output.cc apt-private/private-sources.cc
 msgid "N"
 msgstr ""
 
@@ -2663,6 +2663,11 @@ msgstr "Premenovanie %s na %s zlyhalo"
 msgid "Your '%s' file changed, please run 'apt-get update'.\n"
 msgstr ""
 
+#: apt-private/private-sources.cc
+#, c-format
+msgid "Rewrite %zu sources?"
+msgstr ""
+
 #: apt-private/private-unmet.cc
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
@@ -2683,6 +2688,12 @@ msgstr ""
 #. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
 #: apt-private/private-update.cc
 #, c-format
+msgid "The %s entry for '%s' should be upgraded to deb822 .sources"
+msgstr ""
+
+#. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
 msgid "Missing Signed-By in the %s entry for '%s'"
 msgstr ""
 
@@ -2698,7 +2709,11 @@ msgid ""
 msgstr ""
 
 #: apt-private/private-update.cc
-msgid "See apt-secure(7) for best practices in configuring repository signing."
+msgid "See apt-secure(8) for best practices in configuring repository signing."
+msgstr ""
+
+#: apt-private/private-update.cc
+msgid "Some sources can be modernized. Run 'apt modernize-sources' to do so."
 msgstr ""
 
 #: apt-private/private-update.cc
@@ -3335,6 +3350,10 @@ msgid "edit the source information file"
 msgstr "Načítavajú sa stavové informácie"
 
 #: cmdline/apt.cc
+msgid "modernize .list files to .sources files"
+msgstr ""
+
+#: cmdline/apt.cc
 #, fuzzy
 #| msgid "Failed to satisfy %s dependency for %s: %s"
 msgid "satisfy dependency strings"
diff --git a/po/sl.po b/po/sl.po
index 0a7963620..b9edf98f5 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.5.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2025-01-21 11:21+0000\n"
+"POT-Creation-Date: 2025-01-28 18:52+0000\n"
 "PO-Revision-Date: 2012-06-27 21:29+0000\n"
 "Last-Translator: Andrej Znidarsic <andrej.znidarsic@gmail.com>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -2444,7 +2444,7 @@ msgid "Y"
 msgstr ""
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc
+#: apt-private/private-output.cc apt-private/private-sources.cc
 msgid "N"
 msgstr ""
 
@@ -2667,6 +2667,11 @@ msgstr "Ni mogoče preimenovati %s v %s"
 msgid "Your '%s' file changed, please run 'apt-get update'.\n"
 msgstr ""
 
+#: apt-private/private-sources.cc
+#, c-format
+msgid "Rewrite %zu sources?"
+msgstr ""
+
 #: apt-private/private-unmet.cc
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
@@ -2687,6 +2692,12 @@ msgstr ""
 #. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
 #: apt-private/private-update.cc
 #, c-format
+msgid "The %s entry for '%s' should be upgraded to deb822 .sources"
+msgstr ""
+
+#. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
 msgid "Missing Signed-By in the %s entry for '%s'"
 msgstr ""
 
@@ -2702,7 +2713,11 @@ msgid ""
 msgstr ""
 
 #: apt-private/private-update.cc
-msgid "See apt-secure(7) for best practices in configuring repository signing."
+msgid "See apt-secure(8) for best practices in configuring repository signing."
+msgstr ""
+
+#: apt-private/private-update.cc
+msgid "Some sources can be modernized. Run 'apt modernize-sources' to do so."
 msgstr ""
 
 #: apt-private/private-update.cc
@@ -3340,6 +3355,10 @@ msgid "edit the source information file"
 msgstr "Branje podatkov o stanju"
 
 #: cmdline/apt.cc
+msgid "modernize .list files to .sources files"
+msgstr ""
+
+#: cmdline/apt.cc
 #, fuzzy
 #| msgid "Failed to satisfy %s dependency for %s: %s"
 msgid "satisfy dependency strings"
diff --git a/po/sv.po b/po/sv.po
index 300fc9424..0779af97f 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2025-01-21 11:21+0000\n"
+"POT-Creation-Date: 2025-01-28 18:52+0000\n"
 "PO-Revision-Date: 2015-08-19 21:33+0200\n"
 "Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
 "Language-Team: Swedish <debian-l10n-swedish@debian.org>\n"
@@ -2460,7 +2460,7 @@ msgid "Y"
 msgstr "J"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc
+#: apt-private/private-output.cc apt-private/private-sources.cc
 msgid "N"
 msgstr "N"
 
@@ -2680,6 +2680,11 @@ msgstr "Misslyckades med att tolka %s. Redigera igen? "
 msgid "Your '%s' file changed, please run 'apt-get update'.\n"
 msgstr "Din ”%s”-fil ändrades, kör ”apt-get update”.\n"
 
+#: apt-private/private-sources.cc
+#, c-format
+msgid "Rewrite %zu sources?"
+msgstr ""
+
 #: apt-private/private-unmet.cc
 #, fuzzy, c-format
 msgid "Package %s version %s has an unmet dep:\n"
@@ -2701,6 +2706,12 @@ msgstr ""
 #. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
 #: apt-private/private-update.cc
 #, c-format
+msgid "The %s entry for '%s' should be upgraded to deb822 .sources"
+msgstr ""
+
+#. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
 msgid "Missing Signed-By in the %s entry for '%s'"
 msgstr ""
 
@@ -2716,7 +2727,11 @@ msgid ""
 msgstr ""
 
 #: apt-private/private-update.cc
-msgid "See apt-secure(7) for best practices in configuring repository signing."
+msgid "See apt-secure(8) for best practices in configuring repository signing."
+msgstr ""
+
+#: apt-private/private-update.cc
+msgid "Some sources can be modernized. Run 'apt modernize-sources' to do so."
 msgstr ""
 
 #: apt-private/private-update.cc
@@ -3359,6 +3374,10 @@ msgid "edit the source information file"
 msgstr "redigera källinformationsfilen"
 
 #: cmdline/apt.cc
+msgid "modernize .list files to .sources files"
+msgstr ""
+
+#: cmdline/apt.cc
 #, fuzzy
 #| msgid "Failed to satisfy %s dependency for %s: %s"
 msgid "satisfy dependency strings"
diff --git a/po/th.po b/po/th.po
index e28debdac..db7e44cc6 100644
--- a/po/th.po
+++ b/po/th.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2025-01-21 11:21+0000\n"
+"POT-Creation-Date: 2025-01-28 18:52+0000\n"
 "PO-Revision-Date: 2014-12-12 13:00+0700\n"
 "Last-Translator: Theppitak Karoonboonyanan <thep@debian.org>\n"
 "Language-Team: Thai <thai-l10n@googlegroups.com>\n"
@@ -2384,7 +2384,7 @@ msgid "Y"
 msgstr "Y"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc
+#: apt-private/private-output.cc apt-private/private-sources.cc
 msgid "N"
 msgstr "N"
 
@@ -2600,6 +2600,11 @@ msgstr "แจง %s ไม่สำเร็จ จะแก้ไขอีก�
 msgid "Your '%s' file changed, please run 'apt-get update'.\n"
 msgstr "แฟ้ม '%s' ของคุณมีการเปลี่ยนแปลง กรุณาเรียก 'apt-get update'\n"
 
+#: apt-private/private-sources.cc
+#, c-format
+msgid "Rewrite %zu sources?"
+msgstr ""
+
 #: apt-private/private-unmet.cc
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
@@ -2620,6 +2625,12 @@ msgstr ""
 #. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
 #: apt-private/private-update.cc
 #, c-format
+msgid "The %s entry for '%s' should be upgraded to deb822 .sources"
+msgstr ""
+
+#. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
 msgid "Missing Signed-By in the %s entry for '%s'"
 msgstr ""
 
@@ -2635,7 +2646,11 @@ msgid ""
 msgstr ""
 
 #: apt-private/private-update.cc
-msgid "See apt-secure(7) for best practices in configuring repository signing."
+msgid "See apt-secure(8) for best practices in configuring repository signing."
+msgstr ""
+
+#: apt-private/private-update.cc
+msgid "Some sources can be modernized. Run 'apt modernize-sources' to do so."
 msgstr ""
 
 #: apt-private/private-update.cc
@@ -3271,6 +3286,10 @@ msgid "edit the source information file"
 msgstr "แก้ไขแฟ้มข้อมูลแหล่งแพกเกจ"
 
 #: cmdline/apt.cc
+msgid "modernize .list files to .sources files"
+msgstr ""
+
+#: cmdline/apt.cc
 #, fuzzy
 #| msgid "Failed to satisfy %s dependency for %s: %s"
 msgid "satisfy dependency strings"
diff --git a/po/tl.po b/po/tl.po
index ba77b3bad..181712af4 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2025-01-21 11:21+0000\n"
+"POT-Creation-Date: 2025-01-28 18:52+0000\n"
 "PO-Revision-Date: 2007-03-29 21:36+0800\n"
 "Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n"
 "Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n"
@@ -2396,7 +2396,7 @@ msgid "Y"
 msgstr "O"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc
+#: apt-private/private-output.cc apt-private/private-sources.cc
 msgid "N"
 msgstr "H"
 
@@ -2608,6 +2608,11 @@ msgstr "Bigo ang pagpangalan muli ng %s tungong %s"
 msgid "Your '%s' file changed, please run 'apt-get update'.\n"
 msgstr ""
 
+#: apt-private/private-sources.cc
+#, c-format
+msgid "Rewrite %zu sources?"
+msgstr ""
+
 #: apt-private/private-unmet.cc
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
@@ -2628,6 +2633,12 @@ msgstr ""
 #. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
 #: apt-private/private-update.cc
 #, c-format
+msgid "The %s entry for '%s' should be upgraded to deb822 .sources"
+msgstr ""
+
+#. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
 msgid "Missing Signed-By in the %s entry for '%s'"
 msgstr ""
 
@@ -2643,7 +2654,11 @@ msgid ""
 msgstr ""
 
 #: apt-private/private-update.cc
-msgid "See apt-secure(7) for best practices in configuring repository signing."
+msgid "See apt-secure(8) for best practices in configuring repository signing."
+msgstr ""
+
+#: apt-private/private-update.cc
+msgid "Some sources can be modernized. Run 'apt modernize-sources' to do so."
 msgstr ""
 
 #: apt-private/private-update.cc
@@ -3272,6 +3287,10 @@ msgid "edit the source information file"
 msgstr "Pinagsasama ang magagamit na impormasyon"
 
 #: cmdline/apt.cc
+msgid "modernize .list files to .sources files"
+msgstr ""
+
+#: cmdline/apt.cc
 #, fuzzy
 #| msgid "Failed to satisfy %s dependency for %s: %s"
 msgid "satisfy dependency strings"
diff --git a/po/tr.po b/po/tr.po
index 71699de9e..59dc29d6d 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 2.6.0\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2025-01-21 11:21+0000\n"
+"POT-Creation-Date: 2025-01-28 18:52+0000\n"
 "PO-Revision-Date: 2023-04-19 15:15+0300\n"
 "Last-Translator: Mert Dirik <mertdirik@gmail.com>\n"
 "Language-Team: Debian l10n Turkish <debian-l10n-turkish@lists.debian.org>\n"
@@ -2485,7 +2485,7 @@ msgid "Y"
 msgstr "E"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc
+#: apt-private/private-output.cc apt-private/private-sources.cc
 msgid "N"
 msgstr "H"
 
@@ -2710,6 +2710,11 @@ msgstr "%s ayrıştırılamadı. Tekrar düzenlemek ister misiniz? "
 msgid "Your '%s' file changed, please run 'apt-get update'.\n"
 msgstr "'%s' dosyası değişti, lütfen 'apt-get update' komutunu çalıştırın.\n"
 
+#: apt-private/private-sources.cc
+#, c-format
+msgid "Rewrite %zu sources?"
+msgstr ""
+
 #: apt-private/private-unmet.cc
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
@@ -2732,6 +2737,12 @@ msgstr ""
 #. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
 #: apt-private/private-update.cc
 #, c-format
+msgid "The %s entry for '%s' should be upgraded to deb822 .sources"
+msgstr ""
+
+#. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
 msgid "Missing Signed-By in the %s entry for '%s'"
 msgstr ""
 
@@ -2751,12 +2762,16 @@ msgstr ""
 #| msgid ""
 #| "See apt-secure(8) manpage for repository creation and user configuration "
 #| "details."
-msgid "See apt-secure(7) for best practices in configuring repository signing."
+msgid "See apt-secure(8) for best practices in configuring repository signing."
 msgstr ""
 "Depo oluşturma ve kullanıcı yapılandırması hakkında ayrıntılı bilgi için apt-"
 "secure(8) rehber sayfasında bulunabilir."
 
 #: apt-private/private-update.cc
+msgid "Some sources can be modernized. Run 'apt modernize-sources' to do so."
+msgstr ""
+
+#: apt-private/private-update.cc
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
 msgid_plural ""
@@ -3399,6 +3414,10 @@ msgid "edit the source information file"
 msgstr "Kaynak bilgi dosyasını düzenle"
 
 #: cmdline/apt.cc
+msgid "modernize .list files to .sources files"
+msgstr ""
+
+#: cmdline/apt.cc
 msgid "satisfy dependency strings"
 msgstr "Bağımlılık dizgilerini karşıla"
 
diff --git a/po/uk.po b/po/uk.po
index 7fd03fe92..6b14e8fb7 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2025-01-21 11:21+0000\n"
+"POT-Creation-Date: 2025-01-28 18:52+0000\n"
 "PO-Revision-Date: 2012-09-25 20:19+0300\n"
 "Last-Translator: A. Bondarenko <artem.brz@gmail.com>\n"
 "Language-Team: Українська <uk@li.org>\n"
@@ -2475,7 +2475,7 @@ msgid "Y"
 msgstr ""
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc
+#: apt-private/private-output.cc apt-private/private-sources.cc
 msgid "N"
 msgstr ""
 
@@ -2699,6 +2699,11 @@ msgstr "Не вдалося перейменувати %s на %s"
 msgid "Your '%s' file changed, please run 'apt-get update'.\n"
 msgstr ""
 
+#: apt-private/private-sources.cc
+#, c-format
+msgid "Rewrite %zu sources?"
+msgstr ""
+
 #: apt-private/private-unmet.cc
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
@@ -2719,6 +2724,12 @@ msgstr ""
 #. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
 #: apt-private/private-update.cc
 #, c-format
+msgid "The %s entry for '%s' should be upgraded to deb822 .sources"
+msgstr ""
+
+#. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
 msgid "Missing Signed-By in the %s entry for '%s'"
 msgstr ""
 
@@ -2734,7 +2745,11 @@ msgid ""
 msgstr ""
 
 #: apt-private/private-update.cc
-msgid "See apt-secure(7) for best practices in configuring repository signing."
+msgid "See apt-secure(8) for best practices in configuring repository signing."
+msgstr ""
+
+#: apt-private/private-update.cc
+msgid "Some sources can be modernized. Run 'apt modernize-sources' to do so."
 msgstr ""
 
 #: apt-private/private-update.cc
@@ -3381,6 +3396,10 @@ msgid "edit the source information file"
 msgstr "Зчитування інформації про стан"
 
 #: cmdline/apt.cc
+msgid "modernize .list files to .sources files"
+msgstr ""
+
+#: cmdline/apt.cc
 #, fuzzy
 #| msgid "Failed to satisfy %s dependency for %s: %s"
 msgid "satisfy dependency strings"
diff --git a/po/vi.po b/po/vi.po
index aceb28abb..6d90d82d3 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.8\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2025-01-21 11:21+0000\n"
+"POT-Creation-Date: 2025-01-28 18:52+0000\n"
 "PO-Revision-Date: 2014-09-12 13:48+0700\n"
 "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
 "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
@@ -2439,7 +2439,7 @@ msgid "Y"
 msgstr "C"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc
+#: apt-private/private-output.cc apt-private/private-sources.cc
 msgid "N"
 msgstr "K"
 
@@ -2659,6 +2659,11 @@ msgstr "Gặp lỗi khi phân tích %s. Sửa lại chứ? "
 msgid "Your '%s' file changed, please run 'apt-get update'.\n"
 msgstr "Tập tin “%s” của bạn đã thay đổi, hãy chạy lệnh “apt-get update”.\n"
 
+#: apt-private/private-sources.cc
+#, c-format
+msgid "Rewrite %zu sources?"
+msgstr ""
+
 #: apt-private/private-unmet.cc
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
@@ -2679,6 +2684,12 @@ msgstr ""
 #. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
 #: apt-private/private-update.cc
 #, c-format
+msgid "The %s entry for '%s' should be upgraded to deb822 .sources"
+msgstr ""
+
+#. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
 msgid "Missing Signed-By in the %s entry for '%s'"
 msgstr ""
 
@@ -2694,7 +2705,11 @@ msgid ""
 msgstr ""
 
 #: apt-private/private-update.cc
-msgid "See apt-secure(7) for best practices in configuring repository signing."
+msgid "See apt-secure(8) for best practices in configuring repository signing."
+msgstr ""
+
+#: apt-private/private-update.cc
+msgid "Some sources can be modernized. Run 'apt modernize-sources' to do so."
 msgstr ""
 
 #: apt-private/private-update.cc
@@ -3350,6 +3365,10 @@ msgid "edit the source information file"
 msgstr "sửa tập tin thông tin gói nguồn"
 
 #: cmdline/apt.cc
+msgid "modernize .list files to .sources files"
+msgstr ""
+
+#: cmdline/apt.cc
 #, fuzzy
 #| msgid "Failed to satisfy %s dependency for %s: %s"
 msgid "satisfy dependency strings"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 474c14ab9..ee05daa41 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 2.9.1\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2025-01-21 11:21+0000\n"
+"POT-Creation-Date: 2025-01-28 18:52+0000\n"
 "PO-Revision-Date: 2024-04-16 13:15-0400\n"
 "Last-Translator: Boyuan Yang <073plan@gmail.com>\n"
 "Language-Team: Chinese (simplified) <debian-l10n-chinese@lists.debian.org>\n"
@@ -2357,7 +2357,7 @@ msgid "Y"
 msgstr "Y"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc
+#: apt-private/private-output.cc apt-private/private-sources.cc
 msgid "N"
 msgstr "N"
 
@@ -2576,6 +2576,11 @@ msgstr "解析 %s 失败。请重新编辑之后再试。"
 msgid "Your '%s' file changed, please run 'apt-get update'.\n"
 msgstr "您的 %s 文件有过改动，请执行 ‘apt-get update’。\n"
 
+#: apt-private/private-sources.cc
+#, c-format
+msgid "Rewrite %zu sources?"
+msgstr ""
+
 #: apt-private/private-unmet.cc
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
@@ -2596,6 +2601,12 @@ msgstr "您应当优先考虑使用 %s 而非直接把账户信息直接写在 %
 #. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
 #: apt-private/private-update.cc
 #, c-format
+msgid "The %s entry for '%s' should be upgraded to deb822 .sources"
+msgstr ""
+
+#. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
 msgid "Missing Signed-By in the %s entry for '%s'"
 msgstr "对‘%2$s’在 %1$s 一项中缺失了 Signed-By"
 
@@ -2615,10 +2626,14 @@ msgstr ""
 #| msgid ""
 #| "See apt-secure(8) manpage for repository creation and user configuration "
 #| "details."
-msgid "See apt-secure(7) for best practices in configuring repository signing."
+msgid "See apt-secure(8) for best practices in configuring repository signing."
 msgstr "参见 apt-secure(8) 手册以了解仓库创建和用户配置方面的细节。"
 
 #: apt-private/private-update.cc
+msgid "Some sources can be modernized. Run 'apt modernize-sources' to do so."
+msgstr ""
+
+#: apt-private/private-update.cc
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
 msgid_plural ""
@@ -3238,6 +3253,10 @@ msgid "edit the source information file"
 msgstr "编辑软件源信息文件"
 
 #: cmdline/apt.cc
+msgid "modernize .list files to .sources files"
+msgstr ""
+
+#: cmdline/apt.cc
 msgid "satisfy dependency strings"
 msgstr "使系统满足依赖关系字符串"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 77991310c..b778589d2 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.2.X\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2025-01-21 11:21+0000\n"
+"POT-Creation-Date: 2025-01-28 18:52+0000\n"
 "PO-Revision-Date: 2009-01-28 10:41+0800\n"
 "Last-Translator: Tetralet <tetralet@gmail.com>\n"
 "Language-Team: Debian-user in Chinese [Big5] <debian-chinese-"
@@ -2359,7 +2359,7 @@ msgid "Y"
 msgstr ""
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc
+#: apt-private/private-output.cc apt-private/private-sources.cc
 msgid "N"
 msgstr ""
 
@@ -2571,6 +2571,11 @@ msgstr "無法將 %s 更名為 %s"
 msgid "Your '%s' file changed, please run 'apt-get update'.\n"
 msgstr ""
 
+#: apt-private/private-sources.cc
+#, c-format
+msgid "Rewrite %zu sources?"
+msgstr ""
+
 #: apt-private/private-unmet.cc
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
@@ -2591,6 +2596,12 @@ msgstr ""
 #. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
 #: apt-private/private-update.cc
 #, c-format
+msgid "The %s entry for '%s' should be upgraded to deb822 .sources"
+msgstr ""
+
+#. TRANSLATOR: the first is manpage reference, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
 msgid "Missing Signed-By in the %s entry for '%s'"
 msgstr ""
 
@@ -2606,7 +2617,11 @@ msgid ""
 msgstr ""
 
 #: apt-private/private-update.cc
-msgid "See apt-secure(7) for best practices in configuring repository signing."
+msgid "See apt-secure(8) for best practices in configuring repository signing."
+msgstr ""
+
+#: apt-private/private-update.cc
+msgid "Some sources can be modernized. Run 'apt modernize-sources' to do so."
 msgstr ""
 
 #: apt-private/private-update.cc
@@ -3237,6 +3252,10 @@ msgid "edit the source information file"
 msgstr "正在讀取狀態資料"
 
 #: cmdline/apt.cc
+msgid "modernize .list files to .sources files"
+msgstr ""
+
+#: cmdline/apt.cc
 #, fuzzy
 #| msgid "Failed to satisfy %s dependency for %s: %s"
 msgid "satisfy dependency strings"