Update bootiso catalog (again)

32 files changed, 877 insertions, 872 deletions

diff --git a/docs/docs/stable/bootiso/ast.po b/docs/docs/stable/bootiso/ast.po
index d586407b..313cec9b 100644
--- a/docs/docs/stable/bootiso/ast.po
+++ b/docs/docs/stable/bootiso/ast.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia Boot ISO Help 6.0\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2020-12-20 15:06+0200\n"
+"POT-Creation-Date: 2020-12-20 16:01+0200\n"
 "PO-Revision-Date: 2017-04-04 18:35+0000\n"
 "Last-Translator: enolp <enolp@softastur.org>, 2020\n"
 "Language-Team: Asturian (https://www.transifex.com/MageiaLinux/teams/9361/"
@@ -87,27 +87,27 @@ msgid "Installing Mageia using a Tiny Boot Image"
 msgstr ""
 
 #. type: Content of: <section><title>
-#: en/netInstall-intro.xml:12
+#: en/netInstall-intro.xml:4
 msgid "Introduction"
 msgstr "Introducción"
 
 #. type: Content of: <section><section><title>
-#: en/netInstall-intro.xml:15
+#: en/netInstall-intro.xml:6
 msgid "NetInstall Media"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:18
+#: en/netInstall-intro.xml:8
 msgid "Description"
 msgstr "Descripción"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:20
+#: en/netInstall-intro.xml:9
 msgid "These minimal ISO's contain:"
 msgstr "Estes ISOs mínimes contienen:"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:24
+#: en/netInstall-intro.xml:12
 msgid ""
 "less than 120 MB and are convenient if bandwidth is too low to download a "
 "full DVD, or if you have a PC without a DVD drive or unable to boot from a "
@@ -115,7 +115,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:30
+#: en/netInstall-intro.xml:17
 msgid ""
 "no more than that which is needed to (a) start the <literal>DrakX</literal> "
 "installer and (b) find <literal>DrakX-installer-stage2</literal> and other "
@@ -123,31 +123,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:37
+#: en/netInstall-intro.xml:23
 msgid ""
 "The required source packages may be on a PC hard disk, a local drive, a "
 "local network or on the Internet."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:42
+#: en/netInstall-intro.xml:27
 msgid "Availability"
 msgstr "Disponibilidá"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:44
-msgid "There a two versions of the NetInstall media:"
+#: en/netInstall-intro.xml:28
+msgid "There are two versions of the NetInstall media:"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:48
+#: en/netInstall-intro.xml:31
 msgid ""
 "<emphasis role=\"bold\">netinstall.iso</emphasis> For those who prefer not "
 "to use non-free software, this ISO contains only free software."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:54
+#: en/netInstall-intro.xml:36
 msgid ""
 "<emphasis role=\"bold\">netinstall-nonfree.iso</emphasis> This ISO "
 "additionally includes proprietary device drivers, which may be required for "
@@ -155,7 +155,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:60
+#: en/netInstall-intro.xml:41
 msgid ""
 "Both versions are available in the form of separate 32-bit and 64-bit ISO's. "
 "See here: <link xlink:href=\"https://www.mageia.org/downloads/\">https://www."
@@ -163,12 +163,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:66
+#: en/netInstall-intro.xml:45
 msgid "Preparation"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:68
+#: en/netInstall-intro.xml:46
 msgid ""
 "After downloading the image, burn it to a CD/DVD or, if you prefer to put it "
 "on a USB stick, follow the instructions here: <link xlink:href=\"https://"
@@ -178,17 +178,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/netInstall-intro.xml:75
+#: en/netInstall-intro.xml:51
 msgid "Installation Stages"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/netInstall-intro.xml:77
+#: en/netInstall-intro.xml:52
 msgid "The installation is carried out in two stages:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:81
+#: en/netInstall-intro.xml:55
 msgid ""
 "<emphasis role=\"bold\">Stage 1</emphasis> This is the pre-Installation "
 "stage. You will need to provide the method and details for accessing the "
@@ -199,7 +199,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:91
+#: en/netInstall-intro.xml:64
 msgid ""
 "<emphasis role=\"bold\">Stage 2</emphasis> This is the actual Installation "
 "stage, which will automatically commence once a connection to the installer "
@@ -207,24 +207,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/netInstall-intro.xml:98
+#: en/netInstall-intro.xml:70
 msgid ""
 "During Stage 1, nothing will be written to your Hard Disk, so it is safe to "
 "quit at any point during Stage 1 if you wish. You can do so by pressing "
-"<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Del</keycap> </"
+"<keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Del</keycap></"
 "keycombo>."
 msgstr ""
 
 #. type: Content of: <section><section><tip><para>
-#: en/netInstall-intro.xml:110
+#: en/netInstall-intro.xml:75
 msgid ""
-"You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo> "
-"to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap> </"
+"You can use <keycombo><keycap>Alt</keycap><keycap>F3</keycap></keycombo> to "
+"read the logs and <keycombo><keycap>Alt</keycap><keycap>F1</keycap></"
 "keycombo> to return to the installer screen."
 msgstr ""
 
 #. type: Content of: <section><section><warning><para>
-#: en/netInstall-intro.xml:122
+#: en/netInstall-intro.xml:78
 msgid ""
 "Unlike when installing from DVD or LiveCD, you will be asked to type things "
 "during the first part of a Network installation (<emphasis role=\"bold"
diff --git a/docs/docs/stable/bootiso/bootiso.pot b/docs/docs/stable/bootiso/bootiso.pot
index a3ba2d4c..5f64da59 100644
--- a/docs/docs/stable/bootiso/bootiso.pot
+++ b/docs/docs/stable/bootiso/bootiso.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia Boot ISO Help 6.0\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2020-12-20 15:06+0200\n"
+"POT-Creation-Date: 2020-12-20 16:01+0200\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"
@@ -82,27 +82,27 @@ msgid "Installing Mageia using a Tiny Boot Image"
 msgstr ""
 
 #. type: Content of: <section><title>
-#: en/netInstall-intro.xml:12
+#: en/netInstall-intro.xml:4
 msgid "Introduction"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/netInstall-intro.xml:15
+#: en/netInstall-intro.xml:6
 msgid "NetInstall Media"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:18
+#: en/netInstall-intro.xml:8
 msgid "Description"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:20
+#: en/netInstall-intro.xml:9
 msgid "These minimal ISO's contain:"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:24
+#: en/netInstall-intro.xml:12
 msgid ""
 "less than 120 MB and are convenient if bandwidth is too low to download a "
 "full DVD, or if you have a PC without a DVD drive or unable to boot from a "
@@ -110,7 +110,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:30
+#: en/netInstall-intro.xml:17
 msgid ""
 "no more than that which is needed to (a) start the <literal>DrakX</literal> "
 "installer and (b) find <literal>DrakX-installer-stage2</literal> and other "
@@ -118,31 +118,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:37
+#: en/netInstall-intro.xml:23
 msgid ""
 "The required source packages may be on a PC hard disk, a local drive, a "
 "local network or on the Internet."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:42
+#: en/netInstall-intro.xml:27
 msgid "Availability"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:44
-msgid "There a two versions of the NetInstall media:"
+#: en/netInstall-intro.xml:28
+msgid "There are two versions of the NetInstall media:"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:48
+#: en/netInstall-intro.xml:31
 msgid ""
 "<emphasis role=\"bold\">netinstall.iso</emphasis> For those who prefer not "
 "to use non-free software, this ISO contains only free software."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:54
+#: en/netInstall-intro.xml:36
 msgid ""
 "<emphasis role=\"bold\">netinstall-nonfree.iso</emphasis> This ISO "
 "additionally includes proprietary device drivers, which may be required for "
@@ -150,7 +150,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:60
+#: en/netInstall-intro.xml:41
 msgid ""
 "Both versions are available in the form of separate 32-bit and 64-bit "
 "ISO's. See here: <link "
@@ -158,12 +158,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:66
+#: en/netInstall-intro.xml:45
 msgid "Preparation"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:68
+#: en/netInstall-intro.xml:46
 msgid ""
 "After downloading the image, burn it to a CD/DVD or, if you prefer to put it "
 "on a USB stick, follow the instructions here: <link "
@@ -171,17 +171,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/netInstall-intro.xml:75
+#: en/netInstall-intro.xml:51
 msgid "Installation Stages"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/netInstall-intro.xml:77
+#: en/netInstall-intro.xml:52
 msgid "The installation is carried out in two stages:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:81
+#: en/netInstall-intro.xml:55
 msgid ""
 "<emphasis role=\"bold\">Stage 1</emphasis> This is the pre-Installation "
 "stage. You will need to provide the method and details for accessing the "
@@ -192,7 +192,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:91
+#: en/netInstall-intro.xml:64
 msgid ""
 "<emphasis role=\"bold\">Stage 2</emphasis> This is the actual Installation "
 "stage, which will automatically commence once a connection to the installer "
@@ -200,24 +200,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/netInstall-intro.xml:98
+#: en/netInstall-intro.xml:70
 msgid ""
 "During Stage 1, nothing will be written to your Hard Disk, so it is safe to "
 "quit at any point during Stage 1 if you wish. You can do so by pressing "
-"<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Del</keycap> "
-"</keycombo>."
+"<keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Del</keycap></keycombo>."
 msgstr ""
 
 #. type: Content of: <section><section><tip><para>
-#: en/netInstall-intro.xml:110
+#: en/netInstall-intro.xml:75
 msgid ""
-"You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo> "
-"to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap> "
-"</keycombo> to return to the installer screen."
+"You can use <keycombo><keycap>Alt</keycap><keycap>F3</keycap></keycombo> to "
+"read the logs and "
+"<keycombo><keycap>Alt</keycap><keycap>F1</keycap></keycombo> to return to "
+"the installer screen."
 msgstr ""
 
 #. type: Content of: <section><section><warning><para>
-#: en/netInstall-intro.xml:122
+#: en/netInstall-intro.xml:78
 msgid ""
 "Unlike when installing from DVD or LiveCD, you will be asked to type things "
 "during the first part of a Network installation (<emphasis "
diff --git a/docs/docs/stable/bootiso/ca.po b/docs/docs/stable/bootiso/ca.po
index e4a2a615..b428df60 100644
--- a/docs/docs/stable/bootiso/ca.po
+++ b/docs/docs/stable/bootiso/ca.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia Boot ISO Help 6.0\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2020-12-20 15:06+0200\n"
+"POT-Creation-Date: 2020-12-20 16:01+0200\n"
 "PO-Revision-Date: 2017-04-04 18:35+0000\n"
 "Last-Translator: Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2019\n"
 "Language-Team: Catalan (https://www.transifex.com/MageiaLinux/teams/9361/"
@@ -95,27 +95,27 @@ msgid "Installing Mageia using a Tiny Boot Image"
 msgstr "Instal·lació de Mageia mitjançant una imatge d'arrencada petita"
 
 #. type: Content of: <section><title>
-#: en/netInstall-intro.xml:12
+#: en/netInstall-intro.xml:4
 msgid "Introduction"
 msgstr "Introducció"
 
 #. type: Content of: <section><section><title>
-#: en/netInstall-intro.xml:15
+#: en/netInstall-intro.xml:6
 msgid "NetInstall Media"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:18
+#: en/netInstall-intro.xml:8
 msgid "Description"
 msgstr "Descripció"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:20
+#: en/netInstall-intro.xml:9
 msgid "These minimal ISO's contain:"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:24
+#: en/netInstall-intro.xml:12
 msgid ""
 "less than 120 MB and are convenient if bandwidth is too low to download a "
 "full DVD, or if you have a PC without a DVD drive or unable to boot from a "
@@ -123,7 +123,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:30
+#: en/netInstall-intro.xml:17
 msgid ""
 "no more than that which is needed to (a) start the <literal>DrakX</literal> "
 "installer and (b) find <literal>DrakX-installer-stage2</literal> and other "
@@ -131,31 +131,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:37
+#: en/netInstall-intro.xml:23
 msgid ""
 "The required source packages may be on a PC hard disk, a local drive, a "
 "local network or on the Internet."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:42
+#: en/netInstall-intro.xml:27
 msgid "Availability"
 msgstr "Disponibilitat"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:44
-msgid "There a two versions of the NetInstall media:"
+#: en/netInstall-intro.xml:28
+msgid "There are two versions of the NetInstall media:"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:48
+#: en/netInstall-intro.xml:31
 msgid ""
 "<emphasis role=\"bold\">netinstall.iso</emphasis> For those who prefer not "
 "to use non-free software, this ISO contains only free software."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:54
+#: en/netInstall-intro.xml:36
 msgid ""
 "<emphasis role=\"bold\">netinstall-nonfree.iso</emphasis> This ISO "
 "additionally includes proprietary device drivers, which may be required for "
@@ -163,7 +163,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:60
+#: en/netInstall-intro.xml:41
 msgid ""
 "Both versions are available in the form of separate 32-bit and 64-bit ISO's. "
 "See here: <link xlink:href=\"https://www.mageia.org/downloads/\">https://www."
@@ -171,12 +171,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:66
+#: en/netInstall-intro.xml:45
 msgid "Preparation"
 msgstr "Preparació"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:68
+#: en/netInstall-intro.xml:46
 msgid ""
 "After downloading the image, burn it to a CD/DVD or, if you prefer to put it "
 "on a USB stick, follow the instructions here: <link xlink:href=\"https://"
@@ -186,17 +186,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/netInstall-intro.xml:75
+#: en/netInstall-intro.xml:51
 msgid "Installation Stages"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/netInstall-intro.xml:77
+#: en/netInstall-intro.xml:52
 msgid "The installation is carried out in two stages:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:81
+#: en/netInstall-intro.xml:55
 msgid ""
 "<emphasis role=\"bold\">Stage 1</emphasis> This is the pre-Installation "
 "stage. You will need to provide the method and details for accessing the "
@@ -207,7 +207,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:91
+#: en/netInstall-intro.xml:64
 msgid ""
 "<emphasis role=\"bold\">Stage 2</emphasis> This is the actual Installation "
 "stage, which will automatically commence once a connection to the installer "
@@ -215,24 +215,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/netInstall-intro.xml:98
+#: en/netInstall-intro.xml:70
 msgid ""
 "During Stage 1, nothing will be written to your Hard Disk, so it is safe to "
 "quit at any point during Stage 1 if you wish. You can do so by pressing "
-"<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Del</keycap> </"
+"<keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Del</keycap></"
 "keycombo>."
 msgstr ""
 
 #. type: Content of: <section><section><tip><para>
-#: en/netInstall-intro.xml:110
+#: en/netInstall-intro.xml:75
 msgid ""
-"You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo> "
-"to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap> </"
+"You can use <keycombo><keycap>Alt</keycap><keycap>F3</keycap></keycombo> to "
+"read the logs and <keycombo><keycap>Alt</keycap><keycap>F1</keycap></"
 "keycombo> to return to the installer screen."
 msgstr ""
 
 #. type: Content of: <section><section><warning><para>
-#: en/netInstall-intro.xml:122
+#: en/netInstall-intro.xml:78
 msgid ""
 "Unlike when installing from DVD or LiveCD, you will be asked to type things "
 "during the first part of a Network installation (<emphasis role=\"bold"
diff --git a/docs/docs/stable/bootiso/cs.po b/docs/docs/stable/bootiso/cs.po
index 560ccde2..2a2b8214 100644
--- a/docs/docs/stable/bootiso/cs.po
+++ b/docs/docs/stable/bootiso/cs.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia Boot ISO Help 6.0\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2020-12-20 15:06+0200\n"
+"POT-Creation-Date: 2020-12-20 16:01+0200\n"
 "PO-Revision-Date: 2017-04-04 18:35+0000\n"
 "Last-Translator: Luděk Janča <joelp@email.cz>, 2020\n"
 "Language-Team: Czech (https://www.transifex.com/MageiaLinux/teams/9361/cs/)\n"
@@ -96,27 +96,27 @@ msgid "Installing Mageia using a Tiny Boot Image"
 msgstr "Instalace Mageie s velmi malým instalačním obrazem"
 
 #. type: Content of: <section><title>
-#: en/netInstall-intro.xml:12
+#: en/netInstall-intro.xml:4
 msgid "Introduction"
 msgstr "Úvod"
 
 #. type: Content of: <section><section><title>
-#: en/netInstall-intro.xml:15
+#: en/netInstall-intro.xml:6
 msgid "NetInstall Media"
 msgstr "Média pro síťovou instalaci"
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:18
+#: en/netInstall-intro.xml:8
 msgid "Description"
 msgstr "Popis"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:20
+#: en/netInstall-intro.xml:9
 msgid "These minimal ISO's contain:"
 msgstr "Tato malá ISO obsahují:"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:24
+#: en/netInstall-intro.xml:12
 #, fuzzy
 msgid ""
 "less than 120 MB and are convenient if bandwidth is too low to download a "
@@ -127,7 +127,7 @@ msgstr ""
 "pokud máte PC bez jednotky DVD nebo nelze zavést systém z USB disku."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:30
+#: en/netInstall-intro.xml:17
 msgid ""
 "no more than that which is needed to (a) start the <literal>DrakX</literal> "
 "installer and (b) find <literal>DrakX-installer-stage2</literal> and other "
@@ -135,31 +135,32 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:37
+#: en/netInstall-intro.xml:23
 msgid ""
 "The required source packages may be on a PC hard disk, a local drive, a "
 "local network or on the Internet."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:42
+#: en/netInstall-intro.xml:27
 msgid "Availability"
 msgstr "Dostupnost"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:44
-msgid "There a two versions of the NetInstall media:"
+#: en/netInstall-intro.xml:28
+#, fuzzy
+msgid "There are two versions of the NetInstall media:"
 msgstr "Jsou zde dvě verze instalačního média NetInstall:"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:48
+#: en/netInstall-intro.xml:31
 msgid ""
 "<emphasis role=\"bold\">netinstall.iso</emphasis> For those who prefer not "
 "to use non-free software, this ISO contains only free software."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:54
+#: en/netInstall-intro.xml:36
 msgid ""
 "<emphasis role=\"bold\">netinstall-nonfree.iso</emphasis> This ISO "
 "additionally includes proprietary device drivers, which may be required for "
@@ -167,7 +168,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:60
+#: en/netInstall-intro.xml:41
 msgid ""
 "Both versions are available in the form of separate 32-bit and 64-bit ISO's. "
 "See here: <link xlink:href=\"https://www.mageia.org/downloads/\">https://www."
@@ -175,12 +176,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:66
+#: en/netInstall-intro.xml:45
 msgid "Preparation"
 msgstr "Příprava"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:68
+#: en/netInstall-intro.xml:46
 msgid ""
 "After downloading the image, burn it to a CD/DVD or, if you prefer to put it "
 "on a USB stick, follow the instructions here: <link xlink:href=\"https://"
@@ -190,17 +191,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/netInstall-intro.xml:75
+#: en/netInstall-intro.xml:51
 msgid "Installation Stages"
 msgstr "Fáze instalace"
 
 #. type: Content of: <section><section><para>
-#: en/netInstall-intro.xml:77
+#: en/netInstall-intro.xml:52
 msgid "The installation is carried out in two stages:"
 msgstr "Instalace se provede ve dvou fázích:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:81
+#: en/netInstall-intro.xml:55
 msgid ""
 "<emphasis role=\"bold\">Stage 1</emphasis> This is the pre-Installation "
 "stage. You will need to provide the method and details for accessing the "
@@ -211,7 +212,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:91
+#: en/netInstall-intro.xml:64
 msgid ""
 "<emphasis role=\"bold\">Stage 2</emphasis> This is the actual Installation "
 "stage, which will automatically commence once a connection to the installer "
@@ -219,11 +220,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/netInstall-intro.xml:98
+#: en/netInstall-intro.xml:70
+#, fuzzy
 msgid ""
 "During Stage 1, nothing will be written to your Hard Disk, so it is safe to "
 "quit at any point during Stage 1 if you wish. You can do so by pressing "
-"<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Del</keycap> </"
+"<keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Del</keycap></"
 "keycombo>."
 msgstr ""
 "Během fáze 1 nebude na váš pevný disk nic zapsáno, takže je bezpečné kdykoli "
@@ -231,10 +233,11 @@ msgstr ""
 "keycap> <keycap>Alt</keycap> <keycap>Del</keycap> </keycombo>."
 
 #. type: Content of: <section><section><tip><para>
-#: en/netInstall-intro.xml:110
+#: en/netInstall-intro.xml:75
+#, fuzzy
 msgid ""
-"You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo> "
-"to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap> </"
+"You can use <keycombo><keycap>Alt</keycap><keycap>F3</keycap></keycombo> to "
+"read the logs and <keycombo><keycap>Alt</keycap><keycap>F1</keycap></"
 "keycombo> to return to the installer screen."
 msgstr ""
 "Můžete použít <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </"
@@ -242,7 +245,7 @@ msgstr ""
 "<keycap>F1</keycap> </keycombo> pro návrat do instalační obrazovky."
 
 #. type: Content of: <section><section><warning><para>
-#: en/netInstall-intro.xml:122
+#: en/netInstall-intro.xml:78
 msgid ""
 "Unlike when installing from DVD or LiveCD, you will be asked to type things "
 "during the first part of a Network installation (<emphasis role=\"bold"
diff --git a/docs/docs/stable/bootiso/de.po b/docs/docs/stable/bootiso/de.po
index 8789d537..f45ad642 100644
--- a/docs/docs/stable/bootiso/de.po
+++ b/docs/docs/stable/bootiso/de.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia Boot ISO Help 6.0\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2020-12-20 15:06+0200\n"
+"POT-Creation-Date: 2020-12-20 16:01+0200\n"
 "PO-Revision-Date: 2017-04-04 18:35+0000\n"
 "Last-Translator: psyca, 2019\n"
 "Language-Team: German (https://www.transifex.com/MageiaLinux/teams/9361/"
@@ -101,27 +101,27 @@ msgid "Installing Mageia using a Tiny Boot Image"
 msgstr "Mageia mittels einem kleinem Boot-Image installieren"
 
 #. type: Content of: <section><title>
-#: en/netInstall-intro.xml:12
+#: en/netInstall-intro.xml:4
 msgid "Introduction"
 msgstr "Einleitung"
 
 #. type: Content of: <section><section><title>
-#: en/netInstall-intro.xml:15
+#: en/netInstall-intro.xml:6
 msgid "NetInstall Media"
 msgstr "NetInstall Medien"
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:18
+#: en/netInstall-intro.xml:8
 msgid "Description"
 msgstr "Beschreibung"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:20
+#: en/netInstall-intro.xml:9
 msgid "These minimal ISO's contain:"
 msgstr "Diese minimalen ISOs enthalten:"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:24
+#: en/netInstall-intro.xml:12
 #, fuzzy
 msgid ""
 "less than 120 MB and are convenient if bandwidth is too low to download a "
@@ -133,7 +133,7 @@ msgstr ""
 "ohne ein DVD-Laufwerk haben oder nicht von einem USB-Stick booten können."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:30
+#: en/netInstall-intro.xml:17
 #, fuzzy
 msgid ""
 "no more than that which is needed to (a) start the <literal>DrakX</literal> "
@@ -146,7 +146,7 @@ msgstr ""
 "abzuschließen."
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:37
+#: en/netInstall-intro.xml:23
 msgid ""
 "The required source packages may be on a PC hard disk, a local drive, a "
 "local network or on the Internet."
@@ -155,17 +155,18 @@ msgstr ""
 "lokalen Laufwerk, einem lokalen Netzwerk oder im Internet befinden."
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:42
+#: en/netInstall-intro.xml:27
 msgid "Availability"
 msgstr "Verfügbarkeit"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:44
-msgid "There a two versions of the NetInstall media:"
+#: en/netInstall-intro.xml:28
+#, fuzzy
+msgid "There are two versions of the NetInstall media:"
 msgstr "Es gibt zwei Versionen der NetInstall Medien:"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:48
+#: en/netInstall-intro.xml:31
 msgid ""
 "<emphasis role=\"bold\">netinstall.iso</emphasis> For those who prefer not "
 "to use non-free software, this ISO contains only free software."
@@ -175,7 +176,7 @@ msgstr ""
 "Software."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:54
+#: en/netInstall-intro.xml:36
 msgid ""
 "<emphasis role=\"bold\">netinstall-nonfree.iso</emphasis> This ISO "
 "additionally includes proprietary device drivers, which may be required for "
@@ -186,7 +187,7 @@ msgstr ""
 "Netzwerkgerät, Festplattencontroller, etc., benötigt wird."
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:60
+#: en/netInstall-intro.xml:41
 msgid ""
 "Both versions are available in the form of separate 32-bit and 64-bit ISO's. "
 "See here: <link xlink:href=\"https://www.mageia.org/downloads/\">https://www."
@@ -197,12 +198,12 @@ msgstr ""
 "mageia.org/downloads/</link>"
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:66
+#: en/netInstall-intro.xml:45
 msgid "Preparation"
 msgstr "Vorbereitung"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:68
+#: en/netInstall-intro.xml:46
 msgid ""
 "After downloading the image, burn it to a CD/DVD or, if you prefer to put it "
 "on a USB stick, follow the instructions here: <link xlink:href=\"https://"
@@ -218,17 +219,17 @@ msgstr ""
 "de#Eine_Mageia_ISO_auf_ein_USB_Laufwerk_.C3.BCbertragen</link>"
 
 #. type: Content of: <section><section><title>
-#: en/netInstall-intro.xml:75
+#: en/netInstall-intro.xml:51
 msgid "Installation Stages"
 msgstr "Installationsphasen"
 
 #. type: Content of: <section><section><para>
-#: en/netInstall-intro.xml:77
+#: en/netInstall-intro.xml:52
 msgid "The installation is carried out in two stages:"
 msgstr "Die Installation wird in zwei Stufen durchgeführt:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:81
+#: en/netInstall-intro.xml:55
 #, fuzzy
 msgid ""
 "<emphasis role=\"bold\">Stage 1</emphasis> This is the pre-Installation "
@@ -245,7 +246,7 @@ msgstr ""
 "Netzwerkverbindung aktiviert."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:91
+#: en/netInstall-intro.xml:64
 msgid ""
 "<emphasis role=\"bold\">Stage 2</emphasis> This is the actual Installation "
 "stage, which will automatically commence once a connection to the installer "
@@ -256,11 +257,12 @@ msgstr ""
 "Installationsdateien hergestellt wurde."
 
 #. type: Content of: <section><section><note><para>
-#: en/netInstall-intro.xml:98
+#: en/netInstall-intro.xml:70
+#, fuzzy
 msgid ""
 "During Stage 1, nothing will be written to your Hard Disk, so it is safe to "
 "quit at any point during Stage 1 if you wish. You can do so by pressing "
-"<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Del</keycap> </"
+"<keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Del</keycap></"
 "keycombo>."
 msgstr ""
 "Während der Phase 1 wird nichts auf Ihre Festplatte geschrieben, aus diesem "
@@ -269,10 +271,11 @@ msgstr ""
 "keycap> <keycap>Alt</keycap> <keycap>Entf</keycap></keycombo> drücken."
 
 #. type: Content of: <section><section><tip><para>
-#: en/netInstall-intro.xml:110
+#: en/netInstall-intro.xml:75
+#, fuzzy
 msgid ""
-"You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo> "
-"to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap> </"
+"You can use <keycombo><keycap>Alt</keycap><keycap>F3</keycap></keycombo> to "
+"read the logs and <keycombo><keycap>Alt</keycap><keycap>F1</keycap></"
 "keycombo> to return to the installer screen."
 msgstr ""
 "Sie können durch drücken der Tasten <keycombo><keycap>Alt</keycap> "
@@ -281,7 +284,7 @@ msgstr ""
 "den Installationsbildschirm wechseln."
 
 #. type: Content of: <section><section><warning><para>
-#: en/netInstall-intro.xml:122
+#: en/netInstall-intro.xml:78
 #, fuzzy
 msgid ""
 "Unlike when installing from DVD or LiveCD, you will be asked to type things "
diff --git a/docs/docs/stable/bootiso/el.po b/docs/docs/stable/bootiso/el.po
index 7b9132ea..9f1c8940 100644
--- a/docs/docs/stable/bootiso/el.po
+++ b/docs/docs/stable/bootiso/el.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia Boot ISO Help 6.0\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2020-12-20 15:06+0200\n"
+"POT-Creation-Date: 2020-12-20 16:01+0200\n"
 "PO-Revision-Date: 2017-04-04 18:35+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>, 2019\n"
 "Language-Team: Greek (https://www.transifex.com/MageiaLinux/teams/9361/el/)\n"
@@ -99,27 +99,27 @@ msgid "Installing Mageia using a Tiny Boot Image"
 msgstr "Εγκατάσταση της Mageia μέσω μιας μικροσκοπικής εικόνας εκκίνησης"
 
 #. type: Content of: <section><title>
-#: en/netInstall-intro.xml:12
+#: en/netInstall-intro.xml:4
 msgid "Introduction"
 msgstr "Εισαγωγή"
 
 #. type: Content of: <section><section><title>
-#: en/netInstall-intro.xml:15
+#: en/netInstall-intro.xml:6
 msgid "NetInstall Media"
 msgstr "Μέσο NetInstall"
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:18
+#: en/netInstall-intro.xml:8
 msgid "Description"
 msgstr "Περιγραφή"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:20
+#: en/netInstall-intro.xml:9
 msgid "These minimal ISO's contain:"
 msgstr "Τα ISO ελάχιστης εγκατάστασης περιέχουν:"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:24
+#: en/netInstall-intro.xml:12
 #, fuzzy
 msgid ""
 "less than 120 MB and are convenient if bandwidth is too low to download a "
@@ -131,7 +131,7 @@ msgstr ""
 "όταν ο υπολογιστής δεν υποστηρίζει την εκκίνηση από ένα κλειδί USB."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:30
+#: en/netInstall-intro.xml:17
 #, fuzzy
 msgid ""
 "no more than that which is needed to (a) start the <literal>DrakX</literal> "
@@ -144,7 +144,7 @@ msgstr ""
 "αποπεράτωση της εγκατάστασης."
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:37
+#: en/netInstall-intro.xml:23
 msgid ""
 "The required source packages may be on a PC hard disk, a local drive, a "
 "local network or on the Internet."
@@ -153,17 +153,18 @@ msgstr ""
 "υπολογιστή, έναν τοπικό δίσκο, στο τοπικό δίκτυο ή στο διαδίκτυο."
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:42
+#: en/netInstall-intro.xml:27
 msgid "Availability"
 msgstr "Διαθεσιμότητα"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:44
-msgid "There a two versions of the NetInstall media:"
+#: en/netInstall-intro.xml:28
+#, fuzzy
+msgid "There are two versions of the NetInstall media:"
 msgstr "Υπάρχουν δυο εκδόσεις του μέσου Netinstall:"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:48
+#: en/netInstall-intro.xml:31
 msgid ""
 "<emphasis role=\"bold\">netinstall.iso</emphasis> For those who prefer not "
 "to use non-free software, this ISO contains only free software."
@@ -173,7 +174,7 @@ msgstr ""
 "ιδιόκτητο λογισμικό."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:54
+#: en/netInstall-intro.xml:36
 msgid ""
 "<emphasis role=\"bold\">netinstall-nonfree.iso</emphasis> This ISO "
 "additionally includes proprietary device drivers, which may be required for "
@@ -184,7 +185,7 @@ msgstr ""
 "περιφερειακά δικτύου, ελεγκτές δίσκων, κλπ."
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:60
+#: en/netInstall-intro.xml:41
 msgid ""
 "Both versions are available in the form of separate 32-bit and 64-bit ISO's. "
 "See here: <link xlink:href=\"https://www.mageia.org/downloads/\">https://www."
@@ -195,12 +196,12 @@ msgstr ""
 "www.mageia.org/downloads/</link>"
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:66
+#: en/netInstall-intro.xml:45
 msgid "Preparation"
 msgstr "Προετοιμασία"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:68
+#: en/netInstall-intro.xml:46
 msgid ""
 "After downloading the image, burn it to a CD/DVD or, if you prefer to put it "
 "on a USB stick, follow the instructions here: <link xlink:href=\"https://"
@@ -215,17 +216,17 @@ msgstr ""
 "org/en/Installation_Media#Dump_Mageia_ISOs_on_an_USB_stick</link>"
 
 #. type: Content of: <section><section><title>
-#: en/netInstall-intro.xml:75
+#: en/netInstall-intro.xml:51
 msgid "Installation Stages"
 msgstr "Τα στάδια της εγκατάστασης"
 
 #. type: Content of: <section><section><para>
-#: en/netInstall-intro.xml:77
+#: en/netInstall-intro.xml:52
 msgid "The installation is carried out in two stages:"
 msgstr "Η εγκατάσταση πραγματοποιείται σε δυο στάδια:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:81
+#: en/netInstall-intro.xml:55
 #, fuzzy
 msgid ""
 "<emphasis role=\"bold\">Stage 1</emphasis> This is the pre-Installation "
@@ -241,7 +242,7 @@ msgstr ""
 "απαιτείται η χρήση ενός διακομιστή, τότε θα ενεργοποιηθεί η δικτυακή σύνδεση."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:91
+#: en/netInstall-intro.xml:64
 msgid ""
 "<emphasis role=\"bold\">Stage 2</emphasis> This is the actual Installation "
 "stage, which will automatically commence once a connection to the installer "
@@ -252,11 +253,12 @@ msgstr ""
 "αρχεία της εγκατάστασης."
 
 #. type: Content of: <section><section><note><para>
-#: en/netInstall-intro.xml:98
+#: en/netInstall-intro.xml:70
+#, fuzzy
 msgid ""
 "During Stage 1, nothing will be written to your Hard Disk, so it is safe to "
 "quit at any point during Stage 1 if you wish. You can do so by pressing "
-"<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Del</keycap> </"
+"<keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Del</keycap></"
 "keycombo>."
 msgstr ""
 "Κατά το Στάδιο 1, δεν θα γραφτεί τίποτα στον σκληρό σας δίσκο και ως εκ "
@@ -265,10 +267,11 @@ msgstr ""
 "<keycap>Del</keycap> </keycombo>."
 
 #. type: Content of: <section><section><tip><para>
-#: en/netInstall-intro.xml:110
+#: en/netInstall-intro.xml:75
+#, fuzzy
 msgid ""
-"You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo> "
-"to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap> </"
+"You can use <keycombo><keycap>Alt</keycap><keycap>F3</keycap></keycombo> to "
+"read the logs and <keycombo><keycap>Alt</keycap><keycap>F1</keycap></"
 "keycombo> to return to the installer screen."
 msgstr ""
 "Μπορείτε να αναγνώσετε τις καταγραφές πιέζοντας <keycombo> <keycap>Alt</"
@@ -277,7 +280,7 @@ msgstr ""
 "επιστροφή στην οθόνη εγκατάστασης."
 
 #. type: Content of: <section><section><warning><para>
-#: en/netInstall-intro.xml:122
+#: en/netInstall-intro.xml:78
 #, fuzzy
 msgid ""
 "Unlike when installing from DVD or LiveCD, you will be asked to type things "
diff --git a/docs/docs/stable/bootiso/en/netInstall-intro.xml b/docs/docs/stable/bootiso/en/netInstall-intro.xml
index 89d844ad..655f389b 100644
--- a/docs/docs/stable/bootiso/en/netInstall-intro.xml
+++ b/docs/docs/stable/bootiso/en/netInstall-intro.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<section version="5.0" xmlns="http://docbook.org/ns/docbook"
-         xmlns:xlink="http://www.w3.org/1999/xlink"
-         xmlns:xi="http://www.w3.org/2001/XInclude"
-         xmlns:svg="http://www.w3.org/2000/svg"
-         xmlns:m="http://www.w3.org/1998/Math/MathML"
-         xmlns:html="http://www.w3.org/1999/xhtml"
-         xmlns:db="http://docbook.org/ns/docbook">
+<?xml version='1.0' encoding='UTF-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:db="http://docbook.org/ns/docbook" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
   <!-- 2018/05/18 apb: Created this xml, along with netInstall-stage1.xml and netInstall-stage2.xml to replace the previously single xml for NetInstall. -->
   <!-- 2020/12/18 apb: (1)Updated: ISO size now less than 120 MB. (2)Updated to include WPA encryption and removed mention of Bluetooth. (3)Tweaked wording regarding US keyboard and highlighted this in para about WiFi encryption.  -->
-
   <title>Introduction</title>
-
   <section>
     <title>NetInstall Media</title>
-
     <section>
       <title>Description</title>
-
       <para>These minimal ISO's contain:</para>
-
       <itemizedlist>
         <listitem>
           <para>less than 120 MB and are convenient if bandwidth is too low to
           download a full DVD, or if you have a PC without a DVD drive or
           unable to boot from a USB stick.</para>
         </listitem>
-
         <listitem>
           <para>no more than that which is needed to (a) start the
           <literal>DrakX</literal> installer and (b) find
@@ -33,49 +20,36 @@
           are needed to continue and complete the install.</para>
         </listitem>
       </itemizedlist>
-
       <para>The required source packages may be on a PC hard disk, a local
       drive, a local network or on the Internet.</para>
     </section>
-
     <section>
       <title>Availability</title>
-
-      <para>There a two versions of the NetInstall media:</para>
-
+      <para>There are two versions of the NetInstall media:</para>
       <itemizedlist>
         <listitem>
           <para><emphasis role="bold">netinstall.iso</emphasis> For those who
           prefer not to use non-free software, this ISO contains only free
           software.</para>
         </listitem>
-
         <listitem>
           <para><emphasis role="bold">netinstall-nonfree.iso</emphasis> This
           ISO additionally includes proprietary device drivers, which may be
           required for your network device, disk controller, etc.</para>
         </listitem>
       </itemizedlist>
-
       <para>Both versions are available in the form of separate 32-bit and
-      64-bit ISO's. See here: <link
-      xlink:href="https://www.mageia.org/downloads/">https://www.mageia.org/downloads/</link></para>
+      64-bit ISO's. See here: <link xlink:href="https://www.mageia.org/downloads/">https://www.mageia.org/downloads/</link></para>
     </section>
-
     <section>
       <title>Preparation</title>
-
       <para>After downloading the image, burn it to a CD/DVD or, if you prefer
-      to put it on a USB stick, follow the instructions here: <link
-      xlink:href="https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISOs_on_an_USB_stick">https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISOs_on_an_USB_stick</link></para>
+      to put it on a USB stick, follow the instructions here: <link xlink:href="https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISOs_on_an_USB_stick">https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISOs_on_an_USB_stick</link></para>
     </section>
   </section>
-
   <section>
     <title>Installation Stages</title>
-
     <para>The installation is carried out in two stages:</para>
-
     <itemizedlist>
       <listitem>
         <para><emphasis role="bold">Stage 1</emphasis> This is the
@@ -86,46 +60,26 @@
         with WEP or WPA2 encryption (though please be mindful of the Warning
         below regarding keyboard input).</para>
       </listitem>
-
       <listitem>
         <para><emphasis role="bold">Stage 2</emphasis> This is the actual
         Installation stage, which will automatically commence once a
         connection to the installer files has been established.</para>
       </listitem>
     </itemizedlist>
-
     <note>
       <para>During Stage 1, nothing will be written to your Hard Disk, so it
       is safe to quit at any point during Stage 1 if you wish. You can do so
-      by pressing <keycombo>
-          <keycap>Ctrl</keycap>
-
-          <keycap>Alt</keycap>
-
-          <keycap>Del</keycap>
-        </keycombo>.</para>
+      by pressing <keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Del</keycap></keycombo>.</para>
     </note>
-
     <tip>
-      <para>You can use <keycombo>
-          <keycap>Alt</keycap>
-
-          <keycap>F3</keycap>
-        </keycombo> to read the logs and <keycombo>
-          <keycap>Alt</keycap>
-
-          <keycap>F1</keycap>
-        </keycombo> to return to the installer screen.</para>
+      <para>You can use <keycombo><keycap>Alt</keycap><keycap>F3</keycap></keycombo> to read the logs and <keycombo><keycap>Alt</keycap><keycap>F1</keycap></keycombo> to return to the installer screen.</para>
     </tip>
-
     <warning>
       <para>Unlike when installing from DVD or LiveCD, you will be asked to
-      type things during the first part of a Network installation (<emphasis
-      role="bold">Stage 1</emphasis>). Throughout this stage, however, your
-      keyboard will operate as per an <link
-      xlink:href="https://en.wikipedia.org/wiki/Keyboard_layout#United_States">American
+      type things during the first part of a Network installation (<emphasis role="bold">Stage 1</emphasis>). Throughout this stage, however, your
+      keyboard will operate as per an <link xlink:href="https://en.wikipedia.org/wiki/Keyboard_layout#United_States">American
       keyboard</link> layout. Please bear this in mind to avoid confusion when
       entering things like names and paths etc.</para>
     </warning>
   </section>
-</section>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/bootiso/eo.po b/docs/docs/stable/bootiso/eo.po
index 5c57b327..017bb652 100644
--- a/docs/docs/stable/bootiso/eo.po
+++ b/docs/docs/stable/bootiso/eo.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia Boot ISO Help 6.0\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2020-12-20 15:06+0200\n"
+"POT-Creation-Date: 2020-12-20 16:01+0200\n"
 "PO-Revision-Date: 2017-04-04 18:35+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>, 2019\n"
 "Language-Team: Esperanto (https://www.transifex.com/MageiaLinux/teams/9361/"
@@ -93,27 +93,27 @@ msgid "Installing Mageia using a Tiny Boot Image"
 msgstr ""
 
 #. type: Content of: <section><title>
-#: en/netInstall-intro.xml:12
+#: en/netInstall-intro.xml:4
 msgid "Introduction"
 msgstr "Enkonduko"
 
 #. type: Content of: <section><section><title>
-#: en/netInstall-intro.xml:15
+#: en/netInstall-intro.xml:6
 msgid "NetInstall Media"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:18
+#: en/netInstall-intro.xml:8
 msgid "Description"
 msgstr "Priskribo"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:20
+#: en/netInstall-intro.xml:9
 msgid "These minimal ISO's contain:"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:24
+#: en/netInstall-intro.xml:12
 msgid ""
 "less than 120 MB and are convenient if bandwidth is too low to download a "
 "full DVD, or if you have a PC without a DVD drive or unable to boot from a "
@@ -121,7 +121,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:30
+#: en/netInstall-intro.xml:17
 msgid ""
 "no more than that which is needed to (a) start the <literal>DrakX</literal> "
 "installer and (b) find <literal>DrakX-installer-stage2</literal> and other "
@@ -129,31 +129,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:37
+#: en/netInstall-intro.xml:23
 msgid ""
 "The required source packages may be on a PC hard disk, a local drive, a "
 "local network or on the Internet."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:42
+#: en/netInstall-intro.xml:27
 msgid "Availability"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:44
-msgid "There a two versions of the NetInstall media:"
+#: en/netInstall-intro.xml:28
+msgid "There are two versions of the NetInstall media:"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:48
+#: en/netInstall-intro.xml:31
 msgid ""
 "<emphasis role=\"bold\">netinstall.iso</emphasis> For those who prefer not "
 "to use non-free software, this ISO contains only free software."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:54
+#: en/netInstall-intro.xml:36
 msgid ""
 "<emphasis role=\"bold\">netinstall-nonfree.iso</emphasis> This ISO "
 "additionally includes proprietary device drivers, which may be required for "
@@ -161,7 +161,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:60
+#: en/netInstall-intro.xml:41
 msgid ""
 "Both versions are available in the form of separate 32-bit and 64-bit ISO's. "
 "See here: <link xlink:href=\"https://www.mageia.org/downloads/\">https://www."
@@ -169,12 +169,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:66
+#: en/netInstall-intro.xml:45
 msgid "Preparation"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:68
+#: en/netInstall-intro.xml:46
 msgid ""
 "After downloading the image, burn it to a CD/DVD or, if you prefer to put it "
 "on a USB stick, follow the instructions here: <link xlink:href=\"https://"
@@ -184,17 +184,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/netInstall-intro.xml:75
+#: en/netInstall-intro.xml:51
 msgid "Installation Stages"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/netInstall-intro.xml:77
+#: en/netInstall-intro.xml:52
 msgid "The installation is carried out in two stages:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:81
+#: en/netInstall-intro.xml:55
 msgid ""
 "<emphasis role=\"bold\">Stage 1</emphasis> This is the pre-Installation "
 "stage. You will need to provide the method and details for accessing the "
@@ -205,7 +205,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:91
+#: en/netInstall-intro.xml:64
 msgid ""
 "<emphasis role=\"bold\">Stage 2</emphasis> This is the actual Installation "
 "stage, which will automatically commence once a connection to the installer "
@@ -213,24 +213,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/netInstall-intro.xml:98
+#: en/netInstall-intro.xml:70
 msgid ""
 "During Stage 1, nothing will be written to your Hard Disk, so it is safe to "
 "quit at any point during Stage 1 if you wish. You can do so by pressing "
-"<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Del</keycap> </"
+"<keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Del</keycap></"
 "keycombo>."
 msgstr ""
 
 #. type: Content of: <section><section><tip><para>
-#: en/netInstall-intro.xml:110
+#: en/netInstall-intro.xml:75
 msgid ""
-"You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo> "
-"to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap> </"
+"You can use <keycombo><keycap>Alt</keycap><keycap>F3</keycap></keycombo> to "
+"read the logs and <keycombo><keycap>Alt</keycap><keycap>F1</keycap></"
 "keycombo> to return to the installer screen."
 msgstr ""
 
 #. type: Content of: <section><section><warning><para>
-#: en/netInstall-intro.xml:122
+#: en/netInstall-intro.xml:78
 msgid ""
 "Unlike when installing from DVD or LiveCD, you will be asked to type things "
 "during the first part of a Network installation (<emphasis role=\"bold"
diff --git a/docs/docs/stable/bootiso/es.po b/docs/docs/stable/bootiso/es.po
index e468a534..45f7d271 100644
--- a/docs/docs/stable/bootiso/es.po
+++ b/docs/docs/stable/bootiso/es.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia Boot ISO Help 6.0\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2020-12-20 15:06+0200\n"
+"POT-Creation-Date: 2020-12-20 16:01+0200\n"
 "PO-Revision-Date: 2017-04-04 18:35+0000\n"
 "Last-Translator: José Alberto Valle Cid <j.alberto.vc@gmail.com>, 2020\n"
 "Language-Team: Spanish (https://www.transifex.com/MageiaLinux/teams/9361/"
@@ -100,27 +100,27 @@ msgid "Installing Mageia using a Tiny Boot Image"
 msgstr "Instalando Mageia usando una imagen mínima"
 
 #. type: Content of: <section><title>
-#: en/netInstall-intro.xml:12
+#: en/netInstall-intro.xml:4
 msgid "Introduction"
 msgstr "Introducción"
 
 #. type: Content of: <section><section><title>
-#: en/netInstall-intro.xml:15
+#: en/netInstall-intro.xml:6
 msgid "NetInstall Media"
 msgstr "Instalación por internet"
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:18
+#: en/netInstall-intro.xml:8
 msgid "Description"
 msgstr "Descripción"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:20
+#: en/netInstall-intro.xml:9
 msgid "These minimal ISO's contain:"
 msgstr "Estas pequeñas ISOs contienen:"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:24
+#: en/netInstall-intro.xml:12
 #, fuzzy
 msgid ""
 "less than 120 MB and are convenient if bandwidth is too low to download a "
@@ -132,7 +132,7 @@ msgstr ""
 "no es capaz de arrancar desde un memoria USB."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:30
+#: en/netInstall-intro.xml:17
 #, fuzzy
 msgid ""
 "no more than that which is needed to (a) start the <literal>DrakX</literal> "
@@ -144,7 +144,7 @@ msgstr ""
 "paquetes necesarios para continuar y completar la instalación."
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:37
+#: en/netInstall-intro.xml:23
 msgid ""
 "The required source packages may be on a PC hard disk, a local drive, a "
 "local network or on the Internet."
@@ -153,17 +153,18 @@ msgstr ""
 "PC, un disco local, una red local o en internet."
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:42
+#: en/netInstall-intro.xml:27
 msgid "Availability"
 msgstr "Disponibilidad"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:44
-msgid "There a two versions of the NetInstall media:"
+#: en/netInstall-intro.xml:28
+#, fuzzy
+msgid "There are two versions of the NetInstall media:"
 msgstr "Hay dos versiones:"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:48
+#: en/netInstall-intro.xml:31
 msgid ""
 "<emphasis role=\"bold\">netinstall.iso</emphasis> For those who prefer not "
 "to use non-free software, this ISO contains only free software."
@@ -172,7 +173,7 @@ msgstr ""
 "prefieren no usar software no libre, esta ISO solo contiene software libre."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:54
+#: en/netInstall-intro.xml:36
 msgid ""
 "<emphasis role=\"bold\">netinstall-nonfree.iso</emphasis> This ISO "
 "additionally includes proprietary device drivers, which may be required for "
@@ -183,7 +184,7 @@ msgstr ""
 "de red, controladora de disco, etc."
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:60
+#: en/netInstall-intro.xml:41
 msgid ""
 "Both versions are available in the form of separate 32-bit and 64-bit ISO's. "
 "See here: <link xlink:href=\"https://www.mageia.org/downloads/\">https://www."
@@ -194,12 +195,12 @@ msgstr ""
 "org/downloads/</link>"
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:66
+#: en/netInstall-intro.xml:45
 msgid "Preparation"
 msgstr "Preparación"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:68
+#: en/netInstall-intro.xml:46
 msgid ""
 "After downloading the image, burn it to a CD/DVD or, if you prefer to put it "
 "on a USB stick, follow the instructions here: <link xlink:href=\"https://"
@@ -215,17 +216,17 @@ msgstr ""
 "link>"
 
 #. type: Content of: <section><section><title>
-#: en/netInstall-intro.xml:75
+#: en/netInstall-intro.xml:51
 msgid "Installation Stages"
 msgstr "Etapas de la instalación"
 
 #. type: Content of: <section><section><para>
-#: en/netInstall-intro.xml:77
+#: en/netInstall-intro.xml:52
 msgid "The installation is carried out in two stages:"
 msgstr "La instalación se lleva a cabo en dos etapas:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:81
+#: en/netInstall-intro.xml:55
 #, fuzzy
 msgid ""
 "<emphasis role=\"bold\">Stage 1</emphasis> This is the pre-Installation "
@@ -241,7 +242,7 @@ msgstr ""
 "un servidor, entonces la conexión a internet se activará."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:91
+#: en/netInstall-intro.xml:64
 msgid ""
 "<emphasis role=\"bold\">Stage 2</emphasis> This is the actual Installation "
 "stage, which will automatically commence once a connection to the installer "
@@ -252,11 +253,12 @@ msgstr ""
 "medio escogido. "
 
 #. type: Content of: <section><section><note><para>
-#: en/netInstall-intro.xml:98
+#: en/netInstall-intro.xml:70
+#, fuzzy
 msgid ""
 "During Stage 1, nothing will be written to your Hard Disk, so it is safe to "
 "quit at any point during Stage 1 if you wish. You can do so by pressing "
-"<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Del</keycap> </"
+"<keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Del</keycap></"
 "keycombo>."
 msgstr ""
 "Durante la Etapa 1, nada se escribirá en su disco duro, así que abandonar en "
@@ -265,10 +267,11 @@ msgstr ""
 "keycombo>."
 
 #. type: Content of: <section><section><tip><para>
-#: en/netInstall-intro.xml:110
+#: en/netInstall-intro.xml:75
+#, fuzzy
 msgid ""
-"You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo> "
-"to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap> </"
+"You can use <keycombo><keycap>Alt</keycap><keycap>F3</keycap></keycombo> to "
+"read the logs and <keycombo><keycap>Alt</keycap><keycap>F1</keycap></"
 "keycombo> to return to the installer screen."
 msgstr ""
 "Puede usar <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo> "
@@ -276,7 +279,7 @@ msgstr ""
 "keycap> </keycombo> para volver a la pantalla del instalador."
 
 #. type: Content of: <section><section><warning><para>
-#: en/netInstall-intro.xml:122
+#: en/netInstall-intro.xml:78
 #, fuzzy
 msgid ""
 "Unlike when installing from DVD or LiveCD, you will be asked to type things "
diff --git a/docs/docs/stable/bootiso/et.po b/docs/docs/stable/bootiso/et.po
index 9dd8ffdc..78148526 100644
--- a/docs/docs/stable/bootiso/et.po
+++ b/docs/docs/stable/bootiso/et.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia Boot ISO Help 6.0\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2020-12-20 15:06+0200\n"
+"POT-Creation-Date: 2020-12-20 16:01+0200\n"
 "PO-Revision-Date: 2017-04-04 18:35+0000\n"
 "Last-Translator: Marek Laane <qiilaq69@gmail.com>, 2019\n"
 "Language-Team: Estonian (https://www.transifex.com/MageiaLinux/teams/9361/"
@@ -98,27 +98,27 @@ msgid "Installing Mageia using a Tiny Boot Image"
 msgstr "Mageia paigaldamine väikese alglaadimistõmmise abil"
 
 #. type: Content of: <section><title>
-#: en/netInstall-intro.xml:12
+#: en/netInstall-intro.xml:4
 msgid "Introduction"
 msgstr "Sissejuhatus"
 
 #. type: Content of: <section><section><title>
-#: en/netInstall-intro.xml:15
+#: en/netInstall-intro.xml:6
 msgid "NetInstall Media"
 msgstr "Võrgupaigalduse andmekandjad"
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:18
+#: en/netInstall-intro.xml:8
 msgid "Description"
 msgstr "Kirjeldus"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:20
+#: en/netInstall-intro.xml:9
 msgid "These minimal ISO's contain:"
 msgstr "Need minimaalse mahuga ISO-tõmmised sisaldavad:"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:24
+#: en/netInstall-intro.xml:12
 #, fuzzy
 msgid ""
 "less than 120 MB and are convenient if bandwidth is too low to download a "
@@ -130,7 +130,7 @@ msgstr ""
 "käivitada USB-pulga pealt."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:30
+#: en/netInstall-intro.xml:17
 #, fuzzy
 msgid ""
 "no more than that which is needed to (a) start the <literal>DrakX</literal> "
@@ -142,7 +142,7 @@ msgstr ""
 "mõningate pakettide leidmiseks, et siis jätkata paigaldamisega."
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:37
+#: en/netInstall-intro.xml:23
 msgid ""
 "The required source packages may be on a PC hard disk, a local drive, a "
 "local network or on the Internet."
@@ -151,17 +151,18 @@ msgstr ""
 "kohalikus võrgus või internetis. "
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:42
+#: en/netInstall-intro.xml:27
 msgid "Availability"
 msgstr "Saadavus"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:44
-msgid "There a two versions of the NetInstall media:"
+#: en/netInstall-intro.xml:28
+#, fuzzy
+msgid "There are two versions of the NetInstall media:"
 msgstr "Võrgupaigalduse andmekandjatel on kaks versiooni:"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:48
+#: en/netInstall-intro.xml:31
 msgid ""
 "<emphasis role=\"bold\">netinstall.iso</emphasis> For those who prefer not "
 "to use non-free software, this ISO contains only free software."
@@ -170,7 +171,7 @@ msgstr ""
 "kasutada ainult vaba tarkvara - see tõmmis seda sisaldabki."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:54
+#: en/netInstall-intro.xml:36
 msgid ""
 "<emphasis role=\"bold\">netinstall-nonfree.iso</emphasis> This ISO "
 "additionally includes proprietary device drivers, which may be required for "
@@ -181,7 +182,7 @@ msgstr ""
 "võrguseadmele, kettakontrollerile vms."
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:60
+#: en/netInstall-intro.xml:41
 msgid ""
 "Both versions are available in the form of separate 32-bit and 64-bit ISO's. "
 "See here: <link xlink:href=\"https://www.mageia.org/downloads/\">https://www."
@@ -192,12 +193,12 @@ msgstr ""
 "mageia.org/downloads/</link>"
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:66
+#: en/netInstall-intro.xml:45
 msgid "Preparation"
 msgstr "Valmistumine"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:68
+#: en/netInstall-intro.xml:46
 msgid ""
 "After downloading the image, burn it to a CD/DVD or, if you prefer to put it "
 "on a USB stick, follow the instructions here: <link xlink:href=\"https://"
@@ -211,17 +212,17 @@ msgstr ""
 "wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISOs_on_an_USB_stick</link>"
 
 #. type: Content of: <section><section><title>
-#: en/netInstall-intro.xml:75
+#: en/netInstall-intro.xml:51
 msgid "Installation Stages"
 msgstr "Paigaldamise järgud"
 
 #. type: Content of: <section><section><para>
-#: en/netInstall-intro.xml:77
+#: en/netInstall-intro.xml:52
 msgid "The installation is carried out in two stages:"
 msgstr "Paigaldamine toimub kahes järgus:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:81
+#: en/netInstall-intro.xml:55
 #, fuzzy
 msgid ""
 "<emphasis role=\"bold\">Stage 1</emphasis> This is the pre-Installation "
@@ -237,7 +238,7 @@ msgstr ""
 "andmekandjale. Kui meetod vajab serverit, aktiveeritakse ka võrguühendus."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:91
+#: en/netInstall-intro.xml:64
 msgid ""
 "<emphasis role=\"bold\">Stage 2</emphasis> This is the actual Installation "
 "stage, which will automatically commence once a connection to the installer "
@@ -248,11 +249,12 @@ msgstr ""
 "paigaldamiseks vajalike failidega."
 
 #. type: Content of: <section><section><note><para>
-#: en/netInstall-intro.xml:98
+#: en/netInstall-intro.xml:70
+#, fuzzy
 msgid ""
 "During Stage 1, nothing will be written to your Hard Disk, so it is safe to "
 "quit at any point during Stage 1 if you wish. You can do so by pressing "
-"<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Del</keycap> </"
+"<keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Del</keycap></"
 "keycombo>."
 msgstr ""
 "1. järgu ajal ei kirjutata veel midagi kõvakettale, nii et soovi korral võib "
@@ -261,10 +263,11 @@ msgstr ""
 "<keycap>Del</keycap></keycombo>."
 
 #. type: Content of: <section><section><tip><para>
-#: en/netInstall-intro.xml:110
+#: en/netInstall-intro.xml:75
+#, fuzzy
 msgid ""
-"You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo> "
-"to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap> </"
+"You can use <keycombo><keycap>Alt</keycap><keycap>F3</keycap></keycombo> to "
+"read the logs and <keycombo><keycap>Alt</keycap><keycap>F1</keycap></"
 "keycombo> to return to the installer screen."
 msgstr ""
 "Klahvikombinatsiooniga <keycombo><keycap>Alt</keycap> <keycap>F3</keycap></"
@@ -272,7 +275,7 @@ msgstr ""
 "keycap></keycombo> abil naasta paigaldusekraanile."
 
 #. type: Content of: <section><section><warning><para>
-#: en/netInstall-intro.xml:122
+#: en/netInstall-intro.xml:78
 #, fuzzy
 msgid ""
 "Unlike when installing from DVD or LiveCD, you will be asked to type things "
diff --git a/docs/docs/stable/bootiso/eu.po b/docs/docs/stable/bootiso/eu.po
index f886a9bd..aac223cb 100644
--- a/docs/docs/stable/bootiso/eu.po
+++ b/docs/docs/stable/bootiso/eu.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia Boot ISO Help 6.0\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2020-12-20 15:06+0200\n"
+"POT-Creation-Date: 2020-12-20 16:01+0200\n"
 "PO-Revision-Date: 2017-04-04 18:35+0000\n"
 "Last-Translator: Egoitz Rodriguez <egoitzro@gmail.com>, 2019\n"
 "Language-Team: Basque (https://www.transifex.com/MageiaLinux/teams/9361/"
@@ -94,27 +94,27 @@ msgid "Installing Mageia using a Tiny Boot Image"
 msgstr ""
 
 #. type: Content of: <section><title>
-#: en/netInstall-intro.xml:12
+#: en/netInstall-intro.xml:4
 msgid "Introduction"
 msgstr "Sarrera"
 
 #. type: Content of: <section><section><title>
-#: en/netInstall-intro.xml:15
+#: en/netInstall-intro.xml:6
 msgid "NetInstall Media"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:18
+#: en/netInstall-intro.xml:8
 msgid "Description"
 msgstr "Azalpena"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:20
+#: en/netInstall-intro.xml:9
 msgid "These minimal ISO's contain:"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:24
+#: en/netInstall-intro.xml:12
 msgid ""
 "less than 120 MB and are convenient if bandwidth is too low to download a "
 "full DVD, or if you have a PC without a DVD drive or unable to boot from a "
@@ -122,7 +122,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:30
+#: en/netInstall-intro.xml:17
 msgid ""
 "no more than that which is needed to (a) start the <literal>DrakX</literal> "
 "installer and (b) find <literal>DrakX-installer-stage2</literal> and other "
@@ -130,31 +130,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:37
+#: en/netInstall-intro.xml:23
 msgid ""
 "The required source packages may be on a PC hard disk, a local drive, a "
 "local network or on the Internet."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:42
+#: en/netInstall-intro.xml:27
 msgid "Availability"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:44
-msgid "There a two versions of the NetInstall media:"
+#: en/netInstall-intro.xml:28
+msgid "There are two versions of the NetInstall media:"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:48
+#: en/netInstall-intro.xml:31
 msgid ""
 "<emphasis role=\"bold\">netinstall.iso</emphasis> For those who prefer not "
 "to use non-free software, this ISO contains only free software."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:54
+#: en/netInstall-intro.xml:36
 msgid ""
 "<emphasis role=\"bold\">netinstall-nonfree.iso</emphasis> This ISO "
 "additionally includes proprietary device drivers, which may be required for "
@@ -162,7 +162,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:60
+#: en/netInstall-intro.xml:41
 msgid ""
 "Both versions are available in the form of separate 32-bit and 64-bit ISO's. "
 "See here: <link xlink:href=\"https://www.mageia.org/downloads/\">https://www."
@@ -170,12 +170,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:66
+#: en/netInstall-intro.xml:45
 msgid "Preparation"
 msgstr "Aurkezpena"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:68
+#: en/netInstall-intro.xml:46
 msgid ""
 "After downloading the image, burn it to a CD/DVD or, if you prefer to put it "
 "on a USB stick, follow the instructions here: <link xlink:href=\"https://"
@@ -185,17 +185,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/netInstall-intro.xml:75
+#: en/netInstall-intro.xml:51
 msgid "Installation Stages"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/netInstall-intro.xml:77
+#: en/netInstall-intro.xml:52
 msgid "The installation is carried out in two stages:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:81
+#: en/netInstall-intro.xml:55
 msgid ""
 "<emphasis role=\"bold\">Stage 1</emphasis> This is the pre-Installation "
 "stage. You will need to provide the method and details for accessing the "
@@ -206,7 +206,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:91
+#: en/netInstall-intro.xml:64
 msgid ""
 "<emphasis role=\"bold\">Stage 2</emphasis> This is the actual Installation "
 "stage, which will automatically commence once a connection to the installer "
@@ -214,24 +214,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/netInstall-intro.xml:98
+#: en/netInstall-intro.xml:70
 msgid ""
 "During Stage 1, nothing will be written to your Hard Disk, so it is safe to "
 "quit at any point during Stage 1 if you wish. You can do so by pressing "
-"<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Del</keycap> </"
+"<keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Del</keycap></"
 "keycombo>."
 msgstr ""
 
 #. type: Content of: <section><section><tip><para>
-#: en/netInstall-intro.xml:110
+#: en/netInstall-intro.xml:75
 msgid ""
-"You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo> "
-"to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap> </"
+"You can use <keycombo><keycap>Alt</keycap><keycap>F3</keycap></keycombo> to "
+"read the logs and <keycombo><keycap>Alt</keycap><keycap>F1</keycap></"
 "keycombo> to return to the installer screen."
 msgstr ""
 
 #. type: Content of: <section><section><warning><para>
-#: en/netInstall-intro.xml:122
+#: en/netInstall-intro.xml:78
 msgid ""
 "Unlike when installing from DVD or LiveCD, you will be asked to type things "
 "during the first part of a Network installation (<emphasis role=\"bold"
diff --git a/docs/docs/stable/bootiso/fr.po b/docs/docs/stable/bootiso/fr.po
index c34061e4..0e83251d 100644
--- a/docs/docs/stable/bootiso/fr.po
+++ b/docs/docs/stable/bootiso/fr.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia Boot ISO Help 6.0\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2020-12-20 15:06+0200\n"
+"POT-Creation-Date: 2020-12-20 16:01+0200\n"
 "PO-Revision-Date: 2017-04-04 18:35+0000\n"
 "Last-Translator: stroibe974 <sebsweb@gmail.com>, 2019\n"
 "Language-Team: French (https://www.transifex.com/MageiaLinux/teams/9361/"
@@ -103,27 +103,27 @@ msgid "Installing Mageia using a Tiny Boot Image"
 msgstr "Installation à partir d'une image minimale d'amorçage"
 
 #. type: Content of: <section><title>
-#: en/netInstall-intro.xml:12
+#: en/netInstall-intro.xml:4
 msgid "Introduction"
 msgstr "Introduction"
 
 #. type: Content of: <section><section><title>
-#: en/netInstall-intro.xml:15
+#: en/netInstall-intro.xml:6
 msgid "NetInstall Media"
 msgstr "Media d'installation réseau"
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:18
+#: en/netInstall-intro.xml:8
 msgid "Description"
 msgstr "Description"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:20
+#: en/netInstall-intro.xml:9
 msgid "These minimal ISO's contain:"
 msgstr "Ces images minimalistes contiennent :"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:24
+#: en/netInstall-intro.xml:12
 #, fuzzy
 msgid ""
 "less than 120 MB and are convenient if bandwidth is too low to download a "
@@ -135,7 +135,7 @@ msgstr ""
 "s'il ne peut pas démarrer sur une clé USB."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:30
+#: en/netInstall-intro.xml:17
 #, fuzzy
 msgid ""
 "no more than that which is needed to (a) start the <literal>DrakX</literal> "
@@ -147,7 +147,7 @@ msgstr ""
 "paquets indispensables pour continuer et terminer l'installation."
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:37
+#: en/netInstall-intro.xml:23
 msgid ""
 "The required source packages may be on a PC hard disk, a local drive, a "
 "local network or on the Internet."
@@ -156,17 +156,18 @@ msgstr ""
 "périphérique de stockage, un réseau local ou sur Internet. "
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:42
+#: en/netInstall-intro.xml:27
 msgid "Availability"
 msgstr "Disponibilité"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:44
-msgid "There a two versions of the NetInstall media:"
+#: en/netInstall-intro.xml:28
+#, fuzzy
+msgid "There are two versions of the NetInstall media:"
 msgstr "Il existe deux familles de media NetInstall :"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:48
+#: en/netInstall-intro.xml:31
 msgid ""
 "<emphasis role=\"bold\">netinstall.iso</emphasis> For those who prefer not "
 "to use non-free software, this ISO contains only free software."
@@ -176,7 +177,7 @@ msgstr ""
 "des logiciels libres."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:54
+#: en/netInstall-intro.xml:36
 msgid ""
 "<emphasis role=\"bold\">netinstall-nonfree.iso</emphasis> This ISO "
 "additionally includes proprietary device drivers, which may be required for "
@@ -187,7 +188,7 @@ msgstr ""
 "réseau, contrôleur de disque, etc."
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:60
+#: en/netInstall-intro.xml:41
 msgid ""
 "Both versions are available in the form of separate 32-bit and 64-bit ISO's. "
 "See here: <link xlink:href=\"https://www.mageia.org/downloads/\">https://www."
@@ -198,12 +199,12 @@ msgstr ""
 "\">https://www.mageia.org/downloads/</link>"
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:66
+#: en/netInstall-intro.xml:45
 msgid "Preparation"
 msgstr "Préparation"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:68
+#: en/netInstall-intro.xml:46
 msgid ""
 "After downloading the image, burn it to a CD/DVD or, if you prefer to put it "
 "on a USB stick, follow the instructions here: <link xlink:href=\"https://"
@@ -219,17 +220,17 @@ msgstr ""
 "C3.A9riph.C3.A9rique_USB</link>"
 
 #. type: Content of: <section><section><title>
-#: en/netInstall-intro.xml:75
+#: en/netInstall-intro.xml:51
 msgid "Installation Stages"
 msgstr "Étapes d'installation"
 
 #. type: Content of: <section><section><para>
-#: en/netInstall-intro.xml:77
+#: en/netInstall-intro.xml:52
 msgid "The installation is carried out in two stages:"
 msgstr "L'installation se déroulent en deux étapes :"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:81
+#: en/netInstall-intro.xml:55
 #, fuzzy
 msgid ""
 "<emphasis role=\"bold\">Stage 1</emphasis> This is the pre-Installation "
@@ -245,7 +246,7 @@ msgstr ""
 "l'utilisation d'un serveur, alors la connexion au réseau sera activée. "
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:91
+#: en/netInstall-intro.xml:64
 msgid ""
 "<emphasis role=\"bold\">Stage 2</emphasis> This is the actual Installation "
 "stage, which will automatically commence once a connection to the installer "
@@ -256,11 +257,12 @@ msgstr ""
 "connexion aux fichiers de l'installateur sera effective."
 
 #. type: Content of: <section><section><note><para>
-#: en/netInstall-intro.xml:98
+#: en/netInstall-intro.xml:70
+#, fuzzy
 msgid ""
 "During Stage 1, nothing will be written to your Hard Disk, so it is safe to "
 "quit at any point during Stage 1 if you wish. You can do so by pressing "
-"<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Del</keycap> </"
+"<keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Del</keycap></"
 "keycombo>."
 msgstr ""
 "Pendant l'étape 1 (Stage 1), rien ne sera écrit sur le disque dur, il est "
@@ -269,10 +271,11 @@ msgstr ""
 "keycombo>."
 
 #. type: Content of: <section><section><tip><para>
-#: en/netInstall-intro.xml:110
+#: en/netInstall-intro.xml:75
+#, fuzzy
 msgid ""
-"You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo> "
-"to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap> </"
+"You can use <keycombo><keycap>Alt</keycap><keycap>F3</keycap></keycombo> to "
+"read the logs and <keycombo><keycap>Alt</keycap><keycap>F1</keycap></"
 "keycombo> to return to the installer screen."
 msgstr ""
 "Vous pouvez lire les journaux en appuyant sur <keycombo><keycap>Alt</"
@@ -281,7 +284,7 @@ msgstr ""
 "keycombo>."
 
 #. type: Content of: <section><section><warning><para>
-#: en/netInstall-intro.xml:122
+#: en/netInstall-intro.xml:78
 #, fuzzy
 msgid ""
 "Unlike when installing from DVD or LiveCD, you will be asked to type things "
diff --git a/docs/docs/stable/bootiso/he.po b/docs/docs/stable/bootiso/he.po
index d68d71d8..39d859dd 100644
--- a/docs/docs/stable/bootiso/he.po
+++ b/docs/docs/stable/bootiso/he.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia Boot ISO Help 6.0\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2020-12-20 15:06+0200\n"
+"POT-Creation-Date: 2020-12-20 16:01+0200\n"
 "PO-Revision-Date: 2017-04-04 18:35+0000\n"
 "Last-Translator: Omeritzics Games <omeritzicschwartz@gmail.com>, 2020\n"
 "Language-Team: Hebrew (https://www.transifex.com/MageiaLinux/teams/9361/"
@@ -92,27 +92,27 @@ msgid "Installing Mageia using a Tiny Boot Image"
 msgstr ""
 
 #. type: Content of: <section><title>
-#: en/netInstall-intro.xml:12
+#: en/netInstall-intro.xml:4
 msgid "Introduction"
 msgstr "מבוא"
 
 #. type: Content of: <section><section><title>
-#: en/netInstall-intro.xml:15
+#: en/netInstall-intro.xml:6
 msgid "NetInstall Media"
 msgstr "אמצעי התקנה מהרשת"
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:18
+#: en/netInstall-intro.xml:8
 msgid "Description"
 msgstr "תיאור"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:20
+#: en/netInstall-intro.xml:9
 msgid "These minimal ISO's contain:"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:24
+#: en/netInstall-intro.xml:12
 msgid ""
 "less than 120 MB and are convenient if bandwidth is too low to download a "
 "full DVD, or if you have a PC without a DVD drive or unable to boot from a "
@@ -120,7 +120,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:30
+#: en/netInstall-intro.xml:17
 msgid ""
 "no more than that which is needed to (a) start the <literal>DrakX</literal> "
 "installer and (b) find <literal>DrakX-installer-stage2</literal> and other "
@@ -128,31 +128,32 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:37
+#: en/netInstall-intro.xml:23
 msgid ""
 "The required source packages may be on a PC hard disk, a local drive, a "
 "local network or on the Internet."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:42
+#: en/netInstall-intro.xml:27
 msgid "Availability"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:44
-msgid "There a two versions of the NetInstall media:"
+#: en/netInstall-intro.xml:28
+#, fuzzy
+msgid "There are two versions of the NetInstall media:"
 msgstr "ישנן שתי גרסאות של אמצעי ההתקנה מהרשת:"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:48
+#: en/netInstall-intro.xml:31
 msgid ""
 "<emphasis role=\"bold\">netinstall.iso</emphasis> For those who prefer not "
 "to use non-free software, this ISO contains only free software."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:54
+#: en/netInstall-intro.xml:36
 msgid ""
 "<emphasis role=\"bold\">netinstall-nonfree.iso</emphasis> This ISO "
 "additionally includes proprietary device drivers, which may be required for "
@@ -160,7 +161,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:60
+#: en/netInstall-intro.xml:41
 msgid ""
 "Both versions are available in the form of separate 32-bit and 64-bit ISO's. "
 "See here: <link xlink:href=\"https://www.mageia.org/downloads/\">https://www."
@@ -168,12 +169,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:66
+#: en/netInstall-intro.xml:45
 msgid "Preparation"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:68
+#: en/netInstall-intro.xml:46
 msgid ""
 "After downloading the image, burn it to a CD/DVD or, if you prefer to put it "
 "on a USB stick, follow the instructions here: <link xlink:href=\"https://"
@@ -183,17 +184,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/netInstall-intro.xml:75
+#: en/netInstall-intro.xml:51
 msgid "Installation Stages"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/netInstall-intro.xml:77
+#: en/netInstall-intro.xml:52
 msgid "The installation is carried out in two stages:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:81
+#: en/netInstall-intro.xml:55
 msgid ""
 "<emphasis role=\"bold\">Stage 1</emphasis> This is the pre-Installation "
 "stage. You will need to provide the method and details for accessing the "
@@ -204,7 +205,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:91
+#: en/netInstall-intro.xml:64
 msgid ""
 "<emphasis role=\"bold\">Stage 2</emphasis> This is the actual Installation "
 "stage, which will automatically commence once a connection to the installer "
@@ -212,24 +213,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/netInstall-intro.xml:98
+#: en/netInstall-intro.xml:70
 msgid ""
 "During Stage 1, nothing will be written to your Hard Disk, so it is safe to "
 "quit at any point during Stage 1 if you wish. You can do so by pressing "
-"<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Del</keycap> </"
+"<keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Del</keycap></"
 "keycombo>."
 msgstr ""
 
 #. type: Content of: <section><section><tip><para>
-#: en/netInstall-intro.xml:110
+#: en/netInstall-intro.xml:75
 msgid ""
-"You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo> "
-"to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap> </"
+"You can use <keycombo><keycap>Alt</keycap><keycap>F3</keycap></keycombo> to "
+"read the logs and <keycombo><keycap>Alt</keycap><keycap>F1</keycap></"
 "keycombo> to return to the installer screen."
 msgstr ""
 
 #. type: Content of: <section><section><warning><para>
-#: en/netInstall-intro.xml:122
+#: en/netInstall-intro.xml:78
 msgid ""
 "Unlike when installing from DVD or LiveCD, you will be asked to type things "
 "during the first part of a Network installation (<emphasis role=\"bold"
diff --git a/docs/docs/stable/bootiso/hi.po b/docs/docs/stable/bootiso/hi.po
index 9928051b..763b2e58 100644
--- a/docs/docs/stable/bootiso/hi.po
+++ b/docs/docs/stable/bootiso/hi.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia Boot ISO Help 6.0\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2020-12-20 15:06+0200\n"
+"POT-Creation-Date: 2020-12-20 16:01+0200\n"
 "PO-Revision-Date: 2017-04-04 18:35+0000\n"
 "Last-Translator: Panwar108 <caspian7pena@gmail.com>, 2020\n"
 "Language-Team: Hindi (https://www.transifex.com/MageiaLinux/teams/9361/hi/)\n"
@@ -87,27 +87,27 @@ msgid "Installing Mageia using a Tiny Boot Image"
 msgstr ""
 
 #. type: Content of: <section><title>
-#: en/netInstall-intro.xml:12
+#: en/netInstall-intro.xml:4
 msgid "Introduction"
 msgstr "परिचय"
 
 #. type: Content of: <section><section><title>
-#: en/netInstall-intro.xml:15
+#: en/netInstall-intro.xml:6
 msgid "NetInstall Media"
 msgstr "नेट इंस्टॉल मीडिया"
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:18
+#: en/netInstall-intro.xml:8
 msgid "Description"
 msgstr "विवरण"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:20
+#: en/netInstall-intro.xml:9
 msgid "These minimal ISO's contain:"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:24
+#: en/netInstall-intro.xml:12
 msgid ""
 "less than 120 MB and are convenient if bandwidth is too low to download a "
 "full DVD, or if you have a PC without a DVD drive or unable to boot from a "
@@ -115,7 +115,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:30
+#: en/netInstall-intro.xml:17
 msgid ""
 "no more than that which is needed to (a) start the <literal>DrakX</literal> "
 "installer and (b) find <literal>DrakX-installer-stage2</literal> and other "
@@ -123,31 +123,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:37
+#: en/netInstall-intro.xml:23
 msgid ""
 "The required source packages may be on a PC hard disk, a local drive, a "
 "local network or on the Internet."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:42
+#: en/netInstall-intro.xml:27
 msgid "Availability"
 msgstr "उपलब्धता"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:44
-msgid "There a two versions of the NetInstall media:"
+#: en/netInstall-intro.xml:28
+msgid "There are two versions of the NetInstall media:"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:48
+#: en/netInstall-intro.xml:31
 msgid ""
 "<emphasis role=\"bold\">netinstall.iso</emphasis> For those who prefer not "
 "to use non-free software, this ISO contains only free software."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:54
+#: en/netInstall-intro.xml:36
 msgid ""
 "<emphasis role=\"bold\">netinstall-nonfree.iso</emphasis> This ISO "
 "additionally includes proprietary device drivers, which may be required for "
@@ -155,7 +155,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:60
+#: en/netInstall-intro.xml:41
 msgid ""
 "Both versions are available in the form of separate 32-bit and 64-bit ISO's. "
 "See here: <link xlink:href=\"https://www.mageia.org/downloads/\">https://www."
@@ -163,12 +163,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:66
+#: en/netInstall-intro.xml:45
 msgid "Preparation"
 msgstr "तैयारी"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:68
+#: en/netInstall-intro.xml:46
 msgid ""
 "After downloading the image, burn it to a CD/DVD or, if you prefer to put it "
 "on a USB stick, follow the instructions here: <link xlink:href=\"https://"
@@ -178,17 +178,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/netInstall-intro.xml:75
+#: en/netInstall-intro.xml:51
 msgid "Installation Stages"
 msgstr "इंस्टॉल प्रक्रिया के चरण"
 
 #. type: Content of: <section><section><para>
-#: en/netInstall-intro.xml:77
+#: en/netInstall-intro.xml:52
 msgid "The installation is carried out in two stages:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:81
+#: en/netInstall-intro.xml:55
 msgid ""
 "<emphasis role=\"bold\">Stage 1</emphasis> This is the pre-Installation "
 "stage. You will need to provide the method and details for accessing the "
@@ -199,7 +199,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:91
+#: en/netInstall-intro.xml:64
 msgid ""
 "<emphasis role=\"bold\">Stage 2</emphasis> This is the actual Installation "
 "stage, which will automatically commence once a connection to the installer "
@@ -207,24 +207,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/netInstall-intro.xml:98
+#: en/netInstall-intro.xml:70
 msgid ""
 "During Stage 1, nothing will be written to your Hard Disk, so it is safe to "
 "quit at any point during Stage 1 if you wish. You can do so by pressing "
-"<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Del</keycap> </"
+"<keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Del</keycap></"
 "keycombo>."
 msgstr ""
 
 #. type: Content of: <section><section><tip><para>
-#: en/netInstall-intro.xml:110
+#: en/netInstall-intro.xml:75
 msgid ""
-"You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo> "
-"to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap> </"
+"You can use <keycombo><keycap>Alt</keycap><keycap>F3</keycap></keycombo> to "
+"read the logs and <keycombo><keycap>Alt</keycap><keycap>F1</keycap></"
 "keycombo> to return to the installer screen."
 msgstr ""
 
 #. type: Content of: <section><section><warning><para>
-#: en/netInstall-intro.xml:122
+#: en/netInstall-intro.xml:78
 msgid ""
 "Unlike when installing from DVD or LiveCD, you will be asked to type things "
 "during the first part of a Network installation (<emphasis role=\"bold"
diff --git a/docs/docs/stable/bootiso/hr.po b/docs/docs/stable/bootiso/hr.po
index 5f0b0080..c77f5d9f 100644
--- a/docs/docs/stable/bootiso/hr.po
+++ b/docs/docs/stable/bootiso/hr.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia Boot ISO Help 6.0\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2020-12-20 15:06+0200\n"
+"POT-Creation-Date: 2020-12-20 16:01+0200\n"
 "PO-Revision-Date: 2017-04-04 18:35+0000\n"
 "Last-Translator: Ivica  Kolić <ikoli@yahoo.com>, 2019\n"
 "Language-Team: Croatian (https://www.transifex.com/MageiaLinux/teams/9361/"
@@ -99,27 +99,27 @@ msgid "Installing Mageia using a Tiny Boot Image"
 msgstr ""
 
 #. type: Content of: <section><title>
-#: en/netInstall-intro.xml:12
+#: en/netInstall-intro.xml:4
 msgid "Introduction"
 msgstr "Uvod"
 
 #. type: Content of: <section><section><title>
-#: en/netInstall-intro.xml:15
+#: en/netInstall-intro.xml:6
 msgid "NetInstall Media"
 msgstr "NetInstall medij"
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:18
+#: en/netInstall-intro.xml:8
 msgid "Description"
 msgstr "Opis"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:20
+#: en/netInstall-intro.xml:9
 msgid "These minimal ISO's contain:"
 msgstr "Ovaj minimalni ISO sadrži:"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:24
+#: en/netInstall-intro.xml:12
 #, fuzzy
 msgid ""
 "less than 120 MB and are convenient if bandwidth is too low to download a "
@@ -131,7 +131,7 @@ msgstr ""
 "podignuti sustav sa USB stika."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:30
+#: en/netInstall-intro.xml:17
 msgid ""
 "no more than that which is needed to (a) start the <literal>DrakX</literal> "
 "installer and (b) find <literal>DrakX-installer-stage2</literal> and other "
@@ -139,24 +139,25 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:37
+#: en/netInstall-intro.xml:23
 msgid ""
 "The required source packages may be on a PC hard disk, a local drive, a "
 "local network or on the Internet."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:42
+#: en/netInstall-intro.xml:27
 msgid "Availability"
 msgstr "Dostupnost"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:44
-msgid "There a two versions of the NetInstall media:"
+#: en/netInstall-intro.xml:28
+#, fuzzy
+msgid "There are two versions of the NetInstall media:"
 msgstr "Postoje dvije verzije NetInstall medija:"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:48
+#: en/netInstall-intro.xml:31
 msgid ""
 "<emphasis role=\"bold\">netinstall.iso</emphasis> For those who prefer not "
 "to use non-free software, this ISO contains only free software."
@@ -165,7 +166,7 @@ msgstr ""
 "koristiti neslobodan software, ovaj  ISO sadrži samo slobodan software."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:54
+#: en/netInstall-intro.xml:36
 msgid ""
 "<emphasis role=\"bold\">netinstall-nonfree.iso</emphasis> This ISO "
 "additionally includes proprietary device drivers, which may be required for "
@@ -176,7 +177,7 @@ msgstr ""
 "za vaš mrežni uređaj, disk kontroler, itd."
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:60
+#: en/netInstall-intro.xml:41
 msgid ""
 "Both versions are available in the form of separate 32-bit and 64-bit ISO's. "
 "See here: <link xlink:href=\"https://www.mageia.org/downloads/\">https://www."
@@ -187,12 +188,12 @@ msgstr ""
 "\">https://www.mageia.org/downloads/</link>"
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:66
+#: en/netInstall-intro.xml:45
 msgid "Preparation"
 msgstr "Priprema"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:68
+#: en/netInstall-intro.xml:46
 msgid ""
 "After downloading the image, burn it to a CD/DVD or, if you prefer to put it "
 "on a USB stick, follow the instructions here: <link xlink:href=\"https://"
@@ -202,17 +203,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/netInstall-intro.xml:75
+#: en/netInstall-intro.xml:51
 msgid "Installation Stages"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/netInstall-intro.xml:77
+#: en/netInstall-intro.xml:52
 msgid "The installation is carried out in two stages:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:81
+#: en/netInstall-intro.xml:55
 msgid ""
 "<emphasis role=\"bold\">Stage 1</emphasis> This is the pre-Installation "
 "stage. You will need to provide the method and details for accessing the "
@@ -223,7 +224,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:91
+#: en/netInstall-intro.xml:64
 msgid ""
 "<emphasis role=\"bold\">Stage 2</emphasis> This is the actual Installation "
 "stage, which will automatically commence once a connection to the installer "
@@ -231,24 +232,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/netInstall-intro.xml:98
+#: en/netInstall-intro.xml:70
 msgid ""
 "During Stage 1, nothing will be written to your Hard Disk, so it is safe to "
 "quit at any point during Stage 1 if you wish. You can do so by pressing "
-"<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Del</keycap> </"
+"<keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Del</keycap></"
 "keycombo>."
 msgstr ""
 
 #. type: Content of: <section><section><tip><para>
-#: en/netInstall-intro.xml:110
+#: en/netInstall-intro.xml:75
 msgid ""
-"You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo> "
-"to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap> </"
+"You can use <keycombo><keycap>Alt</keycap><keycap>F3</keycap></keycombo> to "
+"read the logs and <keycombo><keycap>Alt</keycap><keycap>F1</keycap></"
 "keycombo> to return to the installer screen."
 msgstr ""
 
 #. type: Content of: <section><section><warning><para>
-#: en/netInstall-intro.xml:122
+#: en/netInstall-intro.xml:78
 msgid ""
 "Unlike when installing from DVD or LiveCD, you will be asked to type things "
 "during the first part of a Network installation (<emphasis role=\"bold"
diff --git a/docs/docs/stable/bootiso/hu.po b/docs/docs/stable/bootiso/hu.po
index 4c632a63..10642127 100644
--- a/docs/docs/stable/bootiso/hu.po
+++ b/docs/docs/stable/bootiso/hu.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia Boot ISO Help 6.0\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2020-12-20 15:06+0200\n"
+"POT-Creation-Date: 2020-12-20 16:01+0200\n"
 "PO-Revision-Date: 2017-04-04 18:35+0000\n"
 "Last-Translator: István Norbert Péter <peter.norbert.istvan@gmail.com>, "
 "2019\n"
@@ -97,27 +97,27 @@ msgid "Installing Mageia using a Tiny Boot Image"
 msgstr ""
 
 #. type: Content of: <section><title>
-#: en/netInstall-intro.xml:12
+#: en/netInstall-intro.xml:4
 msgid "Introduction"
 msgstr "Bevezetés"
 
 #. type: Content of: <section><section><title>
-#: en/netInstall-intro.xml:15
+#: en/netInstall-intro.xml:6
 msgid "NetInstall Media"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:18
+#: en/netInstall-intro.xml:8
 msgid "Description"
 msgstr "Leírás"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:20
+#: en/netInstall-intro.xml:9
 msgid "These minimal ISO's contain:"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:24
+#: en/netInstall-intro.xml:12
 msgid ""
 "less than 120 MB and are convenient if bandwidth is too low to download a "
 "full DVD, or if you have a PC without a DVD drive or unable to boot from a "
@@ -125,7 +125,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:30
+#: en/netInstall-intro.xml:17
 msgid ""
 "no more than that which is needed to (a) start the <literal>DrakX</literal> "
 "installer and (b) find <literal>DrakX-installer-stage2</literal> and other "
@@ -133,31 +133,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:37
+#: en/netInstall-intro.xml:23
 msgid ""
 "The required source packages may be on a PC hard disk, a local drive, a "
 "local network or on the Internet."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:42
+#: en/netInstall-intro.xml:27
 msgid "Availability"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:44
-msgid "There a two versions of the NetInstall media:"
+#: en/netInstall-intro.xml:28
+msgid "There are two versions of the NetInstall media:"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:48
+#: en/netInstall-intro.xml:31
 msgid ""
 "<emphasis role=\"bold\">netinstall.iso</emphasis> For those who prefer not "
 "to use non-free software, this ISO contains only free software."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:54
+#: en/netInstall-intro.xml:36
 msgid ""
 "<emphasis role=\"bold\">netinstall-nonfree.iso</emphasis> This ISO "
 "additionally includes proprietary device drivers, which may be required for "
@@ -165,7 +165,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:60
+#: en/netInstall-intro.xml:41
 msgid ""
 "Both versions are available in the form of separate 32-bit and 64-bit ISO's. "
 "See here: <link xlink:href=\"https://www.mageia.org/downloads/\">https://www."
@@ -173,12 +173,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:66
+#: en/netInstall-intro.xml:45
 msgid "Preparation"
 msgstr "Előkészítés"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:68
+#: en/netInstall-intro.xml:46
 msgid ""
 "After downloading the image, burn it to a CD/DVD or, if you prefer to put it "
 "on a USB stick, follow the instructions here: <link xlink:href=\"https://"
@@ -188,17 +188,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/netInstall-intro.xml:75
+#: en/netInstall-intro.xml:51
 msgid "Installation Stages"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/netInstall-intro.xml:77
+#: en/netInstall-intro.xml:52
 msgid "The installation is carried out in two stages:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:81
+#: en/netInstall-intro.xml:55
 msgid ""
 "<emphasis role=\"bold\">Stage 1</emphasis> This is the pre-Installation "
 "stage. You will need to provide the method and details for accessing the "
@@ -209,7 +209,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:91
+#: en/netInstall-intro.xml:64
 msgid ""
 "<emphasis role=\"bold\">Stage 2</emphasis> This is the actual Installation "
 "stage, which will automatically commence once a connection to the installer "
@@ -217,24 +217,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/netInstall-intro.xml:98
+#: en/netInstall-intro.xml:70
 msgid ""
 "During Stage 1, nothing will be written to your Hard Disk, so it is safe to "
 "quit at any point during Stage 1 if you wish. You can do so by pressing "
-"<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Del</keycap> </"
+"<keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Del</keycap></"
 "keycombo>."
 msgstr ""
 
 #. type: Content of: <section><section><tip><para>
-#: en/netInstall-intro.xml:110
+#: en/netInstall-intro.xml:75
 msgid ""
-"You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo> "
-"to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap> </"
+"You can use <keycombo><keycap>Alt</keycap><keycap>F3</keycap></keycombo> to "
+"read the logs and <keycombo><keycap>Alt</keycap><keycap>F1</keycap></"
 "keycombo> to return to the installer screen."
 msgstr ""
 
 #. type: Content of: <section><section><warning><para>
-#: en/netInstall-intro.xml:122
+#: en/netInstall-intro.xml:78
 msgid ""
 "Unlike when installing from DVD or LiveCD, you will be asked to type things "
 "during the first part of a Network installation (<emphasis role=\"bold"
diff --git a/docs/docs/stable/bootiso/ja.po b/docs/docs/stable/bootiso/ja.po
index 0059c8b8..0bcd915b 100644
--- a/docs/docs/stable/bootiso/ja.po
+++ b/docs/docs/stable/bootiso/ja.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia Boot ISO Help 6.0\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2020-12-20 15:06+0200\n"
+"POT-Creation-Date: 2020-12-20 16:01+0200\n"
 "PO-Revision-Date: 2017-04-04 18:35+0000\n"
 "Last-Translator: Masanori Kakura <kakurasan@gmail.com>, 2019\n"
 "Language-Team: Japanese (https://www.transifex.com/MageiaLinux/teams/9361/"
@@ -98,27 +98,27 @@ msgid "Installing Mageia using a Tiny Boot Image"
 msgstr "小さな起動イメージを用いて Mageia をインストール"
 
 #. type: Content of: <section><title>
-#: en/netInstall-intro.xml:12
+#: en/netInstall-intro.xml:4
 msgid "Introduction"
 msgstr "はじめに"
 
 #. type: Content of: <section><section><title>
-#: en/netInstall-intro.xml:15
+#: en/netInstall-intro.xml:6
 msgid "NetInstall Media"
 msgstr "ネット インストール メディア"
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:18
+#: en/netInstall-intro.xml:8
 msgid "Description"
 msgstr "説明"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:20
+#: en/netInstall-intro.xml:9
 msgid "These minimal ISO's contain:"
 msgstr "これらの最小限の ISO は:"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:24
+#: en/netInstall-intro.xml:12
 #, fuzzy
 msgid ""
 "less than 120 MB and are convenient if bandwidth is too low to download a "
@@ -130,7 +130,7 @@ msgstr ""
 "利です。"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:30
+#: en/netInstall-intro.xml:17
 #, fuzzy
 msgid ""
 "no more than that which is needed to (a) start the <literal>DrakX</literal> "
@@ -142,7 +142,7 @@ msgstr ""
 "完了に必要な他のパッケージを見つける"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:37
+#: en/netInstall-intro.xml:23
 msgid ""
 "The required source packages may be on a PC hard disk, a local drive, a "
 "local network or on the Internet."
@@ -151,17 +151,18 @@ msgstr ""
 "カル ネットワーク, インターネット上から利用できます。"
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:42
+#: en/netInstall-intro.xml:27
 msgid "Availability"
 msgstr "種類"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:44
-msgid "There a two versions of the NetInstall media:"
+#: en/netInstall-intro.xml:28
+#, fuzzy
+msgid "There are two versions of the NetInstall media:"
 msgstr "ネット インストール メディアには二つのバージョンがあります:"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:48
+#: en/netInstall-intro.xml:31
 msgid ""
 "<emphasis role=\"bold\">netinstall.iso</emphasis> For those who prefer not "
 "to use non-free software, this ISO contains only free software."
@@ -170,7 +171,7 @@ msgstr ""
 "用しないことを好む方々に向けたものとなります。"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:54
+#: en/netInstall-intro.xml:36
 msgid ""
 "<emphasis role=\"bold\">netinstall-nonfree.iso</emphasis> This ISO "
 "additionally includes proprietary device drivers, which may be required for "
@@ -181,7 +182,7 @@ msgstr ""
 "スク コントローラなどに必要となる可能性があります。"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:60
+#: en/netInstall-intro.xml:41
 msgid ""
 "Both versions are available in the form of separate 32-bit and 64-bit ISO's. "
 "See here: <link xlink:href=\"https://www.mageia.org/downloads/\">https://www."
@@ -192,12 +193,12 @@ msgstr ""
 "\">https://www.mageia.org/ja/downloads/</link>"
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:66
+#: en/netInstall-intro.xml:45
 msgid "Preparation"
 msgstr "準備"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:68
+#: en/netInstall-intro.xml:46
 msgid ""
 "After downloading the image, burn it to a CD/DVD or, if you prefer to put it "
 "on a USB stick, follow the instructions here: <link xlink:href=\"https://"
@@ -211,17 +212,17 @@ msgstr ""
 "wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISOs_on_an_USB_stick</link>"
 
 #. type: Content of: <section><section><title>
-#: en/netInstall-intro.xml:75
+#: en/netInstall-intro.xml:51
 msgid "Installation Stages"
 msgstr "インストールの段階"
 
 #. type: Content of: <section><section><para>
-#: en/netInstall-intro.xml:77
+#: en/netInstall-intro.xml:52
 msgid "The installation is carried out in two stages:"
 msgstr "インストールは二つの段階で行われます:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:81
+#: en/netInstall-intro.xml:55
 #, fuzzy
 msgid ""
 "<emphasis role=\"bold\">Stage 1</emphasis> This is the pre-Installation "
@@ -237,7 +238,7 @@ msgstr ""
 "続が有効化されます。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:91
+#: en/netInstall-intro.xml:64
 msgid ""
 "<emphasis role=\"bold\">Stage 2</emphasis> This is the actual Installation "
 "stage, which will automatically commence once a connection to the installer "
@@ -247,11 +248,12 @@ msgstr ""
 "インストーラのファイルに接続できしだい自動的に開始します。"
 
 #. type: Content of: <section><section><note><para>
-#: en/netInstall-intro.xml:98
+#: en/netInstall-intro.xml:70
+#, fuzzy
 msgid ""
 "During Stage 1, nothing will be written to your Hard Disk, so it is safe to "
 "quit at any point during Stage 1 if you wish. You can do so by pressing "
-"<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Del</keycap> </"
+"<keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Del</keycap></"
 "keycombo>."
 msgstr ""
 "Stage 1 の間は、お使いのハード ディスクには何も書き込まれないため、お望みであ"
@@ -260,10 +262,11 @@ msgstr ""
 "を押します。"
 
 #. type: Content of: <section><section><tip><para>
-#: en/netInstall-intro.xml:110
+#: en/netInstall-intro.xml:75
+#, fuzzy
 msgid ""
-"You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo> "
-"to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap> </"
+"You can use <keycombo><keycap>Alt</keycap><keycap>F3</keycap></keycombo> to "
+"read the logs and <keycombo><keycap>Alt</keycap><keycap>F1</keycap></"
 "keycombo> to return to the installer screen."
 msgstr ""
 "ログを参照するには <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </"
@@ -271,7 +274,7 @@ msgstr ""
 "<keycap>F1</keycap> </keycombo> を使用します。"
 
 #. type: Content of: <section><section><warning><para>
-#: en/netInstall-intro.xml:122
+#: en/netInstall-intro.xml:78
 #, fuzzy
 msgid ""
 "Unlike when installing from DVD or LiveCD, you will be asked to type things "
diff --git a/docs/docs/stable/bootiso/nb.po b/docs/docs/stable/bootiso/nb.po
index 47c0537a..df56a669 100644
--- a/docs/docs/stable/bootiso/nb.po
+++ b/docs/docs/stable/bootiso/nb.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia Boot ISO Help 6.0\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2020-12-20 15:06+0200\n"
+"POT-Creation-Date: 2020-12-20 16:01+0200\n"
 "PO-Revision-Date: 2017-04-04 18:35+0000\n"
 "Last-Translator: Karl Morten Ramberg <karl.m.ramberg@gmail.com>, 2020\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/MageiaLinux/"
@@ -98,27 +98,27 @@ msgid "Installing Mageia using a Tiny Boot Image"
 msgstr "Installer Mageia fra et Lite Boot Bilde"
 
 #. type: Content of: <section><title>
-#: en/netInstall-intro.xml:12
+#: en/netInstall-intro.xml:4
 msgid "Introduction"
 msgstr "Introduksjon"
 
 #. type: Content of: <section><section><title>
-#: en/netInstall-intro.xml:15
+#: en/netInstall-intro.xml:6
 msgid "NetInstall Media"
 msgstr "Mageia NettverksInstallering"
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:18
+#: en/netInstall-intro.xml:8
 msgid "Description"
 msgstr "Beskrivelse"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:20
+#: en/netInstall-intro.xml:9
 msgid "These minimal ISO's contain:"
 msgstr "Disse minimale ISOene inneholder:"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:24
+#: en/netInstall-intro.xml:12
 #, fuzzy
 msgid ""
 "less than 120 MB and are convenient if bandwidth is too low to download a "
@@ -130,7 +130,7 @@ msgstr ""
 "uten DVD-stasjon eller som ikke kan starte fra en USB-pinne."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:30
+#: en/netInstall-intro.xml:17
 #, fuzzy
 msgid ""
 "no more than that which is needed to (a) start the <literal>DrakX</literal> "
@@ -143,7 +143,7 @@ msgstr ""
 "installasjonen."
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:37
+#: en/netInstall-intro.xml:23
 msgid ""
 "The required source packages may be on a PC hard disk, a local drive, a "
 "local network or on the Internet."
@@ -152,17 +152,18 @@ msgstr ""
 "lokalt nettverk eller på Internett."
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:42
+#: en/netInstall-intro.xml:27
 msgid "Availability"
 msgstr "Tilgjengelighet"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:44
-msgid "There a two versions of the NetInstall media:"
+#: en/netInstall-intro.xml:28
+#, fuzzy
+msgid "There are two versions of the NetInstall media:"
 msgstr "Det er to versjoner av NettInstallasjons media:"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:48
+#: en/netInstall-intro.xml:31
 msgid ""
 "<emphasis role=\"bold\">netinstall.iso</emphasis> For those who prefer not "
 "to use non-free software, this ISO contains only free software."
@@ -172,7 +173,7 @@ msgstr ""
 "programvare."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:54
+#: en/netInstall-intro.xml:36
 msgid ""
 "<emphasis role=\"bold\">netinstall-nonfree.iso</emphasis> This ISO "
 "additionally includes proprietary device drivers, which may be required for "
@@ -183,7 +184,7 @@ msgstr ""
 "for nettverksenheten, diskkontrolleren etc."
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:60
+#: en/netInstall-intro.xml:41
 msgid ""
 "Both versions are available in the form of separate 32-bit and 64-bit ISO's. "
 "See here: <link xlink:href=\"https://www.mageia.org/downloads/\">https://www."
@@ -194,12 +195,12 @@ msgstr ""
 "\">https://www.mageia.org/downloads/</link>"
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:66
+#: en/netInstall-intro.xml:45
 msgid "Preparation"
 msgstr "Forberedelse"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:68
+#: en/netInstall-intro.xml:46
 msgid ""
 "After downloading the image, burn it to a CD/DVD or, if you prefer to put it "
 "on a USB stick, follow the instructions here: <link xlink:href=\"https://"
@@ -214,17 +215,17 @@ msgstr ""
 "org/en/Installation_Media#Dump_Mageia_ISOs_on_an_USB_stick </link>."
 
 #. type: Content of: <section><section><title>
-#: en/netInstall-intro.xml:75
+#: en/netInstall-intro.xml:51
 msgid "Installation Stages"
 msgstr "Installasjonstrinn"
 
 #. type: Content of: <section><section><para>
-#: en/netInstall-intro.xml:77
+#: en/netInstall-intro.xml:52
 msgid "The installation is carried out in two stages:"
 msgstr "Installasjonen skjer i to trinn:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:81
+#: en/netInstall-intro.xml:55
 #, fuzzy
 msgid ""
 "<emphasis role=\"bold\">Stage 1</emphasis> This is the pre-Installation "
@@ -240,7 +241,7 @@ msgstr ""
 "nettverksforbindelsen aktivert."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:91
+#: en/netInstall-intro.xml:64
 msgid ""
 "<emphasis role=\"bold\">Stage 2</emphasis> This is the actual Installation "
 "stage, which will automatically commence once a connection to the installer "
@@ -251,11 +252,12 @@ msgstr ""
 "installasjonsfilene er opprettet."
 
 #. type: Content of: <section><section><note><para>
-#: en/netInstall-intro.xml:98
+#: en/netInstall-intro.xml:70
+#, fuzzy
 msgid ""
 "During Stage 1, nothing will be written to your Hard Disk, so it is safe to "
 "quit at any point during Stage 1 if you wish. You can do so by pressing "
-"<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Del</keycap> </"
+"<keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Del</keycap></"
 "keycombo>."
 msgstr ""
 "I løpet av trinn 1 vil ingenting bli skrevet til harddisken din, så det er "
@@ -264,10 +266,11 @@ msgstr ""
 "keycap><keycap>Del</keycap></keycombo>."
 
 #. type: Content of: <section><section><tip><para>
-#: en/netInstall-intro.xml:110
+#: en/netInstall-intro.xml:75
+#, fuzzy
 msgid ""
-"You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo> "
-"to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap> </"
+"You can use <keycombo><keycap>Alt</keycap><keycap>F3</keycap></keycombo> to "
+"read the logs and <keycombo><keycap>Alt</keycap><keycap>F1</keycap></"
 "keycombo> to return to the installer screen."
 msgstr ""
 "Du kan bruke <keycombo><keycap>Alt</keycap><keycap> F3 </keycap></"
@@ -275,7 +278,7 @@ msgstr ""
 "keycap></keycombo>for å gå tilbake til installasjonsskjermbildet."
 
 #. type: Content of: <section><section><warning><para>
-#: en/netInstall-intro.xml:122
+#: en/netInstall-intro.xml:78
 #, fuzzy
 msgid ""
 "Unlike when installing from DVD or LiveCD, you will be asked to type things "
diff --git a/docs/docs/stable/bootiso/nl.po b/docs/docs/stable/bootiso/nl.po
index 802d5b7b..0ad491db 100644
--- a/docs/docs/stable/bootiso/nl.po
+++ b/docs/docs/stable/bootiso/nl.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia Boot ISO Help 6.0\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2020-12-20 15:06+0200\n"
+"POT-Creation-Date: 2020-12-20 16:01+0200\n"
 "PO-Revision-Date: 2017-04-04 18:35+0000\n"
 "Last-Translator: dragnadh, 2020\n"
 "Language-Team: Dutch (https://www.transifex.com/MageiaLinux/teams/9361/nl/)\n"
@@ -102,27 +102,27 @@ msgid "Installing Mageia using a Tiny Boot Image"
 msgstr "Installeer Mageia met een Tiny Boot Image"
 
 #. type: Content of: <section><title>
-#: en/netInstall-intro.xml:12
+#: en/netInstall-intro.xml:4
 msgid "Introduction"
 msgstr "Introductie"
 
 #. type: Content of: <section><section><title>
-#: en/netInstall-intro.xml:15
+#: en/netInstall-intro.xml:6
 msgid "NetInstall Media"
 msgstr "Netinstallatie-media"
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:18
+#: en/netInstall-intro.xml:8
 msgid "Description"
 msgstr "Beschrijving"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:20
+#: en/netInstall-intro.xml:9
 msgid "These minimal ISO's contain:"
 msgstr "Deze minimale ISO's bevatten:"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:24
+#: en/netInstall-intro.xml:12
 #, fuzzy
 msgid ""
 "less than 120 MB and are convenient if bandwidth is too low to download a "
@@ -134,7 +134,7 @@ msgstr ""
 "niet kan opstarten vanaf een USB-stick."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:30
+#: en/netInstall-intro.xml:17
 #, fuzzy
 msgid ""
 "no more than that which is needed to (a) start the <literal>DrakX</literal> "
@@ -147,7 +147,7 @@ msgstr ""
 "installatie voort te zetten en te voltooien."
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:37
+#: en/netInstall-intro.xml:23
 msgid ""
 "The required source packages may be on a PC hard disk, a local drive, a "
 "local network or on the Internet."
@@ -156,17 +156,18 @@ msgstr ""
 "station, een lokaal netwerk of op het internet staan."
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:42
+#: en/netInstall-intro.xml:27
 msgid "Availability"
 msgstr "Beschikbaarheid"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:44
-msgid "There a two versions of the NetInstall media:"
+#: en/netInstall-intro.xml:28
+#, fuzzy
+msgid "There are two versions of the NetInstall media:"
 msgstr "Er zijn twee versies van de NetInstall media:"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:48
+#: en/netInstall-intro.xml:31
 msgid ""
 "<emphasis role=\"bold\">netinstall.iso</emphasis> For those who prefer not "
 "to use non-free software, this ISO contains only free software."
@@ -175,7 +176,7 @@ msgstr ""
 "geen niet-vrije software gebruiken, bevat deze ISO alleen vrije software."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:54
+#: en/netInstall-intro.xml:36
 msgid ""
 "<emphasis role=\"bold\">netinstall-nonfree.iso</emphasis> This ISO "
 "additionally includes proprietary device drivers, which may be required for "
@@ -186,7 +187,7 @@ msgstr ""
 "netwerkapparaat, schijfbeheerder, enz.       "
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:60
+#: en/netInstall-intro.xml:41
 msgid ""
 "Both versions are available in the form of separate 32-bit and 64-bit ISO's. "
 "See here: <link xlink:href=\"https://www.mageia.org/downloads/\">https://www."
@@ -197,12 +198,12 @@ msgstr ""
 "downloads/\">https://www.mageia.org/downloads/</link>"
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:66
+#: en/netInstall-intro.xml:45
 msgid "Preparation"
 msgstr "Voorbereiding"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:68
+#: en/netInstall-intro.xml:46
 msgid ""
 "After downloading the image, burn it to a CD/DVD or, if you prefer to put it "
 "on a USB stick, follow the instructions here: <link xlink:href=\"https://"
@@ -217,17 +218,17 @@ msgstr ""
 "org/en/Installation_Media#Dump_Mageia_ISOs_on_an_USB_stick</link>"
 
 #. type: Content of: <section><section><title>
-#: en/netInstall-intro.xml:75
+#: en/netInstall-intro.xml:51
 msgid "Installation Stages"
 msgstr "Installatie fasen"
 
 #. type: Content of: <section><section><para>
-#: en/netInstall-intro.xml:77
+#: en/netInstall-intro.xml:52
 msgid "The installation is carried out in two stages:"
 msgstr "De installatie wordt uitgevoerd in twee fasen:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:81
+#: en/netInstall-intro.xml:55
 #, fuzzy
 msgid ""
 "<emphasis role=\"bold\">Stage 1</emphasis> This is the pre-Installation "
@@ -243,7 +244,7 @@ msgstr ""
 "de methode een server betreft, dan wordt de netwerkverbinding geactiveerd."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:91
+#: en/netInstall-intro.xml:64
 msgid ""
 "<emphasis role=\"bold\">Stage 2</emphasis> This is the actual Installation "
 "stage, which will automatically commence once a connection to the installer "
@@ -254,11 +255,12 @@ msgstr ""
 "installatiebestanden tot stand is gebracht."
 
 #. type: Content of: <section><section><note><para>
-#: en/netInstall-intro.xml:98
+#: en/netInstall-intro.xml:70
+#, fuzzy
 msgid ""
 "During Stage 1, nothing will be written to your Hard Disk, so it is safe to "
 "quit at any point during Stage 1 if you wish. You can do so by pressing "
-"<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Del</keycap> </"
+"<keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Del</keycap></"
 "keycombo>."
 msgstr ""
 "Tijdens fase 1, zal er niets geschreven worden op uw harde schijf, dus het "
@@ -267,10 +269,11 @@ msgstr ""
 "keycombo> in te drukken."
 
 #. type: Content of: <section><section><tip><para>
-#: en/netInstall-intro.xml:110
+#: en/netInstall-intro.xml:75
+#, fuzzy
 msgid ""
-"You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo> "
-"to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap> </"
+"You can use <keycombo><keycap>Alt</keycap><keycap>F3</keycap></keycombo> to "
+"read the logs and <keycombo><keycap>Alt</keycap><keycap>F1</keycap></"
 "keycombo> to return to the installer screen."
 msgstr ""
 "U kunt <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo> "
@@ -279,7 +282,7 @@ msgstr ""
 "installatiescherm."
 
 #. type: Content of: <section><section><warning><para>
-#: en/netInstall-intro.xml:122
+#: en/netInstall-intro.xml:78
 #, fuzzy
 msgid ""
 "Unlike when installing from DVD or LiveCD, you will be asked to type things "
diff --git a/docs/docs/stable/bootiso/pl.po b/docs/docs/stable/bootiso/pl.po
index b62753a6..27eb2101 100644
--- a/docs/docs/stable/bootiso/pl.po
+++ b/docs/docs/stable/bootiso/pl.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia Boot ISO Help 6.0\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2020-12-20 15:06+0200\n"
+"POT-Creation-Date: 2020-12-20 16:01+0200\n"
 "PO-Revision-Date: 2017-04-04 18:35+0000\n"
 "Last-Translator: Szymon Scholz <szymonscholz@gmail.com>, 2019\n"
 "Language-Team: Polish (https://www.transifex.com/MageiaLinux/teams/9361/"
@@ -97,27 +97,27 @@ msgid "Installing Mageia using a Tiny Boot Image"
 msgstr ""
 
 #. type: Content of: <section><title>
-#: en/netInstall-intro.xml:12
+#: en/netInstall-intro.xml:4
 msgid "Introduction"
 msgstr "Wprowadzenie"
 
 #. type: Content of: <section><section><title>
-#: en/netInstall-intro.xml:15
+#: en/netInstall-intro.xml:6
 msgid "NetInstall Media"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:18
+#: en/netInstall-intro.xml:8
 msgid "Description"
 msgstr "Opis"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:20
+#: en/netInstall-intro.xml:9
 msgid "These minimal ISO's contain:"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:24
+#: en/netInstall-intro.xml:12
 msgid ""
 "less than 120 MB and are convenient if bandwidth is too low to download a "
 "full DVD, or if you have a PC without a DVD drive or unable to boot from a "
@@ -125,7 +125,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:30
+#: en/netInstall-intro.xml:17
 msgid ""
 "no more than that which is needed to (a) start the <literal>DrakX</literal> "
 "installer and (b) find <literal>DrakX-installer-stage2</literal> and other "
@@ -133,24 +133,25 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:37
+#: en/netInstall-intro.xml:23
 msgid ""
 "The required source packages may be on a PC hard disk, a local drive, a "
 "local network or on the Internet."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:42
+#: en/netInstall-intro.xml:27
 msgid "Availability"
 msgstr "Dostępność"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:44
-msgid "There a two versions of the NetInstall media:"
+#: en/netInstall-intro.xml:28
+#, fuzzy
+msgid "There are two versions of the NetInstall media:"
 msgstr "Istnieją dwie wersje Instalacji Sieciowej:"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:48
+#: en/netInstall-intro.xml:31
 msgid ""
 "<emphasis role=\"bold\">netinstall.iso</emphasis> For those who prefer not "
 "to use non-free software, this ISO contains only free software."
@@ -160,7 +161,7 @@ msgstr ""
 "oprogramowanie."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:54
+#: en/netInstall-intro.xml:36
 msgid ""
 "<emphasis role=\"bold\">netinstall-nonfree.iso</emphasis> This ISO "
 "additionally includes proprietary device drivers, which may be required for "
@@ -168,7 +169,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:60
+#: en/netInstall-intro.xml:41
 msgid ""
 "Both versions are available in the form of separate 32-bit and 64-bit ISO's. "
 "See here: <link xlink:href=\"https://www.mageia.org/downloads/\">https://www."
@@ -176,12 +177,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:66
+#: en/netInstall-intro.xml:45
 msgid "Preparation"
 msgstr "Przygotowanie"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:68
+#: en/netInstall-intro.xml:46
 msgid ""
 "After downloading the image, burn it to a CD/DVD or, if you prefer to put it "
 "on a USB stick, follow the instructions here: <link xlink:href=\"https://"
@@ -191,17 +192,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/netInstall-intro.xml:75
+#: en/netInstall-intro.xml:51
 msgid "Installation Stages"
 msgstr "Etapy Instalacji"
 
 #. type: Content of: <section><section><para>
-#: en/netInstall-intro.xml:77
+#: en/netInstall-intro.xml:52
 msgid "The installation is carried out in two stages:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:81
+#: en/netInstall-intro.xml:55
 msgid ""
 "<emphasis role=\"bold\">Stage 1</emphasis> This is the pre-Installation "
 "stage. You will need to provide the method and details for accessing the "
@@ -212,7 +213,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:91
+#: en/netInstall-intro.xml:64
 msgid ""
 "<emphasis role=\"bold\">Stage 2</emphasis> This is the actual Installation "
 "stage, which will automatically commence once a connection to the installer "
@@ -220,24 +221,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/netInstall-intro.xml:98
+#: en/netInstall-intro.xml:70
 msgid ""
 "During Stage 1, nothing will be written to your Hard Disk, so it is safe to "
 "quit at any point during Stage 1 if you wish. You can do so by pressing "
-"<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Del</keycap> </"
+"<keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Del</keycap></"
 "keycombo>."
 msgstr ""
 
 #. type: Content of: <section><section><tip><para>
-#: en/netInstall-intro.xml:110
+#: en/netInstall-intro.xml:75
 msgid ""
-"You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo> "
-"to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap> </"
+"You can use <keycombo><keycap>Alt</keycap><keycap>F3</keycap></keycombo> to "
+"read the logs and <keycombo><keycap>Alt</keycap><keycap>F1</keycap></"
 "keycombo> to return to the installer screen."
 msgstr ""
 
 #. type: Content of: <section><section><warning><para>
-#: en/netInstall-intro.xml:122
+#: en/netInstall-intro.xml:78
 msgid ""
 "Unlike when installing from DVD or LiveCD, you will be asked to type things "
 "during the first part of a Network installation (<emphasis role=\"bold"
diff --git a/docs/docs/stable/bootiso/pt.po b/docs/docs/stable/bootiso/pt.po
index def351eb..a3147cec 100644
--- a/docs/docs/stable/bootiso/pt.po
+++ b/docs/docs/stable/bootiso/pt.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia Boot ISO Help 6.0\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2020-12-20 15:06+0200\n"
+"POT-Creation-Date: 2020-12-20 16:01+0200\n"
 "PO-Revision-Date: 2017-04-04 18:35+0000\n"
 "Last-Translator: Sérgio Marques <smarquespt@gmail.com>, 2019\n"
 "Language-Team: Portuguese (https://www.transifex.com/MageiaLinux/teams/9361/"
@@ -102,27 +102,27 @@ msgid "Installing Mageia using a Tiny Boot Image"
 msgstr "Instalar Mageia utilizando uma imagem de arranque"
 
 #. type: Content of: <section><title>
-#: en/netInstall-intro.xml:12
+#: en/netInstall-intro.xml:4
 msgid "Introduction"
 msgstr "Introdução"
 
 #. type: Content of: <section><section><title>
-#: en/netInstall-intro.xml:15
+#: en/netInstall-intro.xml:6
 msgid "NetInstall Media"
 msgstr "NetInstall Media"
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:18
+#: en/netInstall-intro.xml:8
 msgid "Description"
 msgstr "Descrição"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:20
+#: en/netInstall-intro.xml:9
 msgid "These minimal ISO's contain:"
 msgstr "Estes ISO têm:"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:24
+#: en/netInstall-intro.xml:12
 #, fuzzy
 msgid ""
 "less than 120 MB and are convenient if bandwidth is too low to download a "
@@ -134,7 +134,7 @@ msgstr ""
 "consigam arrancar através de uma unidade USB."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:30
+#: en/netInstall-intro.xml:17
 #, fuzzy
 msgid ""
 "no more than that which is needed to (a) start the <literal>DrakX</literal> "
@@ -147,7 +147,7 @@ msgstr ""
 "realizar a instalação."
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:37
+#: en/netInstall-intro.xml:23
 msgid ""
 "The required source packages may be on a PC hard disk, a local drive, a "
 "local network or on the Internet."
@@ -156,24 +156,25 @@ msgstr ""
 "numa unidade externa, na rede local ou na Internet."
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:42
+#: en/netInstall-intro.xml:27
 msgid "Availability"
 msgstr "Disponibilidade"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:44
-msgid "There a two versions of the NetInstall media:"
+#: en/netInstall-intro.xml:28
+#, fuzzy
+msgid "There are two versions of the NetInstall media:"
 msgstr "Existem duas versões do disco NetInstall:"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:48
+#: en/netInstall-intro.xml:31
 msgid ""
 "<emphasis role=\"bold\">netinstall.iso</emphasis> For those who prefer not "
 "to use non-free software, this ISO contains only free software."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:54
+#: en/netInstall-intro.xml:36
 msgid ""
 "<emphasis role=\"bold\">netinstall-nonfree.iso</emphasis> This ISO "
 "additionally includes proprietary device drivers, which may be required for "
@@ -181,7 +182,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:60
+#: en/netInstall-intro.xml:41
 msgid ""
 "Both versions are available in the form of separate 32-bit and 64-bit ISO's. "
 "See here: <link xlink:href=\"https://www.mageia.org/downloads/\">https://www."
@@ -189,12 +190,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:66
+#: en/netInstall-intro.xml:45
 msgid "Preparation"
 msgstr "Preparação"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:68
+#: en/netInstall-intro.xml:46
 msgid ""
 "After downloading the image, burn it to a CD/DVD or, if you prefer to put it "
 "on a USB stick, follow the instructions here: <link xlink:href=\"https://"
@@ -204,17 +205,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/netInstall-intro.xml:75
+#: en/netInstall-intro.xml:51
 msgid "Installation Stages"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/netInstall-intro.xml:77
+#: en/netInstall-intro.xml:52
 msgid "The installation is carried out in two stages:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:81
+#: en/netInstall-intro.xml:55
 msgid ""
 "<emphasis role=\"bold\">Stage 1</emphasis> This is the pre-Installation "
 "stage. You will need to provide the method and details for accessing the "
@@ -225,7 +226,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:91
+#: en/netInstall-intro.xml:64
 msgid ""
 "<emphasis role=\"bold\">Stage 2</emphasis> This is the actual Installation "
 "stage, which will automatically commence once a connection to the installer "
@@ -233,24 +234,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/netInstall-intro.xml:98
+#: en/netInstall-intro.xml:70
 msgid ""
 "During Stage 1, nothing will be written to your Hard Disk, so it is safe to "
 "quit at any point during Stage 1 if you wish. You can do so by pressing "
-"<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Del</keycap> </"
+"<keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Del</keycap></"
 "keycombo>."
 msgstr ""
 
 #. type: Content of: <section><section><tip><para>
-#: en/netInstall-intro.xml:110
+#: en/netInstall-intro.xml:75
 msgid ""
-"You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo> "
-"to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap> </"
+"You can use <keycombo><keycap>Alt</keycap><keycap>F3</keycap></keycombo> to "
+"read the logs and <keycombo><keycap>Alt</keycap><keycap>F1</keycap></"
 "keycombo> to return to the installer screen."
 msgstr ""
 
 #. type: Content of: <section><section><warning><para>
-#: en/netInstall-intro.xml:122
+#: en/netInstall-intro.xml:78
 msgid ""
 "Unlike when installing from DVD or LiveCD, you will be asked to type things "
 "during the first part of a Network installation (<emphasis role=\"bold"
diff --git a/docs/docs/stable/bootiso/pt_BR.po b/docs/docs/stable/bootiso/pt_BR.po
index 5db58d71..cde90f19 100644
--- a/docs/docs/stable/bootiso/pt_BR.po
+++ b/docs/docs/stable/bootiso/pt_BR.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia Boot ISO Help 6.0\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2020-12-20 15:06+0200\n"
+"POT-Creation-Date: 2020-12-20 16:01+0200\n"
 "PO-Revision-Date: 2017-04-04 18:35+0000\n"
 "Last-Translator: Marcio Andre Padula <padula1000@gmail.com>, 2019\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/MageiaLinux/"
@@ -100,27 +100,27 @@ msgid "Installing Mageia using a Tiny Boot Image"
 msgstr "Instalando o Mageia usando uma imagem de inicialização minúscula"
 
 #. type: Content of: <section><title>
-#: en/netInstall-intro.xml:12
+#: en/netInstall-intro.xml:4
 msgid "Introduction"
 msgstr "Introdução"
 
 #. type: Content of: <section><section><title>
-#: en/netInstall-intro.xml:15
+#: en/netInstall-intro.xml:6
 msgid "NetInstall Media"
 msgstr "NetInstall Media"
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:18
+#: en/netInstall-intro.xml:8
 msgid "Description"
 msgstr "Descrição"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:20
+#: en/netInstall-intro.xml:9
 msgid "These minimal ISO's contain:"
 msgstr "Essas ISOs mínimas contêm:"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:24
+#: en/netInstall-intro.xml:12
 #, fuzzy
 msgid ""
 "less than 120 MB and are convenient if bandwidth is too low to download a "
@@ -132,7 +132,7 @@ msgstr ""
 "ou não conseguir inicializar a partir de um pendrive."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:30
+#: en/netInstall-intro.xml:17
 #, fuzzy
 msgid ""
 "no more than that which is needed to (a) start the <literal>DrakX</literal> "
@@ -144,7 +144,7 @@ msgstr ""
 "e outros pacotes que são necessários para continuar e completar a instalação."
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:37
+#: en/netInstall-intro.xml:23
 msgid ""
 "The required source packages may be on a PC hard disk, a local drive, a "
 "local network or on the Internet."
@@ -153,17 +153,18 @@ msgstr ""
 "unidade local, uma rede local ou na Internet."
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:42
+#: en/netInstall-intro.xml:27
 msgid "Availability"
 msgstr "Disponibilidade"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:44
-msgid "There a two versions of the NetInstall media:"
+#: en/netInstall-intro.xml:28
+#, fuzzy
+msgid "There are two versions of the NetInstall media:"
 msgstr "Existem duas versões da mídia NetInstall:"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:48
+#: en/netInstall-intro.xml:31
 msgid ""
 "<emphasis role=\"bold\">netinstall.iso</emphasis> For those who prefer not "
 "to use non-free software, this ISO contains only free software."
@@ -172,7 +173,7 @@ msgstr ""
 "não usar software não-livre, este ISO contém somente software livre."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:54
+#: en/netInstall-intro.xml:36
 msgid ""
 "<emphasis role=\"bold\">netinstall-nonfree.iso</emphasis> This ISO "
 "additionally includes proprietary device drivers, which may be required for "
@@ -183,7 +184,7 @@ msgstr ""
 "necessários para o seu dispositivo de rede, controlador de disco, etc."
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:60
+#: en/netInstall-intro.xml:41
 msgid ""
 "Both versions are available in the form of separate 32-bit and 64-bit ISO's. "
 "See here: <link xlink:href=\"https://www.mageia.org/downloads/\">https://www."
@@ -194,12 +195,12 @@ msgstr ""
 "\">https://www.mageia.org/downloads/</link>"
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:66
+#: en/netInstall-intro.xml:45
 msgid "Preparation"
 msgstr "preparação"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:68
+#: en/netInstall-intro.xml:46
 msgid ""
 "After downloading the image, burn it to a CD/DVD or, if you prefer to put it "
 "on a USB stick, follow the instructions here: <link xlink:href=\"https://"
@@ -213,17 +214,17 @@ msgstr ""
 "mageia.org/en/Installation_Media#Dump_Mageia_ISOs_on_an_USB_stick</link>"
 
 #. type: Content of: <section><section><title>
-#: en/netInstall-intro.xml:75
+#: en/netInstall-intro.xml:51
 msgid "Installation Stages"
 msgstr "Estágios de Instalação"
 
 #. type: Content of: <section><section><para>
-#: en/netInstall-intro.xml:77
+#: en/netInstall-intro.xml:52
 msgid "The installation is carried out in two stages:"
 msgstr "A instalação é realizada em duas etapas:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:81
+#: en/netInstall-intro.xml:55
 #, fuzzy
 msgid ""
 "<emphasis role=\"bold\">Stage 1</emphasis> This is the pre-Installation "
@@ -239,7 +240,7 @@ msgstr ""
 "servidor, então uma conexão com a rede deverá ser ativada."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:91
+#: en/netInstall-intro.xml:64
 msgid ""
 "<emphasis role=\"bold\">Stage 2</emphasis> This is the actual Installation "
 "stage, which will automatically commence once a connection to the installer "
@@ -250,11 +251,12 @@ msgstr ""
 "instalação."
 
 #. type: Content of: <section><section><note><para>
-#: en/netInstall-intro.xml:98
+#: en/netInstall-intro.xml:70
+#, fuzzy
 msgid ""
 "During Stage 1, nothing will be written to your Hard Disk, so it is safe to "
 "quit at any point during Stage 1 if you wish. You can do so by pressing "
-"<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Del</keycap> </"
+"<keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Del</keycap></"
 "keycombo>."
 msgstr ""
 "Durante a Etapa 1, nada será escrito no seu Disco Rígido, então é seguro "
@@ -263,10 +265,11 @@ msgstr ""
 "keycap><keycap>Del</keycap></keycombo>."
 
 #. type: Content of: <section><section><tip><para>
-#: en/netInstall-intro.xml:110
+#: en/netInstall-intro.xml:75
+#, fuzzy
 msgid ""
-"You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo> "
-"to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap> </"
+"You can use <keycombo><keycap>Alt</keycap><keycap>F3</keycap></keycombo> to "
+"read the logs and <keycombo><keycap>Alt</keycap><keycap>F1</keycap></"
 "keycombo> to return to the installer screen."
 msgstr ""
 "Você pode usar <keycombo><keycap>Alt </keycap><keycap>F3</keycap></keycombo> "
@@ -274,7 +277,7 @@ msgstr ""
 "keycombo> para retornar a tela de instalação."
 
 #. type: Content of: <section><section><warning><para>
-#: en/netInstall-intro.xml:122
+#: en/netInstall-intro.xml:78
 #, fuzzy
 msgid ""
 "Unlike when installing from DVD or LiveCD, you will be asked to type things "
diff --git a/docs/docs/stable/bootiso/ru.po b/docs/docs/stable/bootiso/ru.po
index 000ca7e1..295fc3ff 100644
--- a/docs/docs/stable/bootiso/ru.po
+++ b/docs/docs/stable/bootiso/ru.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia Boot ISO Help 6.0\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2020-12-20 15:06+0200\n"
+"POT-Creation-Date: 2020-12-20 16:01+0200\n"
 "PO-Revision-Date: 2017-04-04 18:35+0000\n"
 "Last-Translator: AlexL <loginov.alex.valer@gmail.com>, 2019\n"
 "Language-Team: Russian (https://www.transifex.com/MageiaLinux/teams/9361/"
@@ -102,27 +102,27 @@ msgid "Installing Mageia using a Tiny Boot Image"
 msgstr "Установка Mageia с маленького загрузочного образа"
 
 #. type: Content of: <section><title>
-#: en/netInstall-intro.xml:12
+#: en/netInstall-intro.xml:4
 msgid "Introduction"
 msgstr "Введение"
 
 #. type: Content of: <section><section><title>
-#: en/netInstall-intro.xml:15
+#: en/netInstall-intro.xml:6
 msgid "NetInstall Media"
 msgstr "Носители NetInstall"
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:18
+#: en/netInstall-intro.xml:8
 msgid "Description"
 msgstr "Описание"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:20
+#: en/netInstall-intro.xml:9
 msgid "These minimal ISO's contain:"
 msgstr "Эти минималистичные образы ISO имеют следующие характеристики:"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:24
+#: en/netInstall-intro.xml:12
 #, fuzzy
 msgid ""
 "less than 120 MB and are convenient if bandwidth is too low to download a "
@@ -135,7 +135,7 @@ msgstr ""
 "диска USB."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:30
+#: en/netInstall-intro.xml:17
 #, fuzzy
 msgid ""
 "no more than that which is needed to (a) start the <literal>DrakX</literal> "
@@ -148,7 +148,7 @@ msgstr ""
 "для продолжения и завершения установки системы."
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:37
+#: en/netInstall-intro.xml:23
 msgid ""
 "The required source packages may be on a PC hard disk, a local drive, a "
 "local network or on the Internet."
@@ -157,17 +157,18 @@ msgstr ""
 "локальном диске, диске в локальной сети или сервере в интернете."
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:42
+#: en/netInstall-intro.xml:27
 msgid "Availability"
 msgstr "Доступность"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:44
-msgid "There a two versions of the NetInstall media:"
+#: en/netInstall-intro.xml:28
+#, fuzzy
+msgid "There are two versions of the NetInstall media:"
 msgstr "Предусмотрены две версии носителя NetInstall:"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:48
+#: en/netInstall-intro.xml:31
 msgid ""
 "<emphasis role=\"bold\">netinstall.iso</emphasis> For those who prefer not "
 "to use non-free software, this ISO contains only free software."
@@ -177,7 +178,7 @@ msgstr ""
 "образе содержится только свободное программное обеспечение."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:54
+#: en/netInstall-intro.xml:36
 msgid ""
 "<emphasis role=\"bold\">netinstall-nonfree.iso</emphasis> This ISO "
 "additionally includes proprietary device drivers, which may be required for "
@@ -189,7 +190,7 @@ msgstr ""
 "дисков или, возможно, другого устройства."
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:60
+#: en/netInstall-intro.xml:41
 msgid ""
 "Both versions are available in the form of separate 32-bit and 64-bit ISO's. "
 "See here: <link xlink:href=\"https://www.mageia.org/downloads/\">https://www."
@@ -201,12 +202,12 @@ msgstr ""
 "link>"
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:66
+#: en/netInstall-intro.xml:45
 msgid "Preparation"
 msgstr "Подготовка"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:68
+#: en/netInstall-intro.xml:46
 msgid ""
 "After downloading the image, burn it to a CD/DVD or, if you prefer to put it "
 "on a USB stick, follow the instructions here: <link xlink:href=\"https://"
@@ -221,17 +222,17 @@ msgstr ""
 "Installation_Media#Dump_Mageia_ISOs_on_an_USB_stick</link>"
 
 #. type: Content of: <section><section><title>
-#: en/netInstall-intro.xml:75
+#: en/netInstall-intro.xml:51
 msgid "Installation Stages"
 msgstr "Этапы установки"
 
 #. type: Content of: <section><section><para>
-#: en/netInstall-intro.xml:77
+#: en/netInstall-intro.xml:52
 msgid "The installation is carried out in two stages:"
 msgstr "Установка выполняется в два этапа:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:81
+#: en/netInstall-intro.xml:55
 #, fuzzy
 msgid ""
 "<emphasis role=\"bold\">Stage 1</emphasis> This is the pre-Installation "
@@ -248,7 +249,7 @@ msgstr ""
 "соединения с сетью."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:91
+#: en/netInstall-intro.xml:64
 msgid ""
 "<emphasis role=\"bold\">Stage 2</emphasis> This is the actual Installation "
 "stage, which will automatically commence once a connection to the installer "
@@ -259,11 +260,12 @@ msgstr ""
 "файлов пакетов."
 
 #. type: Content of: <section><section><note><para>
-#: en/netInstall-intro.xml:98
+#: en/netInstall-intro.xml:70
+#, fuzzy
 msgid ""
 "During Stage 1, nothing will be written to your Hard Disk, so it is safe to "
 "quit at any point during Stage 1 if you wish. You can do so by pressing "
-"<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Del</keycap> </"
+"<keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Del</keycap></"
 "keycombo>."
 msgstr ""
 "Во время Этапа 1, на диск вашей системы не будет записано никаких данных, "
@@ -272,10 +274,11 @@ msgstr ""
 "<keycap>Alt</keycap> <keycap>Del</keycap></keycombo>."
 
 #. type: Content of: <section><section><tip><para>
-#: en/netInstall-intro.xml:110
+#: en/netInstall-intro.xml:75
+#, fuzzy
 msgid ""
-"You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo> "
-"to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap> </"
+"You can use <keycombo><keycap>Alt</keycap><keycap>F3</keycap></keycombo> to "
+"read the logs and <keycombo><keycap>Alt</keycap><keycap>F1</keycap></"
 "keycombo> to return to the installer screen."
 msgstr ""
 "Вы можете воспользоваться нажатием комбинации клавиш <keycombo><keycap>Alt</"
@@ -284,7 +287,7 @@ msgstr ""
 "keycap><keycap>F1</keycap></keycombo>, чтобы вернуться к экрану установки."
 
 #. type: Content of: <section><section><warning><para>
-#: en/netInstall-intro.xml:122
+#: en/netInstall-intro.xml:78
 #, fuzzy
 msgid ""
 "Unlike when installing from DVD or LiveCD, you will be asked to type things "
diff --git a/docs/docs/stable/bootiso/sl.po b/docs/docs/stable/bootiso/sl.po
index 9579baf6..4aa62740 100644
--- a/docs/docs/stable/bootiso/sl.po
+++ b/docs/docs/stable/bootiso/sl.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia Boot ISO Help 6.0\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2020-12-20 15:06+0200\n"
+"POT-Creation-Date: 2020-12-20 16:01+0200\n"
 "PO-Revision-Date: 2017-04-04 18:35+0000\n"
 "Last-Translator: Filip Komar <filip.komar@guest.arnes.si>, 2020\n"
 "Language-Team: Slovenian (https://www.transifex.com/MageiaLinux/teams/9361/"
@@ -98,27 +98,27 @@ msgid "Installing Mageia using a Tiny Boot Image"
 msgstr "Namestitev z majhno datoteko odtisa diska"
 
 #. type: Content of: <section><title>
-#: en/netInstall-intro.xml:12
+#: en/netInstall-intro.xml:4
 msgid "Introduction"
 msgstr "Predstavitev"
 
 #. type: Content of: <section><section><title>
-#: en/netInstall-intro.xml:15
+#: en/netInstall-intro.xml:6
 msgid "NetInstall Media"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:18
+#: en/netInstall-intro.xml:8
 msgid "Description"
 msgstr "Opis"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:20
+#: en/netInstall-intro.xml:9
 msgid "These minimal ISO's contain:"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:24
+#: en/netInstall-intro.xml:12
 msgid ""
 "less than 120 MB and are convenient if bandwidth is too low to download a "
 "full DVD, or if you have a PC without a DVD drive or unable to boot from a "
@@ -126,7 +126,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:30
+#: en/netInstall-intro.xml:17
 msgid ""
 "no more than that which is needed to (a) start the <literal>DrakX</literal> "
 "installer and (b) find <literal>DrakX-installer-stage2</literal> and other "
@@ -134,31 +134,32 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:37
+#: en/netInstall-intro.xml:23
 msgid ""
 "The required source packages may be on a PC hard disk, a local drive, a "
 "local network or on the Internet."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:42
+#: en/netInstall-intro.xml:27
 msgid "Availability"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:44
-msgid "There a two versions of the NetInstall media:"
+#: en/netInstall-intro.xml:28
+#, fuzzy
+msgid "There are two versions of the NetInstall media:"
 msgstr "Obstajata dve verziji omrežnih namestitvenih medijev:"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:48
+#: en/netInstall-intro.xml:31
 msgid ""
 "<emphasis role=\"bold\">netinstall.iso</emphasis> For those who prefer not "
 "to use non-free software, this ISO contains only free software."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:54
+#: en/netInstall-intro.xml:36
 msgid ""
 "<emphasis role=\"bold\">netinstall-nonfree.iso</emphasis> This ISO "
 "additionally includes proprietary device drivers, which may be required for "
@@ -166,7 +167,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:60
+#: en/netInstall-intro.xml:41
 msgid ""
 "Both versions are available in the form of separate 32-bit and 64-bit ISO's. "
 "See here: <link xlink:href=\"https://www.mageia.org/downloads/\">https://www."
@@ -174,12 +175,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:66
+#: en/netInstall-intro.xml:45
 msgid "Preparation"
 msgstr "Priprava"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:68
+#: en/netInstall-intro.xml:46
 msgid ""
 "After downloading the image, burn it to a CD/DVD or, if you prefer to put it "
 "on a USB stick, follow the instructions here: <link xlink:href=\"https://"
@@ -189,17 +190,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/netInstall-intro.xml:75
+#: en/netInstall-intro.xml:51
 msgid "Installation Stages"
 msgstr "Koraki namestitve"
 
 #. type: Content of: <section><section><para>
-#: en/netInstall-intro.xml:77
+#: en/netInstall-intro.xml:52
 msgid "The installation is carried out in two stages:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:81
+#: en/netInstall-intro.xml:55
 msgid ""
 "<emphasis role=\"bold\">Stage 1</emphasis> This is the pre-Installation "
 "stage. You will need to provide the method and details for accessing the "
@@ -210,7 +211,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:91
+#: en/netInstall-intro.xml:64
 msgid ""
 "<emphasis role=\"bold\">Stage 2</emphasis> This is the actual Installation "
 "stage, which will automatically commence once a connection to the installer "
@@ -218,24 +219,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/netInstall-intro.xml:98
+#: en/netInstall-intro.xml:70
 msgid ""
 "During Stage 1, nothing will be written to your Hard Disk, so it is safe to "
 "quit at any point during Stage 1 if you wish. You can do so by pressing "
-"<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Del</keycap> </"
+"<keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Del</keycap></"
 "keycombo>."
 msgstr ""
 
 #. type: Content of: <section><section><tip><para>
-#: en/netInstall-intro.xml:110
+#: en/netInstall-intro.xml:75
 msgid ""
-"You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo> "
-"to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap> </"
+"You can use <keycombo><keycap>Alt</keycap><keycap>F3</keycap></keycombo> to "
+"read the logs and <keycombo><keycap>Alt</keycap><keycap>F1</keycap></"
 "keycombo> to return to the installer screen."
 msgstr ""
 
 #. type: Content of: <section><section><warning><para>
-#: en/netInstall-intro.xml:122
+#: en/netInstall-intro.xml:78
 msgid ""
 "Unlike when installing from DVD or LiveCD, you will be asked to type things "
 "during the first part of a Network installation (<emphasis role=\"bold"
diff --git a/docs/docs/stable/bootiso/sq.po b/docs/docs/stable/bootiso/sq.po
index f11933ed..8a0be2c8 100644
--- a/docs/docs/stable/bootiso/sq.po
+++ b/docs/docs/stable/bootiso/sq.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia Boot ISO Help 6.0\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2020-12-20 15:06+0200\n"
+"POT-Creation-Date: 2020-12-20 16:01+0200\n"
 "PO-Revision-Date: 2017-04-04 18:35+0000\n"
 "Last-Translator: Ardit Dani <ardit.dani@gmail.com>, 2019\n"
 "Language-Team: Albanian (https://www.transifex.com/MageiaLinux/teams/9361/"
@@ -97,27 +97,27 @@ msgid "Installing Mageia using a Tiny Boot Image"
 msgstr "Instalimi Mageia  me një Imazh të Vogël Ndezës"
 
 #. type: Content of: <section><title>
-#: en/netInstall-intro.xml:12
+#: en/netInstall-intro.xml:4
 msgid "Introduction"
 msgstr "Paraqitje"
 
 #. type: Content of: <section><section><title>
-#: en/netInstall-intro.xml:15
+#: en/netInstall-intro.xml:6
 msgid "NetInstall Media"
 msgstr "NetInstall Media"
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:18
+#: en/netInstall-intro.xml:8
 msgid "Description"
 msgstr "Përshkrimi"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:20
+#: en/netInstall-intro.xml:9
 msgid "These minimal ISO's contain:"
 msgstr "Këto ISO minimale përmbajnë:"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:24
+#: en/netInstall-intro.xml:12
 #, fuzzy
 msgid ""
 "less than 120 MB and are convenient if bandwidth is too low to download a "
@@ -129,7 +129,7 @@ msgstr ""
 "ose nuk mund të ndizni nga një USB."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:30
+#: en/netInstall-intro.xml:17
 #, fuzzy
 msgid ""
 "no more than that which is needed to (a) start the <literal>DrakX</literal> "
@@ -142,7 +142,7 @@ msgstr ""
 "instalimin."
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:37
+#: en/netInstall-intro.xml:23
 msgid ""
 "The required source packages may be on a PC hard disk, a local drive, a "
 "local network or on the Internet."
@@ -151,17 +151,18 @@ msgstr ""
 "lokal ose në internet."
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:42
+#: en/netInstall-intro.xml:27
 msgid "Availability"
 msgstr "Disponueshmëri"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:44
-msgid "There a two versions of the NetInstall media:"
+#: en/netInstall-intro.xml:28
+#, fuzzy
+msgid "There are two versions of the NetInstall media:"
 msgstr "Ka dy versione të mediave NetInstall:"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:48
+#: en/netInstall-intro.xml:31
 msgid ""
 "<emphasis role=\"bold\">netinstall.iso</emphasis> For those who prefer not "
 "to use non-free software, this ISO contains only free software."
@@ -170,7 +171,7 @@ msgstr ""
 "mos përdorin programin pa-pagesë, kjo ISO përmban vetëm programin falas."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:54
+#: en/netInstall-intro.xml:36
 msgid ""
 "<emphasis role=\"bold\">netinstall-nonfree.iso</emphasis> This ISO "
 "additionally includes proprietary device drivers, which may be required for "
@@ -181,7 +182,7 @@ msgstr ""
 "pajisjen tuaj të rrjetit, kontrolluesin e diskut, etj."
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:60
+#: en/netInstall-intro.xml:41
 msgid ""
 "Both versions are available in the form of separate 32-bit and 64-bit ISO's. "
 "See here: <link xlink:href=\"https://www.mageia.org/downloads/\">https://www."
@@ -192,12 +193,12 @@ msgstr ""
 "\">https://www.mageia.org/downloads/</link>"
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:66
+#: en/netInstall-intro.xml:45
 msgid "Preparation"
 msgstr "Përgatitje"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:68
+#: en/netInstall-intro.xml:46
 msgid ""
 "After downloading the image, burn it to a CD/DVD or, if you prefer to put it "
 "on a USB stick, follow the instructions here: <link xlink:href=\"https://"
@@ -211,17 +212,17 @@ msgstr ""
 "wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISOs_on_an_USB_stick</link>"
 
 #. type: Content of: <section><section><title>
-#: en/netInstall-intro.xml:75
+#: en/netInstall-intro.xml:51
 msgid "Installation Stages"
 msgstr "Fazat Instalimit"
 
 #. type: Content of: <section><section><para>
-#: en/netInstall-intro.xml:77
+#: en/netInstall-intro.xml:52
 msgid "The installation is carried out in two stages:"
 msgstr "Instalimi kryhet në dy faza:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:81
+#: en/netInstall-intro.xml:55
 #, fuzzy
 msgid ""
 "<emphasis role=\"bold\">Stage 1</emphasis> This is the pre-Installation "
@@ -237,7 +238,7 @@ msgstr ""
 "atëherë lidhja e rrjetit do të aktivizohet."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:91
+#: en/netInstall-intro.xml:64
 msgid ""
 "<emphasis role=\"bold\">Stage 2</emphasis> This is the actual Installation "
 "stage, which will automatically commence once a connection to the installer "
@@ -248,11 +249,12 @@ msgstr ""
 "me skedarët e instaluesit."
 
 #. type: Content of: <section><section><note><para>
-#: en/netInstall-intro.xml:98
+#: en/netInstall-intro.xml:70
+#, fuzzy
 msgid ""
 "During Stage 1, nothing will be written to your Hard Disk, so it is safe to "
 "quit at any point during Stage 1 if you wish. You can do so by pressing "
-"<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Del</keycap> </"
+"<keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Del</keycap></"
 "keycombo>."
 msgstr ""
 "Gjatë Fazës 1, asgjë nuk do të shkruhet në Diskun tuaj, kështu që është e "
@@ -261,10 +263,11 @@ msgstr ""
 "<keycap>Del</keycap> </keycombo>."
 
 #. type: Content of: <section><section><tip><para>
-#: en/netInstall-intro.xml:110
+#: en/netInstall-intro.xml:75
+#, fuzzy
 msgid ""
-"You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo> "
-"to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap> </"
+"You can use <keycombo><keycap>Alt</keycap><keycap>F3</keycap></keycombo> to "
+"read the logs and <keycombo><keycap>Alt</keycap><keycap>F1</keycap></"
 "keycombo> to return to the installer screen."
 msgstr ""
 "Ju mund të përdorni <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </"
@@ -272,7 +275,7 @@ msgstr ""
 "<keycap>F1</keycap> </keycombo> për t'u kthyer në ekranin e instaluesit."
 
 #. type: Content of: <section><section><warning><para>
-#: en/netInstall-intro.xml:122
+#: en/netInstall-intro.xml:78
 #, fuzzy
 msgid ""
 "Unlike when installing from DVD or LiveCD, you will be asked to type things "
diff --git a/docs/docs/stable/bootiso/sr.po b/docs/docs/stable/bootiso/sr.po
index 867dc9b4..1f2c5a4a 100644
--- a/docs/docs/stable/bootiso/sr.po
+++ b/docs/docs/stable/bootiso/sr.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia Boot ISO Help 6.0\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2020-12-20 15:06+0200\n"
+"POT-Creation-Date: 2020-12-20 16:01+0200\n"
 "PO-Revision-Date: 2017-04-04 18:35+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>, 2019\n"
 "Language-Team: Serbian (https://www.transifex.com/MageiaLinux/teams/9361/"
@@ -98,27 +98,27 @@ msgid "Installing Mageia using a Tiny Boot Image"
 msgstr "Инсталирај Mageia коришћењем Tiny Boot Image-а"
 
 #. type: Content of: <section><title>
-#: en/netInstall-intro.xml:12
+#: en/netInstall-intro.xml:4
 msgid "Introduction"
 msgstr "Упознавање"
 
 #. type: Content of: <section><section><title>
-#: en/netInstall-intro.xml:15
+#: en/netInstall-intro.xml:6
 msgid "NetInstall Media"
 msgstr "NetInstall Медиј"
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:18
+#: en/netInstall-intro.xml:8
 msgid "Description"
 msgstr "Опис"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:20
+#: en/netInstall-intro.xml:9
 msgid "These minimal ISO's contain:"
 msgstr "Ови минимални ISO-ои садрже:"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:24
+#: en/netInstall-intro.xml:12
 #, fuzzy
 msgid ""
 "less than 120 MB and are convenient if bandwidth is too low to download a "
@@ -130,7 +130,7 @@ msgstr ""
 "инсталацију са USB меморије."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:30
+#: en/netInstall-intro.xml:17
 #, fuzzy
 msgid ""
 "no more than that which is needed to (a) start the <literal>DrakX</literal> "
@@ -142,7 +142,7 @@ msgstr ""
 "су неопходни за наставак и завршетак инсталације."
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:37
+#: en/netInstall-intro.xml:23
 msgid ""
 "The required source packages may be on a PC hard disk, a local drive, a "
 "local network or on the Internet."
@@ -151,17 +151,18 @@ msgstr ""
 "или на Интернету."
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:42
+#: en/netInstall-intro.xml:27
 msgid "Availability"
 msgstr "Доступност"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:44
-msgid "There a two versions of the NetInstall media:"
+#: en/netInstall-intro.xml:28
+#, fuzzy
+msgid "There are two versions of the NetInstall media:"
 msgstr "Постије две верзије NetInstall медија:"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:48
+#: en/netInstall-intro.xml:31
 msgid ""
 "<emphasis role=\"bold\">netinstall.iso</emphasis> For those who prefer not "
 "to use non-free software, this ISO contains only free software."
@@ -170,7 +171,7 @@ msgstr ""
 "не користе не-слободан софтвер, овај  ISO фајл садржи само слободан софтвер."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:54
+#: en/netInstall-intro.xml:36
 msgid ""
 "<emphasis role=\"bold\">netinstall-nonfree.iso</emphasis> This ISO "
 "additionally includes proprietary device drivers, which may be required for "
@@ -181,7 +182,7 @@ msgstr ""
 "контролеру, итд."
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:60
+#: en/netInstall-intro.xml:41
 msgid ""
 "Both versions are available in the form of separate 32-bit and 64-bit ISO's. "
 "See here: <link xlink:href=\"https://www.mageia.org/downloads/\">https://www."
@@ -192,12 +193,12 @@ msgstr ""
 "\">https://www.mageia.org/downloads/</link>"
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:66
+#: en/netInstall-intro.xml:45
 msgid "Preparation"
 msgstr "Припрема"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:68
+#: en/netInstall-intro.xml:46
 msgid ""
 "After downloading the image, burn it to a CD/DVD or, if you prefer to put it "
 "on a USB stick, follow the instructions here: <link xlink:href=\"https://"
@@ -212,17 +213,17 @@ msgstr ""
 "org/en/Installation_Media#Dump_Mageia_ISOs_on_an_USB_stick</link>"
 
 #. type: Content of: <section><section><title>
-#: en/netInstall-intro.xml:75
+#: en/netInstall-intro.xml:51
 msgid "Installation Stages"
 msgstr "Инсталационе фазе"
 
 #. type: Content of: <section><section><para>
-#: en/netInstall-intro.xml:77
+#: en/netInstall-intro.xml:52
 msgid "The installation is carried out in two stages:"
 msgstr "Инсталација се спроводи у две фазе:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:81
+#: en/netInstall-intro.xml:55
 #, fuzzy
 msgid ""
 "<emphasis role=\"bold\">Stage 1</emphasis> This is the pre-Installation "
@@ -238,7 +239,7 @@ msgstr ""
 "сервер, тада ће мрежна конекција бити активирана."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:91
+#: en/netInstall-intro.xml:64
 msgid ""
 "<emphasis role=\"bold\">Stage 2</emphasis> This is the actual Installation "
 "stage, which will automatically commence once a connection to the installer "
@@ -249,11 +250,12 @@ msgstr ""
 "фајловима."
 
 #. type: Content of: <section><section><note><para>
-#: en/netInstall-intro.xml:98
+#: en/netInstall-intro.xml:70
+#, fuzzy
 msgid ""
 "During Stage 1, nothing will be written to your Hard Disk, so it is safe to "
 "quit at any point during Stage 1 if you wish. You can do so by pressing "
-"<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Del</keycap> </"
+"<keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Del</keycap></"
 "keycombo>."
 msgstr ""
 "Током Фазе 1, ништа неће бити уписивано на хард диск, тако да је безбедно да "
@@ -262,10 +264,11 @@ msgstr ""
 "<keycap>Del</keycap> </keycombo>."
 
 #. type: Content of: <section><section><tip><para>
-#: en/netInstall-intro.xml:110
+#: en/netInstall-intro.xml:75
+#, fuzzy
 msgid ""
-"You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo> "
-"to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap> </"
+"You can use <keycombo><keycap>Alt</keycap><keycap>F3</keycap></keycombo> to "
+"read the logs and <keycombo><keycap>Alt</keycap><keycap>F1</keycap></"
 "keycombo> to return to the installer screen."
 msgstr ""
 "Можете користити <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </"
@@ -273,7 +276,7 @@ msgstr ""
 "keycap> </keycombo> за повратак на екран за инсталацију."
 
 #. type: Content of: <section><section><warning><para>
-#: en/netInstall-intro.xml:122
+#: en/netInstall-intro.xml:78
 #, fuzzy
 msgid ""
 "Unlike when installing from DVD or LiveCD, you will be asked to type things "
diff --git a/docs/docs/stable/bootiso/sv.po b/docs/docs/stable/bootiso/sv.po
index 09dc9595..d60d5b2d 100644
--- a/docs/docs/stable/bootiso/sv.po
+++ b/docs/docs/stable/bootiso/sv.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia Boot ISO Help 6.0\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2020-12-20 15:06+0200\n"
+"POT-Creation-Date: 2020-12-20 16:01+0200\n"
 "PO-Revision-Date: 2017-04-04 18:35+0000\n"
 "Last-Translator: Kristoffer Grundström <lovaren@gmail.com>, 2020\n"
 "Language-Team: Swedish (https://www.transifex.com/MageiaLinux/teams/9361/"
@@ -97,27 +97,27 @@ msgid "Installing Mageia using a Tiny Boot Image"
 msgstr "Installera Mageia genom att använda en pytteliten uppstartsavbild"
 
 #. type: Content of: <section><title>
-#: en/netInstall-intro.xml:12
+#: en/netInstall-intro.xml:4
 msgid "Introduction"
 msgstr "Presentation"
 
 #. type: Content of: <section><section><title>
-#: en/netInstall-intro.xml:15
+#: en/netInstall-intro.xml:6
 msgid "NetInstall Media"
 msgstr "Media för nätverksbaserad installation"
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:18
+#: en/netInstall-intro.xml:8
 msgid "Description"
 msgstr "Beskrivning"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:20
+#: en/netInstall-intro.xml:9
 msgid "These minimal ISO's contain:"
 msgstr "De här minimala ISO-filerna innehåller:"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:24
+#: en/netInstall-intro.xml:12
 #, fuzzy
 msgid ""
 "less than 120 MB and are convenient if bandwidth is too low to download a "
@@ -129,7 +129,7 @@ msgstr ""
 "från ett USB-minne."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:30
+#: en/netInstall-intro.xml:17
 #, fuzzy
 msgid ""
 "no more than that which is needed to (a) start the <literal>DrakX</literal> "
@@ -141,7 +141,7 @@ msgstr ""
 "paket som behövs för att fortsätta och slutföra installationen."
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:37
+#: en/netInstall-intro.xml:23
 msgid ""
 "The required source packages may be on a PC hard disk, a local drive, a "
 "local network or on the Internet."
@@ -150,17 +150,18 @@ msgstr ""
 "nätverk, eller på internet."
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:42
+#: en/netInstall-intro.xml:27
 msgid "Availability"
 msgstr "Tillgänglighet"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:44
-msgid "There a two versions of the NetInstall media:"
+#: en/netInstall-intro.xml:28
+#, fuzzy
+msgid "There are two versions of the NetInstall media:"
 msgstr "Det finns två media-versioner av NetInstall."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:48
+#: en/netInstall-intro.xml:31
 msgid ""
 "<emphasis role=\"bold\">netinstall.iso</emphasis> For those who prefer not "
 "to use non-free software, this ISO contains only free software."
@@ -170,7 +171,7 @@ msgstr ""
 "programvara."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:54
+#: en/netInstall-intro.xml:36
 msgid ""
 "<emphasis role=\"bold\">netinstall-nonfree.iso</emphasis> This ISO "
 "additionally includes proprietary device drivers, which may be required for "
@@ -181,7 +182,7 @@ msgstr ""
 "nätverk, hårddiskar etc."
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:60
+#: en/netInstall-intro.xml:41
 msgid ""
 "Both versions are available in the form of separate 32-bit and 64-bit ISO's. "
 "See here: <link xlink:href=\"https://www.mageia.org/downloads/\">https://www."
@@ -192,12 +193,12 @@ msgstr ""
 "mageia.org/downloads/</link>"
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:66
+#: en/netInstall-intro.xml:45
 msgid "Preparation"
 msgstr "Förberedning"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:68
+#: en/netInstall-intro.xml:46
 msgid ""
 "After downloading the image, burn it to a CD/DVD or, if you prefer to put it "
 "on a USB stick, follow the instructions here: <link xlink:href=\"https://"
@@ -212,17 +213,17 @@ msgstr ""
 "org/en/Installation_Media#Dump_Mageia_ISOs_on_an_USB_stick</link>"
 
 #. type: Content of: <section><section><title>
-#: en/netInstall-intro.xml:75
+#: en/netInstall-intro.xml:51
 msgid "Installation Stages"
 msgstr "Installationsteg"
 
 #. type: Content of: <section><section><para>
-#: en/netInstall-intro.xml:77
+#: en/netInstall-intro.xml:52
 msgid "The installation is carried out in two stages:"
 msgstr "Installationen utförs i två steg."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:81
+#: en/netInstall-intro.xml:55
 #, fuzzy
 msgid ""
 "<emphasis role=\"bold\">Stage 1</emphasis> This is the pre-Installation "
@@ -238,7 +239,7 @@ msgstr ""
 "nätverksanslutning att upprättas."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:91
+#: en/netInstall-intro.xml:64
 msgid ""
 "<emphasis role=\"bold\">Stage 2</emphasis> This is the actual Installation "
 "stage, which will automatically commence once a connection to the installer "
@@ -249,11 +250,12 @@ msgstr ""
 "installationsfilerna har upprättats."
 
 #. type: Content of: <section><section><note><para>
-#: en/netInstall-intro.xml:98
+#: en/netInstall-intro.xml:70
+#, fuzzy
 msgid ""
 "During Stage 1, nothing will be written to your Hard Disk, so it is safe to "
 "quit at any point during Stage 1 if you wish. You can do so by pressing "
-"<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Del</keycap> </"
+"<keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Del</keycap></"
 "keycombo>."
 msgstr ""
 "Under steg 1 skrivs inget på din hårddisk, därför kan du avbryta när du "
@@ -261,10 +263,11 @@ msgstr ""
 "<keycap>Alt</keycap> <keycap>Del</keycap> </keycombo>."
 
 #. type: Content of: <section><section><tip><para>
-#: en/netInstall-intro.xml:110
+#: en/netInstall-intro.xml:75
+#, fuzzy
 msgid ""
-"You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo> "
-"to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap> </"
+"You can use <keycombo><keycap>Alt</keycap><keycap>F3</keycap></keycombo> to "
+"read the logs and <keycombo><keycap>Alt</keycap><keycap>F1</keycap></"
 "keycombo> to return to the installer screen."
 msgstr ""
 "Du kan använda <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </"
@@ -272,7 +275,7 @@ msgstr ""
 "<keycap>F1</keycap> </keycombo> för att återvända till installationsskärmen."
 
 #. type: Content of: <section><section><warning><para>
-#: en/netInstall-intro.xml:122
+#: en/netInstall-intro.xml:78
 msgid ""
 "Unlike when installing from DVD or LiveCD, you will be asked to type things "
 "during the first part of a Network installation (<emphasis role=\"bold"
diff --git a/docs/docs/stable/bootiso/tg.po b/docs/docs/stable/bootiso/tg.po
index 73e92eac..40ba784d 100644
--- a/docs/docs/stable/bootiso/tg.po
+++ b/docs/docs/stable/bootiso/tg.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia Boot ISO Help 6.0\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2020-12-20 15:06+0200\n"
+"POT-Creation-Date: 2020-12-20 16:01+0200\n"
 "PO-Revision-Date: 2017-04-04 18:35+0000\n"
 "Last-Translator: Victor Ibragimov <victor.ibragimov@gmail.com>, 2019\n"
 "Language-Team: Tajik (https://www.transifex.com/MageiaLinux/teams/9361/tg/)\n"
@@ -95,27 +95,27 @@ msgid "Installing Mageia using a Tiny Boot Image"
 msgstr ""
 
 #. type: Content of: <section><title>
-#: en/netInstall-intro.xml:12
+#: en/netInstall-intro.xml:4
 msgid "Introduction"
 msgstr "Муқаддима"
 
 #. type: Content of: <section><section><title>
-#: en/netInstall-intro.xml:15
+#: en/netInstall-intro.xml:6
 msgid "NetInstall Media"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:18
+#: en/netInstall-intro.xml:8
 msgid "Description"
 msgstr "Тавсиф"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:20
+#: en/netInstall-intro.xml:9
 msgid "These minimal ISO's contain:"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:24
+#: en/netInstall-intro.xml:12
 msgid ""
 "less than 120 MB and are convenient if bandwidth is too low to download a "
 "full DVD, or if you have a PC without a DVD drive or unable to boot from a "
@@ -123,7 +123,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:30
+#: en/netInstall-intro.xml:17
 msgid ""
 "no more than that which is needed to (a) start the <literal>DrakX</literal> "
 "installer and (b) find <literal>DrakX-installer-stage2</literal> and other "
@@ -131,31 +131,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:37
+#: en/netInstall-intro.xml:23
 msgid ""
 "The required source packages may be on a PC hard disk, a local drive, a "
 "local network or on the Internet."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:42
+#: en/netInstall-intro.xml:27
 msgid "Availability"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:44
-msgid "There a two versions of the NetInstall media:"
+#: en/netInstall-intro.xml:28
+msgid "There are two versions of the NetInstall media:"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:48
+#: en/netInstall-intro.xml:31
 msgid ""
 "<emphasis role=\"bold\">netinstall.iso</emphasis> For those who prefer not "
 "to use non-free software, this ISO contains only free software."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:54
+#: en/netInstall-intro.xml:36
 msgid ""
 "<emphasis role=\"bold\">netinstall-nonfree.iso</emphasis> This ISO "
 "additionally includes proprietary device drivers, which may be required for "
@@ -163,7 +163,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:60
+#: en/netInstall-intro.xml:41
 msgid ""
 "Both versions are available in the form of separate 32-bit and 64-bit ISO's. "
 "See here: <link xlink:href=\"https://www.mageia.org/downloads/\">https://www."
@@ -171,12 +171,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:66
+#: en/netInstall-intro.xml:45
 msgid "Preparation"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:68
+#: en/netInstall-intro.xml:46
 msgid ""
 "After downloading the image, burn it to a CD/DVD or, if you prefer to put it "
 "on a USB stick, follow the instructions here: <link xlink:href=\"https://"
@@ -186,17 +186,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/netInstall-intro.xml:75
+#: en/netInstall-intro.xml:51
 msgid "Installation Stages"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/netInstall-intro.xml:77
+#: en/netInstall-intro.xml:52
 msgid "The installation is carried out in two stages:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:81
+#: en/netInstall-intro.xml:55
 msgid ""
 "<emphasis role=\"bold\">Stage 1</emphasis> This is the pre-Installation "
 "stage. You will need to provide the method and details for accessing the "
@@ -207,7 +207,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:91
+#: en/netInstall-intro.xml:64
 msgid ""
 "<emphasis role=\"bold\">Stage 2</emphasis> This is the actual Installation "
 "stage, which will automatically commence once a connection to the installer "
@@ -215,24 +215,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/netInstall-intro.xml:98
+#: en/netInstall-intro.xml:70
 msgid ""
 "During Stage 1, nothing will be written to your Hard Disk, so it is safe to "
 "quit at any point during Stage 1 if you wish. You can do so by pressing "
-"<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Del</keycap> </"
+"<keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Del</keycap></"
 "keycombo>."
 msgstr ""
 
 #. type: Content of: <section><section><tip><para>
-#: en/netInstall-intro.xml:110
+#: en/netInstall-intro.xml:75
 msgid ""
-"You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo> "
-"to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap> </"
+"You can use <keycombo><keycap>Alt</keycap><keycap>F3</keycap></keycombo> to "
+"read the logs and <keycombo><keycap>Alt</keycap><keycap>F1</keycap></"
 "keycombo> to return to the installer screen."
 msgstr ""
 
 #. type: Content of: <section><section><warning><para>
-#: en/netInstall-intro.xml:122
+#: en/netInstall-intro.xml:78
 msgid ""
 "Unlike when installing from DVD or LiveCD, you will be asked to type things "
 "during the first part of a Network installation (<emphasis role=\"bold"
diff --git a/docs/docs/stable/bootiso/tr.po b/docs/docs/stable/bootiso/tr.po
index 2d48610e..be40e95a 100644
--- a/docs/docs/stable/bootiso/tr.po
+++ b/docs/docs/stable/bootiso/tr.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia Boot ISO Help 6.0\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2020-12-20 15:06+0200\n"
+"POT-Creation-Date: 2020-12-20 16:01+0200\n"
 "PO-Revision-Date: 2017-04-04 18:35+0000\n"
 "Last-Translator: Cenk Yıldızlı <goncagul@national.shitposting.agency>, 2019\n"
 "Language-Team: Turkish (https://www.transifex.com/MageiaLinux/teams/9361/"
@@ -102,27 +102,27 @@ msgid "Installing Mageia using a Tiny Boot Image"
 msgstr " Mageia'yı Küçük Bir Önyükleme Görüntüsü kullanarak Kur"
 
 #. type: Content of: <section><title>
-#: en/netInstall-intro.xml:12
+#: en/netInstall-intro.xml:4
 msgid "Introduction"
 msgstr "Giriş"
 
 #. type: Content of: <section><section><title>
-#: en/netInstall-intro.xml:15
+#: en/netInstall-intro.xml:6
 msgid "NetInstall Media"
 msgstr "NetInstall Kalıp"
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:18
+#: en/netInstall-intro.xml:8
 msgid "Description"
 msgstr "Tanım"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:20
+#: en/netInstall-intro.xml:9
 msgid "These minimal ISO's contain:"
 msgstr "Minimum ISO'lar şunları içerir:"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:24
+#: en/netInstall-intro.xml:12
 #, fuzzy
 msgid ""
 "less than 120 MB and are convenient if bandwidth is too low to download a "
@@ -134,7 +134,7 @@ msgstr ""
 "yapmıyorsanız uygundur."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:30
+#: en/netInstall-intro.xml:17
 msgid ""
 "no more than that which is needed to (a) start the <literal>DrakX</literal> "
 "installer and (b) find <literal>DrakX-installer-stage2</literal> and other "
@@ -142,7 +142,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:37
+#: en/netInstall-intro.xml:23
 msgid ""
 "The required source packages may be on a PC hard disk, a local drive, a "
 "local network or on the Internet."
@@ -151,17 +151,18 @@ msgstr ""
 "bir ağda veya Internet'te olabilir."
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:42
+#: en/netInstall-intro.xml:27
 msgid "Availability"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:44
-msgid "There a two versions of the NetInstall media:"
+#: en/netInstall-intro.xml:28
+#, fuzzy
+msgid "There are two versions of the NetInstall media:"
 msgstr "NetInstall ortamının iki sürümü var:"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:48
+#: en/netInstall-intro.xml:31
 msgid ""
 "<emphasis role=\"bold\">netinstall.iso</emphasis> For those who prefer not "
 "to use non-free software, this ISO contains only free software."
@@ -170,7 +171,7 @@ msgstr ""
 "kullanmamayı tercih edenler için bu ISO sadece özgür yazılım içermektedir."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:54
+#: en/netInstall-intro.xml:36
 msgid ""
 "<emphasis role=\"bold\">netinstall-nonfree.iso</emphasis> This ISO "
 "additionally includes proprietary device drivers, which may be required for "
@@ -181,7 +182,7 @@ msgstr ""
 "özgür olmayan sürücüleri içerir."
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:60
+#: en/netInstall-intro.xml:41
 msgid ""
 "Both versions are available in the form of separate 32-bit and 64-bit ISO's. "
 "See here: <link xlink:href=\"https://www.mageia.org/downloads/\">https://www."
@@ -192,12 +193,12 @@ msgstr ""
 "mageia.org/downloads/</link>"
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:66
+#: en/netInstall-intro.xml:45
 msgid "Preparation"
 msgstr "Hazırlık"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:68
+#: en/netInstall-intro.xml:46
 msgid ""
 "After downloading the image, burn it to a CD/DVD or, if you prefer to put it "
 "on a USB stick, follow the instructions here: <link xlink:href=\"https://"
@@ -212,17 +213,17 @@ msgstr ""
 "org/en/Installation_Media#Dump_Mageia_ISOs_on_an_USB_stick</link>"
 
 #. type: Content of: <section><section><title>
-#: en/netInstall-intro.xml:75
+#: en/netInstall-intro.xml:51
 msgid "Installation Stages"
 msgstr "Kurulum Aşamaları"
 
 #. type: Content of: <section><section><para>
-#: en/netInstall-intro.xml:77
+#: en/netInstall-intro.xml:52
 msgid "The installation is carried out in two stages:"
 msgstr "Kurulum iki aşamada gerçekleştirilir:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:81
+#: en/netInstall-intro.xml:55
 msgid ""
 "<emphasis role=\"bold\">Stage 1</emphasis> This is the pre-Installation "
 "stage. You will need to provide the method and details for accessing the "
@@ -233,7 +234,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:91
+#: en/netInstall-intro.xml:64
 msgid ""
 "<emphasis role=\"bold\">Stage 2</emphasis> This is the actual Installation "
 "stage, which will automatically commence once a connection to the installer "
@@ -241,24 +242,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/netInstall-intro.xml:98
+#: en/netInstall-intro.xml:70
 msgid ""
 "During Stage 1, nothing will be written to your Hard Disk, so it is safe to "
 "quit at any point during Stage 1 if you wish. You can do so by pressing "
-"<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Del</keycap> </"
+"<keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Del</keycap></"
 "keycombo>."
 msgstr ""
 
 #. type: Content of: <section><section><tip><para>
-#: en/netInstall-intro.xml:110
+#: en/netInstall-intro.xml:75
 msgid ""
-"You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo> "
-"to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap> </"
+"You can use <keycombo><keycap>Alt</keycap><keycap>F3</keycap></keycombo> to "
+"read the logs and <keycombo><keycap>Alt</keycap><keycap>F1</keycap></"
 "keycombo> to return to the installer screen."
 msgstr ""
 
 #. type: Content of: <section><section><warning><para>
-#: en/netInstall-intro.xml:122
+#: en/netInstall-intro.xml:78
 msgid ""
 "Unlike when installing from DVD or LiveCD, you will be asked to type things "
 "during the first part of a Network installation (<emphasis role=\"bold"
diff --git a/docs/docs/stable/bootiso/uk.po b/docs/docs/stable/bootiso/uk.po
index 8a4507a3..ae67cae8 100644
--- a/docs/docs/stable/bootiso/uk.po
+++ b/docs/docs/stable/bootiso/uk.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia Boot ISO Help 6.0\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2020-12-20 15:06+0200\n"
+"POT-Creation-Date: 2020-12-20 16:01+0200\n"
 "PO-Revision-Date: 2020-12-20 15:17+0200\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
@@ -16,10 +16,10 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11"
-" ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 >"
-" 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n %"
-" 100 >=11 && n % 100 <=14 )) ? 2: 3);\n"
+"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != "
+"11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % "
+"100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || "
+"(n % 100 >=11 && n % 100 <=14 )) ? 2: 3);\n"
 "X-Generator: Lokalize 20.11.70\n"
 
 #. type: Attribute 'xml:lang' of: <book>
@@ -97,27 +97,27 @@ msgid "Installing Mageia using a Tiny Boot Image"
 msgstr "Встановлення Mageia з маленького завантажувального образу"
 
 #. type: Content of: <section><title>
-#: en/netInstall-intro.xml:12
+#: en/netInstall-intro.xml:4
 msgid "Introduction"
 msgstr "Вступ"
 
 #. type: Content of: <section><section><title>
-#: en/netInstall-intro.xml:15
+#: en/netInstall-intro.xml:6
 msgid "NetInstall Media"
 msgstr "Носії NetInstall"
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:18
+#: en/netInstall-intro.xml:8
 msgid "Description"
 msgstr "Опис"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:20
+#: en/netInstall-intro.xml:9
 msgid "These minimal ISO's contain:"
 msgstr "Ці мінімалістичні образи ISO мають такі характеристики:"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:24
+#: en/netInstall-intro.xml:12
 msgid ""
 "less than 120 MB and are convenient if bandwidth is too low to download a "
 "full DVD, or if you have a PC without a DVD drive or unable to boot from a "
@@ -129,7 +129,7 @@ msgstr ""
 "флеш-диска USB."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:30
+#: en/netInstall-intro.xml:17
 msgid ""
 "no more than that which is needed to (a) start the <literal>DrakX</literal> "
 "installer and (b) find <literal>DrakX-installer-stage2</literal> and other "
@@ -141,7 +141,7 @@ msgstr ""
 "для продовження та завершення встановлення системи."
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:37
+#: en/netInstall-intro.xml:23
 msgid ""
 "The required source packages may be on a PC hard disk, a local drive, a "
 "local network or on the Internet."
@@ -151,17 +151,18 @@ msgstr ""
 "інтернеті."
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:42
+#: en/netInstall-intro.xml:27
 msgid "Availability"
 msgstr "Доступність"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:44
-msgid "There a two versions of the NetInstall media:"
+#: en/netInstall-intro.xml:28
+#, fuzzy
+msgid "There are two versions of the NetInstall media:"
 msgstr "Передбачено дві версії носія NetInstall:"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:48
+#: en/netInstall-intro.xml:31
 msgid ""
 "<emphasis role=\"bold\">netinstall.iso</emphasis> For those who prefer not "
 "to use non-free software, this ISO contains only free software."
@@ -171,7 +172,7 @@ msgstr ""
 "міститься лише вільне програмне забезпечення."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:54
+#: en/netInstall-intro.xml:36
 msgid ""
 "<emphasis role=\"bold\">netinstall-nonfree.iso</emphasis> This ISO "
 "additionally includes proprietary device drivers, which may be required for "
@@ -183,7 +184,7 @@ msgstr ""
 "іншого пристрою."
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:60
+#: en/netInstall-intro.xml:41
 msgid ""
 "Both versions are available in the form of separate 32-bit and 64-bit ISO's. "
 "See here: <link xlink:href=\"https://www.mageia.org/downloads/\">https://www."
@@ -194,12 +195,12 @@ msgstr ""
 "www.mageia.org/downloads/\">тут</link>"
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:66
+#: en/netInstall-intro.xml:45
 msgid "Preparation"
 msgstr "Приготування"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:68
+#: en/netInstall-intro.xml:46
 msgid ""
 "After downloading the image, burn it to a CD/DVD or, if you prefer to put it "
 "on a USB stick, follow the instructions here: <link xlink:href=\"https://"
@@ -212,17 +213,17 @@ msgstr ""
 "org/en/Installation_Media#Dump_Mageia_ISOs_on_an_USB_stick\">звідси</link>."
 
 #. type: Content of: <section><section><title>
-#: en/netInstall-intro.xml:75
+#: en/netInstall-intro.xml:51
 msgid "Installation Stages"
 msgstr "Етапи встановлення"
 
 #. type: Content of: <section><section><para>
-#: en/netInstall-intro.xml:77
+#: en/netInstall-intro.xml:52
 msgid "The installation is carried out in two stages:"
 msgstr "Встановлення виконується у два етапи:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:81
+#: en/netInstall-intro.xml:55
 msgid ""
 "<emphasis role=\"bold\">Stage 1</emphasis> This is the pre-Installation "
 "stage. You will need to provide the method and details for accessing the "
@@ -234,12 +235,12 @@ msgstr ""
 "<emphasis role=\"bold\">Етап 1</emphasis> Це етап попереднього приготування. "
 "Вам слід визначити спосіб та параметри доступу до сховища файлів пакунків, "
 "які буде використано для встановлення. Якщо спосіб встановлення використовує "
-"певний сервер, буде задіяно параметри з'єднання із мережею. Цією мережею може"
-" бути Wi-Fi-з'єднання із шифруванням WEP або WPA2 (втім, будь ласка, зверніть"
-" увагу на наведене нижче попередження щодо введення з клавіатури)."
+"певний сервер, буде задіяно параметри з'єднання із мережею. Цією мережею "
+"може бути Wi-Fi-з'єднання із шифруванням WEP або WPA2 (втім, будь ласка, "
+"зверніть увагу на наведене нижче попередження щодо введення з клавіатури)."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:91
+#: en/netInstall-intro.xml:64
 msgid ""
 "<emphasis role=\"bold\">Stage 2</emphasis> This is the actual Installation "
 "stage, which will automatically commence once a connection to the installer "
@@ -250,11 +251,12 @@ msgstr ""
 "пакунків."
 
 #. type: Content of: <section><section><note><para>
-#: en/netInstall-intro.xml:98
+#: en/netInstall-intro.xml:70
+#, fuzzy
 msgid ""
 "During Stage 1, nothing will be written to your Hard Disk, so it is safe to "
 "quit at any point during Stage 1 if you wish. You can do so by pressing "
-"<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Del</keycap> </"
+"<keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Del</keycap></"
 "keycombo>."
 msgstr ""
 "Під час Етапу 1, на диск вашої системи не буде записано ніяких даних, отже "
@@ -263,10 +265,11 @@ msgstr ""
 "keycap> <keycap>Del</keycap> </keycombo>."
 
 #. type: Content of: <section><section><tip><para>
-#: en/netInstall-intro.xml:110
+#: en/netInstall-intro.xml:75
+#, fuzzy
 msgid ""
-"You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo> "
-"to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap> </"
+"You can use <keycombo><keycap>Alt</keycap><keycap>F3</keycap></keycombo> to "
+"read the logs and <keycombo><keycap>Alt</keycap><keycap>F1</keycap></"
 "keycombo> to return to the installer screen."
 msgstr ""
 "Ви можете скористатися натисканням комбінації клавіш <keycombo> <keycap>Alt</"
@@ -275,7 +278,7 @@ msgstr ""
 "<keycap>F1</keycap> </keycombo>, щоб повернутися до екрана встановлення."
 
 #. type: Content of: <section><section><warning><para>
-#: en/netInstall-intro.xml:122
+#: en/netInstall-intro.xml:78
 msgid ""
 "Unlike when installing from DVD or LiveCD, you will be asked to type things "
 "during the first part of a Network installation (<emphasis role=\"bold"
@@ -289,8 +292,8 @@ msgstr ""
 "під час першої частини встановлення, <emphasis role=\"bold\">Етапу 1</"
 "emphasis>, програма проситиме вас ввести певні дані. Під час цього етапу "
 "клавіатура працюватиме у режимі <link xlink:href=\"https://en.wikipedia.org/"
-"wiki/Keyboard_layout#United_States\">американської розкладки</link>. Майте це"
-" на увазі, щоб уникнути проблем при введення імен, назв або шляхів."
+"wiki/Keyboard_layout#United_States\">американської розкладки</link>. Майте "
+"це на увазі, щоб уникнути проблем при введення імен, назв або шляхів."
 
 #. type: Content of: <section><title>
 #: en/netInstall-stage1.xml:15
diff --git a/docs/docs/stable/bootiso/zh_CN.po b/docs/docs/stable/bootiso/zh_CN.po
index ca01fc65..2941f8bc 100644
--- a/docs/docs/stable/bootiso/zh_CN.po
+++ b/docs/docs/stable/bootiso/zh_CN.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia Boot ISO Help 6.0\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2020-12-20 15:06+0200\n"
+"POT-Creation-Date: 2020-12-20 16:01+0200\n"
 "PO-Revision-Date: 2017-04-04 18:35+0000\n"
 "Last-Translator: zwpwjwtz <zwpwjwtz@126.com>, 2019\n"
 "Language-Team: Chinese (China) (https://www.transifex.com/MageiaLinux/"
@@ -94,27 +94,27 @@ msgid "Installing Mageia using a Tiny Boot Image"
 msgstr ""
 
 #. type: Content of: <section><title>
-#: en/netInstall-intro.xml:12
+#: en/netInstall-intro.xml:4
 msgid "Introduction"
 msgstr "简介"
 
 #. type: Content of: <section><section><title>
-#: en/netInstall-intro.xml:15
+#: en/netInstall-intro.xml:6
 msgid "NetInstall Media"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:18
+#: en/netInstall-intro.xml:8
 msgid "Description"
 msgstr "描述"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:20
+#: en/netInstall-intro.xml:9
 msgid "These minimal ISO's contain:"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:24
+#: en/netInstall-intro.xml:12
 msgid ""
 "less than 120 MB and are convenient if bandwidth is too low to download a "
 "full DVD, or if you have a PC without a DVD drive or unable to boot from a "
@@ -122,7 +122,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:30
+#: en/netInstall-intro.xml:17
 msgid ""
 "no more than that which is needed to (a) start the <literal>DrakX</literal> "
 "installer and (b) find <literal>DrakX-installer-stage2</literal> and other "
@@ -130,31 +130,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:37
+#: en/netInstall-intro.xml:23
 msgid ""
 "The required source packages may be on a PC hard disk, a local drive, a "
 "local network or on the Internet."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:42
+#: en/netInstall-intro.xml:27
 msgid "Availability"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:44
-msgid "There a two versions of the NetInstall media:"
+#: en/netInstall-intro.xml:28
+msgid "There are two versions of the NetInstall media:"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:48
+#: en/netInstall-intro.xml:31
 msgid ""
 "<emphasis role=\"bold\">netinstall.iso</emphasis> For those who prefer not "
 "to use non-free software, this ISO contains only free software."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:54
+#: en/netInstall-intro.xml:36
 msgid ""
 "<emphasis role=\"bold\">netinstall-nonfree.iso</emphasis> This ISO "
 "additionally includes proprietary device drivers, which may be required for "
@@ -162,7 +162,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:60
+#: en/netInstall-intro.xml:41
 msgid ""
 "Both versions are available in the form of separate 32-bit and 64-bit ISO's. "
 "See here: <link xlink:href=\"https://www.mageia.org/downloads/\">https://www."
@@ -170,12 +170,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:66
+#: en/netInstall-intro.xml:45
 msgid "Preparation"
 msgstr "准备工作"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:68
+#: en/netInstall-intro.xml:46
 msgid ""
 "After downloading the image, burn it to a CD/DVD or, if you prefer to put it "
 "on a USB stick, follow the instructions here: <link xlink:href=\"https://"
@@ -185,17 +185,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/netInstall-intro.xml:75
+#: en/netInstall-intro.xml:51
 msgid "Installation Stages"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/netInstall-intro.xml:77
+#: en/netInstall-intro.xml:52
 msgid "The installation is carried out in two stages:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:81
+#: en/netInstall-intro.xml:55
 msgid ""
 "<emphasis role=\"bold\">Stage 1</emphasis> This is the pre-Installation "
 "stage. You will need to provide the method and details for accessing the "
@@ -206,7 +206,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:91
+#: en/netInstall-intro.xml:64
 msgid ""
 "<emphasis role=\"bold\">Stage 2</emphasis> This is the actual Installation "
 "stage, which will automatically commence once a connection to the installer "
@@ -214,24 +214,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/netInstall-intro.xml:98
+#: en/netInstall-intro.xml:70
 msgid ""
 "During Stage 1, nothing will be written to your Hard Disk, so it is safe to "
 "quit at any point during Stage 1 if you wish. You can do so by pressing "
-"<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Del</keycap> </"
+"<keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Del</keycap></"
 "keycombo>."
 msgstr ""
 
 #. type: Content of: <section><section><tip><para>
-#: en/netInstall-intro.xml:110
+#: en/netInstall-intro.xml:75
 msgid ""
-"You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo> "
-"to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap> </"
+"You can use <keycombo><keycap>Alt</keycap><keycap>F3</keycap></keycombo> to "
+"read the logs and <keycombo><keycap>Alt</keycap><keycap>F1</keycap></"
 "keycombo> to return to the installer screen."
 msgstr ""
 
 #. type: Content of: <section><section><warning><para>
-#: en/netInstall-intro.xml:122
+#: en/netInstall-intro.xml:78
 msgid ""
 "Unlike when installing from DVD or LiveCD, you will be asked to type things "
 "during the first part of a Network installation (<emphasis role=\"bold"
diff --git a/docs/docs/stable/bootiso/zh_TW.po b/docs/docs/stable/bootiso/zh_TW.po
index f75e8e81..d8eb2d15 100644
--- a/docs/docs/stable/bootiso/zh_TW.po
+++ b/docs/docs/stable/bootiso/zh_TW.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia Boot ISO Help 6.0\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2020-12-20 15:06+0200\n"
+"POT-Creation-Date: 2020-12-20 16:01+0200\n"
 "PO-Revision-Date: 2017-04-04 18:35+0000\n"
 "Last-Translator: You-Cheng Hsieh <yochenhsieh@gmail.com>, 2019\n"
 "Language-Team: Chinese (Taiwan) (https://www.transifex.com/MageiaLinux/"
@@ -89,27 +89,27 @@ msgid "Installing Mageia using a Tiny Boot Image"
 msgstr ""
 
 #. type: Content of: <section><title>
-#: en/netInstall-intro.xml:12
+#: en/netInstall-intro.xml:4
 msgid "Introduction"
 msgstr "前言"
 
 #. type: Content of: <section><section><title>
-#: en/netInstall-intro.xml:15
+#: en/netInstall-intro.xml:6
 msgid "NetInstall Media"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:18
+#: en/netInstall-intro.xml:8
 msgid "Description"
 msgstr "描述"
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:20
+#: en/netInstall-intro.xml:9
 msgid "These minimal ISO's contain:"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:24
+#: en/netInstall-intro.xml:12
 msgid ""
 "less than 120 MB and are convenient if bandwidth is too low to download a "
 "full DVD, or if you have a PC without a DVD drive or unable to boot from a "
@@ -117,7 +117,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:30
+#: en/netInstall-intro.xml:17
 msgid ""
 "no more than that which is needed to (a) start the <literal>DrakX</literal> "
 "installer and (b) find <literal>DrakX-installer-stage2</literal> and other "
@@ -125,31 +125,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:37
+#: en/netInstall-intro.xml:23
 msgid ""
 "The required source packages may be on a PC hard disk, a local drive, a "
 "local network or on the Internet."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:42
+#: en/netInstall-intro.xml:27
 msgid "Availability"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:44
-msgid "There a two versions of the NetInstall media:"
+#: en/netInstall-intro.xml:28
+msgid "There are two versions of the NetInstall media:"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:48
+#: en/netInstall-intro.xml:31
 msgid ""
 "<emphasis role=\"bold\">netinstall.iso</emphasis> For those who prefer not "
 "to use non-free software, this ISO contains only free software."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:54
+#: en/netInstall-intro.xml:36
 msgid ""
 "<emphasis role=\"bold\">netinstall-nonfree.iso</emphasis> This ISO "
 "additionally includes proprietary device drivers, which may be required for "
@@ -157,7 +157,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:60
+#: en/netInstall-intro.xml:41
 msgid ""
 "Both versions are available in the form of separate 32-bit and 64-bit ISO's. "
 "See here: <link xlink:href=\"https://www.mageia.org/downloads/\">https://www."
@@ -165,12 +165,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:66
+#: en/netInstall-intro.xml:45
 msgid "Preparation"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:68
+#: en/netInstall-intro.xml:46
 msgid ""
 "After downloading the image, burn it to a CD/DVD or, if you prefer to put it "
 "on a USB stick, follow the instructions here: <link xlink:href=\"https://"
@@ -180,17 +180,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/netInstall-intro.xml:75
+#: en/netInstall-intro.xml:51
 msgid "Installation Stages"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/netInstall-intro.xml:77
+#: en/netInstall-intro.xml:52
 msgid "The installation is carried out in two stages:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:81
+#: en/netInstall-intro.xml:55
 msgid ""
 "<emphasis role=\"bold\">Stage 1</emphasis> This is the pre-Installation "
 "stage. You will need to provide the method and details for accessing the "
@@ -201,7 +201,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:91
+#: en/netInstall-intro.xml:64
 msgid ""
 "<emphasis role=\"bold\">Stage 2</emphasis> This is the actual Installation "
 "stage, which will automatically commence once a connection to the installer "
@@ -209,24 +209,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/netInstall-intro.xml:98
+#: en/netInstall-intro.xml:70
 msgid ""
 "During Stage 1, nothing will be written to your Hard Disk, so it is safe to "
 "quit at any point during Stage 1 if you wish. You can do so by pressing "
-"<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Del</keycap> </"
+"<keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Del</keycap></"
 "keycombo>."
 msgstr ""
 
 #. type: Content of: <section><section><tip><para>
-#: en/netInstall-intro.xml:110
+#: en/netInstall-intro.xml:75
 msgid ""
-"You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo> "
-"to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap> </"
+"You can use <keycombo><keycap>Alt</keycap><keycap>F3</keycap></keycombo> to "
+"read the logs and <keycombo><keycap>Alt</keycap><keycap>F1</keycap></"
 "keycombo> to return to the installer screen."
 msgstr ""
 
 #. type: Content of: <section><section><warning><para>
-#: en/netInstall-intro.xml:122
+#: en/netInstall-intro.xml:78
 msgid ""
 "Unlike when installing from DVD or LiveCD, you will be asked to type things "
 "during the first part of a Network installation (<emphasis role=\"bold"