aboutsummaryrefslogtreecommitdiffstats
path: root/docs/installer/help.pot
diff options
context:
space:
mode:
Diffstat (limited to 'docs/installer/help.pot')
-rw-r--r--docs/installer/help.pot544
1 files changed, 249 insertions, 295 deletions
diff --git a/docs/installer/help.pot b/docs/installer/help.pot
index df577e37..f877199b 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-02-10 19:18+0200\n"
+"POT-Creation-Date: 2017-03-14 20:10+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -148,7 +148,7 @@ msgstr ""
#. Lebarhon: 20170210 updated for Mageia 6 (umask)
#. type: Content of: <section><mediaobject>
-#: en/addUser.xml:9
+#: en/addUser.xml:7
msgid ""
"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" "
"fileref=\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" "
@@ -157,12 +157,12 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:20
+#: en/addUser.xml:16
msgid "Set Administrator (root) Password:"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/addUser.xml:24
+#: en/addUser.xml:19
msgid ""
"It is advisable for all <application>Mageia</application> installations to "
"set a superuser or administrator's password, usually called the "
@@ -175,49 +175,49 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:34
+#: en/addUser.xml:28
msgid ""
"All passwords are case sensitive, it is best to use a mixture of letters "
"(upper and lower case), numbers and other characters in a password."
msgstr ""
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:42
+#: en/addUser.xml:35
msgid "Enter a user"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/addUser.xml:45
+#: en/addUser.xml:37
msgid ""
"Add a user here. A user has fewer rights than the superuser (root), but "
-"enough to surf the internet, use office applications or play games and "
-"anything else the average user does with his computer"
+"enough to use the internet, office applications or play games and anything "
+"else the average user does with his computer"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:51
+#: en/addUser.xml:40
msgid ""
"<guibutton>Icon</guibutton>: if you click on this button it will change the "
-"users icon."
+"user's icon."
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:56
+#: en/addUser.xml:43
msgid ""
-"<guilabel>Real Name</guilabel>: Insert the users real name into this text "
+"<guilabel>Real Name</guilabel>: Insert the user's real name into this text "
"box."
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:61
+#: en/addUser.xml:46
msgid ""
"<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
-"drakx use a version of the users real name. <emphasis>The login name is case "
-"sensitive.</emphasis>"
+"drakx use a version of the user's real name. <emphasis>The login name is "
+"case sensitive.</emphasis>"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:67
+#: en/addUser.xml:50
msgid ""
"<guilabel>Password</guilabel>: In this text box you should type in the user "
"password. There is a shield at the end of the text box that indicates the "
@@ -225,7 +225,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:73
+#: en/addUser.xml:55
msgid ""
"<guilabel>Password (again)</guilabel>: Retype the user password into this "
"text box and drakx will check you have the same password in each of the user "
@@ -233,14 +233,14 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:80
+#: en/addUser.xml:61
msgid ""
"Any user you add while installing Mageia, will have a both read and write "
"protected home directory (umask=0027)."
msgstr ""
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:83
+#: en/addUser.xml:63
msgid ""
"You can add all extra needed users in the <emphasis>Configuration - "
"Summary</emphasis> step during the install. Choose <emphasis>User "
@@ -248,29 +248,29 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:87
+#: en/addUser.xml:66
msgid "The access permissions can also be changed after the install."
msgstr ""
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:94
+#: en/addUser.xml:72
msgid "Advanced User Management"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:74
msgid ""
"If the <guibutton>advanced</guibutton> button is clicked you are offered a "
"screen that allows you to edit the settings for the user you are adding."
msgstr ""
#. type: Content of: <section><section><para>
-#: en/addUser.xml:101
+#: en/addUser.xml:77
msgid "Additionally, you can disable or enable a guest account."
msgstr ""
#. type: Content of: <section><section><warning><para>
-#: en/addUser.xml:105
+#: en/addUser.xml:80
msgid ""
"Anything a guest with a default <emphasis>rbash</emphasis> guest account "
"saves to his /home directory will be erased when he logs out. The guest "
@@ -278,7 +278,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:112
+#: en/addUser.xml:86
msgid ""
"<guilabel>Enable guest account</guilabel>: Here you can enable or disable a "
"guest account. The guest account allows a guest to log into and use the PC, "
@@ -286,7 +286,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:119
+#: en/addUser.xml:92
msgid ""
"<guilabel>Shell</guilabel>: This drop down list allows you to change the "
"shell used by the user you are adding in the previous screen, options are "
@@ -294,7 +294,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:125
+#: en/addUser.xml:97
msgid ""
"<guilabel>User ID</guilabel>: Here you can set the user ID for the user you "
"are adding in the previous screen. This is a number. Leave it blank unless "
@@ -302,7 +302,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:131
+#: en/addUser.xml:102
msgid ""
"<guilabel>Group ID</guilabel>: This lets you set the group ID. Also a "
"number, usually the same one as for the user. Leave it blank unless you know "
@@ -1131,34 +1131,32 @@ msgstr ""
#. type: Content of: <section><note><para><mediaobject>
#: en/diskdrake.xml:57
-msgid "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
-msgstr ""
-
-#. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:61
-msgid "<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata "
+"fileref=\"dx2-diskdrake2.png\" align=\"center\"/> </imageobject> "
+"<imageobject condition=\"live\"> <imagedata fileref=\"live-diskdrake2.png\" "
+"align=\"center\"/> </imageobject>"
msgstr ""
-#. type: Content of: <section><note><para>
-#: en/diskdrake.xml:56
-msgid ""
-"<placeholder type=\"mediaobject\" id=\"0\"/><placeholder "
-"type=\"mediaobject\" id=\"1\"/>"
+#. type: Content of: <section><figure>
+#: en/diskdrake.xml:56 en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
msgstr ""
#. type: Content of: <section><note><para>
-#: en/diskdrake.xml:68
+#: en/diskdrake.xml:67
msgid ""
"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
"partition is present with a correct type"
msgstr ""
#. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:72
+#: en/diskdrake.xml:71
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> "
-"</imageobject> <imageobject> <imagedata "
-"fileref=\"live-doPartitionDisks3.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata "
+"fileref=\"dx2-doPartitionDisks3.png\" align=\"center\"/> </imageobject> "
+"<imageobject condition=\"live\"> <imagedata "
+"fileref=\"live-doPartitionDisks3.png\" align=\"center\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><info><title>
@@ -1184,55 +1182,50 @@ msgstr ""
#. type: Content of: <section><mediaobject>
#: en/doPartitionDisks.xml:22
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" "
-"align=\"center\"/> </imageobject>"
-msgstr ""
-
-#. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:28
-msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> "
-"</imageobject>"
+"<imageobject condition=\"classical\"> <imagedata "
+"fileref=\"dx2-doPartitionDisks.png\" align=\"center\"/> </imageobject> "
+"<imageobject condition=\"live\"> <imagedata "
+"fileref=\"live-doPartitionDisks.png\" align=\"center\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:35
+#: en/doPartitionDisks.xml:33
msgid "Use Existing Partitions"
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:38
+#: en/doPartitionDisks.xml:36
msgid ""
"If this option is available, then existing Linux compatible partitions have "
"been found and may be used for the installation."
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:42
msgid "Use Free Space"
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:46
+#: en/doPartitionDisks.xml:44
msgid ""
"If you have unused space on your hard drive then this option will use it for "
"your new Mageia installation."
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:50
msgid "Use Free Space on a Windows Partition"
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:53
msgid ""
"If you have unused space on an existing Windows partition, the installer may "
"offer to use it."
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:59
+#: en/doPartitionDisks.xml:57
msgid ""
"This can be a useful way of making room for your new Mageia installation, "
"but is a risky operation so you should make sure you have backed up all "
@@ -1240,7 +1233,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:62
msgid ""
"Note that this involves shrinking the size of the Windows partition. The "
"partition must be \"clean\", meaning that Windows must have closed down "
@@ -1251,7 +1244,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:72
+#: en/doPartitionDisks.xml:70
msgid ""
"With this option, the installer displays the remaining Windows partition in "
"light blue and the future Mageia partition in dark blue with their intended "
@@ -1260,36 +1253,31 @@ msgid ""
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:79
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> "
-"</imageobject>"
-msgstr ""
-
-#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:85
+#: en/doPartitionDisks.xml:77
msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> "
-"</imageobject>"
+"<imageobject condition=\"classical\"> <imagedata "
+"fileref=\"dx2-doPartitionDisks2.png\" align=\"center\"/> </imageobject> "
+"<imageobject condition=\"live\"> <imagedata "
+"fileref=\"live-doPartitionDisks2.png\" align=\"center\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:92
+#: en/doPartitionDisks.xml:88
msgid "Erase and use Entire Disk."
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:95
+#: en/doPartitionDisks.xml:91
msgid "This option will use the complete drive for Mageia."
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:98
+#: en/doPartitionDisks.xml:94
msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:101
+#: en/doPartitionDisks.xml:97
msgid ""
"If you intend to use part of the disk for something else, or you already "
"have data on the drive that you are not prepared to lose, then do not use "
@@ -1297,67 +1285,67 @@ msgid ""
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:108
+#: en/doPartitionDisks.xml:104
msgid "Custom"
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:110
+#: en/doPartitionDisks.xml:106
msgid ""
"This gives you complete control over the placing of the installation on your "
"hard drive(s)."
msgstr ""
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:116
+#: en/doPartitionDisks.xml:112
msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
msgstr ""
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:118
+#: en/doPartitionDisks.xml:114
msgid ""
"The installer will share the available place out according to the following "
"rules:"
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:123
+#: en/doPartitionDisks.xml:119
msgid ""
"If the total available place is lower than 50 GB, only one partition is "
"created for /, there is no separate partition for /home."
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:129
+#: en/doPartitionDisks.xml:125
msgid ""
"If the total available place is over 50 GB, then three partitions are "
"created"
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:134
+#: en/doPartitionDisks.xml:130
msgid "6/19 of the total available place is allocated to / with a maximum of 50 GB"
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:139
+#: en/doPartitionDisks.xml:135
msgid "1/19 is allocated to swap with a maximum of 4 GB"
msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:143
+#: en/doPartitionDisks.xml:139
msgid "the rest (at least 12/19) is allocated to /home"
msgstr ""
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:149
+#: en/doPartitionDisks.xml:145
msgid ""
"That means that from 160 GB and over of available place, the installer will "
"create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
msgstr ""
#. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:154
+#: en/doPartitionDisks.xml:150
msgid ""
"If you are using an UEFI system, the ESP (EFI System Partition) will be "
"automatically detected, or created if it does not exist yet, and mounted on "
@@ -1366,7 +1354,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:161
+#: en/doPartitionDisks.xml:157
msgid ""
"If you are using a Legacy (as known as CSM or BIOS) system with a GPT disk, "
"you need to create a Bios boot partition if not already existing. It is an "
@@ -1376,28 +1364,23 @@ msgid ""
msgstr ""
#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:169
+#: en/doPartitionDisks.xml:165
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> "
-"</imageobject>"
+"<imageobject condition=\"classical\"> <imagedata "
+"fileref=\"dx2-doPartitionDisks3.png\" align=\"center\"/> </imageobject> "
+"<imageobject condition=\"live\"> <imagedata "
+"fileref=\"live-doPartitionDisks3.png\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><note><mediaobject>
#: en/doPartitionDisks.xml:175
msgid ""
-"<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> "
-"</imageobject>"
-msgstr ""
-
-#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:181
-msgid ""
"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> "
"</imageobject>"
msgstr ""
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:188
+#: en/doPartitionDisks.xml:182
msgid ""
"Some newer drives are now using 4096 byte logical sectors, instead of the "
"previous standard of 512 byte logical sectors. Due to lack of available "
@@ -1409,17 +1392,17 @@ msgid ""
msgstr ""
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:196
+#: en/doPartitionDisks.xml:190
msgid "\"Align to\" \"MiB\""
msgstr ""
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:198
+#: en/doPartitionDisks.xml:192
msgid "\"Free space preceding (MiB)\" \"2\""
msgstr ""
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:200
+#: en/doPartitionDisks.xml:194
msgid "Also make sure all partitions are created with an even number of megabytes."
msgstr ""
@@ -1657,11 +1640,6 @@ msgid ""
"</imageobject>"
msgstr ""
-#. type: Content of: <section><figure>
-#: en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
-msgstr ""
-
#. type: Content of: <section><mediaobject>
#: en/installer.xml:49
msgid ""
@@ -2465,7 +2443,7 @@ msgid "Reboot"
msgstr ""
#. type: Content of: <section><para>
-#: en/reboot.xml:9
+#: en/reboot.xml:6
msgid ""
"Once the bootloader has been installed, you will be prompted to halt your "
"computer, remove the live CD and restart the computer, click on <emphasis "
@@ -2474,20 +2452,20 @@ msgid ""
msgstr ""
#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:15
+#: en/reboot.xml:11
msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><para>
-#: en/reboot.xml:20
+#: en/reboot.xml:15
msgid ""
-"When you restart, you will see a succession of download progress bars. "
-"These indicate that the software media are being downloaded (see Software "
+"When you restart, you will see a succession of download progress bars. These "
+"indicate that the software media lists are being downloaded (see Software "
"management)."
msgstr ""
#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:25
+#: en/reboot.xml:17
msgid ""
"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" "
"fileref=\"live-reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
@@ -2542,29 +2520,29 @@ msgid ""
msgstr ""
#. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:7
+#: en/SelectAndUseISOs2.xml:6
msgid "Select and use ISOs"
msgstr ""
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:11
+#: en/SelectAndUseISOs2.xml:9
msgid "Introduction"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:13
+#: en/SelectAndUseISOs2.xml:10
msgid ""
"Mageia is distributed via ISO images. This page will help you to choose "
"which image match your needs."
msgstr ""
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:16
+#: en/SelectAndUseISOs2.xml:12
msgid "There is two families of media:"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:20
+#: en/SelectAndUseISOs2.xml:15
msgid ""
"Classical installer: After booting the media, it will follow a process "
"allowing to choose what to install and how to configure your target "
@@ -2573,7 +2551,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:28
+#: en/SelectAndUseISOs2.xml:22
msgid ""
"LIVE media: you can boot the media in a real Mageia system without "
"installing it, to see what you will get after installation. The "
@@ -2581,22 +2559,22 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:35
+#: en/SelectAndUseISOs2.xml:28
msgid "Details are given in the next sections."
msgstr ""
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:39
+#: en/SelectAndUseISOs2.xml:31
msgid "Media"
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:42
+#: en/SelectAndUseISOs2.xml:33
msgid "Definition"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:44
+#: en/SelectAndUseISOs2.xml:34
msgid ""
"Here, a medium (plural: media) is an ISO image file that allows you to "
"install and/or update Mageia and by extension any physical support the ISO "
@@ -2604,83 +2582,78 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:48
+#: en/SelectAndUseISOs2.xml:37
msgid ""
"You can find them <link "
"ns4:href=\"http://www.mageia.org/en/downloads/\">here</link>."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:52
+#: en/SelectAndUseISOs2.xml:40
msgid "Classical installation media"
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:55 en/SelectAndUseISOs2.xml:100 en/SelectAndUseISOs2.xml:188
+#: en/SelectAndUseISOs2.xml:42 en/SelectAndUseISOs2.xml:78 en/SelectAndUseISOs2.xml:147
msgid "Common features"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:59
+#: en/SelectAndUseISOs2.xml:45
msgid "These ISOs use the traditional installer called drakx."
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:64
+#: en/SelectAndUseISOs2.xml:49
msgid "They are able to make a clean install or an update from previous releases."
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:55
msgid "DVD"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:75
-msgid "Different media for architecture 32 or 64 bits."
+#: en/SelectAndUseISOs2.xml:58 en/SelectAndUseISOs2.xml:89 en/SelectAndUseISOs2.xml:111 en/SelectAndUseISOs2.xml:125 en/SelectAndUseISOs2.xml:139 en/SelectAndUseISOs2.xml:164
+msgid "Different media for 32 or 64 bit architectures."
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:79
+#: en/SelectAndUseISOs2.xml:61
msgid ""
"Some tools are available in the Welcome screen: Rescue System, Memory Test, "
"Hardware Detection Tool."
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:84
+#: en/SelectAndUseISOs2.xml:65
msgid "Each DVD contains many available desktop environments and languages."
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:89
+#: en/SelectAndUseISOs2.xml:69
msgid "You'll be given the choice during the installation to add non free software."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:97
+#: en/SelectAndUseISOs2.xml:76
msgid "Live media"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:104
+#: en/SelectAndUseISOs2.xml:81
msgid ""
"Can be used to preview the distribution without installing it on a HDD, and "
"optionally install Mageia on to your HDD."
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:109
+#: en/SelectAndUseISOs2.xml:85
msgid "Each ISO contains only one desktop environment (KDE, GNOME or Xfce)."
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:114 en/SelectAndUseISOs2.xml:142 en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178 en/SelectAndUseISOs2.xml:208
-msgid "Different media for 32 or 64 bit architectures."
-msgstr ""
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:118
+#: en/SelectAndUseISOs2.xml:92
msgid ""
"<emphasis role=\"bold\">Live ISOs can only be used to create clean "
"installations, they cannot be used to upgrade from previous "
@@ -2688,52 +2661,52 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:124
+#: en/SelectAndUseISOs2.xml:97
msgid "They contain non free software."
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:130
+#: en/SelectAndUseISOs2.xml:102
msgid "Live DVD Plasma"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:134
+#: en/SelectAndUseISOs2.xml:105
msgid "Plasma desktop environment only."
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:138 en/SelectAndUseISOs2.xml:156 en/SelectAndUseISOs2.xml:174
+#: en/SelectAndUseISOs2.xml:108 en/SelectAndUseISOs2.xml:122 en/SelectAndUseISOs2.xml:136
msgid "All languages are present."
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:148
+#: en/SelectAndUseISOs2.xml:116
msgid "Live DVD GNOME"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:152
+#: en/SelectAndUseISOs2.xml:119
msgid "GNOME desktop environment only."
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:166
+#: en/SelectAndUseISOs2.xml:130
msgid "Live DVD Xfce"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:170
+#: en/SelectAndUseISOs2.xml:133
msgid "Xfce desktop environment only."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:185
+#: en/SelectAndUseISOs2.xml:145
msgid "Boot-only CD media"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:192
+#: en/SelectAndUseISOs2.xml:150
msgid ""
"Each one is a small image that contains no more than that which is needed to "
"start the drakx installer and find drakx-installer-stage2 and other packages "
@@ -2743,7 +2716,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:201
+#: en/SelectAndUseISOs2.xml:158
msgid ""
"These media are very light (less than 100 MB) and are convenient when "
"bandwidth is too low to download a full DVD, a PC without a DVD drive or a "
@@ -2751,46 +2724,46 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:212
+#: en/SelectAndUseISOs2.xml:167
msgid "English language only."
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:218
+#: en/SelectAndUseISOs2.xml:172
msgid "netinstall.iso"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:222
+#: en/SelectAndUseISOs2.xml:175
msgid ""
"Contains only free software, for those people who refuse to use non-free "
"software."
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:229
+#: en/SelectAndUseISOs2.xml:181
msgid "netinstall-nonfree.iso"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:233
+#: en/SelectAndUseISOs2.xml:184
msgid ""
"Contains non-free software (mostly drivers, codecs...) for people who need "
"it."
msgstr ""
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:192
msgid "Downloading and Checking Media"
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:245
+#: en/SelectAndUseISOs2.xml:194
msgid "Downloading"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:247
+#: en/SelectAndUseISOs2.xml:195
msgid ""
"Once you have chosen your ISO file, you can download it using either http or "
"BitTorrent. In both cases, a window gives you some information, such as the "
@@ -2799,12 +2772,12 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:254
+#: en/SelectAndUseISOs2.xml:201
msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:259
+#: en/SelectAndUseISOs2.xml:205
msgid ""
"md5sum and sha1sum are tools to check the ISO integrity. Use only one of "
"them. Keep one of them <link linkend=\"integrity\">for further "
@@ -2812,81 +2785,82 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:209
msgid "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:269
+#: en/SelectAndUseISOs2.xml:213
msgid "Check the radio button Save File."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:273
+#: en/SelectAndUseISOs2.xml:216
msgid "Checking the downloaded media integrity"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:276
+#: en/SelectAndUseISOs2.xml:218
msgid ""
"Both checksums are hexadecimal numbers calculated by an algorithm from the "
"file to be downloaded. When you ask these algorithms to recalculate this "
"number from your downloaded file, either you have the same number and your "
"downloaded file is correct, or the number is different and you have a "
-"failure. A failure infers that you should retry the download."
+"failure. A failure infers that you should retry the download or attempt a "
+"repair using BitTorrent."
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:283
+#: en/SelectAndUseISOs2.xml:219
msgid "Open a console, no need to be root, and:"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:220
msgid ""
"- To use md5sum, type: [sam@localhost]$ <userinput>md5sum "
"path/to/the/image/file.iso</userinput>."
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:288
+#: en/SelectAndUseISOs2.xml:222
msgid ""
"- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum "
"path/to/the/image/file.iso</userinput>."
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:291
+#: en/SelectAndUseISOs2.xml:224
msgid ""
"and compare the obtained number on your computer (you may have to wait for a "
"while) with the number given by Mageia. Example:"
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:295
+#: en/SelectAndUseISOs2.xml:227
msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:305
+#: en/SelectAndUseISOs2.xml:235
msgid "Burn or dump the ISO"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:307
+#: en/SelectAndUseISOs2.xml:236
msgid ""
"The checked ISO can now be burned to a CD or DVD or dumped to a USB "
-"stick. These operations are not a simple copy and aim to make a boot-able "
+"stick. These operations are not a simple copy and aim to make a bootable "
"medium."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:312
+#: en/SelectAndUseISOs2.xml:238
msgid "Burning the ISO to a CD/DVD"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:314
+#: en/SelectAndUseISOs2.xml:239
msgid ""
"Use whatever burner you wish but ensure the burning device is set correctly "
"to <emphasis role=\"bold\">burn an image</emphasis>, burn data or files is "
@@ -2896,121 +2870,121 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:321
+#: en/SelectAndUseISOs2.xml:245
msgid "Dump the ISO to a USB stick"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:323
+#: en/SelectAndUseISOs2.xml:246
msgid ""
"All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick "
"and then use it to boot and install the system."
msgstr ""
#. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:327
+#: en/SelectAndUseISOs2.xml:249
msgid ""
-"\"dumping\" an image onto a flash device destroys any previous file-system "
+"\"Dumping\" an image onto a flash device destroys any previous file-system "
"on the device; any other data will be lost and the partition capacity will "
"be reduced to the image size."
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:332
+#: en/SelectAndUseISOs2.xml:251
msgid ""
"To recover the original capacity, you must redo partitioning and re-format "
"the USB stick."
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:336
+#: en/SelectAndUseISOs2.xml:254
msgid "Using a graphical tool within Mageia"
msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:338
+#: en/SelectAndUseISOs2.xml:255
msgid ""
"You can use a graphical tool like <link "
"ns4:href=\"https://wiki.mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:342
+#: en/SelectAndUseISOs2.xml:258
msgid "Using a graphical tool within Windows"
msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:344
+#: en/SelectAndUseISOs2.xml:259
msgid "You could try:"
msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:346
+#: en/SelectAndUseISOs2.xml:260
msgid ""
"- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
"the \"ISO image\" option;"
msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:349
+#: en/SelectAndUseISOs2.xml:262
msgid ""
"- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
"Disk Imager</link>"
msgstr ""
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:354
+#: en/SelectAndUseISOs2.xml:266
msgid "Using Command line within a GNU/Linux system"
msgstr ""
#. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:357
+#: en/SelectAndUseISOs2.xml:268
msgid ""
"It is potentially *dangerous* to do this by hand. You risk to overwrite a "
"disc partition if you get the device-ID wrong."
msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:361
+#: en/SelectAndUseISOs2.xml:271
msgid "You can also use the dd tool in a console:"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:365
+#: en/SelectAndUseISOs2.xml:274
msgid "Open a console"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:369
+#: en/SelectAndUseISOs2.xml:277
msgid ""
"Become root with the command <userinput>su -</userinput> (don't forget the "
"final '-' )"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:373
+#: en/SelectAndUseISOs2.xml:280
msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:380
+#: en/SelectAndUseISOs2.xml:286
msgid ""
-"Plug your USB stick (do not mount it, this also means do not open any "
+"Plug in your USB stick (do not mount it, this also means do not open any "
"application or file manager that could access or read it)"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:386
+#: en/SelectAndUseISOs2.xml:289
msgid "Enter the command <userinput>fdisk -l</userinput>"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:389
+#: en/SelectAndUseISOs2.xml:291
msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:394
+#: en/SelectAndUseISOs2.xml:295
msgid ""
"Alternatively, you can get the device name with the command "
"<code>dmesg</code>: at end, you see the device name starting with "
@@ -3018,7 +2992,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:399
+#: en/SelectAndUseISOs2.xml:299
#, no-wrap
msgid ""
"[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3048,38 +3022,38 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:420
+#: en/SelectAndUseISOs2.xml:319
msgid ""
"Find the device name for your USB stick (by its size), for example "
"<code>/dev/sdb</code> in the screenshot above, it is a 8GB USB stick."
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:426
+#: en/SelectAndUseISOs2.xml:324
msgid ""
"Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
"bs=1M</userinput>"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:429
+#: en/SelectAndUseISOs2.xml:326
msgid "Where X=your device name eg: /dev/sdc"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:431
+#: en/SelectAndUseISOs2.xml:327
msgid ""
"Example: # <userinput>dd if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso "
"of=/dev/sdb bs=1M</userinput>"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:437
+#: en/SelectAndUseISOs2.xml:332
msgid "Enter the command: # <userinput>sync</userinput>"
msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:441
+#: en/SelectAndUseISOs2.xml:335
msgid "Unplug your USB stick, it is done"
msgstr ""
@@ -3450,84 +3424,74 @@ msgstr ""
#. type: Content of: <section><section><section><mediaobject>
#: en/setupBootloader.xml:36
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> "
-"</imageobject>"
-msgstr ""
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:42
-msgid ""
-"<imageobject> <imagedata xml:id=\"setupBootloader-im1\" "
+"<imageobject condition=\"classical\"> <imagedata "
+"fileref=\"dx2-setupBootloader.png\" align=\"center\"/> </imageobject> "
+"<imageobject condition=\"live\"> <imagedata xml:id=\"setupBootloader-im1\" "
"fileref=\"live-setupBootloader.png\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:47 en/setupBootloader.xml:78
-msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
+#: en/setupBootloader.xml:45 en/setupBootloader.xml:73
+msgid "Don't modify the \"Boot Device\" unless you really know what you are doing."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:52
+#: en/setupBootloader.xml:50
msgid "Grub2-efi on UEFI systems"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:54
+#: en/setupBootloader.xml:52
msgid ""
"With an UEFI system, the user interface is slightly different as you cannot "
"choose between with or without graphical menu"
msgstr ""
#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:58
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> "
-"</imageobject>"
-msgstr ""
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:64
+#: en/setupBootloader.xml:56
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> "
-"</imageobject>"
+"<imageobject condition=\"classical\"> <imagedata "
+"fileref=\"dx2-setupBootloader2.png\" align=\"center\"/> </imageobject> "
+"<imageobject condition=\"live\"> <imagedata "
+"fileref=\"live-setupBootloader2.png\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:69
+#: en/setupBootloader.xml:65
msgid ""
-"If Mageia is the first system installed on your computer, the installer "
+"If Mageia is the only system installed on your computer, the installer "
"created an ESP (EFI System Partition) to receive the bootloader "
-"(Grub2-efi). If there was already UEFI operating systems previously "
-"installed on your computer (Windows 8 for example), the Mageia installer "
-"detected the existing ESP created by Windows and adds grub2-efi. Although it "
-"is possible to have several ESPs, only one is advised and enough whatever "
-"the number of operating systems you have."
+"(Grub2-efi). If there are already UEFI operating systems installed on your "
+"computer (Windows 8 for example), the Mageia installer detects the existing "
+"ESP created by Windows and adds grub2-efi. Although it is possible to have "
+"several ESPs, only one is advised and enough whatever the number of "
+"operating systems you have."
msgstr ""
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:84
+#: en/setupBootloader.xml:79
msgid "Using a Mageia bootloader"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:86
+#: en/setupBootloader.xml:81
msgid "By default, according to your system, Mageia writes a new:"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:90
+#: en/setupBootloader.xml:85
msgid ""
"GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard "
"drive or in the BIOS boot partition."
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:95
+#: en/setupBootloader.xml:90
msgid "Grub2-efi bootloader into the ESP"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:99
+#: en/setupBootloader.xml:94
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, "
@@ -3536,26 +3500,21 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:105
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> "
-"</imageobject>"
-msgstr ""
-
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:111
+#: en/setupBootloader.xml:100
msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> "
-"</imageobject>"
+"<imageobject condition=\"classical\"> <imagedata "
+"fileref=\"dx2-setupBootloader3.png\" align=\"center\"/> </imageobject> "
+"<imageobject condition=\"live\"> <imagedata "
+"fileref=\"live-setupBootloader3.png\" align=\"center\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:118
+#: en/setupBootloader.xml:111
msgid "Using an existing bootloader"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:113
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 "
@@ -3565,59 +3524,54 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:128
-msgid "Using the chain loading"
+#: en/setupBootloader.xml:121
+msgid "Using chain loading"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:130
+#: en/setupBootloader.xml:123
msgid ""
-"If you don't want a bootable Mageia, but chain load it from another OS, "
+"If you don't want a bootable Mageia, but to chain load it from another OS, "
"click on <guibutton>Next</guibutton>, then on "
"<guibutton>Advanced</guibutton> and Check the box <guilabel>Do not touch ESP "
"or MBR</guilabel>."
msgstr ""
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:136
+#: en/setupBootloader.xml:129
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> "
-"</imageobject>"
-msgstr ""
-
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:142
-msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> "
-"</imageobject>"
+"<imageobject condition=\"classical\"> <imagedata "
+"fileref=\"dx2-setupBootloader4.png\" align=\"center\"/> </imageobject> "
+"<imageobject condition=\"live\"> <imagedata "
+"fileref=\"live-setupBootloader4.png\" align=\"center\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:147
+#: en/setupBootloader.xml:138
msgid ""
-"You will get a warning that the bootloader will lack, ignore it by a click "
-"on <guibutton>OK</guibutton>."
+"You will get a warning that the bootloader is missing, ignore it by clicking "
+"<guibutton>OK</guibutton>."
msgstr ""
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:151
+#: en/setupBootloader.xml:142
msgid ""
"<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> "
"</imageobject>"
msgstr ""
#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:158
+#: en/setupBootloader.xml:149
msgid "Options"
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:161
+#: en/setupBootloader.xml:152
msgid "First page"
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:165
+#: en/setupBootloader.xml:156
msgid ""
"<guilabel>Delay before booting the default image</guilabel>: This text box "
"lets you set a delay in seconds before the default operating system is "
@@ -3625,7 +3579,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:171
+#: 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 "
@@ -3633,44 +3587,44 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:177
+#: en/setupBootloader.xml:168
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:182
+#: en/setupBootloader.xml:173
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:188 en/setupBootloader.xml:245
+#: en/setupBootloader.xml:179 en/setupBootloader.xml:237
msgid "<guilabel>Advanced</guilabel>"
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:192
+#: en/setupBootloader.xml:183
msgid ""
"<guilabel>Enable ACPI:</guilabel> ACPI (Advanced Configuration and Power "
"Interface) is a standard for the power management. It can save energy by "
-"stopping unused devices, this was the method used before APM. Uncheck it be "
-"useful, for example, if your computer does not support ACPI or if you think "
-"the ACPI implementation might cause some problems (for instance random "
-"reboots or system lockups)."
+"stopping unused devices, this was the method used before APM. Unchecking 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)."
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:202
+#: en/setupBootloader.xml:193
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:208
+#: en/setupBootloader.xml:199
msgid ""
"<guilabel>Enable APIC</guilabel>: Enabling or disabling this gives the "
"operating system access to the Advanced Programmable Interrupt "
@@ -3679,38 +3633,38 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:216
+#: en/setupBootloader.xml:207
msgid ""
"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
-"manage all external interrupts for some specific processor in an SMP system."
+"manages all external interrupts for a specific processor in an SMP system."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:226
+#: en/setupBootloader.xml:217
msgid "Next page"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:230
+#: en/setupBootloader.xml:221
msgid "<guilabel>Default:</guilabel> Operating system started up by default"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:235
+#: en/setupBootloader.xml:226
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:241
+#: en/setupBootloader.xml:232
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:247
+#: en/setupBootloader.xml:239
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 "
@@ -3718,7 +3672,7 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:254
+#: en/setupBootloader.xml:246
msgid ""
"<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
"linkend=\"setupChainLoading\">Using the chain loading</link>"