Merge branch 'main' into 'main'

Minor localisation fixes

See merge request apt-team/apt!374

12 files changed, 23 insertions, 22 deletions

diff --git a/doc/apt-mark.8.xml b/doc/apt-mark.8.xml
index 21a7a7cba..8fc2a15e5 100644
--- a/doc/apt-mark.8.xml
+++ b/doc/apt-mark.8.xml
@@ -151,7 +151,8 @@
  </refsect1>
 
  <refsect1><title>See Also</title>
-    <para><phrase>&apt-get;,&aptitude;,&apt-conf;</phrase></para>
+   <para>&apt-get;, &aptitude;, &apt-conf;
+   </para>
  </refsect1>
 
  <refsect1><title>Diagnostics</title>
diff --git a/doc/apt-secure.8.xml b/doc/apt-secure.8.xml
index e334df9ca..57ee8b253 100644
--- a/doc/apt-secure.8.xml
+++ b/doc/apt-secure.8.xml
@@ -249,7 +249,7 @@
 
 <para>For more background information you might want to review the
 <ulink
-url="https://www.debian.org/doc/manuals/securing-debian-howto/ch7">Debian
+url="https://www.debian.org/doc/manuals/securing-debian-manual/ch07">Debian
 Security Infrastructure</ulink> chapter of the Securing Debian Manual
 (also available in the harden-doc package) and the
 <ulink url="http://www.cryptnet.net/fdp/crypto/strong_distro.html"
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index e949f7d59..d376c98d6 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -2818,7 +2818,7 @@ msgstr ""
 #: apt-secure.8.xml
 msgid ""
 "For more background information you might want to review the <ulink "
-"url=\"https://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
+"url=\"https://www.debian.org/doc/manuals/securing-debian-manual/ch07\">Debian "
 "Security Infrastructure</ulink> chapter of the Securing Debian Manual (also "
 "available in the harden-doc package) and the <ulink "
 "url=\"http://www.cryptnet.net/fdp/crypto/strong_distro.html\" >Strong "
diff --git a/doc/po/de.po b/doc/po/de.po
index 9d5e41b18..65e63c3f2 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -3990,15 +3990,15 @@ msgstr ""
 #: apt-secure.8.xml
 msgid ""
 "For more background information you might want to review the <ulink "
-"url=\"https://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
+"url=\"https://www.debian.org/doc/manuals/securing-debian-manual/ch07\">Debian "
 "Security Infrastructure</ulink> chapter of the Securing Debian Manual (also "
 "available in the harden-doc package) and the <ulink url=\"http://www."
 "cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution HOWTO</"
 "ulink> by V. Alex Brennen."
 msgstr ""
 "Um weitere Hintergrundinformationen zu erhalten, können Sie das Kapitel "
-"<ulink url=\"https://www.debian.org/doc/manuals/securing-debian-howto/"
-"ch7\">Die Infrastruktur für Sicherheit in Debian</ulink> des Handbuchs "
+"<ulink url=\"https://www.debian.org/doc/manuals/securing-debian-manual/ch07\"> "
+"Die Infrastruktur für Sicherheit in Debian</ulink> des Handbuchs "
 "»Anleitung zum Absichern von Debian« (auch im Paket harden-doc verfügbar) "
 "und das <ulink url=\"http://www.cryptnet.net/fdp/crypto/strong_distro.html\" "
 ">Strong Distribution HOWTO</ulink> von V. Alex Brennen lesen."
diff --git a/doc/po/es.po b/doc/po/es.po
index f464c1423..4fae23c55 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -3957,15 +3957,15 @@ msgstr ""
 #: apt-secure.8.xml
 msgid ""
 "For more background information you might want to review the <ulink "
-"url=\"https://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
+"url=\"https://www.debian.org/doc/manuals/securing-debian-manual/ch07\">Debian "
 "Security Infrastructure</ulink> chapter of the Securing Debian Manual (also "
 "available in the harden-doc package) and the <ulink url=\"http://www."
 "cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution HOWTO</"
 "ulink> by V. Alex Brennen."
 msgstr ""
 "Para más información puede que quiera revisar el capítulo de la <ulink "
-"url=\"https://www.debian.org/doc/manuals/securing-debian-howto/"
-"ch7\">Infraestructura de Seguridad de Debian</ulink> del Manual de Seguridad "
+"url=\"https://www.debian.org/doc/manuals/securing-debian-manual/ch07\"> "
+"Infraestructura de Seguridad de Debian</ulink> del Manual de Seguridad "
 "de Debian (también disponible en el paquete harden-doc) y el <ulink "
 "url=\"http://www.cryptnet.net/fdp/crypto/strong_distro.html\" >COMO "
 "Fortificar una Distribución</ulink> de V. Alex Brennen."
diff --git a/doc/po/fr.po b/doc/po/fr.po
index 2ba9bbaae..81b3ee510 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -3962,14 +3962,14 @@ msgstr ""
 #: apt-secure.8.xml
 msgid ""
 "For more background information you might want to review the <ulink "
-"url=\"https://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
+"url=\"https://www.debian.org/doc/manuals/securing-debian-manual/ch07\">Debian "
 "Security Infrastructure</ulink> chapter of the Securing Debian Manual (also "
 "available in the harden-doc package) and the <ulink url=\"http://www."
 "cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution HOWTO</"
 "ulink> by V. Alex Brennen."
 msgstr ""
 "Pour des informations plus complètes, vous pouvez consulter <ulink "
-"url=\"https://www.debian.org/doc/manuals/securing-debian-howto/ch7\"> "
+"url=\"https://www.debian.org/doc/manuals/securing-debian-manual/ch07\"> "
 "l'infrastructure debian pour la sécurité</ulink> un chapitre du manuel "
 "Debian sur la sécurité (disponible dans le paquet harden-doc) et le <ulink "
 "url=\"http://www.cryptnet.net/fdp/crypto/strong_distro.html\">Strong "
diff --git a/doc/po/it.po b/doc/po/it.po
index 89a23bb5e..b1bd0fa6c 100644
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -3984,7 +3984,7 @@ msgstr ""
 #: apt-secure.8.xml
 msgid ""
 "For more background information you might want to review the <ulink "
-"url=\"https://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
+"url=\"https://www.debian.org/doc/manuals/securing-debian-manual/ch07\">Debian "
 "Security Infrastructure</ulink> chapter of the Securing Debian Manual (also "
 "available in the harden-doc package) and the <ulink url=\"http://www."
 "cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution HOWTO</"
@@ -3992,7 +3992,7 @@ msgid ""
 msgstr ""
 "Per maggiori informazioni sui concetti alla base di questo sistema, si può "
 "leggere il capitolo <ulink url=\"https://www.debian.org/doc/manuals/securing-"
-"debian-howto/ch7\">Debian Security Infrastructure</ulink> del manuale "
+"debian-manual/ch07\">Debian Security Infrastructure</ulink> del manuale "
 "Securing Debian (disponibile anche nel pacchetto harden-doc) e il <ulink "
 "url=\"http://www.cryptnet.net/fdp/crypto/strong_distro.html\" >Strong "
 "Distribution HOWTO</ulink> di V. Alex Brennen."
diff --git a/doc/po/ja.po b/doc/po/ja.po
index ac6a7f584..9377ba50f 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -3866,7 +3866,7 @@ msgstr ""
 #: apt-secure.8.xml
 msgid ""
 "For more background information you might want to review the <ulink "
-"url=\"https://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
+"url=\"https://www.debian.org/doc/manuals/securing-debian-manual/ch07\">Debian "
 "Security Infrastructure</ulink> chapter of the Securing Debian Manual (also "
 "available in the harden-doc package) and the <ulink url=\"http://www."
 "cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution HOWTO</"
@@ -3874,7 +3874,7 @@ msgid ""
 msgstr ""
 "詳細な背景情報を検証するのなら、Securing Debian Manual (harden-doc パッケージ"
 "にも収録) の <ulink url=\"http://www.debian.org/doc/manuals/securing-debian-"
-"howto/ch7\">Debian Security Infrastructure</ulink> 章や、V. Alex Brennen によ"
+"manual/ch07\">Debian Security Infrastructure</ulink> 章や、V. Alex Brennen によ"
 "る <ulink url=\"http://www.cryptnet.net/fdp/crypto/strong_distro.html\" "
 ">Strong Distribution HOWTO</ulink> をご覧ください。"
 
diff --git a/doc/po/nl.po b/doc/po/nl.po
index 7496e521f..54bb91a5e 100644
--- a/doc/po/nl.po
+++ b/doc/po/nl.po
@@ -4077,7 +4077,7 @@ msgstr ""
 #: apt-secure.8.xml
 msgid ""
 "For more background information you might want to review the <ulink "
-"url=\"https://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
+"url=\"https://www.debian.org/doc/manuals/securing-debian-manual/ch07\">Debian "
 "Security Infrastructure</ulink> chapter of the Securing Debian Manual (also "
 "available in the harden-doc package) and the <ulink url=\"http://www."
 "cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution HOWTO</"
@@ -4085,7 +4085,7 @@ msgid ""
 msgstr ""
 "Voor bijkomende achtergrondinformatie kunt u het hoofdstuk raadplegen over "
 "de beveiligingsinfrastructuur van Debian, <ulink url=\"https://www.debian."
-"org/doc/manuals/securing-debian-howto/ch7\">Debian Security Infrastructure</"
+"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 Brennen."
diff --git a/doc/po/pl.po b/doc/po/pl.po
index 5a588b075..4cc23488d 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -4013,14 +4013,14 @@ msgstr ""
 #| "Distribution HOWTO</ulink> by V. Alex Brennen."
 msgid ""
 "For more background information you might want to review the <ulink "
-"url=\"https://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
+"url=\"https://www.debian.org/doc/manuals/securing-debian-manual/ch07\">Debian "
 "Security Infrastructure</ulink> chapter of the Securing Debian Manual (also "
 "available in the harden-doc package) and the <ulink url=\"http://www."
 "cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution HOWTO</"
 "ulink> by V. Alex Brennen."
 msgstr ""
 "Więcej informacji można znaleźć w rozdziale \"<ulink url=\"http://www.debian."
-"org/doc/manuals/securing-debian-howto/ch7\">Debian Security Infrastructure</"
+"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."
diff --git a/doc/po/pt.po b/doc/po/pt.po
index 1ca1146ae..d71a42f84 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -4007,14 +4007,14 @@ msgstr ""
 #: apt-secure.8.xml
 msgid ""
 "For more background information you might want to review the <ulink "
-"url=\"https://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
+"url=\"https://www.debian.org/doc/manuals/securing-debian-manual/ch07\">Debian "
 "Security Infrastructure</ulink> chapter of the Securing Debian Manual (also "
 "available in the harden-doc package) and the <ulink url=\"http://www."
 "cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution HOWTO</"
 "ulink> by V. Alex Brennen."
 msgstr ""
 "Para mais informação de fundo você deve querer reler a <ulink url=\"https://"
-"www.debian.org/doc/manuals/securing-debian-howto/ch7\">Infraestrutura de "
+"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</"
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index 7b1fdc25f..19a1fb293 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -2780,7 +2780,7 @@ msgstr ""
 #: apt-secure.8.xml
 msgid ""
 "For more background information you might want to review the <ulink "
-"url=\"https://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
+"url=\"https://www.debian.org/doc/manuals/securing-debian-manual/ch07\">Debian "
 "Security Infrastructure</ulink> chapter of the Securing Debian Manual (also "
 "available in the harden-doc package) and the <ulink url=\"http://www."
 "cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution HOWTO</"