diff options
Diffstat (limited to 'docs/installer')
| -rw-r--r-- | docs/installer/en/setupBootloader.xml | 34 | ||||
| -rw-r--r-- | docs/installer/help.pot | 45 |
2 files changed, 41 insertions, 38 deletions
diff --git a/docs/installer/en/setupBootloader.xml b/docs/installer/en/setupBootloader.xml index edfe1115..c52a88a9 100644 --- a/docs/installer/en/setupBootloader.xml +++ b/docs/installer/en/setupBootloader.xml @@ -26,18 +26,18 @@ Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC--> </itemizedlist> <tip> - <para>The Mageia graphical menus are nice :</para> + <para>The Mageia graphical menus are nice :)</para> </tip> <section> <title>Grub2 on Legacy/MBR and Legacy/GPT systems</title> <mediaobject> - <imageobject condition="classical"> + <imageobject condition="classical"> <imagedata fileref="dx2-setupBootloader.png" align="center"/> </imageobject> - - <imageobject condition="live"> + + <imageobject condition="live"> <imagedata xml:id="setupBootloader-im1" fileref="live-setupBootloader.png"/> </imageobject> </mediaobject> @@ -53,11 +53,11 @@ Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC--> you cannot choose between with or without graphical menu</para> <mediaobject> - <imageobject condition="classical"> + <imageobject condition="classical"> <imagedata fileref="dx2-setupBootloader2.png" align="center"/> </imageobject> - - <imageobject condition="live"> + + <imageobject condition="live"> <imagedata fileref="live-setupBootloader2.png"/> </imageobject> </mediaobject> @@ -97,11 +97,11 @@ Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC--> <guilabel>Probe Foreign OS</guilabel></para> <mediaobject> - <imageobject condition="classical"> - <imagedata fileref="dx2-setupBootloader3.png" align="center"/> + <imageobject condition="classical"> + <imagedata align="center" fileref="dx2-setupBootloader3.png"/> </imageobject> - - <imageobject condition="live"> + + <imageobject condition="live"> <imagedata fileref="live-setupBootloader3.png" align="center"/> </imageobject> </mediaobject> @@ -126,10 +126,10 @@ Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC--> ESP or MBR</guilabel>.</para> <mediaobject> - <imageobject condition="classical"> + <imageobject condition="classical"> <imagedata fileref="dx2-setupBootloader4.png" align="center"/> </imageobject> - + <imageobject condition="live"> <imagedata fileref="live-setupBootloader4.png" align="center"/> </imageobject> @@ -140,7 +140,7 @@ Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC--> <mediaobject> <imageobject> - <imagedata fileref="dx2-setupBootloader5.png"/> + <imagedata fileref="live-setupBootloader5.png"/> </imageobject> </mediaobject> </section> @@ -160,8 +160,10 @@ Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC--> <listitem> <para><guilabel>Security</guilabel>: This allows you to set a - password for the bootloader. This means other people can not enter - single user mode or change settings at the boot time.</para> + password for the bootloader. This means a username and password + will be asked at the boot time to select a booting entry or change + settings. The username is "root" and the password is the one + chosen here after.</para> </listitem> <listitem> diff --git a/docs/installer/help.pot b/docs/installer/help.pot index 28a3a173..8e136f25 100644 --- a/docs/installer/help.pot +++ b/docs/installer/help.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Mageia Installer Help 3.0\n" "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n" -"POT-Creation-Date: 2017-05-09 21:33+0300\n" +"POT-Creation-Date: 2017-05-23 19:45+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -3423,7 +3423,7 @@ msgstr "" #. type: Content of: <section><section><tip><para> #: en/setupBootloader.xml:29 -msgid "The Mageia graphical menus are nice :" +msgid "The Mageia graphical menus are nice :)" msgstr "" #. type: Content of: <section><section><section><title> @@ -3512,10 +3512,10 @@ msgstr "" #. type: Content of: <section><section><mediaobject> #: en/setupBootloader.xml:100 msgid "" -"<imageobject condition=\"classical\"> <imagedata " -"fileref=\"dx2-setupBootloader3.png\" align=\"center\"/> </imageobject> " -"<imageobject condition=\"live\"> <imagedata " -"fileref=\"live-setupBootloader3.png\" align=\"center\"/> </imageobject>" +"<imageobject condition=\"classical\"> <imagedata align=\"center\" " +"fileref=\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject " +"condition=\"live\"> <imagedata fileref=\"live-setupBootloader3.png\" " +"align=\"center\"/> </imageobject>" msgstr "" #. type: Content of: <section><section><title> @@ -3566,7 +3566,7 @@ msgstr "" #. type: Content of: <section><section><mediaobject> #: en/setupBootloader.xml:142 msgid "" -"<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> " +"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> " "</imageobject>" msgstr "" @@ -3592,31 +3592,32 @@ msgstr "" #: en/setupBootloader.xml:162 msgid "" "<guilabel>Security</guilabel>: This allows you to set a password for the " -"bootloader. This means other people can not enter single user mode or change " -"settings at the boot time." +"bootloader. This means a username and password will be asked at the boot " +"time to select a booting entry or change settings. The username is \"root\" " +"and the password is the one chosen here after." msgstr "" #. type: Content of: <section><section><section><para><itemizedlist><listitem><para> -#: en/setupBootloader.xml:168 +#: en/setupBootloader.xml:170 msgid "" "<guilabel>Password</guilabel>: This text box is where you actually put the " "password" msgstr "" #. type: Content of: <section><section><section><para><itemizedlist><listitem><para> -#: en/setupBootloader.xml:173 +#: en/setupBootloader.xml:175 msgid "" "<guilabel>Password (again)</guilabel>: Retype the password and Drakx will " "check that it matches with the one set above." msgstr "" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/setupBootloader.xml:179 en/setupBootloader.xml:237 +#: en/setupBootloader.xml:181 en/setupBootloader.xml:239 msgid "<guilabel>Advanced</guilabel>" msgstr "" #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para> -#: en/setupBootloader.xml:183 +#: en/setupBootloader.xml:185 msgid "" "<guilabel>Enable ACPI:</guilabel> ACPI (Advanced Configuration and Power " "Interface) is a standard for the power management. It can save energy by " @@ -3627,14 +3628,14 @@ msgid "" msgstr "" #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para> -#: en/setupBootloader.xml:193 +#: en/setupBootloader.xml:195 msgid "" "<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric " "multiprocessing for multi core processors." msgstr "" #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para> -#: en/setupBootloader.xml:199 +#: en/setupBootloader.xml:201 msgid "" "<guilabel>Enable APIC</guilabel>: Enabling or disabling this gives the " "operating system access to the Advanced Programmable Interrupt " @@ -3643,38 +3644,38 @@ msgid "" msgstr "" #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para> -#: en/setupBootloader.xml:207 +#: en/setupBootloader.xml:209 msgid "" "<guilabel>Enable Local APIC</guilabel>: 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:217 +#: en/setupBootloader.xml:219 msgid "Next page" msgstr "" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/setupBootloader.xml:221 +#: en/setupBootloader.xml:223 msgid "<guilabel>Default:</guilabel> Operating system started up by default" msgstr "" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/setupBootloader.xml:226 +#: en/setupBootloader.xml:228 msgid "" "<guilabel>Append:</guilabel> This option lets you pass the kernel " "information or tell the kernel to give you more information as it boots." msgstr "" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/setupBootloader.xml:232 +#: en/setupBootloader.xml:234 msgid "" "<guilabel>Probe foreign OS</guilabel>: see above <link " "linkend=\"setupMageiaBootloader\">Using a Mageia bootloader</link>" msgstr "" #. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para> -#: en/setupBootloader.xml:239 +#: en/setupBootloader.xml:241 msgid "" "<guilabel>Video mode:</guilabel> This sets the screen size and colour depth " "the boot menu will use. If you click the down triangle you will be offered " @@ -3682,7 +3683,7 @@ msgid "" msgstr "" #. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para> -#: en/setupBootloader.xml:246 +#: en/setupBootloader.xml:248 msgid "" "<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link " "linkend=\"setupChainLoading\">Using the chain loading</link>" |