Merge branch 'feature/non-free-firmware' into 'main'

Support transition to new non-free-firmware component

See merge request apt-team/apt!282

1 files changed, 33 insertions, 31 deletions

diff --git a/doc/po/nl.po b/doc/po/nl.po
index 9341092a7..4d011fa18 100644
--- a/doc/po/nl.po
+++ b/doc/po/nl.po
@@ -8228,10 +8228,10 @@ msgid ""
 "<literal>stable</literal> or <literal>testing</literal> or a codename like "
 "<literal>&debian-stable-codename;</literal> or <literal>&debian-testing-"
 "codename;</literal> while component is one of <literal>main</literal>, "
-"<literal>contrib</literal> or <literal>non-free</literal>. The <literal>deb-"
-"src</literal> type references a Debian distribution's source code in the "
-"same form as the <literal>deb</literal> type.  A <literal>deb-src</literal> "
-"line is required to fetch source indexes."
+"<literal>contrib</literal>, <literal>non-free</literal> or <literal>non-free-"
+"firmware</literal>. The <literal>deb-src</literal> type references a Debian "
+"distribution's source code in the same form as the <literal>deb</literal> "
+"type.  A <literal>deb-src</literal> line is required to fetch source indexes."
 msgstr ""
 "Het type <literal>deb</literal> verwijst naar een typisch Debian-archief met "
 "twee niveaus, <filename>distributie/component</filename>. De "
@@ -8239,11 +8239,12 @@ msgstr ""
 "zoals <literal>stable</literal> of <literal>testing</literal> of een "
 "codenaam zoals <literal>&debian-stable-codename;</literal> of "
 "<literal>&debian-testing-codename;</literal>, terwijl component een van de "
-"volgende kan zijn: <literal>main</literal>, <literal>contrib</literal> of "
-"<literal>non-free</literal>. Het type <literal>deb-src</literal> verwijst in "
-"dezelfde vorm als het type <literal>deb</literal> naar de broncode van een "
-"Debian distributie. Om bronnenindexen te kunnen ophalen is een <literal>deb-"
-"src</literal>-regel noodzakelijk."
+"volgende kan zijn: <literal>main</literal>, <literal>contrib</literal>, "
+"<literal>non-free</literal> of <literal>non-free-firmware</literal>. Het "
+"type <literal>deb-src</literal> verwijst in dezelfde vorm als het type "
+"<literal>deb</literal> naar de broncode van een Debian distributie. Om "
+"bronnenindexen te kunnen ophalen is een <literal>deb-src</literal>-regel "
+"noodzakelijk."
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
@@ -8602,7 +8603,7 @@ msgid ""
 "Types: deb\n"
 "URIs: https://deb.debian.org\n"
 "Suites: stable\n"
-"Components: main contrib non-free\n"
+"Components: main contrib non-free non-free-firmware\n"
 "Signed-By:\n"
 " -----BEGIN PGP PUBLIC KEY BLOCK-----\n"
 " .\n"
@@ -8617,7 +8618,7 @@ msgstr ""
 "Types: deb\n"
 "URIs: https://deb.debian.org\n"
 "Suites: stable\n"
-"Components: main contrib non-free\n"
+"Components: main contrib non-free non-free-firmware\n"
 "Signed-By:\n"
 " -----BEGIN PGP PUBLIC KEY BLOCK-----\n"
 " .\n"
@@ -9021,16 +9022,17 @@ msgstr ""
 #: sources.list.5.xml
 msgid ""
 "Uses the archive stored locally (or NFS mounted) at /home/apt/debian for "
-"stable/main, stable/contrib, and stable/non-free."
+"stable/main, stable/contrib, stable/non-free and stable/non-free-firmware."
 msgstr ""
 "Gebruikt het lokaal opgeslagen (of via NFS aangekoppelde) archief in /home/"
-"apt/debian voor stable/main, stable/contrib, en stable/non-free."
+"apt/debian voor stable/main, stable/contrib, stable/non-free, en stable/non-"
+"free-firmware."
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
-msgid "deb file:/home/apt/debian stable main contrib non-free"
-msgstr "deb file:/home/apt/debian stable main contrib non-free"
+msgid "deb file:/home/apt/debian stable main contrib non-free non-free-firmware"
+msgstr "deb file:/home/apt/debian stable main contrib non-free non-free-firmware"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
@@ -9039,12 +9041,12 @@ msgid ""
 "Types: deb\n"
 "URIs: file:/home/apt/debian\n"
 "Suites: stable\n"
-"Components: main contrib non-free"
+"Components: main contrib non-free non-free-firmware"
 msgstr ""
 "Types: deb\n"
 "URIs: file:/home/apt/debian\n"
 "Suites: stable\n"
-"Components: main contrib non-free"
+"Components: main contrib non-free non-free-firmware"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
@@ -9056,8 +9058,8 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
-msgid "deb file:/home/apt/debian unstable main contrib non-free"
-msgstr "deb file:/home/apt/debian unstable main contrib non-free"
+msgid "deb file:/home/apt/debian unstable main contrib non-free non-free-firmware"
+msgstr "deb file:/home/apt/debian unstable main contrib non-free non-free-firmware"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
@@ -9066,12 +9068,12 @@ msgid ""
 "Types: deb\n"
 "URIs: file:/home/apt/debian\n"
 "Suites: unstable\n"
-"Components: main contrib non-free"
+"Components: main contrib non-free non-free-firmware"
 msgstr ""
 "Types: deb\n"
 "URIs: file:/home/apt/debian\n"
 "Suites: unstable\n"
-"Components: main contrib non-free"
+"Components: main contrib non-free non-free-firmware"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
@@ -9081,8 +9083,8 @@ msgstr "Specificatie voor de bronbestanden van het voorgaande."
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
-msgid "deb-src file:/home/apt/debian unstable main contrib non-free"
-msgstr "deb-src file:/home/apt/debian unstable main contrib non-free"
+msgid "deb-src file:/home/apt/debian unstable main contrib non-free non-free-firmware"
+msgstr "deb-src file:/home/apt/debian unstable main contrib non-free non-free-firmware"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
@@ -9091,12 +9093,12 @@ msgid ""
 "Types: deb-src\n"
 "URIs: file:/home/apt/debian\n"
 "Suites: unstable\n"
-"Components: main contrib non-free"
+"Components: main contrib non-free non-free-firmware"
 msgstr ""
 "Types: deb-src\n"
 "URIs: file:/home/apt/debian\n"
 "Suites: unstable\n"
-"Components: main contrib non-free"
+"Components: main contrib non-free non-free-firmware"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
@@ -10060,11 +10062,11 @@ msgstr ""
 msgid ""
 "This is a space separated list of sections which appear under the "
 "distribution; typically this is something like <literal>main contrib non-"
-"free</literal>"
+"free non-free-firmware</literal>"
 msgstr ""
 "Dit is een door spaties gescheiden lijst van secties die onder de "
 "distributie te vinden zijn. Doorgaans is dat iets zoals <literal>main "
-"contrib non-free</literal>"
+"contrib non-free non-free-firmware</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml
@@ -12976,14 +12978,14 @@ msgstr ""
 #, no-wrap
 msgid ""
 " Please give the components to get\n"
-" The components are typically something like: main contrib non-free\n"
+" The components are typically something like: main contrib non-free non-free-firmware\n"
 "\n"
-" Components [main contrib non-free]:\n"
+" Components [main contrib non-free non-free-firmware]:\n"
 msgstr ""
 " Voer de op te halen componenten in\n"
-" Componenten zijn typisch iets zoals: main contrib non-free\n"
+" Componenten zijn typisch iets zoals: main contrib non-free non-free-firmware\n"
 "\n"
-" Componenten [main contrib non-free]:\n"
+" Componenten [main contrib non-free non-free-firmware]:\n"
 
 #. type: Content of: <book><chapter><para>
 #: guide.dbk