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