Sync with calenco

2 files changed, 152 insertions, 106 deletions

diff --git a/docs/docs/stable/installer/en/setupBootloader.xml b/docs/docs/stable/installer/en/setupBootloader.xml
index d27036b4..119f6630 100644
--- a/docs/docs/stable/installer/en/setupBootloader.xml
+++ b/docs/docs/stable/installer/en/setupBootloader.xml
@@ -1,37 +1,62 @@
-<?xml version='1.0' encoding='UTF-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" xreflabel="Bootloader" version="5.0" xml:id="setupBootloader">
+<?xml version="1.0" encoding="UTF-8"?>
+<section version="5.0" xreflabel="Bootloader" xml:id="setupBootloader"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page 
 Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
+
   <!--2018/02/06 apb: Modified the layout for a (hopefully) easier flow. Also commented-out setupBootloaderAddEntry (was section 24) and incorporated it here, at the end of this file.-->
+
   <!--2018/02/22 apb: Changed list styles.-->
+
   <!--2018/02/22 apb: Changed 'Advanced' list style.-->
+
   <!--2018/02/24 apb: Changed main list style.-->
+
   <!--2018/02/25 apb: Added xreflabel to this section.-->
+
+  <!--2019/01/06 apb: Typo.-->
+
+  <!--2019/01/06 apb: Use 'xi:include' for setupBootloaderAddEntry.xml, as that is how it is called by the inline-help drakx/perl routine.-->
+
   <info>
     <title xml:id="setupBootloader-ti1">Bootloader</title>
   </info>
+
   <section>
     <title>Grub2</title>
+
     <itemizedlist>
       <title>Grub2 on Legacy MBR/GPT systems</title>
+
       <listitem>
         <para>GRUB2 (with or without graphical menu) will be used exclusively
         as the bootloader for a Legacy/MBR or Legacy/GPT system.</para>
       </listitem>
+
       <listitem>
         <para>By default, a new bootloader will be written into either the MBR
         (Master Boot Record) of your first hard drive or in the BIOS boot
         partition.</para>
       </listitem>
     </itemizedlist>
+
     <itemizedlist>
       <title>Grub2-efi on UEFI systems</title>
+
       <listitem>
         <para>GRUB2-efi will be used exclusively as the bootloader for a UEFI
         system.</para>
       </listitem>
+
       <listitem>
         <para>By default, a new bootloader (Grub2-efi) will be written into
         the ESP (EFI System Partition).</para>
+
         <para>If there are already UEFI-based operating systems installed on
         your computer (Windows 8 for example), the Mageia installer will
         detect the existing ESP created by Windows and add grub2-efi to it. If
@@ -41,12 +66,15 @@ Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
       </listitem>
     </itemizedlist>
   </section>
+
   <section>
     <info>
       <title xml:id="setupBootloader-ti2">Bootloader Setup</title>
     </info>
+
     <section>
       <title>Bootloader main options</title>
+
       <mediaobject>
         <imageobject condition="classical">
           <imagedata align="center" fileref="dx2-setupBootloader.png"/>
@@ -57,25 +85,33 @@ Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
                      xml:id="setupBootloader-im1"/>
         </imageobject>
       </mediaobject>
+
       <itemizedlist>
         <listitem>
           <para><emphasis role="bold">Bootloader to use</emphasis></para>
+
           <para>This feature is only available to Legacy MBR/BIOS systems.
           Users of UEFI systems will not see this option here.</para>
         </listitem>
+
         <listitem>
           <para><emphasis role="bold">Boot device</emphasis></para>
+
           <para>Don't change this unless you really know what you are
           doing</para>
         </listitem>
+
         <listitem>
           <para><emphasis role="bold">Delay before booting the default
           image</emphasis></para>
+
           <para>This text box lets you set a delay, in seconds, before the
           default operating system is started up.</para>
         </listitem>
+
         <listitem>
           <para><emphasis role="bold">Security</emphasis></para>
+
           <para>This allows you to set a password for the bootloader. This
           means a username and password will be required when booting in order
           to select a booting entry or change settings. This is optional, and
@@ -83,20 +119,27 @@ Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
           <literal>root</literal> and the password is the one chosen
           hereafter.</para>
         </listitem>
+
         <listitem>
           <para><emphasis role="bold">Password</emphasis></para>
+
           <para>Choose a password for the bootloader (optional)</para>
         </listitem>
+
         <listitem>
           <para><emphasis role="bold">Password (again)</emphasis></para>
+
           <para>Retype the password and DrakX will check that it matches with
           the one set above</para>
         </listitem>
       </itemizedlist>
+
       <para><emphasis>Advanced</emphasis></para>
+
       <itemizedlist>
         <listitem>
           <para><emphasis>Enable ACPI</emphasis></para>
+
           <para>ACPI (Advanced Configuration and Power Interface) is a
           standard for power management. It can save energy by stopping unused
           devices. Deselecting it could be useful if, for example, your
@@ -104,72 +147,92 @@ Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
           implementation might cause some problems (for instance random
           reboots or system lockups).</para>
         </listitem>
+
         <listitem>
           <para><emphasis>Enable SMP</emphasis></para>
+
           <para>This option enables/disables symmetric multiprocessing for
           multi-core processors</para>
         </listitem>
+
         <listitem>
           <para><emphasis>Enable APIC</emphasis></para>
+
           <para>Enabling this gives the operating system access to the
           Advanced Programmable Interrupt Controller. APIC devices permit more
           complex priority models, and Advanced IRQ (Interrupt Request)
           management.</para>
         </listitem>
+
         <listitem>
           <para><emphasis>Enable Local APIC</emphasis></para>
+
           <para>Here you can set Local APIC, which manages all external
           interrupts for a specific processor in an SMP system</para>
         </listitem>
       </itemizedlist>
     </section>
+
     <section>
       <title>Bootloader Configuration</title>
+
       <mediaobject>
-      <imageobject condition="classical">
-        <imagedata align="center" fileref="dx2-setupBootloader3.png"/>
-      </imageobject>
-
-      <imageobject condition="live">
-        <imagedata align="center" fileref="live-setupBootloader3.png"/>
-      </imageobject>
-    </mediaobject>
+        <imageobject condition="classical">
+          <imagedata align="center" fileref="dx2-setupBootloader3.png"/>
+        </imageobject>
+
+        <imageobject condition="live">
+          <imagedata align="center" fileref="live-setupBootloader3.png"/>
+        </imageobject>
+      </mediaobject>
+
       <itemizedlist>
         <listitem>
           <para><emphasis role="bold">Default</emphasis></para>
-          <para>The operating system to started up by default</para>
+
+          <para>The operating system to be started up by default.</para>
         </listitem>
+
         <listitem>
           <para><emphasis role="bold">Append</emphasis></para>
+
           <para>This option lets you pass information to the kernel or tell
-          the kernel to give you more information as it boots</para>
+          the kernel to give you more information as it boots.</para>
         </listitem>
+
         <listitem>
           <para><emphasis role="bold">Probe foreign OS</emphasis></para>
+
           <para>If you already have other operating systems installed, Mageia
           attempts to add them to your new Mageia boot menu. If you don't want
           this behaviour, then untick the Probe Foreign OS option.</para>
         </listitem>
       </itemizedlist>
+
       <para><emphasis>Advanced</emphasis></para>
+
       <mediaobject>
-      <imageobject condition="classical">
-        <imagedata align="center" fileref="dx2-setupBootloader4.png"/>
-      </imageobject>
-
-      <imageobject condition="live">
-        <imagedata align="center" fileref="live-setupBootloader4.png"/>
-      </imageobject>
-    </mediaobject>
+        <imageobject condition="classical">
+          <imagedata align="center" fileref="dx2-setupBootloader4.png"/>
+        </imageobject>
+
+        <imageobject condition="live">
+          <imagedata align="center" fileref="live-setupBootloader4.png"/>
+        </imageobject>
+      </mediaobject>
+
       <itemizedlist>
         <listitem>
           <para><emphasis>Video mode</emphasis></para>
+
           <para>This sets the screen size and colour depth to be used by the
           boot menu. If you click the down-triangle you will be offered other
           size and colour depth options.</para>
         </listitem>
+
         <listitem>
           <para><emphasis>Do not touch ESP or MBR</emphasis></para>
+
           <para>Select this option if you don't want a bootable Mageia, but
           would rather chain-load it from another OS. You will get a warning
           that the bootloader is missing. Click<emphasis> Ok</emphasis> if you
@@ -177,17 +240,21 @@ Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
           proceed.</para>
         </listitem>
       </itemizedlist>
+
       <mediaobject>
         <imageobject>
-          <imagedata fileref="live-setupBootloader5.png" align="center"/>
+          <imagedata align="center" fileref="live-setupBootloader5.png"/>
         </imageobject>
       </mediaobject>
     </section>
   </section>
+
   <section>
     <title>Other Options</title>
+
     <section>
       <title>Using an existing bootloader</title>
+
       <para>The exact procedure for adding Mageia to an existing bootloader is
       beyond the scope of this documentation. However in most cases it will
       involve running the relevant bootloader installation program, which
@@ -195,22 +262,17 @@ Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
       bootloader menu. See the documentation for the relevant operating
       system.</para>
     </section>
+
     <section>
       <title>Installing Without a Bootloader</title>
+
       <para>While you can opt to install Mageia without a bootloader (see
       section 2.1 Advanced), this is not recommended unless you absolutely
       know what you are doing, as without some form of bootloader your
       operating system will be unable to start.</para>
     </section>
-    <section>
-      <title>Add or Modify a Boot Menu Entry</title>
-      <para>To do this you need to manually edit
-      <filename>/boot/grub2/custom.cfg</filename> or use the software
-      <application>grub-customizer</application> tool instead (available in
-      the Mageia repositories).</para>
-      <note>
-        <para>For more information, see: <link ns4:href="https://wiki.mageia.org/en/Grub2-efi_and_Mageia">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link></para>
-      </note>
-    </section>
+
+    <xi:include href="setupBootloaderAddEntry.xml"
+                xmlns:xi="http://www.w3.org/2001/XInclude"/>
   </section>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/help.pot b/docs/docs/stable/installer/help.pot
index de36542c..507f6336 100644
--- a/docs/docs/stable/installer/help.pot
+++ b/docs/docs/stable/installer/help.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia Installer Help 6.0\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2019-01-13 16:48+0200\n"
+"POT-Creation-Date: 2019-01-15 12:24+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"
@@ -229,7 +229,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:88 en/setupBootloader.xml:87
+#: en/addUser.xml:88 en/setupBootloader.xml:124
 msgid "<emphasis role=\"bold\">Password</emphasis>"
 msgstr ""
 
@@ -3537,8 +3537,8 @@ msgid ""
 "on a mouse with six or more buttons."
 msgstr ""
 
-#. type: Content of: <section><section><section><title>
-#: en/setupBootloaderAddEntry.xml:7 en/setupBootloader.xml:206
+#. type: Content of: <section><info><title>
+#: en/setupBootloaderAddEntry.xml:7
 msgid "Add or Modify a Boot Menu Entry"
 msgstr ""
 
@@ -3558,53 +3558,53 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:10
+#: en/setupBootloader.xml:27
 msgid "Bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:13
+#: en/setupBootloader.xml:31
 msgid "Grub2"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><title>
-#: en/setupBootloader.xml:15
+#: en/setupBootloader.xml:34
 msgid "Grub2 on Legacy MBR/GPT systems"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:17
+#: en/setupBootloader.xml:37
 msgid ""
 "GRUB2 (with or without graphical menu) will be used exclusively as the "
 "bootloader for a Legacy/MBR or Legacy/GPT system."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:21
+#: en/setupBootloader.xml:42
 msgid ""
 "By default, a new bootloader will be written into either the MBR (Master "
 "Boot Record) of your first hard drive or in the BIOS boot partition."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><title>
-#: en/setupBootloader.xml:27
+#: en/setupBootloader.xml:49
 msgid "Grub2-efi on UEFI systems"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:29
+#: en/setupBootloader.xml:52
 msgid "GRUB2-efi will be used exclusively as the bootloader for a UEFI system."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:33
+#: en/setupBootloader.xml:57
 msgid ""
 "By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI "
 "System Partition)."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:35
+#: en/setupBootloader.xml:60
 msgid ""
 "If there are already UEFI-based operating systems installed on your computer "
 "(Windows 8 for example), the Mageia installer will detect the existing ESP "
@@ -3614,17 +3614,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:46
+#: en/setupBootloader.xml:72
 msgid "Bootloader Setup"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:49
+#: en/setupBootloader.xml:76
 msgid "Bootloader main options"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:51
+#: en/setupBootloader.xml:79
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" "
 "fileref=\"dx2-setupBootloader.png\"/> </imageobject> <imageobject "
@@ -3633,46 +3633,46 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:62
+#: en/setupBootloader.xml:91
 msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:63
+#: en/setupBootloader.xml:93
 msgid ""
 "This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI "
 "systems will not see this option here."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:67
+#: en/setupBootloader.xml:98
 msgid "<emphasis role=\"bold\">Boot device</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:68
+#: en/setupBootloader.xml:100
 msgid "Don't change this unless you really know what you are doing"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:72
+#: en/setupBootloader.xml:105
 msgid "<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:74
+#: en/setupBootloader.xml:108
 msgid ""
 "This text box lets you set a delay, in seconds, before the default operating "
 "system is started up."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:78
+#: en/setupBootloader.xml:113
 msgid "<emphasis role=\"bold\">Security</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:79
+#: en/setupBootloader.xml:115
 msgid ""
 "This allows you to set a password for the bootloader. This means a username "
 "and password will be required when booting in order to select a booting "
@@ -3682,34 +3682,34 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:88
+#: en/setupBootloader.xml:126
 msgid "Choose a password for the bootloader (optional)"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:91
+#: en/setupBootloader.xml:130
 msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:92
+#: en/setupBootloader.xml:132
 msgid ""
 "Retype the password and DrakX will check that it matches with the one set "
 "above"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:96 en/setupBootloader.xml:154
+#: en/setupBootloader.xml:137 en/setupBootloader.xml:212
 msgid "<emphasis>Advanced</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:99
+#: en/setupBootloader.xml:141
 msgid "<emphasis>Enable ACPI</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:100
+#: en/setupBootloader.xml:143
 msgid ""
 "ACPI (Advanced Configuration and Power Interface) is a standard for power "
 "management. It can save energy by stopping unused devices. Deselecting it "
@@ -3719,24 +3719,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:108
+#: en/setupBootloader.xml:152
 msgid "<emphasis>Enable SMP</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:109
+#: en/setupBootloader.xml:154
 msgid ""
 "This option enables/disables symmetric multiprocessing for multi-core "
 "processors"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:113
+#: en/setupBootloader.xml:159
 msgid "<emphasis>Enable APIC</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:114
+#: en/setupBootloader.xml:161
 msgid ""
 "Enabling this gives the operating system access to the Advanced Programmable "
 "Interrupt Controller. APIC devices permit more complex priority models, and "
@@ -3744,24 +3744,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:168
 msgid "<emphasis>Enable Local APIC</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:121
+#: en/setupBootloader.xml:170
 msgid ""
 "Here you can set Local APIC, which manages all external interrupts for a "
 "specific processor in an SMP system"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:127
+#: en/setupBootloader.xml:177
 msgid "Bootloader Configuration"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:129
+#: en/setupBootloader.xml:180
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" "
 "fileref=\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject "
@@ -3770,34 +3770,34 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:139
+#: en/setupBootloader.xml:191
 msgid "<emphasis role=\"bold\">Default</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:140
-msgid "The operating system to started up by default"
+#: en/setupBootloader.xml:193
+msgid "The operating system to be started up by default."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:143
+#: en/setupBootloader.xml:197
 msgid "<emphasis role=\"bold\">Append</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:144
+#: en/setupBootloader.xml:199
 msgid ""
 "This option lets you pass information to the kernel or tell the kernel to "
-"give you more information as it boots"
+"give you more information as it boots."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:148
+#: en/setupBootloader.xml:204
 msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:149
+#: en/setupBootloader.xml:206
 msgid ""
 "If you already have other operating systems installed, Mageia attempts to "
 "add them to your new Mageia boot menu. If you don't want this behaviour, "
@@ -3805,7 +3805,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:156
+#: en/setupBootloader.xml:215
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" "
 "fileref=\"dx2-setupBootloader4.png\"/> </imageobject> <imageobject "
@@ -3814,12 +3814,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:166
+#: en/setupBootloader.xml:226
 msgid "<emphasis>Video mode</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:167
+#: en/setupBootloader.xml:228
 msgid ""
 "This sets the screen size and colour depth to be used by the boot menu. If "
 "you click the down-triangle you will be offered other size and colour depth "
@@ -3827,12 +3827,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:172
+#: en/setupBootloader.xml:234
 msgid "<emphasis>Do not touch ESP or MBR</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:173
+#: en/setupBootloader.xml:236
 msgid ""
 "Select this option if you don't want a bootable Mageia, but would rather "
 "chain-load it from another OS. You will get a warning that the bootloader is "
@@ -3841,24 +3841,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:181
+#: en/setupBootloader.xml:245
 msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" "
-"align=\"center\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" "
+"fileref=\"live-setupBootloader5.png\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:188
+#: en/setupBootloader.xml:253
 msgid "Other Options"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:190
+#: en/setupBootloader.xml:256
 msgid "Using an existing bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:191
+#: en/setupBootloader.xml:258
 msgid ""
 "The exact procedure for adding Mageia to an existing bootloader is beyond "
 "the scope of this documentation. However in most cases it will involve "
@@ -3868,12 +3868,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:199
+#: en/setupBootloader.xml:267
 msgid "Installing Without a Bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:200
+#: en/setupBootloader.xml:269
 msgid ""
 "While you can opt to install Mageia without a bootloader (see section 2.1 "
 "Advanced), this is not recommended unless you absolutely know what you are "
@@ -3881,22 +3881,6 @@ msgid ""
 "unable to start."
 msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:207
-msgid ""
-"To do this you need to manually edit "
-"<filename>/boot/grub2/custom.cfg</filename> or use the software "
-"<application>grub-customizer</application> tool instead (available in the "
-"Mageia repositories)."
-msgstr ""
-
-#. type: Content of: <section><section><section><note><para>
-#: en/setupBootloader.xml:212
-msgid ""
-"For more information, see: <link "
-"ns4:href=\"https://wiki.mageia.org/en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link>"
-msgstr ""
-
 #. type: Content of: <section><info><title>
 #: en/setupSCSI.xml:10
 msgid "Setup SCSI"