aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYuri Chornoivan <yurchor@ukr.net>2019-01-15 12:39:36 +0200
committerYuri Chornoivan <yurchor@ukr.net>2019-01-15 12:39:36 +0200
commitaf2eb433415907ab1be1e0b4d64ef9d0cd18eaf8 (patch)
tree50400375885c9df689e2912675f6b6002411bda6
parent6ebab8933cff36ae5b9dd0fa5874aa3348172bc7 (diff)
downloadtools-af2eb433415907ab1be1e0b4d64ef9d0cd18eaf8.tar
tools-af2eb433415907ab1be1e0b4d64ef9d0cd18eaf8.tar.gz
tools-af2eb433415907ab1be1e0b4d64ef9d0cd18eaf8.tar.bz2
tools-af2eb433415907ab1be1e0b4d64ef9d0cd18eaf8.tar.xz
tools-af2eb433415907ab1be1e0b4d64ef9d0cd18eaf8.zip
Update catalog
-rw-r--r--docs/docs/stable/installer/bg.po143
-rw-r--r--docs/docs/stable/installer/bg/setupBootloader.xml97
-rw-r--r--docs/docs/stable/installer/ca.po140
-rw-r--r--docs/docs/stable/installer/ca/setupBootloader.xml97
-rw-r--r--docs/docs/stable/installer/cs.po157
-rw-r--r--docs/docs/stable/installer/cs/setupBootloader.xml97
-rw-r--r--docs/docs/stable/installer/de.po168
-rw-r--r--docs/docs/stable/installer/de/setupBootloader.xml97
-rw-r--r--docs/docs/stable/installer/el.po133
-rw-r--r--docs/docs/stable/installer/el/setupBootloader.xml97
-rw-r--r--docs/docs/stable/installer/eo.po142
-rw-r--r--docs/docs/stable/installer/eo/setupBootloader.xml97
-rw-r--r--docs/docs/stable/installer/es.po169
-rw-r--r--docs/docs/stable/installer/es/setupBootloader.xml97
-rw-r--r--docs/docs/stable/installer/et.po170
-rw-r--r--docs/docs/stable/installer/et/setupBootloader.xml97
-rw-r--r--docs/docs/stable/installer/eu.po169
-rw-r--r--docs/docs/stable/installer/eu/setupBootloader.xml97
-rw-r--r--docs/docs/stable/installer/fr.po171
-rw-r--r--docs/docs/stable/installer/fr/setupBootloader.xml97
-rw-r--r--docs/docs/stable/installer/hi.po142
-rw-r--r--docs/docs/stable/installer/hi/setupBootloader.xml97
-rw-r--r--docs/docs/stable/installer/hr.po142
-rw-r--r--docs/docs/stable/installer/hr/setupBootloader.xml97
-rw-r--r--docs/docs/stable/installer/hu.po143
-rw-r--r--docs/docs/stable/installer/hu/setupBootloader.xml97
-rw-r--r--docs/docs/stable/installer/id.po154
-rw-r--r--docs/docs/stable/installer/id/setupBootloader.xml97
-rw-r--r--docs/docs/stable/installer/it.po156
-rw-r--r--docs/docs/stable/installer/it/setupBootloader.xml97
-rw-r--r--docs/docs/stable/installer/ja.po134
-rw-r--r--docs/docs/stable/installer/ja/setupBootloader.xml97
-rw-r--r--docs/docs/stable/installer/nb.po168
-rw-r--r--docs/docs/stable/installer/nb/setupBootloader.xml99
-rw-r--r--docs/docs/stable/installer/nl.po158
-rw-r--r--docs/docs/stable/installer/nl/setupBootloader.xml97
-rw-r--r--docs/docs/stable/installer/pl.po138
-rw-r--r--docs/docs/stable/installer/pl/setupBootloader.xml97
-rw-r--r--docs/docs/stable/installer/pt.po131
-rw-r--r--docs/docs/stable/installer/pt/setupBootloader.xml97
-rw-r--r--docs/docs/stable/installer/pt_BR.po170
-rw-r--r--docs/docs/stable/installer/pt_BR/setupBootloader.xml97
-rw-r--r--docs/docs/stable/installer/ro.po154
-rw-r--r--docs/docs/stable/installer/ro/setupBootloader.xml97
-rw-r--r--docs/docs/stable/installer/ru.po169
-rw-r--r--docs/docs/stable/installer/ru/setupBootloader.xml101
-rw-r--r--docs/docs/stable/installer/sk.po158
-rw-r--r--docs/docs/stable/installer/sk/setupBootloader.xml97
-rw-r--r--docs/docs/stable/installer/sl.po143
-rw-r--r--docs/docs/stable/installer/sl/setupBootloader.xml97
-rw-r--r--docs/docs/stable/installer/sq.po142
-rw-r--r--docs/docs/stable/installer/sq/setupBootloader.xml97
-rw-r--r--docs/docs/stable/installer/sv.po157
-rw-r--r--docs/docs/stable/installer/sv/setupBootloader.xml97
-rw-r--r--docs/docs/stable/installer/tg.po131
-rw-r--r--docs/docs/stable/installer/tg/setupBootloader.xml97
-rw-r--r--docs/docs/stable/installer/tr.po159
-rw-r--r--docs/docs/stable/installer/tr/setupBootloader.xml97
-rw-r--r--docs/docs/stable/installer/uk.po166
-rw-r--r--docs/docs/stable/installer/uk/setupBootloader.xml93
-rw-r--r--docs/docs/stable/installer/zh_CN.po168
-rw-r--r--docs/docs/stable/installer/zh_CN/setupBootloader.xml97
-rw-r--r--docs/docs/stable/installer/zh_TW.po131
-rw-r--r--docs/docs/stable/installer/zh_TW/setupBootloader.xml97
64 files changed, 4939 insertions, 3043 deletions
diff --git a/docs/docs/stable/installer/bg.po b/docs/docs/stable/installer/bg.po
index 9390874a..aeb3d8a4 100644
--- a/docs/docs/stable/installer/bg.po
+++ b/docs/docs/stable/installer/bg.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\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: 2018-09-06 14:19+0000\n"
"Last-Translator: Georgi Georgiev <georgiev_1994@abv.bg>\n"
"Language-Team: Bulgarian (http://www.transifex.com/MageiaLinux/mageia/"
@@ -242,7 +242,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 ""
@@ -3676,8 +3676,8 @@ msgid ""
"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 ""
@@ -3697,54 +3697,54 @@ msgid ""
msgstr ""
#. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:10
+#: en/setupBootloader.xml:27
#, fuzzy
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 "
@@ -3754,18 +3754,18 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:46
+#: en/setupBootloader.xml:72
#, fuzzy
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
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -3779,47 +3779,47 @@ msgstr ""
"imageobject>"
#. 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 "
@@ -3829,34 +3829,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 "
@@ -3866,24 +3866,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 "
@@ -3891,25 +3891,25 @@ 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
#, fuzzy
msgid "Bootloader Configuration"
msgstr "Конфигуриране на звука"
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:129
+#: en/setupBootloader.xml:180
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -3923,34 +3923,34 @@ msgstr ""
"imageobject>"
#. 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, "
@@ -3958,7 +3958,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:156
+#: en/setupBootloader.xml:215
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -3972,12 +3972,12 @@ msgstr ""
"imageobject>"
#. 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 "
@@ -3985,12 +3985,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 "
@@ -3999,28 +3999,26 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:181
+#: en/setupBootloader.xml:245
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align=\"center"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png"
"\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
-"imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:188
+#: en/setupBootloader.xml:253
#, fuzzy
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 "
@@ -4030,12 +4028,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 "
@@ -4043,21 +4041,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"
@@ -4402,6 +4385,14 @@ msgstr ""
#, fuzzy
#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align="
+#~ "\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
#~ "<imageobject> <imagedata fileref=\"live-bootCSM.png\" align=\"center\"/> "
#~ "</imageobject>"
#~ msgstr ""
diff --git a/docs/docs/stable/installer/bg/setupBootloader.xml b/docs/docs/stable/installer/bg/setupBootloader.xml
index adb00f9a..b4f035b8 100644
--- a/docs/docs/stable/installer/bg/setupBootloader.xml
+++ b/docs/docs/stable/installer/bg/setupBootloader.xml
@@ -1,10 +1,27 @@
-<?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:lang="bg" xml:id="setupBootloader">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="bg" 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">
+
+
+
+
+
+
+
+
+
+
<info>
<!--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-->
@@ -13,29 +30,39 @@ Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
<!--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.-->
<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 no ESP exists, then one will
@@ -44,155 +71,191 @@ required, whatever the number of operating systems you have.</para>
</listitem>
</itemizedlist>
</section>
+
<section>
<info>
<title xml:id="setupBootloader-ti2">Bootloader Setup</title>
</info>
+
<section>
<title>Опции на програмата за начално зареждане</title>
+
<mediaobject>
<imageobject condition="classical"> <imagedata align="center"
fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
condition="live"> <imagedata fileref="live-setupBootloader.png"
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 most people are not likely
to have a need for it. The username is <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 computer does not support ACPI or if
you think the ACPI 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>
+
<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>
+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>
+
<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 are sure you understand the
implications, and wish to proceed.</para>
</listitem>
</itemizedlist>
+
<mediaobject>
-<imageobject> <imagedata fileref="live-setupBootloader5.png"
-align="center"/> </imageobject></mediaobject>
+<imageobject> <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 should detect
Mageia and automatically add an entry for it in the 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/ca.po b/docs/docs/stable/installer/ca.po
index 8cb6c54e..dcc5b565 100644
--- a/docs/docs/stable/installer/ca.po
+++ b/docs/docs/stable/installer/ca.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\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: 2018-10-01 09:54+0000\n"
"Last-Translator: Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>\n"
"Language-Team: Catalan (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -266,7 +266,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
#, fuzzy
msgid "<emphasis role=\"bold\">Password</emphasis>"
msgstr "<emphasis>Proveïdor</emphasis>"
@@ -3927,8 +3927,8 @@ msgstr ""
"guilabel> per a configurar els botons que no funcionen en un ratolí de sis "
"botons o més."
-#. 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 "Addició o modificació d'una entrada al menú d'arrencada"
@@ -3948,54 +3948,54 @@ msgid ""
msgstr ""
#. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:10
+#: en/setupBootloader.xml:27
#, fuzzy
msgid "Bootloader"
msgstr "Opcions principals del menú d'arrencada"
#. 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 "
@@ -4005,18 +4005,18 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:46
+#: en/setupBootloader.xml:72
#, fuzzy
msgid "Bootloader Setup"
msgstr "Opcions principals del menú d'arrencada"
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:49
+#: en/setupBootloader.xml:76
msgid "Bootloader main options"
msgstr "Opcions principals del menú d'arrencada"
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:51
+#: en/setupBootloader.xml:79
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -4030,51 +4030,51 @@ msgstr ""
"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:62
+#: en/setupBootloader.xml:91
#, fuzzy
msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
msgstr "<emphasis>Proveïdor</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Boot device</emphasis>"
msgstr "<emphasis>Genèric</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:68
+#: en/setupBootloader.xml:100
#, fuzzy
msgid "Don't change this unless you really know what you are doing"
msgstr "Canvieu coses només si teniu molt clar què esteu fent."
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Security</emphasis>"
msgstr "<emphasis>Genèric</emphasis>"
#. 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 "
@@ -4084,37 +4084,37 @@ 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
#, fuzzy
msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
msgstr "<emphasis>Proveïdor</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis>Advanced</emphasis>"
msgstr "<emphasis>Proveïdor</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:99
+#: en/setupBootloader.xml:141
#, fuzzy
msgid "<emphasis>Enable ACPI</emphasis>"
msgstr "<emphasis>Genèric</emphasis>"
#. 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 "
@@ -4124,26 +4124,26 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:108
+#: en/setupBootloader.xml:152
#, fuzzy
msgid "<emphasis>Enable SMP</emphasis>"
msgstr "<emphasis>Genèric</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis>Enable APIC</emphasis>"
msgstr "<emphasis>Genèric</emphasis>"
#. 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 "
@@ -4151,26 +4151,26 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:168
#, fuzzy
msgid "<emphasis>Enable Local APIC</emphasis>"
msgstr "<emphasis>Genèric</emphasis>"
#. 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
#, fuzzy
msgid "Bootloader Configuration"
msgstr "Configuració del so"
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:129
+#: en/setupBootloader.xml:180
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -4184,37 +4184,37 @@ msgstr ""
"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:139
+#: en/setupBootloader.xml:191
#, fuzzy
msgid "<emphasis role=\"bold\">Default</emphasis>"
msgstr "<emphasis>Personalitzat</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Append</emphasis>"
msgstr "<emphasis>Proveïdor</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
msgstr "<emphasis>Proveïdor</emphasis>"
#. 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, "
@@ -4222,7 +4222,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:156
+#: en/setupBootloader.xml:215
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -4236,13 +4236,13 @@ msgstr ""
"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:166
+#: en/setupBootloader.xml:226
#, fuzzy
msgid "<emphasis>Video mode</emphasis>"
msgstr "<emphasis>Proveïdor</emphasis>"
#. 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 "
@@ -4250,13 +4250,13 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:172
+#: en/setupBootloader.xml:234
#, fuzzy
msgid "<emphasis>Do not touch ESP or MBR</emphasis>"
msgstr "<emphasis>Proveïdor</emphasis>"
#. 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 "
@@ -4265,26 +4265,27 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:181
+#: en/setupBootloader.xml:245
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align=\"center"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png"
"\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+msgstr ""
+"<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:188
+#: en/setupBootloader.xml:253
#, fuzzy
msgid "Other Options"
msgstr "Opcions"
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:190
+#: en/setupBootloader.xml:256
msgid "Using an existing bootloader"
msgstr "Ús d'un gestor d'arrencada existent"
#. 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 "
@@ -4294,13 +4295,13 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:199
+#: en/setupBootloader.xml:267
#, fuzzy
msgid "Installing Without a Bootloader"
msgstr "Ús del gestor d'arrencada de Mageia"
#. 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 "
@@ -4308,21 +4309,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"
@@ -4670,6 +4656,12 @@ msgstr ""
#, fuzzy
#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align="
+#~ "\"center\"/> </imageobject>"
+#~ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
#~ "<imageobject> <imagedata fileref=\"live-bootCSM.png\" align=\"center\"/> "
#~ "</imageobject>"
#~ msgstr ""
diff --git a/docs/docs/stable/installer/ca/setupBootloader.xml b/docs/docs/stable/installer/ca/setupBootloader.xml
index 21f6a222..8f6b546d 100644
--- a/docs/docs/stable/installer/ca/setupBootloader.xml
+++ b/docs/docs/stable/installer/ca/setupBootloader.xml
@@ -1,10 +1,27 @@
-<?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:lang="ca" xml:id="setupBootloader">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ca" 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">
+
+
+
+
+
+
+
+
+
+
<info>
<!--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-->
@@ -13,29 +30,39 @@ Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
<!--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.-->
<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 no ESP exists, then one will
@@ -44,155 +71,191 @@ required, whatever the number of operating systems you have.</para>
</listitem>
</itemizedlist>
</section>
+
<section>
<info>
<title xml:id="setupBootloader-ti2">Bootloader Setup</title>
</info>
+
<section>
<title>Opcions principals del menú d'arrencada</title>
+
<mediaobject>
<imageobject condition="classical"> <imagedata align="center"
fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
condition="live"> <imagedata fileref="live-setupBootloader.png"
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 most people are not likely
to have a need for it. The username is <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 computer does not support ACPI or if
you think the ACPI 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>
+
<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>
+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>
+
<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 are sure you understand the
implications, and wish to proceed.</para>
</listitem>
</itemizedlist>
+
<mediaobject>
-<imageobject> <imagedata fileref="live-setupBootloader5.png"
-align="center"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center"
+fileref="live-setupBootloader5.png"/> </imageobject></mediaobject>
</section>
</section>
+
<section>
<title>Other Options</title>
+
<section>
<title>Ús d'un gestor d'arrencada existent</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 should detect
Mageia and automatically add an entry for it in the 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>Addició o modificació d'una entrada al menú d'arrencada</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/cs.po b/docs/docs/stable/installer/cs.po
index 067a6086..8caf29d2 100644
--- a/docs/docs/stable/installer/cs.po
+++ b/docs/docs/stable/installer/cs.po
@@ -17,7 +17,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\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: 2018-02-04 10:32+0000\n"
"Last-Translator: fri\n"
"Language-Team: Czech (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -321,7 +321,7 @@ msgstr ""
"velikost písmen.</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Password</emphasis>"
msgstr "<emphasis role=\"bold\">Pokročilé</emphasis>"
@@ -4576,8 +4576,8 @@ msgstr ""
"guilabel> pro nastavení tlačítek, která nefungují na myši mající šest nebo "
"více tlačítek."
-#. 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 "Přidaní nebo změna položky v nabídce zavaděče"
@@ -4601,56 +4601,56 @@ msgstr ""
"efi_and_Mageia</link>"
#. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:10
+#: en/setupBootloader.xml:27
#, fuzzy
msgid "Bootloader"
msgstr "Rozhraní zavaděče"
#. 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
#, fuzzy
msgid "Grub2 on Legacy MBR/GPT systems"
msgstr "Grub2 na systémech Legacy/MBR a Legacy/GPT"
#. 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
#, fuzzy
msgid "Grub2-efi on UEFI systems"
msgstr "Grub2-efi na UEFI systémech"
#. 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
#, fuzzy
msgid ""
"If there are already UEFI-based operating systems installed on your computer "
@@ -4668,18 +4668,18 @@ msgstr ""
"systémů, které máte v počítači."
#. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:46
+#: en/setupBootloader.xml:72
#, fuzzy
msgid "Bootloader Setup"
msgstr "Rozhraní zavaděče"
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:49
+#: en/setupBootloader.xml:76
msgid "Bootloader main options"
msgstr "Základní nastavení zaváděcího programu"
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:51
+#: en/setupBootloader.xml:79
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -4693,52 +4693,52 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:62
+#: en/setupBootloader.xml:91
#, fuzzy
msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
msgstr "<emphasis role=\"bold\">Pokročilé</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Boot device</emphasis>"
msgstr "<emphasis role=\"bold\">Pokročilé</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:68
+#: en/setupBootloader.xml:100
#, fuzzy
msgid "Don't change this unless you really know what you are doing"
msgstr "Věci měňte jen tehdy, když velmi dobře víte, co děláte."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:72
+#: en/setupBootloader.xml:105
#, fuzzy
msgid ""
"<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
msgstr "<emphasis role=\"bold\">Měnění velikostí oddílu:</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Security</emphasis>"
msgstr "<emphasis role=\"bold\">Pokročilé</emphasis>"
#. 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 "
@@ -4748,19 +4748,19 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:88
+#: en/setupBootloader.xml:126
#, fuzzy
msgid "Choose a password for the bootloader (optional)"
msgstr "<guilabel>Heslo</guilabel>: Do tohoto textového pole vložíte heslo"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:91
+#: en/setupBootloader.xml:130
#, fuzzy
msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
msgstr "<emphasis role=\"bold\">Měnění velikostí oddílu:</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:92
+#: en/setupBootloader.xml:132
#, fuzzy
msgid ""
"Retype the password and DrakX will check that it matches with the one set "
@@ -4770,19 +4770,19 @@ msgstr ""
"zda odpovídá heslu zadanému výše."
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:96 en/setupBootloader.xml:154
+#: en/setupBootloader.xml:137 en/setupBootloader.xml:212
#, fuzzy
msgid "<emphasis>Advanced</emphasis>"
msgstr "<emphasis role=\"bold\">Pokročilé</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:99
+#: en/setupBootloader.xml:141
#, fuzzy
msgid "<emphasis>Enable ACPI</emphasis>"
msgstr "<emphasis>Všeobecný</emphasis>"
#. 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 "
@@ -4792,26 +4792,26 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:108
+#: en/setupBootloader.xml:152
#, fuzzy
msgid "<emphasis>Enable SMP</emphasis>"
msgstr "<emphasis>Všeobecný</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis>Enable APIC</emphasis>"
msgstr "<emphasis>Všeobecný</emphasis>"
#. 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 "
@@ -4819,26 +4819,26 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:168
#, fuzzy
msgid "<emphasis>Enable Local APIC</emphasis>"
msgstr "<emphasis>Všeobecný</emphasis>"
#. 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
#, fuzzy
msgid "Bootloader Configuration"
msgstr "Nastavení zvuku"
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:129
+#: en/setupBootloader.xml:180
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -4852,37 +4852,37 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:139
+#: en/setupBootloader.xml:191
#, fuzzy
msgid "<emphasis role=\"bold\">Default</emphasis>"
msgstr "<emphasis role=\"bold\">Pokročilé</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Append</emphasis>"
msgstr "<emphasis role=\"bold\">Pokročilé</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
msgstr "<emphasis role=\"bold\">Pokročilé</emphasis>"
#. 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, "
@@ -4890,7 +4890,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:156
+#: en/setupBootloader.xml:215
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -4904,13 +4904,13 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:166
+#: en/setupBootloader.xml:226
#, fuzzy
msgid "<emphasis>Video mode</emphasis>"
msgstr "<emphasis>Dodavatel</emphasis>"
#. 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 "
@@ -4918,13 +4918,13 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:172
+#: en/setupBootloader.xml:234
#, fuzzy
msgid "<emphasis>Do not touch ESP or MBR</emphasis>"
msgstr "<emphasis>Dodavatel</emphasis>"
#. 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 "
@@ -4933,28 +4933,26 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:181
+#: en/setupBootloader.xml:245
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align=\"center"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png"
"\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
-"imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:188
+#: en/setupBootloader.xml:253
#, fuzzy
msgid "Other Options"
msgstr "Volby"
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:190
+#: en/setupBootloader.xml:256
msgid "Using an existing bootloader"
msgstr "Použití už existujícího zavaděče"
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:191
+#: en/setupBootloader.xml:258
#, fuzzy
msgid ""
"The exact procedure for adding Mageia to an existing bootloader is beyond "
@@ -4970,13 +4968,13 @@ msgstr ""
"systému, o nějž jde."
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:199
+#: en/setupBootloader.xml:267
#, fuzzy
msgid "Installing Without a Bootloader"
msgstr "Použití zavaděče Mageii"
#. 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 "
@@ -4984,25 +4982,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
-#, fuzzy
-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 ""
-"Pro více informací se podívejte na naše stránky: <link ns2:href=\"https://"
-"wiki.mageia.org/en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-"
-"efi_and_Mageia</link>"
-
#. type: Content of: <section><info><title>
#: en/setupSCSI.xml:10
msgid "Setup SCSI"
@@ -5413,6 +5392,24 @@ msgstr ""
#, fuzzy
#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align="
+#~ "\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ 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 ""
+#~ "Pro více informací se podívejte na naše stránky: <link ns2:href=\"https://"
+#~ "wiki.mageia.org/en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/"
+#~ "Grub2-efi_and_Mageia</link>"
+
+#, fuzzy
+#~ msgid ""
#~ "<imageobject> <imagedata fileref=\"live-bootCSM.png\" align=\"center\"/> "
#~ "</imageobject>"
#~ msgstr ""
diff --git a/docs/docs/stable/installer/cs/setupBootloader.xml b/docs/docs/stable/installer/cs/setupBootloader.xml
index c0001ceb..3e34c7da 100644
--- a/docs/docs/stable/installer/cs/setupBootloader.xml
+++ b/docs/docs/stable/installer/cs/setupBootloader.xml
@@ -1,10 +1,27 @@
-<?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:lang="cs" xml:id="setupBootloader">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="cs" 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">
+
+
+
+
+
+
+
+
+
+
<info>
<!--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-->
@@ -13,29 +30,39 @@ Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
<!--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.-->
<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 no ESP exists, then one will
@@ -44,155 +71,191 @@ required, whatever the number of operating systems you have.</para>
</listitem>
</itemizedlist>
</section>
+
<section>
<info>
<title xml:id="setupBootloader-ti2">Bootloader Setup</title>
</info>
+
<section>
<title>Základní nastavení zaváděcího programu</title>
+
<mediaobject>
<imageobject condition="classical"> <imagedata align="center"
fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
condition="live"> <imagedata fileref="live-setupBootloader.png"
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 most people are not likely
to have a need for it. The username is <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 computer does not support ACPI or if
you think the ACPI 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>
+
<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>
+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>
+
<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 are sure you understand the
implications, and wish to proceed.</para>
</listitem>
</itemizedlist>
+
<mediaobject>
-<imageobject> <imagedata fileref="live-setupBootloader5.png"
-align="center"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center"
+fileref="live-setupBootloader5.png"/> </imageobject></mediaobject>
</section>
</section>
+
<section>
<title>Other Options</title>
+
<section>
<title>Použití už existujícího zavaděče</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 should detect
Mageia and automatically add an entry for it in the 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>Přidaní nebo změna položky v nabídce zavaděče</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/de.po b/docs/docs/stable/installer/de.po
index 439d11a0..06278a3e 100644
--- a/docs/docs/stable/installer/de.po
+++ b/docs/docs/stable/installer/de.po
@@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\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: 2019-01-13 20:16+0000\n"
"Last-Translator: psyca\n"
"Language-Team: German (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -276,7 +276,7 @@ msgstr ""
"\"bold\">Der Anmeldename beachtet die Groß-/Kleinschreibung</emphasis>."
#. 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 "<emphasis role=\"bold\">Passwort</emphasis>"
@@ -4145,8 +4145,8 @@ msgid ""
"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 "Hinzufügen oder ändern eines Bootmenü-Eintrag"
@@ -4172,29 +4172,29 @@ msgstr ""
"en/Grub2-efi_and_Mageia</link>"
#. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:10
+#: en/setupBootloader.xml:27
msgid "Bootloader"
msgstr "Bootloader"
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:13
+#: en/setupBootloader.xml:31
msgid "Grub2"
msgstr "GRUB2"
#. type: Content of: <section><section><itemizedlist><title>
-#: en/setupBootloader.xml:15
+#: en/setupBootloader.xml:34
msgid "Grub2 on Legacy MBR/GPT systems"
msgstr "GRUB2 auf Legacy MBR/GPT Systeme"
#. 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."
@@ -4204,17 +4204,17 @@ msgstr ""
"geschrieben."
#. type: Content of: <section><section><itemizedlist><title>
-#: en/setupBootloader.xml:27
+#: en/setupBootloader.xml:49
msgid "Grub2-efi on UEFI systems"
msgstr "Grub2-efi auf UEFI-Systeme"
#. 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)."
@@ -4223,7 +4223,7 @@ msgstr ""
"Systempartition) geschrieben."
#. 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 "
@@ -4233,17 +4233,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 "Hauptoptionen des Bootloaders"
#. 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 condition=\"live"
@@ -4256,12 +4256,12 @@ msgstr ""
"im1\"/> </imageobject>"
#. 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 "<emphasis role=\"bold\">Zu verwendender Bootloader</emphasis>"
#. 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."
@@ -4270,17 +4270,17 @@ msgstr ""
"eines UEFI-Systems wird diese Auswahl nicht angezeigt."
#. 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 "<emphasis role=\"bold\">Boot-Gerät</emphasis>"
#. 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 "Ändern Sie hier nichts, außer Sie wissen genau, was Sie tun"
#. 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 ""
@@ -4288,7 +4288,7 @@ msgstr ""
"Betriebssystems</emphasis>"
#. 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."
@@ -4297,12 +4297,12 @@ msgstr ""
"Wartezeit ist, bis das voreingestellte Betriebssystem gestartet wird."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:78
+#: en/setupBootloader.xml:113
msgid "<emphasis role=\"bold\">Security</emphasis>"
msgstr "<emphasis role=\"bold\">Sicherheit</emphasis>"
#. 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 "
@@ -4312,17 +4312,17 @@ 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 "Wähle ein Passwort für den Bootloader (optional)"
#. 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 "<emphasis role=\"bold\">Passwort (erneut)</emphasis>"
#. 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"
@@ -4331,17 +4331,17 @@ msgstr ""
"eingegebenen übereinstimmt."
#. 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 "<emphasis>Fortgeschrittene Optionen</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:99
+#: en/setupBootloader.xml:141
msgid "<emphasis>Enable ACPI</emphasis>"
msgstr "<emphasis>APIC aktivieren</emphasis>"
#. 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 "
@@ -4358,12 +4358,12 @@ msgstr ""
"Neustarts oder Systemhänger)."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:108
+#: en/setupBootloader.xml:152
msgid "<emphasis>Enable SMP</emphasis>"
msgstr "<emphasis>SMP aktivieren</emphasis>"
#. 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"
@@ -4372,12 +4372,12 @@ msgstr ""
"Multiprozessorsysteme."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:113
+#: en/setupBootloader.xml:159
msgid "<emphasis>Enable APIC</emphasis>"
msgstr "<emphasis>APIC aktivieren</emphasis>"
#. 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 "
@@ -4385,12 +4385,12 @@ 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 "<emphasis>Lokales APIC aktivieren</emphasis>"
#. 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"
@@ -4400,12 +4400,12 @@ msgstr ""
"verwaltet."
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:127
+#: en/setupBootloader.xml:177
msgid "Bootloader Configuration"
msgstr "Konfiguration des Bootloaders"
#. 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 condition=\"live"
@@ -4418,34 +4418,35 @@ msgstr ""
"imageobject>"
#. 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
+#, fuzzy
+msgid "The operating system to be started up by default."
msgstr "Das Betriebssystem, welches standardmäßig gestartet wird"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:143
+#: en/setupBootloader.xml:197
msgid "<emphasis role=\"bold\">Append</emphasis>"
msgstr "<emphasis role=\"bold\">Hinzufügen / Erweitern</emphasis>"
#. 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 "<emphasis role=\"bold\">Fremdes OS testen</emphasis>"
#. 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, "
@@ -4456,7 +4457,7 @@ msgstr ""
"entferne die Auswahl in der Box Fremdes OS testen."
#. 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 condition=\"live"
@@ -4469,12 +4470,12 @@ msgstr ""
"imageobject>"
#. 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 "
@@ -4482,12 +4483,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 "<emphasis>Verändere nichts an der ESP oder dem MBR</emphasis>"
#. 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 "
@@ -4496,26 +4497,27 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:181
+#: en/setupBootloader.xml:245
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align=\"center"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png"
"\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align=\"center"
-"\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot2.png\"/> </"
+"imageobject>"
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:188
+#: en/setupBootloader.xml:253
msgid "Other Options"
msgstr "Weitere Optionen"
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:190
+#: en/setupBootloader.xml:256
msgid "Using an existing bootloader"
msgstr "Verwenden eines bestehenden Bootloaders"
#. 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 "
@@ -4525,12 +4527,12 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:199
+#: en/setupBootloader.xml:267
msgid "Installing Without a Bootloader"
msgstr "Ohne Bootloader installieren"
#. 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 "
@@ -4538,27 +4540,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 ""
-"Um dies zu tun, müssen Sie <filename>/boot/grub2/custom.cfg</filename> "
-"manuell editieren oder stattdessen die Software <application>grub-"
-"customizer</application> verwenden (Verfügbar in den Mageia Repositorys)."
-
-#. 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 ""
-"Weitere Informationen finden Sie unter <link ns4:href=\"https://wiki.mageia."
-"org/en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/de/Grub2-"
-"efi_und_Mageia</link>"
-
#. type: Content of: <section><info><title>
#: en/setupSCSI.xml:10
msgid "Setup SCSI"
@@ -4934,3 +4915,28 @@ msgid ""
"take a little while to complete. When it is finishing you will briefly get a "
"blank screen - this is normal."
msgstr ""
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align="
+#~ "\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align="
+#~ "\"center\"/> </imageobject>"
+
+#~ 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 ""
+#~ "Um dies zu tun, müssen Sie <filename>/boot/grub2/custom.cfg</filename> "
+#~ "manuell editieren oder stattdessen die Software <application>grub-"
+#~ "customizer</application> verwenden (Verfügbar in den Mageia Repositorys)."
+
+#~ 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 ""
+#~ "Weitere Informationen finden Sie unter <link ns4:href=\"https://wiki."
+#~ "mageia.org/en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/de/Grub2-"
+#~ "efi_und_Mageia</link>"
diff --git a/docs/docs/stable/installer/de/setupBootloader.xml b/docs/docs/stable/installer/de/setupBootloader.xml
index b3864a76..3c9843a4 100644
--- a/docs/docs/stable/installer/de/setupBootloader.xml
+++ b/docs/docs/stable/installer/de/setupBootloader.xml
@@ -1,10 +1,27 @@
-<?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:lang="de" xml:id="setupBootloader">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="de" 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">
+
+
+
+
+
+
+
+
+
+
<info>
<!--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-->
@@ -13,30 +30,40 @@ Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
<!--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.-->
<title xml:id="setupBootloader-ti1">Bootloader</title>
</info>
+
<section>
<title>GRUB2</title>
+
<itemizedlist>
<title>GRUB2 auf Legacy MBR/GPT Systeme</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>Als Voreinstellung wird ein neuer Bootloader entweder in den MBR (Master
Boot Record) Ihrer ersten Festplatte, oder in die BIOS Bootpartition,
geschrieben.</para>
</listitem>
</itemizedlist>
+
<itemizedlist>
<title>Grub2-efi auf UEFI-Systeme</title>
+
<listitem>
<para>GRUB2-efi will be used exclusively as the bootloader for a UEFI system.</para>
</listitem>
+
<listitem>
<para>Als Voreinstellung wird ein neuer Bootloader (Grub2-efi) in die ESP (EFI
Systempartition) geschrieben.</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 no ESP exists, then one will
@@ -45,55 +72,73 @@ required, whatever the number of operating systems you have.</para>
</listitem>
</itemizedlist>
</section>
+
<section>
<info>
<title xml:id="setupBootloader-ti2">Bootloader Setup</title>
</info>
+
<section>
<title>Hauptoptionen des Bootloaders</title>
+
<mediaobject>
<imageobject condition="classical"> <imagedata align="center"
fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
condition="live"> <imagedata fileref="live-setupBootloader.png"
xml:id="setupBootloader-im1"/> </imageobject></mediaobject>
+
<itemizedlist>
<listitem>
<para><emphasis role="bold">Zu verwendender Bootloader</emphasis></para>
+
<para>Diese Eigenschaft ist nur auf Legacy MBR/BIOS Systeme verfügbar. Nutzer
eines UEFI-Systems wird diese Auswahl nicht angezeigt.</para>
</listitem>
+
<listitem>
<para><emphasis role="bold">Boot-Gerät</emphasis></para>
+
<para>Ändern Sie hier nichts, außer Sie wissen genau, was Sie tun</para>
</listitem>
+
<listitem>
<para><emphasis role="bold">Wartezeit vor dem Starten des
Standard-Betriebssystems</emphasis></para>
+
<para>In diesem Textfeld kann, in Sekunden, eingestellt werden, wie lange die
Wartezeit ist, bis das voreingestellte Betriebssystem gestartet wird.</para>
</listitem>
+
<listitem>
<para><emphasis role="bold">Sicherheit</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 most people are not likely
to have a need for it. The username is <literal>root</literal> and the
password is the one chosen hereafter.</para>
</listitem>
+
<listitem>
<para><emphasis role="bold">Passwort</emphasis></para>
+
<para>Wähle ein Passwort für den Bootloader (optional)</para>
</listitem>
+
<listitem>
<para><emphasis role="bold">Passwort (erneut)</emphasis></para>
+
<para>Gebe das Passwort erneut ein und DrakX überprüft, ob dieses mit dem oben
eingegebenen übereinstimmt.</para>
</listitem>
</itemizedlist>
+
<para><emphasis>Fortgeschrittene Optionen</emphasis></para>
+
<itemizedlist>
<listitem>
<para><emphasis>APIC aktivieren</emphasis></para>
+
<para>ACPI (Advanced Configuration and Power Interface) ist ein Standard für die
Energieverwaltung. Es kann durch das Abschalten von ungenutzten Geräten
Strom sparen, was eine Methode ist, welche damals vor APM verwendet
@@ -102,102 +147,120 @@ Beispiel, Ihr Computer ACPI nicht unterstützt oder falls Sie finden, dass
die ACPI Implementierung einige Probleme verursacht (als Beispiel wären
zufällige Neustarts oder Systemhänger).</para>
</listitem>
+
<listitem>
<para><emphasis>SMP aktivieren</emphasis></para>
+
<para>Diese Auswahl aktiviert/deaktiviert das symmetrische Multiprocessing für
Multiprozessorsysteme.</para>
</listitem>
+
<listitem>
<para><emphasis>APIC aktivieren</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>Lokales APIC aktivieren</emphasis></para>
+
<para>Hier können Sie das lokale APIC auswählen, welches alle externen Interrupts
(Unterbrechungen) für einen bestimmten Prozessor in einem SMP-System
verwaltet.</para>
</listitem>
</itemizedlist>
</section>
+
<section>
<title>Konfiguration des Bootloaders</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>
+
<itemizedlist>
<listitem>
<para><emphasis role="bold">Default</emphasis></para>
- <para>Das Betriebssystem, welches standardmäßig gestartet wird</para>
+
+ <para>The operating system to be started up by default.</para>
</listitem>
+
<listitem>
<para><emphasis role="bold">Hinzufügen / Erweitern</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>
+give you more information as it boots.</para>
</listitem>
+
<listitem>
<para><emphasis role="bold">Fremdes OS testen</emphasis></para>
+
<para>Falls Sie bereits andere Betriebssysteme installiert haben wird Mageia diese
in Ihr neues Mageia Bootmenü hinzufügen. Falls Sie dies nicht möchten,
entferne die Auswahl in der Box Fremdes OS testen.</para>
</listitem>
</itemizedlist>
+
<para><emphasis>Fortgeschrittene Optionen</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>
+
<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>Verändere nichts an der ESP oder dem 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 are sure you understand the
implications, and wish to proceed.</para>
</listitem>
</itemizedlist>
+
<mediaobject>
-<imageobject> <imagedata fileref="live-setupBootloader5.png"
-align="center"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center"
+fileref="live-setupBootloader5.png"/> </imageobject></mediaobject>
</section>
</section>
+
<section>
<title>Weitere Optionen</title>
+
<section>
<title>Verwenden eines bestehenden Bootloaders</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 should detect
Mageia and automatically add an entry for it in the bootloader menu. See the
documentation for the relevant operating system.</para>
</section>
+
<section>
<title>Ohne Bootloader installieren</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>Hinzufügen oder ändern eines Bootmenü-Eintrag</title>
- <para>Um dies zu tun, müssen Sie <filename>/boot/grub2/custom.cfg</filename>
-manuell editieren oder stattdessen die Software
-<application>grub-customizer</application> verwenden (Verfügbar in den
-Mageia Repositorys).</para>
- <note>
- <para>Weitere Informationen finden Sie unter <link
-ns4:href="https://wiki.mageia.org/en/Grub2-efi_and_Mageia">https://wiki.mageia.org/de/Grub2-efi_und_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/el.po b/docs/docs/stable/installer/el.po
index 76c2573f..8efa51b2 100644
--- a/docs/docs/stable/installer/el.po
+++ b/docs/docs/stable/installer/el.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\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: 2019-01-11 05:47+0000\n"
"Last-Translator: Dimitrios Glentadakis <dglent@free.fr>\n"
"Language-Team: Greek (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -297,7 +297,7 @@ msgstr ""
"σύνδεσης κάνει διάκριση μεταξύ πεζών και κεφαλαίων.</emphasis>"
#. 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 "<emphasis role=\"bold\">Κωδικός πρόσβασης</emphasis>"
@@ -3925,8 +3925,8 @@ msgid ""
"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 "Προσθήκη ή επεξεργασία μιας καταχώρησης στο μενού Εκκίνησης"
@@ -3952,53 +3952,53 @@ msgstr ""
"efi_and_Mageia</link>"
#. 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 "Grub2 σε συστήματα UEFI"
#. 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 "
@@ -4008,17 +4008,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 condition=\"live"
@@ -4027,47 +4027,47 @@ 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 "
@@ -4077,34 +4077,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 "
@@ -4114,24 +4114,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 "
@@ -4139,24 +4139,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 condition=\"live"
@@ -4165,34 +4165,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, "
@@ -4200,7 +4200,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 condition=\"live"
@@ -4209,12 +4209,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 "
@@ -4222,12 +4222,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 "
@@ -4236,24 +4236,26 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:181
+#: en/setupBootloader.xml:245
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align=\"center"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png"
"\"/> </imageobject>"
msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
#. 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 "
@@ -4263,12 +4265,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 "
@@ -4276,21 +4278,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"
diff --git a/docs/docs/stable/installer/el/setupBootloader.xml b/docs/docs/stable/installer/el/setupBootloader.xml
index d60c2aed..7dc5db55 100644
--- a/docs/docs/stable/installer/el/setupBootloader.xml
+++ b/docs/docs/stable/installer/el/setupBootloader.xml
@@ -1,10 +1,27 @@
-<?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:lang="el" xml:id="setupBootloader">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="el" 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">
+
+
+
+
+
+
+
+
+
+
<info>
<!--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-->
@@ -13,29 +30,39 @@ Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
<!--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.-->
<title xml:id="setupBootloader-ti1">Πρόγραμμα εκκίνησης</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 σε συστήματα UEFI</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 no ESP exists, then one will
@@ -44,155 +71,191 @@ required, whatever the number of operating systems you have.</para>
</listitem>
</itemizedlist>
</section>
+
<section>
<info>
<title xml:id="setupBootloader-ti2">Bootloader Setup</title>
</info>
+
<section>
<title>Κύριες επιλογές του προγράμματος εκκίνησης</title>
+
<mediaobject>
<imageobject condition="classical"> <imagedata align="center"
fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
condition="live"> <imagedata fileref="live-setupBootloader.png"
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 most people are not likely
to have a need for it. The username is <literal>root</literal> and the
password is the one chosen hereafter.</para>
</listitem>
+
<listitem>
<para><emphasis role="bold">Κωδικός πρόσβασης</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 computer does not support ACPI or if
you think the ACPI 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>Ρύθμιση του προγράμματος εκκίνησης</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>
+
<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>
+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>
+
<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 are sure you understand the
implications, and wish to proceed.</para>
</listitem>
</itemizedlist>
+
<mediaobject>
-<imageobject> <imagedata fileref="live-setupBootloader5.png"
-align="center"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center"
+fileref="live-setupBootloader5.png"/> </imageobject></mediaobject>
</section>
</section>
+
<section>
<title>Άλλες επιλογές</title>
+
<section>
<title>Χρήση ενός υπάρχοντος μενού εκκίνησης</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 should detect
Mageia and automatically add an entry for it in the 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>Προσθήκη ή επεξεργασία μιας καταχώρησης στο μενού Εκκίνησης</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/eo.po b/docs/docs/stable/installer/eo.po
index 7d4cdcfa..89183c10 100644
--- a/docs/docs/stable/installer/eo.po
+++ b/docs/docs/stable/installer/eo.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\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: 2016-07-17 11:38+0300\n"
"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
"Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
@@ -297,7 +297,7 @@ msgstr ""
"emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Password</emphasis>"
msgstr "\"Free space preceding (MiB)\" \"2\""
@@ -4220,8 +4220,8 @@ msgstr ""
"Selektu <guilabel>Universalan</guilabel> - <guilabel>Trudi evdev</guilabel> "
"por konfiguri la butonojn kiuj ne funkcias en muso kun ses aŭ pli butonoj."
-#. 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 ""
@@ -4241,54 +4241,54 @@ msgid ""
msgstr ""
#. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:10
+#: en/setupBootloader.xml:27
#, fuzzy
msgid "Bootloader"
msgstr "Lanĉilaj ĉefaj elektoj"
#. 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 "
@@ -4298,18 +4298,18 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:46
+#: en/setupBootloader.xml:72
#, fuzzy
msgid "Bootloader Setup"
msgstr "Lanĉilaj ĉefaj elektoj"
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:49
+#: en/setupBootloader.xml:76
msgid "Bootloader main options"
msgstr "Lanĉilaj ĉefaj elektoj"
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:51
+#: en/setupBootloader.xml:79
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -4322,52 +4322,52 @@ msgstr ""
"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:62
+#: en/setupBootloader.xml:91
#, fuzzy
msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
msgstr "\"Free space preceding (MiB)\" \"2\""
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Boot device</emphasis>"
msgstr "\"Free space preceding (MiB)\" \"2\""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:68
+#: en/setupBootloader.xml:100
#, fuzzy
msgid "Don't change this unless you really know what you are doing"
msgstr "Ŝanĝu aferojn nur se vi scias tre bone kion vi estas faranta."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:72
+#: en/setupBootloader.xml:105
#, fuzzy
msgid ""
"<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
msgstr "\"Free space preceding (MiB)\" \"2\""
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Security</emphasis>"
msgstr "\"Free space preceding (MiB)\" \"2\""
#. 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 "
@@ -4377,18 +4377,18 @@ 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
#, fuzzy
msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
msgstr "\"Free space preceding (MiB)\" \"2\""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:92
+#: en/setupBootloader.xml:132
#, fuzzy
msgid ""
"Retype the password and DrakX will check that it matches with the one set "
@@ -4399,17 +4399,17 @@ msgstr ""
"uzulaj pasvortaj teksto-skatoloj."
#. 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 "
@@ -4419,24 +4419,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 "
@@ -4444,25 +4444,25 @@ 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
#, fuzzy
msgid "Bootloader Configuration"
msgstr "Lanĉilaj ĉefaj elektoj"
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:129
+#: en/setupBootloader.xml:180
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -4475,37 +4475,37 @@ msgstr ""
"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:139
+#: en/setupBootloader.xml:191
#, fuzzy
msgid "<emphasis role=\"bold\">Default</emphasis>"
msgstr "\"Free space preceding (MiB)\" \"2\""
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Append</emphasis>"
msgstr "\"Free space preceding (MiB)\" \"2\""
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
msgstr "\"Free space preceding (MiB)\" \"2\""
#. 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, "
@@ -4513,7 +4513,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:156
+#: en/setupBootloader.xml:215
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -4526,12 +4526,12 @@ msgstr ""
"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
#. 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 "
@@ -4539,12 +4539,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 "
@@ -4553,27 +4553,26 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:181
+#: en/setupBootloader.xml:245
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align=\"center"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png"
"\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
-"\"></imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
#. 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 "Uzi ekzistantan lanĉilon"
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:191
+#: en/setupBootloader.xml:258
#, fuzzy
msgid ""
"The exact procedure for adding Mageia to an existing bootloader is beyond "
@@ -4588,13 +4587,13 @@ msgstr ""
"ĝin aŭtomate. Vidu la dokumentaron por la konkreta operacia sistemo."
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:199
+#: en/setupBootloader.xml:267
#, fuzzy
msgid "Installing Without a Bootloader"
msgstr "Uzi la lanĉilon de Magejo"
#. 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 "
@@ -4602,21 +4601,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"
@@ -4969,6 +4953,14 @@ msgstr ""
#, fuzzy
#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align="
+#~ "\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align="
+#~ "\"center\"></imagedata> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
#~ "<imageobject> <imagedata fileref=\"live-bootCSM.png\" align=\"center\"/> "
#~ "</imageobject>"
#~ msgstr ""
diff --git a/docs/docs/stable/installer/eo/setupBootloader.xml b/docs/docs/stable/installer/eo/setupBootloader.xml
index 27ed10eb..961314c8 100644
--- a/docs/docs/stable/installer/eo/setupBootloader.xml
+++ b/docs/docs/stable/installer/eo/setupBootloader.xml
@@ -1,10 +1,27 @@
-<?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:lang="eo" xml:id="setupBootloader">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="eo" 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">
+
+
+
+
+
+
+
+
+
+
<info>
<!--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-->
@@ -13,29 +30,39 @@ Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
<!--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.-->
<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 no ESP exists, then one will
@@ -44,155 +71,191 @@ required, whatever the number of operating systems you have.</para>
</listitem>
</itemizedlist>
</section>
+
<section>
<info>
<title xml:id="setupBootloader-ti2">Bootloader Setup</title>
</info>
+
<section>
<title>Lanĉilaj ĉefaj elektoj</title>
+
<mediaobject>
<imageobject condition="classical"> <imagedata align="center"
fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
condition="live"> <imagedata fileref="live-setupBootloader.png"
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 most people are not likely
to have a need for it. The username is <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 computer does not support ACPI or if
you think the ACPI 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>
+
<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>
+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>
+
<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 are sure you understand the
implications, and wish to proceed.</para>
</listitem>
</itemizedlist>
+
<mediaobject>
-<imageobject> <imagedata fileref="live-setupBootloader5.png"
-align="center"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center"
+fileref="live-setupBootloader5.png"/> </imageobject></mediaobject>
</section>
</section>
+
<section>
<title>Other Options</title>
+
<section>
<title>Uzi ekzistantan lanĉilon</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 should detect
Mageia and automatically add an entry for it in the 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/es.po b/docs/docs/stable/installer/es.po
index 7fc3ad44..b49c01a6 100644
--- a/docs/docs/stable/installer/es.po
+++ b/docs/docs/stable/installer/es.po
@@ -25,7 +25,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\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: 2018-05-22 11:30+0000\n"
"Last-Translator: Jose Manuel López <joselp@outlook.es>\n"
"Language-Team: Spanish (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -319,7 +319,7 @@ msgstr ""
"sensible a mayúsculas y minúsculas"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Password</emphasis>"
msgstr "<emphasis role=\"bold\">Avanzado</emphasis>"
@@ -4594,8 +4594,8 @@ msgstr ""
"guilabel> para configurar los botones que no funcionan en un ratón de seis o "
"más botones."
-#. 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 "Agregando o modificando una entrada en el menú de arranque"
@@ -4620,24 +4620,24 @@ msgstr ""
"https://wiki.mageia.org/en/Grub2-efi_and_Mageia"
#. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:10
+#: en/setupBootloader.xml:27
#, fuzzy
msgid "Bootloader"
msgstr "Interfaz del cargador de arranque"
#. 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
#, fuzzy
msgid "Grub2 on Legacy MBR/GPT systems"
msgstr "GRUB2 en sistemas Legacy / MBR y Legacy / GPT"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:17
+#: en/setupBootloader.xml:37
#, fuzzy
msgid ""
"GRUB2 (with or without graphical menu) will be used exclusively as the "
@@ -4646,7 +4646,7 @@ msgstr ""
"GRUB2 (con o sin menú gráfico) para un sistema Legacy / MBR o Legacy / GPT"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:21
+#: en/setupBootloader.xml:42
#, fuzzy
msgid ""
"By default, a new bootloader will be written into either the MBR (Master "
@@ -4656,25 +4656,25 @@ msgstr ""
"disco duro o en la partición de arranque del BIOS."
#. type: Content of: <section><section><itemizedlist><title>
-#: en/setupBootloader.xml:27
+#: en/setupBootloader.xml:49
#, fuzzy
msgid "Grub2-efi on UEFI systems"
msgstr "GRUB2-efi en sistemas UEFI"
#. 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
#, fuzzy
msgid ""
"If there are already UEFI-based operating systems installed on your computer "
@@ -4692,18 +4692,18 @@ msgstr ""
"sistemas operativos que tenga."
#. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:46
+#: en/setupBootloader.xml:72
#, fuzzy
msgid "Bootloader Setup"
msgstr "Interfaz del cargador de arranque"
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:49
+#: en/setupBootloader.xml:76
msgid "Bootloader main options"
msgstr "Opciones principales del cargador de arranque"
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:51
+#: en/setupBootloader.xml:79
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -4717,39 +4717,39 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:62
+#: en/setupBootloader.xml:91
#, fuzzy
msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
msgstr "Servidor"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Boot device</emphasis>"
msgstr "<emphasis role=\"bold\">Avanzado</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:68
+#: en/setupBootloader.xml:100
#, fuzzy
msgid "Don't change this unless you really know what you are doing"
msgstr "Sólo cambie servicios cuando sepa bien lo que está haciendo."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:72
+#: en/setupBootloader.xml:105
#, fuzzy
msgid ""
"<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
msgstr "Por favor elija el nivel de seguridad deseado"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:74
+#: en/setupBootloader.xml:108
#, fuzzy
msgid ""
"This text box lets you set a delay, in seconds, before the default operating "
@@ -4760,13 +4760,13 @@ msgstr ""
"operativo predeterminado."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:78
+#: en/setupBootloader.xml:113
#, fuzzy
msgid "<emphasis role=\"bold\">Security</emphasis>"
msgstr "Servidor"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:79
+#: en/setupBootloader.xml:115
#, fuzzy
msgid ""
"This allows you to set a password for the bootloader. This means a username "
@@ -4782,19 +4782,19 @@ msgstr ""
"elige aquí después."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:88
+#: en/setupBootloader.xml:126
#, fuzzy
msgid "Choose a password for the bootloader (optional)"
msgstr "Contraseña: elija una contraseña para el gestor de arranque."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:91
+#: en/setupBootloader.xml:130
#, fuzzy
msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
msgstr "Estación de trabajo"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:92
+#: en/setupBootloader.xml:132
#, fuzzy
msgid ""
"Retype the password and DrakX will check that it matches with the one set "
@@ -4804,19 +4804,19 @@ msgstr ""
"que coincida con la anterior."
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:96 en/setupBootloader.xml:154
+#: en/setupBootloader.xml:137 en/setupBootloader.xml:212
#, fuzzy
msgid "<emphasis>Advanced</emphasis>"
msgstr "<emphasis role=\"bold\">Avanzado</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:99
+#: en/setupBootloader.xml:141
#, fuzzy
msgid "<emphasis>Enable ACPI</emphasis>"
msgstr "<emphasis>Genérico</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:100
+#: en/setupBootloader.xml:143
#, fuzzy
msgid ""
"ACPI (Advanced Configuration and Power Interface) is a standard for power "
@@ -4833,13 +4833,13 @@ msgstr ""
"bloqueos del sistema)."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:108
+#: en/setupBootloader.xml:152
#, fuzzy
msgid "<emphasis>Enable SMP</emphasis>"
msgstr "<emphasis>Genérico</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:109
+#: en/setupBootloader.xml:154
#, fuzzy
msgid ""
"This option enables/disables symmetric multiprocessing for multi-core "
@@ -4849,13 +4849,13 @@ msgstr ""
"simétrico para procesadores multinúcleo."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:113
+#: en/setupBootloader.xml:159
#, fuzzy
msgid "<emphasis>Enable APIC</emphasis>"
msgstr "<emphasis>Genérico</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:114
+#: en/setupBootloader.xml:161
#, fuzzy
msgid ""
"Enabling this gives the operating system access to the Advanced Programmable "
@@ -4868,13 +4868,13 @@ msgstr ""
"interrupción)."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:168
#, fuzzy
msgid "<emphasis>Enable Local APIC</emphasis>"
msgstr "<emphasis>Genérico</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:121
+#: en/setupBootloader.xml:170
#, fuzzy
msgid ""
"Here you can set Local APIC, which manages all external interrupts for a "
@@ -4884,13 +4884,13 @@ msgstr ""
"externas para un procesador específico en un sistema SMP."
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:127
+#: en/setupBootloader.xml:177
#, fuzzy
msgid "Bootloader Configuration"
msgstr "Configurar el sonido"
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:129
+#: en/setupBootloader.xml:180
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -4904,44 +4904,44 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:139
+#: en/setupBootloader.xml:191
#, fuzzy
msgid "<emphasis role=\"bold\">Default</emphasis>"
msgstr "Servidor"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:140
+#: en/setupBootloader.xml:193
#, fuzzy
-msgid "The operating system to started up by default"
+msgid "The operating system to be started up by default."
msgstr ""
"<guilabel>Predeterminado:</guilabel> Sistema operativo iniciado de forma "
"predeterminada"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:143
+#: en/setupBootloader.xml:197
#, fuzzy
msgid "<emphasis role=\"bold\">Append</emphasis>"
msgstr "<emphasis role=\"bold\">Avanzado</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:144
+#: en/setupBootloader.xml:199
#, fuzzy
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 ""
"<guilabel>Añadir:</guilabel> Esta opción le permite pasar la información del "
"kernel o decirle al núcleo que le proporcione más información a medida que "
"arranca."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:148
+#: en/setupBootloader.xml:204
#, fuzzy
msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
msgstr "Servidor"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:149
+#: en/setupBootloader.xml:206
#, fuzzy
msgid ""
"If you already have other operating systems installed, Mageia attempts to "
@@ -4954,7 +4954,7 @@ msgstr ""
"operativos\"."
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:156
+#: en/setupBootloader.xml:215
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -4968,13 +4968,13 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:166
+#: en/setupBootloader.xml:226
#, fuzzy
msgid "<emphasis>Video mode</emphasis>"
msgstr "<emphasis>Vendedor</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:167
+#: en/setupBootloader.xml:228
#, fuzzy
msgid ""
"This sets the screen size and colour depth to be used by the boot menu. If "
@@ -4986,13 +4986,13 @@ msgstr ""
"ofrecerán otras opciones de tamaño y profundidad de color."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:172
+#: en/setupBootloader.xml:234
#, fuzzy
msgid "<emphasis>Do not touch ESP or MBR</emphasis>"
msgstr "<emphasis>Vendedor</emphasis>"
#. 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 "
@@ -5001,28 +5001,26 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:181
+#: en/setupBootloader.xml:245
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align=\"center"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png"
"\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
-"imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:188
+#: en/setupBootloader.xml:253
#, fuzzy
msgid "Other Options"
msgstr "Opciones"
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:190
+#: en/setupBootloader.xml:256
msgid "Using an existing bootloader"
msgstr "Usando un cargador de arranque existente"
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:191
+#: en/setupBootloader.xml:258
#, fuzzy
msgid ""
"The exact procedure for adding Mageia to an existing bootloader is beyond "
@@ -5039,13 +5037,13 @@ msgstr ""
"en cuestión."
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:199
+#: en/setupBootloader.xml:267
#, fuzzy
msgid "Installing Without a Bootloader"
msgstr "Usando el cargador de arranque de Mageia"
#. 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 "
@@ -5053,28 +5051,6 @@ msgid ""
"unable to start."
msgstr ""
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:207
-#, fuzzy
-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 ""
-"Para hacer esto, necesita editar manualmente /boot/grub2/custom.cfg o usar "
-"la herramienta de software grub-customizer en su lugar (disponible en los "
-"repositorios de Mageia)."
-
-#. type: Content of: <section><section><section><note><para>
-#: en/setupBootloader.xml:212
-#, fuzzy
-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 ""
-"Para más información, ver:\n"
-"https://wiki.mageia.org/en/Grub2-efi_and_Mageia"
-
#. type: Content of: <section><info><title>
#: en/setupSCSI.xml:10
msgid "Setup SCSI"
@@ -5485,6 +5461,33 @@ msgstr ""
#, fuzzy
#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align="
+#~ "\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ 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 ""
+#~ "Para hacer esto, necesita editar manualmente /boot/grub2/custom.cfg o "
+#~ "usar la herramienta de software grub-customizer en su lugar (disponible "
+#~ "en los repositorios de Mageia)."
+
+#, fuzzy
+#~ 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 ""
+#~ "Para más información, ver:\n"
+#~ "https://wiki.mageia.org/en/Grub2-efi_and_Mageia"
+
+#, fuzzy
+#~ msgid ""
#~ "<imageobject> <imagedata fileref=\"live-bootCSM.png\" align=\"center\"/> "
#~ "</imageobject>"
#~ msgstr ""
diff --git a/docs/docs/stable/installer/es/setupBootloader.xml b/docs/docs/stable/installer/es/setupBootloader.xml
index deb27b51..f037d70b 100644
--- a/docs/docs/stable/installer/es/setupBootloader.xml
+++ b/docs/docs/stable/installer/es/setupBootloader.xml
@@ -1,10 +1,27 @@
-<?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:lang="es" xml:id="setupBootloader">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="es" 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">
+
+
+
+
+
+
+
+
+
+
<info>
<!--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-->
@@ -13,29 +30,39 @@ Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
<!--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.-->
<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 no ESP exists, then one will
@@ -44,155 +71,191 @@ required, whatever the number of operating systems you have.</para>
</listitem>
</itemizedlist>
</section>
+
<section>
<info>
<title xml:id="setupBootloader-ti2">Bootloader Setup</title>
</info>
+
<section>
<title>Opciones principales del cargador de arranque</title>
+
<mediaobject>
<imageobject condition="classical"> <imagedata align="center"
fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
condition="live"> <imagedata fileref="live-setupBootloader.png"
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 most people are not likely
to have a need for it. The username is <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 computer does not support ACPI or if
you think the ACPI 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>
+
<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>
+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>
+
<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 are sure you understand the
implications, and wish to proceed.</para>
</listitem>
</itemizedlist>
+
<mediaobject>
-<imageobject> <imagedata fileref="live-setupBootloader5.png"
-align="center"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center"
+fileref="live-setupBootloader5.png"/> </imageobject></mediaobject>
</section>
</section>
+
<section>
<title>Other Options</title>
+
<section>
<title>Usando un cargador de arranque existente</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 should detect
Mageia and automatically add an entry for it in the 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>Agregando o modificando una entrada en el menú de arranque</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/et.po b/docs/docs/stable/installer/et.po
index c937a795..ee9434bd 100644
--- a/docs/docs/stable/installer/et.po
+++ b/docs/docs/stable/installer/et.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\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: 2018-05-13 21:49+0000\n"
"Last-Translator: Marek Laane <qiilaq69@gmail.com>\n"
"Language-Team: Estonian (http://www.transifex.com/MageiaLinux/mageia/"
@@ -314,7 +314,7 @@ msgstr ""
"\">Kasutajatunnus on tõstutundlik.</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Password</emphasis>"
msgstr "<emphasis role=\"bold\">Muud valikud</emphasis>"
@@ -4617,8 +4617,8 @@ msgstr ""
"Valige <guilabel>Universaalne</guilabel> - <guilabel>Evdev jõuga</guilabel>, "
"et seadistada nuppe, mis peaksid töötama kuue või rohkema nupuga hiirel."
-#. 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 "Alglaadimismenüü kirje lisamine või muutmine"
@@ -4643,24 +4643,24 @@ msgstr ""
"Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link>"
#. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:10
+#: en/setupBootloader.xml:27
#, fuzzy
msgid "Bootloader"
msgstr "Alglaaduri liides"
#. 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
#, fuzzy
msgid "Grub2 on Legacy MBR/GPT systems"
msgstr "Grub2 pärand/MBR ja pärand/GPT süsteemis"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:17
+#: en/setupBootloader.xml:37
#, fuzzy
msgid ""
"GRUB2 (with or without graphical menu) will be used exclusively as the "
@@ -4670,7 +4670,7 @@ msgstr ""
"süsteemi korral"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:21
+#: en/setupBootloader.xml:42
#, fuzzy
msgid ""
"By default, a new bootloader will be written into either the MBR (Master "
@@ -4680,25 +4680,25 @@ msgstr ""
"BIOS-e alglaadepartisioonile"
#. type: Content of: <section><section><itemizedlist><title>
-#: en/setupBootloader.xml:27
+#: en/setupBootloader.xml:49
#, fuzzy
msgid "Grub2-efi on UEFI systems"
msgstr "Grub2-efi UEFI süsteemis"
#. 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
#, fuzzy
msgid ""
"If there are already UEFI-based operating systems installed on your computer "
@@ -4716,18 +4716,18 @@ msgstr ""
"palju on arvutis operatsioonisüsteeme."
#. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:46
+#: en/setupBootloader.xml:72
#, fuzzy
msgid "Bootloader Setup"
msgstr "Alglaaduri liides"
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:49
+#: en/setupBootloader.xml:76
msgid "Bootloader main options"
msgstr "Alglaaduri põhiseadistused"
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:51
+#: en/setupBootloader.xml:79
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -4741,40 +4741,40 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:62
+#: en/setupBootloader.xml:91
#, fuzzy
msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
msgstr "<emphasis role=\"bold\">Server</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Boot device</emphasis>"
msgstr "<emphasis role=\"bold\">Muud valikud</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:68
+#: en/setupBootloader.xml:100
#, fuzzy
msgid "Don't change this unless you really know what you are doing"
msgstr ""
"Muutke siin midagi ainult siis, kui olete kindel, et teate, mida teete."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:72
+#: en/setupBootloader.xml:105
#, fuzzy
msgid ""
"<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
msgstr "<emphasis role=\"bold\">Palun valige sobiv turbetase</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:74
+#: en/setupBootloader.xml:108
#, fuzzy
msgid ""
"This text box lets you set a delay, in seconds, before the default operating "
@@ -4785,13 +4785,13 @@ msgstr ""
"operatsioonisüsteem."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:78
+#: en/setupBootloader.xml:113
#, fuzzy
msgid "<emphasis role=\"bold\">Security</emphasis>"
msgstr "<emphasis role=\"bold\">Server</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:79
+#: en/setupBootloader.xml:115
#, fuzzy
msgid ""
"This allows you to set a password for the bootloader. This means a username "
@@ -4806,20 +4806,20 @@ msgstr ""
"on <emphasis role=\"bold\">root</emphasis>, parooli saate siin ise määrata."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:88
+#: en/setupBootloader.xml:126
#, fuzzy
msgid "Choose a password for the bootloader (optional)"
msgstr ""
"<guilabel>Parool</guilabel>: selles kastis saab parooli kindlaks määrata."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:91
+#: en/setupBootloader.xml:130
#, fuzzy
msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
msgstr "<emphasis role=\"bold\">Tööjaam</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:92
+#: en/setupBootloader.xml:132
#, fuzzy
msgid ""
"Retype the password and DrakX will check that it matches with the one set "
@@ -4830,19 +4830,19 @@ msgstr ""
"mille sisestasite esimesel korral."
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:96 en/setupBootloader.xml:154
+#: en/setupBootloader.xml:137 en/setupBootloader.xml:212
#, fuzzy
msgid "<emphasis>Advanced</emphasis>"
msgstr "<emphasis role=\"bold\">Muud valikud</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:99
+#: en/setupBootloader.xml:141
#, fuzzy
msgid "<emphasis>Enable ACPI</emphasis>"
msgstr "<emphasis>Tavaline</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:100
+#: en/setupBootloader.xml:143
#, fuzzy
msgid ""
"ACPI (Advanced Configuration and Power Interface) is a standard for power "
@@ -4859,13 +4859,13 @@ msgstr ""
"taaskäivitusi või süsteemi hangumisi)."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:108
+#: en/setupBootloader.xml:152
#, fuzzy
msgid "<emphasis>Enable SMP</emphasis>"
msgstr "<emphasis>Tavaline</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:109
+#: en/setupBootloader.xml:154
#, fuzzy
msgid ""
"This option enables/disables symmetric multiprocessing for multi-core "
@@ -4875,13 +4875,13 @@ msgstr ""
"sümmeetrilise mitmiktöötluse mitme tuumaga protsessorite korral."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:113
+#: en/setupBootloader.xml:159
#, fuzzy
msgid "<emphasis>Enable APIC</emphasis>"
msgstr "<emphasis>Tavaline</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:114
+#: en/setupBootloader.xml:161
#, fuzzy
msgid ""
"Enabling this gives the operating system access to the Advanced Programmable "
@@ -4895,13 +4895,13 @@ msgstr ""
"(katkestusnõuded) haldamist."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:168
#, fuzzy
msgid "<emphasis>Enable Local APIC</emphasis>"
msgstr "<emphasis>Tavaline</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:121
+#: en/setupBootloader.xml:170
#, fuzzy
msgid ""
"Here you can set Local APIC, which manages all external interrupts for a "
@@ -4912,13 +4912,13 @@ msgstr ""
"SMP-süsteemis."
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:127
+#: en/setupBootloader.xml:177
#, fuzzy
msgid "Bootloader Configuration"
msgstr "Heli seadistamine"
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:129
+#: en/setupBootloader.xml:180
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -4932,42 +4932,42 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:139
+#: en/setupBootloader.xml:191
#, fuzzy
msgid "<emphasis role=\"bold\">Default</emphasis>"
msgstr "<emphasis role=\"bold\">Server</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:140
+#: en/setupBootloader.xml:193
#, fuzzy
-msgid "The operating system to started up by default"
+msgid "The operating system to be started up by default."
msgstr ""
"<guilabel>Vaikimisi:</guilabel> vaikimisi käivitatav operatsioonisüsteem."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:143
+#: en/setupBootloader.xml:197
#, fuzzy
msgid "<emphasis role=\"bold\">Append</emphasis>"
msgstr "<emphasis role=\"bold\">Muud valikud</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:144
+#: en/setupBootloader.xml:199
#, fuzzy
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 ""
"<guilabel>Lisaargumendid:</guilabel> siin saab edastada kernelile vajalikku "
"teavet või lasta kernelil alglaadimise ajal anda rohkem teavet."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:148
+#: en/setupBootloader.xml:204
#, fuzzy
msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
msgstr "<emphasis role=\"bold\">Server</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:149
+#: en/setupBootloader.xml:206
#, fuzzy
msgid ""
"If you already have other operating systems installed, Mageia attempts to "
@@ -4980,7 +4980,7 @@ msgstr ""
"role=\"bold\">Võõraste operatsioonisüsteemide otsimine</emphasis>"
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:156
+#: en/setupBootloader.xml:215
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -4994,13 +4994,13 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:166
+#: en/setupBootloader.xml:226
#, fuzzy
msgid "<emphasis>Video mode</emphasis>"
msgstr "<emphasis>Tootja</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:167
+#: en/setupBootloader.xml:228
#, fuzzy
msgid ""
"This sets the screen size and colour depth to be used by the boot menu. If "
@@ -5012,13 +5012,13 @@ msgstr ""
"vaiida muute suuruse ja värvisügavuse valikute seast."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:172
+#: en/setupBootloader.xml:234
#, fuzzy
msgid "<emphasis>Do not touch ESP or MBR</emphasis>"
msgstr "<emphasis>Tootja</emphasis>"
#. 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 "
@@ -5027,28 +5027,26 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:181
+#: en/setupBootloader.xml:245
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align=\"center"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png"
"\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
-"imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:188
+#: en/setupBootloader.xml:253
#, fuzzy
msgid "Other Options"
msgstr "Valikud"
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:190
+#: en/setupBootloader.xml:256
msgid "Using an existing bootloader"
msgstr "Olemasoleva alglaaduri kasutamine"
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:191
+#: en/setupBootloader.xml:258
#, fuzzy
msgid ""
"The exact procedure for adding Mageia to an existing bootloader is beyond "
@@ -5064,13 +5062,13 @@ msgstr ""
"dokumentatsiooni."
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:199
+#: en/setupBootloader.xml:267
#, fuzzy
msgid "Installing Without a Bootloader"
msgstr "Mageia alglaaduri kasutamine"
#. 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 "
@@ -5078,28 +5076,6 @@ msgid ""
"unable to start."
msgstr ""
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:207
-#, fuzzy
-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 ""
-"Selleks tuleb käsitsi muuta faili /boot/grub2/custom.cfg või kasutada "
-"rakendust <emphasis role=\"bold\">grub-customizer</emphasis> (selle leiab "
-"Mageia tarkvarahoidlast)."
-
-#. type: Content of: <section><section><section><note><para>
-#: en/setupBootloader.xml:212
-#, fuzzy
-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 ""
-"Täpsemat teavet annab meie wiki: <link ns2:href=\"https://wiki.mageia.org/en/"
-"Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link>"
-
#. type: Content of: <section><info><title>
#: en/setupSCSI.xml:10
msgid "Setup SCSI"
@@ -5510,6 +5486,34 @@ msgstr ""
#, fuzzy
#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align="
+#~ "\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ 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 ""
+#~ "Selleks tuleb käsitsi muuta faili /boot/grub2/custom.cfg või kasutada "
+#~ "rakendust <emphasis role=\"bold\">grub-customizer</emphasis> (selle leiab "
+#~ "Mageia tarkvarahoidlast)."
+
+#, fuzzy
+#~ 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 ""
+#~ "Täpsemat teavet annab meie wiki: <link ns2:href=\"https://wiki.mageia.org/"
+#~ "en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-"
+#~ "efi_and_Mageia</link>"
+
+#, fuzzy
+#~ msgid ""
#~ "<imageobject> <imagedata fileref=\"live-bootCSM.png\" align=\"center\"/> "
#~ "</imageobject>"
#~ msgstr ""
diff --git a/docs/docs/stable/installer/et/setupBootloader.xml b/docs/docs/stable/installer/et/setupBootloader.xml
index 35df273c..ad2a6615 100644
--- a/docs/docs/stable/installer/et/setupBootloader.xml
+++ b/docs/docs/stable/installer/et/setupBootloader.xml
@@ -1,10 +1,27 @@
-<?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:lang="et" xml:id="setupBootloader">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="et" 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">
+
+
+
+
+
+
+
+
+
+
<info>
<!--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-->
@@ -13,29 +30,39 @@ Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
<!--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.-->
<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 no ESP exists, then one will
@@ -44,155 +71,191 @@ required, whatever the number of operating systems you have.</para>
</listitem>
</itemizedlist>
</section>
+
<section>
<info>
<title xml:id="setupBootloader-ti2">Bootloader Setup</title>
</info>
+
<section>
<title>Alglaaduri põhiseadistused</title>
+
<mediaobject>
<imageobject condition="classical"> <imagedata align="center"
fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
condition="live"> <imagedata fileref="live-setupBootloader.png"
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 most people are not likely
to have a need for it. The username is <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 computer does not support ACPI or if
you think the ACPI 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>
+
<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>
+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>
+
<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 are sure you understand the
implications, and wish to proceed.</para>
</listitem>
</itemizedlist>
+
<mediaobject>
-<imageobject> <imagedata fileref="live-setupBootloader5.png"
-align="center"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center"
+fileref="live-setupBootloader5.png"/> </imageobject></mediaobject>
</section>
</section>
+
<section>
<title>Other Options</title>
+
<section>
<title>Olemasoleva alglaaduri kasutamine</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 should detect
Mageia and automatically add an entry for it in the 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>Alglaadimismenüü kirje lisamine või muutmine</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/eu.po b/docs/docs/stable/installer/eu.po
index 04413f42..90ecc691 100644
--- a/docs/docs/stable/installer/eu.po
+++ b/docs/docs/stable/installer/eu.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\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: 2017-08-18 17:14+0000\n"
"Last-Translator: Egoitz Rodriguez Obieta <egoitzro@gmail.com>\n"
"Language-Team: Basque (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -314,7 +314,7 @@ msgstr ""
"minuskulei sentibera da.</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Password</emphasis>"
msgstr "<emphasis role=\"bold\">Aurreratua</emphasis>"
@@ -4589,8 +4589,8 @@ msgstr ""
"guilabel> lan egiten ez duten sei botoi edo gehiagoko saguaren botoiak "
"konfiguratzen."
-#. 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 "Gegitu edo Aldatu Abio Menuko Sarrera"
@@ -4617,24 +4617,24 @@ msgstr ""
"efi_and_Mageia</link>"
#. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:10
+#: en/setupBootloader.xml:27
#, fuzzy
msgid "Bootloader"
msgstr "Abioko kargatzailearen interfazea"
#. 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
#, fuzzy
msgid "Grub2 on Legacy MBR/GPT systems"
msgstr "Grub2 Legacy/MBR eta Legacy/GPT sistemetan"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:17
+#: en/setupBootloader.xml:37
#, fuzzy
msgid ""
"GRUB2 (with or without graphical menu) will be used exclusively as the "
@@ -4643,7 +4643,7 @@ msgstr ""
"Grub2 (enu grafikoarekin edo gabe) Legacy/MBR edo Legacy/GPT sistemarako"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:21
+#: en/setupBootloader.xml:42
#, fuzzy
msgid ""
"By default, a new bootloader will be written into either the MBR (Master "
@@ -4653,25 +4653,25 @@ msgstr ""
"BIOSen abioko partizioan."
#. type: Content of: <section><section><itemizedlist><title>
-#: en/setupBootloader.xml:27
+#: en/setupBootloader.xml:49
#, fuzzy
msgid "Grub2-efi on UEFI systems"
msgstr "Grub2-efi UEFI sistemetan"
#. 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
#, fuzzy
msgid ""
"If there are already UEFI-based operating systems installed on your computer "
@@ -4689,18 +4689,18 @@ msgstr ""
"da eta aski dituzun sistema eragileetako kopurua edozein izanik ere."
#. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:46
+#: en/setupBootloader.xml:72
#, fuzzy
msgid "Bootloader Setup"
msgstr "Abioko kargatzailearen interfazea"
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:49
+#: en/setupBootloader.xml:76
msgid "Bootloader main options"
msgstr "Abio kargatzailearen aukera nagusiak"
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:51
+#: en/setupBootloader.xml:79
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -4714,52 +4714,52 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:62
+#: en/setupBootloader.xml:91
#, fuzzy
msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
msgstr "<emphasis role=\"bold\">Aurreratua</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Boot device</emphasis>"
msgstr "<emphasis role=\"bold\">Aurreratua</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:68
+#: en/setupBootloader.xml:100
#, fuzzy
msgid "Don't change this unless you really know what you are doing"
msgstr "Gauza bakarra aldatzen duzunean, oso ondo dakizu zer egiten ari zaren."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:72
+#: en/setupBootloader.xml:105
#, fuzzy
msgid ""
"<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
msgstr "<emphasis role=\"bold\">Partizioaren tamaina:</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Security</emphasis>"
msgstr "<emphasis role=\"bold\">Aurreratua</emphasis>"
#. 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 "
@@ -4769,7 +4769,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:88
+#: en/setupBootloader.xml:126
#, fuzzy
msgid "Choose a password for the bootloader (optional)"
msgstr ""
@@ -4777,13 +4777,13 @@ msgstr ""
"jartzen da"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:91
+#: en/setupBootloader.xml:130
#, fuzzy
msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
msgstr "<emphasis role=\"bold\">Partizioaren tamaina:</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:92
+#: en/setupBootloader.xml:132
#, fuzzy
msgid ""
"Retype the password and DrakX will check that it matches with the one set "
@@ -4793,19 +4793,19 @@ msgstr ""
"lehen ezarritakoarekin bat etortzea egiaztatuko du."
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:96 en/setupBootloader.xml:154
+#: en/setupBootloader.xml:137 en/setupBootloader.xml:212
#, fuzzy
msgid "<emphasis>Advanced</emphasis>"
msgstr "<emphasis role=\"bold\">Aurreratua</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:99
+#: en/setupBootloader.xml:141
#, fuzzy
msgid "<emphasis>Enable ACPI</emphasis>"
msgstr "<emphasis>Generikoa</emphasis>"
#. 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 "
@@ -4815,13 +4815,13 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:108
+#: en/setupBootloader.xml:152
#, fuzzy
msgid "<emphasis>Enable SMP</emphasis>"
msgstr "<emphasis>Generikoa</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:109
+#: en/setupBootloader.xml:154
#, fuzzy
msgid ""
"This option enables/disables symmetric multiprocessing for multi-core "
@@ -4831,13 +4831,13 @@ msgstr ""
"simetrikoak gaitzen / desgaitzen ditu."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:113
+#: en/setupBootloader.xml:159
#, fuzzy
msgid "<emphasis>Enable APIC</emphasis>"
msgstr "<emphasis>Generikoa</emphasis>"
#. 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 "
@@ -4845,26 +4845,26 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:168
#, fuzzy
msgid "<emphasis>Enable Local APIC</emphasis>"
msgstr "<emphasis>Generikoa</emphasis>"
#. 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
#, fuzzy
msgid "Bootloader Configuration"
msgstr "Soinu Konfiguraketa"
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:129
+#: en/setupBootloader.xml:180
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -4878,42 +4878,42 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:139
+#: en/setupBootloader.xml:191
#, fuzzy
msgid "<emphasis role=\"bold\">Default</emphasis>"
msgstr "<emphasis role=\"bold\">Aurreratua</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:140
+#: en/setupBootloader.xml:193
#, fuzzy
-msgid "The operating system to started up by default"
+msgid "The operating system to be started up by default."
msgstr ""
"<guilabel>Lehenetsia:</guilabel> Sistema eragilea modu lehenetsian hasi da"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:143
+#: en/setupBootloader.xml:197
#, fuzzy
msgid "<emphasis role=\"bold\">Append</emphasis>"
msgstr "<emphasis role=\"bold\">Aurreratua</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:144
+#: en/setupBootloader.xml:199
#, fuzzy
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 ""
"<guilabel>Erantsi:</guilabel> Aukera honek kernelaren informazioa pasatzera "
"edo kernelak informazio gehiago emateko esaten dio abioan."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:148
+#: en/setupBootloader.xml:204
#, fuzzy
msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
msgstr "<emphasis role=\"bold\">Aurreratua</emphasis>"
#. 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, "
@@ -4921,7 +4921,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:156
+#: en/setupBootloader.xml:215
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -4935,13 +4935,13 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:166
+#: en/setupBootloader.xml:226
#, fuzzy
msgid "<emphasis>Video mode</emphasis>"
msgstr "<emphasis>Hornitzailea</emphasis>"
#. 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 "
@@ -4949,13 +4949,13 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:172
+#: en/setupBootloader.xml:234
#, fuzzy
msgid "<emphasis>Do not touch ESP or MBR</emphasis>"
msgstr "<emphasis>Hornitzailea</emphasis>"
#. 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 "
@@ -4964,28 +4964,26 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:181
+#: en/setupBootloader.xml:245
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align=\"center"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png"
"\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
-"imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:188
+#: en/setupBootloader.xml:253
#, fuzzy
msgid "Other Options"
msgstr "Aukerak"
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:190
+#: en/setupBootloader.xml:256
msgid "Using an existing bootloader"
msgstr "Existitzen den abio kargatzaile bat erabiliz"
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:191
+#: en/setupBootloader.xml:258
#, fuzzy
msgid ""
"The exact procedure for adding Mageia to an existing bootloader is beyond "
@@ -5000,13 +4998,13 @@ msgstr ""
"sistema eragilearen dokumentazioa."
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:199
+#: en/setupBootloader.xml:267
#, fuzzy
msgid "Installing Without a Bootloader"
msgstr "Mageia abio kargatzailea erabiliz"
#. 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 "
@@ -5014,28 +5012,6 @@ msgid ""
"unable to start."
msgstr ""
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:207
-#, fuzzy
-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 ""
-"Horretarako, editatu /boot/grub2/custom.cfg eskuz edo erabili grub-"
-"customizer softwarea (eskuragarri Mageia biltegietan)."
-
-#. type: Content of: <section><section><section><note><para>
-#: en/setupBootloader.xml:212
-#, fuzzy
-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 ""
-"Informazio gehiago lortzeko, ikus gure wikia: <link ns2:href=\"https://wiki."
-"mageia.org/en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-"
-"efi_and_Mageia</link>"
-
#. type: Content of: <section><info><title>
#: en/setupSCSI.xml:10
msgid "Setup SCSI"
@@ -5445,6 +5421,33 @@ msgstr ""
#, fuzzy
#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align="
+#~ "\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ 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 ""
+#~ "Horretarako, editatu /boot/grub2/custom.cfg eskuz edo erabili grub-"
+#~ "customizer softwarea (eskuragarri Mageia biltegietan)."
+
+#, fuzzy
+#~ 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 ""
+#~ "Informazio gehiago lortzeko, ikus gure wikia: <link ns2:href=\"https://"
+#~ "wiki.mageia.org/en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/"
+#~ "Grub2-efi_and_Mageia</link>"
+
+#, fuzzy
+#~ msgid ""
#~ "<imageobject> <imagedata fileref=\"live-bootCSM.png\" align=\"center\"/> "
#~ "</imageobject>"
#~ msgstr ""
diff --git a/docs/docs/stable/installer/eu/setupBootloader.xml b/docs/docs/stable/installer/eu/setupBootloader.xml
index 9616f1d9..74750809 100644
--- a/docs/docs/stable/installer/eu/setupBootloader.xml
+++ b/docs/docs/stable/installer/eu/setupBootloader.xml
@@ -1,10 +1,27 @@
-<?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:lang="eu" xml:id="setupBootloader">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="eu" 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">
+
+
+
+
+
+
+
+
+
+
<info>
<!--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-->
@@ -13,29 +30,39 @@ Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
<!--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.-->
<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 no ESP exists, then one will
@@ -44,155 +71,191 @@ required, whatever the number of operating systems you have.</para>
</listitem>
</itemizedlist>
</section>
+
<section>
<info>
<title xml:id="setupBootloader-ti2">Bootloader Setup</title>
</info>
+
<section>
<title>Abio kargatzailearen aukera nagusiak</title>
+
<mediaobject>
<imageobject condition="classical"> <imagedata align="center"
fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
condition="live"> <imagedata fileref="live-setupBootloader.png"
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 most people are not likely
to have a need for it. The username is <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 computer does not support ACPI or if
you think the ACPI 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>
+
<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>
+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>
+
<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 are sure you understand the
implications, and wish to proceed.</para>
</listitem>
</itemizedlist>
+
<mediaobject>
-<imageobject> <imagedata fileref="live-setupBootloader5.png"
-align="center"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center"
+fileref="live-setupBootloader5.png"/> </imageobject></mediaobject>
</section>
</section>
+
<section>
<title>Other Options</title>
+
<section>
<title>Existitzen den abio kargatzaile bat erabiliz</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 should detect
Mageia and automatically add an entry for it in the 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>Gegitu edo Aldatu Abio Menuko Sarrera</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/fr.po b/docs/docs/stable/installer/fr.po
index b910ae22..269a3746 100644
--- a/docs/docs/stable/installer/fr.po
+++ b/docs/docs/stable/installer/fr.po
@@ -28,7 +28,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\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: 2018-10-12 17:33+0000\n"
"Last-Translator: stroibe974 <sebsweb@gmail.com>\n"
"Language-Team: French (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -336,7 +336,7 @@ msgstr ""
"<emphasis>L'identifiant de connexion est sensible à la casse.</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Password</emphasis>"
msgstr "<emphasis role=\"bold\">Avancé</emphasis>"
@@ -4723,8 +4723,8 @@ msgstr ""
"guilabel> pour configurer les boutons qui ne fonctionnent pas sur une souris "
"à six boutons ou plus."
-#. 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 "Ajouter ou Modifier une Entrée de Menu de Démarrage"
@@ -4750,24 +4750,24 @@ msgstr ""
"fr</link>"
#. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:10
+#: en/setupBootloader.xml:27
#, fuzzy
msgid "Bootloader"
msgstr "Interface du programme d'amorçage"
#. 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
#, fuzzy
msgid "Grub2 on Legacy MBR/GPT systems"
msgstr "GRUB2 sur des systèmes MBR/Legacy et GPT/Legacy "
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:17
+#: en/setupBootloader.xml:37
#, fuzzy
msgid ""
"GRUB2 (with or without graphical menu) will be used exclusively as the "
@@ -4776,7 +4776,7 @@ msgstr ""
"GRUB2 (avec ou sans menu graphique) pour un système MBR/Legacy ou GPT/Legacy"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:21
+#: en/setupBootloader.xml:42
#, fuzzy
msgid ""
"By default, a new bootloader will be written into either the MBR (Master "
@@ -4786,25 +4786,25 @@ msgstr ""
"votre premier disque dur, soit dans la partition de démarrage BIOS."
#. type: Content of: <section><section><itemizedlist><title>
-#: en/setupBootloader.xml:27
+#: en/setupBootloader.xml:49
#, fuzzy
msgid "Grub2-efi on UEFI systems"
msgstr "GRUB2-efi sur les systèmes UEFI"
#. 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
#, fuzzy
msgid ""
"If there are already UEFI-based operating systems installed on your computer "
@@ -4822,18 +4822,18 @@ msgstr ""
"conseillée), quel que soit le nombre de systèmes d'exploitation installés."
#. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:46
+#: en/setupBootloader.xml:72
#, fuzzy
msgid "Bootloader Setup"
msgstr "Interface du programme d'amorçage"
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:49
+#: en/setupBootloader.xml:76
msgid "Bootloader main options"
msgstr "Principales options du chargeur de démarrage"
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:51
+#: en/setupBootloader.xml:79
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -4847,32 +4847,32 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:62
+#: en/setupBootloader.xml:91
#, fuzzy
msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
msgstr "<emphasis role=\"bold\">Serveur</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Boot device</emphasis>"
msgstr "<emphasis role=\"bold\">Avancé</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:68
+#: en/setupBootloader.xml:100
#, fuzzy
msgid "Don't change this unless you really know what you are doing"
msgstr "Ne modifier quelque chose qu'avec la certitude de bien faire."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:72
+#: en/setupBootloader.xml:105
#, fuzzy
msgid ""
"<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
@@ -4881,7 +4881,7 @@ msgstr ""
"emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:74
+#: en/setupBootloader.xml:108
#, fuzzy
msgid ""
"This text box lets you set a delay, in seconds, before the default operating "
@@ -4892,13 +4892,13 @@ msgstr ""
"d'exploitation par défaut."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:78
+#: en/setupBootloader.xml:113
#, fuzzy
msgid "<emphasis role=\"bold\">Security</emphasis>"
msgstr "<emphasis role=\"bold\">Serveur</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:79
+#: en/setupBootloader.xml:115
#, fuzzy
msgid ""
"This allows you to set a password for the bootloader. This means a username "
@@ -4914,7 +4914,7 @@ msgstr ""
"\">root</emphasis> et le mot de passe est celui défini ci-après."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:88
+#: en/setupBootloader.xml:126
#, fuzzy
msgid "Choose a password for the bootloader (optional)"
msgstr ""
@@ -4922,13 +4922,13 @@ msgstr ""
"chargeur de démarrage."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:91
+#: en/setupBootloader.xml:130
#, fuzzy
msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
msgstr "<emphasis role=\"bold\">Poste de travail</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:92
+#: en/setupBootloader.xml:132
#, fuzzy
msgid ""
"Retype the password and DrakX will check that it matches with the one set "
@@ -4938,19 +4938,19 @@ msgstr ""
"de passe et Drakx vérifiera qu'il est identique au précédent."
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:96 en/setupBootloader.xml:154
+#: en/setupBootloader.xml:137 en/setupBootloader.xml:212
#, fuzzy
msgid "<emphasis>Advanced</emphasis>"
msgstr "<emphasis role=\"bold\">Avancé</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:99
+#: en/setupBootloader.xml:141
#, fuzzy
msgid "<emphasis>Enable ACPI</emphasis>"
msgstr "<emphasis>Générique</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:100
+#: en/setupBootloader.xml:143
#, fuzzy
msgid ""
"ACPI (Advanced Configuration and Power Interface) is a standard for power "
@@ -4967,13 +4967,13 @@ msgstr ""
"redémarrages aléatoires ou des blocages)."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:108
+#: en/setupBootloader.xml:152
#, fuzzy
msgid "<emphasis>Enable SMP</emphasis>"
msgstr "<emphasis>Générique</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:109
+#: en/setupBootloader.xml:154
#, fuzzy
msgid ""
"This option enables/disables symmetric multiprocessing for multi-core "
@@ -4983,13 +4983,13 @@ msgstr ""
"processing symétique pour les processeurs multi-cœurs."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:113
+#: en/setupBootloader.xml:159
#, fuzzy
msgid "<emphasis>Enable APIC</emphasis>"
msgstr "<emphasis>Générique</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:114
+#: en/setupBootloader.xml:161
#, fuzzy
msgid ""
"Enabling this gives the operating system access to the Advanced Programmable "
@@ -5003,13 +5003,13 @@ msgstr ""
"Requête d'interruption) avancés."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:168
#, fuzzy
msgid "<emphasis>Enable Local APIC</emphasis>"
msgstr "<emphasis>Générique</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:121
+#: en/setupBootloader.xml:170
#, fuzzy
msgid ""
"Here you can set Local APIC, which manages all external interrupts for a "
@@ -5019,13 +5019,13 @@ msgstr ""
"interruptions externes pour un processeur spécifique d'un système SMP."
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:127
+#: en/setupBootloader.xml:177
#, fuzzy
msgid "Bootloader Configuration"
msgstr "Configuration du son"
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:129
+#: en/setupBootloader.xml:180
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -5039,44 +5039,44 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:139
+#: en/setupBootloader.xml:191
#, fuzzy
msgid "<emphasis role=\"bold\">Default</emphasis>"
msgstr "<emphasis role=\"bold\">Serveur</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:140
+#: en/setupBootloader.xml:193
#, fuzzy
-msgid "The operating system to started up by default"
+msgid "The operating system to be started up by default."
msgstr ""
"<guilabel>Choix par défaut</guilabel> Système d'exploitation démarré par "
"défaut. "
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:143
+#: en/setupBootloader.xml:197
#, fuzzy
msgid "<emphasis role=\"bold\">Append</emphasis>"
msgstr "<emphasis role=\"bold\">Avancé</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:144
+#: en/setupBootloader.xml:199
#, fuzzy
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 ""
"<guilabel>Options passées au noyau</guilabel> Cette option permet de passer "
"des informations au noyau ou de lui demander plus d'informations lors du "
"démarrage. "
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:148
+#: en/setupBootloader.xml:204
#, fuzzy
msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
msgstr "<emphasis role=\"bold\">Serveur</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:149
+#: en/setupBootloader.xml:206
#, fuzzy
msgid ""
"If you already have other operating systems installed, Mageia attempts to "
@@ -5089,7 +5089,7 @@ msgstr ""
"role=\"bold\">Détecter les autres OS</emphasis>."
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:156
+#: en/setupBootloader.xml:215
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -5103,13 +5103,13 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:166
+#: en/setupBootloader.xml:226
#, fuzzy
msgid "<emphasis>Video mode</emphasis>"
msgstr "<emphasis>Vendeur</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:167
+#: en/setupBootloader.xml:228
#, fuzzy
msgid ""
"This sets the screen size and colour depth to be used by the boot menu. If "
@@ -5122,13 +5122,13 @@ msgstr ""
"profondeur de couleurs vous seront proposées."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:172
+#: en/setupBootloader.xml:234
#, fuzzy
msgid "<emphasis>Do not touch ESP or MBR</emphasis>"
msgstr "<emphasis>Vendeur</emphasis>"
#. 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 "
@@ -5137,28 +5137,26 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:181
+#: en/setupBootloader.xml:245
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align=\"center"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png"
"\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
-"imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:188
+#: en/setupBootloader.xml:253
#, fuzzy
msgid "Other Options"
msgstr "Options"
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:190
+#: en/setupBootloader.xml:256
msgid "Using an existing bootloader"
msgstr "Utiliser un chargeur de démarrage existant. "
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:191
+#: en/setupBootloader.xml:258
#, fuzzy
msgid ""
"The exact procedure for adding Mageia to an existing bootloader is beyond "
@@ -5174,13 +5172,13 @@ msgstr ""
"automatiquement. Voir la documentation du système d'exploitation en question."
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:199
+#: en/setupBootloader.xml:267
#, fuzzy
msgid "Installing Without a Bootloader"
msgstr "Utiliser un chargeur de démarrage Mageia"
#. 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 "
@@ -5188,29 +5186,6 @@ msgid ""
"unable to start."
msgstr ""
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:207
-#, fuzzy
-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 ""
-"Pour cela, vous devez modifier manuellement le fichier /boot/grub2/custom."
-"cfg ou bien utiliser le logiciel <emphasis role=\"bold\">grub-customizer</"
-"emphasis> (disponible dans les dépôts Mageia)."
-
-#. type: Content of: <section><section><section><note><para>
-#: en/setupBootloader.xml:212
-#, fuzzy
-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 ""
-"Pour en savoir plus, consultez <link ns2:href=\"https://wiki.mageia.org/en/"
-"Grub2-efi_and_Mageia-fr\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia-"
-"fr</link>"
-
#. type: Content of: <section><info><title>
#: en/setupSCSI.xml:10
msgid "Setup SCSI"
@@ -5623,6 +5598,34 @@ msgstr ""
#, fuzzy
#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align="
+#~ "\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ 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 ""
+#~ "Pour cela, vous devez modifier manuellement le fichier /boot/grub2/custom."
+#~ "cfg ou bien utiliser le logiciel <emphasis role=\"bold\">grub-customizer</"
+#~ "emphasis> (disponible dans les dépôts Mageia)."
+
+#, fuzzy
+#~ 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 ""
+#~ "Pour en savoir plus, consultez <link ns2:href=\"https://wiki.mageia.org/"
+#~ "en/Grub2-efi_and_Mageia-fr\">https://wiki.mageia.org/en/Grub2-"
+#~ "efi_and_Mageia-fr</link>"
+
+#, fuzzy
+#~ msgid ""
#~ "<imageobject> <imagedata fileref=\"live-bootCSM.png\" align=\"center\"/> "
#~ "</imageobject>"
#~ msgstr ""
diff --git a/docs/docs/stable/installer/fr/setupBootloader.xml b/docs/docs/stable/installer/fr/setupBootloader.xml
index d0827a52..4041bf06 100644
--- a/docs/docs/stable/installer/fr/setupBootloader.xml
+++ b/docs/docs/stable/installer/fr/setupBootloader.xml
@@ -1,10 +1,27 @@
-<?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:lang="fr" xml:id="setupBootloader">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="fr" 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">
+
+
+
+
+
+
+
+
+
+
<info>
<!--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-->
@@ -13,29 +30,39 @@ Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
<!--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.-->
<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 no ESP exists, then one will
@@ -44,155 +71,191 @@ required, whatever the number of operating systems you have.</para>
</listitem>
</itemizedlist>
</section>
+
<section>
<info>
<title xml:id="setupBootloader-ti2">Bootloader Setup</title>
</info>
+
<section>
<title>Principales options du chargeur de démarrage</title>
+
<mediaobject>
<imageobject condition="classical"> <imagedata align="center"
fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
condition="live"> <imagedata fileref="live-setupBootloader.png"
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 most people are not likely
to have a need for it. The username is <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 computer does not support ACPI or if
you think the ACPI 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>
+
<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>
+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>
+
<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 are sure you understand the
implications, and wish to proceed.</para>
</listitem>
</itemizedlist>
+
<mediaobject>
-<imageobject> <imagedata fileref="live-setupBootloader5.png"
-align="center"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center"
+fileref="live-setupBootloader5.png"/> </imageobject></mediaobject>
</section>
</section>
+
<section>
<title>Other Options</title>
+
<section>
<title>Utiliser un chargeur de démarrage existant. </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 should detect
Mageia and automatically add an entry for it in the 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>Ajouter ou Modifier une Entrée de Menu de Démarrage</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/hi.po b/docs/docs/stable/installer/hi.po
index 949103b7..998dcde2 100644
--- a/docs/docs/stable/installer/hi.po
+++ b/docs/docs/stable/installer/hi.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\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: 2018-05-17 17:40+0000\n"
"Last-Translator: Panwar108 <caspian7pena@gmail.com>\n"
"Language-Team: Hindi (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -239,7 +239,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 ""
@@ -3672,8 +3672,8 @@ msgid ""
"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 ""
@@ -3693,54 +3693,54 @@ msgid ""
msgstr ""
#. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:10
+#: en/setupBootloader.xml:27
#, fuzzy
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 "
@@ -3750,18 +3750,18 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:46
+#: en/setupBootloader.xml:72
#, fuzzy
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
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -3777,47 +3777,47 @@ msgstr ""
"imageobject>"
#. 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 "
@@ -3827,34 +3827,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 "
@@ -3864,24 +3864,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 "
@@ -3889,25 +3889,25 @@ 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
#, fuzzy
msgid "Bootloader Configuration"
msgstr "बूटलोडर के मुख्य विकल्प"
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:129
+#: en/setupBootloader.xml:180
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -3921,34 +3921,34 @@ msgstr ""
"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
#. 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, "
@@ -3956,7 +3956,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:156
+#: en/setupBootloader.xml:215
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -3970,12 +3970,12 @@ msgstr ""
"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
#. 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 "
@@ -3983,12 +3983,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 "
@@ -3997,28 +3997,27 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:181
+#: en/setupBootloader.xml:245
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align=\"center"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png"
"\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
-"align=\"center\"/> </imageobject>"
+"<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:188
+#: en/setupBootloader.xml:253
#, fuzzy
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 "
@@ -4028,12 +4027,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 "
@@ -4041,21 +4040,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"
@@ -4397,6 +4381,14 @@ msgstr ""
#, fuzzy
#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align="
+#~ "\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+#~ "align=\"center\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
#~ "<imageobject> <imagedata fileref=\"live-bootCSM.png\" align=\"center\"/> "
#~ "</imageobject>"
#~ msgstr ""
diff --git a/docs/docs/stable/installer/hi/setupBootloader.xml b/docs/docs/stable/installer/hi/setupBootloader.xml
index 1777696b..4c167574 100644
--- a/docs/docs/stable/installer/hi/setupBootloader.xml
+++ b/docs/docs/stable/installer/hi/setupBootloader.xml
@@ -1,10 +1,27 @@
-<?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:lang="hi" xml:id="setupBootloader">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hi" 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">
+
+
+
+
+
+
+
+
+
+
<info>
<!--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-->
@@ -13,29 +30,39 @@ Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
<!--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.-->
<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 no ESP exists, then one will
@@ -44,155 +71,191 @@ required, whatever the number of operating systems you have.</para>
</listitem>
</itemizedlist>
</section>
+
<section>
<info>
<title xml:id="setupBootloader-ti2">Bootloader Setup</title>
</info>
+
<section>
<title>बूटलोडर के मुख्य विकल्प</title>
+
<mediaobject>
<imageobject condition="classical"> <imagedata align="center"
fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
condition="live"> <imagedata fileref="live-setupBootloader.png"
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 most people are not likely
to have a need for it. The username is <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 computer does not support ACPI or if
you think the ACPI 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>
+
<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>
+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>
+
<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 are sure you understand the
implications, and wish to proceed.</para>
</listitem>
</itemizedlist>
+
<mediaobject>
-<imageobject> <imagedata fileref="live-setupBootloader5.png"
-align="center"/> </imageobject></mediaobject>
+<imageobject> <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 should detect
Mageia and automatically add an entry for it in the 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/hr.po b/docs/docs/stable/installer/hr.po
index 95236177..05f52178 100644
--- a/docs/docs/stable/installer/hr.po
+++ b/docs/docs/stable/installer/hr.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\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: 2018-03-03 17:14+0000\n"
"Last-Translator: Ivica Kolić <ikoli@yahoo.com>\n"
"Language-Team: Croatian (http://www.transifex.com/MageiaLinux/mageia/"
@@ -311,7 +311,7 @@ msgstr ""
"prijave je osjetljivo na mala i velika slova.</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Password</emphasis>"
msgstr "<emphasis>Generički</emphasis>"
@@ -3925,8 +3925,8 @@ msgid ""
"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 ""
@@ -3946,54 +3946,54 @@ msgid ""
msgstr ""
#. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:10
+#: en/setupBootloader.xml:27
#, fuzzy
msgid "Bootloader"
msgstr "Glavne postavke bootloadera"
#. 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 "
@@ -4003,18 +4003,18 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:46
+#: en/setupBootloader.xml:72
#, fuzzy
msgid "Bootloader Setup"
msgstr "Glavne postavke bootloadera"
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:49
+#: en/setupBootloader.xml:76
msgid "Bootloader main options"
msgstr "Glavne postavke bootloadera"
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:51
+#: en/setupBootloader.xml:79
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -4028,51 +4028,51 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:62
+#: en/setupBootloader.xml:91
#, fuzzy
msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
msgstr "<emphasis>Generički</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Boot device</emphasis>"
msgstr "<emphasis>Generički</emphasis>"
#. 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
#, fuzzy
msgid ""
"<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
msgstr "<emphasis>Prilagođeno</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Security</emphasis>"
msgstr "<emphasis>Generički</emphasis>"
#. 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 "
@@ -4082,18 +4082,18 @@ 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
#, fuzzy
msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
msgstr "<emphasis>Prilagođeno</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:92
+#: en/setupBootloader.xml:132
#, fuzzy
msgid ""
"Retype the password and DrakX will check that it matches with the one set "
@@ -4104,19 +4104,19 @@ msgstr ""
"tekstualnom polju."
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:96 en/setupBootloader.xml:154
+#: en/setupBootloader.xml:137 en/setupBootloader.xml:212
#, fuzzy
msgid "<emphasis>Advanced</emphasis>"
msgstr "<emphasis>Proizvođač</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:99
+#: en/setupBootloader.xml:141
#, fuzzy
msgid "<emphasis>Enable ACPI</emphasis>"
msgstr "<emphasis>Generički</emphasis>"
#. 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 "
@@ -4126,26 +4126,26 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:108
+#: en/setupBootloader.xml:152
#, fuzzy
msgid "<emphasis>Enable SMP</emphasis>"
msgstr "<emphasis>Generički</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis>Enable APIC</emphasis>"
msgstr "<emphasis>Generički</emphasis>"
#. 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 "
@@ -4153,26 +4153,26 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:168
#, fuzzy
msgid "<emphasis>Enable Local APIC</emphasis>"
msgstr "<emphasis>Generički</emphasis>"
#. 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
#, fuzzy
msgid "Bootloader Configuration"
msgstr "Konfiguracija zvuka"
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:129
+#: en/setupBootloader.xml:180
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -4186,37 +4186,37 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:139
+#: en/setupBootloader.xml:191
#, fuzzy
msgid "<emphasis role=\"bold\">Default</emphasis>"
msgstr "<emphasis>Generički</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Append</emphasis>"
msgstr "<emphasis>Generički</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
msgstr "<emphasis>Generički</emphasis>"
#. 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, "
@@ -4224,7 +4224,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:156
+#: en/setupBootloader.xml:215
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -4238,13 +4238,13 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:166
+#: en/setupBootloader.xml:226
#, fuzzy
msgid "<emphasis>Video mode</emphasis>"
msgstr "<emphasis>Proizvođač</emphasis>"
#. 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 "
@@ -4252,13 +4252,13 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:172
+#: en/setupBootloader.xml:234
#, fuzzy
msgid "<emphasis>Do not touch ESP or MBR</emphasis>"
msgstr "<emphasis>Proizvođač</emphasis>"
#. 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 "
@@ -4267,28 +4267,27 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:181
+#: en/setupBootloader.xml:245
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align=\"center"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png"
"\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
-"align=\"center\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:188
+#: en/setupBootloader.xml:253
#, fuzzy
msgid "Other Options"
msgstr "Opcije"
#. 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 "
@@ -4298,12 +4297,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 "
@@ -4311,21 +4310,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"
@@ -4672,6 +4656,14 @@ msgstr ""
#, fuzzy
#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align="
+#~ "\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+#~ "align=\"center\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
#~ "<imageobject> <imagedata fileref=\"live-bootCSM.png\" align=\"center\"/> "
#~ "</imageobject>"
#~ msgstr ""
diff --git a/docs/docs/stable/installer/hr/setupBootloader.xml b/docs/docs/stable/installer/hr/setupBootloader.xml
index c434670c..0e11ec83 100644
--- a/docs/docs/stable/installer/hr/setupBootloader.xml
+++ b/docs/docs/stable/installer/hr/setupBootloader.xml
@@ -1,10 +1,27 @@
-<?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:lang="hr" xml:id="setupBootloader">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hr" 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">
+
+
+
+
+
+
+
+
+
+
<info>
<!--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-->
@@ -13,29 +30,39 @@ Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
<!--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.-->
<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 no ESP exists, then one will
@@ -44,155 +71,191 @@ required, whatever the number of operating systems you have.</para>
</listitem>
</itemizedlist>
</section>
+
<section>
<info>
<title xml:id="setupBootloader-ti2">Bootloader Setup</title>
</info>
+
<section>
<title>Glavne postavke bootloadera</title>
+
<mediaobject>
<imageobject condition="classical"> <imagedata align="center"
fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
condition="live"> <imagedata fileref="live-setupBootloader.png"
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 most people are not likely
to have a need for it. The username is <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 computer does not support ACPI or if
you think the ACPI 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>
+
<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>
+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>
+
<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 are sure you understand the
implications, and wish to proceed.</para>
</listitem>
</itemizedlist>
+
<mediaobject>
-<imageobject> <imagedata fileref="live-setupBootloader5.png"
-align="center"/> </imageobject></mediaobject>
+<imageobject> <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 should detect
Mageia and automatically add an entry for it in the 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/hu.po b/docs/docs/stable/installer/hu.po
index 071039b9..53a6421b 100644
--- a/docs/docs/stable/installer/hu.po
+++ b/docs/docs/stable/installer/hu.po
@@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\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: 2018-01-06 13:51+0000\n"
"Last-Translator: Ferenc Teknős <teknos.ferenc@gmail.com>\n"
"Language-Team: Hungarian (http://www.transifex.com/MageiaLinux/mageia/"
@@ -320,7 +320,7 @@ msgstr ""
"érzékeny.</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Password</emphasis>"
msgstr "<emphasis role=\"bold\">Partíció méret:</emphasis>"
@@ -3889,8 +3889,8 @@ msgid ""
"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 ""
@@ -3910,54 +3910,54 @@ msgid ""
msgstr ""
#. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:10
+#: en/setupBootloader.xml:27
#, fuzzy
msgid "Bootloader"
msgstr "Rendszerindítási beállítások"
#. 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 "
@@ -3967,18 +3967,18 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:46
+#: en/setupBootloader.xml:72
#, fuzzy
msgid "Bootloader Setup"
msgstr "Rendszerindítási beállítások"
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:49
+#: en/setupBootloader.xml:76
msgid "Bootloader main options"
msgstr "Rendszerindítási beállítások"
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:51
+#: en/setupBootloader.xml:79
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -3992,51 +3992,51 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:62
+#: en/setupBootloader.xml:91
#, fuzzy
msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
msgstr "<emphasis role=\"bold\">Partíció méret:</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Boot device</emphasis>"
msgstr "<emphasis role=\"bold\">Partíció méret:</emphasis>"
#. 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
#, fuzzy
msgid ""
"<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
msgstr "<emphasis role=\"bold\">Partíció méret:</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Security</emphasis>"
msgstr "<emphasis role=\"bold\">Partíció méret:</emphasis>"
#. 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 "
@@ -4046,18 +4046,18 @@ 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
#, fuzzy
msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
msgstr "<emphasis role=\"bold\">Partíció méret:</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:92
+#: en/setupBootloader.xml:132
#, fuzzy
msgid ""
"Retype the password and DrakX will check that it matches with the one set "
@@ -4068,19 +4068,19 @@ msgstr ""
"felhasználói jelszó szövegdobozaiban."
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:96 en/setupBootloader.xml:154
+#: en/setupBootloader.xml:137 en/setupBootloader.xml:212
#, fuzzy
msgid "<emphasis>Advanced</emphasis>"
msgstr "<emphasis>Gyártó</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:99
+#: en/setupBootloader.xml:141
#, fuzzy
msgid "<emphasis>Enable ACPI</emphasis>"
msgstr "<emphasis>Általános</emphasis>"
#. 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 "
@@ -4090,26 +4090,26 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:108
+#: en/setupBootloader.xml:152
#, fuzzy
msgid "<emphasis>Enable SMP</emphasis>"
msgstr "<emphasis>Általános</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis>Enable APIC</emphasis>"
msgstr "<emphasis>Általános</emphasis>"
#. 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 "
@@ -4117,26 +4117,26 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:168
#, fuzzy
msgid "<emphasis>Enable Local APIC</emphasis>"
msgstr "<emphasis>Általános</emphasis>"
#. 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
#, fuzzy
msgid "Bootloader Configuration"
msgstr "Hang beállítása"
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:129
+#: en/setupBootloader.xml:180
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -4150,37 +4150,37 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:139
+#: en/setupBootloader.xml:191
#, fuzzy
msgid "<emphasis role=\"bold\">Default</emphasis>"
msgstr "<emphasis role=\"bold\">Partíció méret:</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Append</emphasis>"
msgstr "<emphasis role=\"bold\">Partíció méret:</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
msgstr "<emphasis role=\"bold\">Partíció méret:</emphasis>"
#. 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, "
@@ -4188,7 +4188,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:156
+#: en/setupBootloader.xml:215
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -4202,13 +4202,13 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:166
+#: en/setupBootloader.xml:226
#, fuzzy
msgid "<emphasis>Video mode</emphasis>"
msgstr "<emphasis>Gyártó</emphasis>"
#. 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 "
@@ -4216,13 +4216,13 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:172
+#: en/setupBootloader.xml:234
#, fuzzy
msgid "<emphasis>Do not touch ESP or MBR</emphasis>"
msgstr "<emphasis>Gyártó</emphasis>"
#. 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 "
@@ -4231,28 +4231,26 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:181
+#: en/setupBootloader.xml:245
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align=\"center"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png"
"\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
-"imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:188
+#: en/setupBootloader.xml:253
#, fuzzy
msgid "Other Options"
msgstr "Beállítások"
#. 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 "
@@ -4262,12 +4260,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 "
@@ -4275,21 +4273,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"
@@ -4643,6 +4626,14 @@ msgstr ""
#, fuzzy
#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align="
+#~ "\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
#~ "<imageobject> <imagedata fileref=\"live-bootCSM.png\" align=\"center\"/> "
#~ "</imageobject>"
#~ msgstr ""
diff --git a/docs/docs/stable/installer/hu/setupBootloader.xml b/docs/docs/stable/installer/hu/setupBootloader.xml
index 592f66f7..0404f312 100644
--- a/docs/docs/stable/installer/hu/setupBootloader.xml
+++ b/docs/docs/stable/installer/hu/setupBootloader.xml
@@ -1,10 +1,27 @@
-<?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:lang="hu" xml:id="setupBootloader">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hu" 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">
+
+
+
+
+
+
+
+
+
+
<info>
<!--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-->
@@ -13,29 +30,39 @@ Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
<!--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.-->
<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 no ESP exists, then one will
@@ -44,155 +71,191 @@ required, whatever the number of operating systems you have.</para>
</listitem>
</itemizedlist>
</section>
+
<section>
<info>
<title xml:id="setupBootloader-ti2">Bootloader Setup</title>
</info>
+
<section>
<title>Rendszerindítási beállítások</title>
+
<mediaobject>
<imageobject condition="classical"> <imagedata align="center"
fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
condition="live"> <imagedata fileref="live-setupBootloader.png"
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 most people are not likely
to have a need for it. The username is <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 computer does not support ACPI or if
you think the ACPI 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>
+
<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>
+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>
+
<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 are sure you understand the
implications, and wish to proceed.</para>
</listitem>
</itemizedlist>
+
<mediaobject>
-<imageobject> <imagedata fileref="live-setupBootloader5.png"
-align="center"/> </imageobject></mediaobject>
+<imageobject> <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 should detect
Mageia and automatically add an entry for it in the 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/id.po b/docs/docs/stable/installer/id.po
index 86d3ae6f..3a0209a8 100644
--- a/docs/docs/stable/installer/id.po
+++ b/docs/docs/stable/installer/id.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\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: 2016-07-17 09:04+0000\n"
"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
"Language-Team: Indonesian (http://www.transifex.com/MageiaLinux/mageia/"
@@ -314,7 +314,7 @@ msgstr ""
"login berlaku sensitif.</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Password</emphasis>"
msgstr "<emphasis>Pabrikan</emphasis>"
@@ -4459,8 +4459,8 @@ msgstr ""
"untuk mengkonfigurasi tombol yang tidak bekerja pada mouse dengan enam "
"tombol atau lebih."
-#. 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 "Tambah atau Modifikasi Entri Menu Boot"
@@ -4485,54 +4485,54 @@ msgstr ""
"How_to_set_up_kernel_options</link>"
#. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:10
+#: en/setupBootloader.xml:27
#, fuzzy
msgid "Bootloader"
msgstr "Pilihan utama Bootloader"
#. 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 "
@@ -4542,18 +4542,18 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:46
+#: en/setupBootloader.xml:72
#, fuzzy
msgid "Bootloader Setup"
msgstr "Pilihan utama Bootloader"
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:49
+#: en/setupBootloader.xml:76
msgid "Bootloader main options"
msgstr "Pilihan utama Bootloader"
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:51
+#: en/setupBootloader.xml:79
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -4566,52 +4566,52 @@ msgstr ""
"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:62
+#: en/setupBootloader.xml:91
#, fuzzy
msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
msgstr "<emphasis>Pabrikan</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Boot device</emphasis>"
msgstr "<emphasis>Pabrikan</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:68
+#: en/setupBootloader.xml:100
#, fuzzy
msgid "Don't change this unless you really know what you are doing"
msgstr "Hanya ubah sesuatu jika Anda sangat mengetahui hal tersebut."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:72
+#: en/setupBootloader.xml:105
#, fuzzy
msgid ""
"<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
msgstr "<emphasis>Pabrikan</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Security</emphasis>"
msgstr "<emphasis>Pabrikan</emphasis>"
#. 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 "
@@ -4621,18 +4621,18 @@ 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
#, fuzzy
msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
msgstr "<emphasis>Pabrikan</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:92
+#: en/setupBootloader.xml:132
#, fuzzy
msgid ""
"Retype the password and DrakX will check that it matches with the one set "
@@ -4643,19 +4643,19 @@ msgstr ""
"tiap kotak teks."
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:96 en/setupBootloader.xml:154
+#: en/setupBootloader.xml:137 en/setupBootloader.xml:212
#, fuzzy
msgid "<emphasis>Advanced</emphasis>"
msgstr "<emphasis>Pabrikan</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:99
+#: en/setupBootloader.xml:141
#, fuzzy
msgid "<emphasis>Enable ACPI</emphasis>"
msgstr "<emphasis>Umum</emphasis>"
#. 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 "
@@ -4665,26 +4665,26 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:108
+#: en/setupBootloader.xml:152
#, fuzzy
msgid "<emphasis>Enable SMP</emphasis>"
msgstr "<emphasis>Umum</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis>Enable APIC</emphasis>"
msgstr "<emphasis>Umum</emphasis>"
#. 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 "
@@ -4692,26 +4692,26 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:168
#, fuzzy
msgid "<emphasis>Enable Local APIC</emphasis>"
msgstr "<emphasis>Umum</emphasis>"
#. 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
#, fuzzy
msgid "Bootloader Configuration"
msgstr "Konfigurasi Suara"
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:129
+#: en/setupBootloader.xml:180
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -4724,37 +4724,37 @@ msgstr ""
"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:139
+#: en/setupBootloader.xml:191
#, fuzzy
msgid "<emphasis role=\"bold\">Default</emphasis>"
msgstr "<emphasis>Pabrikan</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Append</emphasis>"
msgstr "<emphasis>Pabrikan</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
msgstr "<emphasis>Pabrikan</emphasis>"
#. 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, "
@@ -4762,7 +4762,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:156
+#: en/setupBootloader.xml:215
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -4775,13 +4775,13 @@ msgstr ""
"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:166
+#: en/setupBootloader.xml:226
#, fuzzy
msgid "<emphasis>Video mode</emphasis>"
msgstr "<emphasis>Pabrikan</emphasis>"
#. 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 "
@@ -4789,13 +4789,13 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:172
+#: en/setupBootloader.xml:234
#, fuzzy
msgid "<emphasis>Do not touch ESP or MBR</emphasis>"
msgstr "<emphasis>Pabrikan</emphasis>"
#. 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 "
@@ -4804,26 +4804,26 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:181
+#: en/setupBootloader.xml:245
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align=\"center"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png"
"\"/> </imageobject>"
msgstr ""
"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
#. 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 "Gunakan bootloader yang ada"
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:191
+#: en/setupBootloader.xml:258
#, fuzzy
msgid ""
"The exact procedure for adding Mageia to an existing bootloader is beyond "
@@ -4838,13 +4838,13 @@ msgstr ""
"menambahkan secara otomatis. Lihat pada dokumentasi sistem operasi."
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:199
+#: en/setupBootloader.xml:267
#, fuzzy
msgid "Installing Without a Bootloader"
msgstr "Gunakan bootloader Mageia"
#. 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 "
@@ -4852,26 +4852,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
-#, fuzzy
-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 ""
-"Untuk informasi lebih banyak tentang opsi kernel pada sistem legacy dan "
-"UEFI, lihat: <link ns2:href=\"https://wiki.mageia.org/en/"
-"How_to_set_up_kernel_options\">https://wiki.mageia.org/en/"
-"How_to_set_up_kernel_options</link>"
-
#. type: Content of: <section><info><title>
#: en/setupSCSI.xml:10
msgid "Setup SCSI"
@@ -5257,6 +5237,24 @@ msgstr ""
#, fuzzy
#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align="
+#~ "\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+
+#, fuzzy
+#~ 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 ""
+#~ "Untuk informasi lebih banyak tentang opsi kernel pada sistem legacy dan "
+#~ "UEFI, lihat: <link ns2:href=\"https://wiki.mageia.org/en/"
+#~ "How_to_set_up_kernel_options\">https://wiki.mageia.org/en/"
+#~ "How_to_set_up_kernel_options</link>"
+
+#, fuzzy
+#~ msgid ""
#~ "<imageobject> <imagedata fileref=\"live-bootCSM.png\" align=\"center\"/> "
#~ "</imageobject>"
#~ msgstr ""
diff --git a/docs/docs/stable/installer/id/setupBootloader.xml b/docs/docs/stable/installer/id/setupBootloader.xml
index 979aab41..65d38075 100644
--- a/docs/docs/stable/installer/id/setupBootloader.xml
+++ b/docs/docs/stable/installer/id/setupBootloader.xml
@@ -1,10 +1,27 @@
-<?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:lang="id" xml:id="setupBootloader">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="id" 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">
+
+
+
+
+
+
+
+
+
+
<info>
<!--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-->
@@ -13,29 +30,39 @@ Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
<!--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.-->
<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 no ESP exists, then one will
@@ -44,155 +71,191 @@ required, whatever the number of operating systems you have.</para>
</listitem>
</itemizedlist>
</section>
+
<section>
<info>
<title xml:id="setupBootloader-ti2">Bootloader Setup</title>
</info>
+
<section>
<title>Pilihan utama Bootloader</title>
+
<mediaobject>
<imageobject condition="classical"> <imagedata align="center"
fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
condition="live"> <imagedata fileref="live-setupBootloader.png"
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 most people are not likely
to have a need for it. The username is <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 computer does not support ACPI or if
you think the ACPI 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>
+
<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>
+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>
+
<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 are sure you understand the
implications, and wish to proceed.</para>
</listitem>
</itemizedlist>
+
<mediaobject>
-<imageobject> <imagedata fileref="live-setupBootloader5.png"
-align="center"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center"
+fileref="live-setupBootloader5.png"/> </imageobject></mediaobject>
</section>
</section>
+
<section>
<title>Other Options</title>
+
<section>
<title>Gunakan bootloader yang ada</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 should detect
Mageia and automatically add an entry for it in the 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>Tambah atau Modifikasi Entri Menu Boot</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/it.po b/docs/docs/stable/installer/it.po
index 5d11fdc5..b37a3cbc 100644
--- a/docs/docs/stable/installer/it.po
+++ b/docs/docs/stable/installer/it.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\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: 2016-07-17 11:45+0300\n"
"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
"Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
@@ -292,7 +292,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
#, fuzzy
msgid "<emphasis role=\"bold\">Password</emphasis>"
msgstr "<emphasis>Venditore</emphasis>"
@@ -4122,8 +4122,8 @@ msgstr ""
"per configurare i pulsanti che non funzionano su un mouse con sei o più "
"pulsanti."
-#. 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 "Aggiungi o modifica una Boot Menu Entry"
@@ -4148,54 +4148,54 @@ msgstr ""
"How_to_set_up_kernel_options</link>"
#. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:10
+#: en/setupBootloader.xml:27
#, fuzzy
msgid "Bootloader"
msgstr "Opzioni principali del bootloader"
#. 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 "
@@ -4205,18 +4205,18 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:46
+#: en/setupBootloader.xml:72
#, fuzzy
msgid "Bootloader Setup"
msgstr "Opzioni principali del bootloader"
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:49
+#: en/setupBootloader.xml:76
msgid "Bootloader main options"
msgstr "Opzioni principali del bootloader"
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:51
+#: en/setupBootloader.xml:79
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -4229,52 +4229,52 @@ msgstr ""
"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:62
+#: en/setupBootloader.xml:91
#, fuzzy
msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
msgstr "<emphasis>Venditore</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Boot device</emphasis>"
msgstr "<emphasis>Venditore</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:68
+#: en/setupBootloader.xml:100
#, fuzzy
msgid "Don't change this unless you really know what you are doing"
msgstr "Cambia le cose solo quando sai veramente bene cosa stai facendo."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:72
+#: en/setupBootloader.xml:105
#, fuzzy
msgid ""
"<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
msgstr "<emphasis>Venditore</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Security</emphasis>"
msgstr "<emphasis>Venditore</emphasis>"
#. 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 "
@@ -4284,37 +4284,37 @@ 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
#, fuzzy
msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
msgstr "<emphasis>Venditore</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis>Advanced</emphasis>"
msgstr "<emphasis>Venditore</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:99
+#: en/setupBootloader.xml:141
#, fuzzy
msgid "<emphasis>Enable ACPI</emphasis>"
msgstr "<emphasis>Generico</emphasis>"
#. 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 "
@@ -4324,26 +4324,26 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:108
+#: en/setupBootloader.xml:152
#, fuzzy
msgid "<emphasis>Enable SMP</emphasis>"
msgstr "<emphasis>Generico</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis>Enable APIC</emphasis>"
msgstr "<emphasis>Generico</emphasis>"
#. 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 "
@@ -4351,26 +4351,26 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:168
#, fuzzy
msgid "<emphasis>Enable Local APIC</emphasis>"
msgstr "<emphasis>Generico</emphasis>"
#. 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
#, fuzzy
msgid "Bootloader Configuration"
msgstr "Configurazione audio"
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:129
+#: en/setupBootloader.xml:180
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -4383,37 +4383,37 @@ msgstr ""
"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:139
+#: en/setupBootloader.xml:191
#, fuzzy
msgid "<emphasis role=\"bold\">Default</emphasis>"
msgstr "<emphasis>Venditore</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Append</emphasis>"
msgstr "<emphasis>Venditore</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
msgstr "<emphasis>Venditore</emphasis>"
#. 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, "
@@ -4421,7 +4421,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:156
+#: en/setupBootloader.xml:215
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -4434,13 +4434,13 @@ msgstr ""
"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:166
+#: en/setupBootloader.xml:226
#, fuzzy
msgid "<emphasis>Video mode</emphasis>"
msgstr "<emphasis>Venditore</emphasis>"
#. 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 "
@@ -4448,13 +4448,13 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:172
+#: en/setupBootloader.xml:234
#, fuzzy
msgid "<emphasis>Do not touch ESP or MBR</emphasis>"
msgstr "<emphasis>Venditore</emphasis>"
#. 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 "
@@ -4463,25 +4463,26 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:181
+#: en/setupBootloader.xml:245
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align=\"center"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png"
"\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+msgstr ""
+"<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
#. 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 "Usare un bootloader esistente"
#. 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 "
@@ -4491,12 +4492,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 "
@@ -4504,26 +4505,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
-#, fuzzy
-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 ""
-"Per maggiori informazioni riguardo le opzioni del kernel su sistemi legacy e "
-"UEFI visitare: <link ns2:href=\"https://wiki.mageia.org/en/"
-"How_to_set_up_kernel_options\">https://wiki.mageia.org/en/"
-"How_to_set_up_kernel_options</link>"
-
#. type: Content of: <section><info><title>
#: en/setupSCSI.xml:10
msgid "Setup SCSI"
@@ -4891,6 +4872,23 @@ msgstr ""
#, fuzzy
#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align="
+#~ "\"center\"/> </imageobject>"
+#~ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#, fuzzy
+#~ 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 ""
+#~ "Per maggiori informazioni riguardo le opzioni del kernel su sistemi "
+#~ "legacy e UEFI visitare: <link ns2:href=\"https://wiki.mageia.org/en/"
+#~ "How_to_set_up_kernel_options\">https://wiki.mageia.org/en/"
+#~ "How_to_set_up_kernel_options</link>"
+
+#, fuzzy
+#~ msgid ""
#~ "<imageobject> <imagedata fileref=\"live-bootCSM.png\" align=\"center\"/> "
#~ "</imageobject>"
#~ msgstr ""
diff --git a/docs/docs/stable/installer/it/setupBootloader.xml b/docs/docs/stable/installer/it/setupBootloader.xml
index a0ccc011..9fe08531 100644
--- a/docs/docs/stable/installer/it/setupBootloader.xml
+++ b/docs/docs/stable/installer/it/setupBootloader.xml
@@ -1,10 +1,27 @@
-<?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:lang="it" xml:id="setupBootloader">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="it" 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">
+
+
+
+
+
+
+
+
+
+
<info>
<!--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-->
@@ -13,29 +30,39 @@ Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
<!--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.-->
<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 no ESP exists, then one will
@@ -44,155 +71,191 @@ required, whatever the number of operating systems you have.</para>
</listitem>
</itemizedlist>
</section>
+
<section>
<info>
<title xml:id="setupBootloader-ti2">Bootloader Setup</title>
</info>
+
<section>
<title>Opzioni principali del bootloader</title>
+
<mediaobject>
<imageobject condition="classical"> <imagedata align="center"
fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
condition="live"> <imagedata fileref="live-setupBootloader.png"
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 most people are not likely
to have a need for it. The username is <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 computer does not support ACPI or if
you think the ACPI 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>
+
<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>
+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>
+
<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 are sure you understand the
implications, and wish to proceed.</para>
</listitem>
</itemizedlist>
+
<mediaobject>
-<imageobject> <imagedata fileref="live-setupBootloader5.png"
-align="center"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center"
+fileref="live-setupBootloader5.png"/> </imageobject></mediaobject>
</section>
</section>
+
<section>
<title>Other Options</title>
+
<section>
<title>Usare un bootloader esistente</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 should detect
Mageia and automatically add an entry for it in the 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>Aggiungi o modifica una 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/ja.po b/docs/docs/stable/installer/ja.po
index d188a4b5..51e65cd7 100644
--- a/docs/docs/stable/installer/ja.po
+++ b/docs/docs/stable/installer/ja.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\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: 2019-01-14 04:21+0000\n"
"Last-Translator: Masanori Kakura <kakurasan@gmail.com>\n"
"Language-Team: Japanese (http://www.transifex.com/MageiaLinux/mageia/"
@@ -284,7 +284,7 @@ msgstr ""
"文字と小文字を区別します。</emphasis>"
#. 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 "<emphasis role=\"bold\">パスワード</emphasis>"
@@ -4005,8 +4005,8 @@ msgid ""
"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 "ブート メニュー項目を追加もしくは変更する"
@@ -4032,53 +4032,53 @@ msgstr ""
"efi_and_Mageia</link>"
#. 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 "UEFI システム上の Grub2-efi"
#. 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 "
@@ -4088,17 +4088,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 condition=\"live"
@@ -4107,47 +4107,47 @@ 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 "
@@ -4157,34 +4157,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 "
@@ -4194,24 +4194,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 "
@@ -4219,24 +4219,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 condition=\"live"
@@ -4245,34 +4245,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, "
@@ -4280,7 +4280,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 condition=\"live"
@@ -4289,12 +4289,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 "
@@ -4302,12 +4302,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 "
@@ -4316,24 +4316,27 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:181
+#: en/setupBootloader.xml:245
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align=\"center"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png"
"\"/> </imageobject>"
msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> </"
+"imageobject>"
#. 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 "
@@ -4343,12 +4346,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 "
@@ -4356,21 +4359,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"
diff --git a/docs/docs/stable/installer/ja/setupBootloader.xml b/docs/docs/stable/installer/ja/setupBootloader.xml
index 59b49ac2..1385cb6d 100644
--- a/docs/docs/stable/installer/ja/setupBootloader.xml
+++ b/docs/docs/stable/installer/ja/setupBootloader.xml
@@ -1,10 +1,27 @@
-<?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:lang="ja" xml:id="setupBootloader">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ja" 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">
+
+
+
+
+
+
+
+
+
+
<info>
<!--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-->
@@ -13,29 +30,39 @@ Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
<!--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.-->
<title xml:id="setupBootloader-ti1">ブート ローダ</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>UEFI システム上の Grub2-efi</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 no ESP exists, then one will
@@ -44,155 +71,191 @@ required, whatever the number of operating systems you have.</para>
</listitem>
</itemizedlist>
</section>
+
<section>
<info>
<title xml:id="setupBootloader-ti2">Bootloader Setup</title>
</info>
+
<section>
<title>ブート ローダの主な設定</title>
+
<mediaobject>
<imageobject condition="classical"> <imagedata align="center"
fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
condition="live"> <imagedata fileref="live-setupBootloader.png"
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 most people are not likely
to have a need for it. The username is <literal>root</literal> and the
password is the one chosen hereafter.</para>
</listitem>
+
<listitem>
<para><emphasis role="bold">パスワード</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 computer does not support ACPI or if
you think the ACPI 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>ブート ローダの設定</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>
+
<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>
+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>
+
<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 are sure you understand the
implications, and wish to proceed.</para>
</listitem>
</itemizedlist>
+
<mediaobject>
-<imageobject> <imagedata fileref="live-setupBootloader5.png"
-align="center"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center"
+fileref="live-setupBootloader5.png"/> </imageobject></mediaobject>
</section>
</section>
+
<section>
<title>その他のオプション</title>
+
<section>
<title>既存のブート ローダを使用する</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 should detect
Mageia and automatically add an entry for it in the 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>ブート メニュー項目を追加もしくは変更する</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/nb.po b/docs/docs/stable/installer/nb.po
index c9f42619..485e2804 100644
--- a/docs/docs/stable/installer/nb.po
+++ b/docs/docs/stable/installer/nb.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\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: 2019-01-13 20:51+0000\n"
"Last-Translator: Karl Morten Ramberg <karl.m.ramberg@gmail.com>\n"
"Language-Team: Norwegian Bokmål (http://www.transifex.com/MageiaLinux/mageia/"
@@ -283,7 +283,7 @@ msgstr ""
"skiller på store og små bokstaver. </emphasis>"
#. 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 "<emphasis role=\"bold\">Passord</emphasis>"
@@ -4440,8 +4440,8 @@ msgstr ""
"guimenuitem></menuchoice> for å konfigurere knappene som ikke virker på en "
"mus med 6 eller flere knapper."
-#. 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 "Legg til eller endre et oppstartsmenypunkt"
@@ -4466,22 +4466,22 @@ msgstr ""
"efi_and_Mageia\"> https://wiki.mageia.org/en/Grub2-efi_and_Mageia </link>"
#. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:10
+#: en/setupBootloader.xml:27
msgid "Bootloader"
msgstr "Oppstartslaster"
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:13
+#: en/setupBootloader.xml:31
msgid "Grub2"
msgstr "Grub2"
#. type: Content of: <section><section><itemizedlist><title>
-#: en/setupBootloader.xml:15
+#: en/setupBootloader.xml:34
msgid "Grub2 on Legacy MBR/GPT systems"
msgstr "Grub2 på eldre MBR/GPT systemer"
#. 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."
@@ -4490,7 +4490,7 @@ msgstr ""
"oppstartslaster for et Legacy/MBR eller Legacy/GPT-system."
#. 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."
@@ -4499,17 +4499,17 @@ msgstr ""
"Record) på den første harddisken eller i BIOS-oppstartspartisjonen."
#. type: Content of: <section><section><itemizedlist><title>
-#: en/setupBootloader.xml:27
+#: en/setupBootloader.xml:49
msgid "Grub2-efi on UEFI systems"
msgstr "Grub2-efi på UEFI systemer"
#. 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 "GRUB2-efi vil bare bli brukt som oppstartslaster for et UEFI-system."
#. 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)."
@@ -4518,7 +4518,7 @@ msgstr ""
"Partition)."
#. 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 "
@@ -4534,17 +4534,17 @@ msgstr ""
"operativsystemer du har."
#. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:46
+#: en/setupBootloader.xml:72
msgid "Bootloader Setup"
msgstr "Oppsett av Oppstartslaster"
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:49
+#: en/setupBootloader.xml:76
msgid "Bootloader main options"
msgstr "Hovedvalg for oppstartslaster"
#. 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 condition=\"live"
@@ -4557,12 +4557,12 @@ msgstr ""
"im1\"/> </imageobject>"
#. 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 "<emphasis role=\"bold\">Velg Oppstarter</emphasis>"
#. 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."
@@ -4571,17 +4571,17 @@ msgstr ""
"av UEFI-systemer vil ikke se dette alternativet."
#. 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 "<emphasis role=\"bold\">Oppstartsenhet</emphasis>"
#. 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 "Gjør ikke endringer i dette med mindre du virkelig vet hva du gjør"
#. 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 ""
@@ -4589,7 +4589,7 @@ msgstr ""
"emphasis>"
#. 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."
@@ -4598,12 +4598,12 @@ msgstr ""
"operativsystemet er startet opp."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:78
+#: en/setupBootloader.xml:113
msgid "<emphasis role=\"bold\">Security</emphasis>"
msgstr "<emphasis role=\"bold\">Sikkerhet</emphasis>"
#. 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 "
@@ -4617,17 +4617,17 @@ msgstr ""
"literal>og passordet er det som er valgt her etter."
#. 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 "Velg et passord for oppstartslasteren (alternativt)."
#. 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 "<emphasis role=\"bold\">Passord (igjen)</emphasis>"
#. 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"
@@ -4636,17 +4636,17 @@ msgstr ""
"som er angitt ovenfor."
#. 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 "<emphasis>Avansert</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:99
+#: en/setupBootloader.xml:141
msgid "<emphasis>Enable ACPI</emphasis>"
msgstr "<emphasis>Aktiver ACPI</emphasis>"
#. 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 "
@@ -4662,12 +4662,12 @@ msgstr ""
"tilfeldige omstart eller systemlåsing)."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:108
+#: en/setupBootloader.xml:152
msgid "<emphasis>Enable SMP</emphasis>"
msgstr "<emphasis>Aktiver SMP</emphasis>"
#. 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"
@@ -4676,12 +4676,12 @@ msgstr ""
"fler-kjerne prosessorer."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:113
+#: en/setupBootloader.xml:159
msgid "<emphasis>Enable APIC</emphasis>"
msgstr "<emphasis>Aktiver APIC</emphasis>"
#. 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 "
@@ -4693,12 +4693,12 @@ msgstr ""
"administrasjon."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:168
msgid "<emphasis>Enable Local APIC</emphasis>"
msgstr "<emphasis>Aktiver Lokal APIC</emphasis>"
#. 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"
@@ -4707,12 +4707,12 @@ msgstr ""
"bestemt prosessor i et SMP-system."
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:127
+#: en/setupBootloader.xml:177
msgid "Bootloader Configuration"
msgstr "Oppsett av oppstartslaster"
#. 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 condition=\"live"
@@ -4725,36 +4725,38 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:139
+#: en/setupBootloader.xml:191
msgid "<emphasis role=\"bold\">Default</emphasis>"
msgstr "<emphasis role=\"bold\">Standard</emphasis>"
#. 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
+#, fuzzy
+msgid "The operating system to be started up by default."
msgstr " Operativsystemet startes opp som standard"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:143
+#: en/setupBootloader.xml:197
msgid "<emphasis role=\"bold\">Append</emphasis>"
msgstr "<emphasis role=\"bold\">Legg til</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:144
+#: en/setupBootloader.xml:199
+#, fuzzy
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 ""
"Dette alternativet lar deg sende kjernedataene eller fortelle kjernen for å "
"gi deg mer informasjon når den starter opp."
#. 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 "<emphasis role=\"bold\">Sjekk for fremmed OS</emphasis>"
#. 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, "
@@ -4765,7 +4767,7 @@ msgstr ""
"du markeringen for Test for Fremmed OS"
#. 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 condition=\"live"
@@ -4778,12 +4780,12 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:166
+#: en/setupBootloader.xml:226
msgid "<emphasis>Video mode</emphasis>"
msgstr "<emphasis>Video modus</emphasis>"
#. 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 "
@@ -4794,12 +4796,12 @@ msgstr ""
"fargedybdealternativer."
#. 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 "<emphasis>Ikke rør ESP eller MBR</emphasis>"
#. 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 "
@@ -4812,26 +4814,27 @@ msgstr ""
"på at du forstår implikasjonene, og ønsker å fortsette."
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:181
+#: en/setupBootloader.xml:245
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align=\"center"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png"
"\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align=\"center"
-"\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot2.png\"/> </"
+"imageobject>"
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:188
+#: en/setupBootloader.xml:253
msgid "Other Options"
msgstr "Andre valg"
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:190
+#: en/setupBootloader.xml:256
msgid "Using an existing bootloader"
msgstr "Bruker en eksisterende oppstartslaster"
#. 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 "
@@ -4846,12 +4849,12 @@ msgstr ""
"automatisk. Se dokumentasjonen for det aktuelle operativsystemet."
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:199
+#: en/setupBootloader.xml:267
msgid "Installing Without a Bootloader"
msgstr "Innstaller uten en oppstartslaster"
#. 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 "
@@ -4862,26 +4865,6 @@ msgstr ""
"Avansert), anbefales dette ikke med mindre du absolutt vet hva du gjør, som "
"uten noen form for oppstartslader, kan operativsystemet ikke starte."
-#. 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 ""
-"For å gjøre dette må du manuelt redigere <filename>/boot/grub2/custom.cfg</"
-"filename> eller bruke verktøyet <application> grub-customizer </application> "
-"i stedet (tilgjengelig i Mageia-repositoriene)."
-
-#. 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 ""
-"For mer informasjon, see: <link ns4:href=\"https://wiki.mageia.org/en/Grub2-"
-"efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link>"
-
#. type: Content of: <section><info><title>
#: en/setupSCSI.xml:10
msgid "Setup SCSI"
@@ -5284,3 +5267,28 @@ msgid ""
msgstr ""
"Neste steg er kopiering av filene til disken. Dette tar noen minutter. Til "
"slutt får du en tom skjerm for en stund, noe som er normalt."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align="
+#~ "\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align="
+#~ "\"center\"/> </imageobject>"
+
+#~ 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 ""
+#~ "For å gjøre dette må du manuelt redigere <filename>/boot/grub2/custom."
+#~ "cfg</filename> eller bruke verktøyet <application> grub-customizer </"
+#~ "application> i stedet (tilgjengelig i Mageia-repositoriene)."
+
+#~ 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 ""
+#~ "For mer informasjon, see: <link ns4:href=\"https://wiki.mageia.org/en/"
+#~ "Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</"
+#~ "link>"
diff --git a/docs/docs/stable/installer/nb/setupBootloader.xml b/docs/docs/stable/installer/nb/setupBootloader.xml
index 4d170abc..9e499b44 100644
--- a/docs/docs/stable/installer/nb/setupBootloader.xml
+++ b/docs/docs/stable/installer/nb/setupBootloader.xml
@@ -1,10 +1,27 @@
-<?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:lang="nb" xml:id="setupBootloader">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="nb" 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">
+
+
+
+
+
+
+
+
+
+
<info>
<!--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-->
@@ -13,29 +30,39 @@ Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
<!--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.-->
<title xml:id="setupBootloader-ti1">Oppstartslaster</title>
</info>
+
<section>
<title>Grub2</title>
+
<itemizedlist>
<title>Grub2 på eldre MBR/GPT systemer</title>
+
<listitem>
<para>GRUB2 (med eller uten grafisk meny) vil bli brukt utelukkende som
oppstartslaster for et Legacy/MBR eller Legacy/GPT-system.</para>
</listitem>
+
<listitem>
<para>Som standard vil en ny oppstartslaster skrives inn i enten MBR (Master Boot
Record) på den første harddisken eller i BIOS-oppstartspartisjonen.</para>
</listitem>
</itemizedlist>
+
<itemizedlist>
<title>Grub2-efi på UEFI systemer</title>
+
<listitem>
<para>GRUB2-efi vil bare bli brukt som oppstartslaster for et UEFI-system.</para>
</listitem>
+
<listitem>
<para>Som standard skrives en ny oppstarstlaster (Grub2-efi) inn i ESP (EFI System
Partition).</para>
+
<para>Hvis det allerede er UEFI-baserte operativsystemer installert på
datamaskinen din (Windows 8 eller senere for eksempel), vil Mageia
installereren oppdage eksisterende ESP laget av Windows og legge til
@@ -45,54 +72,72 @@ operativsystemer du har.</para>
</listitem>
</itemizedlist>
</section>
+
<section>
<info>
<title xml:id="setupBootloader-ti2">Oppsett av Oppstartslaster</title>
</info>
+
<section>
<title>Hovedvalg for oppstartslaster</title>
+
<mediaobject>
<imageobject condition="classical"> <imagedata align="center"
fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
condition="live"> <imagedata fileref="live-setupBootloader.png"
xml:id="setupBootloader-im1"/> </imageobject></mediaobject>
+
<itemizedlist>
<listitem>
<para><emphasis role="bold">Velg Oppstarter</emphasis></para>
+
<para>Denne funksjonen er bare tilgjengelig for Legacy MBR/BIOS-systemer. Brukere
av UEFI-systemer vil ikke se dette alternativet.</para>
</listitem>
+
<listitem>
<para><emphasis role="bold">Oppstartsenhet</emphasis></para>
+
<para>Gjør ikke endringer i dette med mindre du virkelig vet hva du gjør</para>
</listitem>
+
<listitem>
<para><emphasis role="bold">Forsinkelse før oppstart av
standardversjonen</emphasis></para>
+
<para>Denne tekstboksen lar deg angi en forsinkelse i sekunder før standard
operativsystemet er startet opp.</para>
</listitem>
+
<listitem>
<para><emphasis role="bold">Sikkerhet</emphasis></para>
+
<para>Dette lar deg sette et passord for oppstartslasteren. Dette betyr at
brukernavn og passord må oppgis ved oppstartstidspunkt for å velge en
oppstartspost eller endre innstillinger. Brukernavnet er <literal>"root"
</literal>og passordet er det som er valgt her etter.</para>
</listitem>
+
<listitem>
<para><emphasis role="bold">Passord</emphasis></para>
+
<para>Velg et passord for oppstartslasteren (alternativt).</para>
</listitem>
+
<listitem>
<para><emphasis role="bold">Passord (igjen)</emphasis></para>
+
<para>Skriv inn passordet igjen, og Drakx vil kontrollere at det samsvarer med det
som er angitt ovenfor.</para>
</listitem>
</itemizedlist>
+
<para><emphasis>Avansert</emphasis></para>
+
<itemizedlist>
<listitem>
<para><emphasis>Aktiver ACPI</emphasis></para>
+
<para>ACPI (Advanced Configuration and Power Interface) er en standard for
strømstyring. Det kan spare energi ved å stoppe ubrukte enheter, dette var
metoden som ble brukt før APM. Hvis du fjerner avmerkningen, kan det være
@@ -100,101 +145,119 @@ nyttig hvis datamaskinen din ikke støtter ACPI, eller hvis du tror at
implementeringen av ACPI kan forårsake noen problemer (for eksempel
tilfeldige omstart eller systemlåsing).</para>
</listitem>
+
<listitem>
<para><emphasis>Aktiver SMP</emphasis></para>
+
<para>Dette alternativet aktiverer / deaktiverer symmetrisk multiprosessering for
fler-kjerne prosessorer.</para>
</listitem>
+
<listitem>
<para><emphasis>Aktiver APIC</emphasis></para>
+
<para>Aktivering eller deaktivering av dette gir operativsystemet tilgang til den
avanserte programmerbare avbruddskontrollen. APIC-enheter tillater mer
komplekse prioritetsmodeller, og Avansert IRQ (Interrupt Request)
-administrasjon.</para>
</listitem>
+
<listitem>
<para><emphasis>Aktiver Lokal APIC</emphasis></para>
+
<para>Her kan du angi lokale APIC, som administrerer alle eksterne avbrudd for en
bestemt prosessor i et SMP-system.</para>
</listitem>
</itemizedlist>
</section>
+
<section>
<title>Oppsett av oppstartslaster</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>
+
<itemizedlist>
<listitem>
<para><emphasis role="bold">Standard</emphasis></para>
- <para> Operativsystemet startes opp som standard</para>
+
+ <para>The operating system to be started up by default.</para>
</listitem>
+
<listitem>
<para><emphasis role="bold">Legg til</emphasis></para>
- <para>Dette alternativet lar deg sende kjernedataene eller fortelle kjernen for å
-gi deg mer informasjon når den starter opp.</para>
+
+ <para>This option lets you pass information to the kernel or tell the kernel to
+give you more information as it boots.</para>
</listitem>
+
<listitem>
<para><emphasis role="bold">Sjekk for fremmed OS</emphasis></para>
+
<para>Hvis du har andre operativsystemer installert, forsøker Mageia å legge dem
til din Mageia oppstartsmeny. Hvis du ikke vil ha denne virkemåten, fjerner
du markeringen for Test for Fremmed OS</para>
</listitem>
</itemizedlist>
+
<para><emphasis>Avansert</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>
+
<itemizedlist>
<listitem>
<para><emphasis>Video modus</emphasis></para>
+
<para>Dette setter skjermstørrelsen og fargedybden som startmenyen vil bruke. Hvis
du klikker på nedre trekant, vil du bli tilbudt andre størrelses- og
fargedybdealternativer.</para>
</listitem>
+
<listitem>
<para><emphasis>Ikke rør ESP eller MBR</emphasis></para>
+
<para>Velg dette alternativet hvis du ikke vil ha en oppstartbar Mageia, men vil
heller kjede laste det fra et annet OS. Du får en advarsel om at
oppstartslasteren mangler. Klikk <emphasis>Ok</emphasis> hvis du er sikker
på at du forstår implikasjonene, og ønsker å fortsette.</para>
</listitem>
</itemizedlist>
+
<mediaobject>
-<imageobject> <imagedata fileref="live-setupBootloader5.png"
-align="center"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center"
+fileref="live-setupBootloader5.png"/> </imageobject></mediaobject>
</section>
</section>
+
<section>
<title>Andre valg</title>
+
<section>
<title>Bruker en eksisterende oppstartslaster</title>
+
<para>Den nøyaktige prosedyren for å legge til Mageia-systemet til i en
eksisterende oppstartslaster er utenfor omfanget av denne dokumentasjonen,
men i de fleste tilfeller vil det innebære å kjøre det aktuelle
startprogrammet for opplastingsprogrammer, som skal oppdage og legge til det
automatisk. Se dokumentasjonen for det aktuelle operativsystemet.</para>
</section>
+
<section>
<title>Innstaller uten en oppstartslaster</title>
+
<para>Du kan velge å installere Mageia uten oppstartslaster (se avsnitt 2.1
Avansert), anbefales dette ikke med mindre du absolutt vet hva du gjør, som
uten noen form for oppstartslader, kan operativsystemet ikke starte.</para>
</section>
- <section>
- <title>Legg til eller endre et oppstartsmenypunkt</title>
- <para>For å gjøre dette må du manuelt redigere
-<filename>/boot/grub2/custom.cfg</filename> eller bruke verktøyet
-<application> grub-customizer </application> i stedet (tilgjengelig i
-Mageia-repositoriene).</para>
- <note>
- <para>For mer informasjon, 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/nl.po b/docs/docs/stable/installer/nl.po
index b59d9895..9a6b7c78 100644
--- a/docs/docs/stable/installer/nl.po
+++ b/docs/docs/stable/installer/nl.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\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: 2018-07-11 19:23+0000\n"
"Last-Translator: dragnadh <dragnadh@gmail.com>\n"
"Language-Team: Dutch (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -279,7 +279,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
#, fuzzy
msgid "<emphasis role=\"bold\">Password</emphasis>"
msgstr "<emphasis role=\"bold\">Geavanceerd</emphasis>"
@@ -4060,8 +4060,8 @@ msgstr ""
"guilabel> om de niet werkende knoppen te configureren van een muis met zes "
"of meer knoppen."
-#. 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 "Wijzig een opstartmenu-ingang of voeg er een toe"
@@ -4081,54 +4081,54 @@ msgid ""
msgstr ""
#. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:10
+#: en/setupBootloader.xml:27
#, fuzzy
msgid "Bootloader"
msgstr "Opstartlader Interface"
#. 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 "
@@ -4138,18 +4138,18 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:46
+#: en/setupBootloader.xml:72
#, fuzzy
msgid "Bootloader Setup"
msgstr "Opstartlader Interface"
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:49
+#: en/setupBootloader.xml:76
msgid "Bootloader main options"
msgstr "Algemene opties voor de opstartlader"
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:51
+#: en/setupBootloader.xml:79
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -4163,52 +4163,52 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:62
+#: en/setupBootloader.xml:91
#, fuzzy
msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
msgstr "<emphasis role=\"bold\">Partitie grootte:</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Boot device</emphasis>"
msgstr "<emphasis role=\"bold\">Geavanceerd</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:68
+#: en/setupBootloader.xml:100
#, fuzzy
msgid "Don't change this unless you really know what you are doing"
msgstr "Verander alleen iets als u heel goed weet wat u doet."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:72
+#: en/setupBootloader.xml:105
#, fuzzy
msgid ""
"<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
msgstr "<emphasis role=\"bold\">Partitie grootte:</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Security</emphasis>"
msgstr "<emphasis role=\"bold\">Geavanceerd</emphasis>"
#. 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 "
@@ -4218,37 +4218,37 @@ 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
#, fuzzy
msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
msgstr "<emphasis role=\"bold\">Geavanceerd</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis>Advanced</emphasis>"
msgstr "<emphasis role=\"bold\">Geavanceerd</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:99
+#: en/setupBootloader.xml:141
#, fuzzy
msgid "<emphasis>Enable ACPI</emphasis>"
msgstr "<emphasis>Algemeen</emphasis>"
#. 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 "
@@ -4258,26 +4258,26 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:108
+#: en/setupBootloader.xml:152
#, fuzzy
msgid "<emphasis>Enable SMP</emphasis>"
msgstr "<emphasis>Algemeen</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis>Enable APIC</emphasis>"
msgstr "<emphasis>Algemeen</emphasis>"
#. 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 "
@@ -4285,26 +4285,26 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:168
#, fuzzy
msgid "<emphasis>Enable Local APIC</emphasis>"
msgstr "<emphasis>Algemeen</emphasis>"
#. 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
#, fuzzy
msgid "Bootloader Configuration"
msgstr "Geluidsconfiguratie"
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:129
+#: en/setupBootloader.xml:180
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -4318,42 +4318,42 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:139
+#: en/setupBootloader.xml:191
#, fuzzy
msgid "<emphasis role=\"bold\">Default</emphasis>"
msgstr "<emphasis role=\"bold\">Geavanceerd</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:140
+#: en/setupBootloader.xml:193
#, fuzzy
-msgid "The operating system to started up by default"
+msgid "The operating system to be started up by default."
msgstr "<guilabel>Standaard:</guilabel> Besturingssysteem standaard opgestart"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:143
+#: en/setupBootloader.xml:197
#, fuzzy
msgid "<emphasis role=\"bold\">Append</emphasis>"
msgstr "<emphasis role=\"bold\">Geavanceerd</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:144
+#: en/setupBootloader.xml:199
#, fuzzy
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 ""
"<guilabel>Toevoegen:</guilabel> Met deze optie kunt u de kernel informatie "
"overslaan of de kernel vertellen om u meer informatie omtrent het opstarten "
"te geven."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:148
+#: en/setupBootloader.xml:204
#, fuzzy
msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
msgstr "<emphasis role=\"bold\">Partitie grootte:</emphasis>"
#. 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, "
@@ -4361,7 +4361,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:156
+#: en/setupBootloader.xml:215
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -4375,13 +4375,13 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:166
+#: en/setupBootloader.xml:226
#, fuzzy
msgid "<emphasis>Video mode</emphasis>"
msgstr "<emphasis>Vendor (producent)</emphasis>"
#. 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 "
@@ -4389,13 +4389,13 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:172
+#: en/setupBootloader.xml:234
#, fuzzy
msgid "<emphasis>Do not touch ESP or MBR</emphasis>"
msgstr "<emphasis>Vendor (producent)</emphasis>"
#. 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 "
@@ -4404,28 +4404,26 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:181
+#: en/setupBootloader.xml:245
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align=\"center"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png"
"\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
-"imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:188
+#: en/setupBootloader.xml:253
#, fuzzy
msgid "Other Options"
msgstr "Opties"
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:190
+#: en/setupBootloader.xml:256
msgid "Using an existing bootloader"
msgstr "Een bestaande opstartlader gebruiken"
#. 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 "
@@ -4435,13 +4433,13 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:199
+#: en/setupBootloader.xml:267
#, fuzzy
msgid "Installing Without a Bootloader"
msgstr "De Mageia-opstartlader gebruiken"
#. 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 "
@@ -4449,25 +4447,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
-#, fuzzy
-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 ""
-"Voor meer informatie over kernelopties in legacy- en UEFI-sytemen, zie: "
-"<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
-"\">https://wiki.mageia.org/en/How_to_set_up_kernel_options</link> (Engels)."
-
#. type: Content of: <section><info><title>
#: en/setupSCSI.xml:10
msgid "Setup SCSI"
@@ -4839,6 +4818,25 @@ msgstr ""
#, fuzzy
#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align="
+#~ "\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ 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 ""
+#~ "Voor meer informatie over kernelopties in legacy- en UEFI-sytemen, zie: "
+#~ "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
+#~ "\">https://wiki.mageia.org/en/How_to_set_up_kernel_options</link> "
+#~ "(Engels)."
+
+#, fuzzy
+#~ msgid ""
#~ "<imageobject> <imagedata fileref=\"live-bootCSM.png\" align=\"center\"/> "
#~ "</imageobject>"
#~ msgstr ""
diff --git a/docs/docs/stable/installer/nl/setupBootloader.xml b/docs/docs/stable/installer/nl/setupBootloader.xml
index 7330378b..2f58b465 100644
--- a/docs/docs/stable/installer/nl/setupBootloader.xml
+++ b/docs/docs/stable/installer/nl/setupBootloader.xml
@@ -1,10 +1,27 @@
-<?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:lang="nl" xml:id="setupBootloader">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="nl" 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">
+
+
+
+
+
+
+
+
+
+
<info>
<!--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-->
@@ -13,29 +30,39 @@ Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
<!--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.-->
<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 no ESP exists, then one will
@@ -44,155 +71,191 @@ required, whatever the number of operating systems you have.</para>
</listitem>
</itemizedlist>
</section>
+
<section>
<info>
<title xml:id="setupBootloader-ti2">Bootloader Setup</title>
</info>
+
<section>
<title>Algemene opties voor de opstartlader</title>
+
<mediaobject>
<imageobject condition="classical"> <imagedata align="center"
fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
condition="live"> <imagedata fileref="live-setupBootloader.png"
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 most people are not likely
to have a need for it. The username is <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 computer does not support ACPI or if
you think the ACPI 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>
+
<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>
+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>
+
<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 are sure you understand the
implications, and wish to proceed.</para>
</listitem>
</itemizedlist>
+
<mediaobject>
-<imageobject> <imagedata fileref="live-setupBootloader5.png"
-align="center"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center"
+fileref="live-setupBootloader5.png"/> </imageobject></mediaobject>
</section>
</section>
+
<section>
<title>Other Options</title>
+
<section>
<title>Een bestaande opstartlader gebruiken</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 should detect
Mageia and automatically add an entry for it in the 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>Wijzig een opstartmenu-ingang of voeg er een toe</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/pl.po b/docs/docs/stable/installer/pl.po
index 359d3dbf..fb9fba84 100644
--- a/docs/docs/stable/installer/pl.po
+++ b/docs/docs/stable/installer/pl.po
@@ -14,7 +14,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\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: 2017-02-10 17:18+0000\n"
"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
"Language-Team: Polish (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -318,7 +318,7 @@ msgstr ""
"ma znaczenie.</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Password</emphasis>"
msgstr "<emphasis>Dostawca</emphasis>"
@@ -4219,8 +4219,8 @@ msgid ""
"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 "Dodaj lub zmodyfikuj wpis Boot Menu"
@@ -4240,54 +4240,54 @@ msgid ""
msgstr ""
#. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:10
+#: en/setupBootloader.xml:27
#, fuzzy
msgid "Bootloader"
msgstr "Podstawowe opcje programu rozruchowego"
#. 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 "
@@ -4297,18 +4297,18 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:46
+#: en/setupBootloader.xml:72
#, fuzzy
msgid "Bootloader Setup"
msgstr "Podstawowe opcje programu rozruchowego"
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:49
+#: en/setupBootloader.xml:76
msgid "Bootloader main options"
msgstr "Podstawowe opcje programu rozruchowego"
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:51
+#: en/setupBootloader.xml:79
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -4322,52 +4322,52 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:62
+#: en/setupBootloader.xml:91
#, fuzzy
msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
msgstr "<emphasis>Dostawca</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Boot device</emphasis>"
msgstr "<emphasis>Dostawca</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:68
+#: en/setupBootloader.xml:100
#, fuzzy
msgid "Don't change this unless you really know what you are doing"
msgstr "Zmień to tylko i wyłącznie wtedy, kiedy wiesz co robisz."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:72
+#: en/setupBootloader.xml:105
#, fuzzy
msgid ""
"<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
msgstr "<emphasis>Dostawca</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Security</emphasis>"
msgstr "<emphasis>Dostawca</emphasis>"
#. 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 "
@@ -4377,18 +4377,18 @@ 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
#, fuzzy
msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
msgstr "<emphasis>Dostawca</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:92
+#: en/setupBootloader.xml:132
#, fuzzy
msgid ""
"Retype the password and DrakX will check that it matches with the one set "
@@ -4398,19 +4398,19 @@ msgstr ""
"tym polu, instalator sprawdzi czy hasła się zgadzają."
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:96 en/setupBootloader.xml:154
+#: en/setupBootloader.xml:137 en/setupBootloader.xml:212
#, fuzzy
msgid "<emphasis>Advanced</emphasis>"
msgstr "<emphasis>Dostawca</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:99
+#: en/setupBootloader.xml:141
#, fuzzy
msgid "<emphasis>Enable ACPI</emphasis>"
msgstr "<emphasis>Własny</emphasis>"
#. 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 "
@@ -4420,26 +4420,26 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:108
+#: en/setupBootloader.xml:152
#, fuzzy
msgid "<emphasis>Enable SMP</emphasis>"
msgstr "<emphasis>Dostawca</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis>Enable APIC</emphasis>"
msgstr "<emphasis>Własny</emphasis>"
#. 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 "
@@ -4447,26 +4447,26 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:168
#, fuzzy
msgid "<emphasis>Enable Local APIC</emphasis>"
msgstr "<emphasis>Dostawca</emphasis>"
#. 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
#, fuzzy
msgid "Bootloader Configuration"
msgstr "Konfiguracja dźwięku"
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:129
+#: en/setupBootloader.xml:180
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -4480,37 +4480,37 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:139
+#: en/setupBootloader.xml:191
#, fuzzy
msgid "<emphasis role=\"bold\">Default</emphasis>"
msgstr "<emphasis>Dostawca</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Append</emphasis>"
msgstr "<emphasis>Dostawca</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
msgstr "<emphasis>Dostawca</emphasis>"
#. 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, "
@@ -4518,7 +4518,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:156
+#: en/setupBootloader.xml:215
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -4532,13 +4532,13 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:166
+#: en/setupBootloader.xml:226
#, fuzzy
msgid "<emphasis>Video mode</emphasis>"
msgstr "<emphasis>Dostawca</emphasis>"
#. 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 "
@@ -4546,13 +4546,13 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:172
+#: en/setupBootloader.xml:234
#, fuzzy
msgid "<emphasis>Do not touch ESP or MBR</emphasis>"
msgstr "<emphasis>Dostawca</emphasis>"
#. 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 "
@@ -4561,27 +4561,27 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:181
+#: en/setupBootloader.xml:245
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align=\"center"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png"
"\"/> </imageobject>"
msgstr ""
"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:188
+#: en/setupBootloader.xml:253
#, fuzzy
msgid "Other Options"
msgstr "Opcje"
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:190
+#: en/setupBootloader.xml:256
msgid "Using an existing bootloader"
msgstr "Użyj istniejącego bootloader'a."
#. 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 "
@@ -4591,13 +4591,13 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:199
+#: en/setupBootloader.xml:267
#, fuzzy
msgid "Installing Without a Bootloader"
msgstr "Używanie bootloader'a Magei"
#. 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 "
@@ -4605,21 +4605,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"
@@ -4981,6 +4966,13 @@ msgstr ""
#, fuzzy
#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align="
+#~ "\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
#~ "<imageobject> <imagedata fileref=\"live-bootCSM.png\" align=\"center\"/> "
#~ "</imageobject>"
#~ msgstr ""
diff --git a/docs/docs/stable/installer/pl/setupBootloader.xml b/docs/docs/stable/installer/pl/setupBootloader.xml
index 2e165380..68569e10 100644
--- a/docs/docs/stable/installer/pl/setupBootloader.xml
+++ b/docs/docs/stable/installer/pl/setupBootloader.xml
@@ -1,10 +1,27 @@
-<?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:lang="pl" xml:id="setupBootloader">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pl" 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">
+
+
+
+
+
+
+
+
+
+
<info>
<!--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-->
@@ -13,29 +30,39 @@ Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
<!--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.-->
<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 no ESP exists, then one will
@@ -44,155 +71,191 @@ required, whatever the number of operating systems you have.</para>
</listitem>
</itemizedlist>
</section>
+
<section>
<info>
<title xml:id="setupBootloader-ti2">Bootloader Setup</title>
</info>
+
<section>
<title>Podstawowe opcje programu rozruchowego</title>
+
<mediaobject>
<imageobject condition="classical"> <imagedata align="center"
fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
condition="live"> <imagedata fileref="live-setupBootloader.png"
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 most people are not likely
to have a need for it. The username is <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 computer does not support ACPI or if
you think the ACPI 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>
+
<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>
+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>
+
<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 are sure you understand the
implications, and wish to proceed.</para>
</listitem>
</itemizedlist>
+
<mediaobject>
-<imageobject> <imagedata fileref="live-setupBootloader5.png"
-align="center"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center"
+fileref="live-setupBootloader5.png"/> </imageobject></mediaobject>
</section>
</section>
+
<section>
<title>Other Options</title>
+
<section>
<title>Użyj istniejącego bootloader'a.</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 should detect
Mageia and automatically add an entry for it in the 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>Dodaj lub zmodyfikuj wpis Boot Menu</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/pt.po b/docs/docs/stable/installer/pt.po
index 4bd7047a..260c979d 100644
--- a/docs/docs/stable/installer/pt.po
+++ b/docs/docs/stable/installer/pt.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\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: 2018-12-05 12:58+0000\n"
"Last-Translator: Rui <xymarior@yandex.com>\n"
"Language-Team: Portuguese (http://www.transifex.com/MageiaLinux/mageia/"
@@ -248,7 +248,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
#, fuzzy
msgid "<emphasis role=\"bold\">Password</emphasis>"
msgstr "<emphasis>Fabricante</emphasis>"
@@ -3606,8 +3606,8 @@ msgid ""
"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 ""
@@ -3627,54 +3627,54 @@ msgid ""
msgstr ""
#. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:10
+#: en/setupBootloader.xml:27
#, fuzzy
msgid "Bootloader"
msgstr "Opções principais do carregador de arranque"
#. 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 "
@@ -3684,18 +3684,18 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:46
+#: en/setupBootloader.xml:72
#, fuzzy
msgid "Bootloader Setup"
msgstr "Opções principais do carregador de arranque"
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:49
+#: en/setupBootloader.xml:76
msgid "Bootloader main options"
msgstr "Opções principais do carregador de arranque"
#. 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 condition=\"live"
@@ -3704,50 +3704,50 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:62
+#: en/setupBootloader.xml:91
#, fuzzy
msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
msgstr "<emphasis>Fabricante</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Boot device</emphasis>"
msgstr "<emphasis>Genérico</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Security</emphasis>"
msgstr "<emphasis>Genérico</emphasis>"
#. 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 "
@@ -3757,37 +3757,37 @@ 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
#, fuzzy
msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
msgstr "<emphasis>Fabricante</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis>Advanced</emphasis>"
msgstr "<emphasis>Fabricante</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:99
+#: en/setupBootloader.xml:141
#, fuzzy
msgid "<emphasis>Enable ACPI</emphasis>"
msgstr "<emphasis>Genérico</emphasis>"
#. 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 "
@@ -3797,26 +3797,26 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:108
+#: en/setupBootloader.xml:152
#, fuzzy
msgid "<emphasis>Enable SMP</emphasis>"
msgstr "<emphasis>Genérico</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis>Enable APIC</emphasis>"
msgstr "<emphasis>Genérico</emphasis>"
#. 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 "
@@ -3824,26 +3824,26 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:168
#, fuzzy
msgid "<emphasis>Enable Local APIC</emphasis>"
msgstr "<emphasis>Genérico</emphasis>"
#. 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
#, fuzzy
msgid "Bootloader Configuration"
msgstr "Configuração do Som"
#. 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 condition=\"live"
@@ -3852,37 +3852,37 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:139
+#: en/setupBootloader.xml:191
#, fuzzy
msgid "<emphasis role=\"bold\">Default</emphasis>"
msgstr "<emphasis>Personalizar</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Append</emphasis>"
msgstr "<emphasis>Fabricante</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
msgstr "<emphasis>Fabricante</emphasis>"
#. 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, "
@@ -3890,7 +3890,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 condition=\"live"
@@ -3899,13 +3899,13 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:166
+#: en/setupBootloader.xml:226
#, fuzzy
msgid "<emphasis>Video mode</emphasis>"
msgstr "<emphasis>Fabricante</emphasis>"
#. 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 "
@@ -3913,13 +3913,13 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:172
+#: en/setupBootloader.xml:234
#, fuzzy
msgid "<emphasis>Do not touch ESP or MBR</emphasis>"
msgstr "<emphasis>Fabricante</emphasis>"
#. 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 "
@@ -3928,25 +3928,25 @@ 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> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png"
"\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:188
+#: en/setupBootloader.xml:253
#, fuzzy
msgid "Other Options"
msgstr "Opções"
#. 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 "
@@ -3956,12 +3956,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 "
@@ -3969,21 +3969,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"
diff --git a/docs/docs/stable/installer/pt/setupBootloader.xml b/docs/docs/stable/installer/pt/setupBootloader.xml
index 6c4fe008..b2e61b0a 100644
--- a/docs/docs/stable/installer/pt/setupBootloader.xml
+++ b/docs/docs/stable/installer/pt/setupBootloader.xml
@@ -1,10 +1,27 @@
-<?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:lang="pt" xml:id="setupBootloader">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pt" 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">
+
+
+
+
+
+
+
+
+
+
<info>
<!--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-->
@@ -13,29 +30,39 @@ Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
<!--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.-->
<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 no ESP exists, then one will
@@ -44,155 +71,191 @@ required, whatever the number of operating systems you have.</para>
</listitem>
</itemizedlist>
</section>
+
<section>
<info>
<title xml:id="setupBootloader-ti2">Bootloader Setup</title>
</info>
+
<section>
<title>Opções principais do carregador de arranque</title>
+
<mediaobject>
<imageobject condition="classical"> <imagedata align="center"
fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
condition="live"> <imagedata fileref="live-setupBootloader.png"
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 most people are not likely
to have a need for it. The username is <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 computer does not support ACPI or if
you think the ACPI 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>
+
<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>
+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>
+
<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 are sure you understand the
implications, and wish to proceed.</para>
</listitem>
</itemizedlist>
+
<mediaobject>
-<imageobject> <imagedata fileref="live-setupBootloader5.png"
-align="center"/> </imageobject></mediaobject>
+<imageobject> <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 should detect
Mageia and automatically add an entry for it in the 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/pt_BR.po b/docs/docs/stable/installer/pt_BR.po
index 4710337b..d461672f 100644
--- a/docs/docs/stable/installer/pt_BR.po
+++ b/docs/docs/stable/installer/pt_BR.po
@@ -18,7 +18,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\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: 2018-06-09 22:48+0000\n"
"Last-Translator: Marcio Andre Padula <padula1000@gmail.com>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/MageiaLinux/"
@@ -322,7 +322,7 @@ msgstr ""
"emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Password</emphasis>"
msgstr "<emphasis role=\"bold\">Avançado</emphasis>"
@@ -4677,8 +4677,8 @@ msgstr ""
"para configurar os botões que não funcionam em um mouse com seis ou mais "
"botões."
-#. 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 "Adicionando ou Modificando uma Entrada do Menu de Inicialização"
@@ -4703,24 +4703,24 @@ msgstr ""
"Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link>"
#. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:10
+#: en/setupBootloader.xml:27
#, fuzzy
msgid "Bootloader"
msgstr "Interface do Bootloader"
#. 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
#, fuzzy
msgid "Grub2 on Legacy MBR/GPT systems"
msgstr "GRUB2 para sistemas Legacy/MBR e Legacy/GPT."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:17
+#: en/setupBootloader.xml:37
#, fuzzy
msgid ""
"GRUB2 (with or without graphical menu) will be used exclusively as the "
@@ -4729,7 +4729,7 @@ msgstr ""
"GRUB2 (com ou sem menu gráfico) para um sistema Legacy/MBR ou Legacy/GPT"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:21
+#: en/setupBootloader.xml:42
#, fuzzy
msgid ""
"By default, a new bootloader will be written into either the MBR (Master "
@@ -4739,25 +4739,25 @@ msgstr ""
"primeiro disco rígido ou na partição de inicialização do BIOS."
#. type: Content of: <section><section><itemizedlist><title>
-#: en/setupBootloader.xml:27
+#: en/setupBootloader.xml:49
#, fuzzy
msgid "Grub2-efi on UEFI systems"
msgstr "GRUB2-efi em sistemas UEFI."
#. 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
#, fuzzy
msgid ""
"If there are already UEFI-based operating systems installed on your computer "
@@ -4775,18 +4775,18 @@ msgstr ""
"número de sistemas operacionais que você possui."
#. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:46
+#: en/setupBootloader.xml:72
#, fuzzy
msgid "Bootloader Setup"
msgstr "Interface do Bootloader"
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:49
+#: en/setupBootloader.xml:76
msgid "Bootloader main options"
msgstr "Principais Opções do Gerenciador de Inicialização"
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:51
+#: en/setupBootloader.xml:79
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -4800,33 +4800,33 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:62
+#: en/setupBootloader.xml:91
#, fuzzy
msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
msgstr "<emphasis role=\"bold\">Servidor</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Boot device</emphasis>"
msgstr "<emphasis role=\"bold\">Avançado</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:68
+#: en/setupBootloader.xml:100
#, fuzzy
msgid "Don't change this unless you really know what you are doing"
msgstr ""
"Apenas mude as coisas quando você sabe muito bem o que você está fazendo."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:72
+#: en/setupBootloader.xml:105
#, fuzzy
msgid ""
"<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
@@ -4835,7 +4835,7 @@ msgstr ""
"emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:74
+#: en/setupBootloader.xml:108
#, fuzzy
msgid ""
"This text box lets you set a delay, in seconds, before the default operating "
@@ -4846,13 +4846,13 @@ msgstr ""
"operacional padrão seja iniciado."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:78
+#: en/setupBootloader.xml:113
#, fuzzy
msgid "<emphasis role=\"bold\">Security</emphasis>"
msgstr "<emphasis role=\"bold\">Servidor</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:79
+#: en/setupBootloader.xml:115
#, fuzzy
msgid ""
"This allows you to set a password for the bootloader. This means a username "
@@ -4868,19 +4868,19 @@ msgstr ""
"role=\"bold\">root</emphasis> e a senha é a escolhida posteriormente aqui."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:88
+#: en/setupBootloader.xml:126
#, fuzzy
msgid "Choose a password for the bootloader (optional)"
msgstr "<guilabel>Senha</guilabel>: Escolha uma senha para o bootloader."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:91
+#: en/setupBootloader.xml:130
#, fuzzy
msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
msgstr "<emphasis role=\"bold\">Área de trabalho</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:92
+#: en/setupBootloader.xml:132
#, fuzzy
msgid ""
"Retype the password and DrakX will check that it matches with the one set "
@@ -4890,19 +4890,19 @@ msgstr ""
"verificará se combina com a senha acima."
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:96 en/setupBootloader.xml:154
+#: en/setupBootloader.xml:137 en/setupBootloader.xml:212
#, fuzzy
msgid "<emphasis>Advanced</emphasis>"
msgstr "<emphasis role=\"bold\">Avançado</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:99
+#: en/setupBootloader.xml:141
#, fuzzy
msgid "<emphasis>Enable ACPI</emphasis>"
msgstr "<emphasis>Generic</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:100
+#: en/setupBootloader.xml:143
#, fuzzy
msgid ""
"ACPI (Advanced Configuration and Power Interface) is a standard for power "
@@ -4919,13 +4919,13 @@ msgstr ""
"reinicializações aleatórias ou travamentos do sistema)."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:108
+#: en/setupBootloader.xml:152
#, fuzzy
msgid "<emphasis>Enable SMP</emphasis>"
msgstr "<emphasis>Generic</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:109
+#: en/setupBootloader.xml:154
#, fuzzy
msgid ""
"This option enables/disables symmetric multiprocessing for multi-core "
@@ -4935,13 +4935,13 @@ msgstr ""
"multiprocessamento simétrico para processadores com vários núcleos."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:113
+#: en/setupBootloader.xml:159
#, fuzzy
msgid "<emphasis>Enable APIC</emphasis>"
msgstr "<emphasis>Generic</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:114
+#: en/setupBootloader.xml:161
#, fuzzy
msgid ""
"Enabling this gives the operating system access to the Advanced Programmable "
@@ -4954,13 +4954,13 @@ msgstr ""
"gerenciamento avançado de IRQ (solicitação de interrupção)."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:168
#, fuzzy
msgid "<emphasis>Enable Local APIC</emphasis>"
msgstr "<emphasis>Generic</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:121
+#: en/setupBootloader.xml:170
#, fuzzy
msgid ""
"Here you can set Local APIC, which manages all external interrupts for a "
@@ -4970,13 +4970,13 @@ msgstr ""
"interrupções externas de um processador específico em um sistema SMP."
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:127
+#: en/setupBootloader.xml:177
#, fuzzy
msgid "Bootloader Configuration"
msgstr "Configuração de Som"
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:129
+#: en/setupBootloader.xml:180
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -4990,42 +4990,42 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:139
+#: en/setupBootloader.xml:191
#, fuzzy
msgid "<emphasis role=\"bold\">Default</emphasis>"
msgstr "<emphasis role=\"bold\">Servidor</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:140
+#: en/setupBootloader.xml:193
#, fuzzy
-msgid "The operating system to started up by default"
+msgid "The operating system to be started up by default."
msgstr "<guilabel>Padrão:</guilabel> Sistema operacional iniciado por padrão"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:143
+#: en/setupBootloader.xml:197
#, fuzzy
msgid "<emphasis role=\"bold\">Append</emphasis>"
msgstr "<emphasis role=\"bold\">Avançado</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:144
+#: en/setupBootloader.xml:199
#, fuzzy
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 ""
"<guilabel>Anexar:</guilabel> Esta opção permite que você transmita as "
"informações do kernel ou informe o kernel para fornecer mais informações à "
"medida que inicia."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:148
+#: en/setupBootloader.xml:204
#, fuzzy
msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
msgstr "<emphasis role=\"bold\">Servidor</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:149
+#: en/setupBootloader.xml:206
#, fuzzy
msgid ""
"If you already have other operating systems installed, Mageia attempts to "
@@ -5039,7 +5039,7 @@ msgstr ""
"(testar outros sistemas)."
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:156
+#: en/setupBootloader.xml:215
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -5053,13 +5053,13 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:166
+#: en/setupBootloader.xml:226
#, fuzzy
msgid "<emphasis>Video mode</emphasis>"
msgstr "<emphasis>Fabricante</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:167
+#: en/setupBootloader.xml:228
#, fuzzy
msgid ""
"This sets the screen size and colour depth to be used by the boot menu. If "
@@ -5072,13 +5072,13 @@ msgstr ""
"profundidade de cor."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:172
+#: en/setupBootloader.xml:234
#, fuzzy
msgid "<emphasis>Do not touch ESP or MBR</emphasis>"
msgstr "<emphasis>Fabricante</emphasis>"
#. 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 "
@@ -5087,28 +5087,26 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:181
+#: en/setupBootloader.xml:245
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align=\"center"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png"
"\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
-"imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:188
+#: en/setupBootloader.xml:253
#, fuzzy
msgid "Other Options"
msgstr "Opções"
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:190
+#: en/setupBootloader.xml:256
msgid "Using an existing bootloader"
msgstr "Usando um Gerenciador de Inicialização existente"
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:191
+#: en/setupBootloader.xml:258
#, fuzzy
msgid ""
"The exact procedure for adding Mageia to an existing bootloader is beyond "
@@ -5124,13 +5122,13 @@ msgstr ""
"automaticamente. Consulte a documentação do sistema operacional em questão."
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:199
+#: en/setupBootloader.xml:267
#, fuzzy
msgid "Installing Without a Bootloader"
msgstr "Usando o Gerenciador de Inicialização da Mageia"
#. 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 "
@@ -5138,28 +5136,6 @@ msgid ""
"unable to start."
msgstr ""
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:207
-#, fuzzy
-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 ""
-"Para fazer isso, você precisa editar manualmente o arquivo \"/boot/grub2/"
-"custom.cfg\" ou usar o programa <emphasis role=\"bold\">grub-customizer</"
-"emphasis> (disponível nos repositórios da Mageia)."
-
-#. type: Content of: <section><section><section><note><para>
-#: en/setupBootloader.xml:212
-#, fuzzy
-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 ""
-"Para mais informações, consulte: <link ns2:href=\"https://wiki.mageia.org/en/"
-"Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link>"
-
#. type: Content of: <section><info><title>
#: en/setupSCSI.xml:10
msgid "Setup SCSI"
@@ -5573,6 +5549,34 @@ msgstr ""
#, fuzzy
#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align="
+#~ "\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ 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 ""
+#~ "Para fazer isso, você precisa editar manualmente o arquivo \"/boot/grub2/"
+#~ "custom.cfg\" ou usar o programa <emphasis role=\"bold\">grub-customizer</"
+#~ "emphasis> (disponível nos repositórios da Mageia)."
+
+#, fuzzy
+#~ 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 ""
+#~ "Para mais informações, consulte: <link ns2:href=\"https://wiki.mageia.org/"
+#~ "en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-"
+#~ "efi_and_Mageia</link>"
+
+#, fuzzy
+#~ msgid ""
#~ "<imageobject> <imagedata fileref=\"live-bootCSM.png\" align=\"center\"/> "
#~ "</imageobject>"
#~ msgstr ""
diff --git a/docs/docs/stable/installer/pt_BR/setupBootloader.xml b/docs/docs/stable/installer/pt_BR/setupBootloader.xml
index b8d66004..f53a69df 100644
--- a/docs/docs/stable/installer/pt_BR/setupBootloader.xml
+++ b/docs/docs/stable/installer/pt_BR/setupBootloader.xml
@@ -1,10 +1,27 @@
-<?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:lang="pt_BR" xml:id="setupBootloader">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pt_BR" 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">
+
+
+
+
+
+
+
+
+
+
<info>
<!--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-->
@@ -13,29 +30,39 @@ Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
<!--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.-->
<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 no ESP exists, then one will
@@ -44,155 +71,191 @@ required, whatever the number of operating systems you have.</para>
</listitem>
</itemizedlist>
</section>
+
<section>
<info>
<title xml:id="setupBootloader-ti2">Bootloader Setup</title>
</info>
+
<section>
<title>Principais Opções do Gerenciador de Inicialização</title>
+
<mediaobject>
<imageobject condition="classical"> <imagedata align="center"
fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
condition="live"> <imagedata fileref="live-setupBootloader.png"
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 most people are not likely
to have a need for it. The username is <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 computer does not support ACPI or if
you think the ACPI 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>
+
<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>
+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>
+
<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 are sure you understand the
implications, and wish to proceed.</para>
</listitem>
</itemizedlist>
+
<mediaobject>
-<imageobject> <imagedata fileref="live-setupBootloader5.png"
-align="center"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center"
+fileref="live-setupBootloader5.png"/> </imageobject></mediaobject>
</section>
</section>
+
<section>
<title>Other Options</title>
+
<section>
<title>Usando um Gerenciador de Inicialização existente</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 should detect
Mageia and automatically add an entry for it in the 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>Adicionando ou Modificando uma Entrada do Menu de Inicialização</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/ro.po b/docs/docs/stable/installer/ro.po
index bcc77326..18930482 100644
--- a/docs/docs/stable/installer/ro.po
+++ b/docs/docs/stable/installer/ro.po
@@ -14,7 +14,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\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: 2016-10-28 16:09+0000\n"
"Last-Translator: Florin Cătălin RUSSEN <cfrussen@yahoo.co.uk>\n"
"Language-Team: Romanian (http://www.transifex.com/MageiaLinux/mageia/"
@@ -318,7 +318,7 @@ msgstr ""
"majuscule.</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Password</emphasis>"
msgstr "<emphasis role=\"bold\">Dimensionarea partițiilor:</emphasis>"
@@ -4608,8 +4608,8 @@ msgstr ""
"guilabel> pentru a configura butoanele care nu funcționează la mausurile cu "
"șase sau mai multe butoane."
-#. 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 "Adăugați sau modificați o intrare din meniul de demaraj"
@@ -4634,55 +4634,55 @@ msgstr ""
"How_to_set_up_kernel_options</link>"
#. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:10
+#: en/setupBootloader.xml:27
#, fuzzy
msgid "Bootloader"
msgstr "Opțiunile principale ale încărcătorului de sistem"
#. 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
#, fuzzy
msgid "Grub2-efi on UEFI systems"
msgstr "Cu un sistem UEFI"
#. 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
#, fuzzy
msgid ""
"If there are already UEFI-based operating systems installed on your computer "
@@ -4700,18 +4700,18 @@ msgstr ""
"sisteme de operare aveți instalate pe calculator."
#. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:46
+#: en/setupBootloader.xml:72
#, fuzzy
msgid "Bootloader Setup"
msgstr "Opțiunile principale ale încărcătorului de sistem"
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:49
+#: en/setupBootloader.xml:76
msgid "Bootloader main options"
msgstr "Opțiunile principale ale încărcătorului de sistem"
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:51
+#: en/setupBootloader.xml:79
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -4724,53 +4724,53 @@ msgstr ""
"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:62
+#: en/setupBootloader.xml:91
#, fuzzy
msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
msgstr "<emphasis role=\"bold\">Dimensionarea partițiilor:</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Boot device</emphasis>"
msgstr "<emphasis role=\"bold\">Dimensionarea partițiilor:</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:68
+#: en/setupBootloader.xml:100
#, fuzzy
msgid "Don't change this unless you really know what you are doing"
msgstr ""
"Faceți modificări numai în cazul în care știți foarte bine ceea ce faceți."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:72
+#: en/setupBootloader.xml:105
#, fuzzy
msgid ""
"<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
msgstr "<emphasis role=\"bold\">Dimensionarea partițiilor:</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Security</emphasis>"
msgstr "<emphasis role=\"bold\">Dimensionarea partițiilor:</emphasis>"
#. 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 "
@@ -4780,18 +4780,18 @@ 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
#, fuzzy
msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
msgstr "<emphasis role=\"bold\">Dimensionarea partițiilor:</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:92
+#: en/setupBootloader.xml:132
#, fuzzy
msgid ""
"Retype the password and DrakX will check that it matches with the one set "
@@ -4801,19 +4801,19 @@ msgstr ""
"și drakx va verifica dacă ați tastat aceeași parolă în ambele căsuțe."
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:96 en/setupBootloader.xml:154
+#: en/setupBootloader.xml:137 en/setupBootloader.xml:212
#, fuzzy
msgid "<emphasis>Advanced</emphasis>"
msgstr "<emphasis role=\"bold\">Dimensionarea partițiilor:</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:99
+#: en/setupBootloader.xml:141
#, fuzzy
msgid "<emphasis>Enable ACPI</emphasis>"
msgstr "<emphasis>Generic</emphasis>"
#. 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 "
@@ -4823,26 +4823,26 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:108
+#: en/setupBootloader.xml:152
#, fuzzy
msgid "<emphasis>Enable SMP</emphasis>"
msgstr "<emphasis>Generic</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis>Enable APIC</emphasis>"
msgstr "<emphasis>Generic</emphasis>"
#. 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 "
@@ -4850,26 +4850,26 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:168
#, fuzzy
msgid "<emphasis>Enable Local APIC</emphasis>"
msgstr "<emphasis>Generic</emphasis>"
#. 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
#, fuzzy
msgid "Bootloader Configuration"
msgstr "Configurare sunet"
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:129
+#: en/setupBootloader.xml:180
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -4882,37 +4882,37 @@ msgstr ""
"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:139
+#: en/setupBootloader.xml:191
#, fuzzy
msgid "<emphasis role=\"bold\">Default</emphasis>"
msgstr "<emphasis role=\"bold\">Dimensionarea partițiilor:</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Append</emphasis>"
msgstr "<emphasis role=\"bold\">Dimensionarea partițiilor:</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
msgstr "<emphasis role=\"bold\">Dimensionarea partițiilor:</emphasis>"
#. 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, "
@@ -4920,7 +4920,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:156
+#: en/setupBootloader.xml:215
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -4933,13 +4933,13 @@ msgstr ""
"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:166
+#: en/setupBootloader.xml:226
#, fuzzy
msgid "<emphasis>Video mode</emphasis>"
msgstr "<emphasis>Fabricant</emphasis>"
#. 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 "
@@ -4947,13 +4947,13 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:172
+#: en/setupBootloader.xml:234
#, fuzzy
msgid "<emphasis>Do not touch ESP or MBR</emphasis>"
msgstr "<emphasis>Fabricant</emphasis>"
#. 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 "
@@ -4962,26 +4962,26 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:181
+#: en/setupBootloader.xml:245
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align=\"center"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png"
"\"/> </imageobject>"
msgstr ""
"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
#. 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 "Se utilizează încărcătorul de sistem existent"
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:191
+#: en/setupBootloader.xml:258
#, fuzzy
msgid ""
"The exact procedure for adding Mageia to an existing bootloader is beyond "
@@ -4997,13 +4997,13 @@ msgstr ""
"sistem Mageia. Consultați documentația sistemului de operare în chestiune."
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:199
+#: en/setupBootloader.xml:267
#, fuzzy
msgid "Installing Without a Bootloader"
msgstr "Se utilizează un încărcător de sistem Mageia"
#. 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 "
@@ -5011,26 +5011,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
-#, fuzzy
-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 ""
-"Pentru informații suplimentare despre opțiunile nucleului pe sistemele vechi "
-"și UEFI consultați: <link ns2:href=\"https://wiki.mageia.org/en/"
-"How_to_set_up_kernel_options\">https://wiki.mageia.org/en/"
-"How_to_set_up_kernel_options</link>"
-
#. type: Content of: <section><info><title>
#: en/setupSCSI.xml:10
msgid "Setup SCSI"
@@ -5442,6 +5422,24 @@ msgstr ""
#, fuzzy
#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align="
+#~ "\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+
+#, fuzzy
+#~ 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 ""
+#~ "Pentru informații suplimentare despre opțiunile nucleului pe sistemele "
+#~ "vechi și UEFI consultați: <link ns2:href=\"https://wiki.mageia.org/en/"
+#~ "How_to_set_up_kernel_options\">https://wiki.mageia.org/en/"
+#~ "How_to_set_up_kernel_options</link>"
+
+#, fuzzy
+#~ msgid ""
#~ "<imageobject> <imagedata fileref=\"live-bootCSM.png\" align=\"center\"/> "
#~ "</imageobject>"
#~ msgstr ""
diff --git a/docs/docs/stable/installer/ro/setupBootloader.xml b/docs/docs/stable/installer/ro/setupBootloader.xml
index 94729fce..6393df8f 100644
--- a/docs/docs/stable/installer/ro/setupBootloader.xml
+++ b/docs/docs/stable/installer/ro/setupBootloader.xml
@@ -1,10 +1,27 @@
-<?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:lang="ro" xml:id="setupBootloader">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ro" 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">
+
+
+
+
+
+
+
+
+
+
<info>
<!--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-->
@@ -13,29 +30,39 @@ Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
<!--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.-->
<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 no ESP exists, then one will
@@ -44,155 +71,191 @@ required, whatever the number of operating systems you have.</para>
</listitem>
</itemizedlist>
</section>
+
<section>
<info>
<title xml:id="setupBootloader-ti2">Bootloader Setup</title>
</info>
+
<section>
<title>Opțiunile principale ale încărcătorului de sistem</title>
+
<mediaobject>
<imageobject condition="classical"> <imagedata align="center"
fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
condition="live"> <imagedata fileref="live-setupBootloader.png"
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 most people are not likely
to have a need for it. The username is <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 computer does not support ACPI or if
you think the ACPI 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>
+
<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>
+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>
+
<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 are sure you understand the
implications, and wish to proceed.</para>
</listitem>
</itemizedlist>
+
<mediaobject>
-<imageobject> <imagedata fileref="live-setupBootloader5.png"
-align="center"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center"
+fileref="live-setupBootloader5.png"/> </imageobject></mediaobject>
</section>
</section>
+
<section>
<title>Other Options</title>
+
<section>
<title>Se utilizează încărcătorul de sistem existent</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 should detect
Mageia and automatically add an entry for it in the 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>Adăugați sau modificați o intrare din meniul de demaraj</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/ru.po b/docs/docs/stable/installer/ru.po
index ec24dd37..3d7b859b 100644
--- a/docs/docs/stable/installer/ru.po
+++ b/docs/docs/stable/installer/ru.po
@@ -18,7 +18,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\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: 2019-01-13 23:45+0000\n"
"Last-Translator: AlexL <loginov.alex.valer@gmail.com>\n"
"Language-Team: Russian (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -299,7 +299,7 @@ msgstr ""
"регистру.</emphasis>"
#. 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 "<emphasis role=\"bold\">Пароль</emphasis>"
@@ -4585,8 +4585,8 @@ msgstr ""
"<guimenuitem>Задействовать evdev</guimenuitem></menuchoice>, чтобы настроить "
"кнопки, которые не работают для мыши с шестью или более кнопками."
-#. 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 ""
"Добавление пункта в меню загрузки или внесение изменений в такие пункты"
@@ -4613,22 +4613,22 @@ msgstr ""
"wiki.mageia.org/en/Grub2-efi_and_Mageia</link>"
#. 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 "Grub2"
#. type: Content of: <section><section><itemizedlist><title>
-#: en/setupBootloader.xml:15
+#: en/setupBootloader.xml:34
msgid "Grub2 on Legacy MBR/GPT systems"
msgstr "Grub2 для устаревших систем с MBR/GPT"
#. 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."
@@ -4637,7 +4637,7 @@ msgstr ""
"загрузчика для устаревших систем с MBR или GPT."
#. 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."
@@ -4646,17 +4646,17 @@ msgstr ""
"первого диска, или в загрузочный раздел BIOS."
#. type: Content of: <section><section><itemizedlist><title>
-#: en/setupBootloader.xml:27
+#: en/setupBootloader.xml:49
msgid "Grub2-efi on UEFI systems"
msgstr "Grub2-efi в системах UEFI"
#. 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 "Для систем UEFI используется только загрузчик GRUB2-efi."
#. 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)."
@@ -4665,7 +4665,7 @@ msgstr ""
"раздел EFI)."
#. 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 "
@@ -4681,17 +4681,17 @@ 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 condition=\"live"
@@ -4704,12 +4704,12 @@ msgstr ""
"im1\"/> </imageobject>"
#. 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 "<emphasis role=\"bold\">Использовать загрузчик</emphasis>"
#. 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."
@@ -4718,24 +4718,24 @@ msgstr ""
"BIOS. Пользователи систем UEFI её не увидят."
#. 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 "<emphasis role=\"bold\">Загрузочное устройство</emphasis>"
#. 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 ""
"<emphasis role=\"bold\">Пауза перед загрузкой основной системы</emphasis>"
#. 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."
@@ -4744,12 +4744,12 @@ 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 "<emphasis role=\"bold\">Безопасность</emphasis>"
#. 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 "
@@ -4764,19 +4764,19 @@ 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 "<emphasis role=\"bold\">Пароль (ещё раз)</emphasis>"
#. 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"
@@ -4785,17 +4785,17 @@ 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 "<emphasis>Дополнительно</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:99
+#: en/setupBootloader.xml:141
msgid "<emphasis>Enable ACPI</emphasis>"
msgstr "<emphasis>Включить ACPI</emphasis>"
#. 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 "
@@ -4812,12 +4812,12 @@ msgstr ""
"(например неожиданные перезагрузки системы или «зависания» системы)."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:108
+#: en/setupBootloader.xml:152
msgid "<emphasis>Enable SMP</emphasis>"
msgstr "<emphasis>Включить SMP</emphasis>"
#. 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"
@@ -4827,12 +4827,12 @@ msgstr ""
"процессор."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:113
+#: en/setupBootloader.xml:159
msgid "<emphasis>Enable APIC</emphasis>"
msgstr "<emphasis>Включить APIC</emphasis>"
#. 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 "
@@ -4845,12 +4845,12 @@ 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 "<emphasis>Включить локальный APIC</emphasis>"
#. 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"
@@ -4860,12 +4860,12 @@ 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 condition=\"live"
@@ -4878,37 +4878,39 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:139
+#: en/setupBootloader.xml:191
msgid "<emphasis role=\"bold\">Default</emphasis>"
msgstr "<emphasis role=\"bold\">По умолчанию</emphasis>"
#. 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
+#, fuzzy
+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 "<emphasis role=\"bold\">Присоединить</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:144
+#: en/setupBootloader.xml:199
+#, fuzzy
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 "<emphasis role=\"bold\">Зондирование посторонней ОС</emphasis>"
#. 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, "
@@ -4919,7 +4921,7 @@ 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 condition=\"live"
@@ -4932,12 +4934,12 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:166
+#: en/setupBootloader.xml:226
msgid "<emphasis>Video mode</emphasis>"
msgstr "<emphasis>Видеорежим</emphasis>"
#. 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 "
@@ -4949,12 +4951,12 @@ 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 "<emphasis>Не трогайте ESP или MBR</emphasis>"
#. 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 "
@@ -4968,26 +4970,27 @@ msgstr ""
"уверены в последствиях и хотите продолжить установку."
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:181
+#: en/setupBootloader.xml:245
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align=\"center"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png"
"\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align=\"center"
-"\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot2.png\"/> </"
+"imageobject>"
#. 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 "
@@ -5003,12 +5006,12 @@ 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 "
@@ -5020,27 +5023,6 @@ 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 ""
-"Для этого вам придётся внести вручную изменения в <filename>/boot/grub2/"
-"custom.cfg</filename> или воспользоваться программой для настройки GRUB "
-"(например <application>grub-customizer</application> из хранилищ Mageia)."
-
-#. 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 ""
-"Чтобы узнать больше, ознакомьтесь с соответствующей страницей нашей вики: "
-"<link ns4:href=\"https://wiki.mageia.org/en/Grub2-efi_and_Mageia\">https://"
-"wiki.mageia.org/en/Grub2-efi_and_Mageia</link>"
-
#. type: Content of: <section><info><title>
#: en/setupSCSI.xml:10
msgid "Setup SCSI"
@@ -5458,3 +5440,28 @@ msgstr ""
"На следующем шаге произойдёт копирование файлов на жёсткий диск. Эта "
"процедура займёт несколько минут. В конце процедуры вы определённое время "
"будете видеть пустой экран. Это нормально."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align="
+#~ "\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align="
+#~ "\"center\"/> </imageobject>"
+
+#~ 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 ""
+#~ "Для этого вам придётся внести вручную изменения в <filename>/boot/grub2/"
+#~ "custom.cfg</filename> или воспользоваться программой для настройки GRUB "
+#~ "(например <application>grub-customizer</application> из хранилищ Mageia)."
+
+#~ 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 ""
+#~ "Чтобы узнать больше, ознакомьтесь с соответствующей страницей нашей вики: "
+#~ "<link ns4:href=\"https://wiki.mageia.org/en/Grub2-efi_and_Mageia"
+#~ "\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link>"
diff --git a/docs/docs/stable/installer/ru/setupBootloader.xml b/docs/docs/stable/installer/ru/setupBootloader.xml
index 81096a58..e254b0aa 100644
--- a/docs/docs/stable/installer/ru/setupBootloader.xml
+++ b/docs/docs/stable/installer/ru/setupBootloader.xml
@@ -1,10 +1,27 @@
-<?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:lang="ru" xml:id="setupBootloader">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ru" 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">
+
+
+
+
+
+
+
+
+
+
<info>
<!--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-->
@@ -13,29 +30,39 @@ Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
<!--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.-->
<title xml:id="setupBootloader-ti1">Начальный загрузчик</title>
</info>
+
<section>
<title>Grub2</title>
+
<itemizedlist>
<title>Grub2 для устаревших систем с MBR/GPT</title>
+
<listitem>
<para>GRUB2 (с графическим меню или без него) будет единственным вариантом
загрузчика для устаревших систем с MBR или GPT.</para>
</listitem>
+
<listitem>
<para>По умолчанию новый загрузчик будет записан в MBR (Master Boot Record) вашего
первого диска, или в загрузочный раздел BIOS.</para>
</listitem>
</itemizedlist>
+
<itemizedlist>
<title>Grub2-efi в системах UEFI</title>
+
<listitem>
<para>Для систем UEFI используется только загрузчик GRUB2-efi.</para>
</listitem>
+
<listitem>
<para>По умолчанию новый загрузчик (Grub2-efi) будет записан в ESP (системный
раздел EFI).</para>
+
<para>Если на компьютере уже установлены операционные системы с UEFI (например
Windows 8), инсталлятор Mageia обнаружит имеющиеся разделы ESP, созданные
Windows, добавит GRUB2-efi. Если раздела ESP ещё не существует, такой раздел
@@ -45,55 +72,73 @@ Windows, добавит GRUB2-efi. Если раздела ESP ещё не су
</listitem>
</itemizedlist>
</section>
+
<section>
<info>
<title xml:id="setupBootloader-ti2">Настройка загрузчика</title>
</info>
+
<section>
<title>Основные параметры загрузчика</title>
+
<mediaobject>
<imageobject condition="classical"> <imagedata align="center"
fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
condition="live"> <imagedata fileref="live-setupBootloader.png"
xml:id="setupBootloader-im1"/> </imageobject></mediaobject>
+
<itemizedlist>
<listitem>
<para><emphasis role="bold">Использовать загрузчик</emphasis></para>
+
<para>Этой возможностью можно воспользоваться только на устаревших системах
MBR/BIOS. Пользователи систем UEFI её не увидят.</para>
</listitem>
+
<listitem>
<para><emphasis role="bold">Загрузочное устройство</emphasis></para>
+
<para>Не вносите изменений, если не уверены в их последствиях</para>
</listitem>
+
<listitem>
<para><emphasis role="bold">Пауза перед загрузкой основной системы</emphasis></para>
+
<para>С помощью этого пункта можно установить задержку в секундах перед загрузкой
операционной системы по умолчанию.</para>
</listitem>
+
<listitem>
<para><emphasis role="bold">Безопасность</emphasis></para>
+
<para>С помощью этого раздела вы можете установить пароль для доступа к
загрузчику. Использование пароля будет означать, что для выбора записи для
загрузки или изменения параметров придётся вводить пароль. Такой пароль не
является обязательным. Именем будет <literal>root</literal>, а пароль можно
будет выбрать на следующем этапе.</para>
</listitem>
+
<listitem>
<para><emphasis role="bold">Пароль</emphasis></para>
+
<para>С помощью этого поля для ввода текста вы можете указать пароль для
загрузчика (опционально).</para>
</listitem>
+
<listitem>
<para><emphasis role="bold">Пароль (ещё раз)</emphasis></para>
+
<para>Повторите ввод пароля пользователя в этом поле. DrakX проверит, совпадает ли
введённый повторно пароль с его первоначальным вариантом.</para>
</listitem>
</itemizedlist>
+
<para><emphasis>Дополнительно</emphasis></para>
+
<itemizedlist>
<listitem>
<para><emphasis>Включить ACPI</emphasis></para>
+
<para>ACPI (Advanced Configuration and Power Interface) является стандартом
управления питанием компьютера. С его помощью компьютер может экономить
энергию, выключая устройства, которые не используются. Этот метод
@@ -102,69 +147,88 @@ MBR/BIOS. Пользователи систем UEFI её не увидят.</pa
вы считаете, что реализация ACPI создаёт проблемы в работе компьютера
(например неожиданные перезагрузки системы или «зависания» системы).</para>
</listitem>
+
<listitem>
<para><emphasis>Включить SMP</emphasis></para>
+
<para>С помощью этого пункта можно включить или выключить симметричное
использование многих процессоров, если на компьютере установлен многоядерный
процессор.</para>
</listitem>
+
<listitem>
<para><emphasis>Включить APIC</emphasis></para>
+
<para>Обозначение этого пункта предоставляет операционной системе доступ к
расширенному программируемому контроллеру прерываний (Advanced Programmable
Interrupt Controller). Устройства с APIC дают возможность использовать более
сложные модели с приоритетностью процессов и управления расширенными IRQ
(запросами в отношении прерываний).</para>
</listitem>
+
<listitem>
<para><emphasis>Включить локальный APIC</emphasis></para>
+
<para>С помощью этого пункта можно включить локальный APIC, то есть управление
всеми внешними прерываниями для определённых процессоров в многопроцессорных
системах.</para>
</listitem>
</itemizedlist>
</section>
+
<section>
<title>Настройка загрузчика</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>
+
<itemizedlist>
<listitem>
<para><emphasis role="bold">По умолчанию</emphasis></para>
- <para>Типичный вариант операционной системы для загрузки.</para>
+
+ <para>The operating system to be started up by default.</para>
</listitem>
+
<listitem>
<para><emphasis role="bold">Присоединить</emphasis></para>
- <para>С помощью этого параметра вы можете передать ядру системы какие-то данные
-или сообщить ядру о том, что следует предоставить вам больше информации во
-время загрузки системы.</para>
+
+ <para>This option lets you pass information to the kernel or tell the kernel to
+give you more information as it boots.</para>
</listitem>
+
<listitem>
<para><emphasis role="bold">Зондирование посторонней ОС</emphasis></para>
+
<para>Если на компьютере уже установлены другие операционные системы, Mageia
попытается добавить эти системы к вашему новому меню загрузки Mageia. Если
вам это не нужно, снимите отметку с пункта Зондирования посторонней ОС.</para>
</listitem>
</itemizedlist>
+
<para><emphasis>Дополнительно</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>
+
<itemizedlist>
<listitem>
<para><emphasis>Видеорежим</emphasis></para>
+
<para>С помощью этого пункта можно указать разрешение экрана (в пикселях) и
глубину цветов для меню загрузки. Если вы нажмёте кнопку списка с маленьким
треугольником острием вниз, программа покажет варианты разрешений и глубины
цветов, которыми можно воспользоваться.</para>
</listitem>
+
<listitem>
<para><emphasis>Не трогайте ESP или MBR</emphasis></para>
+
<para>Выберите этот вариант, если вам не нужна отдельная загружаемая версия
Mageia, а нужна лишь система, которая будет использоваться в цепной загрузке
с другой операционной системы. Вы будете предупреждены о том, что не
@@ -172,15 +236,19 @@ Mageia, а нужна лишь система, которая будет исп
уверены в последствиях и хотите продолжить установку.</para>
</listitem>
</itemizedlist>
+
<mediaobject>
-<imageobject> <imagedata fileref="live-setupBootloader5.png"
-align="center"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center"
+fileref="live-setupBootloader5.png"/> </imageobject></mediaobject>
</section>
</section>
+
<section>
<title>Другие варианты</title>
+
<section>
<title>Использование уже установленного загрузчика</title>
+
<para>Полный перечень шагов добавления пункта операционной системы Mageia в меню
уже установленного загрузчика не является предметом этой справочной
страницы. Впрочем, в основном, эти шаги связаны с запуском соответствующей
@@ -188,24 +256,17 @@ align="center"/> </imageobject></mediaobject>
пункт системы в автоматическом режиме. Соответствующие пояснения должны быть
приведены в документации к другой операционной системе.</para>
</section>
+
<section>
<title>Установка без загрузчика</title>
+
<para>Хотя вам будет предложен вариант установки Mageia без загрузчика (см. Раздел
2.1), не рекомендуем им пользоваться, если вы не уверены в результатах,
поскольку без определённого загрузчика вашу операционную систему нельзя
будет запустить.</para>
</section>
- <section>
- <title>Добавление пункта в меню загрузки или внесение изменений в такие пункты</title>
- <para>Для этого вам придётся внести вручную изменения в
-<filename>/boot/grub2/custom.cfg</filename> или воспользоваться программой
-для настройки GRUB (например <application>grub-customizer</application> из
-хранилищ Mageia).</para>
- <note>
- <para>Чтобы узнать больше, ознакомьтесь с соответствующей страницей нашей вики:
-<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/sk.po b/docs/docs/stable/installer/sk.po
index 970f4fe2..d176383d 100644
--- a/docs/docs/stable/installer/sk.po
+++ b/docs/docs/stable/installer/sk.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\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: 2016-07-17 11:59+0300\n"
"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
"Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
@@ -315,7 +315,7 @@ msgstr ""
"citlivé na veľkosť písmen.</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Password</emphasis>"
msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
@@ -4592,8 +4592,8 @@ msgstr ""
"guilabel> pre nakonfigurovanie tlačidiel, ktoré nefungujú na myši majúcej "
"šesť alebo viac tlačidiel."
-#. 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 "Pridanie alebo úprava položiek Ponuky na zavedenie systému"
@@ -4618,55 +4618,55 @@ msgstr ""
"How_to_set_up_kernel_options</link>"
#. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:10
+#: en/setupBootloader.xml:27
#, fuzzy
msgid "Bootloader"
msgstr "Hlavné parametre zavádzača"
#. 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
#, fuzzy
msgid "Grub2-efi on UEFI systems"
msgstr "So systémom UEFI"
#. 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
#, fuzzy
msgid ""
"If there are already UEFI-based operating systems installed on your computer "
@@ -4684,18 +4684,18 @@ msgstr ""
"ktoré máte v počítači."
#. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:46
+#: en/setupBootloader.xml:72
#, fuzzy
msgid "Bootloader Setup"
msgstr "Hlavné parametre zavádzača"
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:49
+#: en/setupBootloader.xml:76
msgid "Bootloader main options"
msgstr "Hlavné parametre zavádzača"
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:51
+#: en/setupBootloader.xml:79
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -4708,52 +4708,52 @@ msgstr ""
"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:62
+#: en/setupBootloader.xml:91
#, fuzzy
msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Boot device</emphasis>"
msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:68
+#: en/setupBootloader.xml:100
#, fuzzy
msgid "Don't change this unless you really know what you are doing"
msgstr "Veci meňte len vtedy, keď veľmi dobre viete, čo robíte."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:72
+#: en/setupBootloader.xml:105
#, fuzzy
msgid ""
"<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Security</emphasis>"
msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
#. 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 "
@@ -4763,18 +4763,18 @@ 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
#, fuzzy
msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:92
+#: en/setupBootloader.xml:132
#, fuzzy
msgid ""
"Retype the password and DrakX will check that it matches with the one set "
@@ -4785,19 +4785,19 @@ msgstr ""
"textových políčok pre používateľské heslo."
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:96 en/setupBootloader.xml:154
+#: en/setupBootloader.xml:137 en/setupBootloader.xml:212
#, fuzzy
msgid "<emphasis>Advanced</emphasis>"
msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:99
+#: en/setupBootloader.xml:141
#, fuzzy
msgid "<emphasis>Enable ACPI</emphasis>"
msgstr "<emphasis>Všeobecný</emphasis>"
#. 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 "
@@ -4807,26 +4807,26 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:108
+#: en/setupBootloader.xml:152
#, fuzzy
msgid "<emphasis>Enable SMP</emphasis>"
msgstr "<emphasis>Všeobecný</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis>Enable APIC</emphasis>"
msgstr "<emphasis>Všeobecný</emphasis>"
#. 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 "
@@ -4834,26 +4834,26 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:168
#, fuzzy
msgid "<emphasis>Enable Local APIC</emphasis>"
msgstr "<emphasis>Všeobecný</emphasis>"
#. 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
#, fuzzy
msgid "Bootloader Configuration"
msgstr "Konfigurácia zvuku"
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:129
+#: en/setupBootloader.xml:180
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -4866,37 +4866,37 @@ msgstr ""
"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:139
+#: en/setupBootloader.xml:191
#, fuzzy
msgid "<emphasis role=\"bold\">Default</emphasis>"
msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Append</emphasis>"
msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
#. 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, "
@@ -4904,7 +4904,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:156
+#: en/setupBootloader.xml:215
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -4917,13 +4917,13 @@ msgstr ""
"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:166
+#: en/setupBootloader.xml:226
#, fuzzy
msgid "<emphasis>Video mode</emphasis>"
msgstr "<emphasis>Dodávateľ</emphasis>"
#. 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 "
@@ -4931,13 +4931,13 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:172
+#: en/setupBootloader.xml:234
#, fuzzy
msgid "<emphasis>Do not touch ESP or MBR</emphasis>"
msgstr "<emphasis>Dodávateľ</emphasis>"
#. 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 "
@@ -4946,27 +4946,26 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:181
+#: en/setupBootloader.xml:245
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align=\"center"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png"
"\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
#. 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 "Použitie už existujúceho zavádzača"
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:191
+#: en/setupBootloader.xml:258
#, fuzzy
msgid ""
"The exact procedure for adding Mageia to an existing bootloader is beyond "
@@ -4982,13 +4981,13 @@ msgstr ""
"systém."
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:199
+#: en/setupBootloader.xml:267
#, fuzzy
msgid "Installing Without a Bootloader"
msgstr "Použitie zavádzača Mageie"
#. 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 "
@@ -4996,26 +4995,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
-#, fuzzy
-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 ""
-"Pre viacej informácií o možnostiach kernelu na obstarožných a UEFI "
-"systémoch, pozrite: <link ns2:href=\"https://wiki.mageia.org/en/"
-"How_to_set_up_kernel_options\">https://wiki.mageia.org/en/"
-"How_to_set_up_kernel_options</link>"
-
#. type: Content of: <section><info><title>
#: en/setupSCSI.xml:10
msgid "Setup SCSI"
@@ -5423,6 +5402,25 @@ msgstr ""
#, fuzzy
#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align="
+#~ "\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ 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 ""
+#~ "Pre viacej informácií o možnostiach kernelu na obstarožných a UEFI "
+#~ "systémoch, pozrite: <link ns2:href=\"https://wiki.mageia.org/en/"
+#~ "How_to_set_up_kernel_options\">https://wiki.mageia.org/en/"
+#~ "How_to_set_up_kernel_options</link>"
+
+#, fuzzy
+#~ msgid ""
#~ "<imageobject> <imagedata fileref=\"live-bootCSM.png\" align=\"center\"/> "
#~ "</imageobject>"
#~ msgstr ""
diff --git a/docs/docs/stable/installer/sk/setupBootloader.xml b/docs/docs/stable/installer/sk/setupBootloader.xml
index 93e8da87..063e7e25 100644
--- a/docs/docs/stable/installer/sk/setupBootloader.xml
+++ b/docs/docs/stable/installer/sk/setupBootloader.xml
@@ -1,10 +1,27 @@
-<?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:lang="sk" xml:id="setupBootloader">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sk" 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">
+
+
+
+
+
+
+
+
+
+
<info>
<!--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-->
@@ -13,29 +30,39 @@ Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
<!--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.-->
<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 no ESP exists, then one will
@@ -44,155 +71,191 @@ required, whatever the number of operating systems you have.</para>
</listitem>
</itemizedlist>
</section>
+
<section>
<info>
<title xml:id="setupBootloader-ti2">Bootloader Setup</title>
</info>
+
<section>
<title>Hlavné parametre zavádzača</title>
+
<mediaobject>
<imageobject condition="classical"> <imagedata align="center"
fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
condition="live"> <imagedata fileref="live-setupBootloader.png"
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 most people are not likely
to have a need for it. The username is <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 computer does not support ACPI or if
you think the ACPI 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>
+
<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>
+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>
+
<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 are sure you understand the
implications, and wish to proceed.</para>
</listitem>
</itemizedlist>
+
<mediaobject>
-<imageobject> <imagedata fileref="live-setupBootloader5.png"
-align="center"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center"
+fileref="live-setupBootloader5.png"/> </imageobject></mediaobject>
</section>
</section>
+
<section>
<title>Other Options</title>
+
<section>
<title>Použitie už existujúceho zavádzača</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 should detect
Mageia and automatically add an entry for it in the 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>Pridanie alebo úprava položiek Ponuky na zavedenie systému</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/sl.po b/docs/docs/stable/installer/sl.po
index 6337bf1f..027e24df 100644
--- a/docs/docs/stable/installer/sl.po
+++ b/docs/docs/stable/installer/sl.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\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: 2018-04-10 20:43+0000\n"
"Last-Translator: Filip Komar <filip.komar@gmail.com>\n"
"Language-Team: Slovenian (http://www.transifex.com/MageiaLinux/mageia/"
@@ -308,7 +308,7 @@ msgstr ""
"role=\"bold\">Prijavno ime razlikuje med velikostjo črk.</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Password</emphasis>"
msgstr "<emphasis role=\"bold\">Napredno</emphasis>"
@@ -3894,8 +3894,8 @@ msgid ""
"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 ""
@@ -3915,54 +3915,54 @@ msgid ""
msgstr ""
#. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:10
+#: en/setupBootloader.xml:27
#, fuzzy
msgid "Bootloader"
msgstr "Vmesnik zagonskega nalagalnika"
#. 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 "
@@ -3972,18 +3972,18 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:46
+#: en/setupBootloader.xml:72
#, fuzzy
msgid "Bootloader Setup"
msgstr "Vmesnik zagonskega nalagalnika"
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:49
+#: en/setupBootloader.xml:76
msgid "Bootloader main options"
msgstr "Glavne možnosti zagonskega nalagalnika"
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:51
+#: en/setupBootloader.xml:79
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -3997,51 +3997,51 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:62
+#: en/setupBootloader.xml:91
#, fuzzy
msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
msgstr "<emphasis role=\"bold\">Strežnik</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Boot device</emphasis>"
msgstr "<emphasis role=\"bold\">Napredno</emphasis>"
#. 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
#, fuzzy
msgid ""
"<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
msgstr "<emphasis role=\"bold\">Delovna postaja</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Security</emphasis>"
msgstr "<emphasis role=\"bold\">Strežnik</emphasis>"
#. 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 "
@@ -4051,37 +4051,37 @@ 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
#, fuzzy
msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
msgstr "<emphasis role=\"bold\">Delovna postaja</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis>Advanced</emphasis>"
msgstr "<emphasis role=\"bold\">Napredno</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:99
+#: en/setupBootloader.xml:141
#, fuzzy
msgid "<emphasis>Enable ACPI</emphasis>"
msgstr "<emphasis>Običajen</emphasis>"
#. 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 "
@@ -4091,26 +4091,26 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:108
+#: en/setupBootloader.xml:152
#, fuzzy
msgid "<emphasis>Enable SMP</emphasis>"
msgstr "<emphasis>Običajen</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis>Enable APIC</emphasis>"
msgstr "<emphasis>Običajen</emphasis>"
#. 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 "
@@ -4118,26 +4118,26 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:168
#, fuzzy
msgid "<emphasis>Enable Local APIC</emphasis>"
msgstr "<emphasis>Običajen</emphasis>"
#. 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
#, fuzzy
msgid "Bootloader Configuration"
msgstr "Nastavitve zvoka"
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:129
+#: en/setupBootloader.xml:180
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -4151,37 +4151,37 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:139
+#: en/setupBootloader.xml:191
#, fuzzy
msgid "<emphasis role=\"bold\">Default</emphasis>"
msgstr "<emphasis role=\"bold\">Strežnik</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Append</emphasis>"
msgstr "<emphasis role=\"bold\">Napredno</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
msgstr "<emphasis role=\"bold\">Strežnik</emphasis>"
#. 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, "
@@ -4189,7 +4189,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:156
+#: en/setupBootloader.xml:215
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -4203,13 +4203,13 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:166
+#: en/setupBootloader.xml:226
#, fuzzy
msgid "<emphasis>Video mode</emphasis>"
msgstr "<emphasis>prodajalec</emphasis>"
#. 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 "
@@ -4217,13 +4217,13 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:172
+#: en/setupBootloader.xml:234
#, fuzzy
msgid "<emphasis>Do not touch ESP or MBR</emphasis>"
msgstr "<emphasis>prodajalec</emphasis>"
#. 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 "
@@ -4232,28 +4232,26 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:181
+#: en/setupBootloader.xml:245
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align=\"center"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png"
"\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
-"imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:188
+#: en/setupBootloader.xml:253
#, fuzzy
msgid "Other Options"
msgstr "Možnosti"
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:190
+#: en/setupBootloader.xml:256
msgid "Using an existing bootloader"
msgstr "Uporaba obstoječega zagonskega nalagalnika"
#. 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 "
@@ -4263,13 +4261,13 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:199
+#: en/setupBootloader.xml:267
#, fuzzy
msgid "Installing Without a Bootloader"
msgstr "Uporaba Magejinega zagonskega nalagalnika"
#. 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 "
@@ -4277,21 +4275,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"
@@ -4637,6 +4620,14 @@ msgstr ""
#, fuzzy
#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align="
+#~ "\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
#~ "<imageobject> <imagedata fileref=\"live-bootCSM.png\" align=\"center\"/> "
#~ "</imageobject>"
#~ msgstr ""
diff --git a/docs/docs/stable/installer/sl/setupBootloader.xml b/docs/docs/stable/installer/sl/setupBootloader.xml
index 98b62a0f..7c46621d 100644
--- a/docs/docs/stable/installer/sl/setupBootloader.xml
+++ b/docs/docs/stable/installer/sl/setupBootloader.xml
@@ -1,10 +1,27 @@
-<?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:lang="sl" xml:id="setupBootloader">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sl" 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">
+
+
+
+
+
+
+
+
+
+
<info>
<!--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-->
@@ -13,29 +30,39 @@ Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
<!--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.-->
<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 no ESP exists, then one will
@@ -44,155 +71,191 @@ required, whatever the number of operating systems you have.</para>
</listitem>
</itemizedlist>
</section>
+
<section>
<info>
<title xml:id="setupBootloader-ti2">Bootloader Setup</title>
</info>
+
<section>
<title>Glavne možnosti zagonskega nalagalnika</title>
+
<mediaobject>
<imageobject condition="classical"> <imagedata align="center"
fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
condition="live"> <imagedata fileref="live-setupBootloader.png"
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 most people are not likely
to have a need for it. The username is <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 computer does not support ACPI or if
you think the ACPI 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>
+
<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>
+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>
+
<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 are sure you understand the
implications, and wish to proceed.</para>
</listitem>
</itemizedlist>
+
<mediaobject>
-<imageobject> <imagedata fileref="live-setupBootloader5.png"
-align="center"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center"
+fileref="live-setupBootloader5.png"/> </imageobject></mediaobject>
</section>
</section>
+
<section>
<title>Other Options</title>
+
<section>
<title>Uporaba obstoječega zagonskega nalagalnika</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 should detect
Mageia and automatically add an entry for it in the 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/sq.po b/docs/docs/stable/installer/sq.po
index dedf6e70..fcada225 100644
--- a/docs/docs/stable/installer/sq.po
+++ b/docs/docs/stable/installer/sq.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\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: 2018-05-15 12:14+0000\n"
"Last-Translator: Ardit Dani <ardit.dani@gmail.com>\n"
"Language-Team: Albanian (http://www.transifex.com/MageiaLinux/mageia/"
@@ -273,7 +273,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
#, fuzzy
msgid "<emphasis role=\"bold\">Password</emphasis>"
msgstr "<emphasis>Shitës</emphasis>"
@@ -3884,8 +3884,8 @@ msgid ""
"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 ""
@@ -3905,54 +3905,54 @@ msgid ""
msgstr ""
#. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:10
+#: en/setupBootloader.xml:27
#, fuzzy
msgid "Bootloader"
msgstr "Opsionet kryesore të programit Bootloader"
#. 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 "
@@ -3962,18 +3962,18 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:46
+#: en/setupBootloader.xml:72
#, fuzzy
msgid "Bootloader Setup"
msgstr "Opsionet kryesore të programit Bootloader"
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:49
+#: en/setupBootloader.xml:76
msgid "Bootloader main options"
msgstr "Opsionet kryesore të programit Bootloader"
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:51
+#: en/setupBootloader.xml:79
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -3988,51 +3988,51 @@ msgstr ""
"\"center\" condition=\"live\"/> </imageobject>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:62
+#: en/setupBootloader.xml:91
#, fuzzy
msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
msgstr "<emphasis>Shitës</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Boot device</emphasis>"
msgstr "<emphasis>Përgjithshëm</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:68
+#: en/setupBootloader.xml:100
#, fuzzy
msgid "Don't change this unless you really know what you are doing"
msgstr "Vetëm ndrysho gjërat, kur ju e dini shumë mirë se çfarë po bëni."
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Security</emphasis>"
msgstr "<emphasis>Përgjithshëm</emphasis>"
#. 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 "
@@ -4042,37 +4042,37 @@ 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
#, fuzzy
msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
msgstr "<emphasis>Shitës</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis>Advanced</emphasis>"
msgstr "<emphasis>Shitës</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:99
+#: en/setupBootloader.xml:141
#, fuzzy
msgid "<emphasis>Enable ACPI</emphasis>"
msgstr "<emphasis>Përgjithshëm</emphasis>"
#. 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 "
@@ -4082,26 +4082,26 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:108
+#: en/setupBootloader.xml:152
#, fuzzy
msgid "<emphasis>Enable SMP</emphasis>"
msgstr "<emphasis>Përgjithshëm</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis>Enable APIC</emphasis>"
msgstr "<emphasis>Përgjithshëm</emphasis>"
#. 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 "
@@ -4109,26 +4109,26 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:168
#, fuzzy
msgid "<emphasis>Enable Local APIC</emphasis>"
msgstr "<emphasis>Përgjithshëm</emphasis>"
#. 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
#, fuzzy
msgid "Bootloader Configuration"
msgstr "Konfigurimi zërit"
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:129
+#: en/setupBootloader.xml:180
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -4143,37 +4143,37 @@ msgstr ""
"\"center\" condition=\"live\"/> </imageobject>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:139
+#: en/setupBootloader.xml:191
#, fuzzy
msgid "<emphasis role=\"bold\">Default</emphasis>"
msgstr "<emphasis>Personalizuar</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Append</emphasis>"
msgstr "<emphasis>Shitës</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
msgstr "<emphasis>Shitës</emphasis>"
#. 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, "
@@ -4181,7 +4181,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:156
+#: en/setupBootloader.xml:215
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -4196,13 +4196,13 @@ msgstr ""
"\"center\" condition=\"live\"/> </imageobject>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:166
+#: en/setupBootloader.xml:226
#, fuzzy
msgid "<emphasis>Video mode</emphasis>"
msgstr "<emphasis>Shitës</emphasis>"
#. 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 "
@@ -4210,13 +4210,13 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:172
+#: en/setupBootloader.xml:234
#, fuzzy
msgid "<emphasis>Do not touch ESP or MBR</emphasis>"
msgstr "<emphasis>Shitës</emphasis>"
#. 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 "
@@ -4225,28 +4225,27 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:181
+#: en/setupBootloader.xml:245
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align=\"center"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png"
"\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
-"align=\"center\"/> </imageobject>"
+"<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:188
+#: en/setupBootloader.xml:253
#, fuzzy
msgid "Other Options"
msgstr "Opcionet"
#. 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 "
@@ -4256,12 +4255,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 "
@@ -4269,21 +4268,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"
@@ -4630,6 +4614,14 @@ msgstr ""
#, fuzzy
#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align="
+#~ "\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+#~ "align=\"center\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
#~ "<imageobject> <imagedata fileref=\"live-bootCSM.png\" align=\"center\"/> "
#~ "</imageobject>"
#~ msgstr ""
diff --git a/docs/docs/stable/installer/sq/setupBootloader.xml b/docs/docs/stable/installer/sq/setupBootloader.xml
index b4b78914..9f788d45 100644
--- a/docs/docs/stable/installer/sq/setupBootloader.xml
+++ b/docs/docs/stable/installer/sq/setupBootloader.xml
@@ -1,10 +1,27 @@
-<?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:lang="sq" xml:id="setupBootloader">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sq" 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">
+
+
+
+
+
+
+
+
+
+
<info>
<!--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-->
@@ -13,29 +30,39 @@ Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
<!--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.-->
<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 no ESP exists, then one will
@@ -44,155 +71,191 @@ required, whatever the number of operating systems you have.</para>
</listitem>
</itemizedlist>
</section>
+
<section>
<info>
<title xml:id="setupBootloader-ti2">Bootloader Setup</title>
</info>
+
<section>
<title>Opsionet kryesore të programit Bootloader</title>
+
<mediaobject>
<imageobject condition="classical"> <imagedata align="center"
fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
condition="live"> <imagedata fileref="live-setupBootloader.png"
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 most people are not likely
to have a need for it. The username is <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 computer does not support ACPI or if
you think the ACPI 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>
+
<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>
+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>
+
<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 are sure you understand the
implications, and wish to proceed.</para>
</listitem>
</itemizedlist>
+
<mediaobject>
-<imageobject> <imagedata fileref="live-setupBootloader5.png"
-align="center"/> </imageobject></mediaobject>
+<imageobject> <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 should detect
Mageia and automatically add an entry for it in the 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/sv.po b/docs/docs/stable/installer/sv.po
index e556a48b..7825a990 100644
--- a/docs/docs/stable/installer/sv.po
+++ b/docs/docs/stable/installer/sv.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\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: 2018-10-08 22:17+0000\n"
"Last-Translator: Kristoffer Grundström <kristoffer.grundstrom1983@gmail."
"com>\n"
@@ -266,7 +266,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
#, fuzzy
msgid "<emphasis role=\"bold\">Password</emphasis>"
msgstr "<emphasis role=\"bold\">Avancerat</emphasis>"
@@ -4029,8 +4029,8 @@ msgstr ""
"för att konfigurera knapparna som inte fungerar på en mus med sex eller fler "
"knappar."
-#. 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 "Lägg till eller ändra en post i bootmenyn"
@@ -4050,55 +4050,55 @@ msgid ""
msgstr ""
#. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:10
+#: en/setupBootloader.xml:27
#, fuzzy
msgid "Bootloader"
msgstr "Gränssnitt för starthanteraren"
#. 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
#, fuzzy
msgid "Grub2-efi on UEFI systems"
msgstr "GRUB2-efi för ett UEFI-system."
#. 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 "
@@ -4108,18 +4108,18 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:46
+#: en/setupBootloader.xml:72
#, fuzzy
msgid "Bootloader Setup"
msgstr "Gränssnitt för starthanteraren"
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:49
+#: en/setupBootloader.xml:76
msgid "Bootloader main options"
msgstr "Huvudalternativ för startshanteraren"
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:51
+#: en/setupBootloader.xml:79
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -4133,32 +4133,32 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:62
+#: en/setupBootloader.xml:91
#, fuzzy
msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
msgstr "<emphasis role=\"bold\">Server</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Boot device</emphasis>"
msgstr "<emphasis role=\"bold\">Avancerat</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:68
+#: en/setupBootloader.xml:100
#, fuzzy
msgid "Don't change this unless you really know what you are doing"
msgstr "Ändra bara på saker när du vet mycket väl vad du gör."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:72
+#: en/setupBootloader.xml:105
#, fuzzy
msgid ""
"<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
@@ -4166,20 +4166,20 @@ msgstr ""
"<emphasis role=\"bold\">Vänligen välj den önskade säkerhetsnivån</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Security</emphasis>"
msgstr "<emphasis role=\"bold\">Server</emphasis>"
#. 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 "
@@ -4189,37 +4189,37 @@ 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
#, fuzzy
msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
msgstr "<emphasis role=\"bold\">Arbetsstation</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis>Advanced</emphasis>"
msgstr "<emphasis role=\"bold\">Avancerat</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:99
+#: en/setupBootloader.xml:141
#, fuzzy
msgid "<emphasis>Enable ACPI</emphasis>"
msgstr "<emphasis>Standard</emphasis>"
#. 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 "
@@ -4229,26 +4229,26 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:108
+#: en/setupBootloader.xml:152
#, fuzzy
msgid "<emphasis>Enable SMP</emphasis>"
msgstr "<emphasis>Standard</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis>Enable APIC</emphasis>"
msgstr "<emphasis>Standard</emphasis>"
#. 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 "
@@ -4256,26 +4256,26 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:168
#, fuzzy
msgid "<emphasis>Enable Local APIC</emphasis>"
msgstr "<emphasis>Standard</emphasis>"
#. 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
#, fuzzy
msgid "Bootloader Configuration"
msgstr "Ljudkonfiguration"
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:129
+#: en/setupBootloader.xml:180
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -4289,42 +4289,42 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:139
+#: en/setupBootloader.xml:191
#, fuzzy
msgid "<emphasis role=\"bold\">Default</emphasis>"
msgstr "<emphasis role=\"bold\">Server</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:140
+#: en/setupBootloader.xml:193
#, fuzzy
-msgid "The operating system to started up by default"
+msgid "The operating system to be started up by default."
msgstr ""
"<guilabel>Standard:</guilabel> Operativsystemet som startar som standard"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:143
+#: en/setupBootloader.xml:197
#, fuzzy
msgid "<emphasis role=\"bold\">Append</emphasis>"
msgstr "<emphasis role=\"bold\">Avancerat</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:144
+#: en/setupBootloader.xml:199
#, fuzzy
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 ""
"<guilabel>Tillägg:</guilabel> Med det här valet kan du ändra eller lägga "
"till information till kärnan när du startar upp. "
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:148
+#: en/setupBootloader.xml:204
#, fuzzy
msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
msgstr "<emphasis role=\"bold\">Server</emphasis>"
#. 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, "
@@ -4332,7 +4332,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:156
+#: en/setupBootloader.xml:215
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -4346,13 +4346,13 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:166
+#: en/setupBootloader.xml:226
#, fuzzy
msgid "<emphasis>Video mode</emphasis>"
msgstr "<emphasis>Tillverkare</emphasis>"
#. 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 "
@@ -4360,13 +4360,13 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:172
+#: en/setupBootloader.xml:234
#, fuzzy
msgid "<emphasis>Do not touch ESP or MBR</emphasis>"
msgstr "<emphasis>Tillverkare</emphasis>"
#. 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 "
@@ -4375,28 +4375,26 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:181
+#: en/setupBootloader.xml:245
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align=\"center"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png"
"\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
-"imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:188
+#: en/setupBootloader.xml:253
#, fuzzy
msgid "Other Options"
msgstr "Alternativ"
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:190
+#: en/setupBootloader.xml:256
msgid "Using an existing bootloader"
msgstr "Använder en befintlig startshanterare"
#. 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 "
@@ -4406,13 +4404,13 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:199
+#: en/setupBootloader.xml:267
#, fuzzy
msgid "Installing Without a Bootloader"
msgstr "Använder en startshanterare från Mageia"
#. 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 "
@@ -4420,25 +4418,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
-#, fuzzy
-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 ""
-"För mer information om kernel-alternativ för legacy och UEFI-läge läs: <link "
-"ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options\">https://"
-"wiki.mageia.org/en/How_to_set_up_kernel_options</link>"
-
#. type: Content of: <section><info><title>
#: en/setupSCSI.xml:10
msgid "Setup SCSI"
@@ -4812,6 +4791,24 @@ msgstr ""
#, fuzzy
#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align="
+#~ "\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ 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 ""
+#~ "För mer information om kernel-alternativ för legacy och UEFI-läge läs: "
+#~ "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
+#~ "\">https://wiki.mageia.org/en/How_to_set_up_kernel_options</link>"
+
+#, fuzzy
+#~ msgid ""
#~ "<imageobject> <imagedata fileref=\"live-bootCSM.png\" align=\"center\"/> "
#~ "</imageobject>"
#~ msgstr ""
diff --git a/docs/docs/stable/installer/sv/setupBootloader.xml b/docs/docs/stable/installer/sv/setupBootloader.xml
index 3ba23fec..88a620ad 100644
--- a/docs/docs/stable/installer/sv/setupBootloader.xml
+++ b/docs/docs/stable/installer/sv/setupBootloader.xml
@@ -1,10 +1,27 @@
-<?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:lang="sv" xml:id="setupBootloader">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sv" 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">
+
+
+
+
+
+
+
+
+
+
<info>
<!--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-->
@@ -13,29 +30,39 @@ Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
<!--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.-->
<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 no ESP exists, then one will
@@ -44,155 +71,191 @@ required, whatever the number of operating systems you have.</para>
</listitem>
</itemizedlist>
</section>
+
<section>
<info>
<title xml:id="setupBootloader-ti2">Bootloader Setup</title>
</info>
+
<section>
<title>Huvudalternativ för startshanteraren</title>
+
<mediaobject>
<imageobject condition="classical"> <imagedata align="center"
fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
condition="live"> <imagedata fileref="live-setupBootloader.png"
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 most people are not likely
to have a need for it. The username is <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 computer does not support ACPI or if
you think the ACPI 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>
+
<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>
+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>
+
<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 are sure you understand the
implications, and wish to proceed.</para>
</listitem>
</itemizedlist>
+
<mediaobject>
-<imageobject> <imagedata fileref="live-setupBootloader5.png"
-align="center"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center"
+fileref="live-setupBootloader5.png"/> </imageobject></mediaobject>
</section>
</section>
+
<section>
<title>Other Options</title>
+
<section>
<title>Använder en befintlig startshanterare</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 should detect
Mageia and automatically add an entry for it in the 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>Lägg till eller ändra en post i bootmenyn</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/tg.po b/docs/docs/stable/installer/tg.po
index f296169c..971c7f2b 100644
--- a/docs/docs/stable/installer/tg.po
+++ b/docs/docs/stable/installer/tg.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\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: 2017-08-21 06:59+0000\n"
"Last-Translator: Victor Ibragimov <victor.ibragimov@gmail.com>\n"
"Language-Team: Tajik (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -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 ""
@@ -3542,8 +3542,8 @@ msgid ""
"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 ""
@@ -3563,54 +3563,54 @@ msgid ""
msgstr ""
#. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:10
+#: en/setupBootloader.xml:27
#, fuzzy
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 "
@@ -3620,18 +3620,18 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:46
+#: en/setupBootloader.xml:72
#, fuzzy
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 condition=\"live"
@@ -3640,47 +3640,47 @@ 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 "
@@ -3690,34 +3690,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 "
@@ -3727,24 +3727,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 "
@@ -3752,25 +3752,25 @@ 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
#, fuzzy
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 condition=\"live"
@@ -3779,34 +3779,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, "
@@ -3814,7 +3814,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 condition=\"live"
@@ -3823,12 +3823,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 "
@@ -3836,12 +3836,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 "
@@ -3850,25 +3850,25 @@ 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> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png"
"\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:188
+#: en/setupBootloader.xml:253
#, fuzzy
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 "
@@ -3878,12 +3878,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 "
@@ -3891,21 +3891,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"
diff --git a/docs/docs/stable/installer/tg/setupBootloader.xml b/docs/docs/stable/installer/tg/setupBootloader.xml
index 8ac336f8..4265a473 100644
--- a/docs/docs/stable/installer/tg/setupBootloader.xml
+++ b/docs/docs/stable/installer/tg/setupBootloader.xml
@@ -1,10 +1,27 @@
-<?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:lang="tg" xml:id="setupBootloader">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="tg" 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">
+
+
+
+
+
+
+
+
+
+
<info>
<!--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-->
@@ -13,29 +30,39 @@ Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
<!--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.-->
<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 no ESP exists, then one will
@@ -44,155 +71,191 @@ required, whatever the number of operating systems you have.</para>
</listitem>
</itemizedlist>
</section>
+
<section>
<info>
<title xml:id="setupBootloader-ti2">Bootloader Setup</title>
</info>
+
<section>
<title>Хосиятҳои асосии корандози худборшав</title>
+
<mediaobject>
<imageobject condition="classical"> <imagedata align="center"
fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
condition="live"> <imagedata fileref="live-setupBootloader.png"
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 most people are not likely
to have a need for it. The username is <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 computer does not support ACPI or if
you think the ACPI 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>
+
<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>
+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>
+
<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 are sure you understand the
implications, and wish to proceed.</para>
</listitem>
</itemizedlist>
+
<mediaobject>
-<imageobject> <imagedata fileref="live-setupBootloader5.png"
-align="center"/> </imageobject></mediaobject>
+<imageobject> <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 should detect
Mageia and automatically add an entry for it in the 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/tr.po b/docs/docs/stable/installer/tr.po
index 8080532a..5dd721ca 100644
--- a/docs/docs/stable/installer/tr.po
+++ b/docs/docs/stable/installer/tr.po
@@ -17,7 +17,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\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: 2018-04-19 13:33+0000\n"
"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
"Language-Team: Turkish (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -321,7 +321,7 @@ msgstr ""
"küçük harfe duyarlıdır.</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Password</emphasis>"
msgstr "<emphasis role=\"bold\">Gelişmiş</emphasis>"
@@ -4097,8 +4097,8 @@ msgstr ""
"için <guilabel>Evrensel</guilabel> - <guilabel>evdev zorla</guilabel> "
"seçeneğini seçin."
-#. 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 "Önyükleme Menü Girdisi Ekleme veya Değiştirme"
@@ -4118,54 +4118,54 @@ msgid ""
msgstr ""
#. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:10
+#: en/setupBootloader.xml:27
#, fuzzy
msgid "Bootloader"
msgstr "Önyükleyici arayüzü"
#. 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 "
@@ -4175,18 +4175,18 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:46
+#: en/setupBootloader.xml:72
#, fuzzy
msgid "Bootloader Setup"
msgstr "Önyükleyici arayüzü"
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:49
+#: en/setupBootloader.xml:76
msgid "Bootloader main options"
msgstr "Önyükleyici ana seçenekleri"
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:51
+#: en/setupBootloader.xml:79
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -4200,26 +4200,26 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:62
+#: en/setupBootloader.xml:91
#, fuzzy
msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
msgstr "<emphasis role=\"bold\">Sunucu</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Boot device</emphasis>"
msgstr "<emphasis role=\"bold\">Gelişmiş</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:68
+#: en/setupBootloader.xml:100
#, fuzzy
msgid "Don't change this unless you really know what you are doing"
msgstr ""
@@ -4227,27 +4227,27 @@ msgstr ""
"değiştirin."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:72
+#: en/setupBootloader.xml:105
#, fuzzy
msgid ""
"<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
msgstr "<emphasis role=\"bold\">İş İstasyonu</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Security</emphasis>"
msgstr "<emphasis role=\"bold\">Sunucu</emphasis>"
#. 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 "
@@ -4257,37 +4257,37 @@ 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
#, fuzzy
msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
msgstr "<emphasis role=\"bold\">İş İstasyonu</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis>Advanced</emphasis>"
msgstr "<emphasis role=\"bold\">Gelişmiş</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:99
+#: en/setupBootloader.xml:141
#, fuzzy
msgid "<emphasis>Enable ACPI</emphasis>"
msgstr "<emphasis>Genel</emphasis>"
#. 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 "
@@ -4297,26 +4297,26 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:108
+#: en/setupBootloader.xml:152
#, fuzzy
msgid "<emphasis>Enable SMP</emphasis>"
msgstr "<emphasis>Genel</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis>Enable APIC</emphasis>"
msgstr "<emphasis>Genel</emphasis>"
#. 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 "
@@ -4324,26 +4324,26 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:168
#, fuzzy
msgid "<emphasis>Enable Local APIC</emphasis>"
msgstr "<emphasis>Genel</emphasis>"
#. 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
#, fuzzy
msgid "Bootloader Configuration"
msgstr "Ses Yapılandırması"
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:129
+#: en/setupBootloader.xml:180
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -4357,43 +4357,43 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:139
+#: en/setupBootloader.xml:191
#, fuzzy
msgid "<emphasis role=\"bold\">Default</emphasis>"
msgstr "<emphasis role=\"bold\">Sunucu</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:140
+#: en/setupBootloader.xml:193
#, fuzzy
-msgid "The operating system to started up by default"
+msgid "The operating system to be started up by default."
msgstr ""
"<guilabel>Öntanımlı:</guilabel> Öntanımlı olarak başlatılacak işletim sistemi"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:143
+#: en/setupBootloader.xml:197
#, fuzzy
msgid "<emphasis role=\"bold\">Append</emphasis>"
msgstr "<emphasis role=\"bold\">Gelişmiş</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:144
+#: en/setupBootloader.xml:199
#, fuzzy
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 ""
"<guilabel>Sonuna ekle:</guilabel> Bu seçenek çekirdek bilgisini geçmenizi "
"veya çekirdeğe önyükleme sırasında daha fazla bilgi vermesini söylemenizi "
"sağlar."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:148
+#: en/setupBootloader.xml:204
#, fuzzy
msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
msgstr "<emphasis role=\"bold\">Sunucu</emphasis>"
#. 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, "
@@ -4401,7 +4401,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:156
+#: en/setupBootloader.xml:215
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -4415,13 +4415,13 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:166
+#: en/setupBootloader.xml:226
#, fuzzy
msgid "<emphasis>Video mode</emphasis>"
msgstr "<emphasis>Üretici</emphasis>"
#. 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 "
@@ -4429,13 +4429,13 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:172
+#: en/setupBootloader.xml:234
#, fuzzy
msgid "<emphasis>Do not touch ESP or MBR</emphasis>"
msgstr "<emphasis>Üretici</emphasis>"
#. 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 "
@@ -4444,28 +4444,26 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:181
+#: en/setupBootloader.xml:245
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align=\"center"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png"
"\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
-"imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:188
+#: en/setupBootloader.xml:253
#, fuzzy
msgid "Other Options"
msgstr "Seçenekler"
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:190
+#: en/setupBootloader.xml:256
msgid "Using an existing bootloader"
msgstr "Mevcut bir önyükleyiciyi kullanmak"
#. 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 "
@@ -4475,13 +4473,13 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:199
+#: en/setupBootloader.xml:267
#, fuzzy
msgid "Installing Without a Bootloader"
msgstr "Bir Mageia önyükleyicisi kullanmak"
#. 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 "
@@ -4489,26 +4487,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
-#, fuzzy
-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 ""
-"Eski ve UEFI sistemlerde çekirdek seçenekleri ile ilgili daha fazla bilgi "
-"için: <link ns2:href=\"https://wiki.mageia.org/en/"
-"How_to_set_up_kernel_options\">https://wiki.mageia.org/en/"
-"How_to_set_up_kernel_options</link>"
-
#. type: Content of: <section><info><title>
#: en/setupSCSI.xml:10
msgid "Setup SCSI"
@@ -4884,6 +4862,25 @@ msgstr ""
#, fuzzy
#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align="
+#~ "\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ 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 ""
+#~ "Eski ve UEFI sistemlerde çekirdek seçenekleri ile ilgili daha fazla bilgi "
+#~ "için: <link ns2:href=\"https://wiki.mageia.org/en/"
+#~ "How_to_set_up_kernel_options\">https://wiki.mageia.org/en/"
+#~ "How_to_set_up_kernel_options</link>"
+
+#, fuzzy
+#~ msgid ""
#~ "<imageobject> <imagedata fileref=\"live-bootCSM.png\" align=\"center\"/> "
#~ "</imageobject>"
#~ msgstr ""
diff --git a/docs/docs/stable/installer/tr/setupBootloader.xml b/docs/docs/stable/installer/tr/setupBootloader.xml
index 663083eb..178f3f85 100644
--- a/docs/docs/stable/installer/tr/setupBootloader.xml
+++ b/docs/docs/stable/installer/tr/setupBootloader.xml
@@ -1,10 +1,27 @@
-<?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:lang="tr" xml:id="setupBootloader">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="tr" 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">
+
+
+
+
+
+
+
+
+
+
<info>
<!--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-->
@@ -13,29 +30,39 @@ Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
<!--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.-->
<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 no ESP exists, then one will
@@ -44,155 +71,191 @@ required, whatever the number of operating systems you have.</para>
</listitem>
</itemizedlist>
</section>
+
<section>
<info>
<title xml:id="setupBootloader-ti2">Bootloader Setup</title>
</info>
+
<section>
<title>Önyükleyici ana seçenekleri</title>
+
<mediaobject>
<imageobject condition="classical"> <imagedata align="center"
fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
condition="live"> <imagedata fileref="live-setupBootloader.png"
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 most people are not likely
to have a need for it. The username is <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 computer does not support ACPI or if
you think the ACPI 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>
+
<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>
+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>
+
<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 are sure you understand the
implications, and wish to proceed.</para>
</listitem>
</itemizedlist>
+
<mediaobject>
-<imageobject> <imagedata fileref="live-setupBootloader5.png"
-align="center"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center"
+fileref="live-setupBootloader5.png"/> </imageobject></mediaobject>
</section>
</section>
+
<section>
<title>Other Options</title>
+
<section>
<title>Mevcut bir önyükleyiciyi kullanmak</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 should detect
Mageia and automatically add an entry for it in the 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>Önyükleme Menü Girdisi Ekleme veya Değiştirme</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/uk.po b/docs/docs/stable/installer/uk.po
index cded9273..8b2a59dc 100644
--- a/docs/docs/stable/installer/uk.po
+++ b/docs/docs/stable/installer/uk.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2019-01-13 16:48+0200\n"
-"PO-Revision-Date: 2019-01-13 16:52+0200\n"
+"POT-Creation-Date: 2019-01-15 12:24+0200\n"
+"PO-Revision-Date: 2019-01-15 12:27+0200\n"
"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
"Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
"Language: uk\n"
@@ -284,7 +284,7 @@ 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 "<emphasis role=\"bold\">Пароль</emphasis>"
@@ -4564,8 +4564,8 @@ msgstr ""
"<guimenuitem>Задіяти evdev</guimenuitem></menuchoice>, щоб налаштувати "
"кнопки, які не працюють на миші з шістьма або більше кнопками."
-#. 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 "Додавання пункту меню завантаження та внесення змін у такі пункти"
@@ -4591,22 +4591,22 @@ msgstr ""
"mageia.org/en/Grub2-efi_and_Mageia</link>"
#. 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 "Grub2"
#. type: Content of: <section><section><itemizedlist><title>
-#: en/setupBootloader.xml:15
+#: en/setupBootloader.xml:34
msgid "Grub2 on Legacy MBR/GPT systems"
msgstr "GRUB2 для застарілих систем із MBR та GPT"
#. 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."
@@ -4615,7 +4615,7 @@ msgstr ""
"для застарілих систем із MBR або GPT."
#. 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."
@@ -4624,17 +4624,17 @@ msgstr ""
"першого диска, або до завантажувального розділу BIOS."
#. type: Content of: <section><section><itemizedlist><title>
-#: en/setupBootloader.xml:27
+#: en/setupBootloader.xml:49
msgid "Grub2-efi on UEFI systems"
msgstr "GRUB2-efi у системах UEFI"
#. 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 "Для систем UEFI використовується лише завантажувач GRUB2-efi."
#. 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)."
@@ -4643,7 +4643,7 @@ msgstr ""
"розділу EFI)."
#. 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 "
@@ -4659,17 +4659,17 @@ 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 condition=\"live"
@@ -4682,12 +4682,12 @@ msgstr ""
"im1\"/> </imageobject>"
#. 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 "<emphasis role=\"bold\">Використовувати завантажувач</emphasis>"
#. 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."
@@ -4696,24 +4696,24 @@ msgstr ""
"Користувачі систем UEFI її не побачать."
#. 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 "<emphasis role=\"bold\">Пристрій завантаження</emphasis>"
#. 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 ""
"<emphasis role=\"bold\">Пауза перед завантаженням основної системи</emphasis>"
#. 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."
@@ -4722,12 +4722,12 @@ 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 "<emphasis role=\"bold\">Безпека</emphasis>"
#. 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 "
@@ -4742,19 +4742,19 @@ 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 "<emphasis role=\"bold\">Пароль (ще раз)</emphasis>"
#. 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"
@@ -4763,17 +4763,17 @@ 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 "<emphasis>Додатково</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:99
+#: en/setupBootloader.xml:141
msgid "<emphasis>Enable ACPI</emphasis>"
msgstr "<emphasis>Увімкнути ACPI</emphasis>"
#. 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 "
@@ -4790,12 +4790,12 @@ msgstr ""
"перезавантаження системи або «замерзання» системи)."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:108
+#: en/setupBootloader.xml:152
msgid "<emphasis>Enable SMP</emphasis>"
msgstr "<emphasis>Увімкнути SMP</emphasis>"
#. 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"
@@ -4805,12 +4805,12 @@ msgstr ""
"багатоядерний процесор."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:113
+#: en/setupBootloader.xml:159
msgid "<emphasis>Enable APIC</emphasis>"
msgstr "<emphasis>Увімкнути APIC</emphasis>"
#. 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 "
@@ -4823,12 +4823,12 @@ 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 "<emphasis>Увімкнути локальний APIC</emphasis>"
#. 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"
@@ -4838,12 +4838,12 @@ 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 condition=\"live"
@@ -4856,37 +4856,37 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:139
+#: en/setupBootloader.xml:191
msgid "<emphasis role=\"bold\">Default</emphasis>"
msgstr "<emphasis role=\"bold\">Типовий</emphasis>"
#. 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 "<emphasis role=\"bold\">Приєднати</emphasis>"
#. 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 "<emphasis role=\"bold\">Зондування сторонньої ОС</emphasis>"
#. 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, "
@@ -4898,7 +4898,7 @@ msgstr ""
"emphasis>."
#. 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 condition=\"live"
@@ -4911,12 +4911,12 @@ msgstr ""
"imageobject>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:166
+#: en/setupBootloader.xml:226
msgid "<emphasis>Video mode</emphasis>"
msgstr "<emphasis>Відеорежим</emphasis>"
#. 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 "
@@ -4928,12 +4928,12 @@ 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 "<emphasis>Не чіпати ESP або MBR</emphasis>"
#. 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 "
@@ -4947,26 +4947,26 @@ 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> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png"
"\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align=\"center"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png"
"\"/> </imageobject>"
#. 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 "
@@ -4982,12 +4982,12 @@ 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 "
@@ -4999,27 +4999,6 @@ 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 ""
-"Для цього вам доведеться внести вручну зміни до <filename>/boot/grub2/custom."
-"cfg</filename> або скористатися програмою для налаштовування GRUB (наприклад "
-"<application>grub-customizer</application> зі сховищ Mageia)."
-
-#. 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 ""
-"Щоб дізнатися більше, ознайомтеся із відповідною сторінкою нашої вікі: <link "
-"ns4:href=\"https://wiki.mageia.org/en/Grub2-efi_and_Mageia\">https://wiki."
-"mageia.org/en/Grub2-efi_and_Mageia</link>"
-
#. type: Content of: <section><info><title>
#: en/setupSCSI.xml:10
msgid "Setup SCSI"
@@ -5440,6 +5419,31 @@ msgstr ""
"процедура триватиме декілька хвилин. Наприкінці процедури ви певний час "
"бачитимете порожній екран. Це нормально."
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align="
+#~ "\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align="
+#~ "\"center\"/> </imageobject>"
+
+#~ 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 ""
+#~ "Для цього вам доведеться внести вручну зміни до <filename>/boot/grub2/"
+#~ "custom.cfg</filename> або скористатися програмою для налаштовування GRUB "
+#~ "(наприклад <application>grub-customizer</application> зі сховищ Mageia)."
+
+#~ 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 ""
+#~ "Щоб дізнатися більше, ознайомтеся із відповідною сторінкою нашої вікі: "
+#~ "<link ns4:href=\"https://wiki.mageia.org/en/Grub2-efi_and_Mageia"
+#~ "\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link>"
+
#~ msgid "Main Menu"
#~ msgstr "Головне меню"
diff --git a/docs/docs/stable/installer/uk/setupBootloader.xml b/docs/docs/stable/installer/uk/setupBootloader.xml
index 385c6dc0..a1d9d1dc 100644
--- a/docs/docs/stable/installer/uk/setupBootloader.xml
+++ b/docs/docs/stable/installer/uk/setupBootloader.xml
@@ -1,10 +1,27 @@
-<?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:lang="uk" xml:id="setupBootloader">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="uk" 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">
+
+
+
+
+
+
+
+
+
+
<info>
<!--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-->
@@ -13,29 +30,39 @@ Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
<!--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.-->
<title xml:id="setupBootloader-ti1">Завантажувач</title>
</info>
+
<section>
<title>Grub2</title>
+
<itemizedlist>
<title>GRUB2 для застарілих систем із MBR та GPT</title>
+
<listitem>
<para>GRUB2 (з графічним меню або без нього) буде єдиним варіантом завантажувача
для застарілих систем із MBR або GPT.</para>
</listitem>
+
<listitem>
<para>Типово, новий завантажувач буде записано до MBR (Master Boot Record) вашого
першого диска, або до завантажувального розділу BIOS.</para>
</listitem>
</itemizedlist>
+
<itemizedlist>
<title>GRUB2-efi у системах UEFI</title>
+
<listitem>
<para>Для систем UEFI використовується лише завантажувач GRUB2-efi.</para>
</listitem>
+
<listitem>
<para>Типово, новий завантажувач (Grub2-efi) буде записано до ESP (системного
розділу EFI).</para>
+
<para>Якщо на комп’ютері вже було встановлено операційні системи з UEFI (наприклад
Windows 8), засіб встановлення Mageia виявить наявні розділи ESP, створені
Windows, додасть GRUB2-efi. Якщо розділу ESP ще не існує, таких розділ буде
@@ -45,55 +72,73 @@ Windows, додасть GRUB2-efi. Якщо розділу ESP ще не існ
</listitem>
</itemizedlist>
</section>
+
<section>
<info>
<title xml:id="setupBootloader-ti2">Налаштовування завантажувача</title>
</info>
+
<section>
<title>Основні параметри завантажувача</title>
+
<mediaobject>
<imageobject condition="classical"> <imagedata align="center"
fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
condition="live"> <imagedata fileref="live-setupBootloader.png"
xml:id="setupBootloader-im1"/> </imageobject></mediaobject>
+
<itemizedlist>
<listitem>
<para><emphasis role="bold">Використовувати завантажувач</emphasis></para>
+
<para>Цією можливістю можна скористатися лише на застарілих системах
MBR/BIOS. Користувачі систем UEFI її не побачать.</para>
</listitem>
+
<listitem>
<para><emphasis role="bold">Пристрій завантаження</emphasis></para>
+
<para>Не вносьте змін, якщо не певні щодо їхніх наслідків</para>
</listitem>
+
<listitem>
<para><emphasis role="bold">Пауза перед завантаженням основної системи</emphasis></para>
+
<para>За допомогою цього пункту ви можете встановити затримку у секундах перед
завантаженням типової операційної системи.</para>
</listitem>
+
<listitem>
<para><emphasis role="bold">Безпека</emphasis></para>
+
<para>За допомогою цього розділу ви можете встановити пароль для доступу до
завантажувача. Використання пароля означатиме, що для вибору запису для
завантаження або зміни параметрів доведеться вводити пароль. Такий пароль не
є обов'язковим. Іменем користувача буде <literal>root</literal>, а пароль
можна буде вибрати на наступному етапі.</para>
</listitem>
+
<listitem>
<para><emphasis role="bold">Пароль</emphasis></para>
+
<para>За допомогою цього поля для введення тексту ви можете вказати пароль до
завантажувача (необов'язковий).</para>
</listitem>
+
<listitem>
<para><emphasis role="bold">Пароль (ще раз)</emphasis></para>
+
<para>Повторіть введення пароля користувача у цьому полі. drakx перевірить, чи
збігається введений вами повторно пароль з його початковим варіантом.</para>
</listitem>
</itemizedlist>
+
<para><emphasis>Додатково</emphasis></para>
+
<itemizedlist>
<listitem>
<para><emphasis>Увімкнути ACPI</emphasis></para>
+
<para>ACPI (Advanced Configuration and Power Interface) є стандартом керування
живленням комп’ютера. За його допомогою комп’ютер може заощаджувати енергію,
вимикаючи пристрої, які не використовуються. Цей метод використовували до
@@ -102,70 +147,90 @@ MBR/BIOS. Користувачі систем UEFI її не побачать.</
реалізація ACPI створює проблеми у роботі комп’ютера (наприклад неочікувані
перезавантаження системи або «замерзання» системи).</para>
</listitem>
+
<listitem>
<para><emphasis>Увімкнути SMP</emphasis></para>
+
<para>За допомогою цього пункту можна увімкнути або вимкнути симетричне
використання багатьох процесорів, якщо на комп’ютері встановлено
багатоядерний процесор.</para>
</listitem>
+
<listitem>
<para><emphasis>Увімкнути APIC</emphasis></para>
+
<para>Позначення цього пункту надає операційній системі доступ до розширеного
програмованого контролера переривань (Advanced Programmable Interrupt
Controller). Пристрої з APIC надають змогу використовувати складніші моделі
із пріоритетністю процесів та керування розширеними IRQ (запитами щодо
переривань).</para>
</listitem>
+
<listitem>
<para><emphasis>Увімкнути локальний APIC</emphasis></para>
+
<para>За допомогою цього пункту ви можете увімкнути локальний APIC, тобто
керування усіма зовнішніми перериваннями для певних процесорів у
багатопроцесорних системах.</para>
</listitem>
</itemizedlist>
</section>
+
<section>
<title>Налаштування завантаження</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>
+
<itemizedlist>
<listitem>
<para><emphasis role="bold">Типовий</emphasis></para>
+
<para>Типовий варіант операційної системи для завантаження.</para>
</listitem>
+
<listitem>
<para><emphasis role="bold">Приєднати</emphasis></para>
+
<para>За допомогою цього параметра ви можете передати ядру системи якісь дані або
повідомити ядру про те, що слід надати вам більше інформації під час
завантаження системи.</para>
</listitem>
+
<listitem>
<para><emphasis role="bold">Зондування сторонньої ОС</emphasis></para>
+
<para>Якщо на комп’ютері вже встановлено інші операційні системи, Mageia спробує
додати ці системи до вашого нового меню завантаження Mageia. Якщо вам це не
потрібно, зніміть позначку з пункту <emphasis>Зондування сторонньої
ОС</emphasis>.</para>
</listitem>
</itemizedlist>
+
<para><emphasis>Додатково</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>
+
<itemizedlist>
<listitem>
<para><emphasis>Відеорежим</emphasis></para>
+
<para>За допомогою цього пункту ви можете вказати розмірності екрана (у пікселях)
та глибину кольорів для меню завантаження. Якщо ви натиснете кнопку списку
із маленьким трикутничком вістрям униз, програма покаже варіанти
розмірностей і глибини кольорів, якими можна скористатися.</para>
</listitem>
+
<listitem>
<para><emphasis>Не чіпати ESP або MBR</emphasis></para>
+
<para>Виберіть цей варіант, якщо вам не потрібна окрема завантажувана версія
Mageia, а потрібна лише система, яка використовуватиметься у ланцюговому
завантаженні з іншої операційної системи. Вас буде попереджено про те, що не
@@ -173,15 +238,19 @@ Mageia, а потрібна лише система, яка використов
якщо ви впевнені у наслідках і хочете продовжити встановлення.</para>
</listitem>
</itemizedlist>
+
<mediaobject>
-<imageobject> <imagedata fileref="live-setupBootloader5.png"
-align="center"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center"
+fileref="live-setupBootloader5.png"/> </imageobject></mediaobject>
</section>
</section>
+
<section>
<title>Інші параметри</title>
+
<section>
<title>Користування вже встановленим завантажувачем</title>
+
<para>Повний перелік кроків додавання пункту операційної системи Mageia до меню
вже встановленого завантажувача не є предметом цієї довідкової
сторінки. Втім, здебільшого, ці кроки пов’язано з запуском відповідної
@@ -189,23 +258,17 @@ align="center"/> </imageobject></mediaobject>
системи у автоматичному режимі. Відповідні пояснення має бути наведено у
документації до іншої операційної системи.</para>
</section>
+
<section>
<title>Встановлення без завантажувача</title>
+
<para>Хоча вам буде запропоновано варіант встановлення Mageia без завантажувача
(див. розділ 2.1), не рекомендуємо ним користуватися, якщо ви не впевнені у
результатах, оскільки без певного завантажувача вашу операційну систему не
можна буде запустити.</para>
</section>
- <section>
- <title>Додавання пункту меню завантаження та внесення змін у такі пункти</title>
- <para>Для цього вам доведеться внести вручну зміни до
-<filename>/boot/grub2/custom.cfg</filename> або скористатися програмою для
-налаштовування GRUB (наприклад <application>grub-customizer</application> зі
-сховищ Mageia).</para>
- <note>
- <para>Щоб дізнатися більше, ознайомтеся із відповідною сторінкою нашої вікі: <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/zh_CN.po b/docs/docs/stable/installer/zh_CN.po
index 9cf05f6c..418dde9e 100644
--- a/docs/docs/stable/installer/zh_CN.po
+++ b/docs/docs/stable/installer/zh_CN.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\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: 2017-05-21 06:29+0000\n"
"Last-Translator: zwpwjwtz <zwpwjwtz@126.com>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/MageiaLinux/mageia/"
@@ -299,7 +299,7 @@ msgstr ""
"置。<emphasis>登录名区分大小写。</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Password</emphasis>"
msgstr "<emphasis role=\"bold\">分区大小:</emphasis>"
@@ -4307,8 +4307,8 @@ msgstr ""
"选择 <guilabel>通用</guilabel> - <guilabel>强制 evdev</guilabel> 可用于配置超"
"过五键的鼠标。"
-#. 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 "添加或修改引导菜单项"
@@ -4334,24 +4334,24 @@ msgstr ""
"Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link>"
#. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:10
+#: en/setupBootloader.xml:27
#, fuzzy
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
#, fuzzy
msgid "Grub2 on Legacy MBR/GPT systems"
msgstr "GRUB2,当使用传统硬件 + MBR/GPT 格式分区时"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:17
+#: en/setupBootloader.xml:37
#, fuzzy
msgid ""
"GRUB2 (with or without graphical menu) will be used exclusively as the "
@@ -4359,7 +4359,7 @@ msgid ""
msgstr "GRUB2(包含/不包含图形界面),当使用传统硬件 + MBR/GPT格式分区时"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:21
+#: en/setupBootloader.xml:42
#, fuzzy
msgid ""
"By default, a new bootloader will be written into either the MBR (Master "
@@ -4367,25 +4367,25 @@ msgid ""
msgstr "GRUB 2 引导器安装至 MBR(主引导记录)区域或第一硬盘的 BIOS 引导分区。"
#. type: Content of: <section><section><itemizedlist><title>
-#: en/setupBootloader.xml:27
+#: en/setupBootloader.xml:49
#, fuzzy
msgid "Grub2-efi on UEFI systems"
msgstr "GRUB2-efi,当使用 UEFI 硬件时"
#. 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
#, fuzzy
msgid ""
"If there are already UEFI-based operating systems installed on your computer "
@@ -4401,18 +4401,18 @@ msgstr ""
"求。"
#. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:46
+#: en/setupBootloader.xml:72
#, fuzzy
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
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -4426,39 +4426,39 @@ msgstr ""
"\"center\"/> </imageobject>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:62
+#: en/setupBootloader.xml:91
#, fuzzy
msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
msgstr "<emphasis role=\"bold\">分区大小:</emphasis>"
#. 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
#, fuzzy
msgid "<emphasis role=\"bold\">Boot device</emphasis>"
msgstr "<emphasis role=\"bold\">分区大小:</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:68
+#: en/setupBootloader.xml:100
#, fuzzy
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
#, fuzzy
msgid ""
"<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
msgstr "<emphasis role=\"bold\">分区大小:</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:74
+#: en/setupBootloader.xml:108
#, fuzzy
msgid ""
"This text box lets you set a delay, in seconds, before the default operating "
@@ -4468,13 +4468,13 @@ msgstr ""
"入默认选定的操作系统。"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:78
+#: en/setupBootloader.xml:113
#, fuzzy
msgid "<emphasis role=\"bold\">Security</emphasis>"
msgstr "<emphasis role=\"bold\">分区大小:</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:79
+#: en/setupBootloader.xml:115
#, fuzzy
msgid ""
"This allows you to set a password for the bootloader. This means a username "
@@ -4487,19 +4487,19 @@ msgstr ""
"式,或者修改引导参数。"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:88
+#: en/setupBootloader.xml:126
#, fuzzy
msgid "Choose a password for the bootloader (optional)"
msgstr "<guilabel>密码</guilabel>:此文本框用于输入密码"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:91
+#: en/setupBootloader.xml:130
#, fuzzy
msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
msgstr "<emphasis role=\"bold\">分区大小:</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:92
+#: en/setupBootloader.xml:132
#, fuzzy
msgid ""
"Retype the password and DrakX will check that it matches with the one set "
@@ -4509,19 +4509,19 @@ msgstr ""
"否一致。"
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:96 en/setupBootloader.xml:154
+#: en/setupBootloader.xml:137 en/setupBootloader.xml:212
#, fuzzy
msgid "<emphasis>Advanced</emphasis>"
msgstr "<emphasis role=\"bold\">分区大小:</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:99
+#: en/setupBootloader.xml:141
#, fuzzy
msgid "<emphasis>Enable ACPI</emphasis>"
msgstr "<emphasis>通用</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:100
+#: en/setupBootloader.xml:143
#, fuzzy
msgid ""
"ACPI (Advanced Configuration and Power Interface) is a standard for power "
@@ -4535,13 +4535,13 @@ msgstr ""
"偶尔会自动重启,或系统卡死),则可以取消勾选它。"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:108
+#: en/setupBootloader.xml:152
#, fuzzy
msgid "<emphasis>Enable SMP</emphasis>"
msgstr "<emphasis>通用</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:109
+#: en/setupBootloader.xml:154
#, fuzzy
msgid ""
"This option enables/disables symmetric multiprocessing for multi-core "
@@ -4551,13 +4551,13 @@ msgstr ""
"性。"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:113
+#: en/setupBootloader.xml:159
#, fuzzy
msgid "<emphasis>Enable APIC</emphasis>"
msgstr "<emphasis>通用</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:114
+#: en/setupBootloader.xml:161
#, fuzzy
msgid ""
"Enabling this gives the operating system access to the Advanced Programmable "
@@ -4568,13 +4568,13 @@ msgstr ""
"支持更复杂的优先级模型和高级 IRQ(中断请求)管理功能。"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:168
#, fuzzy
msgid "<emphasis>Enable Local APIC</emphasis>"
msgstr "<emphasis>通用</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:121
+#: en/setupBootloader.xml:170
#, fuzzy
msgid ""
"Here you can set Local APIC, which manages all external interrupts for a "
@@ -4584,13 +4584,13 @@ msgstr ""
"统中管理某个特定处理器的所有外部中断。"
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:127
+#: en/setupBootloader.xml:177
#, fuzzy
msgid "Bootloader Configuration"
msgstr "声音配置"
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:129
+#: en/setupBootloader.xml:180
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -4604,40 +4604,40 @@ msgstr ""
"\"center\"/> </imageobject>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:139
+#: en/setupBootloader.xml:191
#, fuzzy
msgid "<emphasis role=\"bold\">Default</emphasis>"
msgstr "<emphasis role=\"bold\">分区大小:</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:140
+#: en/setupBootloader.xml:193
#, fuzzy
-msgid "The operating system to started up by default"
+msgid "The operating system to be started up by default."
msgstr "<guilabel>默认</guilabel>:使用默认引导参数"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:143
+#: en/setupBootloader.xml:197
#, fuzzy
msgid "<emphasis role=\"bold\">Append</emphasis>"
msgstr "<emphasis role=\"bold\">分区大小:</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:144
+#: en/setupBootloader.xml:199
#, fuzzy
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 ""
"<guilabel>追加</guilabel> :用于在默认引导选项后添加额外所需的内核参数。"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:148
+#: en/setupBootloader.xml:204
#, fuzzy
msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
msgstr "<emphasis role=\"bold\">分区大小:</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:149
+#: en/setupBootloader.xml:206
#, fuzzy
msgid ""
"If you already have other operating systems installed, Mageia attempts to "
@@ -4649,7 +4649,7 @@ msgstr ""
"<guilabel>检测其他操作系统</guilabel>"
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:156
+#: en/setupBootloader.xml:215
#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -4663,13 +4663,13 @@ msgstr ""
"\"center\"/> </imageobject>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:166
+#: en/setupBootloader.xml:226
#, fuzzy
msgid "<emphasis>Video mode</emphasis>"
msgstr "<emphasis>供应商</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:167
+#: en/setupBootloader.xml:228
#, fuzzy
msgid ""
"This sets the screen size and colour depth to be used by the boot menu. If "
@@ -4680,13 +4680,13 @@ msgstr ""
"若要从可用的模式中进行选择,请点击下三角标记。"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:172
+#: en/setupBootloader.xml:234
#, fuzzy
msgid "<emphasis>Do not touch ESP or MBR</emphasis>"
msgstr "<emphasis>供应商</emphasis>"
#. 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 "
@@ -4695,28 +4695,26 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:181
+#: en/setupBootloader.xml:245
#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align=\"center"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png"
"\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
-"imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:188
+#: en/setupBootloader.xml:253
#, fuzzy
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
#, fuzzy
msgid ""
"The exact procedure for adding Mageia to an existing bootloader is beyond "
@@ -4730,13 +4728,13 @@ msgstr ""
"以便进一步操作。"
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:199
+#: en/setupBootloader.xml:267
#, fuzzy
msgid "Installing Without a Bootloader"
msgstr "使用 Mageia 提供的引导器"
#. 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 "
@@ -4744,27 +4742,6 @@ msgid ""
"unable to start."
msgstr ""
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:207
-#, fuzzy
-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 ""
-"为此,您需要手动编辑 /boot/grub2/custom.cfg,或者使用 grub-customizer(可以"
-"从 Mageia 仓库中安装)来编辑引导项。"
-
-#. type: Content of: <section><section><section><note><para>
-#: en/setupBootloader.xml:212
-#, fuzzy
-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 ""
-"有关更多信息,请参考我们的 wiki:<link ns2:href=\"https://wiki.mageia.org/en/"
-"Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link>"
-
#. type: Content of: <section><info><title>
#: en/setupSCSI.xml:10
msgid "Setup SCSI"
@@ -5155,6 +5132,33 @@ msgstr ""
#, fuzzy
#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align="
+#~ "\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ 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 ""
+#~ "为此,您需要手动编辑 /boot/grub2/custom.cfg,或者使用 grub-customizer(可"
+#~ "以从 Mageia 仓库中安装)来编辑引导项。"
+
+#, fuzzy
+#~ 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 ""
+#~ "有关更多信息,请参考我们的 wiki:<link ns2:href=\"https://wiki.mageia.org/"
+#~ "en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-"
+#~ "efi_and_Mageia</link>"
+
+#, fuzzy
+#~ msgid ""
#~ "<imageobject> <imagedata fileref=\"live-bootCSM.png\" align=\"center\"/> "
#~ "</imageobject>"
#~ msgstr ""
diff --git a/docs/docs/stable/installer/zh_CN/setupBootloader.xml b/docs/docs/stable/installer/zh_CN/setupBootloader.xml
index 1ac4b307..b6bb79a5 100644
--- a/docs/docs/stable/installer/zh_CN/setupBootloader.xml
+++ b/docs/docs/stable/installer/zh_CN/setupBootloader.xml
@@ -1,10 +1,27 @@
-<?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:lang="zh_CN" xml:id="setupBootloader">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="zh_CN" 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">
+
+
+
+
+
+
+
+
+
+
<info>
<!--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-->
@@ -13,29 +30,39 @@ Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
<!--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.-->
<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 no ESP exists, then one will
@@ -44,155 +71,191 @@ required, whatever the number of operating systems you have.</para>
</listitem>
</itemizedlist>
</section>
+
<section>
<info>
<title xml:id="setupBootloader-ti2">Bootloader Setup</title>
</info>
+
<section>
<title>引导程序的主要选项</title>
+
<mediaobject>
<imageobject condition="classical"> <imagedata align="center"
fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
condition="live"> <imagedata fileref="live-setupBootloader.png"
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 most people are not likely
to have a need for it. The username is <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 computer does not support ACPI or if
you think the ACPI 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>
+
<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>
+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>
+
<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 are sure you understand the
implications, and wish to proceed.</para>
</listitem>
</itemizedlist>
+
<mediaobject>
-<imageobject> <imagedata fileref="live-setupBootloader5.png"
-align="center"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center"
+fileref="live-setupBootloader5.png"/> </imageobject></mediaobject>
</section>
</section>
+
<section>
<title>Other Options</title>
+
<section>
<title>使用现存的引导器</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 should detect
Mageia and automatically add an entry for it in the 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>添加或修改引导菜单项</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/zh_TW.po b/docs/docs/stable/installer/zh_TW.po
index 7f9af618..390ca9db 100644
--- a/docs/docs/stable/installer/zh_TW.po
+++ b/docs/docs/stable/installer/zh_TW.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\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: 2018-12-12 02:14+0000\n"
"Last-Translator: You-Cheng Hsieh <yochenhsieh@gmail.com>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/MageiaLinux/mageia/"
@@ -233,7 +233,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 ""
@@ -3547,8 +3547,8 @@ msgid ""
"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 ""
@@ -3568,54 +3568,54 @@ msgid ""
msgstr ""
#. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:10
+#: en/setupBootloader.xml:27
#, fuzzy
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 "
@@ -3625,18 +3625,18 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:46
+#: en/setupBootloader.xml:72
#, fuzzy
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 condition=\"live"
@@ -3645,47 +3645,47 @@ 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 "
@@ -3695,34 +3695,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 "
@@ -3732,24 +3732,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 "
@@ -3757,25 +3757,25 @@ 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
#, fuzzy
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 condition=\"live"
@@ -3784,34 +3784,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, "
@@ -3819,7 +3819,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 condition=\"live"
@@ -3828,12 +3828,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 "
@@ -3841,12 +3841,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 "
@@ -3855,25 +3855,25 @@ 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> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png"
"\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:188
+#: en/setupBootloader.xml:253
#, fuzzy
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 "
@@ -3883,12 +3883,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 "
@@ -3896,21 +3896,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"
diff --git a/docs/docs/stable/installer/zh_TW/setupBootloader.xml b/docs/docs/stable/installer/zh_TW/setupBootloader.xml
index d6723dee..2ba88667 100644
--- a/docs/docs/stable/installer/zh_TW/setupBootloader.xml
+++ b/docs/docs/stable/installer/zh_TW/setupBootloader.xml
@@ -1,10 +1,27 @@
-<?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:lang="zh_TW" xml:id="setupBootloader">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="zh_TW" 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">
+
+
+
+
+
+
+
+
+
+
<info>
<!--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-->
@@ -13,29 +30,39 @@ Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
<!--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.-->
<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 no ESP exists, then one will
@@ -44,155 +71,191 @@ required, whatever the number of operating systems you have.</para>
</listitem>
</itemizedlist>
</section>
+
<section>
<info>
<title xml:id="setupBootloader-ti2">Bootloader Setup</title>
</info>
+
<section>
<title>開機載入程式主要選項</title>
+
<mediaobject>
<imageobject condition="classical"> <imagedata align="center"
fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
condition="live"> <imagedata fileref="live-setupBootloader.png"
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 most people are not likely
to have a need for it. The username is <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 computer does not support ACPI or if
you think the ACPI 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>
+
<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>
+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>
+
<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 are sure you understand the
implications, and wish to proceed.</para>
</listitem>
</itemizedlist>
+
<mediaobject>
-<imageobject> <imagedata fileref="live-setupBootloader5.png"
-align="center"/> </imageobject></mediaobject>
+<imageobject> <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 should detect
Mageia and automatically add an entry for it in the 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>