From 66e1291af57f4ce33c149bc8419ea38417ee03c8 Mon Sep 17 00:00:00 2001 From: Yuri Chornoivan Date: Sun, 17 Jul 2016 11:22:52 +0300 Subject: Update en XML files from Calenco --- docs/installer/en/bootLive.xml | 143 +++----------------- docs/installer/en/login.xml | 25 +--- docs/installer/en/setupBootloader.xml | 28 ++-- docs/installer/en/setupBootloaderAddEntry.xml | 11 +- docs/installer/en/unused.xml | 2 +- docs/installer/help.pot | 181 +++++++++++++------------- 6 files changed, 139 insertions(+), 251 deletions(-) (limited to 'docs/installer') diff --git a/docs/installer/en/bootLive.xml b/docs/installer/en/bootLive.xml index 7b33a109..bd74d9b9 100644 --- a/docs/installer/en/bootLive.xml +++ b/docs/installer/en/bootLive.xml @@ -1,142 +1,33 @@ -
- - Boot Mageia as Live system - - -
- - Booting the medium - - -
- - From a disc - - - You can boot directly from the media you used to burn your image +
Boot Mageia as Live system
Booting the medium
From a discYou can boot directly from the media you used to burn your image (CD-ROM, DVD-ROM...). You usually just need to insert it in your CD/DVD drive for the bootloader to launch the installation automatically after rebooting the computer. If that does not happen you may need to reconfigure your BIOS or press one key that will offer you to choose the - peripheral from which the computer will boot. - - According to which hardware you have, and how it is configured, - you get either one or another of the two screens below. -
- -
- - From a USB device - - - You can boot from the USB device on which you dumped your image + peripheral from which the computer will boot.According to which hardware you have, and how it is configured, + you get either one or another of the two screens below.
From a USB deviceYou can boot from the USB device on which you dumped your image ISO. According to your BIOS settings, the computer boots perhaps directly on the USB device already plugged in a port. If that does not happen you may need to reconfigure your BIOS or press one key that will offer you to choose the peripheral from which the computer will - boot. -
-
- -
- - In BIOS/CSM/Legacy mode - - - - - - - - - First screen while booting in BIOS mode - - - - In the middle menu, you have the choice between three - actions: - - - - Boot Mageia: That means Mageia 5 will start from the connected + boot.
In BIOS/CSM/Legacy modeFirst screen while booting in BIOS modeIn the middle menu, you have the choice between three + actions:Boot Mageia: That means Mageia 5 will start from the connected media (CD/DVD or USB stick) without writing anything on the disk, so expect a very slow system. Once the boot is done, you can proceed to - the installation on a hard disk. - - - - Install Mageia: This choice will directly install Mageia on a - hard disk. - - - - Boot from hard disk: This choice allows to boot from hard disk, + the installation on a hard disk.Install Mageia: This choice will directly install Mageia on a + hard disk.Boot from hard disk: This choice allows to boot from hard disk, as usual, when no media (CD/DVD or USB stick) is connected. (not - working with Mageia 5). - - - - In the bottom menu, are the Boot Options: - - - - F1 - Help. Explain the options "splash", "apm", "acpi" and - "Ide" - - - - F2 - Language. Choose the display language of the - screens. - - - - F3 - Screen resolution. Choose between text, 640x400, 800x600, - 1024x728 - - - - F4 - CD-Rom. CD-Rom or Other. Normally, the installation is + working with Mageia 5).In the bottom menu, are the Boot Options:F1 - Help. Explain the options "splash", "apm", "acpi" and + "Ide"F2 - Language. Choose the display language of the + screens.F3 - Screen resolution. Choose between text, 640x400, 800x600, + 1024x728F4 - CD-Rom. CD-Rom or Other. Normally, the installation is performed from the inserted installation medium. Here, select other sources, like FTP or NFS servers. If the installation is carried out in a network with an SLP server, select one of the installation - sources available on the server with this option. - - - - F5 - Driver. Yes or No. The system is aware about the presence + sources available on the server with this option.F5 - Driver. Yes or No. The system is aware about the presence of an optional disk with a driver update and will require its - insertion during installation process. - - - - F6 - Kernel options. This is a way to specify options according - to your hardware and the drivers to use. - - -
- -
- - In UEFI mode - - - - - - - - - First screen while booting on UEFI system from disk - - - - You have only the choice to run Mageia in Live mode (first choice) - or to process the installation (second choice). - If you booted from a USB stick, you get two supplemental lines which + insertion during installation process.F6 - Kernel options. This is a way to specify options according + to your hardware and the drivers to use.
In UEFI modeFirst screen while booting on UEFI system from diskYou have only the choice to run Mageia in Live mode (first choice) + or to process the installation (second choice).If you booted from a USB stick, you get two supplemental lines which are a duplicata of the previous lines suffixed with "USB". You have to - choose them. - - In each case, the first steps will be the same to choose language, - timezone and keyboard, then the processes differ, with additional steps in Live mode. -
-
\ No newline at end of file + choose them.In each case, the first steps will be the same to choose language, + timezone and keyboard, then the processes differ, with additional steps in Live mode.
\ No newline at end of file diff --git a/docs/installer/en/login.xml b/docs/installer/en/login.xml index 14e5f130..235706ea 100644 --- a/docs/installer/en/login.xml +++ b/docs/installer/en/login.xml @@ -1,23 +1,4 @@ -
- - Login screen - - - - - - - - - KDM login screen - - - - Finally, you will come to the login screen. - - Enter your user name and user password, and in a few seconds you will +
Login screenKDM login screenFinally, you will come to the login screen.Enter your user name and user password, and in a few seconds you will find yourself with a loaded KDE or GNOME desktop, depending on which live - medium you used. You can now start using your Mageia installation. - - You can find another part of our documentation in the Mageia wiki. -
\ No newline at end of file + medium you used. You can now start using your Mageia installation.You can find another part of our documentation in the Mageia + wiki.
\ No newline at end of file diff --git a/docs/installer/en/setupBootloader.xml b/docs/installer/en/setupBootloader.xml index a2b8fe03..938d2618 100644 --- a/docs/installer/en/setupBootloader.xml +++ b/docs/installer/en/setupBootloader.xml @@ -8,8 +8,11 @@ - - + + + + + @@ -35,7 +38,7 @@ bootloader - By default, Mageia + By default, Mageia writes a new GRUB (legacy) bootloader into the MBR (Master Boot Record) of your first hard drive. If you already have other operating systems installed, Mageia attempts to add them to your new Mageia boot @@ -45,7 +48,7 @@ bootloader in addition to GRUB legacy and Lilo. - Linux systems which + Linux systems which use the GRUB2 bootloader are not currently supported by GRUB (legacy) and will not be recognized if the default GRUB bootloader is used. @@ -58,17 +61,17 @@
- Using an + <title xml:id="usingExistingBootloader-ti4" revision="2">Using an existing bootloader - If you decide to use an + If you decide to use an existing bootloader then you will need to remember to STOP at the summary page during the installation and click the Bootloader Configure button, which will allow you to change the bootloader install location. - Do not select a device + Do not select a device e.g."sda", or you will overwrite your existing MBR. You must select the root partition that you chose during the partitioning phase earlier, e.g. sda7. @@ -83,7 +86,7 @@ to the installer screen. - The exact procedure for + The exact procedure for adding your Mageia system to an existing bootloader is beyond the scope of this help, however in most cases it will involve running the relevant bootloader installation program which should detect and add it @@ -93,11 +96,11 @@
- Bootloader + <title xml:id="advancedOptionBootloader-ti5" revision="2">Bootloader advanced option - If you have very + If you have very limited disk space for the / partition that contains /tmp, click on Advanced and check the box for Clean /tmp at each boot. This @@ -112,9 +115,12 @@ cannot choose the boot loader since only Grub2-efi is available. - + + + + If Mageia is the first system installed on your computer, the diff --git a/docs/installer/en/setupBootloaderAddEntry.xml b/docs/installer/en/setupBootloaderAddEntry.xml index 43a03fa3..0096b862 100644 --- a/docs/installer/en/setupBootloaderAddEntry.xml +++ b/docs/installer/en/setupBootloaderAddEntry.xml @@ -1,4 +1,4 @@ -
+
@@ -7,8 +7,11 @@ - - + + + + + @@ -28,7 +31,7 @@ - + diff --git a/docs/installer/en/unused.xml b/docs/installer/en/unused.xml index ff18bf00..51fb643a 100644 --- a/docs/installer/en/unused.xml +++ b/docs/installer/en/unused.xml @@ -23,7 +23,7 @@ - + diff --git a/docs/installer/help.pot b/docs/installer/help.pot index a55291c7..8b1943ec 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: 2016-02-10 16:29+0200\n" +"POT-Creation-Date: 2016-07-17 11:22+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -452,22 +452,22 @@ msgid "In advanced tab, you will find more options about clock settings." msgstr "" #. type: Content of:
-#: en/bootLive.xml:3 +#: en/bootLive.xml:1 msgid "Boot Mageia as Live system" msgstr "" #. type: Content of: <section><section><info><title> -#: en/bootLive.xml:8 +#: en/bootLive.xml:1 msgid "Booting the medium" msgstr "" #. type: Content of: <section><section><section><info><title> -#: en/bootLive.xml:13 +#: en/bootLive.xml:1 msgid "From a disc" msgstr "" #. type: Content of: <section><section><section><para> -#: en/bootLive.xml:16 +#: en/bootLive.xml:1 msgid "" "You can boot directly from the media you used to burn your image (CD-ROM, " "DVD-ROM...). You usually just need to insert it in your CD/DVD drive for the " @@ -478,19 +478,19 @@ msgid "" msgstr "" #. type: Content of: <section><section><section><para> -#: en/bootLive.xml:23 +#: en/bootLive.xml:6 msgid "" "According to which hardware you have, and how it is configured, you get " "either one or another of the two screens below." msgstr "" #. type: Content of: <section><section><section><info><title> -#: en/bootLive.xml:29 +#: en/bootLive.xml:7 msgid "From a USB device" msgstr "" #. type: Content of: <section><section><section><para> -#: en/bootLive.xml:32 +#: en/bootLive.xml:7 msgid "" "You can boot from the USB device on which you dumped your image " "ISO. According to your BIOS settings, the computer boots perhaps directly on " @@ -500,27 +500,27 @@ msgid "" msgstr "" #. type: Content of: <section><section><info><title> -#: en/bootLive.xml:43 +#: en/bootLive.xml:12 msgid "In BIOS/CSM/Legacy mode" msgstr "" #. type: Content of: <section><section><mediaobject> -#: en/bootLive.xml:47 -msgid "<imageobject> <imagedata fileref=\"live-bootCSM.png\"/> </imageobject>" +#: en/bootLive.xml:12 +msgid "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>" msgstr "" #. type: Content of: <section><section><mediaobject><caption><para> -#: en/bootLive.xml:52 +#: en/bootLive.xml:12 msgid "First screen while booting in BIOS mode" msgstr "" #. type: Content of: <section><section><para> -#: en/bootLive.xml:56 +#: en/bootLive.xml:12 msgid "In the middle menu, you have the choice between three actions:" msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/bootLive.xml:61 +#: en/bootLive.xml:13 msgid "" "Boot Mageia: That means Mageia 5 will start from the connected media (CD/DVD " "or USB stick) without writing anything on the disk, so expect a very slow " @@ -529,12 +529,12 @@ msgid "" msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/bootLive.xml:68 +#: en/bootLive.xml:16 msgid "Install Mageia: This choice will directly install Mageia on a hard disk." msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/bootLive.xml:73 +#: en/bootLive.xml:17 msgid "" "Boot from hard disk: This choice allows to boot from hard disk, as usual, " "when no media (CD/DVD or USB stick) is connected. (not working with Mageia " @@ -542,27 +542,27 @@ msgid "" msgstr "" #. type: Content of: <section><section><para> -#: en/bootLive.xml:79 +#: en/bootLive.xml:19 msgid "In the bottom menu, are the Boot Options:" msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/bootLive.xml:83 +#: en/bootLive.xml:19 msgid "F1 - Help. Explain the options \"splash\", \"apm\", \"acpi\" and \"Ide\"" msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/bootLive.xml:88 +#: en/bootLive.xml:20 msgid "F2 - Language. Choose the display language of the screens." msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/bootLive.xml:93 +#: en/bootLive.xml:21 msgid "F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728" msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/bootLive.xml:98 +#: en/bootLive.xml:22 msgid "" "F4 - CD-Rom. CD-Rom or Other. Normally, the installation is performed from " "the inserted installation medium. Here, select other sources, like FTP or " @@ -572,7 +572,7 @@ msgid "" msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/bootLive.xml:106 +#: en/bootLive.xml:26 msgid "" "F5 - Driver. Yes or No. The system is aware about the presence of an " "optional disk with a driver update and will require its insertion during " @@ -580,39 +580,38 @@ msgid "" msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/bootLive.xml:112 +#: en/bootLive.xml:28 msgid "" "F6 - Kernel options. This is a way to specify options according to your " "hardware and the drivers to use." msgstr "" #. type: Content of: <section><section><info><title> -#: en/bootLive.xml:120 +#: en/bootLive.xml:29 msgid "In UEFI mode" msgstr "" #. type: Content of: <section><section><mediaobject> -#: en/bootLive.xml:124 +#: en/bootLive.xml:29 msgid "" -"<imageobject> <imagedata revision=\"1\" align=\"center\" " -"fileref=\"live-bootUEFI.png\" format=\"PNG\" xml:id=\"bootUEFI-im1\"/> " -"</imageobject>" +"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" " +"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>" msgstr "" #. type: Content of: <section><section><mediaobject><caption><para> -#: en/bootLive.xml:129 +#: en/bootLive.xml:29 msgid "First screen while booting on UEFI system from disk" msgstr "" #. type: Content of: <section><section><para> -#: en/bootLive.xml:133 +#: en/bootLive.xml:29 msgid "" "You have only the choice to run Mageia in Live mode (first choice) or to " "process the installation (second choice)." msgstr "" #. type: Content of: <section><section><para> -#: en/bootLive.xml:135 +#: en/bootLive.xml:30 msgid "" "If you booted from a USB stick, you get two supplemental lines which are a " "duplicata of the previous lines suffixed with \"USB\". You have to choose " @@ -620,7 +619,7 @@ msgid "" msgstr "" #. type: Content of: <section><section><para> -#: en/bootLive.xml:139 +#: en/bootLive.xml:32 msgid "" "In each case, the first steps will be the same to choose language, timezone " "and keyboard, then the processes differ, with <link " @@ -1973,30 +1972,29 @@ msgid "Then press <guibutton>Next</guibutton> to continue" msgstr "" #. type: Content of: <section><info><title> -#: en/login.xml:3 +#: en/login.xml:1 msgid "Login screen" msgstr "" #. type: Content of: <section><mediaobject> -#: en/login.xml:7 +#: en/login.xml:1 msgid "" -"<imageobject> <imagedata revision=\"1\" align=\"center\" " -"xml:id=\"login-im1\" format=\"PNG\" fileref=\"live-login.png\"/> " -"</imageobject>" +"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" " +"fileref=\"live-login.png\" align=\"center\" revision=\"1\"/></imageobject>" msgstr "" #. type: Content of: <section><mediaobject><caption><para> -#: en/login.xml:12 +#: en/login.xml:1 msgid "KDM login screen" msgstr "" #. type: Content of: <section><para> -#: en/login.xml:16 +#: en/login.xml:1 msgid "Finally, you will come to the login screen." msgstr "" #. type: Content of: <section><para> -#: en/login.xml:18 +#: en/login.xml:1 msgid "" "Enter your user name and user password, and in a few seconds you will find " "yourself with a loaded KDE or GNOME desktop, depending on which live medium " @@ -2004,11 +2002,11 @@ msgid "" msgstr "" #. type: Content of: <section><para> -#: en/login.xml:22 +#: en/login.xml:3 msgid "" "You can find another part of our documentation in <link " -"linkend=\"https://wiki.mageia.org/en/Category:Documentation\">the Mageia " -"wiki</link>." +"xmlns:ns0=\"http://www.w3.org/1999/xlink\" ns0:href=\"../../installer/\">the " +"Mageia wiki</link>." msgstr "" #. type: Content of: <section><info><title> @@ -3369,18 +3367,22 @@ msgstr "" #. type: Content of: <section><mediaobject> #: en/setupBootloaderAddEntry.xml:10 msgid "" -"<imageobject> <imagedata revision=\"1\" " -"fileref=\"dx2-bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" " -"xml:id=\"bootloaderConfiguration-im1\"/> </imageobject>" +"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" " +"xml:id=\"bootloaderConfiguration-im1\" " +"fileref=\"dx2-bootloaderConfiguration.png\" align=\"center\" " +"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata " +"format=\"PNG\" xml:id=\"bootloaderConfiguration-im1\" " +"fileref=\"live-bootloaderConfiguration.png\" align=\"center\" " +"revision=\"1\"/> </imageobject>" msgstr "" #. type: Content of: <section><section><title> -#: en/setupBootloaderAddEntry.xml:16 en/setupBootloader.xml:17 +#: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20 msgid "With a Bios system" msgstr "" #. type: Content of: <section><section><para> -#: en/setupBootloaderAddEntry.xml:18 +#: en/setupBootloaderAddEntry.xml:21 msgid "" "You can add an entry or modify the one you select first, by pressing the " "relevant button in the <emphasis>Bootloader Configuration</emphasis> screen " @@ -3388,7 +3390,7 @@ msgid "" msgstr "" #. type: Content of: <section><section><note><para> -#: en/setupBootloaderAddEntry.xml:23 +#: en/setupBootloaderAddEntry.xml:26 msgid "" "If you have chosen <code>Grub 2</code> as your bootloader, you cannot use " "this tool to edit entries at this step, press 'Next'. You need to manually " @@ -3397,46 +3399,46 @@ msgid "" msgstr "" #. type: Content of: <section><section><mediaobject> -#: en/setupBootloaderAddEntry.xml:30 +#: en/setupBootloaderAddEntry.xml:33 msgid "" -"<imageobject> <imagedata revision=\"1\" " -"xml:id=\"setupBootloaderAddEntry-im1\" align=\"center\" format=\"PNG\" " -"fileref=\"dx2-setupBootloaderAddEntry.png\"/> </imageobject>" +"<imageobject> <imagedata format=\"PNG\" " +"xml:id=\"setupBootloaderAddEntry-im1\" align=\"center\" " +"fileref=\"dx2-setupBootloaderAddEntry.png\" revision=\"1\"/> </imageobject>" msgstr "" #. type: Content of: <section><section><para> -#: en/setupBootloaderAddEntry.xml:35 +#: en/setupBootloaderAddEntry.xml:38 msgid "" "Some things that can be done without any risk, are changing the label of an " "entry and ticking the box to make an entry the default one." msgstr "" #. type: Content of: <section><section><para> -#: en/setupBootloaderAddEntry.xml:39 +#: en/setupBootloaderAddEntry.xml:42 msgid "You can add the proper version number of an entry, or rename it completely." msgstr "" #. type: Content of: <section><section><para> -#: en/setupBootloaderAddEntry.xml:42 +#: en/setupBootloaderAddEntry.xml:45 msgid "" "The default entry is the one the systems boots into if you don't make a " "choice while booting up." msgstr "" #. type: Content of: <section><section><warning><para> -#: en/setupBootloaderAddEntry.xml:46 +#: en/setupBootloaderAddEntry.xml:49 msgid "" "Editing other things can leave you with an unbootable system. Please don't " "just try something without knowing what you are doing." msgstr "" #. type: Content of: <section><section><title> -#: en/setupBootloaderAddEntry.xml:53 en/setupBootloader.xml:109 +#: en/setupBootloaderAddEntry.xml:56 en/setupBootloader.xml:112 msgid "With an UEFI system" msgstr "" #. type: Content of: <section><section><para> -#: en/setupBootloaderAddEntry.xml:55 +#: en/setupBootloaderAddEntry.xml:58 msgid "" "In this case you are using Grub2-efi and you cannot use this tool to edit " "entries at this step. To do that you need to manually edit " @@ -3446,7 +3448,7 @@ msgid "" msgstr "" #. type: Content of: <section><section><para> -#: en/setupBootloaderAddEntry.xml:61 +#: en/setupBootloaderAddEntry.xml:64 msgid "" "After a click on the <guibutton>Next</guibutton> button, another drop down " "list allows to choose the video resolution for Grub2 which is a graphical " @@ -3454,7 +3456,7 @@ msgid "" msgstr "" #. type: Content of: <section><section><mediaobject> -#: en/setupBootloaderAddEntry.xml:66 +#: en/setupBootloaderAddEntry.xml:69 msgid "" "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> " "</imageobject>" @@ -3468,20 +3470,23 @@ msgstr "" #. type: Content of: <section><mediaobject> #: en/setupBootloader.xml:11 msgid "" -"<imageobject> <imagedata revision=\"1\" align=\"center\" " -"fileref=\"dx2-setupBootloader.png\" xml:id=\"setupBootloader-im1\" " -"format=\"PNG\"/> </imageobject>" +"<imageobject condition=\"classical\"> <imagedata " +"xml:id=\"setupBootloader-im1\" format=\"PNG\" " +"fileref=\"dx2-setupBootloader.png\" align=\"center\" revision=\"1\"/> " +"</imageobject> <imageobject condition=\"live\"> <imagedata " +"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" " +"revision=\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>" msgstr "" #. type: Content of: <section><section><para> -#: en/setupBootloader.xml:19 +#: en/setupBootloader.xml:22 msgid "" "If you prefer different bootloader settings to those chosen automatically by " "the installer, you can change them here." msgstr "" #. type: Content of: <section><section><para> -#: en/setupBootloader.xml:23 +#: en/setupBootloader.xml:26 msgid "" "You may already have another operating system on your machine, in which case " "you need to decide whether to add Mageia to your existing bootloader, or " @@ -3489,17 +3494,17 @@ msgid "" msgstr "" #. type: Content of: <section><section><tip><para> -#: en/setupBootloader.xml:29 +#: en/setupBootloader.xml:32 msgid "The Mageia graphical menus are nice :" msgstr "" #. type: Content of: <section><section><section><info><title> -#: en/setupBootloader.xml:34 +#: en/setupBootloader.xml:37 msgid "Using a Mageia bootloader" msgstr "" #. type: Content of: <section><section><section><para> -#: en/setupBootloader.xml:38 +#: en/setupBootloader.xml:41 msgid "" "By default, Mageia writes a new GRUB (legacy) bootloader into the MBR " "(Master Boot Record) of your first hard drive. If you already have other " @@ -3508,14 +3513,14 @@ msgid "" msgstr "" #. type: Content of: <section><section><section><para> -#: en/setupBootloader.xml:44 +#: en/setupBootloader.xml:47 msgid "" "Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB " "legacy and Lilo." msgstr "" #. type: Content of: <section><section><section><warning><para> -#: en/setupBootloader.xml:48 +#: en/setupBootloader.xml:51 msgid "" "Linux systems which use the GRUB2 bootloader are not currently supported by " "GRUB (legacy) and will not be recognized if the default GRUB bootloader is " @@ -3523,19 +3528,19 @@ msgid "" msgstr "" #. type: Content of: <section><section><section><warning><para> -#: en/setupBootloader.xml:53 +#: en/setupBootloader.xml:56 msgid "" "The best solution here is to use the GRUB2 bootloader which is available at " "the Summary page during installation." msgstr "" #. type: Content of: <section><section><section><info><title> -#: en/setupBootloader.xml:61 +#: en/setupBootloader.xml:64 msgid "Using an existing bootloader" msgstr "" #. type: Content of: <section><section><section><para> -#: en/setupBootloader.xml:65 +#: en/setupBootloader.xml:68 msgid "" "If you decide to use an existing bootloader then you will need to remember " "to STOP at the summary page during the installation and click the Bootloader " @@ -3544,7 +3549,7 @@ msgid "" msgstr "" #. type: Content of: <section><section><section><para> -#: en/setupBootloader.xml:71 +#: en/setupBootloader.xml:74 msgid "" "Do not select a device e.g.\"sda\", or you will overwrite your existing " "MBR. You must select the root partition that you chose during the " @@ -3552,12 +3557,12 @@ msgid "" msgstr "" #. type: Content of: <section><section><section><para> -#: en/setupBootloader.xml:76 +#: en/setupBootloader.xml:79 msgid "To be clear, sda is a device, sda7 is a partition on that device." msgstr "" #. type: Content of: <section><section><section><tip><para> -#: en/setupBootloader.xml:80 +#: en/setupBootloader.xml:83 msgid "" "Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where " "your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back to " @@ -3565,7 +3570,7 @@ msgid "" msgstr "" #. type: Content of: <section><section><section><para> -#: en/setupBootloader.xml:86 +#: en/setupBootloader.xml:89 msgid "" "The exact procedure for adding your Mageia system to an existing bootloader " "is beyond the scope of this help, however in most cases it will involve " @@ -3575,12 +3580,12 @@ msgid "" msgstr "" #. type: Content of: <section><section><section><info><title> -#: en/setupBootloader.xml:96 +#: en/setupBootloader.xml:99 msgid "Bootloader advanced option" msgstr "" #. type: Content of: <section><section><section><para> -#: en/setupBootloader.xml:100 +#: en/setupBootloader.xml:103 msgid "" "If you have very limited disk space for the <literal>/</literal> partition " "that contains <literal>/tmp</literal>, click on " @@ -3589,21 +3594,23 @@ msgid "" msgstr "" #. type: Content of: <section><section><para> -#: en/setupBootloader.xml:111 +#: en/setupBootloader.xml:114 msgid "" "With an UEFI system, the user interface is slightly different as you cannot " "choose the boot loader since only Grub2-efi is available." msgstr "" #. type: Content of: <section><section><mediaobject> -#: en/setupBootloader.xml:115 +#: en/setupBootloader.xml:118 msgid "" -"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> " +"<imageobject condition=\"classical\"> <imagedata " +"fileref=\"dx2-setupBootloader2.png\"/> </imageobject> <imageobject " +"condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> " "</imageobject>" msgstr "" #. type: Content of: <section><section><para> -#: en/setupBootloader.xml:120 +#: en/setupBootloader.xml:126 msgid "" "If Mageia is the first system installed on your computer, the installer " "created an ESP (EFI System Partition) to receive the bootloader " @@ -3615,7 +3622,7 @@ msgid "" msgstr "" #. type: Content of: <section><section><para> -#: en/setupBootloader.xml:128 +#: en/setupBootloader.xml:134 msgid "Don't modify the \"Boot Device\" unless really knowing what you do." msgstr "" @@ -3933,8 +3940,8 @@ msgstr "" #. type: Content of: <section><mediaobject> #: en/unused.xml:25 msgid "" -"<imageobject> <imagedata fileref=\"live-unused-InstallationProgress.png\"/> " -"</imageobject>" +"<imageobject> <imagedata " +"fileref=\"../live-unused-InstallationProgress.png\"/> </imageobject>" msgstr "" #. type: Content of: <section><para> -- cgit v1.2.1