Sync Installer docs with Calenco

46 files changed, 17481 insertions, 11504 deletions

diff --git a/docs/docs/stable/installer/bg.po b/docs/docs/stable/installer/bg.po
index 28dde88c..a386c634 100644
--- a/docs/docs/stable/installer/bg.po
+++ b/docs/docs/stable/installer/bg.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2019-01-19 21:23+0200\n"
+"POT-Creation-Date: 2019-09-08 15:26+0300\n"
 "PO-Revision-Date: 2019-01-19 19:25+0000\n"
 "Last-Translator: Georgi Georgiev <georgiev_1994@abv.bg>\n"
 "Language-Team: Bulgarian (http://www.transifex.com/MageiaLinux/mageia/"
@@ -147,7 +147,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/addUser.xml:3
+#: en/addUser.xml:9
 msgid "User Management"
 msgstr ""
 
@@ -157,13 +157,16 @@ msgstr ""
 #. 2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
 #.   Also changed 'Advanced User Management' to 'User Management (advanced)'.
 #. 2018/02/24 apb: Changed list style.
+#. 2019/08/10 apb: Added missing 'condition' profile for live-user1.png.
+#. 2019/08/11 apb: [1] Reword 1.1 (including Note) [2] Reword 1.2 Password text.
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:12
+#: en/addUser.xml:28
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
-"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
-"\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata format="
-"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-setRootPassword.png\" format=\"PNG\" revision=\"1\" xml:id="
+"\"setRootPassword-im1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-user1.png\" format=\"PNG\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
 "\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -171,36 +174,41 @@ msgstr ""
 "\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:21
+#: en/addUser.xml:40
 msgid "Set Administrator (root)  Password:"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:24
+#: en/addUser.xml:44
 msgid ""
 "It is advisable for all Mageia installations to set a <literal>superuser</"
 "literal> (Administrator) password, usually called the <emphasis>root </"
-"emphasis>password in Linux. As you type a password into the top box a shield "
-"will change from red-to-yellow-to-green depending on the strength of the "
-"password. A green shield shows you are using a strong password. You need to "
-"repeat the same password in the box underneath, to check that the first "
-"entry was not mistyped."
+"emphasis>password in Linux. You need to repeat the same password in the box "
+"underneath, to check that the first entry was not mistyped."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:32
+#: en/addUser.xml:51
+msgid ""
+"As you type a password into the top box a shield will change from red-to-"
+"yellow-to-green depending on the strength of the password. A green shield "
+"shows you are using a strong password."
+msgstr ""
+
+#. type: Content of: <section><section><note><para>
+#: en/addUser.xml:55
 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:39
+#: en/addUser.xml:63
 msgid "Enter a user"
 msgstr "Въведете потребител"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:41
+#: en/addUser.xml:66
 msgid ""
 "Add a User here. A regular user has fewer privileges than the "
 "<literal>superuser</literal> (root), but enough to use the Internet, office "
@@ -209,39 +217,39 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:47
+#: en/addUser.xml:73
 msgid "<emphasis role=\"bold\">Icon</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:48
+#: en/addUser.xml:75
 msgid "Click on this button if you want to change the user's icon"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:52
+#: en/addUser.xml:80
 msgid "<emphasis role=\"bold\">Real Name</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:53
+#: en/addUser.xml:82
 msgid "Insert the user's real name into this text box"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:56
+#: en/addUser.xml:86
 msgid "<emphasis role=\"bold\">Login Name</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:57
+#: en/addUser.xml:88
 msgid ""
 "Enter the user login name or let DrakX use a version of the user's real "
 "name. <emphasis role=\"bold\">The login name is case-sensitive.</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><caution><simpara>
-#: en/addUser.xml:61
+#: en/addUser.xml:93
 msgid ""
 "The login entered here should be different to any login currently in use for "
 "your <filename>/home</filename> directory. Some user parameters will be "
@@ -250,34 +258,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:65 en/setupBootloader.xml:124
+#: en/addUser.xml:102 en/setupBootloader.xml:182
 msgid "<emphasis role=\"bold\">Password</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:66
-msgid ""
-"Type in the user password. There is a shield at the end of the text box that "
-"indicates the strength of the password. (See also <xref linkend="
-"\"givePassword\"/>)"
+#: en/addUser.xml:104
+msgid "Type in the user password (remembering the advice in the Note above)."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:68
+#: en/addUser.xml:107
 msgid ""
 "<emphasis role=\"bold\">Password (again):</emphasis> Retype the user "
 "password. DrakX will check that you have not mistyped the password."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:74
+#: en/addUser.xml:114
 msgid ""
 "Any users added while installing Mageia, will have a home directory that is "
 "both read and write protected (umask=0027)"
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:76
+#: en/addUser.xml:117
 msgid ""
 "You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
@@ -285,24 +290,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:79
+#: en/addUser.xml:121
 msgid "The access permissions can also be changed after the install."
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:85
+#: en/addUser.xml:128
 msgid "User Management (advanced)"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:87
+#: en/addUser.xml:131
 msgid ""
 "The <emphasis>Advanced</emphasis> option allows you to edit further settings "
 "for the user you are adding."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:91
+#: en/addUser.xml:136
 msgid ""
 "<emphasis>Shell</emphasis>: This drop-down list allows you to change the "
 "shell available to any user you added in the previous screen. Options are "
@@ -310,7 +315,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:143
 msgid ""
 "<emphasis>User ID</emphasis>: Here you can set the user ID for any user you "
 "added in the previous screen. If you are unsure what the purpose of this is, "
@@ -318,7 +323,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:102
+#: en/addUser.xml:149
 msgid ""
 "<emphasis>Group ID</emphasis>: This lets you set the group ID.  Again, if "
 "unsure, leave it blank."
@@ -438,24 +443,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:23
+#: en/bootLive.xml:10
 msgid "Boot Mageia as Live system"
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:28
+#: en/bootLive.xml:14
 msgid "Booting the medium"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:31
+#: en/bootLive.xml:16
 msgid ""
 "You can boot directly from a Live DVD or USB. Usually, you just need to plug "
 "the USB device in or place the DVD in the drive and restart the computer."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:35
+#: en/bootLive.xml:19
 msgid ""
 "If the computer does not automatically boot from the USB or DVD you may need "
 "to reconfigure your BIOS Boot Disk priority. Alternatively, you might try "
@@ -464,7 +469,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><tip><para>
-#: en/bootLive.xml:41
+#: en/bootLive.xml:24
 msgid ""
 "To access the BIOS or boot menu when the computer is starting, you can try "
 "pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or <keycap>Esc</"
@@ -474,7 +479,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/bootLive.xml:50
+#: en/bootLive.xml:32
 msgid ""
 "The actual screen that you will first see when booting from the Live media "
 "will depend on whether your computer motherboard is of the Legacy (BIOS) or "
@@ -482,91 +487,93 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:58
+#: en/bootLive.xml:39
 msgid "In BIOS/CSM/Legacy mode"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:62
+#: en/bootLive.xml:42
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"../live-bootCSM.png\" align=\"center\"/> "
+"</imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:67
+#: en/bootLive.xml:46
 msgid "First screen while booting in BIOS mode"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><title>
-#: en/bootLive.xml:72 en/bootLive.xml:144 en/installer.xml:106
-#: en/installer.xml:154
+#: en/bootLive.xml:50 en/bootLive.xml:104 en/installer.xml:108
+#: en/installer.xml:156
 msgid "Menu"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:75 en/bootLive.xml:147
+#: en/bootLive.xml:52 en/bootLive.xml:106
 msgid "<emphasis role=\"bold\">Boot Mageia</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:77
+#: en/bootLive.xml:53
 msgid ""
 "This option will boot the Mageia Live system from the connected DVD/USB "
 "media (expect a very slow system compared to an installed OS)."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:81
+#: en/bootLive.xml:56
 msgid "Once the boot is done, you can proceed to the installation."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:86 en/bootLive.xml:102
+#: en/bootLive.xml:60 en/bootLive.xml:72
 msgid ""
 "<emphasis role=\"bold\">+ use non-free video drivers (slower to boot)</"
 "emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:89
+#: en/bootLive.xml:62
 msgid "Boot the Mageia Live system using non-free video drivers"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:96 en/bootLive.xml:155 en/installer.xml:109
+#: en/bootLive.xml:68 en/bootLive.xml:112 en/installer.xml:111
 msgid "<emphasis role=\"bold\">Install Mageia</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:98 en/bootLive.xml:157
+#: en/bootLive.xml:69 en/bootLive.xml:113
 msgid "This option will install Mageia to a hard disk."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:105
+#: en/bootLive.xml:74
 msgid "Install Mageia using non-free video drivers"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:111 en/installer.xml:125
+#: en/bootLive.xml:79 en/installer.xml:127
 msgid "<emphasis role=\"bold\">Memory Test</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:113 en/installer.xml:127
+#: en/bootLive.xml:80 en/installer.xml:129
 msgid ""
 "Test the installed RAM by performing multiple read and write operations. "
 "Reboot to end the test."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:118 en/bootLive.xml:161
+#: en/bootLive.xml:84 en/bootLive.xml:116
 msgid "<emphasis role=\"bold\"> F2 Language</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:120 en/bootLive.xml:163
+#: en/bootLive.xml:85 en/bootLive.xml:117
 msgid ""
 "Press <keycap>F2</keycap> to have the installer use a specific language "
 "during the installation. Use the arrow keys to select the language then "
@@ -574,24 +581,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:129
+#: en/bootLive.xml:93
 msgid "In UEFI mode"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:133
+#: en/bootLive.xml:96
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:139
+#: en/bootLive.xml:100
 msgid "First screen while booting in UEFI mode"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:149
+#: en/bootLive.xml:107
 msgid ""
 "This option will boot the Mageia Live system from the connected DVD/USB "
 "media (expect a very slow system compared to an installed OS).  Once the "
@@ -599,7 +609,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/bootLive.xml:170
+#: en/bootLive.xml:123
 msgid ""
 "If you booted from a USB stick, you will see the above menu options "
 "duplicated, and in this case, you should choose from the menu pair that will "
@@ -821,12 +831,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:24
+#: en/configureX_card_list.xml:27
 msgid "Choose an X Server (Configure your Graphic Card)"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_card_list.xml:29
+#: en/configureX_card_list.xml:32
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_card_list."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_card_list-im1\"/> </"
@@ -834,36 +844,36 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:35
+#: en/configureX_card_list.xml:38
 msgid ""
 "DrakX has a very comprehensive database of video cards and will usually "
 "correctly identify your video device."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:38
+#: en/configureX_card_list.xml:41
 msgid ""
 "If the installer has not correctly detected your graphic card and you know "
 "which one you have, you can select it from the tree by:"
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_card_list.xml:41 en/configureX_monitor.xml:74
+#: en/configureX_card_list.xml:44 en/configureX_monitor.xml:78
 msgid "Vendor"
 msgstr "Производител"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:45
+#: en/configureX_card_list.xml:48
 msgid "then the make of your card"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:49
+#: en/configureX_card_list.xml:52
 msgid "and the model of card"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:53
+#: en/configureX_card_list.xml:56
 msgid ""
 "If you cannot find your card in the vendor lists (because it's not yet in "
 "the database or it's an older card) you may find a suitable driver in the "
@@ -874,14 +884,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><caution><para>
-#: en/configureX_card_list.xml:61
+#: en/configureX_card_list.xml:64
 msgid ""
 "Be aware that if you select an incompatible driver you may only have access "
 "to the <emphasis>Command Line Interface</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:65
+#: en/configureX_card_list.xml:68
 msgid ""
 "Some video card manufacturers provide proprietary drivers for Linux which "
 "may only be available in the <emphasis>Nonfree</emphasis> repository and in "
@@ -892,17 +902,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:11
-msgid "Graphic Card and Monitor Configuration"
+#: en/configureX_chooser.xml:23
+msgid "Graphics Card and Monitor Configuration"
 msgstr ""
 
-#.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
-#. 2018/02/15 apb: Some text and typography.
-#. 2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.
-#. 2018/02/23 apb: Typo.
-#. 2019/01/06 apb: Slight reword, split 1st para in two.
 #. type: Content of: <section><mediaobject>
-#: en/configureX_chooser.xml:26
+#: en/configureX_chooser.xml:28
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_chooser."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_chooser-im1\"/> </"
@@ -910,7 +915,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:32
+#: en/configureX_chooser.xml:34
 msgid ""
 "No matter which graphical environment (also known as desktop environment) "
 "you chose for this install of Mageia, they are all based on a graphical user "
@@ -921,31 +926,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:39
+#: en/configureX_chooser.xml:41
 msgid ""
 "Choose the appropriate settings manually if you think the details are "
 "incorrect, or if none are shown."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:44
-msgid "<emphasis role=\"bold\">Graphic Card</emphasis>"
+#: en/configureX_chooser.xml:46
+msgid "<emphasis role=\"bold\">Graphics Card</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:47
+#: en/configureX_chooser.xml:49
 msgid ""
 "If you need to, you can select a specific card from this expandable list. "
 "See <xref linkend=\"configureX_card_list\"/>."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:52
+#: en/configureX_chooser.xml:54
 msgid "<emphasis role=\"bold\">Monitor</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:55
+#: en/configureX_chooser.xml:57
 msgid ""
 "You can choose Plug 'n Play, if applicable, or choose your monitor from the "
 "<emphasis>Vendor</emphasis> or <emphasis>Generic</emphasis> lists. Choose "
@@ -955,22 +960,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:63
+#: en/configureX_chooser.xml:65
 msgid "<emphasis role=\"bold\">Resolution</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:66
+#: en/configureX_chooser.xml:68
 msgid "The resolution and color depth of your monitor can be set here."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:71
+#: en/configureX_chooser.xml:73
 msgid "<emphasis role=\"bold\">Test</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:74
+#: en/configureX_chooser.xml:76
 msgid ""
 "The test button does not always appear during install. If the option is "
 "there, and you test your settings, you should be asked to confirm that your "
@@ -982,17 +987,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:85
+#: en/configureX_chooser.xml:87
 msgid "<emphasis role=\"bold\">Options</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:88
+#: en/configureX_chooser.xml:90
 msgid "Here you can choose to enable or disable various options."
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_chooser.xml:93
+#: en/configureX_chooser.xml:95
 msgid ""
 "There is a risk of damaging a monitor if you choose refresh rates that are "
 "outside the frequency range of that monitor. This applies to older CRT "
@@ -1001,19 +1006,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_monitor.xml:22
+#: en/configureX_monitor.xml:26
 msgid "Choosing your Monitor"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:25
+#: en/configureX_monitor.xml:29
 msgid ""
 "DrakX has a very comprehensive database of monitors and will usually "
 "correctly identify yours."
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:30
+#: en/configureX_monitor.xml:34
 msgid ""
 "<emphasis role=\"bold\">Selecting a monitor with different characteristics "
 "could damage your monitor or video hardware. Please don't try something "
@@ -1022,7 +1027,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:38
+#: en/configureX_monitor.xml:42
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
@@ -1030,12 +1035,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:46
+#: en/configureX_monitor.xml:50
 msgid "Custom"
 msgstr "Позволи на отделни потребители"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:49
+#: en/configureX_monitor.xml:53
 msgid ""
 "This option allows you to set two critical parameters: the vertical refresh "
 "rate and the horizontal sync rate. Vertical refresh determines how often the "
@@ -1044,7 +1049,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:55
+#: en/configureX_monitor.xml:59
 msgid ""
 "It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor "
 "type with a sync range that is beyond the capabilities of your monitor: you "
@@ -1053,56 +1058,56 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:64
+#: en/configureX_monitor.xml:68
 msgid "Plug'n Play"
 msgstr "Plug & Play"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:67
+#: en/configureX_monitor.xml:71
 msgid ""
 "This is the default option and automatically tries to determine the monitor "
 "type from the monitor database."
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:77
+#: en/configureX_monitor.xml:81
 msgid ""
 "If the installer has not correctly detected your monitor and you know which "
-"one you have, you can select it from the tree by selecting:"
+"one you have, you can choose it from the options by selecting:"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:86
+#: en/configureX_monitor.xml:90
 msgid "Manufacturer"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:90
+#: en/configureX_monitor.xml:94
 msgid "Monitor model"
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:96
+#: en/configureX_monitor.xml:100
 msgid "Generic"
 msgstr "Общ"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:99
+#: en/configureX_monitor.xml:103
 msgid ""
-"Selecting this group will list nearly 30 display configurations such as "
-"1024x768 @ 60Hz and includes flat-panel displays as used in laptops. This is "
-"often a good monitor selection group if you need to use the VESA card driver "
-"when your video hardware cannot be determined automatically.  Once again it "
-"may be wise to be conservative in your selections."
+"Selecting this group will list approximately 30 display configurations such "
+"as 1024x768 @ 60Hz and includes flat-panel displays as used in laptops.  "
+"This is often a good monitor selection group if you need to use the VESA "
+"card driver when your video hardware cannot be determined automatically. "
+"Once again, it may be wise to be conservative in your selections."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:22
+#: en/diskdrake.xml:24
 msgid "Custom Disk Partitioning with DiskDrake"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:27
+#: en/diskdrake.xml:29
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-diskdrake.png\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1110,7 +1115,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:38
+#: en/diskdrake.xml:40
 msgid ""
 "Modify the layout of your disk(s) here. You can remove or create partitions, "
 "change the filesystem or size of a partition and even view their details "
@@ -1118,15 +1123,15 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:47
 msgid ""
 "There is a tab at the top for every detected hard disk (or other storage "
-"device, like a USB key). In the screenshot above there are two available "
-"devices: <filename>sda </filename>and <filename>sdb</filename>."
+"device, like a USB key), for example: <filename>sda</filename>, "
+"<filename>sdb</filename>, <filename>sdc</filename> etc."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:52
+#: en/diskdrake.xml:54
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it. "
@@ -1135,21 +1140,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:60
+#: en/diskdrake.xml:62
 msgid ""
 "Continue until you have adjusted everything to your satisfaction, then click "
 "<emphasis>Done</emphasis> when you're ready."
 msgstr ""
 
 #. type: Content of: <section><warning><orderedlist><listitem><para>
-#: en/diskdrake.xml:69
+#: en/diskdrake.xml:71
 msgid ""
 "Take care with the <emphasis>Clear all</emphasis> option, use it only if you "
 "are sure you want to wipe all partitions on the selected storage device."
 msgstr ""
 
 #. type: Content of: <section><warning><orderedlist><listitem><para>
-#: en/diskdrake.xml:75
+#: en/diskdrake.xml:77
 msgid ""
 "If you wish to use encryption on your <filename>/</filename> partition you "
 "must ensure that you have a separate <filename>/boot</filename> partition. "
@@ -1158,7 +1163,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/diskdrake.xml:87
+#: en/diskdrake.xml:89
 msgid ""
 "If you are installing Mageia on a UEFI system, check that an ESP (EFI System "
 "Partition) is present and correctly mounted on <filename>/boot/EFI</"
@@ -1166,19 +1171,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/diskdrake.xml:93
+#: en/diskdrake.xml:95
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
 "partition is present and of the correct type. See Figure 2 below."
 msgstr ""
 
 #. type: Content of: <section><figure><title>
-#: en/diskdrake.xml:101
+#: en/diskdrake.xml:103
 msgid "EFI System Partition"
 msgstr ""
 
 #. type: Content of: <section><figure><mediaobject>
-#: en/diskdrake.xml:104
+#: en/diskdrake.xml:106
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-diskdrake2.png\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1186,17 +1191,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><figure>
-#: en/diskdrake.xml:103 en/diskdrake.xml:117
+#: en/diskdrake.xml:105 en/diskdrake.xml:119
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><figure><title>
-#: en/diskdrake.xml:115
+#: en/diskdrake.xml:117
 msgid "BIOS boot partition"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:118 en/doPartitionDisks.xml:201
+#: en/diskdrake.xml:120 en/doPartitionDisks.xml:206
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1219,26 +1224,26 @@ msgid "Partitioning"
 msgstr "Управление на дискови дялове"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:31
 msgid "Suggested Partitioning"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:34
 msgid ""
 "In this screen you can see the content of your hard drive(s) along with the "
 "DrakX partitioning proposals for where to install Mageia."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:34
+#: en/doPartitionDisks.xml:38
 msgid ""
 "The actual options available from those shown below will vary according to "
 "the layout and content of your particular hard drive(s)."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:39
+#: en/doPartitionDisks.xml:43
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1247,111 +1252,116 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><title>
-#: en/doPartitionDisks.xml:49
+#: en/doPartitionDisks.xml:53
 msgid "Main Options"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:56
 msgid "<emphasis role=\"bold\">Use Existing Partitions</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:59
 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><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:61
+#: en/doPartitionDisks.xml:65
 msgid "<emphasis role=\"bold\">Use Free Space</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:68
 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><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:70
+#: en/doPartitionDisks.xml:74
 msgid ""
 "<emphasis role=\"bold\">Use Free Space on a Windows Partition</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:73
+#: en/doPartitionDisks.xml:77
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it. 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 important files!"
+"installation but see the warning below."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para><mediaobject>
+#: en/doPartitionDisks.xml:87
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:79
+#: en/doPartitionDisks.xml:82
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
 "light blue and the proposed Mageia partition in dark blue with their "
 "intended sizes just underneath. You have the option to modify these sizes by "
 "clicking and dragging the gap between both partitions.  See the following "
-"screenshot:"
+"screenshot:<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><warning><para>
+#: en/doPartitionDisks.xml:97
+msgid ""
+"This involves shrinking the size of the Windows partition, and therefore is "
+"a risky operation, so you should make sure you have backed up all important "
+"files before proceeding."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><important><para>
+#: en/doPartitionDisks.xml:103
+msgid ""
+"The partition must be \"clean\", meaning that Windows must have closed down "
+"correctly the last time it was used. It must also have been defragmented, "
+"although this is not a guarantee that all files in the partition have been "
+"moved out of the area that is about to be used for Mageia."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:87
+#: en/doPartitionDisks.xml:112
 msgid "<emphasis role=\"bold\">Erase and use Entire Disk</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:90
+#: en/doPartitionDisks.xml:115
 msgid "This option will allocate the entire drive for Mageia"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:119
 msgid ""
 "This will erase ALL data on the selected hard drive. Take care! 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 this option."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><important><para>
-#: en/doPartitionDisks.xml:101
-msgid ""
-"Note that this involves shrinking the size of the Windows partition. The "
-"partition must be \"clean\", meaning that Windows must have closed down "
-"correctly the last time it was used. It must also have been defragmented, "
-"although this is not a guarantee that all files in the partition have been "
-"moved out of the area that is about to be used. It is highly recommended to "
-"back up your personal files."
-msgstr ""
-
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:112
+#: en/doPartitionDisks.xml:127
 msgid "<emphasis role=\"bold\">Custom Disk Partitioning</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:115
+#: en/doPartitionDisks.xml:130
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
 msgstr ""
 
-#. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:122
-msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
-msgstr ""
-
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:131
+#: en/doPartitionDisks.xml:136
 msgid ""
 "If you are not using the <emphasis>Custom disk partitioning</emphasis> "
 "option, then the installer will allocate the available space according to "
@@ -1359,60 +1369,60 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:137
+#: en/doPartitionDisks.xml:142
 msgid ""
 "If the total available space is less than 50 GB, then only one partition is "
 "created. This will be the <filename>/</filename> (root)  partition."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:143
+#: en/doPartitionDisks.xml:148
 msgid ""
 "If the total available space is greater than 50 GB, then three partitions "
 "are created"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:148
+#: en/doPartitionDisks.xml:153
 msgid ""
 "6/19 of the total available place is allocated to <filename>/</filename> "
 "with a maximum of 50 GB"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:153
+#: en/doPartitionDisks.xml:158
 msgid "1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:158
+#: en/doPartitionDisks.xml:163
 msgid "the rest (at least 12/19) is allocated to <filename>/home</filename>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:165
+#: en/doPartitionDisks.xml:170
 msgid ""
 "This means that from 160 GB or greater available space, the installer will "
 "create three partitions:"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:170
+#: en/doPartitionDisks.xml:175
 msgid "50 GB for <filename>/</filename>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:174
+#: en/doPartitionDisks.xml:179
 msgid "4 GB for <filename>swap</filename>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:178
+#: en/doPartitionDisks.xml:183
 msgid "and the remainder for <filename>/home</filename>"
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:183
+#: en/doPartitionDisks.xml:188
 msgid ""
 "If you are using a UEFI system, the ESP (EFI System Partition) will be "
 "automatically detected - or created if it does not exist yet - and mounted "
@@ -1422,7 +1432,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:189
+#: en/doPartitionDisks.xml:194
 msgid ""
 "If you are using a Legacy (also known as BIOS) system with a GPT partitioned "
 "disk, you need to create a BIOS boot partition if it doesn't already exist. "
@@ -1433,19 +1443,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:196
+#: en/doPartitionDisks.xml:201
 msgid "See <xref linkend=\"diskdrake\"/> for information on how to proceed."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:211
+#: en/doPartitionDisks.xml:216
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4.png"
-"\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks4.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks4.png\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:217
+#: en/doPartitionDisks.xml:226
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
 "previous standard of 512. Due to lack of available hardware, the "
@@ -1454,7 +1471,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:222
+#: en/doPartitionDisks.xml:231
 msgid ""
 "Some SSD devices now use an erase block size over 1 MB. If you have such a "
 "device we suggest that you partition the drive in advance, using an "
@@ -1463,17 +1480,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:229
+#: en/doPartitionDisks.xml:238
 msgid "<emphasis>Align to</emphasis> = MiB"
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:233
+#: en/doPartitionDisks.xml:242
 msgid "<emphasis>Free space preceding (MiB)</emphasis> = 2"
 msgstr ""
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:237
+#: en/doPartitionDisks.xml:246
 msgid ""
 "Also make sure all partitions are created using an even number of megabytes."
 msgstr ""
@@ -1633,12 +1650,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/firewall.xml:7
+#: en/firewall.xml:16
 msgid "Firewall"
 msgstr "Защитна стена"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:10
+#: en/firewall.xml:19
 msgid ""
 "This section allows you to configure some simple firewall rules: they "
 "determine which type of message from the Internet will be accepted by the "
@@ -1646,8 +1663,17 @@ msgid ""
 "system to be accessible from the Internet."
 msgstr ""
 
+#. type: Content of: <section><mediaobject>
+#: en/firewall.xml:26
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-firewall.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+
 #. type: Content of: <section><para>
-#: en/firewall.xml:16
+#: en/firewall.xml:31
 msgid ""
 "In the default setting (no button is checked), no service of the system is "
 "accessible from the network. The <emphasis>Everything (no firewall)</"
@@ -1660,7 +1686,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:25
+#: en/firewall.xml:40
 msgid ""
 "All other options are more or less self-explanatory. As an example, you will "
 "enable the CUPS server if you want printers on your machine to be accessible "
@@ -1668,12 +1694,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:29
+#: en/firewall.xml:44
 msgid "<emphasis role=\"bold\">Advanced</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:31
+#: en/firewall.xml:46
 msgid ""
 "The <emphasis>Advanced</emphasis> option opens a window where you can enable "
 "a series of services by typing a list of <quote>couples</quote> (blank "
@@ -1681,34 +1707,35 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:35
-msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
+#: en/firewall.xml:50
+msgid "<emphasis>&lt;port-number&gt;/&lt;protocol&gt;</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:38
+#: en/firewall.xml:53
 msgid ""
-"- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
-"the service you want to enable (e.g. 873 for the RSYNC service) as defined "
-"in <emphasis>RFC-433</emphasis>;"
+"- <emphasis>&lt;port-number&gt;</emphasis> is the value of the port assigned "
+"to the service you want to enable (e.g. 873 for the RSYNC service) as "
+"defined in <emphasis>RFC-433</emphasis>;"
 msgstr ""
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:42
+#: en/firewall.xml:57
 msgid ""
-"- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
-"<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
+"- <emphasis>&lt;protocol&gt;</emphasis> is one of <emphasis>TCP</emphasis> "
+"or <emphasis>UDP</emphasis> - the internet protocol that is used by the "
+"service."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:47
+#: en/firewall.xml:62
 msgid ""
 "For instance, the entry for enabling access to the RSYNC service therefore "
 "is <emphasis>873/tcp</emphasis>."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:50
+#: en/firewall.xml:65
 msgid ""
 "In case a service is implemented to use both protocols, you specify 2 "
 "couples for the same port."
@@ -1776,12 +1803,12 @@ msgid "Graphical Configuration"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:32
+#: en/installer.xml:34
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, инсталатора на Mageia"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:35
+#: en/installer.xml:37
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -1789,33 +1816,33 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:40
+#: en/installer.xml:42
 msgid "The installation steps"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:44
+#: en/installer.xml:46
 msgid ""
 "The install process is divided into a number of steps - the status of which "
 "is indicated in a panel to the left of the screen."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:50
+#: en/installer.xml:52
 msgid ""
 "Each step has one or more screens, which may also have <emphasis>Advanced</"
 "emphasis> sections with extra, less commonly required options."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:56
+#: en/installer.xml:58
 msgid ""
 "Most screens have <emphasis>Help</emphasis> buttons for further details "
 "about the particular step."
 msgstr ""
 
 #. type: Content of: <section><section><caution><para>
-#: en/installer.xml:62
+#: en/installer.xml:64
 msgid ""
 "If at some point during the install you decide to abort the installation, it "
 "is possible to reboot, but please think twice before you do this. Once a "
@@ -1825,7 +1852,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><caution><para>
-#: en/installer.xml:68
+#: en/installer.xml:70
 msgid ""
 "If, in spite of this, you are very sure rebooting is what you want, go to a "
 "text terminal by pressing the keys <keycombo> <keycap>Ctrl</keycap> "
@@ -1835,12 +1862,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:86
+#: en/installer.xml:88
 msgid "Installation Welcome Screen"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:88
+#: en/installer.xml:90
 msgid ""
 "The particular screen that you will first see when booting from the "
 "Installation media will depend on whether your computer motherboard is of "
@@ -1848,60 +1875,60 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:92
+#: en/installer.xml:94
 msgid ""
 "The welcome menu screen has various options, however the default option will "
 "start the installer, and is normally all that you will need."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:97
+#: en/installer.xml:99
 msgid "Legacy (BIOS) Systems"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:100
+#: en/installer.xml:102
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome.png\"/> </"
 "imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:111
+#: en/installer.xml:113
 msgid ""
 "Install Mageia to a hard disk. This is the default option, and will "
 "automatically start after a short while unless another option is selected."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:117
+#: en/installer.xml:119
 msgid "<emphasis role=\"bold\">Rescue System</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:119
+#: en/installer.xml:121
 msgid ""
 "This option allows you to either re-install the bootloader for an existing "
 "Mageia installation or you can use it to restore a Windows bootloader."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:132
+#: en/installer.xml:134
 msgid "<emphasis role=\"bold\">F2: Language</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:134
+#: en/installer.xml:136
 msgid "Press F2 for alternative languages."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:140
+#: en/installer.xml:142
 msgid "UEFI Systems"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:142
+#: en/installer.xml:144
 msgid ""
 "From this screen, you can access options by pressing <keycap>e</keycap> to "
 "enter the edit mode. To come back to this screen, press <keycap>Esc</keycap> "
@@ -1909,19 +1936,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:148
+#: en/installer.xml:150
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome2.png\"/> </"
 "imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:157
+#: en/installer.xml:159
 msgid "<emphasis role=\"bold\">Install:</emphasis> Start the Install process"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:162
+#: en/installer.xml:164
 msgid ""
 "<emphasis role=\"bold\">Rescue:</emphasis> This option allows you to either "
 "re-install the bootloader for an existing Mageia installation or you can use "
@@ -1929,31 +1956,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:169
+#: en/installer.xml:171
 msgid ""
 "<emphasis role=\"bold\">F2: Language:</emphasis> Press <keycap>F2</keycap> "
 "for alternative languages."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:174
+#: en/installer.xml:176
 msgid ""
 "If you booted from a USB stick, you will see the above options duplicated, "
 "and in this case, you should use the set that will be suffixed with \"USB\"."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:181
+#: en/installer.xml:183
 msgid "Installation Problems and Possible Solutions"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:184
+#: en/installer.xml:186
 msgid "No Graphical Interface"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:188
+#: en/installer.xml:190
 msgid ""
 "After the initial screen you did not progress to the <emphasis>Language "
 "Selection</emphasis> screen. This can happen with some graphic cards and "
@@ -1962,7 +1989,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:195
+#: en/installer.xml:197
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
 "In this case it is worth trying a text-mode installation. To use this press "
@@ -1973,12 +2000,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:208
+#: en/installer.xml:210
 msgid "The Install Freezes"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:210
+#: en/installer.xml:212
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic hardware "
@@ -1988,12 +2015,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:218
+#: en/installer.xml:220
 msgid "RAM problem"
 msgstr "Проблем с RAM паметта"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:220
+#: en/installer.xml:222
 msgid ""
 "This will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
@@ -2003,12 +2030,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:228
+#: en/installer.xml:230
 msgid "Dynamic partitions"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:230
+#: en/installer.xml:232
 msgid ""
 "If you converted your hard disk from <literal>Basic</literal> format to "
 "<literal>Dynamic</literal> format in Microsoft Windows, then it is not "
@@ -3601,73 +3628,106 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:27
+#: en/setupBootloader.xml:32
 msgid "Bootloader"
 msgstr "Програма за начално зареждане"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:31
+#: en/setupBootloader.xml:36
+#, fuzzy
+msgid "Available Bootloaders"
+msgstr "Програма за начално зареждане"
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:39
 msgid "Grub2"
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><title>
-#: en/setupBootloader.xml:34
-msgid "Grub2 on Legacy MBR/GPT systems"
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:42
+msgid "<emphasis role=\"bold\">Grub2 on Legacy MBR/GPT systems</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:37
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:46
 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:42
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:52
 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:49
-msgid "Grub2-efi on UEFI systems"
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:59
+msgid "<emphasis role=\"bold\">Grub2-efi on UEFI systems</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:52
-msgid "GRUB2-efi will be used exclusively as the bootloader for a UEFI system."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:63
+msgid "GRUB2-efi or rEFInd may be used as the bootloader for a UEFI system."
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:57
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:68
 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:60
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:71
 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 "
-"created by Windows and add grub2-efi to it. If no ESP exists, then one will "
+"created by Windows and add grub2-efi to it.  If no ESP exists, then one will "
 "be created. Although it is possible to have several ESPs, only one is "
 "required, whatever the number of operating systems you have."
 msgstr ""
 
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:82
+msgid "rEFInd"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:85
+msgid "<emphasis role=\"bold\">rEFInd on UEFI systems</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:88
+msgid ""
+"rEFInd has a nice graphical set of options, and can auto-detect installed "
+"EFI bootloaders. See: http://www.rodsbooks.com/refind/"
+msgstr ""
+
+#. type: Content of: <section><section><section><note><para>
+#: en/setupBootloader.xml:95
+msgid ""
+"Please note that in order to be able to use the <literal>rEFInd</literal> "
+"option, an installed EFI System Partition must match your system "
+"architecture: if you have a 32bit EFI System Partition installed on a 64bit "
+"machine for instance, then the rEFInd option will not be displayed/available "
+"to you."
+msgstr ""
+
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:72
+#: en/setupBootloader.xml:106
 msgid "Bootloader Setup"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:76
+#: en/setupBootloader.xml:110
 msgid "Bootloader main options"
 msgstr "Опции на програмата за начално зареждане"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:79
+#: en/setupBootloader.xml:113
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader.png\"/> </imageobject> <imageobject condition=\"live"
@@ -3676,47 +3736,69 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:91
+#: en/setupBootloader.xml:125
 msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:93
+#. type: Content of: <section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:129
+msgid ""
+"<guimenuitem>GRUB2</guimenuitem> (with either a graphical or a text menu), "
+"can be chosen for both <literal>Legacy MBR/BIOS</literal> systems and "
+"<literal>UEFI</literal> systems."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:136
 msgid ""
-"This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI "
-"systems will not see this option here."
+"<guimenuitem>rEFInd</guimenuitem> (with a graphical menu)  is an alternative "
+"option solely for use with <literal>UEFI</literal> systems."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:98
+#: en/setupBootloader.xml:144
 msgid "<emphasis role=\"bold\">Boot device</emphasis>"
 msgstr ""
 
+#. type: Content of: <section><section><section><itemizedlist><listitem><warning><para>
+#: en/setupBootloader.xml:147
+msgid "Don't change this unless you really know what you are doing."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><note><para>
+#: en/setupBootloader.xml:152
+msgid ""
+"There is no option to write GRUB to the boot sector of a partition (e.g: "
+"<filename>sda1</filename>), as this method is considered unreliable."
+msgstr ""
+
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:100
-msgid "Don't change this unless you really know what you are doing"
+#: en/setupBootloader.xml:157
+msgid ""
+"When using UEFI mode, then the <guilabel>Boot device</guilabel> will be "
+"listed as <guimenuitem>EFI System Partition</guimenuitem>."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:105
+#: en/setupBootloader.xml:163
 msgid ""
 "<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:108
+#: en/setupBootloader.xml:166
 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:113
+#: en/setupBootloader.xml:171
 msgid "<emphasis role=\"bold\">Security</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:115
+#: en/setupBootloader.xml:173
 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 "
@@ -3726,34 +3808,34 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:126
+#: en/setupBootloader.xml:184
 msgid "Choose a password for the bootloader (optional)"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:130
+#: en/setupBootloader.xml:188
 msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:132
+#: en/setupBootloader.xml:190
 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:137 en/setupBootloader.xml:212
+#: en/setupBootloader.xml:195 en/setupBootloader.xml:308
 msgid "<emphasis>Advanced</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:141
+#: en/setupBootloader.xml:199
 msgid "<emphasis>Enable ACPI</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:143
+#: en/setupBootloader.xml:201
 msgid ""
 "ACPI (Advanced Configuration and Power Interface) is a standard for power "
 "management. It can save energy by stopping unused devices. Deselecting it "
@@ -3763,24 +3845,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:152
+#: en/setupBootloader.xml:210
 msgid "<emphasis>Enable SMP</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:154
+#: en/setupBootloader.xml:212
 msgid ""
 "This option enables/disables symmetric multiprocessing for multi-core "
 "processors"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:159
+#: en/setupBootloader.xml:217
 msgid "<emphasis>Enable APIC</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:161
+#: en/setupBootloader.xml:219
 msgid ""
 "Enabling this gives the operating system access to the Advanced Programmable "
 "Interrupt Controller. APIC devices permit more complex priority models, and "
@@ -3788,24 +3870,82 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:168
+#: en/setupBootloader.xml:226
 msgid "<emphasis>Enable Local APIC</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:170
+#: en/setupBootloader.xml:228
 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:177
+#: en/setupBootloader.xml:235
 msgid "Bootloader Configuration"
 msgstr "Конфигуриране на програмата за начално зареждане"
 
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:237
+msgid ""
+"If, in the previous section you selected <literal>rEFInd</literal> as the "
+"bootloader to use, you would then be presented with the options shown in the "
+"screenshot directly below. Otherwise, please instead move on to the "
+"subsequent screenshot for your options."
+msgstr ""
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:243
+#, fuzzy
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"rEFIndLoaderConfig.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-rEFIndLoaderConfig.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:253
+#, fuzzy
+msgid "Your rEFInd configuration options:"
+msgstr "Конфигуриране на звука"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:256
+msgid ""
+"<guimenuitem>Install or update rEFInd in the EFI system partition.</"
+"guimenuitem>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:261
+msgid ""
+"<guimenuitem>Install in EFI/Boot partition (workaround for some BIOS's).</"
+"guimenuitem>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:264
+msgid ""
+"With some BIOS's, the newly written bootloaser for Mageia at end of the "
+"installation will not be recognized. In that case, you can use this option "
+"as a workaround for the issue."
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:270
+msgid ""
+"If you did not select rEFInd as the bootloader to use in the previous "
+"section, then your bootloader configurations are shown below:"
+msgstr ""
+
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:180
+#: en/setupBootloader.xml:275
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -3814,42 +3954,42 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:191
+#: en/setupBootloader.xml:286
 msgid "<emphasis role=\"bold\">Default</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:193
+#: en/setupBootloader.xml:288
 msgid "The operating system to be started up by default."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:197
+#: en/setupBootloader.xml:292
 msgid "<emphasis role=\"bold\">Append</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:199
+#: en/setupBootloader.xml:294
 msgid ""
 "This option lets you pass information to the kernel 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:204
+#: en/setupBootloader.xml:299
 msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:206
+#: en/setupBootloader.xml:301
 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, "
-"then untick the Probe Foreign OS option."
+"then untick the <guimenuitem>Probe Foreign OS</guimenuitem> option."
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:215
+#: en/setupBootloader.xml:311
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader4.png\"/> </imageobject> <imageobject condition=\"live"
@@ -3858,12 +3998,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:226
+#: en/setupBootloader.xml:322
 msgid "<emphasis>Video mode</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:228
+#: en/setupBootloader.xml:324
 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 "
@@ -3871,38 +4011,47 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:234
+#: en/setupBootloader.xml:330
 msgid "<emphasis>Do not touch ESP or MBR</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:236
+#: en/setupBootloader.xml:332
 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 "
-"missing. Click<emphasis> Ok</emphasis> if you are sure you understand the "
-"implications, and wish to proceed."
+"missing. Click <guimenuitem>Ok </guimenuitem>only if you are sure you "
+"understand the implications, and wish to proceed."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><warning><para>
+#: en/setupBootloader.xml:338
+msgid ""
+"Chain-loading via legacy bootloaders (GRUB Legacy and LiLo)  is no longer "
+"supported by Mageia as it is likely to fail when attempting to boot this "
+"resulting installation of Mageia. If you use anything other than GRUB2 or "
+"rEFInd for this purpose, then you do so at your own risk!"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:245
+#: en/setupBootloader.xml:348
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png"
 "\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:253
+#: en/setupBootloader.xml:356
 msgid "Other Options"
 msgstr "Други параметри"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:256
+#: en/setupBootloader.xml:359
 msgid "Using an existing bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:258
+#: en/setupBootloader.xml:361
 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 "
@@ -3912,12 +4061,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:267
+#: en/setupBootloader.xml:370
 msgid "Installing Without a Bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:269
+#: en/setupBootloader.xml:372
 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 "
diff --git a/docs/docs/stable/installer/ca.po b/docs/docs/stable/installer/ca.po
index c48a4989..3acbe2ef 100644
--- a/docs/docs/stable/installer/ca.po
+++ b/docs/docs/stable/installer/ca.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2019-01-19 21:23+0200\n"
+"POT-Creation-Date: 2019-09-08 15:26+0300\n"
 "PO-Revision-Date: 2019-05-27 15:12+0000\n"
 "Last-Translator: Davidmp <medipas@gmail.com>\n"
 "Language-Team: Catalan (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -154,7 +154,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/addUser.xml:3
+#: en/addUser.xml:9
 msgid "User Management"
 msgstr ""
 
@@ -164,13 +164,16 @@ msgstr ""
 #. 2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
 #.   Also changed 'Advanced User Management' to 'User Management (advanced)'.
 #. 2018/02/24 apb: Changed list style.
+#. 2019/08/10 apb: Added missing 'condition' profile for live-user1.png.
+#. 2019/08/11 apb: [1] Reword 1.1 (including Note) [2] Reword 1.2 Password text.
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:12
+#: en/addUser.xml:28
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
-"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
-"\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata format="
-"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-setRootPassword.png\" format=\"PNG\" revision=\"1\" xml:id="
+"\"setRootPassword-im1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-user1.png\" format=\"PNG\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
 "\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -178,36 +181,41 @@ msgstr ""
 "\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:21
+#: en/addUser.xml:40
 msgid "Set Administrator (root)  Password:"
 msgstr "Estableix la contrasenya d'administrador (root):"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:24
+#: en/addUser.xml:44
 msgid ""
 "It is advisable for all Mageia installations to set a <literal>superuser</"
 "literal> (Administrator) password, usually called the <emphasis>root </"
-"emphasis>password in Linux. As you type a password into the top box a shield "
-"will change from red-to-yellow-to-green depending on the strength of the "
-"password. A green shield shows you are using a strong password. You need to "
-"repeat the same password in the box underneath, to check that the first "
-"entry was not mistyped."
+"emphasis>password in Linux. You need to repeat the same password in the box "
+"underneath, to check that the first entry was not mistyped."
+msgstr ""
+
+#. type: Content of: <section><section><note><para>
+#: en/addUser.xml:51
+msgid ""
+"As you type a password into the top box a shield will change from red-to-"
+"yellow-to-green depending on the strength of the password. A green shield "
+"shows you are using a strong password."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:32
+#: en/addUser.xml:55
 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:39
+#: en/addUser.xml:63
 msgid "Enter a user"
 msgstr "Introduïu un usuari"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:41
+#: en/addUser.xml:66
 msgid ""
 "Add a User here. A regular user has fewer privileges than the "
 "<literal>superuser</literal> (root), but enough to use the Internet, office "
@@ -216,39 +224,39 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:47
+#: en/addUser.xml:73
 msgid "<emphasis role=\"bold\">Icon</emphasis>"
 msgstr "<emphasis role=\"bold\">Icona</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:48
+#: en/addUser.xml:75
 msgid "Click on this button if you want to change the user's icon"
 msgstr "Feu clic a aquest botó si voleu canviar la icona de l'usuari"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:52
+#: en/addUser.xml:80
 msgid "<emphasis role=\"bold\">Real Name</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:53
+#: en/addUser.xml:82
 msgid "Insert the user's real name into this text box"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:56
+#: en/addUser.xml:86
 msgid "<emphasis role=\"bold\">Login Name</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:57
+#: en/addUser.xml:88
 msgid ""
 "Enter the user login name or let DrakX use a version of the user's real "
 "name. <emphasis role=\"bold\">The login name is case-sensitive.</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><caution><simpara>
-#: en/addUser.xml:61
+#: en/addUser.xml:93
 msgid ""
 "The login entered here should be different to any login currently in use for "
 "your <filename>/home</filename> directory. Some user parameters will be "
@@ -257,34 +265,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:65 en/setupBootloader.xml:124
+#: en/addUser.xml:102 en/setupBootloader.xml:182
 msgid "<emphasis role=\"bold\">Password</emphasis>"
 msgstr "<emphasis role=\"bold\">Contrasenya</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:66
-msgid ""
-"Type in the user password. There is a shield at the end of the text box that "
-"indicates the strength of the password. (See also <xref linkend="
-"\"givePassword\"/>)"
+#: en/addUser.xml:104
+msgid "Type in the user password (remembering the advice in the Note above)."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:68
+#: en/addUser.xml:107
 msgid ""
 "<emphasis role=\"bold\">Password (again):</emphasis> Retype the user "
 "password. DrakX will check that you have not mistyped the password."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:74
+#: en/addUser.xml:114
 msgid ""
 "Any users added while installing Mageia, will have a home directory that is "
 "both read and write protected (umask=0027)"
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:76
+#: en/addUser.xml:117
 msgid ""
 "You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
@@ -292,25 +297,25 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:79
+#: en/addUser.xml:121
 msgid "The access permissions can also be changed after the install."
 msgstr ""
 "Els permisos d'accés també es poden modificar després de la instal·lació."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:85
+#: en/addUser.xml:128
 msgid "User Management (advanced)"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:87
+#: en/addUser.xml:131
 msgid ""
 "The <emphasis>Advanced</emphasis> option allows you to edit further settings "
 "for the user you are adding."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:91
+#: en/addUser.xml:136
 msgid ""
 "<emphasis>Shell</emphasis>: This drop-down list allows you to change the "
 "shell available to any user you added in the previous screen. Options are "
@@ -318,7 +323,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:143
 msgid ""
 "<emphasis>User ID</emphasis>: Here you can set the user ID for any user you "
 "added in the previous screen. If you are unsure what the purpose of this is, "
@@ -326,7 +331,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:102
+#: en/addUser.xml:149
 msgid ""
 "<emphasis>Group ID</emphasis>: This lets you set the group ID.  Again, if "
 "unsure, leave it blank."
@@ -453,24 +458,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:23
+#: en/bootLive.xml:10
 msgid "Boot Mageia as Live system"
 msgstr "Arrencada de Mageia com a sistema autònom"
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:28
+#: en/bootLive.xml:14
 msgid "Booting the medium"
 msgstr "Arrencada del mitjà"
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:31
+#: en/bootLive.xml:16
 msgid ""
 "You can boot directly from a Live DVD or USB. Usually, you just need to plug "
 "the USB device in or place the DVD in the drive and restart the computer."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:35
+#: en/bootLive.xml:19
 msgid ""
 "If the computer does not automatically boot from the USB or DVD you may need "
 "to reconfigure your BIOS Boot Disk priority. Alternatively, you might try "
@@ -479,7 +484,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><tip><para>
-#: en/bootLive.xml:41
+#: en/bootLive.xml:24
 msgid ""
 "To access the BIOS or boot menu when the computer is starting, you can try "
 "pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or <keycap>Esc</"
@@ -489,7 +494,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/bootLive.xml:50
+#: en/bootLive.xml:32
 msgid ""
 "The actual screen that you will first see when booting from the Live media "
 "will depend on whether your computer motherboard is of the Legacy (BIOS) or "
@@ -497,93 +502,94 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:58
+#: en/bootLive.xml:39
 msgid "In BIOS/CSM/Legacy mode"
 msgstr "En mode BIOS/CSM/Legacy"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:62
+#: en/bootLive.xml:42
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"../live-bootCSM.png\" align=\"center\"/> "
+"</imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> </"
+"<imageobject> <imagedata fileref=\"dx2-summaryTop.png\" align=\"center\"/> </"
 "imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:67
+#: en/bootLive.xml:46
 msgid "First screen while booting in BIOS mode"
 msgstr "La primera pantalla de l'arrencada en mode BIOS"
 
 #. type: Content of: <section><section><section><itemizedlist><title>
-#: en/bootLive.xml:72 en/bootLive.xml:144 en/installer.xml:106
-#: en/installer.xml:154
+#: en/bootLive.xml:50 en/bootLive.xml:104 en/installer.xml:108
+#: en/installer.xml:156
 msgid "Menu"
 msgstr "Menú"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:75 en/bootLive.xml:147
+#: en/bootLive.xml:52 en/bootLive.xml:106
 msgid "<emphasis role=\"bold\">Boot Mageia</emphasis>"
 msgstr "<emphasis role=\"bold\">Arrenca Mageia</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:77
+#: en/bootLive.xml:53
 msgid ""
 "This option will boot the Mageia Live system from the connected DVD/USB "
 "media (expect a very slow system compared to an installed OS)."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:81
+#: en/bootLive.xml:56
 msgid "Once the boot is done, you can proceed to the installation."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:86 en/bootLive.xml:102
+#: en/bootLive.xml:60 en/bootLive.xml:72
 msgid ""
 "<emphasis role=\"bold\">+ use non-free video drivers (slower to boot)</"
 "emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:89
+#: en/bootLive.xml:62
 msgid "Boot the Mageia Live system using non-free video drivers"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:96 en/bootLive.xml:155 en/installer.xml:109
+#: en/bootLive.xml:68 en/bootLive.xml:112 en/installer.xml:111
 msgid "<emphasis role=\"bold\">Install Mageia</emphasis>"
 msgstr "<emphasis role=\"bold\">Instal·la Mageia</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:98 en/bootLive.xml:157
+#: en/bootLive.xml:69 en/bootLive.xml:113
 msgid "This option will install Mageia to a hard disk."
 msgstr "Aquesta opció instal·larà Mageia a un disc dur."
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:105
+#: en/bootLive.xml:74
 msgid "Install Mageia using non-free video drivers"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:111 en/installer.xml:125
+#: en/bootLive.xml:79 en/installer.xml:127
 msgid "<emphasis role=\"bold\">Memory Test</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:113 en/installer.xml:127
+#: en/bootLive.xml:80 en/installer.xml:129
 msgid ""
 "Test the installed RAM by performing multiple read and write operations. "
 "Reboot to end the test."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:118 en/bootLive.xml:161
+#: en/bootLive.xml:84 en/bootLive.xml:116
 msgid "<emphasis role=\"bold\"> F2 Language</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:120 en/bootLive.xml:163
+#: en/bootLive.xml:85 en/bootLive.xml:117
 msgid ""
 "Press <keycap>F2</keycap> to have the installer use a specific language "
 "during the installation. Use the arrow keys to select the language then "
@@ -591,26 +597,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:129
+#: en/bootLive.xml:93
 msgid "In UEFI mode"
 msgstr "En mode UEFI"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:133
+#: en/bootLive.xml:96
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:139
+#: en/bootLive.xml:100
 msgid "First screen while booting in UEFI mode"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:149
+#: en/bootLive.xml:107
 msgid ""
 "This option will boot the Mageia Live system from the connected DVD/USB "
 "media (expect a very slow system compared to an installed OS).  Once the "
@@ -618,7 +625,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/bootLive.xml:170
+#: en/bootLive.xml:123
 msgid ""
 "If you booted from a USB stick, you will see the above menu options "
 "duplicated, and in this case, you should choose from the menu pair that will "
@@ -852,12 +859,12 @@ msgstr ""
 "estan configurats a l'hora local, o bé tots a l'hora UTC/GMT."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:24
+#: en/configureX_card_list.xml:27
 msgid "Choose an X Server (Configure your Graphic Card)"
 msgstr "Tria del servidor de les X (configura la targeta gràfica)"
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_card_list.xml:29
+#: en/configureX_card_list.xml:32
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_card_list."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_card_list-im1\"/> </"
@@ -868,7 +875,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:35
+#: en/configureX_card_list.xml:38
 msgid ""
 "DrakX has a very comprehensive database of video cards and will usually "
 "correctly identify your video device."
@@ -877,7 +884,7 @@ msgstr ""
 "identifica correctament el dispositiu de vídeo."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:38
+#: en/configureX_card_list.xml:41
 msgid ""
 "If the installer has not correctly detected your graphic card and you know "
 "which one you have, you can select it from the tree by:"
@@ -886,22 +893,22 @@ msgstr ""
 "quina és, seleccioneu-la a l'arbre:"
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_card_list.xml:41 en/configureX_monitor.xml:74
+#: en/configureX_card_list.xml:44 en/configureX_monitor.xml:78
 msgid "Vendor"
 msgstr "Fabricant"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:45
+#: en/configureX_card_list.xml:48
 msgid "then the make of your card"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:49
+#: en/configureX_card_list.xml:52
 msgid "and the model of card"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:53
+#: en/configureX_card_list.xml:56
 msgid ""
 "If you cannot find your card in the vendor lists (because it's not yet in "
 "the database or it's an older card) you may find a suitable driver in the "
@@ -912,14 +919,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><caution><para>
-#: en/configureX_card_list.xml:61
+#: en/configureX_card_list.xml:64
 msgid ""
 "Be aware that if you select an incompatible driver you may only have access "
 "to the <emphasis>Command Line Interface</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:65
+#: en/configureX_card_list.xml:68
 msgid ""
 "Some video card manufacturers provide proprietary drivers for Linux which "
 "may only be available in the <emphasis>Nonfree</emphasis> repository and in "
@@ -930,17 +937,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:11
-msgid "Graphic Card and Monitor Configuration"
+#: en/configureX_chooser.xml:23
+#, fuzzy
+msgid "Graphics Card and Monitor Configuration"
 msgstr "Configuració de targeta gràfica i monitor"
 
-#.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
-#. 2018/02/15 apb: Some text and typography.
-#. 2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.
-#. 2018/02/23 apb: Typo.
-#. 2019/01/06 apb: Slight reword, split 1st para in two.
 #. type: Content of: <section><mediaobject>
-#: en/configureX_chooser.xml:26
+#: en/configureX_chooser.xml:28
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_chooser."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_chooser-im1\"/> </"
@@ -951,7 +954,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:32
+#: en/configureX_chooser.xml:34
 msgid ""
 "No matter which graphical environment (also known as desktop environment) "
 "you chose for this install of Mageia, they are all based on a graphical user "
@@ -962,31 +965,32 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:39
+#: en/configureX_chooser.xml:41
 msgid ""
 "Choose the appropriate settings manually if you think the details are "
 "incorrect, or if none are shown."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:44
-msgid "<emphasis role=\"bold\">Graphic Card</emphasis>"
-msgstr ""
+#: en/configureX_chooser.xml:46
+#, fuzzy
+msgid "<emphasis role=\"bold\">Graphics Card</emphasis>"
+msgstr "<emphasis role=\"bold\">Interfície gràfica</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:47
+#: en/configureX_chooser.xml:49
 msgid ""
 "If you need to, you can select a specific card from this expandable list. "
 "See <xref linkend=\"configureX_card_list\"/>."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:52
+#: en/configureX_chooser.xml:54
 msgid "<emphasis role=\"bold\">Monitor</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:55
+#: en/configureX_chooser.xml:57
 msgid ""
 "You can choose Plug 'n Play, if applicable, or choose your monitor from the "
 "<emphasis>Vendor</emphasis> or <emphasis>Generic</emphasis> lists. Choose "
@@ -996,22 +1000,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:63
+#: en/configureX_chooser.xml:65
 msgid "<emphasis role=\"bold\">Resolution</emphasis>"
 msgstr "<emphasis role=\"bold\">Resolució</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:66
+#: en/configureX_chooser.xml:68
 msgid "The resolution and color depth of your monitor can be set here."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:71
+#: en/configureX_chooser.xml:73
 msgid "<emphasis role=\"bold\">Test</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:74
+#: en/configureX_chooser.xml:76
 msgid ""
 "The test button does not always appear during install. If the option is "
 "there, and you test your settings, you should be asked to confirm that your "
@@ -1023,17 +1027,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:85
+#: en/configureX_chooser.xml:87
 msgid "<emphasis role=\"bold\">Options</emphasis>"
 msgstr "<emphasis role=\"bold\">Opcions</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:88
+#: en/configureX_chooser.xml:90
 msgid "Here you can choose to enable or disable various options."
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_chooser.xml:93
+#: en/configureX_chooser.xml:95
 msgid ""
 "There is a risk of damaging a monitor if you choose refresh rates that are "
 "outside the frequency range of that monitor. This applies to older CRT "
@@ -1042,12 +1046,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_monitor.xml:22
+#: en/configureX_monitor.xml:26
 msgid "Choosing your Monitor"
 msgstr "Tria del monitor"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:25
+#: en/configureX_monitor.xml:29
 msgid ""
 "DrakX has a very comprehensive database of monitors and will usually "
 "correctly identify yours."
@@ -1056,7 +1060,7 @@ msgstr ""
 "identificarà correctament el vostre."
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:30
+#: en/configureX_monitor.xml:34
 msgid ""
 "<emphasis role=\"bold\">Selecting a monitor with different characteristics "
 "could damage your monitor or video hardware. Please don't try something "
@@ -1065,7 +1069,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:38
+#: en/configureX_monitor.xml:42
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
@@ -1076,12 +1080,12 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:46
+#: en/configureX_monitor.xml:50
 msgid "Custom"
 msgstr "Personalitzat"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:49
+#: en/configureX_monitor.xml:53
 msgid ""
 "This option allows you to set two critical parameters: the vertical refresh "
 "rate and the horizontal sync rate. Vertical refresh determines how often the "
@@ -1090,7 +1094,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:55
+#: en/configureX_monitor.xml:59
 msgid ""
 "It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor "
 "type with a sync range that is beyond the capabilities of your monitor: you "
@@ -1103,58 +1107,59 @@ msgstr ""
 "conservadora i consulteu la documentació del monitor."
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:64
+#: en/configureX_monitor.xml:68
 msgid "Plug'n Play"
 msgstr "Plug'n'Play"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:67
+#: en/configureX_monitor.xml:71
 msgid ""
 "This is the default option and automatically tries to determine the monitor "
 "type from the monitor database."
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:77
+#: en/configureX_monitor.xml:81
+#, fuzzy
 msgid ""
 "If the installer has not correctly detected your monitor and you know which "
-"one you have, you can select it from the tree by selecting:"
+"one you have, you can choose it from the options by selecting:"
 msgstr ""
 "Si l'instal·lador no ha detectat correctament el monitor i sabeu quin és, el "
 "podeu seleccionar de l'arbre:"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:86
+#: en/configureX_monitor.xml:90
 msgid "Manufacturer"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:90
+#: en/configureX_monitor.xml:94
 msgid "Monitor model"
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:96
+#: en/configureX_monitor.xml:100
 msgid "Generic"
 msgstr "Genèric"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:99
+#: en/configureX_monitor.xml:103
 msgid ""
-"Selecting this group will list nearly 30 display configurations such as "
-"1024x768 @ 60Hz and includes flat-panel displays as used in laptops. This is "
-"often a good monitor selection group if you need to use the VESA card driver "
-"when your video hardware cannot be determined automatically.  Once again it "
-"may be wise to be conservative in your selections."
+"Selecting this group will list approximately 30 display configurations such "
+"as 1024x768 @ 60Hz and includes flat-panel displays as used in laptops.  "
+"This is often a good monitor selection group if you need to use the VESA "
+"card driver when your video hardware cannot be determined automatically. "
+"Once again, it may be wise to be conservative in your selections."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:22
+#: en/diskdrake.xml:24
 msgid "Custom Disk Partitioning with DiskDrake"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:27
+#: en/diskdrake.xml:29
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-diskdrake.png\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1165,7 +1170,7 @@ msgstr ""
 "<imagedata align=\"center\" fileref=\"live-diskdrake.png\"/> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:38
+#: en/diskdrake.xml:40
 msgid ""
 "Modify the layout of your disk(s) here. You can remove or create partitions, "
 "change the filesystem or size of a partition and even view their details "
@@ -1173,15 +1178,15 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:47
 msgid ""
 "There is a tab at the top for every detected hard disk (or other storage "
-"device, like a USB key). In the screenshot above there are two available "
-"devices: <filename>sda </filename>and <filename>sdb</filename>."
+"device, like a USB key), for example: <filename>sda</filename>, "
+"<filename>sdb</filename>, <filename>sdc</filename> etc."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:52
+#: en/diskdrake.xml:54
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it. "
@@ -1190,21 +1195,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:60
+#: en/diskdrake.xml:62
 msgid ""
 "Continue until you have adjusted everything to your satisfaction, then click "
 "<emphasis>Done</emphasis> when you're ready."
 msgstr ""
 
 #. type: Content of: <section><warning><orderedlist><listitem><para>
-#: en/diskdrake.xml:69
+#: en/diskdrake.xml:71
 msgid ""
 "Take care with the <emphasis>Clear all</emphasis> option, use it only if you "
 "are sure you want to wipe all partitions on the selected storage device."
 msgstr ""
 
 #. type: Content of: <section><warning><orderedlist><listitem><para>
-#: en/diskdrake.xml:75
+#: en/diskdrake.xml:77
 msgid ""
 "If you wish to use encryption on your <filename>/</filename> partition you "
 "must ensure that you have a separate <filename>/boot</filename> partition. "
@@ -1213,7 +1218,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/diskdrake.xml:87
+#: en/diskdrake.xml:89
 msgid ""
 "If you are installing Mageia on a UEFI system, check that an ESP (EFI System "
 "Partition) is present and correctly mounted on <filename>/boot/EFI</"
@@ -1221,19 +1226,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/diskdrake.xml:93
+#: en/diskdrake.xml:95
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
 "partition is present and of the correct type. See Figure 2 below."
 msgstr ""
 
 #. type: Content of: <section><figure><title>
-#: en/diskdrake.xml:101
+#: en/diskdrake.xml:103
 msgid "EFI System Partition"
 msgstr "Partició EFI del sistema"
 
 #. type: Content of: <section><figure><mediaobject>
-#: en/diskdrake.xml:104
+#: en/diskdrake.xml:106
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-diskdrake2.png\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1244,17 +1249,17 @@ msgstr ""
 "<imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/> </imageobject>"
 
 #. type: Content of: <section><figure>
-#: en/diskdrake.xml:103 en/diskdrake.xml:117
+#: en/diskdrake.xml:105 en/diskdrake.xml:119
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><figure><title>
-#: en/diskdrake.xml:115
+#: en/diskdrake.xml:117
 msgid "BIOS boot partition"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:118 en/doPartitionDisks.xml:201
+#: en/diskdrake.xml:120 en/doPartitionDisks.xml:206
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1277,26 +1282,26 @@ msgid "Partitioning"
 msgstr "Particions"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:31
 msgid "Suggested Partitioning"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:34
 msgid ""
 "In this screen you can see the content of your hard drive(s) along with the "
 "DrakX partitioning proposals for where to install Mageia."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:34
+#: en/doPartitionDisks.xml:38
 msgid ""
 "The actual options available from those shown below will vary according to "
 "the layout and content of your particular hard drive(s)."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:39
+#: en/doPartitionDisks.xml:43
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1309,17 +1314,17 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><itemizedlist><title>
-#: en/doPartitionDisks.xml:49
+#: en/doPartitionDisks.xml:53
 msgid "Main Options"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:56
 msgid "<emphasis role=\"bold\">Use Existing Partitions</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:59
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1328,12 +1333,12 @@ msgstr ""
 "compatibles amb Linux i es podrien utilitzar per a la instal·lació."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:61
+#: en/doPartitionDisks.xml:65
 msgid "<emphasis role=\"bold\">Use Free Space</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:68
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1342,57 +1347,58 @@ msgstr ""
 "instal·lació de Mageia."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:70
+#: en/doPartitionDisks.xml:74
 msgid ""
 "<emphasis role=\"bold\">Use Free Space on a Windows Partition</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:73
+#: en/doPartitionDisks.xml:77
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it. 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 important files!"
+"installation but see the warning below."
 msgstr ""
 
+#. type: Content of: <section><itemizedlist><listitem><para><mediaobject>
+#: en/doPartitionDisks.xml:87
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:79
+#: en/doPartitionDisks.xml:82
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
 "light blue and the proposed Mageia partition in dark blue with their "
 "intended sizes just underneath. You have the option to modify these sizes by "
 "clicking and dragging the gap between both partitions.  See the following "
-"screenshot:"
-msgstr ""
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:87
-msgid "<emphasis role=\"bold\">Erase and use Entire Disk</emphasis>"
-msgstr ""
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:90
-msgid "This option will allocate the entire drive for Mageia"
+"screenshot:<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:97
 msgid ""
-"This will erase ALL data on the selected hard drive. Take care! 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 this option."
+"This involves shrinking the size of the Windows partition, and therefore is "
+"a risky operation, so you should make sure you have backed up all important "
+"files before proceeding."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><important><para>
-#: en/doPartitionDisks.xml:101
+#: en/doPartitionDisks.xml:103
+#, fuzzy
 msgid ""
-"Note that this involves shrinking the size of the Windows partition. The "
-"partition must be \"clean\", meaning that Windows must have closed down "
+"The partition must be \"clean\", meaning that Windows must have closed down "
 "correctly the last time it was used. It must also have been defragmented, "
 "although this is not a guarantee that all files in the partition have been "
-"moved out of the area that is about to be used. It is highly recommended to "
-"back up your personal files."
+"moved out of the area that is about to be used for Mageia."
 msgstr ""
 "Tingueu present que això implica encongir la partició de Windows. La "
 "partició ha d'estar «neta», és a dir, Windows s'ha d'haver tancat "
@@ -1404,11 +1410,29 @@ msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/doPartitionDisks.xml:112
-msgid "<emphasis role=\"bold\">Custom Disk Partitioning</emphasis>"
+msgid "<emphasis role=\"bold\">Erase and use Entire Disk</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/doPartitionDisks.xml:115
+msgid "This option will allocate the entire drive for Mageia"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><warning><para>
+#: en/doPartitionDisks.xml:119
+msgid ""
+"This will erase ALL data on the selected hard drive. Take care! 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 this option."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:127
+msgid "<emphasis role=\"bold\">Custom Disk Partitioning</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:130
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1416,21 +1440,8 @@ msgstr ""
 "Aquesta opció us dona control total sobre la localització de la instal·lació "
 "al(s) disc(s) dur(s)."
 
-#. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:122
-msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
-
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:131
+#: en/doPartitionDisks.xml:136
 msgid ""
 "If you are not using the <emphasis>Custom disk partitioning</emphasis> "
 "option, then the installer will allocate the available space according to "
@@ -1438,60 +1449,60 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:137
+#: en/doPartitionDisks.xml:142
 msgid ""
 "If the total available space is less than 50 GB, then only one partition is "
 "created. This will be the <filename>/</filename> (root)  partition."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:143
+#: en/doPartitionDisks.xml:148
 msgid ""
 "If the total available space is greater than 50 GB, then three partitions "
 "are created"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:148
+#: en/doPartitionDisks.xml:153
 msgid ""
 "6/19 of the total available place is allocated to <filename>/</filename> "
 "with a maximum of 50 GB"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:153
+#: en/doPartitionDisks.xml:158
 msgid "1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:158
+#: en/doPartitionDisks.xml:163
 msgid "the rest (at least 12/19) is allocated to <filename>/home</filename>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:165
+#: en/doPartitionDisks.xml:170
 msgid ""
 "This means that from 160 GB or greater available space, the installer will "
 "create three partitions:"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:170
+#: en/doPartitionDisks.xml:175
 msgid "50 GB for <filename>/</filename>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:174
+#: en/doPartitionDisks.xml:179
 msgid "4 GB for <filename>swap</filename>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:178
+#: en/doPartitionDisks.xml:183
 msgid "and the remainder for <filename>/home</filename>"
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:183
+#: en/doPartitionDisks.xml:188
 msgid ""
 "If you are using a UEFI system, the ESP (EFI System Partition) will be "
 "automatically detected - or created if it does not exist yet - and mounted "
@@ -1501,7 +1512,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:189
+#: en/doPartitionDisks.xml:194
 msgid ""
 "If you are using a Legacy (also known as BIOS) system with a GPT partitioned "
 "disk, you need to create a BIOS boot partition if it doesn't already exist. "
@@ -1512,21 +1523,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:196
+#: en/doPartitionDisks.xml:201
 msgid "See <xref linkend=\"diskdrake\"/> for information on how to proceed."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:211
+#: en/doPartitionDisks.xml:216
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4.png"
-"\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks4.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks4.png\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4.png"
-"\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:217
+#: en/doPartitionDisks.xml:226
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
 "previous standard of 512. Due to lack of available hardware, the "
@@ -1535,7 +1551,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:222
+#: en/doPartitionDisks.xml:231
 msgid ""
 "Some SSD devices now use an erase block size over 1 MB. If you have such a "
 "device we suggest that you partition the drive in advance, using an "
@@ -1544,17 +1560,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:229
+#: en/doPartitionDisks.xml:238
 msgid "<emphasis>Align to</emphasis> = MiB"
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:233
+#: en/doPartitionDisks.xml:242
 msgid "<emphasis>Free space preceding (MiB)</emphasis> = 2"
 msgstr ""
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:237
+#: en/doPartitionDisks.xml:246
 msgid ""
 "Also make sure all partitions are created using an even number of megabytes."
 msgstr ""
@@ -1728,12 +1744,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/firewall.xml:7
+#: en/firewall.xml:16
 msgid "Firewall"
 msgstr "Tallafoc"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:10
+#: en/firewall.xml:19
 msgid ""
 "This section allows you to configure some simple firewall rules: they "
 "determine which type of message from the Internet will be accepted by the "
@@ -1741,8 +1757,18 @@ msgid ""
 "system to be accessible from the Internet."
 msgstr ""
 
+#. type: Content of: <section><mediaobject>
+#: en/firewall.xml:26
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-firewall.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome.png\"/> </"
+"imageobject>"
+
 #. type: Content of: <section><para>
-#: en/firewall.xml:16
+#: en/firewall.xml:31
 msgid ""
 "In the default setting (no button is checked), no service of the system is "
 "accessible from the network. The <emphasis>Everything (no firewall)</"
@@ -1755,7 +1781,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:25
+#: en/firewall.xml:40
 msgid ""
 "All other options are more or less self-explanatory. As an example, you will "
 "enable the CUPS server if you want printers on your machine to be accessible "
@@ -1763,12 +1789,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:29
+#: en/firewall.xml:44
 msgid "<emphasis role=\"bold\">Advanced</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:31
+#: en/firewall.xml:46
 msgid ""
 "The <emphasis>Advanced</emphasis> option opens a window where you can enable "
 "a series of services by typing a list of <quote>couples</quote> (blank "
@@ -1776,34 +1802,35 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:35
-msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
+#: en/firewall.xml:50
+msgid "<emphasis>&lt;port-number&gt;/&lt;protocol&gt;</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:38
+#: en/firewall.xml:53
 msgid ""
-"- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
-"the service you want to enable (e.g. 873 for the RSYNC service) as defined "
-"in <emphasis>RFC-433</emphasis>;"
+"- <emphasis>&lt;port-number&gt;</emphasis> is the value of the port assigned "
+"to the service you want to enable (e.g. 873 for the RSYNC service) as "
+"defined in <emphasis>RFC-433</emphasis>;"
 msgstr ""
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:42
+#: en/firewall.xml:57
 msgid ""
-"- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
-"<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
+"- <emphasis>&lt;protocol&gt;</emphasis> is one of <emphasis>TCP</emphasis> "
+"or <emphasis>UDP</emphasis> - the internet protocol that is used by the "
+"service."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:47
+#: en/firewall.xml:62
 msgid ""
 "For instance, the entry for enabling access to the RSYNC service therefore "
 "is <emphasis>873/tcp</emphasis>."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:50
+#: en/firewall.xml:65
 msgid ""
 "In case a service is implemented to use both protocols, you specify 2 "
 "couples for the same port."
@@ -1876,12 +1903,12 @@ msgid "Graphical Configuration"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:32
+#: en/installer.xml:34
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, l'instal·lador de Mageia"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:35
+#: en/installer.xml:37
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -1892,33 +1919,33 @@ msgstr ""
 "instal·lació o actualització tan fàcil com sigui possible."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:40
+#: en/installer.xml:42
 msgid "The installation steps"
 msgstr "Passos de la instal·lació"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:44
+#: en/installer.xml:46
 msgid ""
 "The install process is divided into a number of steps - the status of which "
 "is indicated in a panel to the left of the screen."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:50
+#: en/installer.xml:52
 msgid ""
 "Each step has one or more screens, which may also have <emphasis>Advanced</"
 "emphasis> sections with extra, less commonly required options."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:56
+#: en/installer.xml:58
 msgid ""
 "Most screens have <emphasis>Help</emphasis> buttons for further details "
 "about the particular step."
 msgstr ""
 
 #. type: Content of: <section><section><caution><para>
-#: en/installer.xml:62
+#: en/installer.xml:64
 msgid ""
 "If at some point during the install you decide to abort the installation, it "
 "is possible to reboot, but please think twice before you do this. Once a "
@@ -1928,7 +1955,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><caution><para>
-#: en/installer.xml:68
+#: en/installer.xml:70
 msgid ""
 "If, in spite of this, you are very sure rebooting is what you want, go to a "
 "text terminal by pressing the keys <keycombo> <keycap>Ctrl</keycap> "
@@ -1938,12 +1965,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:86
+#: en/installer.xml:88
 msgid "Installation Welcome Screen"
 msgstr "Pantalla de benvinguda de la instal·lació"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:88
+#: en/installer.xml:90
 msgid ""
 "The particular screen that you will first see when booting from the "
 "Installation media will depend on whether your computer motherboard is of "
@@ -1951,19 +1978,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:92
+#: en/installer.xml:94
 msgid ""
 "The welcome menu screen has various options, however the default option will "
 "start the installer, and is normally all that you will need."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:97
+#: en/installer.xml:99
 msgid "Legacy (BIOS) Systems"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:100
+#: en/installer.xml:102
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome.png\"/> </"
 "imageobject>"
@@ -1972,41 +1999,41 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:111
+#: en/installer.xml:113
 msgid ""
 "Install Mageia to a hard disk. This is the default option, and will "
 "automatically start after a short while unless another option is selected."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:117
+#: en/installer.xml:119
 msgid "<emphasis role=\"bold\">Rescue System</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:119
+#: en/installer.xml:121
 msgid ""
 "This option allows you to either re-install the bootloader for an existing "
 "Mageia installation or you can use it to restore a Windows bootloader."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:132
+#: en/installer.xml:134
 msgid "<emphasis role=\"bold\">F2: Language</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:134
+#: en/installer.xml:136
 msgid "Press F2 for alternative languages."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:140
+#: en/installer.xml:142
 msgid "UEFI Systems"
 msgstr "Sistemes UEFI"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:142
+#: en/installer.xml:144
 msgid ""
 "From this screen, you can access options by pressing <keycap>e</keycap> to "
 "enter the edit mode. To come back to this screen, press <keycap>Esc</keycap> "
@@ -2014,7 +2041,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:148
+#: en/installer.xml:150
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome2.png\"/> </"
 "imageobject>"
@@ -2023,12 +2050,12 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:157
+#: en/installer.xml:159
 msgid "<emphasis role=\"bold\">Install:</emphasis> Start the Install process"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:162
+#: en/installer.xml:164
 msgid ""
 "<emphasis role=\"bold\">Rescue:</emphasis> This option allows you to either "
 "re-install the bootloader for an existing Mageia installation or you can use "
@@ -2036,31 +2063,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:169
+#: en/installer.xml:171
 msgid ""
 "<emphasis role=\"bold\">F2: Language:</emphasis> Press <keycap>F2</keycap> "
 "for alternative languages."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:174
+#: en/installer.xml:176
 msgid ""
 "If you booted from a USB stick, you will see the above options duplicated, "
 "and in this case, you should use the set that will be suffixed with \"USB\"."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:181
+#: en/installer.xml:183
 msgid "Installation Problems and Possible Solutions"
 msgstr "Problemes en la instal·lació i possibles solucions"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:184
+#: en/installer.xml:186
 msgid "No Graphical Interface"
 msgstr "Sense interfície gràfica"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:188
+#: en/installer.xml:190
 msgid ""
 "After the initial screen you did not progress to the <emphasis>Language "
 "Selection</emphasis> screen. This can happen with some graphic cards and "
@@ -2069,7 +2096,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:195
+#: en/installer.xml:197
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
 "In this case it is worth trying a text-mode installation. To use this press "
@@ -2080,12 +2107,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:208
+#: en/installer.xml:210
 msgid "The Install Freezes"
 msgstr "La instal·lació es penja"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:210
+#: en/installer.xml:212
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic hardware "
@@ -2095,12 +2122,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:218
+#: en/installer.xml:220
 msgid "RAM problem"
 msgstr "Problema en la RAM"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:220
+#: en/installer.xml:222
 msgid ""
 "This will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
@@ -2110,12 +2137,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:228
+#: en/installer.xml:230
 msgid "Dynamic partitions"
 msgstr "Particions dinàmiques"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:230
+#: en/installer.xml:232
 msgid ""
 "If you converted your hard disk from <literal>Basic</literal> format to "
 "<literal>Dynamic</literal> format in Microsoft Windows, then it is not "
@@ -3773,73 +3800,109 @@ msgstr ""
 "efi_and_Mageia</link>"
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:27
+#: en/setupBootloader.xml:32
 msgid "Bootloader"
 msgstr "Gestor d'arrencada"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:31
+#: en/setupBootloader.xml:36
+#, fuzzy
+msgid "Available Bootloaders"
+msgstr "Gestor d'arrencada"
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:39
 msgid "Grub2"
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><title>
-#: en/setupBootloader.xml:34
-msgid "Grub2 on Legacy MBR/GPT systems"
-msgstr ""
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:42
+#, fuzzy
+msgid "<emphasis role=\"bold\">Grub2 on Legacy MBR/GPT systems</emphasis>"
+msgstr "<emphasis role=\"bold\">Servidors intermediaris</emphasis>"
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:37
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:46
 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:42
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:52
 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:49
-msgid "Grub2-efi on UEFI systems"
-msgstr ""
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:59
+#, fuzzy
+msgid "<emphasis role=\"bold\">Grub2-efi on UEFI systems</emphasis>"
+msgstr "<emphasis role=\"bold\">Opcions</emphasis>"
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:52
-msgid "GRUB2-efi will be used exclusively as the bootloader for a UEFI system."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:63
+msgid "GRUB2-efi or rEFInd may be used as the bootloader for a UEFI system."
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:57
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:68
 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:60
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:71
 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 "
-"created by Windows and add grub2-efi to it. If no ESP exists, then one will "
+"created by Windows and add grub2-efi to it.  If no ESP exists, then one will "
 "be created. Although it is possible to have several ESPs, only one is "
 "required, whatever the number of operating systems you have."
 msgstr ""
 
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:82
+msgid "rEFInd"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:85
+#, fuzzy
+msgid "<emphasis role=\"bold\">rEFInd on UEFI systems</emphasis>"
+msgstr "<emphasis role=\"bold\">Icona</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:88
+msgid ""
+"rEFInd has a nice graphical set of options, and can auto-detect installed "
+"EFI bootloaders. See: http://www.rodsbooks.com/refind/"
+msgstr ""
+
+#. type: Content of: <section><section><section><note><para>
+#: en/setupBootloader.xml:95
+msgid ""
+"Please note that in order to be able to use the <literal>rEFInd</literal> "
+"option, an installed EFI System Partition must match your system "
+"architecture: if you have a 32bit EFI System Partition installed on a 64bit "
+"machine for instance, then the rEFInd option will not be displayed/available "
+"to you."
+msgstr ""
+
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:72
+#: en/setupBootloader.xml:106
 msgid "Bootloader Setup"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:76
+#: en/setupBootloader.xml:110
 msgid "Bootloader main options"
 msgstr "Opcions principals del menú d'arrencada"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:79
+#: en/setupBootloader.xml:113
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader.png\"/> </imageobject> <imageobject condition=\"live"
@@ -3852,47 +3915,70 @@ msgstr ""
 "im1\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:91
+#: en/setupBootloader.xml:125
 msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:93
+#. type: Content of: <section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:129
+msgid ""
+"<guimenuitem>GRUB2</guimenuitem> (with either a graphical or a text menu), "
+"can be chosen for both <literal>Legacy MBR/BIOS</literal> systems and "
+"<literal>UEFI</literal> systems."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:136
 msgid ""
-"This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI "
-"systems will not see this option here."
+"<guimenuitem>rEFInd</guimenuitem> (with a graphical menu)  is an alternative "
+"option solely for use with <literal>UEFI</literal> systems."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:98
+#: en/setupBootloader.xml:144
 msgid "<emphasis role=\"bold\">Boot device</emphasis>"
 msgstr ""
 
+#. type: Content of: <section><section><section><itemizedlist><listitem><warning><para>
+#: en/setupBootloader.xml:147
+#, fuzzy
+msgid "Don't change this unless you really know what you are doing."
+msgstr "Canvieu coses només si teniu molt clar què esteu fent."
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><note><para>
+#: en/setupBootloader.xml:152
+msgid ""
+"There is no option to write GRUB to the boot sector of a partition (e.g: "
+"<filename>sda1</filename>), as this method is considered unreliable."
+msgstr ""
+
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:100
-msgid "Don't change this unless you really know what you are doing"
+#: en/setupBootloader.xml:157
+msgid ""
+"When using UEFI mode, then the <guilabel>Boot device</guilabel> will be "
+"listed as <guimenuitem>EFI System Partition</guimenuitem>."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:105
+#: en/setupBootloader.xml:163
 msgid ""
 "<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:108
+#: en/setupBootloader.xml:166
 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:113
+#: en/setupBootloader.xml:171
 msgid "<emphasis role=\"bold\">Security</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:115
+#: en/setupBootloader.xml:173
 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 "
@@ -3902,34 +3988,34 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:126
+#: en/setupBootloader.xml:184
 msgid "Choose a password for the bootloader (optional)"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:130
+#: en/setupBootloader.xml:188
 msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:132
+#: en/setupBootloader.xml:190
 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:137 en/setupBootloader.xml:212
+#: en/setupBootloader.xml:195 en/setupBootloader.xml:308
 msgid "<emphasis>Advanced</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:141
+#: en/setupBootloader.xml:199
 msgid "<emphasis>Enable ACPI</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:143
+#: en/setupBootloader.xml:201
 msgid ""
 "ACPI (Advanced Configuration and Power Interface) is a standard for power "
 "management. It can save energy by stopping unused devices. Deselecting it "
@@ -3939,24 +4025,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:152
+#: en/setupBootloader.xml:210
 msgid "<emphasis>Enable SMP</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:154
+#: en/setupBootloader.xml:212
 msgid ""
 "This option enables/disables symmetric multiprocessing for multi-core "
 "processors"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:159
+#: en/setupBootloader.xml:217
 msgid "<emphasis>Enable APIC</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:161
+#: en/setupBootloader.xml:219
 msgid ""
 "Enabling this gives the operating system access to the Advanced Programmable "
 "Interrupt Controller. APIC devices permit more complex priority models, and "
@@ -3964,24 +4050,82 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:168
+#: en/setupBootloader.xml:226
 msgid "<emphasis>Enable Local APIC</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:170
+#: en/setupBootloader.xml:228
 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:177
+#: en/setupBootloader.xml:235
 msgid "Bootloader Configuration"
 msgstr "Configuració del gestor d'arrencada"
 
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:237
+msgid ""
+"If, in the previous section you selected <literal>rEFInd</literal> as the "
+"bootloader to use, you would then be presented with the options shown in the "
+"screenshot directly below. Otherwise, please instead move on to the "
+"subsequent screenshot for your options."
+msgstr ""
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:243
+#, fuzzy
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"rEFIndLoaderConfig.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-rEFIndLoaderConfig.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:253
+#, fuzzy
+msgid "Your rEFInd configuration options:"
+msgstr "Configuració del so"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:256
+msgid ""
+"<guimenuitem>Install or update rEFInd in the EFI system partition.</"
+"guimenuitem>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:261
+msgid ""
+"<guimenuitem>Install in EFI/Boot partition (workaround for some BIOS's).</"
+"guimenuitem>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:264
+msgid ""
+"With some BIOS's, the newly written bootloaser for Mageia at end of the "
+"installation will not be recognized. In that case, you can use this option "
+"as a workaround for the issue."
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:270
+msgid ""
+"If you did not select rEFInd as the bootloader to use in the previous "
+"section, then your bootloader configurations are shown below:"
+msgstr ""
+
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:180
+#: en/setupBootloader.xml:275
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -3994,42 +4138,42 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:191
+#: en/setupBootloader.xml:286
 msgid "<emphasis role=\"bold\">Default</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:193
+#: en/setupBootloader.xml:288
 msgid "The operating system to be started up by default."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:197
+#: en/setupBootloader.xml:292
 msgid "<emphasis role=\"bold\">Append</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:199
+#: en/setupBootloader.xml:294
 msgid ""
 "This option lets you pass information to the kernel 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:204
+#: en/setupBootloader.xml:299
 msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:206
+#: en/setupBootloader.xml:301
 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, "
-"then untick the Probe Foreign OS option."
+"then untick the <guimenuitem>Probe Foreign OS</guimenuitem> option."
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:215
+#: en/setupBootloader.xml:311
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader4.png\"/> </imageobject> <imageobject condition=\"live"
@@ -4042,12 +4186,12 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:226
+#: en/setupBootloader.xml:322
 msgid "<emphasis>Video mode</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:228
+#: en/setupBootloader.xml:324
 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 "
@@ -4055,21 +4199,30 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:234
+#: en/setupBootloader.xml:330
 msgid "<emphasis>Do not touch ESP or MBR</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:236
+#: en/setupBootloader.xml:332
 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 "
-"missing. Click<emphasis> Ok</emphasis> if you are sure you understand the "
-"implications, and wish to proceed."
+"missing. Click <guimenuitem>Ok </guimenuitem>only if you are sure you "
+"understand the implications, and wish to proceed."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><warning><para>
+#: en/setupBootloader.xml:338
+msgid ""
+"Chain-loading via legacy bootloaders (GRUB Legacy and LiLo)  is no longer "
+"supported by Mageia as it is likely to fail when attempting to boot this "
+"resulting installation of Mageia. If you use anything other than GRUB2 or "
+"rEFInd for this purpose, then you do so at your own risk!"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:245
+#: en/setupBootloader.xml:348
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png"
 "\"/> </imageobject>"
@@ -4078,17 +4231,17 @@ msgstr ""
 "\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:253
+#: en/setupBootloader.xml:356
 msgid "Other Options"
 msgstr "Altres opcions"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:256
+#: en/setupBootloader.xml:359
 msgid "Using an existing bootloader"
 msgstr "Ús d'un gestor d'arrencada existent"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:258
+#: en/setupBootloader.xml:361
 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 "
@@ -4098,12 +4251,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:267
+#: en/setupBootloader.xml:370
 msgid "Installing Without a Bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:269
+#: en/setupBootloader.xml:372
 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 "
@@ -4448,3 +4601,24 @@ msgid ""
 "take a little while to complete. When it is finishing you will briefly get a "
 "blank screen - this is normal."
 msgstr ""
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> "
+#~ "</imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> "
+#~ "</imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4."
+#~ "png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4."
+#~ "png\"/> </imageobject>"
diff --git a/docs/docs/stable/installer/cs.po b/docs/docs/stable/installer/cs.po
index 4cfc748c..ae6df134 100644
--- a/docs/docs/stable/installer/cs.po
+++ b/docs/docs/stable/installer/cs.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2019-01-19 21:23+0200\n"
+"POT-Creation-Date: 2019-09-08 15:26+0300\n"
 "PO-Revision-Date: 2019-02-25 21:09+0000\n"
 "Last-Translator: fri\n"
 "Language-Team: Czech (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -157,7 +157,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/addUser.xml:3
+#: en/addUser.xml:9
 msgid "User Management"
 msgstr ""
 
@@ -167,13 +167,16 @@ msgstr ""
 #. 2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
 #.   Also changed 'Advanced User Management' to 'User Management (advanced)'.
 #. 2018/02/24 apb: Changed list style.
+#. 2019/08/10 apb: Added missing 'condition' profile for live-user1.png.
+#. 2019/08/11 apb: [1] Reword 1.1 (including Note) [2] Reword 1.2 Password text.
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:12
+#: en/addUser.xml:28
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
-"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
-"\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata format="
-"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-setRootPassword.png\" format=\"PNG\" revision=\"1\" xml:id="
+"\"setRootPassword-im1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-user1.png\" format=\"PNG\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
 "\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -181,36 +184,41 @@ msgstr ""
 "\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:21
+#: en/addUser.xml:40
 msgid "Set Administrator (root)  Password:"
 msgstr "Nastavení hesla správce (uživatele root):"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:24
+#: en/addUser.xml:44
 msgid ""
 "It is advisable for all Mageia installations to set a <literal>superuser</"
 "literal> (Administrator) password, usually called the <emphasis>root </"
-"emphasis>password in Linux. As you type a password into the top box a shield "
-"will change from red-to-yellow-to-green depending on the strength of the "
-"password. A green shield shows you are using a strong password. You need to "
-"repeat the same password in the box underneath, to check that the first "
-"entry was not mistyped."
+"emphasis>password in Linux. You need to repeat the same password in the box "
+"underneath, to check that the first entry was not mistyped."
+msgstr ""
+
+#. type: Content of: <section><section><note><para>
+#: en/addUser.xml:51
+msgid ""
+"As you type a password into the top box a shield will change from red-to-"
+"yellow-to-green depending on the strength of the password. A green shield "
+"shows you are using a strong password."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:32
+#: en/addUser.xml:55
 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:39
+#: en/addUser.xml:63
 msgid "Enter a user"
 msgstr "Zadejte uživatele"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:41
+#: en/addUser.xml:66
 msgid ""
 "Add a User here. A regular user has fewer privileges than the "
 "<literal>superuser</literal> (root), but enough to use the Internet, office "
@@ -219,39 +227,39 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:47
+#: en/addUser.xml:73
 msgid "<emphasis role=\"bold\">Icon</emphasis>"
 msgstr "<emphasis role=\"bold\">Ikona</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:48
+#: en/addUser.xml:75
 msgid "Click on this button if you want to change the user's icon"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:52
+#: en/addUser.xml:80
 msgid "<emphasis role=\"bold\">Real Name</emphasis>"
 msgstr "<emphasis role=\"bold\">Skutečné Jméno</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:53
+#: en/addUser.xml:82
 msgid "Insert the user's real name into this text box"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:56
+#: en/addUser.xml:86
 msgid "<emphasis role=\"bold\">Login Name</emphasis>"
 msgstr "<emphasis role=\"bold\">Přihlašovací Jméno</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:57
+#: en/addUser.xml:88
 msgid ""
 "Enter the user login name or let DrakX use a version of the user's real "
 "name. <emphasis role=\"bold\">The login name is case-sensitive.</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><caution><simpara>
-#: en/addUser.xml:61
+#: en/addUser.xml:93
 msgid ""
 "The login entered here should be different to any login currently in use for "
 "your <filename>/home</filename> directory. Some user parameters will be "
@@ -260,34 +268,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:65 en/setupBootloader.xml:124
+#: en/addUser.xml:102 en/setupBootloader.xml:182
 msgid "<emphasis role=\"bold\">Password</emphasis>"
 msgstr "<emphasis role=\"bold\">Heslo</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:66
-msgid ""
-"Type in the user password. There is a shield at the end of the text box that "
-"indicates the strength of the password. (See also <xref linkend="
-"\"givePassword\"/>)"
+#: en/addUser.xml:104
+msgid "Type in the user password (remembering the advice in the Note above)."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:68
+#: en/addUser.xml:107
 msgid ""
 "<emphasis role=\"bold\">Password (again):</emphasis> Retype the user "
 "password. DrakX will check that you have not mistyped the password."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:74
+#: en/addUser.xml:114
 msgid ""
 "Any users added while installing Mageia, will have a home directory that is "
 "both read and write protected (umask=0027)"
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:76
+#: en/addUser.xml:117
 msgid ""
 "You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
@@ -295,24 +300,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:79
+#: en/addUser.xml:121
 msgid "The access permissions can also be changed after the install."
 msgstr "Přístupová oprávnění lze změnit také po instalaci."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:85
+#: en/addUser.xml:128
 msgid "User Management (advanced)"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:87
+#: en/addUser.xml:131
 msgid ""
 "The <emphasis>Advanced</emphasis> option allows you to edit further settings "
 "for the user you are adding."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:91
+#: en/addUser.xml:136
 msgid ""
 "<emphasis>Shell</emphasis>: This drop-down list allows you to change the "
 "shell available to any user you added in the previous screen. Options are "
@@ -320,7 +325,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:143
 msgid ""
 "<emphasis>User ID</emphasis>: Here you can set the user ID for any user you "
 "added in the previous screen. If you are unsure what the purpose of this is, "
@@ -328,7 +333,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:102
+#: en/addUser.xml:149
 msgid ""
 "<emphasis>Group ID</emphasis>: This lets you set the group ID.  Again, if "
 "unsure, leave it blank."
@@ -455,24 +460,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:23
+#: en/bootLive.xml:10
 msgid "Boot Mageia as Live system"
 msgstr "Zavést Mageiu jako živý systém"
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:28
+#: en/bootLive.xml:14
 msgid "Booting the medium"
 msgstr "Zavedení z datového nosiče"
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:31
+#: en/bootLive.xml:16
 msgid ""
 "You can boot directly from a Live DVD or USB. Usually, you just need to plug "
 "the USB device in or place the DVD in the drive and restart the computer."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:35
+#: en/bootLive.xml:19
 msgid ""
 "If the computer does not automatically boot from the USB or DVD you may need "
 "to reconfigure your BIOS Boot Disk priority. Alternatively, you might try "
@@ -481,7 +486,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><tip><para>
-#: en/bootLive.xml:41
+#: en/bootLive.xml:24
 msgid ""
 "To access the BIOS or boot menu when the computer is starting, you can try "
 "pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or <keycap>Esc</"
@@ -491,7 +496,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/bootLive.xml:50
+#: en/bootLive.xml:32
 msgid ""
 "The actual screen that you will first see when booting from the Live media "
 "will depend on whether your computer motherboard is of the Legacy (BIOS) or "
@@ -499,49 +504,50 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:58
+#: en/bootLive.xml:39
 msgid "In BIOS/CSM/Legacy mode"
 msgstr "V zastaralém režimu BIOS/CSM"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:62
+#: en/bootLive.xml:42
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"../live-bootCSM.png\" align=\"center\"/> "
+"</imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> </"
+"<imageobject> <imagedata fileref=\"dx2-summaryTop.png\" align=\"center\"/> </"
 "imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:67
+#: en/bootLive.xml:46
 msgid "First screen while booting in BIOS mode"
 msgstr "První obrazovka během spouštění v režimu BIOS"
 
 #. type: Content of: <section><section><section><itemizedlist><title>
-#: en/bootLive.xml:72 en/bootLive.xml:144 en/installer.xml:106
-#: en/installer.xml:154
+#: en/bootLive.xml:50 en/bootLive.xml:104 en/installer.xml:108
+#: en/installer.xml:156
 msgid "Menu"
 msgstr "Nabídka"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:75 en/bootLive.xml:147
+#: en/bootLive.xml:52 en/bootLive.xml:106
 msgid "<emphasis role=\"bold\">Boot Mageia</emphasis>"
 msgstr "<emphasis role=\"bold\">Zavést Mageiu</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:77
+#: en/bootLive.xml:53
 msgid ""
 "This option will boot the Mageia Live system from the connected DVD/USB "
 "media (expect a very slow system compared to an installed OS)."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:81
+#: en/bootLive.xml:56
 msgid "Once the boot is done, you can proceed to the installation."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:86 en/bootLive.xml:102
+#: en/bootLive.xml:60 en/bootLive.xml:72
 msgid ""
 "<emphasis role=\"bold\">+ use non-free video drivers (slower to boot)</"
 "emphasis>"
@@ -550,44 +556,44 @@ msgstr ""
 "zavedení)</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:89
+#: en/bootLive.xml:62
 msgid "Boot the Mageia Live system using non-free video drivers"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:96 en/bootLive.xml:155 en/installer.xml:109
+#: en/bootLive.xml:68 en/bootLive.xml:112 en/installer.xml:111
 msgid "<emphasis role=\"bold\">Install Mageia</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:98 en/bootLive.xml:157
+#: en/bootLive.xml:69 en/bootLive.xml:113
 msgid "This option will install Mageia to a hard disk."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:105
+#: en/bootLive.xml:74
 msgid "Install Mageia using non-free video drivers"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:111 en/installer.xml:125
+#: en/bootLive.xml:79 en/installer.xml:127
 msgid "<emphasis role=\"bold\">Memory Test</emphasis>"
 msgstr "<emphasis role=\"bold\">Test paměti</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:113 en/installer.xml:127
+#: en/bootLive.xml:80 en/installer.xml:129
 msgid ""
 "Test the installed RAM by performing multiple read and write operations. "
 "Reboot to end the test."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:118 en/bootLive.xml:161
+#: en/bootLive.xml:84 en/bootLive.xml:116
 msgid "<emphasis role=\"bold\"> F2 Language</emphasis>"
 msgstr "<emphasis role=\"bold\"> F2 Jazyk</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:120 en/bootLive.xml:163
+#: en/bootLive.xml:85 en/bootLive.xml:117
 msgid ""
 "Press <keycap>F2</keycap> to have the installer use a specific language "
 "during the installation. Use the arrow keys to select the language then "
@@ -595,26 +601,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:129
+#: en/bootLive.xml:93
 msgid "In UEFI mode"
 msgstr "V režimu UEFI"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:133
+#: en/bootLive.xml:96
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:139
+#: en/bootLive.xml:100
 msgid "First screen while booting in UEFI mode"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:149
+#: en/bootLive.xml:107
 msgid ""
 "This option will boot the Mageia Live system from the connected DVD/USB "
 "media (expect a very slow system compared to an installed OS).  Once the "
@@ -622,7 +629,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/bootLive.xml:170
+#: en/bootLive.xml:123
 msgid ""
 "If you booted from a USB stick, you will see the above menu options "
 "duplicated, and in this case, you should choose from the menu pair that will "
@@ -855,12 +862,12 @@ msgstr ""
 "jsou všechny nastaveny na místní čas, nebo všichny na UTC/GMT."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:24
+#: en/configureX_card_list.xml:27
 msgid "Choose an X Server (Configure your Graphic Card)"
 msgstr "Výběr X Serveru (Konfigurace vaší grafické karty)"
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_card_list.xml:29
+#: en/configureX_card_list.xml:32
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_card_list."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_card_list-im1\"/> </"
@@ -871,7 +878,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:35
+#: en/configureX_card_list.xml:38
 msgid ""
 "DrakX has a very comprehensive database of video cards and will usually "
 "correctly identify your video device."
@@ -880,7 +887,7 @@ msgstr ""
 "identifikuje správně."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:38
+#: en/configureX_card_list.xml:41
 msgid ""
 "If the installer has not correctly detected your graphic card and you know "
 "which one you have, you can select it from the tree by:"
@@ -889,22 +896,22 @@ msgstr ""
 "víte, jakou kartu máte, můžete ji vybrat ze stromu:"
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_card_list.xml:41 en/configureX_monitor.xml:74
+#: en/configureX_card_list.xml:44 en/configureX_monitor.xml:78
 msgid "Vendor"
 msgstr "Dodavatel"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:45
+#: en/configureX_card_list.xml:48
 msgid "then the make of your card"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:49
+#: en/configureX_card_list.xml:52
 msgid "and the model of card"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:53
+#: en/configureX_card_list.xml:56
 msgid ""
 "If you cannot find your card in the vendor lists (because it's not yet in "
 "the database or it's an older card) you may find a suitable driver in the "
@@ -915,14 +922,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><caution><para>
-#: en/configureX_card_list.xml:61
+#: en/configureX_card_list.xml:64
 msgid ""
 "Be aware that if you select an incompatible driver you may only have access "
 "to the <emphasis>Command Line Interface</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:65
+#: en/configureX_card_list.xml:68
 msgid ""
 "Some video card manufacturers provide proprietary drivers for Linux which "
 "may only be available in the <emphasis>Nonfree</emphasis> repository and in "
@@ -933,17 +940,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:11
-msgid "Graphic Card and Monitor Configuration"
+#: en/configureX_chooser.xml:23
+#, fuzzy
+msgid "Graphics Card and Monitor Configuration"
 msgstr "Nastavení grafické karty a monitoru"
 
-#.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
-#. 2018/02/15 apb: Some text and typography.
-#. 2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.
-#. 2018/02/23 apb: Typo.
-#. 2019/01/06 apb: Slight reword, split 1st para in two.
 #. type: Content of: <section><mediaobject>
-#: en/configureX_chooser.xml:26
+#: en/configureX_chooser.xml:28
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_chooser."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_chooser-im1\"/> </"
@@ -954,7 +957,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:32
+#: en/configureX_chooser.xml:34
 msgid ""
 "No matter which graphical environment (also known as desktop environment) "
 "you chose for this install of Mageia, they are all based on a graphical user "
@@ -965,31 +968,32 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:39
+#: en/configureX_chooser.xml:41
 msgid ""
 "Choose the appropriate settings manually if you think the details are "
 "incorrect, or if none are shown."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:44
-msgid "<emphasis role=\"bold\">Graphic Card</emphasis>"
+#: en/configureX_chooser.xml:46
+#, fuzzy
+msgid "<emphasis role=\"bold\">Graphics Card</emphasis>"
 msgstr "<emphasis role=\"bold\">Grafická karta</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:47
+#: en/configureX_chooser.xml:49
 msgid ""
 "If you need to, you can select a specific card from this expandable list. "
 "See <xref linkend=\"configureX_card_list\"/>."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:52
+#: en/configureX_chooser.xml:54
 msgid "<emphasis role=\"bold\">Monitor</emphasis>"
 msgstr "<emphasis role=\"bold\">Monitor</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:55
+#: en/configureX_chooser.xml:57
 msgid ""
 "You can choose Plug 'n Play, if applicable, or choose your monitor from the "
 "<emphasis>Vendor</emphasis> or <emphasis>Generic</emphasis> lists. Choose "
@@ -999,22 +1003,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:63
+#: en/configureX_chooser.xml:65
 msgid "<emphasis role=\"bold\">Resolution</emphasis>"
 msgstr "<emphasis role=\"bold\">Rozlišení</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:66
+#: en/configureX_chooser.xml:68
 msgid "The resolution and color depth of your monitor can be set here."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:71
+#: en/configureX_chooser.xml:73
 msgid "<emphasis role=\"bold\">Test</emphasis>"
 msgstr "<emphasis role=\"bold\">Test</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:74
+#: en/configureX_chooser.xml:76
 msgid ""
 "The test button does not always appear during install. If the option is "
 "there, and you test your settings, you should be asked to confirm that your "
@@ -1026,17 +1030,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:85
+#: en/configureX_chooser.xml:87
 msgid "<emphasis role=\"bold\">Options</emphasis>"
 msgstr "<emphasis role=\"bold\">Možnosti</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:88
+#: en/configureX_chooser.xml:90
 msgid "Here you can choose to enable or disable various options."
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_chooser.xml:93
+#: en/configureX_chooser.xml:95
 msgid ""
 "There is a risk of damaging a monitor if you choose refresh rates that are "
 "outside the frequency range of that monitor. This applies to older CRT "
@@ -1045,12 +1049,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_monitor.xml:22
+#: en/configureX_monitor.xml:26
 msgid "Choosing your Monitor"
 msgstr "Výběr monitoru"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:25
+#: en/configureX_monitor.xml:29
 msgid ""
 "DrakX has a very comprehensive database of monitors and will usually "
 "correctly identify yours."
@@ -1059,7 +1063,7 @@ msgstr ""
 "váš."
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:30
+#: en/configureX_monitor.xml:34
 msgid ""
 "<emphasis role=\"bold\">Selecting a monitor with different characteristics "
 "could damage your monitor or video hardware. Please don't try something "
@@ -1068,7 +1072,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:38
+#: en/configureX_monitor.xml:42
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
@@ -1079,12 +1083,12 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:46
+#: en/configureX_monitor.xml:50
 msgid "Custom"
 msgstr "Vlastní"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:49
+#: en/configureX_monitor.xml:53
 msgid ""
 "This option allows you to set two critical parameters: the vertical refresh "
 "rate and the horizontal sync rate. Vertical refresh determines how often the "
@@ -1093,7 +1097,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:55
+#: en/configureX_monitor.xml:59
 msgid ""
 "It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor "
 "type with a sync range that is beyond the capabilities of your monitor: you "
@@ -1106,58 +1110,59 @@ msgstr ""
 "konzervativní nastavení a prověřte ho v dokumentaci k vašemu monitoru."
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:64
+#: en/configureX_monitor.xml:68
 msgid "Plug'n Play"
 msgstr "Plug'n Play"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:67
+#: en/configureX_monitor.xml:71
 msgid ""
 "This is the default option and automatically tries to determine the monitor "
 "type from the monitor database."
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:77
+#: en/configureX_monitor.xml:81
+#, fuzzy
 msgid ""
 "If the installer has not correctly detected your monitor and you know which "
-"one you have, you can select it from the tree by selecting:"
+"one you have, you can choose it from the options by selecting:"
 msgstr ""
 "Pokud instalátor správně nerozpoznal váš monitor a vy víte, který máte, "
 "můžete si ho zvolit ze stromu pomocí výběru:"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:86
+#: en/configureX_monitor.xml:90
 msgid "Manufacturer"
 msgstr "Výrobce"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:90
+#: en/configureX_monitor.xml:94
 msgid "Monitor model"
 msgstr "Model monitoru"
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:96
+#: en/configureX_monitor.xml:100
 msgid "Generic"
 msgstr "Obecný"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:99
+#: en/configureX_monitor.xml:103
 msgid ""
-"Selecting this group will list nearly 30 display configurations such as "
-"1024x768 @ 60Hz and includes flat-panel displays as used in laptops. This is "
-"often a good monitor selection group if you need to use the VESA card driver "
-"when your video hardware cannot be determined automatically.  Once again it "
-"may be wise to be conservative in your selections."
+"Selecting this group will list approximately 30 display configurations such "
+"as 1024x768 @ 60Hz and includes flat-panel displays as used in laptops.  "
+"This is often a good monitor selection group if you need to use the VESA "
+"card driver when your video hardware cannot be determined automatically. "
+"Once again, it may be wise to be conservative in your selections."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:22
+#: en/diskdrake.xml:24
 msgid "Custom Disk Partitioning with DiskDrake"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:27
+#: en/diskdrake.xml:29
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-diskdrake.png\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1168,7 +1173,7 @@ msgstr ""
 "<imagedata align=\"center\" fileref=\"live-diskdrake.png\"/> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:38
+#: en/diskdrake.xml:40
 msgid ""
 "Modify the layout of your disk(s) here. You can remove or create partitions, "
 "change the filesystem or size of a partition and even view their details "
@@ -1176,15 +1181,15 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:47
 msgid ""
 "There is a tab at the top for every detected hard disk (or other storage "
-"device, like a USB key). In the screenshot above there are two available "
-"devices: <filename>sda </filename>and <filename>sdb</filename>."
+"device, like a USB key), for example: <filename>sda</filename>, "
+"<filename>sdb</filename>, <filename>sdc</filename> etc."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:52
+#: en/diskdrake.xml:54
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it. "
@@ -1193,21 +1198,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:60
+#: en/diskdrake.xml:62
 msgid ""
 "Continue until you have adjusted everything to your satisfaction, then click "
 "<emphasis>Done</emphasis> when you're ready."
 msgstr ""
 
 #. type: Content of: <section><warning><orderedlist><listitem><para>
-#: en/diskdrake.xml:69
+#: en/diskdrake.xml:71
 msgid ""
 "Take care with the <emphasis>Clear all</emphasis> option, use it only if you "
 "are sure you want to wipe all partitions on the selected storage device."
 msgstr ""
 
 #. type: Content of: <section><warning><orderedlist><listitem><para>
-#: en/diskdrake.xml:75
+#: en/diskdrake.xml:77
 msgid ""
 "If you wish to use encryption on your <filename>/</filename> partition you "
 "must ensure that you have a separate <filename>/boot</filename> partition. "
@@ -1216,7 +1221,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/diskdrake.xml:87
+#: en/diskdrake.xml:89
 msgid ""
 "If you are installing Mageia on a UEFI system, check that an ESP (EFI System "
 "Partition) is present and correctly mounted on <filename>/boot/EFI</"
@@ -1224,19 +1229,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/diskdrake.xml:93
+#: en/diskdrake.xml:95
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
 "partition is present and of the correct type. See Figure 2 below."
 msgstr ""
 
 #. type: Content of: <section><figure><title>
-#: en/diskdrake.xml:101
+#: en/diskdrake.xml:103
 msgid "EFI System Partition"
 msgstr "Systémový oddíl EFI"
 
 #. type: Content of: <section><figure><mediaobject>
-#: en/diskdrake.xml:104
+#: en/diskdrake.xml:106
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-diskdrake2.png\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1247,17 +1252,17 @@ msgstr ""
 "<imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/> </imageobject>"
 
 #. type: Content of: <section><figure>
-#: en/diskdrake.xml:103 en/diskdrake.xml:117
+#: en/diskdrake.xml:105 en/diskdrake.xml:119
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><figure><title>
-#: en/diskdrake.xml:115
+#: en/diskdrake.xml:117
 msgid "BIOS boot partition"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:118 en/doPartitionDisks.xml:201
+#: en/diskdrake.xml:120 en/doPartitionDisks.xml:206
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1280,26 +1285,26 @@ msgid "Partitioning"
 msgstr "Rozdělení disku"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:31
 msgid "Suggested Partitioning"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:34
 msgid ""
 "In this screen you can see the content of your hard drive(s) along with the "
 "DrakX partitioning proposals for where to install Mageia."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:34
+#: en/doPartitionDisks.xml:38
 msgid ""
 "The actual options available from those shown below will vary according to "
 "the layout and content of your particular hard drive(s)."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:39
+#: en/doPartitionDisks.xml:43
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1312,17 +1317,17 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><itemizedlist><title>
-#: en/doPartitionDisks.xml:49
+#: en/doPartitionDisks.xml:53
 msgid "Main Options"
 msgstr "Hlavní možnosti"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:56
 msgid "<emphasis role=\"bold\">Use Existing Partitions</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:59
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1331,12 +1336,12 @@ msgstr ""
 "kompatibilní oddíly a tyto mohou být použity pro instalaci."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:61
+#: en/doPartitionDisks.xml:65
 msgid "<emphasis role=\"bold\">Use Free Space</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:68
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1345,57 +1350,58 @@ msgstr ""
 "využije pro novou instalaci Mageii."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:70
+#: en/doPartitionDisks.xml:74
 msgid ""
 "<emphasis role=\"bold\">Use Free Space on a Windows Partition</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:73
+#: en/doPartitionDisks.xml:77
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it. 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 important files!"
+"installation but see the warning below."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para><mediaobject>
+#: en/doPartitionDisks.xml:87
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:79
+#: en/doPartitionDisks.xml:82
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
 "light blue and the proposed Mageia partition in dark blue with their "
 "intended sizes just underneath. You have the option to modify these sizes by "
 "clicking and dragging the gap between both partitions.  See the following "
-"screenshot:"
-msgstr ""
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:87
-msgid "<emphasis role=\"bold\">Erase and use Entire Disk</emphasis>"
-msgstr "<emphasis role=\"bold\">Smazat a použít celý disk</emphasis>"
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:90
-msgid "This option will allocate the entire drive for Mageia"
+"screenshot:<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:97
 msgid ""
-"This will erase ALL data on the selected hard drive. Take care! 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 this option."
+"This involves shrinking the size of the Windows partition, and therefore is "
+"a risky operation, so you should make sure you have backed up all important "
+"files before proceeding."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><important><para>
-#: en/doPartitionDisks.xml:101
+#: en/doPartitionDisks.xml:103
+#, fuzzy
 msgid ""
-"Note that this involves shrinking the size of the Windows partition. The "
-"partition must be \"clean\", meaning that Windows must have closed down "
+"The partition must be \"clean\", meaning that Windows must have closed down "
 "correctly the last time it was used. It must also have been defragmented, "
 "although this is not a guarantee that all files in the partition have been "
-"moved out of the area that is about to be used. It is highly recommended to "
-"back up your personal files."
+"moved out of the area that is about to be used for Mageia."
 msgstr ""
 "Pamatujte, že toto znamená zmenšení velikosti windowsovského oddílu. Oddíl "
 "musí být \"čistý\", to znamená, že Windows musely být správně vypnuty, když "
@@ -1405,11 +1411,29 @@ msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/doPartitionDisks.xml:112
+msgid "<emphasis role=\"bold\">Erase and use Entire Disk</emphasis>"
+msgstr "<emphasis role=\"bold\">Smazat a použít celý disk</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:115
+msgid "This option will allocate the entire drive for Mageia"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><warning><para>
+#: en/doPartitionDisks.xml:119
+msgid ""
+"This will erase ALL data on the selected hard drive. Take care! 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 this option."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:127
 msgid "<emphasis role=\"bold\">Custom Disk Partitioning</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:115
+#: en/doPartitionDisks.xml:130
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1417,21 +1441,8 @@ msgstr ""
 "Toto vám dává úplnou kontrolu nad umístěním instalace na vašem pevném disku "
 "(resp. discích)."
 
-#. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:122
-msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
-
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:131
+#: en/doPartitionDisks.xml:136
 msgid ""
 "If you are not using the <emphasis>Custom disk partitioning</emphasis> "
 "option, then the installer will allocate the available space according to "
@@ -1439,60 +1450,60 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:137
+#: en/doPartitionDisks.xml:142
 msgid ""
 "If the total available space is less than 50 GB, then only one partition is "
 "created. This will be the <filename>/</filename> (root)  partition."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:143
+#: en/doPartitionDisks.xml:148
 msgid ""
 "If the total available space is greater than 50 GB, then three partitions "
 "are created"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:148
+#: en/doPartitionDisks.xml:153
 msgid ""
 "6/19 of the total available place is allocated to <filename>/</filename> "
 "with a maximum of 50 GB"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:153
+#: en/doPartitionDisks.xml:158
 msgid "1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:158
+#: en/doPartitionDisks.xml:163
 msgid "the rest (at least 12/19) is allocated to <filename>/home</filename>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:165
+#: en/doPartitionDisks.xml:170
 msgid ""
 "This means that from 160 GB or greater available space, the installer will "
 "create three partitions:"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:170
+#: en/doPartitionDisks.xml:175
 msgid "50 GB for <filename>/</filename>"
 msgstr "50 GB pro <filename>/</filename>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:174
+#: en/doPartitionDisks.xml:179
 msgid "4 GB for <filename>swap</filename>"
 msgstr "4 GB pro <filename>swap</filename>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:178
+#: en/doPartitionDisks.xml:183
 msgid "and the remainder for <filename>/home</filename>"
 msgstr "a zbytek pro <filename>/home</filename>"
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:183
+#: en/doPartitionDisks.xml:188
 msgid ""
 "If you are using a UEFI system, the ESP (EFI System Partition) will be "
 "automatically detected - or created if it does not exist yet - and mounted "
@@ -1502,7 +1513,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:189
+#: en/doPartitionDisks.xml:194
 msgid ""
 "If you are using a Legacy (also known as BIOS) system with a GPT partitioned "
 "disk, you need to create a BIOS boot partition if it doesn't already exist. "
@@ -1513,21 +1524,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:196
+#: en/doPartitionDisks.xml:201
 msgid "See <xref linkend=\"diskdrake\"/> for information on how to proceed."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:211
+#: en/doPartitionDisks.xml:216
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4.png"
-"\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks4.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks4.png\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4.png"
-"\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:217
+#: en/doPartitionDisks.xml:226
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
 "previous standard of 512. Due to lack of available hardware, the "
@@ -1536,7 +1552,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:222
+#: en/doPartitionDisks.xml:231
 msgid ""
 "Some SSD devices now use an erase block size over 1 MB. If you have such a "
 "device we suggest that you partition the drive in advance, using an "
@@ -1545,17 +1561,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:229
+#: en/doPartitionDisks.xml:238
 msgid "<emphasis>Align to</emphasis> = MiB"
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:233
+#: en/doPartitionDisks.xml:242
 msgid "<emphasis>Free space preceding (MiB)</emphasis> = 2"
 msgstr ""
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:237
+#: en/doPartitionDisks.xml:246
 msgid ""
 "Also make sure all partitions are created using an even number of megabytes."
 msgstr ""
@@ -1729,12 +1745,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/firewall.xml:7
+#: en/firewall.xml:16
 msgid "Firewall"
 msgstr "Firewall"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:10
+#: en/firewall.xml:19
 msgid ""
 "This section allows you to configure some simple firewall rules: they "
 "determine which type of message from the Internet will be accepted by the "
@@ -1742,8 +1758,18 @@ msgid ""
 "system to be accessible from the Internet."
 msgstr ""
 
+#. type: Content of: <section><mediaobject>
+#: en/firewall.xml:26
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-firewall.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome.png\"/> </"
+"imageobject>"
+
 #. type: Content of: <section><para>
-#: en/firewall.xml:16
+#: en/firewall.xml:31
 msgid ""
 "In the default setting (no button is checked), no service of the system is "
 "accessible from the network. The <emphasis>Everything (no firewall)</"
@@ -1756,7 +1782,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:25
+#: en/firewall.xml:40
 msgid ""
 "All other options are more or less self-explanatory. As an example, you will "
 "enable the CUPS server if you want printers on your machine to be accessible "
@@ -1764,12 +1790,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:29
+#: en/firewall.xml:44
 msgid "<emphasis role=\"bold\">Advanced</emphasis>"
 msgstr "<emphasis role=\"bold\">Pokročilé</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:31
+#: en/firewall.xml:46
 msgid ""
 "The <emphasis>Advanced</emphasis> option opens a window where you can enable "
 "a series of services by typing a list of <quote>couples</quote> (blank "
@@ -1777,37 +1803,40 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:35
-msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
+#: en/firewall.xml:50
+#, fuzzy
+msgid "<emphasis>&lt;port-number&gt;/&lt;protocol&gt;</emphasis>"
 msgstr "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:38
+#: en/firewall.xml:53
 msgid ""
-"- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
-"the service you want to enable (e.g. 873 for the RSYNC service) as defined "
-"in <emphasis>RFC-433</emphasis>;"
+"- <emphasis>&lt;port-number&gt;</emphasis> is the value of the port assigned "
+"to the service you want to enable (e.g. 873 for the RSYNC service) as "
+"defined in <emphasis>RFC-433</emphasis>;"
 msgstr ""
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:42
+#: en/firewall.xml:57
+#, fuzzy
 msgid ""
-"- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
-"<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
+"- <emphasis>&lt;protocol&gt;</emphasis> is one of <emphasis>TCP</emphasis> "
+"or <emphasis>UDP</emphasis> - the internet protocol that is used by the "
+"service."
 msgstr ""
 "- <emphasis>&lt;protocol></emphasis> je jedním z <emphasis>TCP</emphasis> "
 "nebo <emphasis>UDP</emphasis> - internetový protokol, který je používán "
 "službou."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:47
+#: en/firewall.xml:62
 msgid ""
 "For instance, the entry for enabling access to the RSYNC service therefore "
 "is <emphasis>873/tcp</emphasis>."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:50
+#: en/firewall.xml:65
 msgid ""
 "In case a service is implemented to use both protocols, you specify 2 "
 "couples for the same port."
@@ -1880,12 +1909,12 @@ msgid "Graphical Configuration"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:32
+#: en/installer.xml:34
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, instalátor Mageii"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:35
+#: en/installer.xml:37
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -1896,33 +1925,33 @@ msgstr ""
 "je to možné."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:40
+#: en/installer.xml:42
 msgid "The installation steps"
 msgstr "Instalační kroky"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:44
+#: en/installer.xml:46
 msgid ""
 "The install process is divided into a number of steps - the status of which "
 "is indicated in a panel to the left of the screen."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:50
+#: en/installer.xml:52
 msgid ""
 "Each step has one or more screens, which may also have <emphasis>Advanced</"
 "emphasis> sections with extra, less commonly required options."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:56
+#: en/installer.xml:58
 msgid ""
 "Most screens have <emphasis>Help</emphasis> buttons for further details "
 "about the particular step."
 msgstr ""
 
 #. type: Content of: <section><section><caution><para>
-#: en/installer.xml:62
+#: en/installer.xml:64
 msgid ""
 "If at some point during the install you decide to abort the installation, it "
 "is possible to reboot, but please think twice before you do this. Once a "
@@ -1932,7 +1961,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><caution><para>
-#: en/installer.xml:68
+#: en/installer.xml:70
 msgid ""
 "If, in spite of this, you are very sure rebooting is what you want, go to a "
 "text terminal by pressing the keys <keycombo> <keycap>Ctrl</keycap> "
@@ -1942,12 +1971,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:86
+#: en/installer.xml:88
 msgid "Installation Welcome Screen"
 msgstr "Uvítací instalační obrazovka"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:88
+#: en/installer.xml:90
 msgid ""
 "The particular screen that you will first see when booting from the "
 "Installation media will depend on whether your computer motherboard is of "
@@ -1955,19 +1984,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:92
+#: en/installer.xml:94
 msgid ""
 "The welcome menu screen has various options, however the default option will "
 "start the installer, and is normally all that you will need."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:97
+#: en/installer.xml:99
 msgid "Legacy (BIOS) Systems"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:100
+#: en/installer.xml:102
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome.png\"/> </"
 "imageobject>"
@@ -1976,41 +2005,41 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:111
+#: en/installer.xml:113
 msgid ""
 "Install Mageia to a hard disk. This is the default option, and will "
 "automatically start after a short while unless another option is selected."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:117
+#: en/installer.xml:119
 msgid "<emphasis role=\"bold\">Rescue System</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:119
+#: en/installer.xml:121
 msgid ""
 "This option allows you to either re-install the bootloader for an existing "
 "Mageia installation or you can use it to restore a Windows bootloader."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:132
+#: en/installer.xml:134
 msgid "<emphasis role=\"bold\">F2: Language</emphasis>"
 msgstr "<emphasis role=\"bold\">F2: Jazyk</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:134
+#: en/installer.xml:136
 msgid "Press F2 for alternative languages."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:140
+#: en/installer.xml:142
 msgid "UEFI Systems"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:142
+#: en/installer.xml:144
 msgid ""
 "From this screen, you can access options by pressing <keycap>e</keycap> to "
 "enter the edit mode. To come back to this screen, press <keycap>Esc</keycap> "
@@ -2018,7 +2047,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:148
+#: en/installer.xml:150
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome2.png\"/> </"
 "imageobject>"
@@ -2027,13 +2056,13 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:157
+#: en/installer.xml:159
 msgid "<emphasis role=\"bold\">Install:</emphasis> Start the Install process"
 msgstr ""
 "<emphasis role=\"bold\">Instalovat:</emphasis> Zahájit instalační proces"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:162
+#: en/installer.xml:164
 msgid ""
 "<emphasis role=\"bold\">Rescue:</emphasis> This option allows you to either "
 "re-install the bootloader for an existing Mageia installation or you can use "
@@ -2041,7 +2070,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:169
+#: en/installer.xml:171
 msgid ""
 "<emphasis role=\"bold\">F2: Language:</emphasis> Press <keycap>F2</keycap> "
 "for alternative languages."
@@ -2050,24 +2079,24 @@ msgstr ""
 "pro alternativní jazyky."
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:174
+#: en/installer.xml:176
 msgid ""
 "If you booted from a USB stick, you will see the above options duplicated, "
 "and in this case, you should use the set that will be suffixed with \"USB\"."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:181
+#: en/installer.xml:183
 msgid "Installation Problems and Possible Solutions"
 msgstr "Problémy při instalaci a možné řešení"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:184
+#: en/installer.xml:186
 msgid "No Graphical Interface"
 msgstr "Bez grafického rozhraní"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:188
+#: en/installer.xml:190
 msgid ""
 "After the initial screen you did not progress to the <emphasis>Language "
 "Selection</emphasis> screen. This can happen with some graphic cards and "
@@ -2076,7 +2105,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:195
+#: en/installer.xml:197
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
 "In this case it is worth trying a text-mode installation. To use this press "
@@ -2087,12 +2116,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:208
+#: en/installer.xml:210
 msgid "The Install Freezes"
 msgstr "Instalace zamrzne"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:210
+#: en/installer.xml:212
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic hardware "
@@ -2102,12 +2131,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:218
+#: en/installer.xml:220
 msgid "RAM problem"
 msgstr "Problém paměti RAM"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:220
+#: en/installer.xml:222
 msgid ""
 "This will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
@@ -2117,12 +2146,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:228
+#: en/installer.xml:230
 msgid "Dynamic partitions"
 msgstr "Dynamické oddíly"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:230
+#: en/installer.xml:232
 msgid ""
 "If you converted your hard disk from <literal>Basic</literal> format to "
 "<literal>Dynamic</literal> format in Microsoft Windows, then it is not "
@@ -3783,73 +3812,109 @@ msgstr ""
 "Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link>"
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:27
+#: en/setupBootloader.xml:32
 msgid "Bootloader"
 msgstr "Zaváděcí program"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:31
+#: en/setupBootloader.xml:36
+#, fuzzy
+msgid "Available Bootloaders"
+msgstr "Zaváděcí program"
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:39
 msgid "Grub2"
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><title>
-#: en/setupBootloader.xml:34
-msgid "Grub2 on Legacy MBR/GPT systems"
-msgstr ""
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:42
+#, fuzzy
+msgid "<emphasis role=\"bold\">Grub2 on Legacy MBR/GPT systems</emphasis>"
+msgstr "<emphasis role=\"bold\">Test paměti</emphasis>"
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:37
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:46
 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:42
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:52
 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:49
-msgid "Grub2-efi on UEFI systems"
-msgstr "Grub2-efi na UEFI systémech"
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:59
+#, fuzzy
+msgid "<emphasis role=\"bold\">Grub2-efi on UEFI systems</emphasis>"
+msgstr "<emphasis role=\"bold\">Test</emphasis>"
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:52
-msgid "GRUB2-efi will be used exclusively as the bootloader for a UEFI system."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:63
+msgid "GRUB2-efi or rEFInd may be used as the bootloader for a UEFI system."
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:57
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:68
 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:60
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:71
 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 "
-"created by Windows and add grub2-efi to it. If no ESP exists, then one will "
+"created by Windows and add grub2-efi to it.  If no ESP exists, then one will "
 "be created. Although it is possible to have several ESPs, only one is "
 "required, whatever the number of operating systems you have."
 msgstr ""
 
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:82
+msgid "rEFInd"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:85
+#, fuzzy
+msgid "<emphasis role=\"bold\">rEFInd on UEFI systems</emphasis>"
+msgstr "<emphasis role=\"bold\">Ikona</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:88
+msgid ""
+"rEFInd has a nice graphical set of options, and can auto-detect installed "
+"EFI bootloaders. See: http://www.rodsbooks.com/refind/"
+msgstr ""
+
+#. type: Content of: <section><section><section><note><para>
+#: en/setupBootloader.xml:95
+msgid ""
+"Please note that in order to be able to use the <literal>rEFInd</literal> "
+"option, an installed EFI System Partition must match your system "
+"architecture: if you have a 32bit EFI System Partition installed on a 64bit "
+"machine for instance, then the rEFInd option will not be displayed/available "
+"to you."
+msgstr ""
+
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:72
+#: en/setupBootloader.xml:106
 msgid "Bootloader Setup"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:76
+#: en/setupBootloader.xml:110
 msgid "Bootloader main options"
 msgstr "Základní nastavení zaváděcího programu"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:79
+#: en/setupBootloader.xml:113
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader.png\"/> </imageobject> <imageobject condition=\"live"
@@ -3858,47 +3923,70 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:91
+#: en/setupBootloader.xml:125
 msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:93
+#. type: Content of: <section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:129
+msgid ""
+"<guimenuitem>GRUB2</guimenuitem> (with either a graphical or a text menu), "
+"can be chosen for both <literal>Legacy MBR/BIOS</literal> systems and "
+"<literal>UEFI</literal> systems."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:136
 msgid ""
-"This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI "
-"systems will not see this option here."
+"<guimenuitem>rEFInd</guimenuitem> (with a graphical menu)  is an alternative "
+"option solely for use with <literal>UEFI</literal> systems."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:98
+#: en/setupBootloader.xml:144
 msgid "<emphasis role=\"bold\">Boot device</emphasis>"
 msgstr ""
 
+#. type: Content of: <section><section><section><itemizedlist><listitem><warning><para>
+#: en/setupBootloader.xml:147
+#, fuzzy
+msgid "Don't change this unless you really know what you are doing."
+msgstr "Věci měňte jen tehdy, když velmi dobře víte, co děláte."
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><note><para>
+#: en/setupBootloader.xml:152
+msgid ""
+"There is no option to write GRUB to the boot sector of a partition (e.g: "
+"<filename>sda1</filename>), as this method is considered unreliable."
+msgstr ""
+
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:100
-msgid "Don't change this unless you really know what you are doing"
+#: en/setupBootloader.xml:157
+msgid ""
+"When using UEFI mode, then the <guilabel>Boot device</guilabel> will be "
+"listed as <guimenuitem>EFI System Partition</guimenuitem>."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:105
+#: en/setupBootloader.xml:163
 msgid ""
 "<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:108
+#: en/setupBootloader.xml:166
 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:113
+#: en/setupBootloader.xml:171
 msgid "<emphasis role=\"bold\">Security</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:115
+#: en/setupBootloader.xml:173
 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 "
@@ -3908,34 +3996,34 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:126
+#: en/setupBootloader.xml:184
 msgid "Choose a password for the bootloader (optional)"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:130
+#: en/setupBootloader.xml:188
 msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:132
+#: en/setupBootloader.xml:190
 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:137 en/setupBootloader.xml:212
+#: en/setupBootloader.xml:195 en/setupBootloader.xml:308
 msgid "<emphasis>Advanced</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:141
+#: en/setupBootloader.xml:199
 msgid "<emphasis>Enable ACPI</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:143
+#: en/setupBootloader.xml:201
 msgid ""
 "ACPI (Advanced Configuration and Power Interface) is a standard for power "
 "management. It can save energy by stopping unused devices. Deselecting it "
@@ -3945,24 +4033,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:152
+#: en/setupBootloader.xml:210
 msgid "<emphasis>Enable SMP</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:154
+#: en/setupBootloader.xml:212
 msgid ""
 "This option enables/disables symmetric multiprocessing for multi-core "
 "processors"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:159
+#: en/setupBootloader.xml:217
 msgid "<emphasis>Enable APIC</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:161
+#: en/setupBootloader.xml:219
 msgid ""
 "Enabling this gives the operating system access to the Advanced Programmable "
 "Interrupt Controller. APIC devices permit more complex priority models, and "
@@ -3970,24 +4058,82 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:168
+#: en/setupBootloader.xml:226
 msgid "<emphasis>Enable Local APIC</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:170
+#: en/setupBootloader.xml:228
 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:177
+#: en/setupBootloader.xml:235
 msgid "Bootloader Configuration"
 msgstr "Nastavení zaváděcího programu"
 
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:237
+msgid ""
+"If, in the previous section you selected <literal>rEFInd</literal> as the "
+"bootloader to use, you would then be presented with the options shown in the "
+"screenshot directly below. Otherwise, please instead move on to the "
+"subsequent screenshot for your options."
+msgstr ""
+
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:180
+#: en/setupBootloader.xml:243
+#, fuzzy
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"rEFIndLoaderConfig.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-rEFIndLoaderConfig.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:253
+#, fuzzy
+msgid "Your rEFInd configuration options:"
+msgstr "Nastavení zvuku"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:256
+msgid ""
+"<guimenuitem>Install or update rEFInd in the EFI system partition.</"
+"guimenuitem>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:261
+msgid ""
+"<guimenuitem>Install in EFI/Boot partition (workaround for some BIOS's).</"
+"guimenuitem>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:264
+msgid ""
+"With some BIOS's, the newly written bootloaser for Mageia at end of the "
+"installation will not be recognized. In that case, you can use this option "
+"as a workaround for the issue."
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:270
+msgid ""
+"If you did not select rEFInd as the bootloader to use in the previous "
+"section, then your bootloader configurations are shown below:"
+msgstr ""
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:275
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -3996,42 +4142,42 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:191
+#: en/setupBootloader.xml:286
 msgid "<emphasis role=\"bold\">Default</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:193
+#: en/setupBootloader.xml:288
 msgid "The operating system to be started up by default."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:197
+#: en/setupBootloader.xml:292
 msgid "<emphasis role=\"bold\">Append</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:199
+#: en/setupBootloader.xml:294
 msgid ""
 "This option lets you pass information to the kernel 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:204
+#: en/setupBootloader.xml:299
 msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:206
+#: en/setupBootloader.xml:301
 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, "
-"then untick the Probe Foreign OS option."
+"then untick the <guimenuitem>Probe Foreign OS</guimenuitem> option."
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:215
+#: en/setupBootloader.xml:311
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader4.png\"/> </imageobject> <imageobject condition=\"live"
@@ -4040,12 +4186,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:226
+#: en/setupBootloader.xml:322
 msgid "<emphasis>Video mode</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:228
+#: en/setupBootloader.xml:324
 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 "
@@ -4053,38 +4199,47 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:234
+#: en/setupBootloader.xml:330
 msgid "<emphasis>Do not touch ESP or MBR</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:236
+#: en/setupBootloader.xml:332
 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 "
-"missing. Click<emphasis> Ok</emphasis> if you are sure you understand the "
-"implications, and wish to proceed."
+"missing. Click <guimenuitem>Ok </guimenuitem>only if you are sure you "
+"understand the implications, and wish to proceed."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><warning><para>
+#: en/setupBootloader.xml:338
+msgid ""
+"Chain-loading via legacy bootloaders (GRUB Legacy and LiLo)  is no longer "
+"supported by Mageia as it is likely to fail when attempting to boot this "
+"resulting installation of Mageia. If you use anything other than GRUB2 or "
+"rEFInd for this purpose, then you do so at your own risk!"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:245
+#: en/setupBootloader.xml:348
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png"
 "\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:253
+#: en/setupBootloader.xml:356
 msgid "Other Options"
 msgstr "Další volby"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:256
+#: en/setupBootloader.xml:359
 msgid "Using an existing bootloader"
 msgstr "Použití už existujícího zavaděče"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:258
+#: en/setupBootloader.xml:361
 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 "
@@ -4094,12 +4249,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:267
+#: en/setupBootloader.xml:370
 msgid "Installing Without a Bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:269
+#: en/setupBootloader.xml:372
 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 "
@@ -4434,3 +4589,27 @@ msgid ""
 "take a little while to complete. When it is finishing you will briefly get a "
 "blank screen - this is normal."
 msgstr ""
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> "
+#~ "</imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> "
+#~ "</imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4."
+#~ "png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4."
+#~ "png\"/> </imageobject>"
+
+#~ msgid "Grub2-efi on UEFI systems"
+#~ msgstr "Grub2-efi na UEFI systémech"
diff --git a/docs/docs/stable/installer/de.po b/docs/docs/stable/installer/de.po
index 57f3a3e6..80b124b5 100644
--- a/docs/docs/stable/installer/de.po
+++ b/docs/docs/stable/installer/de.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2019-01-19 21:23+0200\n"
+"POT-Creation-Date: 2019-09-08 15:26+0300\n"
 "PO-Revision-Date: 2019-03-12 20:13+0000\n"
 "Last-Translator: psyca\n"
 "Language-Team: German (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -192,7 +192,7 @@ msgstr ""
 "benötigten 32-Bit Pakete finden und aktualisieren."
 
 #. type: Content of: <section><info><title>
-#: en/addUser.xml:3
+#: en/addUser.xml:9
 msgid "User Management"
 msgstr "Benutzerverwaltung"
 
@@ -202,13 +202,16 @@ msgstr "Benutzerverwaltung"
 #. 2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
 #.   Also changed 'Advanced User Management' to 'User Management (advanced)'.
 #. 2018/02/24 apb: Changed list style.
+#. 2019/08/10 apb: Added missing 'condition' profile for live-user1.png.
+#. 2019/08/11 apb: [1] Reword 1.1 (including Note) [2] Reword 1.2 Password text.
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:12
+#: en/addUser.xml:28
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
-"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
-"\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata format="
-"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-setRootPassword.png\" format=\"PNG\" revision=\"1\" xml:id="
+"\"setRootPassword-im1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-user1.png\" format=\"PNG\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
 "\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -216,20 +219,18 @@ msgstr ""
 "\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:21
+#: en/addUser.xml:40
 msgid "Set Administrator (root)  Password:"
 msgstr "Setzen des Administrator (root)  Passworts:"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:24
+#: en/addUser.xml:44
+#, fuzzy
 msgid ""
 "It is advisable for all Mageia installations to set a <literal>superuser</"
 "literal> (Administrator) password, usually called the <emphasis>root </"
-"emphasis>password in Linux. As you type a password into the top box a shield "
-"will change from red-to-yellow-to-green depending on the strength of the "
-"password. A green shield shows you are using a strong password. You need to "
-"repeat the same password in the box underneath, to check that the first "
-"entry was not mistyped."
+"emphasis>password in Linux. You need to repeat the same password in the box "
+"underneath, to check that the first entry was not mistyped."
 msgstr ""
 "Es ist für alle Installationen von Mageia ratsam, ein Passwort für den "
 "<literal>superuser</literal> (Administrator) zu setzen, normalerweise wird "
@@ -242,7 +243,15 @@ msgstr ""
 "Eingabe des ersten Passwortes nicht vertippt haben."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:32
+#: en/addUser.xml:51
+msgid ""
+"As you type a password into the top box a shield will change from red-to-"
+"yellow-to-green depending on the strength of the password. A green shield "
+"shows you are using a strong password."
+msgstr ""
+
+#. type: Content of: <section><section><note><para>
+#: en/addUser.xml:55
 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."
@@ -252,12 +261,12 @@ msgstr ""
 "Sonderzeichen in einem Passwort verwenden."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:39
+#: en/addUser.xml:63
 msgid "Enter a user"
 msgstr "Einen Benutzer eingeben"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:41
+#: en/addUser.xml:66
 msgid ""
 "Add a User here. A regular user has fewer privileges than the "
 "<literal>superuser</literal> (root), but enough to use the Internet, office "
@@ -270,33 +279,33 @@ msgstr ""
 "vieles mehr, was ein durchschnittlicher Benutzer mit einem Computer macht."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:47
+#: en/addUser.xml:73
 msgid "<emphasis role=\"bold\">Icon</emphasis>"
 msgstr "<emphasis role=\"bold\">Symbol</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:48
+#: en/addUser.xml:75
 msgid "Click on this button if you want to change the user's icon"
 msgstr ""
 "Klicke auf diesen Knopf, wenn Sie das Symbol für den Benutzer ändern möchten"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:52
+#: en/addUser.xml:80
 msgid "<emphasis role=\"bold\">Real Name</emphasis>"
 msgstr "<emphasis role=\"bold\">Vollständiger Name</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:53
+#: en/addUser.xml:82
 msgid "Insert the user's real name into this text box"
 msgstr "Gebe den vollständigen Namen des Benutzers in dieses Textfeld ein"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:56
+#: en/addUser.xml:86
 msgid "<emphasis role=\"bold\">Login Name</emphasis>"
 msgstr "<emphasis role=\"bold\">Benutzername</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:57
+#: en/addUser.xml:88
 msgid ""
 "Enter the user login name or let DrakX use a version of the user's real "
 "name. <emphasis role=\"bold\">The login name is case-sensitive.</emphasis>"
@@ -306,7 +315,7 @@ msgstr ""
 "\"bold\">Der Anmeldename beachtet die Groß-/Kleinschreibung</emphasis>."
 
 #. type: Content of: <section><section><itemizedlist><listitem><caution><simpara>
-#: en/addUser.xml:61
+#: en/addUser.xml:93
 msgid ""
 "The login entered here should be different to any login currently in use for "
 "your <filename>/home</filename> directory. Some user parameters will be "
@@ -321,23 +330,17 @@ msgstr ""
 "Name verwendet werden."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:65 en/setupBootloader.xml:124
+#: en/addUser.xml:102 en/setupBootloader.xml:182
 msgid "<emphasis role=\"bold\">Password</emphasis>"
 msgstr "<emphasis role=\"bold\">Passwort</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:66
-msgid ""
-"Type in the user password. There is a shield at the end of the text box that "
-"indicates the strength of the password. (See also <xref linkend="
-"\"givePassword\"/>)"
+#: en/addUser.xml:104
+msgid "Type in the user password (remembering the advice in the Note above)."
 msgstr ""
-"Geben Sie das Passwort für den Benutzer ein. Am Ende des Textfelds zeigt ein "
-"Schild an, wie sicher das Passwort ist. (Siehe auch <xref linkend="
-"\"givePassword\"/>)"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:68
+#: en/addUser.xml:107
 msgid ""
 "<emphasis role=\"bold\">Password (again):</emphasis> Retype the user "
 "password. DrakX will check that you have not mistyped the password."
@@ -348,7 +351,7 @@ msgstr ""
 "vergleicht."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:74
+#: en/addUser.xml:114
 msgid ""
 "Any users added while installing Mageia, will have a home directory that is "
 "both read and write protected (umask=0027)"
@@ -357,7 +360,7 @@ msgstr ""
 "ein lese- und schreibgeschütztes home Verzeichnis (umask=0027)"
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:76
+#: en/addUser.xml:117
 msgid ""
 "You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
@@ -369,18 +372,18 @@ msgstr ""
 "emphasis> aus."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:79
+#: en/addUser.xml:121
 msgid "The access permissions can also be changed after the install."
 msgstr ""
 "Die Zugriffsrechte können auch nach der Installation abgeändert werden."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:85
+#: en/addUser.xml:128
 msgid "User Management (advanced)"
 msgstr "Benutzerverwaltung (fortgeschritten)"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:87
+#: en/addUser.xml:131
 msgid ""
 "The <emphasis>Advanced</emphasis> option allows you to edit further settings "
 "for the user you are adding."
@@ -389,7 +392,7 @@ msgstr ""
 "Einstellungen für den Benutzer zu bearbeiten, den Sie gerade hinzufügen."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:91
+#: en/addUser.xml:136
 msgid ""
 "<emphasis>Shell</emphasis>: This drop-down list allows you to change the "
 "shell available to any user you added in the previous screen. Options are "
@@ -401,7 +404,7 @@ msgstr ""
 "<literal>Dash</literal> und <literal>Sh</literal>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:143
 msgid ""
 "<emphasis>User ID</emphasis>: Here you can set the user ID for any user you "
 "added in the previous screen. If you are unsure what the purpose of this is, "
@@ -413,7 +416,7 @@ msgstr ""
 "sind, welchen Zweck die Benutzer-ID erfüllt, lassen Sie das Feld leer."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:102
+#: en/addUser.xml:149
 msgid ""
 "<emphasis>Group ID</emphasis>: This lets you set the group ID.  Again, if "
 "unsure, leave it blank."
@@ -571,17 +574,17 @@ msgstr ""
 "automatische Zeitsynchronisation aktivieren und einen NTP Server festlegen."
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:23
+#: en/bootLive.xml:10
 msgid "Boot Mageia as Live system"
 msgstr "Mageia als Live-System starten"
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:28
+#: en/bootLive.xml:14
 msgid "Booting the medium"
 msgstr "Vom Medium starten"
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:31
+#: en/bootLive.xml:16
 msgid ""
 "You can boot directly from a Live DVD or USB. Usually, you just need to plug "
 "the USB device in or place the DVD in the drive and restart the computer."
@@ -591,7 +594,7 @@ msgstr ""
 "Laufwerk legen und den Computer neu starten."
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:35
+#: en/bootLive.xml:19
 msgid ""
 "If the computer does not automatically boot from the USB or DVD you may need "
 "to reconfigure your BIOS Boot Disk priority. Alternatively, you might try "
@@ -604,7 +607,7 @@ msgstr ""
 "Ihres Computers aufrufen, um das entsprechende Laufwerk auszuwählen."
 
 #. type: Content of: <section><section><tip><para>
-#: en/bootLive.xml:41
+#: en/bootLive.xml:24
 msgid ""
 "To access the BIOS or boot menu when the computer is starting, you can try "
 "pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or <keycap>Esc</"
@@ -621,7 +624,7 @@ msgstr ""
 "möglichen Tasten."
 
 #. type: Content of: <section><section><note><para>
-#: en/bootLive.xml:50
+#: en/bootLive.xml:32
 msgid ""
 "The actual screen that you will first see when booting from the Live media "
 "will depend on whether your computer motherboard is of the Legacy (BIOS) or "
@@ -632,37 +635,38 @@ msgstr ""
 "Modus (BIOS) oder UEFI verwendet."
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:58
+#: en/bootLive.xml:39
 msgid "In BIOS/CSM/Legacy mode"
 msgstr "Im BIOS/CSM/Legacy Modus"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:62
+#: en/bootLive.xml:42
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"../live-bootCSM.png\" align=\"center\"/> "
+"</imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> </"
+"<imageobject> <imagedata fileref=\"dx2-summaryTop.png\" align=\"center\"/> </"
 "imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:67
+#: en/bootLive.xml:46
 msgid "First screen while booting in BIOS mode"
 msgstr "Der erste Bildschirm beim starten im BIOS Modus"
 
 #. type: Content of: <section><section><section><itemizedlist><title>
-#: en/bootLive.xml:72 en/bootLive.xml:144 en/installer.xml:106
-#: en/installer.xml:154
+#: en/bootLive.xml:50 en/bootLive.xml:104 en/installer.xml:108
+#: en/installer.xml:156
 msgid "Menu"
 msgstr "Menü"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:75 en/bootLive.xml:147
+#: en/bootLive.xml:52 en/bootLive.xml:106
 msgid "<emphasis role=\"bold\">Boot Mageia</emphasis>"
 msgstr "<emphasis role=\"bold\">Mageia starten</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:77
+#: en/bootLive.xml:53
 msgid ""
 "This option will boot the Mageia Live system from the connected DVD/USB "
 "media (expect a very slow system compared to an installed OS)."
@@ -672,14 +676,14 @@ msgstr ""
 "Betriebssystem, sehr langsam ist)."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:81
+#: en/bootLive.xml:56
 msgid "Once the boot is done, you can proceed to the installation."
 msgstr ""
 "Sobald der Startvorgang abgeschlossen ist, können Sie mit der Installation "
 "fortfahren."
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:86 en/bootLive.xml:102
+#: en/bootLive.xml:60 en/bootLive.xml:72
 msgid ""
 "<emphasis role=\"bold\">+ use non-free video drivers (slower to boot)</"
 "emphasis>"
@@ -688,34 +692,34 @@ msgstr ""
 "Systemstart)</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:89
+#: en/bootLive.xml:62
 msgid "Boot the Mageia Live system using non-free video drivers"
 msgstr ""
 "Startet das Mageia Live-System mit Verwendung der unfreien "
 "Grafikkartentreiber"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:96 en/bootLive.xml:155 en/installer.xml:109
+#: en/bootLive.xml:68 en/bootLive.xml:112 en/installer.xml:111
 msgid "<emphasis role=\"bold\">Install Mageia</emphasis>"
 msgstr "<emphasis role=\"bold\">Mageia installieren</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:98 en/bootLive.xml:157
+#: en/bootLive.xml:69 en/bootLive.xml:113
 msgid "This option will install Mageia to a hard disk."
 msgstr "Diese Auswahl wird Mageia direkt auf eine Festplatte installieren."
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:105
+#: en/bootLive.xml:74
 msgid "Install Mageia using non-free video drivers"
 msgstr "Installiert Mageia mit den unfreien Grafikkartentreiber."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:111 en/installer.xml:125
+#: en/bootLive.xml:79 en/installer.xml:127
 msgid "<emphasis role=\"bold\">Memory Test</emphasis>"
 msgstr "<emphasis role=\"bold\">Speichertest</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:113 en/installer.xml:127
+#: en/bootLive.xml:80 en/installer.xml:129
 msgid ""
 "Test the installed RAM by performing multiple read and write operations. "
 "Reboot to end the test."
@@ -724,12 +728,12 @@ msgstr ""
 "das System neu um den Test zu beenden."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:118 en/bootLive.xml:161
+#: en/bootLive.xml:84 en/bootLive.xml:116
 msgid "<emphasis role=\"bold\"> F2 Language</emphasis>"
 msgstr "<emphasis role=\"bold\"> F2 Sprache</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:120 en/bootLive.xml:163
+#: en/bootLive.xml:85 en/bootLive.xml:117
 msgid ""
 "Press <keycap>F2</keycap> to have the installer use a specific language "
 "during the installation. Use the arrow keys to select the language then "
@@ -740,26 +744,27 @@ msgstr ""
 "auszuwählen und drücke danach <keycap>Enter</keycap>."
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:129
+#: en/bootLive.xml:93
 msgid "In UEFI mode"
 msgstr "Im UEFI-Modus"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:133
+#: en/bootLive.xml:96
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:139
+#: en/bootLive.xml:100
 msgid "First screen while booting in UEFI mode"
 msgstr "Der erste Bildschirm beim starten im UEFI-Modus"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:149
+#: en/bootLive.xml:107
 msgid ""
 "This option will boot the Mageia Live system from the connected DVD/USB "
 "media (expect a very slow system compared to an installed OS).  Once the "
@@ -771,7 +776,7 @@ msgstr ""
 "ist, können Sie mit der Installation fortfahren"
 
 #. type: Content of: <section><section><note><para>
-#: en/bootLive.xml:170
+#: en/bootLive.xml:123
 msgid ""
 "If you booted from a USB stick, you will see the above menu options "
 "duplicated, and in this case, you should choose from the menu pair that will "
@@ -1048,12 +1053,12 @@ msgstr ""
 "alle Betriebssysteme entweder auf Lokalzeit oder auf UTC/GMT gesetzt sind."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:24
+#: en/configureX_card_list.xml:27
 msgid "Choose an X Server (Configure your Graphic Card)"
 msgstr "Einen X-Server auswählen (Ihre Grafikkarte einrichten)"
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_card_list.xml:29
+#: en/configureX_card_list.xml:32
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_card_list."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_card_list-im1\"/> </"
@@ -1064,7 +1069,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:35
+#: en/configureX_card_list.xml:38
 msgid ""
 "DrakX has a very comprehensive database of video cards and will usually "
 "correctly identify your video device."
@@ -1073,7 +1078,7 @@ msgstr ""
 "Ihre Grafikkarte korrekt erkennen."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:38
+#: en/configureX_card_list.xml:41
 msgid ""
 "If the installer has not correctly detected your graphic card and you know "
 "which one you have, you can select it from the tree by:"
@@ -1083,22 +1088,22 @@ msgstr ""
 "dem Baum auswählen:"
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_card_list.xml:41 en/configureX_monitor.xml:74
+#: en/configureX_card_list.xml:44 en/configureX_monitor.xml:78
 msgid "Vendor"
 msgstr "Hersteller"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:45
+#: en/configureX_card_list.xml:48
 msgid "then the make of your card"
 msgstr "dann die Marke Ihrer Karte"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:49
+#: en/configureX_card_list.xml:52
 msgid "and the model of card"
 msgstr "und das Modell der Karte"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:53
+#: en/configureX_card_list.xml:56
 msgid ""
 "If you cannot find your card in the vendor lists (because it's not yet in "
 "the database or it's an older card) you may find a suitable driver in the "
@@ -1116,7 +1121,7 @@ msgstr ""
 "verwenden, welcher grundlegende Eigenschaften besitzt."
 
 #. type: Content of: <section><caution><para>
-#: en/configureX_card_list.xml:61
+#: en/configureX_card_list.xml:64
 msgid ""
 "Be aware that if you select an incompatible driver you may only have access "
 "to the <emphasis>Command Line Interface</emphasis>"
@@ -1126,7 +1131,7 @@ msgstr ""
 "<emphasis>Befehlszeilenschnittstelle</emphasis> erhalten."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:65
+#: en/configureX_card_list.xml:68
 msgid ""
 "Some video card manufacturers provide proprietary drivers for Linux which "
 "may only be available in the <emphasis>Nonfree</emphasis> repository and in "
@@ -1143,17 +1148,13 @@ msgstr ""
 "sollten Sie dies nach Ihrem ersten Systemstart tun."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:11
-msgid "Graphic Card and Monitor Configuration"
+#: en/configureX_chooser.xml:23
+#, fuzzy
+msgid "Graphics Card and Monitor Configuration"
 msgstr "Konfiguration der Grafikkarte und des Bildschirms"
 
-#.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
-#. 2018/02/15 apb: Some text and typography.
-#. 2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.
-#. 2018/02/23 apb: Typo.
-#. 2019/01/06 apb: Slight reword, split 1st para in two.
 #. type: Content of: <section><mediaobject>
-#: en/configureX_chooser.xml:26
+#: en/configureX_chooser.xml:28
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_chooser."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_chooser-im1\"/> </"
@@ -1164,7 +1165,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:32
+#: en/configureX_chooser.xml:34
 msgid ""
 "No matter which graphical environment (also known as desktop environment) "
 "you chose for this install of Mageia, they are all based on a graphical user "
@@ -1181,7 +1182,7 @@ msgstr ""
 "quote> korrekt sein."
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:39
+#: en/configureX_chooser.xml:41
 msgid ""
 "Choose the appropriate settings manually if you think the details are "
 "incorrect, or if none are shown."
@@ -1190,12 +1191,13 @@ msgstr ""
 "die Details nicht richtig sind oder wenn keine angezeigt werden."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:44
-msgid "<emphasis role=\"bold\">Graphic Card</emphasis>"
+#: en/configureX_chooser.xml:46
+#, fuzzy
+msgid "<emphasis role=\"bold\">Graphics Card</emphasis>"
 msgstr "<emphasis role=\"bold\">Grafikkarte</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:47
+#: en/configureX_chooser.xml:49
 msgid ""
 "If you need to, you can select a specific card from this expandable list. "
 "See <xref linkend=\"configureX_card_list\"/>."
@@ -1204,12 +1206,12 @@ msgstr ""
 "auswählen. Siehe <xref linkend=\"configureX_card_list\"/>."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:52
+#: en/configureX_chooser.xml:54
 msgid "<emphasis role=\"bold\">Monitor</emphasis>"
 msgstr "<emphasis role=\"bold\">Monitor</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:55
+#: en/configureX_chooser.xml:57
 msgid ""
 "You can choose Plug 'n Play, if applicable, or choose your monitor from the "
 "<emphasis>Vendor</emphasis> or <emphasis>Generic</emphasis> lists. Choose "
@@ -1225,24 +1227,24 @@ msgstr ""
 ">."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:63
+#: en/configureX_chooser.xml:65
 msgid "<emphasis role=\"bold\">Resolution</emphasis>"
 msgstr "<emphasis role=\"bold\">Auflösung</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:66
+#: en/configureX_chooser.xml:68
 msgid "The resolution and color depth of your monitor can be set here."
 msgstr ""
 "Legen Sie hier die entsprechende Auflösung und Farbtiefe für Ihren "
 "Bildschirm fest"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:71
+#: en/configureX_chooser.xml:73
 msgid "<emphasis role=\"bold\">Test</emphasis>"
 msgstr "<emphasis role=\"bold\">Test</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:74
+#: en/configureX_chooser.xml:76
 msgid ""
 "The test button does not always appear during install. If the option is "
 "there, and you test your settings, you should be asked to confirm that your "
@@ -1264,17 +1266,17 @@ msgstr ""
 "Bildschirms befinden."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:85
+#: en/configureX_chooser.xml:87
 msgid "<emphasis role=\"bold\">Options</emphasis>"
 msgstr "<emphasis role=\"bold\">Optionen</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:88
+#: en/configureX_chooser.xml:90
 msgid "Here you can choose to enable or disable various options."
 msgstr "Hier können Sie verschiedene Optionen aktivieren oder deaktivieren."
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_chooser.xml:93
+#: en/configureX_chooser.xml:95
 msgid ""
 "There is a risk of damaging a monitor if you choose refresh rates that are "
 "outside the frequency range of that monitor. This applies to older CRT "
@@ -1288,12 +1290,12 @@ msgstr ""
 "Standby-Modus wechseln."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_monitor.xml:22
+#: en/configureX_monitor.xml:26
 msgid "Choosing your Monitor"
 msgstr "Auswahl des Monitors"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:25
+#: en/configureX_monitor.xml:29
 msgid ""
 "DrakX has a very comprehensive database of monitors and will usually "
 "correctly identify yours."
@@ -1302,7 +1304,7 @@ msgstr ""
 "normalerweise ihren Monitor korrekt."
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:30
+#: en/configureX_monitor.xml:34
 msgid ""
 "<emphasis role=\"bold\">Selecting a monitor with different characteristics "
 "could damage your monitor or video hardware. Please don't try something "
@@ -1315,7 +1317,7 @@ msgstr ""
 "Zweifel schauen Sie doch bitte in die Dokumentation des Monitors"
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:38
+#: en/configureX_monitor.xml:42
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
@@ -1326,12 +1328,12 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:46
+#: en/configureX_monitor.xml:50
 msgid "Custom"
 msgstr "Benutzerdefiniert"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:49
+#: en/configureX_monitor.xml:53
 msgid ""
 "This option allows you to set two critical parameters: the vertical refresh "
 "rate and the horizontal sync rate. Vertical refresh determines how often the "
@@ -1345,7 +1347,7 @@ msgstr ""
 "Scanlinien dargestellt werden."
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:55
+#: en/configureX_monitor.xml:59
 msgid ""
 "It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor "
 "type with a sync range that is beyond the capabilities of your monitor: you "
@@ -1358,12 +1360,12 @@ msgstr ""
 "niedrigere Einstellung und schauen Sie in die Dokumentation ihres Monitors."
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:64
+#: en/configureX_monitor.xml:68
 msgid "Plug'n Play"
 msgstr "Plug'n'Play"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:67
+#: en/configureX_monitor.xml:71
 msgid ""
 "This is the default option and automatically tries to determine the monitor "
 "type from the monitor database."
@@ -1372,38 +1374,40 @@ msgstr ""
 "Monitor-Datenbank zu bestimmen."
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:77
+#: en/configureX_monitor.xml:81
+#, fuzzy
 msgid ""
 "If the installer has not correctly detected your monitor and you know which "
-"one you have, you can select it from the tree by selecting:"
+"one you have, you can choose it from the options by selecting:"
 msgstr ""
 "Falls das Installationsprogramm Ihren Monitor nicht korrekt erkannt hat und "
 "Sie wissen, um welchen Monitor es sich handelt, können Sie den Monitor "
 "anhand folgender Optionen auswählen:"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:86
+#: en/configureX_monitor.xml:90
 msgid "Manufacturer"
 msgstr "Hersteller"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:90
+#: en/configureX_monitor.xml:94
 msgid "Monitor model"
 msgstr "Monitor-Modell"
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:96
+#: en/configureX_monitor.xml:100
 msgid "Generic"
 msgstr "Generisch"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:99
+#: en/configureX_monitor.xml:103
+#, fuzzy
 msgid ""
-"Selecting this group will list nearly 30 display configurations such as "
-"1024x768 @ 60Hz and includes flat-panel displays as used in laptops. This is "
-"often a good monitor selection group if you need to use the VESA card driver "
-"when your video hardware cannot be determined automatically.  Once again it "
-"may be wise to be conservative in your selections."
+"Selecting this group will list approximately 30 display configurations such "
+"as 1024x768 @ 60Hz and includes flat-panel displays as used in laptops.  "
+"This is often a good monitor selection group if you need to use the VESA "
+"card driver when your video hardware cannot be determined automatically. "
+"Once again, it may be wise to be conservative in your selections."
 msgstr ""
 "Die Auswahl dieser Gruppe listet rund 30 Anzeigeneinstellungen auf, darunter "
 "1024x768 @ 60Hz und beinhaltet auch Flachbildschirme, die in Laptops verbaut "
@@ -1413,12 +1417,12 @@ msgstr ""
 "zu sein."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:22
+#: en/diskdrake.xml:24
 msgid "Custom Disk Partitioning with DiskDrake"
 msgstr "Benutzerdefinierte Laufwerkspartitionierung mit DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:27
+#: en/diskdrake.xml:29
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-diskdrake.png\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1429,7 +1433,7 @@ msgstr ""
 "<imagedata align=\"center\" fileref=\"live-diskdrake.png\"/> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:38
+#: en/diskdrake.xml:40
 msgid ""
 "Modify the layout of your disk(s) here. You can remove or create partitions, "
 "change the filesystem or size of a partition and even view their details "
@@ -1440,18 +1444,19 @@ msgstr ""
 "ändern und sogar die Details anzeigen lassen, bevor Sie anfangen."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:47
+#, fuzzy
 msgid ""
 "There is a tab at the top for every detected hard disk (or other storage "
-"device, like a USB key). In the screenshot above there are two available "
-"devices: <filename>sda </filename>and <filename>sdb</filename>."
+"device, like a USB key), for example: <filename>sda</filename>, "
+"<filename>sdb</filename>, <filename>sdc</filename> etc."
 msgstr ""
 "Für jede erkannte Festplatte (oder anderen Datenträger, wie einen USB-Stick) "
 "gibt es im oberen Bereich einen Tab. In dem Screenshot oben sind zwei Geräte "
 "verfügbar: <filename>sda</filename> und <filename>sdb</filename>."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:52
+#: en/diskdrake.xml:54
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it. "
@@ -1466,7 +1471,7 @@ msgstr ""
 "Partition zu geben oder einen Partitionstyp festzulegen."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:60
+#: en/diskdrake.xml:62
 msgid ""
 "Continue until you have adjusted everything to your satisfaction, then click "
 "<emphasis>Done</emphasis> when you're ready."
@@ -1476,7 +1481,7 @@ msgstr ""
 "sobald alles bereit sind."
 
 #. type: Content of: <section><warning><orderedlist><listitem><para>
-#: en/diskdrake.xml:69
+#: en/diskdrake.xml:71
 msgid ""
 "Take care with the <emphasis>Clear all</emphasis> option, use it only if you "
 "are sure you want to wipe all partitions on the selected storage device."
@@ -1486,7 +1491,7 @@ msgstr ""
 "Laufwerk gelöscht werden sollen."
 
 #. type: Content of: <section><warning><orderedlist><listitem><para>
-#: en/diskdrake.xml:75
+#: en/diskdrake.xml:77
 msgid ""
 "If you wish to use encryption on your <filename>/</filename> partition you "
 "must ensure that you have a separate <filename>/boot</filename> partition. "
@@ -1500,7 +1505,7 @@ msgstr ""
 "das System nicht gebootet werden kann."
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/diskdrake.xml:87
+#: en/diskdrake.xml:89
 msgid ""
 "If you are installing Mageia on a UEFI system, check that an ESP (EFI System "
 "Partition) is present and correctly mounted on <filename>/boot/EFI</"
@@ -1511,7 +1516,7 @@ msgstr ""
 "EFI</filename> eingebunden ist. Siehe hierzu Abbildung 1."
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/diskdrake.xml:93
+#: en/diskdrake.xml:95
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
 "partition is present and of the correct type. See Figure 2 below."
@@ -1521,12 +1526,12 @@ msgstr ""
 "hat. Siehe Abbildung 2 unten."
 
 #. type: Content of: <section><figure><title>
-#: en/diskdrake.xml:101
+#: en/diskdrake.xml:103
 msgid "EFI System Partition"
 msgstr "EFI-Systempartition"
 
 #. type: Content of: <section><figure><mediaobject>
-#: en/diskdrake.xml:104
+#: en/diskdrake.xml:106
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-diskdrake2.png\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1537,17 +1542,17 @@ msgstr ""
 "<imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/> </imageobject>"
 
 #. type: Content of: <section><figure>
-#: en/diskdrake.xml:103 en/diskdrake.xml:117
+#: en/diskdrake.xml:105 en/diskdrake.xml:119
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><figure><title>
-#: en/diskdrake.xml:115
+#: en/diskdrake.xml:117
 msgid "BIOS boot partition"
 msgstr "BIOS Bootpartition"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:118 en/doPartitionDisks.xml:201
+#: en/diskdrake.xml:120 en/doPartitionDisks.xml:206
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1570,12 +1575,12 @@ msgid "Partitioning"
 msgstr "Partitionierung"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:31
 msgid "Suggested Partitioning"
 msgstr "Vorgeschlagene Partitionierung"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:34
 msgid ""
 "In this screen you can see the content of your hard drive(s) along with the "
 "DrakX partitioning proposals for where to install Mageia."
@@ -1585,7 +1590,7 @@ msgstr ""
 "Mageia vorschlägt."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:34
+#: en/doPartitionDisks.xml:38
 msgid ""
 "The actual options available from those shown below will vary according to "
 "the layout and content of your particular hard drive(s)."
@@ -1594,7 +1599,7 @@ msgstr ""
 "anhand der Anordnung und des Inhalts Ihrer aktuellen Festplatte(n)."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:39
+#: en/doPartitionDisks.xml:43
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1607,17 +1612,17 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><itemizedlist><title>
-#: en/doPartitionDisks.xml:49
+#: en/doPartitionDisks.xml:53
 msgid "Main Options"
 msgstr "Hauptoptionen"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:56
 msgid "<emphasis role=\"bold\">Use Existing Partitions</emphasis>"
 msgstr "<emphasis role=\"bold\">Bestehende Partitionen verwenden</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:59
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1626,12 +1631,12 @@ msgstr ""
 "Partitionen gefunden und können für die Installation genutzt werden."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:61
+#: en/doPartitionDisks.xml:65
 msgid "<emphasis role=\"bold\">Use Free Space</emphasis>"
 msgstr "<emphasis role=\"bold\">Freien Speicherplatz verwenden</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:68
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1640,7 +1645,7 @@ msgstr ""
 "dann wird diese Option diesen für die neue Mageia-Installation verwenden."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:70
+#: en/doPartitionDisks.xml:74
 msgid ""
 "<emphasis role=\"bold\">Use Free Space on a Windows Partition</emphasis>"
 msgstr ""
@@ -1648,12 +1653,12 @@ msgstr ""
 "verwenden</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:73
+#: en/doPartitionDisks.xml:77
+#, fuzzy
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it. 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 important files!"
+"installation but see the warning below."
 msgstr ""
 "Wenn Sie freien Speicherplatz auf einer bestehenden Windows-Partition haben, "
 "wird Ihnen der Installer anbieten, diesen zu verwenden. Dies kann eine "
@@ -1661,14 +1666,28 @@ msgstr ""
 "erhalten, jedoch ist dies auch risikoreich, weshalb Sie zuvor eine "
 "Datensicherung Ihrer wichtigen Daten durchführen sollten!"
 
+#. type: Content of: <section><itemizedlist><listitem><para><mediaobject>
+#: en/doPartitionDisks.xml:87
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:79
+#: en/doPartitionDisks.xml:82
+#, fuzzy
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
 "light blue and the proposed Mageia partition in dark blue with their "
 "intended sizes just underneath. You have the option to modify these sizes by "
 "clicking and dragging the gap between both partitions.  See the following "
-"screenshot:"
+"screenshot:<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr ""
 "Bei dieser Option stellt das Installationsprogramm die verbleibende Windows-"
 "Partition in einem hellen und die zukünftige Mageia-Partition in einem "
@@ -1677,20 +1696,45 @@ msgstr ""
 "die Grenze zwischen den beiden Partitionen anklicken und verschieben. Siehe "
 "dazu den folgenden Screenshot:"
 
+#. type: Content of: <section><itemizedlist><listitem><warning><para>
+#: en/doPartitionDisks.xml:97
+msgid ""
+"This involves shrinking the size of the Windows partition, and therefore is "
+"a risky operation, so you should make sure you have backed up all important "
+"files before proceeding."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><important><para>
+#: en/doPartitionDisks.xml:103
+#, fuzzy
+msgid ""
+"The partition must be \"clean\", meaning that Windows must have closed down "
+"correctly the last time it was used. It must also have been defragmented, "
+"although this is not a guarantee that all files in the partition have been "
+"moved out of the area that is about to be used for Mageia."
+msgstr ""
+"Beachten Sie bitte, dass für diese Option eine Verkleinerung der Windows-"
+"Partition durchgeführt werden muss. Die Partition muss zwingend \"sauber\" "
+"sein. Das bedeutet, dass Windows bei der letzten Nutzung korrekt "
+"heruntergefahren wurde. Zusätzlich muss die Partition defragmentiert worden "
+"sein, obwohl es keine Garantie gibt, dass alle Dateien der Partition aus dem "
+"zu nutzenden Teil verschoben wurden. Es ist also wirklich sehr zu empfehlen, "
+"die persönlichen Daten vor dem Vorgang zu sichern."
+
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:87
+#: en/doPartitionDisks.xml:112
 msgid "<emphasis role=\"bold\">Erase and use Entire Disk</emphasis>"
 msgstr ""
 "<emphasis role=\"bold\">Komplettes Laufwerk löschen und freien Platz "
 "verwenden</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:90
+#: en/doPartitionDisks.xml:115
 msgid "This option will allocate the entire drive for Mageia"
 msgstr "Diese Option wird das gesamte Laufwerk für Mageia zuordnen"
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:119
 msgid ""
 "This will erase ALL data on the selected hard drive. Take care! If you "
 "intend to use part of the disk for something else, or you already have data "
@@ -1701,31 +1745,13 @@ msgstr ""
 "oder falls Sie bereits Daten auf dem Laufwerk haben, die Sie nicht verlieren "
 "möchten, dann verwenden Sie diese Auswahl nicht."
 
-#. type: Content of: <section><itemizedlist><listitem><important><para>
-#: en/doPartitionDisks.xml:101
-msgid ""
-"Note that this involves shrinking the size of the Windows partition. The "
-"partition must be \"clean\", meaning that Windows must have closed down "
-"correctly the last time it was used. It must also have been defragmented, "
-"although this is not a guarantee that all files in the partition have been "
-"moved out of the area that is about to be used. It is highly recommended to "
-"back up your personal files."
-msgstr ""
-"Beachten Sie bitte, dass für diese Option eine Verkleinerung der Windows-"
-"Partition durchgeführt werden muss. Die Partition muss zwingend \"sauber\" "
-"sein. Das bedeutet, dass Windows bei der letzten Nutzung korrekt "
-"heruntergefahren wurde. Zusätzlich muss die Partition defragmentiert worden "
-"sein, obwohl es keine Garantie gibt, dass alle Dateien der Partition aus dem "
-"zu nutzenden Teil verschoben wurden. Es ist also wirklich sehr zu empfehlen, "
-"die persönlichen Daten vor dem Vorgang zu sichern."
-
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:112
+#: en/doPartitionDisks.xml:127
 msgid "<emphasis role=\"bold\">Custom Disk Partitioning</emphasis>"
 msgstr "<emphasis role=\"bold\">Benutzerdefinierte Partitionierung</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:115
+#: en/doPartitionDisks.xml:130
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1733,21 +1759,8 @@ msgstr ""
 "Diese Option gibt Ihnen die vollständige Kontrolle über das Platzieren der "
 "Installation auf den Festplatten."
 
-#. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:122
-msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
-
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:131
+#: en/doPartitionDisks.xml:136
 msgid ""
 "If you are not using the <emphasis>Custom disk partitioning</emphasis> "
 "option, then the installer will allocate the available space according to "
@@ -1758,7 +1771,7 @@ msgstr ""
 "anhand folgender Regeln zuordnen:"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:137
+#: en/doPartitionDisks.xml:142
 msgid ""
 "If the total available space is less than 50 GB, then only one partition is "
 "created. This will be the <filename>/</filename> (root)  partition."
@@ -1768,7 +1781,7 @@ msgstr ""
 "filename> (root) Partition."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:143
+#: en/doPartitionDisks.xml:148
 msgid ""
 "If the total available space is greater than 50 GB, then three partitions "
 "are created"
@@ -1777,7 +1790,7 @@ msgstr ""
 "Partitionen erstellt"
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:148
+#: en/doPartitionDisks.xml:153
 msgid ""
 "6/19 of the total available place is allocated to <filename>/</filename> "
 "with a maximum of 50 GB"
@@ -1786,19 +1799,19 @@ msgstr ""
 "zugewiesen, mit einer maximalen Größe von 50 GB "
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:153
+#: en/doPartitionDisks.xml:158
 msgid "1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB"
 msgstr ""
 "1/19 wird <filename>swap</filename> zugewiesen mit einer maximalen Größe von "
 "4 GB"
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:158
+#: en/doPartitionDisks.xml:163
 msgid "the rest (at least 12/19) is allocated to <filename>/home</filename>"
 msgstr "der Rest (mindestens 12/19) wird <filename>/home</filename> zugewiesen"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:165
+#: en/doPartitionDisks.xml:170
 msgid ""
 "This means that from 160 GB or greater available space, the installer will "
 "create three partitions:"
@@ -1807,22 +1820,22 @@ msgstr ""
 "Installationsprogramm drei Partitionen erstellen wird:"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:170
+#: en/doPartitionDisks.xml:175
 msgid "50 GB for <filename>/</filename>"
 msgstr "50 GB für <filename>/</filename>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:174
+#: en/doPartitionDisks.xml:179
 msgid "4 GB for <filename>swap</filename>"
 msgstr "4 GB für <filename>swap</filename>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:178
+#: en/doPartitionDisks.xml:183
 msgid "and the remainder for <filename>/home</filename>"
 msgstr "und der Rest für <filename>/home</filename>"
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:183
+#: en/doPartitionDisks.xml:188
 msgid ""
 "If you are using a UEFI system, the ESP (EFI System Partition) will be "
 "automatically detected - or created if it does not exist yet - and mounted "
@@ -1837,7 +1850,7 @@ msgstr ""
 "einzige Möglichkeit um nachzuprüfen, ob dies erfolgreich durchgeführt wurde."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:189
+#: en/doPartitionDisks.xml:194
 msgid ""
 "If you are using a Legacy (also known as BIOS) system with a GPT partitioned "
 "disk, you need to create a BIOS boot partition if it doesn't already exist. "
@@ -1855,23 +1868,28 @@ msgstr ""
 "quote> aus."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:196
+#: en/doPartitionDisks.xml:201
 msgid "See <xref linkend=\"diskdrake\"/> for information on how to proceed."
 msgstr ""
 "Siehe <xref linkend=\"diskdrake\"/>, für Informationen zur weiteren "
 "Vorgehensweise."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:211
+#: en/doPartitionDisks.xml:216
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4.png"
-"\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks4.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks4.png\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4.png"
-"\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:217
+#: en/doPartitionDisks.xml:226
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
 "previous standard of 512. Due to lack of available hardware, the "
@@ -1884,7 +1902,7 @@ msgstr ""
 "Laufwerken getestet."
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:222
+#: en/doPartitionDisks.xml:231
 msgid ""
 "Some SSD devices now use an erase block size over 1 MB. If you have such a "
 "device we suggest that you partition the drive in advance, using an "
@@ -1897,17 +1915,17 @@ msgstr ""
 "partitionieren:"
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:229
+#: en/doPartitionDisks.xml:238
 msgid "<emphasis>Align to</emphasis> = MiB"
 msgstr "<emphasis>Ausrichten an</emphasis> = MiB"
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:233
+#: en/doPartitionDisks.xml:242
 msgid "<emphasis>Free space preceding (MiB)</emphasis> = 2"
 msgstr "<emphasis>Vorhergehender freier Speicherplatz (MiB)</emphasis> = 2"
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:237
+#: en/doPartitionDisks.xml:246
 msgid ""
 "Also make sure all partitions are created using an even number of megabytes."
 msgstr ""
@@ -2097,12 +2115,12 @@ msgstr ""
 "link>, falls Sie weitere Fragen haben oder bei Mageia mitarbeiten wollen"
 
 #. type: Content of: <section><info><title>
-#: en/firewall.xml:7
+#: en/firewall.xml:16
 msgid "Firewall"
 msgstr "Firewall"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:10
+#: en/firewall.xml:19
 msgid ""
 "This section allows you to configure some simple firewall rules: they "
 "determine which type of message from the Internet will be accepted by the "
@@ -2114,8 +2132,18 @@ msgstr ""
 "dem Zielsystem akzeptiert werden. Das erlaubt den Zugriff aus dem Internet "
 "auf die entsprechenden System-Services."
 
+#. type: Content of: <section><mediaobject>
+#: en/firewall.xml:26
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-firewall.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome.png\"/> </"
+"imageobject>"
+
 #. type: Content of: <section><para>
-#: en/firewall.xml:16
+#: en/firewall.xml:31
 msgid ""
 "In the default setting (no button is checked), no service of the system is "
 "accessible from the network. The <emphasis>Everything (no firewall)</"
@@ -2137,7 +2165,7 @@ msgstr ""
 "zu deaktivieren."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:25
+#: en/firewall.xml:40
 msgid ""
 "All other options are more or less self-explanatory. As an example, you will "
 "enable the CUPS server if you want printers on your machine to be accessible "
@@ -2149,12 +2177,12 @@ msgstr ""
 "sollen."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:29
+#: en/firewall.xml:44
 msgid "<emphasis role=\"bold\">Advanced</emphasis>"
 msgstr "<emphasis role=\"bold\">Fortgeschritten</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:31
+#: en/firewall.xml:46
 msgid ""
 "The <emphasis>Advanced</emphasis> option opens a window where you can enable "
 "a series of services by typing a list of <quote>couples</quote> (blank "
@@ -2165,33 +2193,37 @@ msgstr ""
 "(getrennt durch Leerzeichen) dieser, aktivieren können"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:35
-msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
+#: en/firewall.xml:50
+#, fuzzy
+msgid "<emphasis>&lt;port-number&gt;/&lt;protocol&gt;</emphasis>"
 msgstr "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:38
+#: en/firewall.xml:53
+#, fuzzy
 msgid ""
-"- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
-"the service you want to enable (e.g. 873 for the RSYNC service) as defined "
-"in <emphasis>RFC-433</emphasis>;"
+"- <emphasis>&lt;port-number&gt;</emphasis> is the value of the port assigned "
+"to the service you want to enable (e.g. 873 for the RSYNC service) as "
+"defined in <emphasis>RFC-433</emphasis>;"
 msgstr ""
 "- <emphasis>&lt;port-number></emphasis> ist der Wert des vom Dienst "
 "verwendeten Ports, welchen Sie aktivieren möchten (z. B. 873 für den RSYNC "
 "Dienst), wie dieser von <emphasis>RFC-433</emphasis> vorgegeben ist;"
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:42
+#: en/firewall.xml:57
+#, fuzzy
 msgid ""
-"- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
-"<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
+"- <emphasis>&lt;protocol&gt;</emphasis> is one of <emphasis>TCP</emphasis> "
+"or <emphasis>UDP</emphasis> - the internet protocol that is used by the "
+"service."
 msgstr ""
 "- <emphasis>&lt;protocol></emphasis> ist entweder <emphasis>TCP</emphasis> "
 "oder <emphasis>UDP</emphasis> - das Internetprotokoll welches von diesem "
 "Dienst verwendet wird."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:47
+#: en/firewall.xml:62
 msgid ""
 "For instance, the entry for enabling access to the RSYNC service therefore "
 "is <emphasis>873/tcp</emphasis>."
@@ -2200,7 +2232,7 @@ msgstr ""
 "dementsprechend <emphasis>873/tcp</emphasis>."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:50
+#: en/firewall.xml:65
 msgid ""
 "In case a service is implemented to use both protocols, you specify 2 "
 "couples for the same port."
@@ -2290,12 +2322,12 @@ msgid "Graphical Configuration"
 msgstr "Grafische Einrichtung"
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:32
+#: en/installer.xml:34
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, das Mageia Installationsprogramm"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:35
+#: en/installer.xml:37
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -2306,12 +2338,12 @@ msgstr ""
 "Installation oder eine Aktualisierung so leicht wie möglich macht."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:40
+#: en/installer.xml:42
 msgid "The installation steps"
 msgstr "Die Installationsschritte"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:44
+#: en/installer.xml:46
 msgid ""
 "The install process is divided into a number of steps - the status of which "
 "is indicated in a panel to the left of the screen."
@@ -2320,7 +2352,7 @@ msgstr ""
 "kann auf der linken Seite des Bildschirms verfolgt werden."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:50
+#: en/installer.xml:52
 msgid ""
 "Each step has one or more screens, which may also have <emphasis>Advanced</"
 "emphasis> sections with extra, less commonly required options."
@@ -2330,7 +2362,7 @@ msgstr ""
 "welche zusätzliche, seltener benötigte Optionen, enthält."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:56
+#: en/installer.xml:58
 msgid ""
 "Most screens have <emphasis>Help</emphasis> buttons for further details "
 "about the particular step."
@@ -2339,7 +2371,7 @@ msgstr ""
 "über den Sie weitere Details zum aktuellen Schritt erhalten."
 
 #. type: Content of: <section><section><caution><para>
-#: en/installer.xml:62
+#: en/installer.xml:64
 msgid ""
 "If at some point during the install you decide to abort the installation, it "
 "is possible to reboot, but please think twice before you do this. Once a "
@@ -2355,7 +2387,7 @@ msgstr ""
 "nicht mehr verwendbaren System zurücklassen."
 
 #. type: Content of: <section><section><caution><para>
-#: en/installer.xml:68
+#: en/installer.xml:70
 msgid ""
 "If, in spite of this, you are very sure rebooting is what you want, go to a "
 "text terminal by pressing the keys <keycombo> <keycap>Ctrl</keycap> "
@@ -2371,12 +2403,12 @@ msgstr ""
 "keycombo> um das System neu zu starten."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:86
+#: en/installer.xml:88
 msgid "Installation Welcome Screen"
 msgstr "Willkommensbildschirm der Installation"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:88
+#: en/installer.xml:90
 msgid ""
 "The particular screen that you will first see when booting from the "
 "Installation media will depend on whether your computer motherboard is of "
@@ -2387,7 +2419,7 @@ msgstr ""
 "den Lagacy Modus (BIOS) oder UEFI verwendet."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:92
+#: en/installer.xml:94
 msgid ""
 "The welcome menu screen has various options, however the default option will "
 "start the installer, and is normally all that you will need."
@@ -2397,12 +2429,12 @@ msgstr ""
 "alles, was Sie benötigen."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:97
+#: en/installer.xml:99
 msgid "Legacy (BIOS) Systems"
 msgstr "Legacy (BIOS) Systeme"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:100
+#: en/installer.xml:102
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome.png\"/> </"
 "imageobject>"
@@ -2411,7 +2443,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:111
+#: en/installer.xml:113
 msgid ""
 "Install Mageia to a hard disk. This is the default option, and will "
 "automatically start after a short while unless another option is selected."
@@ -2421,12 +2453,12 @@ msgstr ""
 "getroffen wird."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:117
+#: en/installer.xml:119
 msgid "<emphasis role=\"bold\">Rescue System</emphasis>"
 msgstr "<emphasis role=\"bold\">Rettungssystem</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:119
+#: en/installer.xml:121
 msgid ""
 "This option allows you to either re-install the bootloader for an existing "
 "Mageia installation or you can use it to restore a Windows bootloader."
@@ -2436,22 +2468,22 @@ msgstr ""
 "wiederherzustellen."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:132
+#: en/installer.xml:134
 msgid "<emphasis role=\"bold\">F2: Language</emphasis>"
 msgstr "<emphasis role=\"bold\">F2: Sprache</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:134
+#: en/installer.xml:136
 msgid "Press F2 for alternative languages."
 msgstr "Drücke F2 für weitere Sprachen."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:140
+#: en/installer.xml:142
 msgid "UEFI Systems"
 msgstr "UEFI-Systeme"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:142
+#: en/installer.xml:144
 msgid ""
 "From this screen, you can access options by pressing <keycap>e</keycap> to "
 "enter the edit mode. To come back to this screen, press <keycap>Esc</keycap> "
@@ -2465,7 +2497,7 @@ msgstr ""
 "Änderungen zu speichern und den Vorgang zu beenden."
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:148
+#: en/installer.xml:150
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome2.png\"/> </"
 "imageobject>"
@@ -2474,14 +2506,14 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:157
+#: en/installer.xml:159
 msgid "<emphasis role=\"bold\">Install:</emphasis> Start the Install process"
 msgstr ""
 "<emphasis role=\"bold\">Installieren:</emphasis> Startet den "
 "Installationsvorgang"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:162
+#: en/installer.xml:164
 msgid ""
 "<emphasis role=\"bold\">Rescue:</emphasis> This option allows you to either "
 "re-install the bootloader for an existing Mageia installation or you can use "
@@ -2492,7 +2524,7 @@ msgstr ""
 "installieren oder einen Windows Bootloader wiederherzustellen."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:169
+#: en/installer.xml:171
 msgid ""
 "<emphasis role=\"bold\">F2: Language:</emphasis> Press <keycap>F2</keycap> "
 "for alternative languages."
@@ -2501,7 +2533,7 @@ msgstr ""
 "für weitere Sprachen"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:174
+#: en/installer.xml:176
 msgid ""
 "If you booted from a USB stick, you will see the above options duplicated, "
 "and in this case, you should use the set that will be suffixed with \"USB\"."
@@ -2511,17 +2543,17 @@ msgstr ""
 "Auswahlmöglichkeiten mit dem Suffix \"USB\" verwenden."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:181
+#: en/installer.xml:183
 msgid "Installation Problems and Possible Solutions"
 msgstr "Installationsprobleme und mögliche Lösungen"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:184
+#: en/installer.xml:186
 msgid "No Graphical Interface"
 msgstr "Keine grafische Schnittstelle"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:188
+#: en/installer.xml:190
 msgid ""
 "After the initial screen you did not progress to the <emphasis>Language "
 "Selection</emphasis> screen. This can happen with some graphic cards and "
@@ -2534,7 +2566,7 @@ msgstr ""
 "Eingabeaufforderung <command>vgalo</command> eingeben."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:195
+#: en/installer.xml:197
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
 "In this case it is worth trying a text-mode installation. To use this press "
@@ -2552,12 +2584,12 @@ msgstr ""
 "<keycap>ENTER</keycap>. Nun wird die Installation im Textmodus fortgesetzt."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:208
+#: en/installer.xml:210
 msgid "The Install Freezes"
 msgstr "Die Installation friert ein"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:210
+#: en/installer.xml:212
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic hardware "
@@ -2573,12 +2605,12 @@ msgstr ""
 "auch mit anderen Optionen kombiniert werden, falls dies nötig ist."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:218
+#: en/installer.xml:220
 msgid "RAM problem"
 msgstr "RAM Problem"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:220
+#: en/installer.xml:222
 msgid ""
 "This will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
@@ -2595,12 +2627,12 @@ msgstr ""
 "an RAM."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:228
+#: en/installer.xml:230
 msgid "Dynamic partitions"
 msgstr "Dynamische Partitionen"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:230
+#: en/installer.xml:232
 msgid ""
 "If you converted your hard disk from <literal>Basic</literal> format to "
 "<literal>Dynamic</literal> format in Microsoft Windows, then it is not "
@@ -4648,22 +4680,29 @@ msgstr ""
 "en/Grub2-efi_and_Mageia</link>"
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:27
+#: en/setupBootloader.xml:32
 msgid "Bootloader"
 msgstr "Bootloader"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:31
+#: en/setupBootloader.xml:36
+#, fuzzy
+msgid "Available Bootloaders"
+msgstr "Bootloader"
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:39
 msgid "Grub2"
 msgstr "GRUB2"
 
-#. type: Content of: <section><section><itemizedlist><title>
-#: en/setupBootloader.xml:34
-msgid "Grub2 on Legacy MBR/GPT systems"
-msgstr "GRUB2 auf Legacy MBR/GPT Systeme"
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:42
+#, fuzzy
+msgid "<emphasis role=\"bold\">Grub2 on Legacy MBR/GPT systems</emphasis>"
+msgstr "<emphasis role=\"bold\">Rettungssystem</emphasis>"
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:37
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:46
 msgid ""
 "GRUB2 (with or without graphical menu) will be used exclusively as the "
 "bootloader for a Legacy/MBR or Legacy/GPT system."
@@ -4671,8 +4710,8 @@ msgstr ""
 "Bei einem Legacy/MBR oder Legacy/GPT-System wird ausschließlich GRUB2 (mit "
 "oder ohne grafischem Menü) als Bootloader verwendet."
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:42
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:52
 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."
@@ -4681,19 +4720,21 @@ msgstr ""
 "Boot Record) Ihrer ersten Festplatte, oder in die BIOS Bootpartition, "
 "geschrieben."
 
-#. type: Content of: <section><section><itemizedlist><title>
-#: en/setupBootloader.xml:49
-msgid "Grub2-efi on UEFI systems"
-msgstr "Grub2-efi auf UEFI-Systeme"
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:59
+#, fuzzy
+msgid "<emphasis role=\"bold\">Grub2-efi on UEFI systems</emphasis>"
+msgstr "<emphasis role=\"bold\">Rettungssystem</emphasis>"
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:52
-msgid "GRUB2-efi will be used exclusively as the bootloader for a UEFI system."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:63
+#, fuzzy
+msgid "GRUB2-efi or rEFInd may be used as the bootloader for a UEFI system."
 msgstr ""
 "Bei einem UEFI-System wird ausschließlich GRUB2-efi als Bootloader verwendet."
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:57
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:68
 msgid ""
 "By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI "
 "System Partition)."
@@ -4701,12 +4742,13 @@ msgstr ""
 "Als Voreinstellung wird ein neuer Bootloader (Grub2-efi) in die ESP (EFI "
 "Systempartition) geschrieben."
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:60
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:71
+#, fuzzy
 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 "
-"created by Windows and add grub2-efi to it. If no ESP exists, then one will "
+"created by Windows and add grub2-efi to it.  If no ESP exists, then one will "
 "be created. Although it is possible to have several ESPs, only one is "
 "required, whatever the number of operating systems you have."
 msgstr ""
@@ -4717,18 +4759,46 @@ msgstr ""
 "mehrere ESP zu haben, wird nur eine benötigt, selbst wenn Sie mehrere "
 "Betriebssysteme verwenden."
 
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:82
+msgid "rEFInd"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:85
+#, fuzzy
+msgid "<emphasis role=\"bold\">rEFInd on UEFI systems</emphasis>"
+msgstr "<emphasis role=\"bold\">Symbol</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:88
+msgid ""
+"rEFInd has a nice graphical set of options, and can auto-detect installed "
+"EFI bootloaders. See: http://www.rodsbooks.com/refind/"
+msgstr ""
+
+#. type: Content of: <section><section><section><note><para>
+#: en/setupBootloader.xml:95
+msgid ""
+"Please note that in order to be able to use the <literal>rEFInd</literal> "
+"option, an installed EFI System Partition must match your system "
+"architecture: if you have a 32bit EFI System Partition installed on a 64bit "
+"machine for instance, then the rEFInd option will not be displayed/available "
+"to you."
+msgstr ""
+
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:72
+#: en/setupBootloader.xml:106
 msgid "Bootloader Setup"
 msgstr "Bootloader Einrichten"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:76
+#: en/setupBootloader.xml:110
 msgid "Bootloader main options"
 msgstr "Hauptoptionen des Bootloaders"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:79
+#: en/setupBootloader.xml:113
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader.png\"/> </imageobject> <imageobject condition=\"live"
@@ -4741,31 +4811,52 @@ msgstr ""
 "im1\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:91
+#: en/setupBootloader.xml:125
 msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
 msgstr "<emphasis role=\"bold\">Zu verwendender Bootloader</emphasis>"
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:93
+#. type: Content of: <section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:129
 msgid ""
-"This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI "
-"systems will not see this option here."
+"<guimenuitem>GRUB2</guimenuitem> (with either a graphical or a text menu), "
+"can be chosen for both <literal>Legacy MBR/BIOS</literal> systems and "
+"<literal>UEFI</literal> systems."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:136
+msgid ""
+"<guimenuitem>rEFInd</guimenuitem> (with a graphical menu)  is an alternative "
+"option solely for use with <literal>UEFI</literal> systems."
 msgstr ""
-"Diese Eigenschaft ist nur auf Legacy MBR/BIOS Systeme verfügbar. Nutzer "
-"eines UEFI-Systems wird diese Auswahl nicht angezeigt."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:98
+#: en/setupBootloader.xml:144
 msgid "<emphasis role=\"bold\">Boot device</emphasis>"
 msgstr "<emphasis role=\"bold\">Boot-Gerät</emphasis>"
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:100
-msgid "Don't change this unless you really know what you are doing"
+#. type: Content of: <section><section><section><itemizedlist><listitem><warning><para>
+#: en/setupBootloader.xml:147
+#, fuzzy
+msgid "Don't change this unless you really know what you are doing."
 msgstr "Ändern Sie hier nichts, außer Sie wissen genau, was Sie tun"
 
+#. type: Content of: <section><section><section><itemizedlist><listitem><note><para>
+#: en/setupBootloader.xml:152
+msgid ""
+"There is no option to write GRUB to the boot sector of a partition (e.g: "
+"<filename>sda1</filename>), as this method is considered unreliable."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:157
+msgid ""
+"When using UEFI mode, then the <guilabel>Boot device</guilabel> will be "
+"listed as <guimenuitem>EFI System Partition</guimenuitem>."
+msgstr ""
+
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:105
+#: en/setupBootloader.xml:163
 msgid ""
 "<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
 msgstr ""
@@ -4773,7 +4864,7 @@ msgstr ""
 "Betriebssystems</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:108
+#: en/setupBootloader.xml:166
 msgid ""
 "This text box lets you set a delay, in seconds, before the default operating "
 "system is started up."
@@ -4782,12 +4873,12 @@ msgstr ""
 "Wartezeit ist, bis das voreingestellte Betriebssystem gestartet wird."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:113
+#: en/setupBootloader.xml:171
 msgid "<emphasis role=\"bold\">Security</emphasis>"
 msgstr "<emphasis role=\"bold\">Sicherheit</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:115
+#: en/setupBootloader.xml:173
 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 "
@@ -4803,17 +4894,17 @@ msgstr ""
 "Sie danach festgelegt haben."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:126
+#: en/setupBootloader.xml:184
 msgid "Choose a password for the bootloader (optional)"
 msgstr "Wähle ein Passwort für den Bootloader (optional)"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:130
+#: en/setupBootloader.xml:188
 msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
 msgstr "<emphasis role=\"bold\">Passwort (erneut)</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:132
+#: en/setupBootloader.xml:190
 msgid ""
 "Retype the password and DrakX will check that it matches with the one set "
 "above"
@@ -4822,17 +4913,17 @@ msgstr ""
 "eingegebenen übereinstimmt."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:137 en/setupBootloader.xml:212
+#: en/setupBootloader.xml:195 en/setupBootloader.xml:308
 msgid "<emphasis>Advanced</emphasis>"
 msgstr "<emphasis>Fortgeschrittene Optionen</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:141
+#: en/setupBootloader.xml:199
 msgid "<emphasis>Enable ACPI</emphasis>"
 msgstr "<emphasis>APIC aktivieren</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:143
+#: en/setupBootloader.xml:201
 msgid ""
 "ACPI (Advanced Configuration and Power Interface) is a standard for power "
 "management. It can save energy by stopping unused devices. Deselecting it "
@@ -4849,12 +4940,12 @@ msgstr ""
 "Neustarts oder Systemhänger)."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:152
+#: en/setupBootloader.xml:210
 msgid "<emphasis>Enable SMP</emphasis>"
 msgstr "<emphasis>SMP aktivieren</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:154
+#: en/setupBootloader.xml:212
 msgid ""
 "This option enables/disables symmetric multiprocessing for multi-core "
 "processors"
@@ -4863,12 +4954,12 @@ msgstr ""
 "Multiprozessorsysteme."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:159
+#: en/setupBootloader.xml:217
 msgid "<emphasis>Enable APIC</emphasis>"
 msgstr "<emphasis>APIC aktivieren</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:161
+#: en/setupBootloader.xml:219
 msgid ""
 "Enabling this gives the operating system access to the Advanced Programmable "
 "Interrupt Controller. APIC devices permit more complex priority models, and "
@@ -4880,12 +4971,12 @@ msgstr ""
 "Verwaltung."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:168
+#: en/setupBootloader.xml:226
 msgid "<emphasis>Enable Local APIC</emphasis>"
 msgstr "<emphasis>Lokales APIC aktivieren</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:170
+#: en/setupBootloader.xml:228
 msgid ""
 "Here you can set Local APIC, which manages all external interrupts for a "
 "specific processor in an SMP system"
@@ -4895,12 +4986,70 @@ msgstr ""
 "verwaltet."
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:177
+#: en/setupBootloader.xml:235
 msgid "Bootloader Configuration"
 msgstr "Konfiguration des Bootloaders"
 
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:237
+msgid ""
+"If, in the previous section you selected <literal>rEFInd</literal> as the "
+"bootloader to use, you would then be presented with the options shown in the "
+"screenshot directly below. Otherwise, please instead move on to the "
+"subsequent screenshot for your options."
+msgstr ""
+
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:180
+#: en/setupBootloader.xml:243
+#, fuzzy
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"rEFIndLoaderConfig.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-rEFIndLoaderConfig.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:253
+#, fuzzy
+msgid "Your rEFInd configuration options:"
+msgstr "Soundkonfiguration"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:256
+msgid ""
+"<guimenuitem>Install or update rEFInd in the EFI system partition.</"
+"guimenuitem>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:261
+msgid ""
+"<guimenuitem>Install in EFI/Boot partition (workaround for some BIOS's).</"
+"guimenuitem>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:264
+msgid ""
+"With some BIOS's, the newly written bootloaser for Mageia at end of the "
+"installation will not be recognized. In that case, you can use this option "
+"as a workaround for the issue."
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:270
+msgid ""
+"If you did not select rEFInd as the bootloader to use in the previous "
+"section, then your bootloader configurations are shown below:"
+msgstr ""
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:275
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -4913,22 +5062,22 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:191
+#: en/setupBootloader.xml:286
 msgid "<emphasis role=\"bold\">Default</emphasis>"
 msgstr "<emphasis role=\"bold\">Standard</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:193
+#: en/setupBootloader.xml:288
 msgid "The operating system to be started up by default."
 msgstr "Das Betriebssystem, welches standardmäßig gestartet wird."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:197
+#: en/setupBootloader.xml:292
 msgid "<emphasis role=\"bold\">Append</emphasis>"
 msgstr "<emphasis role=\"bold\">Hinzufügen / Erweitern</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:199
+#: en/setupBootloader.xml:294
 msgid ""
 "This option lets you pass information to the kernel or tell the kernel to "
 "give you more information as it boots."
@@ -4938,23 +5087,24 @@ msgstr ""
 "auszugeben."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:204
+#: en/setupBootloader.xml:299
 msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
 msgstr "<emphasis role=\"bold\">Fremdes OS testen</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:206
+#: en/setupBootloader.xml:301
+#, fuzzy
 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, "
-"then untick the Probe Foreign OS option."
+"then untick the <guimenuitem>Probe Foreign OS</guimenuitem> option."
 msgstr ""
 "Falls Sie bereits andere Betriebssysteme installiert haben wird Mageia diese "
 "in Ihr neues Mageia Bootmenü hinzufügen. Falls Sie dies nicht möchten, "
 "entferne die Auswahl in der Box Fremdes OS testen."
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:215
+#: en/setupBootloader.xml:311
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader4.png\"/> </imageobject> <imageobject condition=\"live"
@@ -4967,12 +5117,12 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:226
+#: en/setupBootloader.xml:322
 msgid "<emphasis>Video mode</emphasis>"
 msgstr "<emphasis>Video-Modus</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:228
+#: en/setupBootloader.xml:324
 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 "
@@ -4983,17 +5133,18 @@ msgstr ""
 "Auflösungen und Farbtiefen angezeigt."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:234
+#: en/setupBootloader.xml:330
 msgid "<emphasis>Do not touch ESP or MBR</emphasis>"
 msgstr "<emphasis>Verändere nichts an der ESP oder dem MBR</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:236
+#: en/setupBootloader.xml:332
+#, fuzzy
 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 "
-"missing. Click<emphasis> Ok</emphasis> if you are sure you understand the "
-"implications, and wish to proceed."
+"missing. Click <guimenuitem>Ok </guimenuitem>only if you are sure you "
+"understand the implications, and wish to proceed."
 msgstr ""
 "Wähle diese Auswahl, wenn Sie kein bootfähiges Mageia möchten, und "
 "stattdessen das System über ein anderes Betriebssystem starten möchten "
@@ -5001,8 +5152,17 @@ msgstr ""
 "Klicke <emphasis>OK</emphasis>, wenn Sie sich über die Auswirkung im klaren "
 "sind und fortfahren möchten."
 
+#. type: Content of: <section><section><section><itemizedlist><listitem><warning><para>
+#: en/setupBootloader.xml:338
+msgid ""
+"Chain-loading via legacy bootloaders (GRUB Legacy and LiLo)  is no longer "
+"supported by Mageia as it is likely to fail when attempting to boot this "
+"resulting installation of Mageia. If you use anything other than GRUB2 or "
+"rEFInd for this purpose, then you do so at your own risk!"
+msgstr ""
+
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:245
+#: en/setupBootloader.xml:348
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png"
 "\"/> </imageobject>"
@@ -5011,17 +5171,17 @@ msgstr ""
 "\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:253
+#: en/setupBootloader.xml:356
 msgid "Other Options"
 msgstr "Weitere Optionen"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:256
+#: en/setupBootloader.xml:359
 msgid "Using an existing bootloader"
 msgstr "Verwenden eines bestehenden Bootloaders"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:258
+#: en/setupBootloader.xml:361
 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 "
@@ -5037,12 +5197,12 @@ msgstr ""
 "Betriebssystems nach."
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:267
+#: en/setupBootloader.xml:370
 msgid "Installing Without a Bootloader"
 msgstr "Ohne Bootloader installieren"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:269
+#: en/setupBootloader.xml:372
 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 "
@@ -5473,3 +5633,46 @@ msgstr ""
 "Vorgang dauert eine Weile, bis er abgeschlossen ist. Sobald der Vorgang "
 "beendet ist, erhalten Sie für eine kurze Zeit einen leeren Bildschirm - dies "
 "ist normal."
+
+#~ msgid ""
+#~ "Type in the user password. There is a shield at the end of the text box "
+#~ "that indicates the strength of the password. (See also <xref linkend="
+#~ "\"givePassword\"/>)"
+#~ msgstr ""
+#~ "Geben Sie das Passwort für den Benutzer ein. Am Ende des Textfelds zeigt "
+#~ "ein Schild an, wie sicher das Passwort ist. (Siehe auch <xref linkend="
+#~ "\"givePassword\"/>)"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> "
+#~ "</imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> "
+#~ "</imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4."
+#~ "png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4."
+#~ "png\"/> </imageobject>"
+
+#~ msgid "Grub2 on Legacy MBR/GPT systems"
+#~ msgstr "GRUB2 auf Legacy MBR/GPT Systeme"
+
+#~ msgid "Grub2-efi on UEFI systems"
+#~ msgstr "Grub2-efi auf UEFI-Systeme"
+
+#~ msgid ""
+#~ "This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI "
+#~ "systems will not see this option here."
+#~ msgstr ""
+#~ "Diese Eigenschaft ist nur auf Legacy MBR/BIOS Systeme verfügbar. Nutzer "
+#~ "eines UEFI-Systems wird diese Auswahl nicht angezeigt."
diff --git a/docs/docs/stable/installer/el.po b/docs/docs/stable/installer/el.po
index 93871c2b..72458a8c 100644
--- a/docs/docs/stable/installer/el.po
+++ b/docs/docs/stable/installer/el.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2019-01-19 21:23+0200\n"
+"POT-Creation-Date: 2019-09-08 15:26+0300\n"
 "PO-Revision-Date: 2019-01-31 15:41+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Greek (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -183,7 +183,7 @@ msgstr ""
 "εντοπίσει εκεί τα 32bit πακέτα."
 
 #. type: Content of: <section><info><title>
-#: en/addUser.xml:3
+#: en/addUser.xml:9
 msgid "User Management"
 msgstr "Διαχείριση χρηστών:"
 
@@ -193,13 +193,16 @@ msgstr "Διαχείριση χρηστών:"
 #. 2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
 #.   Also changed 'Advanced User Management' to 'User Management (advanced)'.
 #. 2018/02/24 apb: Changed list style.
+#. 2019/08/10 apb: Added missing 'condition' profile for live-user1.png.
+#. 2019/08/11 apb: [1] Reword 1.1 (including Note) [2] Reword 1.2 Password text.
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:12
+#: en/addUser.xml:28
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
-"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
-"\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata format="
-"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-setRootPassword.png\" format=\"PNG\" revision=\"1\" xml:id="
+"\"setRootPassword-im1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-user1.png\" format=\"PNG\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
 "\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -207,20 +210,18 @@ msgstr ""
 "\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:21
+#: en/addUser.xml:40
 msgid "Set Administrator (root)  Password:"
 msgstr "Ορίστε τον κωδικό πρόσβασης του διαχειριστή (root):"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:24
+#: en/addUser.xml:44
+#, fuzzy
 msgid ""
 "It is advisable for all Mageia installations to set a <literal>superuser</"
 "literal> (Administrator) password, usually called the <emphasis>root </"
-"emphasis>password in Linux. As you type a password into the top box a shield "
-"will change from red-to-yellow-to-green depending on the strength of the "
-"password. A green shield shows you are using a strong password. You need to "
-"repeat the same password in the box underneath, to check that the first "
-"entry was not mistyped."
+"emphasis>password in Linux. You need to repeat the same password in the box "
+"underneath, to check that the first entry was not mistyped."
 msgstr ""
 "Συνιστάται για όλες τις εγκαταστάσεις Mageia ο καθορισμός ενός κωδικού "
 "πρόσβαση <literal>διαχειριστή</literal>· στο Linux συνηθίζεται να λέγεται "
@@ -232,7 +233,15 @@ msgstr ""
 "στο επόμενο πεδίο."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:32
+#: en/addUser.xml:51
+msgid ""
+"As you type a password into the top box a shield will change from red-to-"
+"yellow-to-green depending on the strength of the password. A green shield "
+"shows you are using a strong password."
+msgstr ""
+
+#. type: Content of: <section><section><note><para>
+#: en/addUser.xml:55
 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."
@@ -242,12 +251,12 @@ msgstr ""
 "σε έναν κωδικό."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:39
+#: en/addUser.xml:63
 msgid "Enter a user"
 msgstr "Εισαγωγή ενός χρήστη"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:41
+#: en/addUser.xml:66
 msgid ""
 "Add a User here. A regular user has fewer privileges than the "
 "<literal>superuser</literal> (root), but enough to use the Internet, office "
@@ -261,33 +270,33 @@ msgstr ""
 "με τον υπολογιστή του."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:47
+#: en/addUser.xml:73
 msgid "<emphasis role=\"bold\">Icon</emphasis>"
 msgstr "<emphasis role=\"bold\">Εικονίδιο</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:48
+#: en/addUser.xml:75
 msgid "Click on this button if you want to change the user's icon"
 msgstr ""
 "Κάνετε κλικ σε αυτό το κουμπί αν θέλετε να αλλάξετε το εικονίδιο του χρήστη"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:52
+#: en/addUser.xml:80
 msgid "<emphasis role=\"bold\">Real Name</emphasis>"
 msgstr "<emphasis role=\"bold\">Πραγματικό όνομα</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:53
+#: en/addUser.xml:82
 msgid "Insert the user's real name into this text box"
 msgstr "Εισαγάγετε το πραγματικό όνομα του χρήστη σε αυτό το πλαίσιο κειμένου"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:56
+#: en/addUser.xml:86
 msgid "<emphasis role=\"bold\">Login Name</emphasis>"
 msgstr "<emphasis role=\"bold\">Όνομα σύνδεσης</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:57
+#: en/addUser.xml:88
 msgid ""
 "Enter the user login name or let DrakX use a version of the user's real "
 "name. <emphasis role=\"bold\">The login name is case-sensitive.</emphasis>"
@@ -297,7 +306,7 @@ msgstr ""
 "σύνδεσης κάνει διάκριση μεταξύ πεζών και κεφαλαίων.</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><caution><simpara>
-#: en/addUser.xml:61
+#: en/addUser.xml:93
 msgid ""
 "The login entered here should be different to any login currently in use for "
 "your <filename>/home</filename> directory. Some user parameters will be "
@@ -310,23 +319,17 @@ msgstr ""
 "εφαρμογών όπως του Firefox, Thunderbird ή Kmail..."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:65 en/setupBootloader.xml:124
+#: en/addUser.xml:102 en/setupBootloader.xml:182
 msgid "<emphasis role=\"bold\">Password</emphasis>"
 msgstr "<emphasis role=\"bold\">Κωδικός πρόσβασης</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:66
-msgid ""
-"Type in the user password. There is a shield at the end of the text box that "
-"indicates the strength of the password. (See also <xref linkend="
-"\"givePassword\"/>)"
+#: en/addUser.xml:104
+msgid "Type in the user password (remembering the advice in the Note above)."
 msgstr ""
-"Πληκτρολογήστε τον κωδικό πρόσβασης του χρήστη.  Και εδώ, υπάρχει μια ασπίδα "
-"στην άκρη του πλαισίου που δείχνει κατά πόσο είναι ισχυρός ο κωδικός "
-"πρόσβασης του χρήστη. (Δείτε επίσης <xref linkend=\"givePassword\"/>)"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:68
+#: en/addUser.xml:107
 msgid ""
 "<emphasis role=\"bold\">Password (again):</emphasis> Retype the user "
 "password. DrakX will check that you have not mistyped the password."
@@ -336,7 +339,7 @@ msgstr ""
 "τον ίδιο κωδικό πρόσβασης."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:74
+#: en/addUser.xml:114
 msgid ""
 "Any users added while installing Mageia, will have a home directory that is "
 "both read and write protected (umask=0027)"
@@ -345,7 +348,7 @@ msgstr ""
 "προσωπικό κατάλογο με προστασία εγγραφής και ανάγνωσης (umask=0027)"
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:76
+#: en/addUser.xml:117
 msgid ""
 "You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
@@ -356,18 +359,18 @@ msgstr ""
 "<emphasis>Διαχείριση χρηστών</emphasis>."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:79
+#: en/addUser.xml:121
 msgid "The access permissions can also be changed after the install."
 msgstr ""
 "Οι άδειες πρόσβασης μπορούν επίσης να τροποποιηθούν και μετά την εγκατάσταση."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:85
+#: en/addUser.xml:128
 msgid "User Management (advanced)"
 msgstr "Διαχείριση χρηστών (προηγμένη)"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:87
+#: en/addUser.xml:131
 msgid ""
 "The <emphasis>Advanced</emphasis> option allows you to edit further settings "
 "for the user you are adding."
@@ -376,7 +379,7 @@ msgstr ""
 "επεξεργαστείτε τις ρυθμίσεις για τον χρήστη που προσθέτετε."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:91
+#: en/addUser.xml:136
 msgid ""
 "<emphasis>Shell</emphasis>: This drop-down list allows you to change the "
 "shell available to any user you added in the previous screen. Options are "
@@ -388,7 +391,7 @@ msgstr ""
 "<literal>Dash</literal> και <literal>Sh</literal>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:143
 msgid ""
 "<emphasis>User ID</emphasis>: Here you can set the user ID for any user you "
 "added in the previous screen. If you are unsure what the purpose of this is, "
@@ -399,7 +402,7 @@ msgstr ""
 "ξέρετε τι να κάνετε αφήστε το κενό."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:102
+#: en/addUser.xml:149
 msgid ""
 "<emphasis>Group ID</emphasis>: This lets you set the group ID.  Again, if "
 "unsure, leave it blank."
@@ -560,17 +563,17 @@ msgstr ""
 "(Πρωτόκολλο Δικτυακού Χρόνου)."
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:23
+#: en/bootLive.xml:10
 msgid "Boot Mageia as Live system"
 msgstr "Εκκίνηση της Mageia ως σύστημα Live"
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:28
+#: en/bootLive.xml:14
 msgid "Booting the medium"
 msgstr "Εκκίνηση του μέσου"
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:31
+#: en/bootLive.xml:16
 msgid ""
 "You can boot directly from a Live DVD or USB. Usually, you just need to plug "
 "the USB device in or place the DVD in the drive and restart the computer."
@@ -580,7 +583,7 @@ msgstr ""
 "οδηγό και να επανεκκινήσετε τον υπολογιστή."
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:35
+#: en/bootLive.xml:19
 msgid ""
 "If the computer does not automatically boot from the USB or DVD you may need "
 "to reconfigure your BIOS Boot Disk priority. Alternatively, you might try "
@@ -593,7 +596,7 @@ msgstr ""
 "επιλέξετε την συσκευή από την οποία θα εκκινηθεί ο υπολογιστής."
 
 #. type: Content of: <section><section><tip><para>
-#: en/bootLive.xml:41
+#: en/bootLive.xml:24
 msgid ""
 "To access the BIOS or boot menu when the computer is starting, you can try "
 "pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or <keycap>Esc</"
@@ -609,7 +612,7 @@ msgstr ""
 "παρά μόνο ένα κατάστιχο πιθανών επιλογών."
 
 #. type: Content of: <section><section><note><para>
-#: en/bootLive.xml:50
+#: en/bootLive.xml:32
 msgid ""
 "The actual screen that you will first see when booting from the Live media "
 "will depend on whether your computer motherboard is of the Legacy (BIOS) or "
@@ -620,37 +623,38 @@ msgstr ""
 "UEFI"
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:58
+#: en/bootLive.xml:39
 msgid "In BIOS/CSM/Legacy mode"
 msgstr "Στο BIOS/CSM/Λειτουργία παλαιού τύπου"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:62
+#: en/bootLive.xml:42
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"../live-bootCSM.png\" align=\"center\"/> "
+"</imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> </"
+"<imageobject> <imagedata fileref=\"dx2-summaryTop.png\" align=\"center\"/> </"
 "imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:67
+#: en/bootLive.xml:46
 msgid "First screen while booting in BIOS mode"
 msgstr "Η πρώτη οθόνη εκκινώντας σε λειτουργία BIOS"
 
 #. type: Content of: <section><section><section><itemizedlist><title>
-#: en/bootLive.xml:72 en/bootLive.xml:144 en/installer.xml:106
-#: en/installer.xml:154
+#: en/bootLive.xml:50 en/bootLive.xml:104 en/installer.xml:108
+#: en/installer.xml:156
 msgid "Menu"
 msgstr "Μενού"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:75 en/bootLive.xml:147
+#: en/bootLive.xml:52 en/bootLive.xml:106
 msgid "<emphasis role=\"bold\">Boot Mageia</emphasis>"
 msgstr "<emphasis role=\"bold\">Εκκίνηση της Mageia</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:77
+#: en/bootLive.xml:53
 msgid ""
 "This option will boot the Mageia Live system from the connected DVD/USB "
 "media (expect a very slow system compared to an installed OS)."
@@ -660,13 +664,13 @@ msgstr ""
 "λειτουργικό σύστημα)."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:81
+#: en/bootLive.xml:56
 msgid "Once the boot is done, you can proceed to the installation."
 msgstr ""
 "Μετά το πέρας της εκκίνησης, μπορείτε να συνεχίσετε με την εγκατάσταση."
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:86 en/bootLive.xml:102
+#: en/bootLive.xml:60 en/bootLive.xml:72
 msgid ""
 "<emphasis role=\"bold\">+ use non-free video drivers (slower to boot)</"
 "emphasis>"
@@ -675,33 +679,33 @@ msgstr ""
 "εκκίνηση)</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:89
+#: en/bootLive.xml:62
 msgid "Boot the Mageia Live system using non-free video drivers"
 msgstr ""
 "Εκκίνηση του Ζωντανού συστήματος της Mageia με ιδιόκτητους οδηγούς βίντεο"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:96 en/bootLive.xml:155 en/installer.xml:109
+#: en/bootLive.xml:68 en/bootLive.xml:112 en/installer.xml:111
 msgid "<emphasis role=\"bold\">Install Mageia</emphasis>"
 msgstr "<emphasis role=\"bold\">Εγκατάσταση της Mageia</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:98 en/bootLive.xml:157
+#: en/bootLive.xml:69 en/bootLive.xml:113
 msgid "This option will install Mageia to a hard disk."
 msgstr "Αυτή η επιλογή θα εγκαταστήσει τη Mageia στον σκληρό δίσκο."
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:105
+#: en/bootLive.xml:74
 msgid "Install Mageia using non-free video drivers"
 msgstr "Εγκατάσταση της Mageia με ιδιόκτητους οδηγούς βίντεο"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:111 en/installer.xml:125
+#: en/bootLive.xml:79 en/installer.xml:127
 msgid "<emphasis role=\"bold\">Memory Test</emphasis>"
 msgstr "<emphasis role=\"bold\">Έλεγχος μνήμης</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:113 en/installer.xml:127
+#: en/bootLive.xml:80 en/installer.xml:129
 msgid ""
 "Test the installed RAM by performing multiple read and write operations. "
 "Reboot to end the test."
@@ -710,12 +714,12 @@ msgstr ""
 "εγγραφής. Κάντε επανεκκίνηση για τον τερματισμό του ελέγχου."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:118 en/bootLive.xml:161
+#: en/bootLive.xml:84 en/bootLive.xml:116
 msgid "<emphasis role=\"bold\"> F2 Language</emphasis>"
 msgstr "<emphasis role=\"bold\"> F2 Γλώσσα</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:120 en/bootLive.xml:163
+#: en/bootLive.xml:85 en/bootLive.xml:117
 msgid ""
 "Press <keycap>F2</keycap> to have the installer use a specific language "
 "during the installation. Use the arrow keys to select the language then "
@@ -726,26 +730,27 @@ msgstr ""
 "πιέστε <keycap>Enter</keycap>."
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:129
+#: en/bootLive.xml:93
 msgid "In UEFI mode"
 msgstr "Σε λειτουργία UEFI"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:133
+#: en/bootLive.xml:96
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:139
+#: en/bootLive.xml:100
 msgid "First screen while booting in UEFI mode"
 msgstr "Η πρώτη οθόνη εκκινώντας σε λειτουργία UEFI"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:149
+#: en/bootLive.xml:107
 msgid ""
 "This option will boot the Mageia Live system from the connected DVD/USB "
 "media (expect a very slow system compared to an installed OS).  Once the "
@@ -757,7 +762,7 @@ msgstr ""
 "στην εγκατάσταση"
 
 #. type: Content of: <section><section><note><para>
-#: en/bootLive.xml:170
+#: en/bootLive.xml:123
 msgid ""
 "If you booted from a USB stick, you will see the above menu options "
 "duplicated, and in this case, you should choose from the menu pair that will "
@@ -1033,12 +1038,12 @@ msgstr ""
 "σύνολό τους."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:24
+#: en/configureX_card_list.xml:27
 msgid "Choose an X Server (Configure your Graphic Card)"
 msgstr "Επιλέξτε έναν εξυπηρετητή X (Διαμόρφωση της κάρτας γραφικών)"
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_card_list.xml:29
+#: en/configureX_card_list.xml:32
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_card_list."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_card_list-im1\"/> </"
@@ -1049,7 +1054,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:35
+#: en/configureX_card_list.xml:38
 msgid ""
 "DrakX has a very comprehensive database of video cards and will usually "
 "correctly identify your video device."
@@ -1058,7 +1063,7 @@ msgstr ""
 "συνήθως θα αναγνωρίσει σωστά την κάρτα σας."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:38
+#: en/configureX_card_list.xml:41
 msgid ""
 "If the installer has not correctly detected your graphic card and you know "
 "which one you have, you can select it from the tree by:"
@@ -1067,22 +1072,22 @@ msgstr ""
 "γνωρίζετε τον τύπο της, μπορείτε να την επιλέξετε από τη λίστα δέντρου ανά:"
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_card_list.xml:41 en/configureX_monitor.xml:74
+#: en/configureX_card_list.xml:44 en/configureX_monitor.xml:78
 msgid "Vendor"
 msgstr "Κατασκευαστής"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:45
+#: en/configureX_card_list.xml:48
 msgid "then the make of your card"
 msgstr "στη συνέχεια τον κατασκευαστή της κάρτας"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:49
+#: en/configureX_card_list.xml:52
 msgid "and the model of card"
 msgstr "και το μοντέλο της κάρτας"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:53
+#: en/configureX_card_list.xml:56
 msgid ""
 "If you cannot find your card in the vendor lists (because it's not yet in "
 "the database or it's an older card) you may find a suitable driver in the "
@@ -1100,7 +1105,7 @@ msgstr ""
 "βασική υποστήριξη."
 
 #. type: Content of: <section><caution><para>
-#: en/configureX_card_list.xml:61
+#: en/configureX_card_list.xml:64
 msgid ""
 "Be aware that if you select an incompatible driver you may only have access "
 "to the <emphasis>Command Line Interface</emphasis>"
@@ -1109,7 +1114,7 @@ msgstr ""
 "<emphasis>γραμμή εντολών</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:65
+#: en/configureX_card_list.xml:68
 msgid ""
 "Some video card manufacturers provide proprietary drivers for Linux which "
 "may only be available in the <emphasis>Nonfree</emphasis> repository and in "
@@ -1126,17 +1131,13 @@ msgstr ""
 "πράξετε μετά την πρώτη εκκίνηση."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:11
-msgid "Graphic Card and Monitor Configuration"
+#: en/configureX_chooser.xml:23
+#, fuzzy
+msgid "Graphics Card and Monitor Configuration"
 msgstr "Διαμόρφωση του X, της κάρτας γραφικών και της οθόνης"
 
-#.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
-#. 2018/02/15 apb: Some text and typography.
-#. 2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.
-#. 2018/02/23 apb: Typo.
-#. 2019/01/06 apb: Slight reword, split 1st para in two.
 #. type: Content of: <section><mediaobject>
-#: en/configureX_chooser.xml:26
+#: en/configureX_chooser.xml:28
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_chooser."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_chooser-im1\"/> </"
@@ -1147,7 +1148,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:32
+#: en/configureX_chooser.xml:34
 msgid ""
 "No matter which graphical environment (also known as desktop environment) "
 "you chose for this install of Mageia, they are all based on a graphical user "
@@ -1165,7 +1166,7 @@ msgstr ""
 "κάποια, ή αν πιστεύετε ότι είναι λανθασμένες."
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:39
+#: en/configureX_chooser.xml:41
 msgid ""
 "Choose the appropriate settings manually if you think the details are "
 "incorrect, or if none are shown."
@@ -1174,12 +1175,13 @@ msgstr ""
 "πληροφορίες είναι εσφαλμένες, ή αν δεν εμφανίζεται τίποτα."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:44
-msgid "<emphasis role=\"bold\">Graphic Card</emphasis>"
+#: en/configureX_chooser.xml:46
+#, fuzzy
+msgid "<emphasis role=\"bold\">Graphics Card</emphasis>"
 msgstr "<emphasis role=\"bold\">Κάρτα γραφικών</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:47
+#: en/configureX_chooser.xml:49
 msgid ""
 "If you need to, you can select a specific card from this expandable list. "
 "See <xref linkend=\"configureX_card_list\"/>."
@@ -1189,12 +1191,12 @@ msgstr ""
 "\"/>."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:52
+#: en/configureX_chooser.xml:54
 msgid "<emphasis role=\"bold\">Monitor</emphasis>"
 msgstr "<emphasis role=\"bold\">Οθόνη:</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:55
+#: en/configureX_chooser.xml:57
 msgid ""
 "You can choose Plug 'n Play, if applicable, or choose your monitor from the "
 "<emphasis>Vendor</emphasis> or <emphasis>Generic</emphasis> lists. Choose "
@@ -1210,23 +1212,23 @@ msgstr ""
 "\"configureX_monitor\"/>."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:63
+#: en/configureX_chooser.xml:65
 msgid "<emphasis role=\"bold\">Resolution</emphasis>"
 msgstr "<emphasis role=\"bold\">Ανάλυση</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:66
+#: en/configureX_chooser.xml:68
 msgid "The resolution and color depth of your monitor can be set here."
 msgstr ""
 "Εδώ μπορείτε να ορίσετε την ανάλυση και το βάθος χρώματος της οθόνης σας."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:71
+#: en/configureX_chooser.xml:73
 msgid "<emphasis role=\"bold\">Test</emphasis>"
 msgstr "<emphasis role=\"bold\">Δοκιμή</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:74
+#: en/configureX_chooser.xml:76
 msgid ""
 "The test button does not always appear during install. If the option is "
 "there, and you test your settings, you should be asked to confirm that your "
@@ -1245,19 +1247,19 @@ msgstr ""
 "τις σωστές ρυθμίσεις."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:85
+#: en/configureX_chooser.xml:87
 msgid "<emphasis role=\"bold\">Options</emphasis>"
 msgstr "<emphasis role=\"bold\">Επιλογές</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:88
+#: en/configureX_chooser.xml:90
 msgid "Here you can choose to enable or disable various options."
 msgstr ""
 "Εδώ μπορείτε να επιλέξετε την ενεργοποίηση ή απενεργοποίηση ορισμένων "
 "παραμέτρων."
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_chooser.xml:93
+#: en/configureX_chooser.xml:95
 msgid ""
 "There is a risk of damaging a monitor if you choose refresh rates that are "
 "outside the frequency range of that monitor. This applies to older CRT "
@@ -1270,12 +1272,12 @@ msgstr ""
 "συχνότητα και κανονικά θα μεταβούν σε λειτουργία αναμονής."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_monitor.xml:22
+#: en/configureX_monitor.xml:26
 msgid "Choosing your Monitor"
 msgstr "Επιλογή της οθόνης"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:25
+#: en/configureX_monitor.xml:29
 msgid ""
 "DrakX has a very comprehensive database of monitors and will usually "
 "correctly identify yours."
@@ -1284,7 +1286,7 @@ msgstr ""
 "συνήθως θα αναγνωρίσει σωστά και τη δική σας."
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:30
+#: en/configureX_monitor.xml:34
 msgid ""
 "<emphasis role=\"bold\">Selecting a monitor with different characteristics "
 "could damage your monitor or video hardware. Please don't try something "
@@ -1298,7 +1300,7 @@ msgstr ""
 "οθόνης σας"
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:38
+#: en/configureX_monitor.xml:42
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
@@ -1309,12 +1311,12 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:46
+#: en/configureX_monitor.xml:50
 msgid "Custom"
 msgstr "Προσαρμοσμένο"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:49
+#: en/configureX_monitor.xml:53
 msgid ""
 "This option allows you to set two critical parameters: the vertical refresh "
 "rate and the horizontal sync rate. Vertical refresh determines how often the "
@@ -1328,7 +1330,7 @@ msgstr ""
 "οποία εμφανίζονται οι γραμμές σάρωσης."
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:55
+#: en/configureX_monitor.xml:59
 msgid ""
 "It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor "
 "type with a sync range that is beyond the capabilities of your monitor: you "
@@ -1341,12 +1343,12 @@ msgstr ""
 "συμβουλευτείτε την τεκμηρίωση της οθόνης σας."
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:64
+#: en/configureX_monitor.xml:68
 msgid "Plug'n Play"
 msgstr "Άμεσης τοποθέτησης και λειτουργίας"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:67
+#: en/configureX_monitor.xml:71
 msgid ""
 "This is the default option and automatically tries to determine the monitor "
 "type from the monitor database."
@@ -1355,37 +1357,39 @@ msgstr ""
 "εντοπισμού του τύπου της οθόνης από τη βάση δεδομένων με τις συσκευές οθονών."
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:77
+#: en/configureX_monitor.xml:81
+#, fuzzy
 msgid ""
 "If the installer has not correctly detected your monitor and you know which "
-"one you have, you can select it from the tree by selecting:"
+"one you have, you can choose it from the options by selecting:"
 msgstr ""
 "αν το πρόγραμμα εγκατάστασης δεν εντόπισε σωστά την οθόνη σας και γνωρίζεται "
 "τον τύπο της, μπορείτε να την επιλέξετε από τη λίστα δέντρου επιλέγοντας ανά:"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:86
+#: en/configureX_monitor.xml:90
 msgid "Manufacturer"
 msgstr "Κατασκευαστής"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:90
+#: en/configureX_monitor.xml:94
 msgid "Monitor model"
 msgstr "Μοντέλο οθόνης"
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:96
+#: en/configureX_monitor.xml:100
 msgid "Generic"
 msgstr "Γενικού τύπου"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:99
+#: en/configureX_monitor.xml:103
+#, fuzzy
 msgid ""
-"Selecting this group will list nearly 30 display configurations such as "
-"1024x768 @ 60Hz and includes flat-panel displays as used in laptops. This is "
-"often a good monitor selection group if you need to use the VESA card driver "
-"when your video hardware cannot be determined automatically.  Once again it "
-"may be wise to be conservative in your selections."
+"Selecting this group will list approximately 30 display configurations such "
+"as 1024x768 @ 60Hz and includes flat-panel displays as used in laptops.  "
+"This is often a good monitor selection group if you need to use the VESA "
+"card driver when your video hardware cannot be determined automatically. "
+"Once again, it may be wise to be conservative in your selections."
 msgstr ""
 "Επιλέγοντας αυτήν την ομάδα θα εμφανιστούν γύρω στις 30 διαμορφώσεις οθονών "
 "όπως 1024x768 @ 60Hz συμπεριλαμβάνονται και οι οθόνες Flat των φορητών "
@@ -1395,12 +1399,12 @@ msgstr ""
 "είστε συντηρητικοί στις επιλογές σας."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:22
+#: en/diskdrake.xml:24
 msgid "Custom Disk Partitioning with DiskDrake"
 msgstr "Προσαρμοσμένη κατάτμηση δίσκων με το DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:27
+#: en/diskdrake.xml:29
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-diskdrake.png\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1411,7 +1415,7 @@ msgstr ""
 "<imagedata align=\"center\" fileref=\"live-diskdrake.png\"/> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:38
+#: en/diskdrake.xml:40
 msgid ""
 "Modify the layout of your disk(s) here. You can remove or create partitions, "
 "change the filesystem or size of a partition and even view their details "
@@ -1423,11 +1427,12 @@ msgstr ""
 "πριν να ξεκινήσετε."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:47
+#, fuzzy
 msgid ""
 "There is a tab at the top for every detected hard disk (or other storage "
-"device, like a USB key). In the screenshot above there are two available "
-"devices: <filename>sda </filename>and <filename>sdb</filename>."
+"device, like a USB key), for example: <filename>sda</filename>, "
+"<filename>sdb</filename>, <filename>sdc</filename> etc."
 msgstr ""
 "Υπάρχει μια καρτέλα στην κορυφή κάθε εντοπισμένου σκληρού δίσκου (ή άλλη "
 "συσκευή αποθήκευσης όπως ένα κλειδί USB). Στο ανωτέρω στιγμιότυπο υπάρχουν "
@@ -1435,7 +1440,7 @@ msgstr ""
 "filename>."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:52
+#: en/diskdrake.xml:54
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it. "
@@ -1450,7 +1455,7 @@ msgstr ""
 "τύπου της κατάτμησης."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:60
+#: en/diskdrake.xml:62
 msgid ""
 "Continue until you have adjusted everything to your satisfaction, then click "
 "<emphasis>Done</emphasis> when you're ready."
@@ -1459,7 +1464,7 @@ msgstr ""
 "κλικ στο <emphasis>Εντάξει</emphasis> όταν είστε έτοιμος-η."
 
 #. type: Content of: <section><warning><orderedlist><listitem><para>
-#: en/diskdrake.xml:69
+#: en/diskdrake.xml:71
 msgid ""
 "Take care with the <emphasis>Clear all</emphasis> option, use it only if you "
 "are sure you want to wipe all partitions on the selected storage device."
@@ -1469,7 +1474,7 @@ msgstr ""
 "τις κατατμήσεις στην επιλεγμένη συσκευή αποθήκευσης."
 
 #. type: Content of: <section><warning><orderedlist><listitem><para>
-#: en/diskdrake.xml:75
+#: en/diskdrake.xml:77
 msgid ""
 "If you wish to use encryption on your <filename>/</filename> partition you "
 "must ensure that you have a separate <filename>/boot</filename> partition. "
@@ -1483,7 +1488,7 @@ msgstr ""
 "εκκίνηση του υπολογιστή σας."
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/diskdrake.xml:87
+#: en/diskdrake.xml:89
 msgid ""
 "If you are installing Mageia on a UEFI system, check that an ESP (EFI System "
 "Partition) is present and correctly mounted on <filename>/boot/EFI</"
@@ -1494,7 +1499,7 @@ msgstr ""
 "στο <filename>/boot.EFI</filename> (δείτε κατωτέρω."
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/diskdrake.xml:93
+#: en/diskdrake.xml:95
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
 "partition is present and of the correct type. See Figure 2 below."
@@ -1504,12 +1509,12 @@ msgstr ""
 "εικόνα 2 παρακάτω."
 
 #. type: Content of: <section><figure><title>
-#: en/diskdrake.xml:101
+#: en/diskdrake.xml:103
 msgid "EFI System Partition"
 msgstr "Κατάτμηση συστήματος EFI"
 
 #. type: Content of: <section><figure><mediaobject>
-#: en/diskdrake.xml:104
+#: en/diskdrake.xml:106
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-diskdrake2.png\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1520,17 +1525,17 @@ msgstr ""
 "<imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/> </imageobject>"
 
 #. type: Content of: <section><figure>
-#: en/diskdrake.xml:103 en/diskdrake.xml:117
+#: en/diskdrake.xml:105 en/diskdrake.xml:119
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><figure><title>
-#: en/diskdrake.xml:115
+#: en/diskdrake.xml:117
 msgid "BIOS boot partition"
 msgstr "Κατάτμηση εκκίνησης BIOS"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:118 en/doPartitionDisks.xml:201
+#: en/diskdrake.xml:120 en/doPartitionDisks.xml:206
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1553,12 +1558,12 @@ msgid "Partitioning"
 msgstr "Διαμερισμός"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:31
 msgid "Suggested Partitioning"
 msgstr "Προτιμώμενος διαμερισμός"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:34
 msgid ""
 "In this screen you can see the content of your hard drive(s) along with the "
 "DrakX partitioning proposals for where to install Mageia."
@@ -1568,7 +1573,7 @@ msgstr ""
 "θα γίνει η εγκατάσταση της Mageia."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:34
+#: en/doPartitionDisks.xml:38
 msgid ""
 "The actual options available from those shown below will vary according to "
 "the layout and content of your particular hard drive(s)."
@@ -1577,7 +1582,7 @@ msgstr ""
 "και το περιεχόμενο των σκληρών σας δίσκων."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:39
+#: en/doPartitionDisks.xml:43
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1590,17 +1595,17 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><itemizedlist><title>
-#: en/doPartitionDisks.xml:49
+#: en/doPartitionDisks.xml:53
 msgid "Main Options"
 msgstr "Κύριες επιλογές"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:56
 msgid "<emphasis role=\"bold\">Use Existing Partitions</emphasis>"
 msgstr "<emphasis role=\"bold\">Χρήση των υπαρχουσών κατατμήσεων</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:59
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1609,12 +1614,12 @@ msgstr ""
 "συμβατές με το Linux και μπορούν να χρησιμοποιηθούν για την εγκατάσταση."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:61
+#: en/doPartitionDisks.xml:65
 msgid "<emphasis role=\"bold\">Use Free Space</emphasis>"
 msgstr "<emphasis role=\"bold\">Χρήση του ελεύθερου χώρου</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:68
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1623,7 +1628,7 @@ msgstr ""
 "θα τον χρησιμοποιήσει για τη νέα σας εγκατάσταση της Mageia."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:70
+#: en/doPartitionDisks.xml:74
 msgid ""
 "<emphasis role=\"bold\">Use Free Space on a Windows Partition</emphasis>"
 msgstr ""
@@ -1631,26 +1636,40 @@ msgstr ""
 "Windows</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:73
+#: en/doPartitionDisks.xml:77
+#, fuzzy
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it. 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 important files!"
+"installation but see the warning below."
 msgstr ""
 "Αν έχετε αχρησιμοποίητο χώρο σε μια υπάρχουσα κατάτμηση Windows, ο "
 "εγκαταστάτης μπορεί να σας τον διαθέσει για να τον χρησιμοποιήσετε. Αυτό "
 "μπορεί να φανεί χρήσιμο για την δημιουργία του κατάλληλου χώρου για την "
 "εγκατάσταση της Mageia."
 
+#. type: Content of: <section><itemizedlist><listitem><para><mediaobject>
+#: en/doPartitionDisks.xml:87
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:79
+#: en/doPartitionDisks.xml:82
+#, fuzzy
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
 "light blue and the proposed Mageia partition in dark blue with their "
 "intended sizes just underneath. You have the option to modify these sizes by "
 "clicking and dragging the gap between both partitions.  See the following "
-"screenshot:"
+"screenshot:<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr ""
 "Με αυτήν την επιλογή, ο εγκαταστάτης εμφανίζει την υπολειπόμενη κατάτμηση "
 "των Windows με ανοιχτό κυανό και της προτεινόμενης κατάτμησης Mageia σε βαθύ "
@@ -1658,19 +1677,45 @@ msgstr ""
 "δυνατότητα να προσαρμόσετε αυτά τα μεγέθη κάνοντας κλικ και σύρσιμο του "
 "διαστήματος μεταξύ των δυο κατατμήσεων. Δείτε στο παρακάτω στιγμιότυπο:"
 
+#. type: Content of: <section><itemizedlist><listitem><warning><para>
+#: en/doPartitionDisks.xml:97
+msgid ""
+"This involves shrinking the size of the Windows partition, and therefore is "
+"a risky operation, so you should make sure you have backed up all important "
+"files before proceeding."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><important><para>
+#: en/doPartitionDisks.xml:103
+#, fuzzy
+msgid ""
+"The partition must be \"clean\", meaning that Windows must have closed down "
+"correctly the last time it was used. It must also have been defragmented, "
+"although this is not a guarantee that all files in the partition have been "
+"moved out of the area that is about to be used for Mageia."
+msgstr ""
+"Σημειώστε ότι αυτό θα προκαλέσει την συρρίκνωση του μεγέθους της κατάτμησης "
+"των Windows, κάτι το οποίο μπορεί να διατρέχει κάποιον κίνδυνο. Η κατάτμηση "
+"θα πρέπει να είναι «καθαρή» δηλαδή τα Windows πρέπει να έχουν κλείσει σωστά "
+"την τελευταία φορά που χρησιμοποιήθηκαν.  Επίσης θα πρέπει να έχετε κάνει "
+"αποκερμάτωση, ωστόσο δεν αποτελεί εγγύηση ότι όλα τα αρχεία στην κατάτμηση "
+"έχουν μετακινηθεί εκτός της περιοχής που θα χρησιμοποιηθεί. Σε κάθε "
+"περίπτωση θα πρέπει να έχετε πάρει αντίγραφα ασφαλείας των σημαντικών σας "
+"αρχείων. Θα πρέπει να το ελέγξετε προσεκτικά πριν συνεχίσετε."
+
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:87
+#: en/doPartitionDisks.xml:112
 msgid "<emphasis role=\"bold\">Erase and use Entire Disk</emphasis>"
 msgstr ""
 "<emphasis role=\"bold\">Διαγραφή και χρήση ολόκληρου του δίσκου</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:90
+#: en/doPartitionDisks.xml:115
 msgid "This option will allocate the entire drive for Mageia"
 msgstr "Αυτή η επιλογή θα χρησιμοποιήσει ολόκληρο τον δίσκο για τη Mageia"
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:119
 msgid ""
 "This will erase ALL data on the selected hard drive. Take care! If you "
 "intend to use part of the disk for something else, or you already have data "
@@ -1681,32 +1726,13 @@ msgstr ""
 "διαθέτετε ήδη κάποια δεδομένα στον δίσκο τα οποία δεν θα θέλατε να χάσετε, "
 "τότε μην χρησιμοποιήσετε αυτήν την επιλογή."
 
-#. type: Content of: <section><itemizedlist><listitem><important><para>
-#: en/doPartitionDisks.xml:101
-msgid ""
-"Note that this involves shrinking the size of the Windows partition. The "
-"partition must be \"clean\", meaning that Windows must have closed down "
-"correctly the last time it was used. It must also have been defragmented, "
-"although this is not a guarantee that all files in the partition have been "
-"moved out of the area that is about to be used. It is highly recommended to "
-"back up your personal files."
-msgstr ""
-"Σημειώστε ότι αυτό θα προκαλέσει την συρρίκνωση του μεγέθους της κατάτμησης "
-"των Windows, κάτι το οποίο μπορεί να διατρέχει κάποιον κίνδυνο. Η κατάτμηση "
-"θα πρέπει να είναι «καθαρή» δηλαδή τα Windows πρέπει να έχουν κλείσει σωστά "
-"την τελευταία φορά που χρησιμοποιήθηκαν.  Επίσης θα πρέπει να έχετε κάνει "
-"αποκερμάτωση, ωστόσο δεν αποτελεί εγγύηση ότι όλα τα αρχεία στην κατάτμηση "
-"έχουν μετακινηθεί εκτός της περιοχής που θα χρησιμοποιηθεί. Σε κάθε "
-"περίπτωση θα πρέπει να έχετε πάρει αντίγραφα ασφαλείας των σημαντικών σας "
-"αρχείων. Θα πρέπει να το ελέγξετε προσεκτικά πριν συνεχίσετε."
-
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:112
+#: en/doPartitionDisks.xml:127
 msgid "<emphasis role=\"bold\">Custom Disk Partitioning</emphasis>"
 msgstr "<emphasis role=\"bold\">Προσαρμοσμένη κατάτμηση δίσκων</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:115
+#: en/doPartitionDisks.xml:130
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1714,21 +1740,8 @@ msgstr ""
 "Αυτό σας δίνει πλήρη έλεγχο στον διαμερισμό της εγκατάστασης στους σκληρούς "
 "σας δίσκους."
 
-#. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:122
-msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
-
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:131
+#: en/doPartitionDisks.xml:136
 msgid ""
 "If you are not using the <emphasis>Custom disk partitioning</emphasis> "
 "option, then the installer will allocate the available space according to "
@@ -1739,7 +1752,7 @@ msgstr ""
 "κοινόχρηστο χώρο βάσει των ακόλουθων κανόνων:"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:137
+#: en/doPartitionDisks.xml:142
 msgid ""
 "If the total available space is less than 50 GB, then only one partition is "
 "created. This will be the <filename>/</filename> (root)  partition."
@@ -1748,7 +1761,7 @@ msgstr ""
 "δημιουργηθεί μόνο η ριζική κατάτμηση <filename>/</filename> (root)."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:143
+#: en/doPartitionDisks.xml:148
 msgid ""
 "If the total available space is greater than 50 GB, then three partitions "
 "are created"
@@ -1757,7 +1770,7 @@ msgstr ""
 "δημιουργούνται τρεις κατατμήσεις"
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:148
+#: en/doPartitionDisks.xml:153
 msgid ""
 "6/19 of the total available place is allocated to <filename>/</filename> "
 "with a maximum of 50 GB"
@@ -1766,21 +1779,21 @@ msgstr ""
 "filename> με μέγιστο χώρο 50 GB"
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:153
+#: en/doPartitionDisks.xml:158
 msgid "1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB"
 msgstr ""
 "1/19 του συνολικού διαθέσιμου χώρου εκχωρούνται στην κατάτμηση "
 "<filename>swap</filename> με μέγιστο χώρο 4 GB"
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:158
+#: en/doPartitionDisks.xml:163
 msgid "the rest (at least 12/19) is allocated to <filename>/home</filename>"
 msgstr ""
 "o υπολειπόμενος χώρος (τουλάχιστον 12/19) εκχωρείται στον προσωπικό κατάλογο "
 "<filename>/home</filename>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:165
+#: en/doPartitionDisks.xml:170
 msgid ""
 "This means that from 160 GB or greater available space, the installer will "
 "create three partitions:"
@@ -1789,22 +1802,22 @@ msgstr ""
 "εγκατάστασης δημιουργεί τρεις κατατμήσεις:"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:170
+#: en/doPartitionDisks.xml:175
 msgid "50 GB for <filename>/</filename>"
 msgstr "50 GB για <filename>/</filename>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:174
+#: en/doPartitionDisks.xml:179
 msgid "4 GB for <filename>swap</filename>"
 msgstr "4 GB για την κατάτμηση <filename>swap</filename>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:178
+#: en/doPartitionDisks.xml:183
 msgid "and the remainder for <filename>/home</filename>"
 msgstr "και το υπόλοιπο για την κατάτμηση <filename>/home</filename>"
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:183
+#: en/doPartitionDisks.xml:188
 msgid ""
 "If you are using a UEFI system, the ESP (EFI System Partition) will be "
 "automatically detected - or created if it does not exist yet - and mounted "
@@ -1819,7 +1832,7 @@ msgstr ""
 "επικύρωσης."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:189
+#: en/doPartitionDisks.xml:194
 msgid ""
 "If you are using a Legacy (also known as BIOS) system with a GPT partitioned "
 "disk, you need to create a BIOS boot partition if it doesn't already exist. "
@@ -1837,22 +1850,27 @@ msgstr ""
 "quote> ως τύπο συστήματος αρχείων."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:196
+#: en/doPartitionDisks.xml:201
 msgid "See <xref linkend=\"diskdrake\"/> for information on how to proceed."
 msgstr ""
 "Για περισσότερες πληροφορίες, ανατρέξτε στο <xref linkend=\"diskdrake\"/>."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:211
+#: en/doPartitionDisks.xml:216
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4.png"
-"\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks4.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks4.png\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4.png"
-"\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:217
+#: en/doPartitionDisks.xml:226
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
 "previous standard of 512. Due to lack of available hardware, the "
@@ -1865,7 +1883,7 @@ msgstr ""
 "στον εγκαταστάτη δεν δοκιμάστηκε σε τέτοιους οδηγούς."
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:222
+#: en/doPartitionDisks.xml:231
 msgid ""
 "Some SSD devices now use an erase block size over 1 MB. If you have such a "
 "device we suggest that you partition the drive in advance, using an "
@@ -1878,17 +1896,17 @@ msgstr ""
 "κατατμήσεων όπως το gparted, και να χρησιμοποιήσετε την παρακάτω διαμόρφωση:"
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:229
+#: en/doPartitionDisks.xml:238
 msgid "<emphasis>Align to</emphasis> = MiB"
 msgstr "<emphasis>Στοίχιση σε</emphasis> = MiB"
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:233
+#: en/doPartitionDisks.xml:242
 msgid "<emphasis>Free space preceding (MiB)</emphasis> = 2"
 msgstr "<emphasis>Ελεύθερος χώρος που προηγείται (MiB)</emphasis> = 2"
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:237
+#: en/doPartitionDisks.xml:246
 msgid ""
 "Also make sure all partitions are created using an even number of megabytes."
 msgstr ""
@@ -2076,12 +2094,12 @@ msgstr ""
 "</link> αν έχετε διάφορες απορίες ή αν θέλετε να συνεισφέρετε στη Mageia"
 
 #. type: Content of: <section><info><title>
-#: en/firewall.xml:7
+#: en/firewall.xml:16
 msgid "Firewall"
 msgstr "Τείχος προστασίας"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:10
+#: en/firewall.xml:19
 msgid ""
 "This section allows you to configure some simple firewall rules: they "
 "determine which type of message from the Internet will be accepted by the "
@@ -2093,8 +2111,18 @@ msgstr ""
 "διαδίκτυο στο σύστημα προορισμού. Αυτό επιτρέπει τανάπαλιν την πρόσβαση των "
 "αντίστοιχων υπηρεσιών από το διαδίκτυο."
 
+#. type: Content of: <section><mediaobject>
+#: en/firewall.xml:26
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-firewall.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome.png\"/> </"
+"imageobject>"
+
 #. type: Content of: <section><para>
-#: en/firewall.xml:16
+#: en/firewall.xml:31
 msgid ""
 "In the default setting (no button is checked), no service of the system is "
 "accessible from the network. The <emphasis>Everything (no firewall)</"
@@ -2116,7 +2144,7 @@ msgstr ""
 "δοκιμές και αποσφαλμάτωση."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:25
+#: en/firewall.xml:40
 msgid ""
 "All other options are more or less self-explanatory. As an example, you will "
 "enable the CUPS server if you want printers on your machine to be accessible "
@@ -2127,12 +2155,12 @@ msgstr ""
 "από το δίκτυο."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:29
+#: en/firewall.xml:44
 msgid "<emphasis role=\"bold\">Advanced</emphasis>"
 msgstr "<emphasis role=\"bold\">Προχωρημένες</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:31
+#: en/firewall.xml:46
 msgid ""
 "The <emphasis>Advanced</emphasis> option opens a window where you can enable "
 "a series of services by typing a list of <quote>couples</quote> (blank "
@@ -2143,33 +2171,37 @@ msgstr ""
 "αφήνοντας κενά μεταξύ τους."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:35
-msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
+#: en/firewall.xml:50
+#, fuzzy
+msgid "<emphasis>&lt;port-number&gt;/&lt;protocol&gt;</emphasis>"
 msgstr "<emphasis>&lt;αριθμός-θύρας>/&lt;πρωτόκολλο></emphasis>"
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:38
+#: en/firewall.xml:53
+#, fuzzy
 msgid ""
-"- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
-"the service you want to enable (e.g. 873 for the RSYNC service) as defined "
-"in <emphasis>RFC-433</emphasis>;"
+"- <emphasis>&lt;port-number&gt;</emphasis> is the value of the port assigned "
+"to the service you want to enable (e.g. 873 for the RSYNC service) as "
+"defined in <emphasis>RFC-433</emphasis>;"
 msgstr ""
 "- <emphasis>&lt;αριθμός-θύρας></emphasis>: πρόκειται για τον αριθμός της "
 "θύρας που έχει ανατεθεί στην υπηρεσία που θέλετε να ενεργοποιήσετε (π.χ. 873 "
 "για την υπηρεσία RSYNC) όπως καθορίζεται στο <emphasis>RFC-433</emphasis>·"
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:42
+#: en/firewall.xml:57
+#, fuzzy
 msgid ""
-"- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
-"<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
+"- <emphasis>&lt;protocol&gt;</emphasis> is one of <emphasis>TCP</emphasis> "
+"or <emphasis>UDP</emphasis> - the internet protocol that is used by the "
+"service."
 msgstr ""
 "- <emphasis>&lt;πρωτόκολλο></emphasis> πρόκειται για το <emphasis>TCP</"
 "emphasis> ή το <emphasis>UDP</emphasis> - το διαδικτυακό πρωτόκολλο της "
 "εκάστοτε υπηρεσίας."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:47
+#: en/firewall.xml:62
 msgid ""
 "For instance, the entry for enabling access to the RSYNC service therefore "
 "is <emphasis>873/tcp</emphasis>."
@@ -2178,7 +2210,7 @@ msgstr ""
 "υπηρεσία RSYNC είναι η <emphasis>873/tcp</emphasis>."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:50
+#: en/firewall.xml:65
 msgid ""
 "In case a service is implemented to use both protocols, you specify 2 "
 "couples for the same port."
@@ -2268,12 +2300,12 @@ msgid "Graphical Configuration"
 msgstr "Διαμόρφωση του εξυπηρετητή γραφικών"
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:32
+#: en/installer.xml:34
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, ο οδηγός εγκατάστασης της Mageia"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:35
+#: en/installer.xml:37
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -2285,12 +2317,12 @@ msgstr ""
 "ευκολότερα."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:40
+#: en/installer.xml:42
 msgid "The installation steps"
 msgstr "Τα βήματα εγκατάστασης"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:44
+#: en/installer.xml:46
 msgid ""
 "The install process is divided into a number of steps - the status of which "
 "is indicated in a panel to the left of the screen."
@@ -2299,7 +2331,7 @@ msgstr ""
 "οποία μπορείτε να παρακολουθήσετε στον πλευρικό πίνακα αριστερά της οθόνης."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:50
+#: en/installer.xml:52
 msgid ""
 "Each step has one or more screens, which may also have <emphasis>Advanced</"
 "emphasis> sections with extra, less commonly required options."
@@ -2309,7 +2341,7 @@ msgstr ""
 "συχνά, επιλογές."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:56
+#: en/installer.xml:58
 msgid ""
 "Most screens have <emphasis>Help</emphasis> buttons for further details "
 "about the particular step."
@@ -2318,7 +2350,7 @@ msgstr ""
 "θα βρείτε περισσότερες πληροφορίες σχετικά με το τρέχον βήμα."
 
 #. type: Content of: <section><section><caution><para>
-#: en/installer.xml:62
+#: en/installer.xml:64
 msgid ""
 "If at some point during the install you decide to abort the installation, it "
 "is possible to reboot, but please think twice before you do this. Once a "
@@ -2333,7 +2365,7 @@ msgstr ""
 "αφήσετε σε μια κατάσταση εκτός λειτουργίας."
 
 #. type: Content of: <section><section><caution><para>
-#: en/installer.xml:68
+#: en/installer.xml:70
 msgid ""
 "If, in spite of this, you are very sure rebooting is what you want, go to a "
 "text terminal by pressing the keys <keycombo> <keycap>Ctrl</keycap> "
@@ -2348,12 +2380,12 @@ msgstr ""
 "keycombo> ταυτόχρονα για να κάνετε επανεκκίνηση."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:86
+#: en/installer.xml:88
 msgid "Installation Welcome Screen"
 msgstr "Η πρώτη οθόνη καλωσορίσματος στην εγκατάσταση"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:88
+#: en/installer.xml:90
 msgid ""
 "The particular screen that you will first see when booting from the "
 "Installation media will depend on whether your computer motherboard is of "
@@ -2363,7 +2395,7 @@ msgstr ""
 "αν η μητρική κάρτα διαθέτει έναν παλαιού τύπου BIOS ή τύπου UEFI"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:92
+#: en/installer.xml:94
 msgid ""
 "The welcome menu screen has various options, however the default option will "
 "start the installer, and is normally all that you will need."
@@ -2372,12 +2404,12 @@ msgstr ""
 "θα εκκινήσει τον οδηγό εγκατάστασης, και τυπικά είναι αυτό που χρειαζόσαστε."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:97
+#: en/installer.xml:99
 msgid "Legacy (BIOS) Systems"
 msgstr "Παλιό σύστημα (BIOS)"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:100
+#: en/installer.xml:102
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome.png\"/> </"
 "imageobject>"
@@ -2386,7 +2418,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:111
+#: en/installer.xml:113
 msgid ""
 "Install Mageia to a hard disk. This is the default option, and will "
 "automatically start after a short while unless another option is selected."
@@ -2396,12 +2428,12 @@ msgstr ""
 "άλλο."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:117
+#: en/installer.xml:119
 msgid "<emphasis role=\"bold\">Rescue System</emphasis>"
 msgstr "<emphasis role=\"bold\">Σύστημα διάσωσης</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:119
+#: en/installer.xml:121
 msgid ""
 "This option allows you to either re-install the bootloader for an existing "
 "Mageia installation or you can use it to restore a Windows bootloader."
@@ -2411,22 +2443,22 @@ msgstr ""
 "χρησιμοποιήσετε για την επαναφορά του προγράμματος εκκίνησης των Windows."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:132
+#: en/installer.xml:134
 msgid "<emphasis role=\"bold\">F2: Language</emphasis>"
 msgstr "<emphasis role=\"bold\"> F2 Γλώσσα</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:134
+#: en/installer.xml:136
 msgid "Press F2 for alternative languages."
 msgstr "Πιέστε F2 για εναλλακτικές γλώσσες."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:140
+#: en/installer.xml:142
 msgid "UEFI Systems"
 msgstr "Συστήματα UEFI"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:142
+#: en/installer.xml:144
 msgid ""
 "From this screen, you can access options by pressing <keycap>e</keycap> to "
 "enter the edit mode. To come back to this screen, press <keycap>Esc</keycap> "
@@ -2439,7 +2471,7 @@ msgstr ""
 "αποθήκευση."
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:148
+#: en/installer.xml:150
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome2.png\"/> </"
 "imageobject>"
@@ -2448,14 +2480,14 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:157
+#: en/installer.xml:159
 msgid "<emphasis role=\"bold\">Install:</emphasis> Start the Install process"
 msgstr ""
 "<emphasis role=\"bold\">Εγκατάσταση:</emphasis> Έναρξη της διαδικασίας "
 "εγκατάστασης"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:162
+#: en/installer.xml:164
 msgid ""
 "<emphasis role=\"bold\">Rescue:</emphasis> This option allows you to either "
 "re-install the bootloader for an existing Mageia installation or you can use "
@@ -2467,7 +2499,7 @@ msgstr ""
 "του προγράμματος εκκίνησης των Windows."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:169
+#: en/installer.xml:171
 msgid ""
 "<emphasis role=\"bold\">F2: Language:</emphasis> Press <keycap>F2</keycap> "
 "for alternative languages."
@@ -2476,7 +2508,7 @@ msgstr ""
 "για τις εναλλακτικές γλώσσες."
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:174
+#: en/installer.xml:176
 msgid ""
 "If you booted from a USB stick, you will see the above options duplicated, "
 "and in this case, you should use the set that will be suffixed with \"USB\"."
@@ -2486,17 +2518,17 @@ msgstr ""
 "την κατάληξη «USB»."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:181
+#: en/installer.xml:183
 msgid "Installation Problems and Possible Solutions"
 msgstr "Προβλήματα στην εγκατάσταση και πιθανές λύσεις"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:184
+#: en/installer.xml:186
 msgid "No Graphical Interface"
 msgstr "Δεν λειτουργεί το γραφικό περιβάλλον"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:188
+#: en/installer.xml:190
 msgid ""
 "After the initial screen you did not progress to the <emphasis>Language "
 "Selection</emphasis> screen. This can happen with some graphic cards and "
@@ -2509,7 +2541,7 @@ msgstr ""
 "ανάλυση πληκτρολογώντας <command>vgalo</command> στην προτροπή."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:195
+#: en/installer.xml:197
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
 "In this case it is worth trying a text-mode installation. To use this press "
@@ -2528,12 +2560,12 @@ msgstr ""
 "λειτουργία κειμένου."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:208
+#: en/installer.xml:210
 msgid "The Install Freezes"
 msgstr "Πάγωμα της εγκατάστασης"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:210
+#: en/installer.xml:212
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic hardware "
@@ -2549,12 +2581,12 @@ msgstr ""
 "κριθεί απαραίτητο."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:218
+#: en/installer.xml:220
 msgid "RAM problem"
 msgstr "Πρόβλημα RAM"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:220
+#: en/installer.xml:222
 msgid ""
 "This will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
@@ -2570,12 +2602,12 @@ msgstr ""
 "<literal>mem=256M</literal> καθορίζει 256MB RAM."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:228
+#: en/installer.xml:230
 msgid "Dynamic partitions"
 msgstr "Δυναμικές κατατμήσεις"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:230
+#: en/installer.xml:232
 msgid ""
 "If you converted your hard disk from <literal>Basic</literal> format to "
 "<literal>Dynamic</literal> format in Microsoft Windows, then it is not "
@@ -4610,22 +4642,29 @@ msgstr ""
 "efi_and_Mageia</link>"
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:27
+#: en/setupBootloader.xml:32
 msgid "Bootloader"
 msgstr "Πρόγραμμα εκκίνησης"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:31
+#: en/setupBootloader.xml:36
+#, fuzzy
+msgid "Available Bootloaders"
+msgstr "Πρόγραμμα εκκίνησης"
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:39
 msgid "Grub2"
 msgstr "Grub2"
 
-#. type: Content of: <section><section><itemizedlist><title>
-#: en/setupBootloader.xml:34
-msgid "Grub2 on Legacy MBR/GPT systems"
-msgstr "Grub2 σε παλιό σύστημα με MBR/GPT"
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:42
+#, fuzzy
+msgid "<emphasis role=\"bold\">Grub2 on Legacy MBR/GPT systems</emphasis>"
+msgstr "<emphasis role=\"bold\">Σύστημα διάσωσης</emphasis>"
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:37
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:46
 msgid ""
 "GRUB2 (with or without graphical menu) will be used exclusively as the "
 "bootloader for a Legacy/MBR or Legacy/GPT system."
@@ -4633,8 +4672,8 @@ msgstr ""
 "Το GRUB2 (με ή χωρίς γραφικό περιβάλλον) θα χρησιμοποιηθεί αποκλειστικά ως "
 "το πρόγραμμα εκκίνησης για παλιά συστήματα MBR/GPT."
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:42
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:52
 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."
@@ -4643,20 +4682,22 @@ msgstr ""
 "(Master Boot Record) του πρώτου σκληρού δίσκου ή στην κατάτμηση εκκίνησης "
 "του BIOS."
 
-#. type: Content of: <section><section><itemizedlist><title>
-#: en/setupBootloader.xml:49
-msgid "Grub2-efi on UEFI systems"
-msgstr "Grub2 σε συστήματα UEFI"
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:59
+#, fuzzy
+msgid "<emphasis role=\"bold\">Grub2-efi on UEFI systems</emphasis>"
+msgstr "<emphasis role=\"bold\">Σύστημα διάσωσης</emphasis>"
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:52
-msgid "GRUB2-efi will be used exclusively as the bootloader for a UEFI system."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:63
+#, fuzzy
+msgid "GRUB2-efi or rEFInd may be used as the bootloader for a UEFI system."
 msgstr ""
 "Το GRUB2-efi θα χρησιμοποιηθεί αποκλειστικά ως το πρόγραμμα εκκίνησης ενός "
 "UEFI συστήματος."
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:57
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:68
 msgid ""
 "By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI "
 "System Partition)."
@@ -4664,12 +4705,13 @@ msgstr ""
 "Εξ ορισμού, θα γίνει εγγραφή ενός νέου προγράμματος εκκίνησης (Grub2-efi) "
 "στο ESP (EFI System Partition)."
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:60
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:71
+#, fuzzy
 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 "
-"created by Windows and add grub2-efi to it. If no ESP exists, then one will "
+"created by Windows and add grub2-efi to it.  If no ESP exists, then one will "
 "be created. Although it is possible to have several ESPs, only one is "
 "required, whatever the number of operating systems you have."
 msgstr ""
@@ -4680,18 +4722,46 @@ msgstr ""
 "ESP συστήματα, μόνον ένα απαιτείται, ανεξαρτήτου αριθμού των εγκατεστημένων "
 "λειτουργικών συστημάτων που διαθέτετε."
 
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:82
+msgid "rEFInd"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:85
+#, fuzzy
+msgid "<emphasis role=\"bold\">rEFInd on UEFI systems</emphasis>"
+msgstr "<emphasis role=\"bold\">Εικονίδιο</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:88
+msgid ""
+"rEFInd has a nice graphical set of options, and can auto-detect installed "
+"EFI bootloaders. See: http://www.rodsbooks.com/refind/"
+msgstr ""
+
+#. type: Content of: <section><section><section><note><para>
+#: en/setupBootloader.xml:95
+msgid ""
+"Please note that in order to be able to use the <literal>rEFInd</literal> "
+"option, an installed EFI System Partition must match your system "
+"architecture: if you have a 32bit EFI System Partition installed on a 64bit "
+"machine for instance, then the rEFInd option will not be displayed/available "
+"to you."
+msgstr ""
+
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:72
+#: en/setupBootloader.xml:106
 msgid "Bootloader Setup"
 msgstr "Ρύθμιση του προγράμματος εκκίνησης"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:76
+#: en/setupBootloader.xml:110
 msgid "Bootloader main options"
 msgstr "Κύριες επιλογές του προγράμματος εκκίνησης"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:79
+#: en/setupBootloader.xml:113
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader.png\"/> </imageobject> <imageobject condition=\"live"
@@ -4704,33 +4774,54 @@ msgstr ""
 "im1\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:91
+#: en/setupBootloader.xml:125
 msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
 msgstr "<emphasis role=\"bold\">Πρόγραμμα εκκίνησης προς χρήση</emphasis>"
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:93
+#. type: Content of: <section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:129
 msgid ""
-"This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI "
-"systems will not see this option here."
+"<guimenuitem>GRUB2</guimenuitem> (with either a graphical or a text menu), "
+"can be chosen for both <literal>Legacy MBR/BIOS</literal> systems and "
+"<literal>UEFI</literal> systems."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:136
+msgid ""
+"<guimenuitem>rEFInd</guimenuitem> (with a graphical menu)  is an alternative "
+"option solely for use with <literal>UEFI</literal> systems."
 msgstr ""
-"Αυτό το χαρακτηριστικό είναι διαθέσιμο μόνο για τα παλαιότερα συστήματα MBR/"
-"BIOS. Αυτές οι επιλογές δεν εμφανίζονται σε συστήματα UEFI."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:98
+#: en/setupBootloader.xml:144
 msgid "<emphasis role=\"bold\">Boot device</emphasis>"
 msgstr "<emphasis role=\"bold\">Συσκευή εκκίνησης</emphasis>"
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:100
-msgid "Don't change this unless you really know what you are doing"
+#. type: Content of: <section><section><section><itemizedlist><listitem><warning><para>
+#: en/setupBootloader.xml:147
+#, fuzzy
+msgid "Don't change this unless you really know what you are doing."
 msgstr ""
 "Μην τροποποιήσετε τη συσκευή εκκίνησης εκτός και αν γνωρίζεται τι ακριβώς "
 "πράττετε"
 
+#. type: Content of: <section><section><section><itemizedlist><listitem><note><para>
+#: en/setupBootloader.xml:152
+msgid ""
+"There is no option to write GRUB to the boot sector of a partition (e.g: "
+"<filename>sda1</filename>), as this method is considered unreliable."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:157
+msgid ""
+"When using UEFI mode, then the <guilabel>Boot device</guilabel> will be "
+"listed as <guimenuitem>EFI System Partition</guimenuitem>."
+msgstr ""
+
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:105
+#: en/setupBootloader.xml:163
 msgid ""
 "<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
 msgstr ""
@@ -4738,7 +4829,7 @@ msgstr ""
 "εικόνας</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:108
+#: en/setupBootloader.xml:166
 msgid ""
 "This text box lets you set a delay, in seconds, before the default operating "
 "system is started up."
@@ -4747,12 +4838,12 @@ msgstr ""
 "δευτερόλεπτα πριν την εκκίνηση του εξ ορισμού λειτουργικού συστήματος."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:113
+#: en/setupBootloader.xml:171
 msgid "<emphasis role=\"bold\">Security</emphasis>"
 msgstr "<emphasis role=\"bold\">Ασφάλεια</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:115
+#: en/setupBootloader.xml:173
 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 "
@@ -4768,18 +4859,18 @@ msgstr ""
 "κωδικός πρόσβασης είναι αυτός που θα επιλέξετε εδώ."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:126
+#: en/setupBootloader.xml:184
 msgid "Choose a password for the bootloader (optional)"
 msgstr ""
 "Επιλέξτε έναν κωδικό πρόσβασης για το πρόγραμμα εκκίνησης (προαιρετικό)"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:130
+#: en/setupBootloader.xml:188
 msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
 msgstr "<emphasis role=\"bold\">Κωδικός πρόσβασης (ξανά)</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:132
+#: en/setupBootloader.xml:190
 msgid ""
 "Retype the password and DrakX will check that it matches with the one set "
 "above"
@@ -4788,17 +4879,17 @@ msgstr ""
 "αν ο κωδικός πρόσβασης ταιριάζει με τον ανωτέρω"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:137 en/setupBootloader.xml:212
+#: en/setupBootloader.xml:195 en/setupBootloader.xml:308
 msgid "<emphasis>Advanced</emphasis>"
 msgstr "<emphasis>Για προχωρημένους</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:141
+#: en/setupBootloader.xml:199
 msgid "<emphasis>Enable ACPI</emphasis>"
 msgstr "<emphasis>Ενεργοποίηση ACPI</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:143
+#: en/setupBootloader.xml:201
 msgid ""
 "ACPI (Advanced Configuration and Power Interface) is a standard for power "
 "management. It can save energy by stopping unused devices. Deselecting it "
@@ -4815,12 +4906,12 @@ msgstr ""
 "κωλύματα του συστήματος)."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:152
+#: en/setupBootloader.xml:210
 msgid "<emphasis>Enable SMP</emphasis>"
 msgstr "<emphasis>Ενεργοποίηση του SMP</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:154
+#: en/setupBootloader.xml:212
 msgid ""
 "This option enables/disables symmetric multiprocessing for multi-core "
 "processors"
@@ -4829,12 +4920,12 @@ msgstr ""
 "πολλαπλών πυρήνων"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:159
+#: en/setupBootloader.xml:217
 msgid "<emphasis>Enable APIC</emphasis>"
 msgstr "<emphasis>Ενεργοποίηση του APIC</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:161
+#: en/setupBootloader.xml:219
 msgid ""
 "Enabling this gives the operating system access to the Advanced Programmable "
 "Interrupt Controller. APIC devices permit more complex priority models, and "
@@ -4846,12 +4937,12 @@ msgstr ""
 "προηγμένη διαχείριση IRQ (Αιτήσεις διακοπτών)."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:168
+#: en/setupBootloader.xml:226
 msgid "<emphasis>Enable Local APIC</emphasis>"
 msgstr "<emphasis>Ενεργοποίηση του τοπικού APIC</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:170
+#: en/setupBootloader.xml:228
 msgid ""
 "Here you can set Local APIC, which manages all external interrupts for a "
 "specific processor in an SMP system"
@@ -4861,12 +4952,70 @@ msgstr ""
 "σύστημα SMP"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:177
+#: en/setupBootloader.xml:235
 msgid "Bootloader Configuration"
 msgstr "Ρύθμιση του προγράμματος εκκίνησης"
 
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:237
+msgid ""
+"If, in the previous section you selected <literal>rEFInd</literal> as the "
+"bootloader to use, you would then be presented with the options shown in the "
+"screenshot directly below. Otherwise, please instead move on to the "
+"subsequent screenshot for your options."
+msgstr ""
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:243
+#, fuzzy
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"rEFIndLoaderConfig.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-rEFIndLoaderConfig.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:253
+#, fuzzy
+msgid "Your rEFInd configuration options:"
+msgstr "Ρύθμιση του ήχου"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:256
+msgid ""
+"<guimenuitem>Install or update rEFInd in the EFI system partition.</"
+"guimenuitem>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:261
+msgid ""
+"<guimenuitem>Install in EFI/Boot partition (workaround for some BIOS's).</"
+"guimenuitem>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:264
+msgid ""
+"With some BIOS's, the newly written bootloaser for Mageia at end of the "
+"installation will not be recognized. In that case, you can use this option "
+"as a workaround for the issue."
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:270
+msgid ""
+"If you did not select rEFInd as the bootloader to use in the previous "
+"section, then your bootloader configurations are shown below:"
+msgstr ""
+
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:180
+#: en/setupBootloader.xml:275
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -4879,22 +5028,22 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:191
+#: en/setupBootloader.xml:286
 msgid "<emphasis role=\"bold\">Default</emphasis>"
 msgstr "<emphasis role=\"bold\">Προκαθορισμένο</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:193
+#: en/setupBootloader.xml:288
 msgid "The operating system to be started up by default."
 msgstr "Το λειτουργικό σύστημα που εκκινείται εξ ορισμού."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:197
+#: en/setupBootloader.xml:292
 msgid "<emphasis role=\"bold\">Append</emphasis>"
 msgstr "<emphasis role=\"bold\">Επιλογές περασμένες στον πυρήνα</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:199
+#: en/setupBootloader.xml:294
 msgid ""
 "This option lets you pass information to the kernel or tell the kernel to "
 "give you more information as it boots."
@@ -4904,25 +5053,26 @@ msgstr ""
 "εκκίνηση."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:204
+#: en/setupBootloader.xml:299
 msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
 msgstr ""
 "<emphasis role=\"bold\">Εντοπισμού των άλλων Λειτουργικών Συστημάτων</"
 "emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:206
+#: en/setupBootloader.xml:301
+#, fuzzy
 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, "
-"then untick the Probe Foreign OS option."
+"then untick the <guimenuitem>Probe Foreign OS</guimenuitem> option."
 msgstr ""
 "Αν έχετε και άλλα λειτουργικά συστήματα εγκατεστημένα, η Mageia προσπαθεί να "
 "τα προσθέσει στο νέο μενού εκκίνησης Mageia. Αν δεν το επιθυμείτε, κάντε "
 "κλικ στο Επόμενο και αποεπιλέξτε το πλαίσιο Εντοπισμός ξένου λειτουργικού."
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:215
+#: en/setupBootloader.xml:311
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader4.png\"/> </imageobject> <imageobject condition=\"live"
@@ -4935,12 +5085,12 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:226
+#: en/setupBootloader.xml:322
 msgid "<emphasis>Video mode</emphasis>"
 msgstr "<emphasis>Λειτουργία βίντεο</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:228
+#: en/setupBootloader.xml:324
 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 "
@@ -4951,25 +5101,35 @@ msgstr ""
 "επιλογές μεγέθους και χρωματικού βάθους."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:234
+#: en/setupBootloader.xml:330
 msgid "<emphasis>Do not touch ESP or MBR</emphasis>"
 msgstr "<emphasis>Μην αγγίξετε το ESP ή το MBR</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:236
+#: en/setupBootloader.xml:332
+#, fuzzy
 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 "
-"missing. Click<emphasis> Ok</emphasis> if you are sure you understand the "
-"implications, and wish to proceed."
+"missing. Click <guimenuitem>Ok </guimenuitem>only if you are sure you "
+"understand the implications, and wish to proceed."
 msgstr ""
 "Επιλέξτε το αν δεν θέλετε μια εκκινήσιμη εγκατάσταση της Mageia, αλλά μια "
 "αλυσιδωτή φόρτωση από ένα άλλο λογισμικό. Θα λάβετε ένα μήνυμα ότι λείπει το "
 "πρόγραμμα εκκίνησης. Κάντε κλικ στο <emphasis>Εντάξει</emphasis> αν "
 "πιστεύετε ότι καταλαβαίνετε τις επιπτώσεις, και επιθυμείτε να προχωρήσετε."
 
+#. type: Content of: <section><section><section><itemizedlist><listitem><warning><para>
+#: en/setupBootloader.xml:338
+msgid ""
+"Chain-loading via legacy bootloaders (GRUB Legacy and LiLo)  is no longer "
+"supported by Mageia as it is likely to fail when attempting to boot this "
+"resulting installation of Mageia. If you use anything other than GRUB2 or "
+"rEFInd for this purpose, then you do so at your own risk!"
+msgstr ""
+
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:245
+#: en/setupBootloader.xml:348
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png"
 "\"/> </imageobject>"
@@ -4978,17 +5138,17 @@ msgstr ""
 "\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:253
+#: en/setupBootloader.xml:356
 msgid "Other Options"
 msgstr "Άλλες επιλογές"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:256
+#: en/setupBootloader.xml:359
 msgid "Using an existing bootloader"
 msgstr "Χρήση ενός υπάρχοντος μενού εκκίνησης"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:258
+#: en/setupBootloader.xml:361
 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 "
@@ -5004,12 +5164,12 @@ msgstr ""
 "λειτουργικού συστήματος."
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:267
+#: en/setupBootloader.xml:370
 msgid "Installing Without a Bootloader"
 msgstr "Εγκατάσταση χωρίς πρόγραμμα εκκίνησης"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:269
+#: en/setupBootloader.xml:372
 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 "
@@ -5437,3 +5597,47 @@ msgstr ""
 "Το επόμενο βήμα αφορά την αντιγραφή των αρχείων στον σκληρό δίσκο. Αυτή η "
 "διεργασία δεν διαρκεί πολύ. Μετά το πέρας της διεργασίας θα δείτε για λίγο "
 "μια λευκή οθόνη. Πρόκειται για φυσιολογική συμπεριφορά."
+
+#~ msgid ""
+#~ "Type in the user password. There is a shield at the end of the text box "
+#~ "that indicates the strength of the password. (See also <xref linkend="
+#~ "\"givePassword\"/>)"
+#~ msgstr ""
+#~ "Πληκτρολογήστε τον κωδικό πρόσβασης του χρήστη.  Και εδώ, υπάρχει μια "
+#~ "ασπίδα στην άκρη του πλαισίου που δείχνει κατά πόσο είναι ισχυρός ο "
+#~ "κωδικός πρόσβασης του χρήστη. (Δείτε επίσης <xref linkend=\"givePassword"
+#~ "\"/>)"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> "
+#~ "</imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> "
+#~ "</imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4."
+#~ "png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4."
+#~ "png\"/> </imageobject>"
+
+#~ msgid "Grub2 on Legacy MBR/GPT systems"
+#~ msgstr "Grub2 σε παλιό σύστημα με MBR/GPT"
+
+#~ msgid "Grub2-efi on UEFI systems"
+#~ msgstr "Grub2 σε συστήματα UEFI"
+
+#~ msgid ""
+#~ "This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI "
+#~ "systems will not see this option here."
+#~ msgstr ""
+#~ "Αυτό το χαρακτηριστικό είναι διαθέσιμο μόνο για τα παλαιότερα συστήματα "
+#~ "MBR/BIOS. Αυτές οι επιλογές δεν εμφανίζονται σε συστήματα UEFI."
diff --git a/docs/docs/stable/installer/en/addUser.xml b/docs/docs/stable/installer/en/addUser.xml
index fbb69ad8..d4766e20 100644
--- a/docs/docs/stable/installer/en/addUser.xml
+++ b/docs/docs/stable/installer/en/addUser.xml
@@ -1,91 +1,136 @@
-<?xml version='1.0' encoding='UTF-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" version="5.0" xml:id="addUser">
+<?xml version="1.0" encoding="UTF-8"?>
+<section version="5.0" xml:id="addUser" xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="addUser-ti1">User Management</title>
   </info>
+
   <!-- Lebarhon: 20170210 updated for Mageia 6 (umask)-->
+
   <!--2018/02/12 apb: Text and Typography.-->
+
   <!--2018/02/19 apb: Update dx2-setRootPassword.png to Mga6.-->
+
   <!--2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
   Also changed 'Advanced User Management' to 'User Management (advanced)'.-->
+
   <!--2018/02/24 apb: Changed list style.-->
+
+  <!--2019/08/10 apb: Added missing 'condition' profile for live-user1.png.-->
+
+  <!--2019/08/11 apb: [1] Reword 1.1 (including Note) [2] Reword 1.2 Password text.-->
+
   <mediaobject>
     <imageobject condition="classical">
-      <imagedata format="PNG" fileref="dx2-setRootPassword.png" align="center" revision="1" xml:id="setRootPassword-im1"/>
+      <imagedata align="center" fileref="dx2-setRootPassword.png" format="PNG"
+                 revision="1" xml:id="setRootPassword-im1"/>
     </imageobject>
-    <imageobject>
-      <imagedata format="PNG" fileref="live-user1.png"/>
+
+    <imageobject condition="live">
+      <imagedata fileref="live-user1.png" format="PNG"/>
     </imageobject>
   </mediaobject>
+
   <section xml:id="root-password">
     <info>
       <title xml:id="root-password-ti2">Set Administrator (root)
       Password:</title>
     </info>
+
     <para>It is advisable for all Mageia installations to set a
     <literal>superuser</literal> (Administrator) password, usually called the
-    <emphasis>root </emphasis>password in Linux. As you type a password into
-    the top box a shield will change from red-to-yellow-to-green depending on
-    the strength of the password. A green shield shows you are using a strong
-    password. You need to repeat the same password in the box underneath, to
-    check that the first entry was not mistyped.</para>
+    <emphasis>root </emphasis>password in Linux. You need to repeat the same
+    password in the box underneath, to check that the first entry was not
+    mistyped.</para>
+
     <note xml:id="givePassword">
+      <para>As you type a password into the top box a shield will change from
+      red-to-yellow-to-green depending on the strength of the password. A
+      green shield shows you are using a strong password.</para>
+
       <para>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.</para>
     </note>
   </section>
+
   <section xml:id="enterUser">
     <info>
       <title xml:id="enterUser-ti3">Enter a user</title>
     </info>
+
     <para>Add a User here. A regular user has fewer privileges than the
     <literal>superuser</literal> (root), but enough to use the Internet,
     office applications or play games and anything else the average user might
     use a computer for.</para>
+
     <itemizedlist>
       <listitem>
         <para><emphasis role="bold">Icon</emphasis></para>
+
         <para>Click on this button if you want to change the user's
         icon</para>
       </listitem>
+
       <listitem>
         <para><emphasis role="bold">Real Name</emphasis></para>
+
         <para>Insert the user's real name into this text box</para>
       </listitem>
+
       <listitem>
         <para><emphasis role="bold">Login Name</emphasis></para>
+
         <para>Enter the user login name or let DrakX use a version of the
         user's real name. <emphasis role="bold">The login name is
         case-sensitive.</emphasis></para>
+
         <caution condition="live">
-          <simpara>The login entered here should be different to any login currently in use for your <filename>/home</filename> directory. Some user parameters will be written in the user space, and some can overwrite actual data such as Firefox, Thunderbird or Kmail data...</simpara>
+          <simpara>The login entered here should be different to any login
+          currently in use for your <filename>/home</filename> directory. Some
+          user parameters will be written in the user space, and some can
+          overwrite actual data such as Firefox, Thunderbird or Kmail
+          data...</simpara>
         </caution>
       </listitem>
+
       <listitem>
         <para><emphasis role="bold">Password</emphasis></para>
-        <para>Type in the user password. There is a shield at the end of the
-        text box that indicates the strength of the password. (See also <xref linkend="givePassword"/>)</para>
+
+        <para>Type in the user password (remembering the advice in the Note
+        above).</para>
+
         <para><emphasis role="bold">Password (again):</emphasis> Retype the
         user password. DrakX will check that you have not mistyped the
         password.</para>
       </listitem>
     </itemizedlist>
+
     <note>
       <para>Any users added while installing Mageia, will have a home
       directory that is both read and write protected (umask=0027)</para>
+
       <para>You can add any extra needed users in the <emphasis>Configuration
       - Summary</emphasis> step during the install. Choose <emphasis>User
       management</emphasis>.</para>
+
       <para>The access permissions can also be changed after the
       install.</para>
     </note>
   </section>
-  <section xml:id="addUserAdvanced" condition="classical">
+
+  <section condition="classical" xml:id="addUserAdvanced">
     <info>
       <title xml:id="addUserAdvanced-ti3">User Management (advanced)</title>
     </info>
+
     <para>The <emphasis>Advanced</emphasis> option allows you to edit further
     settings for the user you are adding.</para>
+
     <itemizedlist>
       <listitem>
         <para><emphasis>Shell</emphasis>: This drop-down list allows you to
@@ -93,15 +138,17 @@
         screen. Options are <literal>Bash</literal>, <literal>Dash</literal>
         and <literal>Sh</literal></para>
       </listitem>
+
       <listitem>
         <para><emphasis>User ID</emphasis>: Here you can set the user ID for
         any user you added in the previous screen. If you are unsure what the
         purpose of this is, then leave it blank.</para>
       </listitem>
+
       <listitem>
         <para><emphasis>Group ID</emphasis>: This lets you set the group ID.
         Again, if unsure, leave it blank.</para>
       </listitem>
     </itemizedlist>
   </section>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/en/bootLive.xml b/docs/docs/stable/installer/en/bootLive.xml
index 1facb419..eca99292 100644
--- a/docs/docs/stable/installer/en/bootLive.xml
+++ b/docs/docs/stable/installer/en/bootLive.xml
@@ -1,42 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<section version="5.0" xmlns="http://docbook.org/ns/docbook"
-         xmlns:ns6="http://www.w3.org/1999/xlink"
-         xmlns:ns5="http://www.w3.org/1999/xhtml"
-         xmlns:ns4="http://www.w3.org/2000/svg"
-         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns="http://docbook.org/ns/docbook">
+<?xml version='1.0' encoding='UTF-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0">
   <!--2018/03/01 apb: a) center-align live-bootCSM.png b) Redo/expand text.-->
-
   <!--2018/02/02 apb: a) update live-bootCSM.png and redo corresponding text.-->
-
   <!--2018/02/03 apb: a) A couple of typos and slight adjustment to some text. b) Added definition for F6 Default boot option.-->
-
   <!--2019/01/06 apb: 1.2 - F6 last sentence typo.-->
-
   <!--2019/01/06 apb: 1.2 - Update SC (live-bootCSM.png) and text to reflect changes to Mga7 options.-->
-
   <!--2019/01/08 apb: 1.2 - Add text for Memtest option. 1.3 - Update live-bootUEFI.png and add text for F2 Language option.-->
-
   <!--2019/01/11 apb: 1.3 - Boot Mageia: change Dvd -> DVD.-->
-
   <info>
     <title xml:id="bootLive-ti1">Boot Mageia as Live system</title>
   </info>
-
   <section xml:id="bootLive-1">
     <info>
       <title xml:id="bootLive1-ti1">Booting the medium</title>
     </info>
-
     <para>You can boot directly from a Live DVD or USB. Usually, you just need
     to plug the USB device in or place the DVD in the drive and restart the
     computer.</para>
-
     <para>If the computer does not automatically boot from the USB or DVD you
     may need to reconfigure your BIOS Boot Disk priority. Alternatively, you
     might try accessing the boot device menu to select a device from which the
     computer will boot.</para>
-
     <tip>
       <para>To access the BIOS or boot menu when the computer is starting, you
       can try pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or
@@ -45,131 +28,101 @@
       the boot device menu. These (fairly common) keys are just a selection of
       possible options though.</para>
     </tip>
-
     <note>
       <para>The actual screen that you will first see when booting from the
       Live media will depend on whether your computer motherboard is of the
       Legacy (BIOS) or UEFI type.</para>
     </note>
   </section>
-
   <section xml:id="biosmode">
     <info>
       <title xml:id="biosmode-ti1">In BIOS/CSM/Legacy mode</title>
     </info>
-
     <mediaobject>
       <imageobject>
-        <imagedata align="center" fileref="live-bootCSM.png"/>
+        <imagedata fileref="../live-bootCSM.png" align="center"/>
       </imageobject>
-
       <caption>
         <para>First screen while booting in BIOS mode</para>
       </caption>
     </mediaobject>
-
     <itemizedlist>
       <title>Menu</title>
-
       <listitem>
         <para><emphasis role="bold">Boot Mageia</emphasis></para>
-
         <para>This option will boot the Mageia Live system from the connected
         DVD/USB media (expect a very slow system compared to an installed
         OS).</para>
-
         <para>Once the boot is done, you can proceed to the
         installation.</para>
-
         <itemizedlist>
           <listitem>
             <para><emphasis role="bold">+ use non-free video drivers (slower
             to boot)</emphasis></para>
-
             <para>Boot the Mageia Live system using non-free video
             drivers</para>
           </listitem>
         </itemizedlist>
       </listitem>
-
       <listitem>
         <para><emphasis role="bold">Install Mageia</emphasis></para>
-
         <para>This option will install Mageia to a hard disk.</para>
-
         <itemizedlist>
           <listitem>
             <para><emphasis role="bold">+ use non-free video drivers (slower
             to boot)</emphasis></para>
-
             <para>Install Mageia using non-free video drivers</para>
           </listitem>
         </itemizedlist>
       </listitem>
-
       <listitem>
         <para><emphasis role="bold">Memory Test</emphasis></para>
-
         <para>Test the installed RAM by performing multiple read and write
         operations. Reboot to end the test.</para>
       </listitem>
-
       <listitem>
         <para><emphasis role="bold"> F2 Language</emphasis></para>
-
         <para>Press <keycap>F2</keycap> to have the installer use a specific
         language during the installation. Use the arrow keys to select the
         language then press <keycap>Enter</keycap>.</para>
       </listitem>
     </itemizedlist>
   </section>
-
   <section xml:id="uefimode">
     <info>
       <title xml:id="uefimode-ti1">In UEFI mode</title>
     </info>
-
     <mediaobject condition="live">
       <imageobject>
-        <imagedata align="center" fileref="live-bootUEFI.png" format="PNG"
-                   revision="1" xml:id="bootUEFI-im1"/>
+        <imagedata format="PNG" fileref="../live-bootUEFI.png" align="center" xml:id="bootUEFI-im1" revision="1"/>
       </imageobject>
-
       <caption>
         <para>First screen while booting in UEFI mode</para>
       </caption>
     </mediaobject>
-
     <itemizedlist>
       <title>Menu</title>
-
       <listitem>
         <para><emphasis role="bold">Boot Mageia</emphasis></para>
-
         <para>This option will boot the Mageia Live system from the connected
         DVD/USB media (expect a very slow system compared to an installed OS).
         Once the boot is done, you can proceed to the installation</para>
       </listitem>
-
       <listitem>
         <para><emphasis role="bold">Install Mageia</emphasis></para>
-
         <para>This option will install Mageia to a hard disk.</para>
       </listitem>
-
       <listitem>
         <para><emphasis role="bold"> F2 Language</emphasis></para>
-
         <para>Press <keycap>F2</keycap> to have the installer use a specific
         language during the installation. Use the arrow keys to select the
         language then press <keycap>Enter</keycap>.</para>
       </listitem>
     </itemizedlist>
-
     <note>
       <para>If you booted from a USB stick, you will see the above menu
       options duplicated, and in this case, you should choose from the menu
       pair that will be suffixed with "USB".</para>
     </note>
   </section>
-</section>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/en/configureX_card_list.xml b/docs/docs/stable/installer/en/configureX_card_list.xml
index 3f43ec2b..ead57c91 100644
--- a/docs/docs/stable/installer/en/configureX_card_list.xml
+++ b/docs/docs/stable/installer/en/configureX_card_list.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:id="configureX_card_list"
-         xmlns="http://docbook.org/ns/docbook"
+<section version="5.0"
+         xreflabel="Choose an X Server (Configure your Graphic Card)"
+         xml:id="configureX_card_list" xmlns="http://docbook.org/ns/docbook"
          xmlns:ns5="http://www.w3.org/1999/xhtml"
          xmlns:ns4="http://www.w3.org/1998/Math/MathML"
          xmlns:ns3="http://www.w3.org/2000/svg"
@@ -20,6 +21,8 @@
 
   <!--2018/02/21 apb: Merge last 2 paras + slight reword.-->
 
+  <!--2019/08/10 apb: Added xreflabel-->
+
   <info>
     <title xml:id="configureX_card_list-ti1">Choose an X Server (Configure
     your Graphic Card)</title>
diff --git a/docs/docs/stable/installer/en/configureX_chooser.xml b/docs/docs/stable/installer/en/configureX_chooser.xml
index 7bc9c8d7..f2dff75a 100644
--- a/docs/docs/stable/installer/en/configureX_chooser.xml
+++ b/docs/docs/stable/installer/en/configureX_chooser.xml
@@ -1,17 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section version="5.0" xml:id="configureX_chooser"
-         xmlns="http://docbook.org/ns/docbook"
+<section version="5.0" xreflabel="Graphics Card and Monitor Configuration"
+         xml:id="configureX_chooser" xmlns="http://docbook.org/ns/docbook"
          xmlns:xi="http://www.w3.org/2001/XInclude"
          xmlns:ns5="http://www.w3.org/1999/xhtml"
          xmlns:ns42="http://www.w3.org/1998/Math/MathML"
          xmlns:ns4="http://www.w3.org/1999/xlink"
          xmlns:ns3="http://www.w3.org/2000/svg"
          xmlns:ns="http://docbook.org/ns/docbook">
-  <info>
-    <title xml:id="configureX_chooser-ti1">Graphic Card and Monitor
-    Configuration</title>
-  </info>
-
   <!-- Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page-->
 
   <!--2018/02/15 apb: Some text and typography.-->
@@ -22,6 +17,13 @@
 
   <!--2019/01/06 apb: Slight reword, split 1st para in two.-->
 
+  <!--2019/08/10 apb: [1] Added xreflabel. [2] Changed all instances of 'Graphic Card' to Graphics Card-->
+
+  <info>
+    <title xml:id="configureX_chooser-ti1">Graphics Card and Monitor
+    Configuration</title>
+  </info>
+
   <mediaobject>
     <imageobject>
       <imagedata align="center" fileref="dx2-configureX_chooser.png"
@@ -42,7 +44,7 @@
   <itemizedlist>
     <listitem>
       <para revision="1" xml:id="configureX_chooser-pa2"><emphasis
-      role="bold">Graphic Card</emphasis></para>
+      role="bold">Graphics Card</emphasis></para>
 
       <para>If you need to, you can select a specific card from this
       expandable list. See <xref linkend="configureX_card_list"/>.</para>
diff --git a/docs/docs/stable/installer/en/configureX_monitor.xml b/docs/docs/stable/installer/en/configureX_monitor.xml
index e31a96f1..2e24b531 100644
--- a/docs/docs/stable/installer/en/configureX_monitor.xml
+++ b/docs/docs/stable/installer/en/configureX_monitor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:id="configureX_monitor"
-         xmlns="http://docbook.org/ns/docbook"
+<section version="5.0" xreflabel="Choosing your Monitor"
+         xml:id="configureX_monitor" xmlns="http://docbook.org/ns/docbook"
          xmlns:ns5="http://www.w3.org/1999/xhtml"
          xmlns:ns4="http://www.w3.org/1998/Math/MathML"
          xmlns:ns3="http://www.w3.org/2000/svg"
@@ -18,6 +18,10 @@
 
   <!--2018/02/22 apb: Change list style.-->
 
+  <!--2019/01/06 apb: Slight rewording.-->
+
+  <!--2019/08/10 apb: Added xreflabel.-->
+
   <info>
     <title xml:id="configureX_monitor-ti1">Choosing your Monitor</title>
   </info>
@@ -76,7 +80,7 @@
       <listitem>
         <para revision="1" xml:id="configureX_monitor-pa8">If the installer
         has not correctly detected your monitor and you know which one you
-        have, you can select it from the tree by selecting:</para>
+        have, you can choose it from the options by selecting:</para>
       </listitem>
     </varlistentry>
   </variablelist>
@@ -97,11 +101,11 @@
 
       <listitem>
         <para revision="1" xml:id="configureX_monitor-pa10">Selecting this
-        group will list nearly 30 display configurations such as 1024x768 @
-        60Hz and includes flat-panel displays as used in laptops. This is
-        often a good monitor selection group if you need to use the VESA card
-        driver when your video hardware cannot be determined automatically.
-        Once again it may be wise to be conservative in your
+        group will list approximately 30 display configurations such as
+        1024x768 @ 60Hz and includes flat-panel displays as used in laptops.
+        This is often a good monitor selection group if you need to use the
+        VESA card driver when your video hardware cannot be determined
+        automatically. Once again, it may be wise to be conservative in your
         selections.</para>
       </listitem>
     </varlistentry>
diff --git a/docs/docs/stable/installer/en/diskdrake.xml b/docs/docs/stable/installer/en/diskdrake.xml
index 90caf8e7..60b3d9c6 100644
--- a/docs/docs/stable/installer/en/diskdrake.xml
+++ b/docs/docs/stable/installer/en/diskdrake.xml
@@ -15,8 +15,10 @@ Lebarhon 20170902 added SC-->
   <!--2018/02/17 apb: Fix a couple of tags that were out of place + added 'xreflabel="DiskDrake" at start of doc.-->
 
   <!--2018/02/27 apb: Reformat the text and add titles for the boot partition SC's.-->
-    
-    <!--2018/02/27 apb: Slight reword to 1st bullet-point.-->
+
+  <!--2019/01/05 apb: Slight reword to 1st bullet-point.-->
+
+  <!--2019/08/06 apb: Slight reword to 2nd bullet-point (was mentioning sda & sdb tabs in previous SC version).-->
 
   <info>
     <title xml:id="diskdrake-ti1">Custom Disk Partitioning with
@@ -43,9 +45,9 @@ Lebarhon 20170902 added SC-->
 
     <listitem>
       <para revision="1" xml:id="diskdrake-pa4">There is a tab at the top for
-      every detected hard disk (or other storage device, like a USB key). In
-      the screenshot above there are two available devices: <filename>sda
-      </filename>and <filename>sdb</filename>.</para>
+      every detected hard disk (or other storage device, like a USB key), for
+      example: <filename>sda</filename>, <filename>sdb</filename>,
+      <filename>sdc</filename> etc.</para>
     </listitem>
 
     <listitem>
diff --git a/docs/docs/stable/installer/en/doPartitionDisks.xml b/docs/docs/stable/installer/en/doPartitionDisks.xml
index 8914a615..11ee951a 100644
--- a/docs/docs/stable/installer/en/doPartitionDisks.xml
+++ b/docs/docs/stable/installer/en/doPartitionDisks.xml
@@ -23,6 +23,10 @@ lebarhon 20170209 added SC-->
 
   <!--2019/01/11 apb: Auto allocation of drive space rules: small edits for style consistency.-->
 
+  <!--2019/07/06 apb: Added live-doPartitionDisksk.png, as it was previously sharing the DrakX screenshot.-->
+
+  <!--2019/08/23 apb: Moved 'Important' note from 'Erase and Use Entire Disk' to 'Use Free Space on a Windows Partition'. Slight text tweak to to first para, 'Warning' and 'Important' -->
+
   <info>
     <title xml:id="doPartitionDisks-ti1">Suggested Partitioning</title>
   </info>
@@ -73,14 +77,35 @@ lebarhon 20170209 added SC-->
       <para revision="1" xml:id="suggestedPartitioning-pa9">If you have unused
       space on an existing Windows partition, the installer may offer to use
       it. 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 important files!</para>
+      installation but see the warning below.</para>
 
       <para>With this option, the installer displays the remaining Windows
       partition in light blue and the proposed Mageia partition in dark blue
       with their intended sizes just underneath. You have the option to modify
       these sizes by clicking and dragging the gap between both partitions.
-      See the following screenshot:</para>
+      See the following screenshot:<mediaobject>
+          <imageobject condition="classical">
+            <imagedata align="center" fileref="dx2-doPartitionDisks2.png"/>
+          </imageobject>
+
+          <imageobject condition="live">
+            <imagedata align="center" fileref="live-doPartitionDisks2.png"/>
+          </imageobject>
+        </mediaobject></para>
+
+      <warning>
+        <para>This involves shrinking the size of the Windows partition, and
+        therefore is a risky operation, so you should make sure you have
+        backed up all important files before proceeding.</para>
+      </warning>
+
+      <important>
+        <para revision="3" xml:id="doPartitionDisks-pa11">The partition must
+        be "clean", meaning that Windows must have closed down correctly the
+        last time it was used. It must also have been defragmented, although
+        this is not a guarantee that all files in the partition have been
+        moved out of the area that is about to be used for Mageia.</para>
+      </important>
     </listitem>
 
     <listitem>
@@ -96,16 +121,6 @@ lebarhon 20170209 added SC-->
         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 this option.</para>
       </warning>
-
-      <important>
-        <para revision="3" xml:id="doPartitionDisks-pa11">Note that this
-        involves shrinking the size of the Windows partition. The partition
-        must be "clean", meaning that Windows must have closed down correctly
-        the last time it was used. It must also have been defragmented,
-        although this is not a guarantee that all files in the partition have
-        been moved out of the area that is about to be used. It is highly
-        recommended to back up your personal files.</para>
-      </important>
     </listitem>
 
     <listitem>
@@ -118,16 +133,6 @@ lebarhon 20170209 added SC-->
     </listitem>
   </itemizedlist>
 
-  <mediaobject>
-    <imageobject condition="classical">
-      <imagedata align="center" fileref="dx2-doPartitionDisks2.png"/>
-    </imageobject>
-
-    <imageobject condition="live">
-      <imagedata align="center" fileref="live-doPartitionDisks2.png"/>
-    </imageobject>
-  </mediaobject>
-
   <para>If you are not using the <emphasis>Custom disk partitioning</emphasis>
   option, then the installer will allocate the available space according to
   the following rules:</para>
@@ -208,9 +213,13 @@ lebarhon 20170209 added SC-->
   </mediaobject>
 
   <mediaobject>
-    <imageobject>
+    <imageobject condition="classical">
       <imagedata align="center" fileref="dx2-doPartitionDisks4.png"/>
     </imageobject>
+
+    <imageobject condition="live">
+      <imagedata align="center" fileref="live-doPartitionDisks4.png"/>
+    </imageobject>
   </mediaobject>
 
   <important>
diff --git a/docs/docs/stable/installer/en/firewall.xml b/docs/docs/stable/installer/en/firewall.xml
index a27b09f2..a21ef293 100644
--- a/docs/docs/stable/installer/en/firewall.xml
+++ b/docs/docs/stable/installer/en/firewall.xml
@@ -1,18 +1,33 @@
-<?xml version='1.0' encoding='UTF-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="firewall" version="5.0" xreflabel="Firewall">
+<?xml version="1.0" encoding="UTF-8"?>
+<section version="5.0" xreflabel="Firewall" xml:id="firewall"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <!--2018/02/15 apb: Text and typography.-->
 
   <!--2018/02/25 apb: Added xreflabel for this section.-->
 
+  <!--2019/07/23 apb: Added dx2-firewall.png for this section.-->
+
   <info>
     <title xml:id="firewall-ti1">Firewall</title>
   </info>
 
-  <para xml:id="firewall-pa1" revision="1">This section allows you to
+  <para revision="1" xml:id="firewall-pa1">This section allows you to
   configure some simple firewall rules: they determine which type of message
   from the Internet will be accepted by the target system. This, in turn,
   allows the corresponding services on the system to be accessible from the
   Internet.</para>
 
+  <mediaobject>
+    <imageobject>
+      <imagedata align="center" fileref="dx2-firewall.png"/>
+    </imageobject>
+  </mediaobject>
+
   <para>In the default setting (no button is checked), no service of the
   system is accessible from the network. The <emphasis>Everything (no
   firewall)</emphasis> option enables access to all services of the machine -
@@ -32,14 +47,14 @@
   enable a series of services by typing a list of <quote>couples</quote>
   (blank separated)</para>
 
-  <para><emphasis>&lt;port-number>/&lt;protocol></emphasis></para>
+  <para><emphasis>&lt;port-number&gt;/&lt;protocol&gt;</emphasis></para>
 
   <simplelist>
-    <member>- <emphasis>&lt;port-number></emphasis> is the value of the
+    <member>- <emphasis>&lt;port-number&gt;</emphasis> is the value of the
     port assigned to the service you want to enable (e.g. 873 for the RSYNC
     service) as defined in <emphasis>RFC-433</emphasis>;</member>
 
-    <member>- <emphasis>&lt;protocol></emphasis> is one of
+    <member>- <emphasis>&lt;protocol&gt;</emphasis> is one of
     <emphasis>TCP</emphasis> or <emphasis>UDP</emphasis> - the internet
     protocol that is used by the service.</member>
   </simplelist>
@@ -49,4 +64,4 @@
 
   <para>In case a service is implemented to use both protocols, you specify 2
   couples for the same port.</para>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/en/installer.xml b/docs/docs/stable/installer/en/installer.xml
index 58f9720f..3fa0bf2f 100644
--- a/docs/docs/stable/installer/en/installer.xml
+++ b/docs/docs/stable/installer/en/installer.xml
@@ -28,6 +28,8 @@
 
   <!--2019/01/08 apb: 1.2.2: Update dx-welcome2.png (UEFI Welcome screen) to Mga7 and add text for F2 Languages option.-->
 
+  <!--2019/07/17 apb: Force dx-welcome.png and dx-welcome2.png to be 800px wide.-->
+
   <info>
     <title xml:id="installer-ti1">DrakX, the Mageia Installer</title>
   </info>
diff --git a/docs/docs/stable/installer/en/setupBootloader.xml b/docs/docs/stable/installer/en/setupBootloader.xml
index 119f6630..4923786c 100644
--- a/docs/docs/stable/installer/en/setupBootloader.xml
+++ b/docs/docs/stable/installer/en/setupBootloader.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section version="5.0" xreflabel="Bootloader" xml:id="setupBootloader"
          xmlns="http://docbook.org/ns/docbook"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
          xmlns:ns5="http://www.w3.org/1999/xhtml"
          xmlns:ns42="http://www.w3.org/1998/Math/MathML"
          xmlns:ns4="http://www.w3.org/1999/xlink"
@@ -23,48 +24,81 @@ Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
 
   <!--2019/01/06 apb: Use 'xi:include' for setupBootloaderAddEntry.xml, as that is how it is called by the inline-help drakx/perl routine.-->
 
+  <!--2019/07/18 apb: Rewrite 1.1, to accomodate inclusion of rEFInd option, and modify 1.2.1, 1.2.2 accordingly.-->
+
+  <!--2019/08/01 apb: 1.1.1 reworded to: GRUB2-efi or rEFInd may be used as the bootloader for a UEFI system. Added warning text for 1.2.2 Do not Touch MBR/ESP part.-->
+
   <info>
     <title xml:id="setupBootloader-ti1">Bootloader</title>
   </info>
 
   <section>
-    <title>Grub2</title>
-
-    <itemizedlist>
-      <title>Grub2 on Legacy MBR/GPT systems</title>
-
-      <listitem>
-        <para>GRUB2 (with or without graphical menu) will be used exclusively
-        as the bootloader for a Legacy/MBR or Legacy/GPT system.</para>
-      </listitem>
-
-      <listitem>
-        <para>By default, a new bootloader will be written into either the MBR
-        (Master Boot Record) of your first hard drive or in the BIOS boot
-        partition.</para>
-      </listitem>
-    </itemizedlist>
-
-    <itemizedlist>
-      <title>Grub2-efi on UEFI systems</title>
-
-      <listitem>
-        <para>GRUB2-efi will be used exclusively as the bootloader for a UEFI
-        system.</para>
-      </listitem>
-
-      <listitem>
-        <para>By default, a new bootloader (Grub2-efi) will be written into
-        the ESP (EFI System Partition).</para>
-
-        <para>If there are already UEFI-based operating systems installed on
-        your computer (Windows 8 for example), the Mageia installer will
-        detect the existing ESP created by Windows and add grub2-efi to it. If
-        no ESP exists, then one will be created. Although it is possible to
-        have several ESPs, only one is required, whatever the number of
-        operating systems you have.</para>
-      </listitem>
-    </itemizedlist>
+    <title>Available Bootloaders</title>
+
+    <section>
+      <title>Grub2</title>
+
+      <itemizedlist>
+        <para><emphasis role="bold">Grub2 on Legacy MBR/GPT
+        systems</emphasis></para>
+
+        <listitem>
+          <para>GRUB2 (with or without graphical menu) will be used
+          exclusively as the bootloader for a Legacy/MBR or Legacy/GPT
+          system.</para>
+        </listitem>
+
+        <listitem>
+          <para>By default, a new bootloader will be written into either the
+          MBR (Master Boot Record) of your first hard drive or in the BIOS
+          boot partition.</para>
+        </listitem>
+      </itemizedlist>
+
+      <itemizedlist>
+        <para><emphasis role="bold">Grub2-efi on UEFI
+        systems</emphasis></para>
+
+        <listitem>
+          <para>GRUB2-efi or rEFInd may be used as the bootloader for a UEFI
+          system.</para>
+        </listitem>
+
+        <listitem>
+          <para>By default, a new bootloader (Grub2-efi) will be written into
+          the ESP (EFI System Partition).</para>
+
+          <para>If there are already UEFI-based operating systems installed on
+          your computer (Windows 8 for example), the Mageia installer will
+          detect the existing ESP created by Windows and add grub2-efi to it.
+          If no ESP exists, then one will be created. Although it is possible
+          to have several ESPs, only one is required, whatever the number of
+          operating systems you have.</para>
+        </listitem>
+      </itemizedlist>
+    </section>
+
+    <section>
+      <title>rEFInd</title>
+
+      <itemizedlist>
+        <para><emphasis role="bold">rEFInd on UEFI systems</emphasis></para>
+
+        <listitem>
+          <para>rEFInd has a nice graphical set of options, and can
+          auto-detect installed EFI bootloaders. See:
+          http://www.rodsbooks.com/refind/</para>
+        </listitem>
+      </itemizedlist>
+
+      <note>
+        <para>Please note that in order to be able to use the
+        <literal>rEFInd</literal> option, an installed EFI System Partition
+        must match your system architecture: if you have a 32bit EFI System
+        Partition installed on a 64bit machine for instance, then the rEFInd
+        option will not be displayed/available to you.</para>
+      </note>
+    </section>
   </section>
 
   <section>
@@ -90,15 +124,39 @@ Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
         <listitem>
           <para><emphasis role="bold">Bootloader to use</emphasis></para>
 
-          <para>This feature is only available to Legacy MBR/BIOS systems.
-          Users of UEFI systems will not see this option here.</para>
+          <itemizedlist>
+            <listitem>
+              <para><guimenuitem>GRUB2</guimenuitem> (with either a graphical
+              or a text menu), can be chosen for both <literal>Legacy
+              MBR/BIOS</literal> systems and <literal>UEFI</literal>
+              systems.</para>
+            </listitem>
+
+            <listitem>
+              <para><guimenuitem>rEFInd</guimenuitem> (with a graphical menu)
+              is an alternative option solely for use with
+              <literal>UEFI</literal> systems.</para>
+            </listitem>
+          </itemizedlist>
         </listitem>
 
         <listitem>
           <para><emphasis role="bold">Boot device</emphasis></para>
 
-          <para>Don't change this unless you really know what you are
-          doing</para>
+          <warning>
+            <para>Don't change this unless you really know what you are
+            doing.</para>
+          </warning>
+
+          <note>
+            <para>There is no option to write GRUB to the boot sector of a
+            partition (e.g: <filename>sda1</filename>), as this method is
+            considered unreliable.</para>
+          </note>
+
+          <para>When using UEFI mode, then the <guilabel>Boot
+          device</guilabel> will be listed as <guimenuitem>EFI System
+          Partition</guimenuitem>.</para>
         </listitem>
 
         <listitem>
@@ -176,6 +234,43 @@ Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
     <section>
       <title>Bootloader Configuration</title>
 
+      <para>If, in the previous section you selected <literal>rEFInd</literal>
+      as the bootloader to use, you would then be presented with the options
+      shown in the screenshot directly below. Otherwise, please instead move
+      on to the subsequent screenshot for your options.</para>
+
+      <mediaobject>
+        <imageobject condition="classical">
+          <imagedata align="center" fileref="rEFIndLoaderConfig.png"/>
+        </imageobject>
+
+        <imageobject condition="live">
+          <imagedata align="center" fileref="live-rEFIndLoaderConfig.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <para>Your rEFInd configuration options:</para>
+
+        <listitem>
+          <para><guimenuitem>Install or update rEFInd in the EFI system
+          partition.</guimenuitem></para>
+        </listitem>
+
+        <listitem>
+          <para><guimenuitem>Install in EFI/Boot partition (workaround for
+          some BIOS's).</guimenuitem></para>
+
+          <para>With some BIOS's, the newly written bootloaser for Mageia at
+          end of the installation will not be recognized. In that case, you
+          can use this option as a workaround for the issue.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>If you did not select rEFInd as the bootloader to use in the
+      previous section, then your bootloader configurations are shown
+      below:</para>
+
       <mediaobject>
         <imageobject condition="classical">
           <imagedata align="center" fileref="dx2-setupBootloader3.png"/>
@@ -205,7 +300,8 @@ Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
 
           <para>If you already have other operating systems installed, Mageia
           attempts to add them to your new Mageia boot menu. If you don't want
-          this behaviour, then untick the Probe Foreign OS option.</para>
+          this behaviour, then untick the <guimenuitem>Probe Foreign
+          OS</guimenuitem> option.</para>
         </listitem>
       </itemizedlist>
 
@@ -235,9 +331,16 @@ Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
 
           <para>Select this option if you don't want a bootable Mageia, but
           would rather chain-load it from another OS. You will get a warning
-          that the bootloader is missing. Click<emphasis> Ok</emphasis> if you
-          are sure you understand the implications, and wish to
-          proceed.</para>
+          that the bootloader is missing. Click <guimenuitem>Ok </guimenuitem>only if you are sure you
+          understand the implications, and wish to proceed.</para>
+
+          <warning>
+            <para>Chain-loading via legacy bootloaders (GRUB Legacy and LiLo)
+            is no longer supported by Mageia as it is likely to fail when
+            attempting to boot this resulting installation of Mageia. If you
+            use anything other than GRUB2 or rEFInd for this purpose, then you
+            do so at your own risk!</para>
+          </warning>
         </listitem>
       </itemizedlist>
 
@@ -272,7 +375,6 @@ Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
       operating system will be unable to start.</para>
     </section>
 
-    <xi:include href="setupBootloaderAddEntry.xml"
-                xmlns:xi="http://www.w3.org/2001/XInclude"/>
+    <xi:include href="setupBootloaderAddEntry.xml"/>
   </section>
 </section>
diff --git a/docs/docs/stable/installer/eo.po b/docs/docs/stable/installer/eo.po
index 55f82069..86671819 100644
--- a/docs/docs/stable/installer/eo.po
+++ b/docs/docs/stable/installer/eo.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2019-01-19 21:23+0200\n"
+"POT-Creation-Date: 2019-09-08 15:26+0300\n"
 "PO-Revision-Date: 2019-01-19 19:25+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Esperanto (http://www.transifex.com/MageiaLinux/mageia/"
@@ -141,7 +141,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/addUser.xml:3
+#: en/addUser.xml:9
 msgid "User Management"
 msgstr ""
 
@@ -151,46 +151,57 @@ msgstr ""
 #. 2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
 #.   Also changed 'Advanced User Management' to 'User Management (advanced)'.
 #. 2018/02/24 apb: Changed list style.
+#. 2019/08/10 apb: Added missing 'condition' profile for live-user1.png.
+#. 2019/08/11 apb: [1] Reword 1.1 (including Note) [2] Reword 1.2 Password text.
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:12
+#: en/addUser.xml:28
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
-"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
-"\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata format="
-"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-setRootPassword.png\" format=\"PNG\" revision=\"1\" xml:id="
+"\"setRootPassword-im1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-user1.png\" format=\"PNG\"/> </imageobject>"
 msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
+"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:21
+#: en/addUser.xml:40
 msgid "Set Administrator (root)  Password:"
 msgstr "Kreo de mastrumanta pasvorto (Set administrator (root) password):"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:24
+#: en/addUser.xml:44
 msgid ""
 "It is advisable for all Mageia installations to set a <literal>superuser</"
 "literal> (Administrator) password, usually called the <emphasis>root </"
-"emphasis>password in Linux. As you type a password into the top box a shield "
-"will change from red-to-yellow-to-green depending on the strength of the "
-"password. A green shield shows you are using a strong password. You need to "
-"repeat the same password in the box underneath, to check that the first "
-"entry was not mistyped."
+"emphasis>password in Linux. You need to repeat the same password in the box "
+"underneath, to check that the first entry was not mistyped."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:32
+#: en/addUser.xml:51
+msgid ""
+"As you type a password into the top box a shield will change from red-to-"
+"yellow-to-green depending on the strength of the password. A green shield "
+"shows you are using a strong password."
+msgstr ""
+
+#. type: Content of: <section><section><note><para>
+#: en/addUser.xml:55
 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:39
+#: en/addUser.xml:63
 msgid "Enter a user"
 msgstr "Enigo de uzulo (Enter a user)"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:41
+#: en/addUser.xml:66
 msgid ""
 "Add a User here. A regular user has fewer privileges than the "
 "<literal>superuser</literal> (root), but enough to use the Internet, office "
@@ -199,39 +210,39 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:47
+#: en/addUser.xml:73
 msgid "<emphasis role=\"bold\">Icon</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:48
+#: en/addUser.xml:75
 msgid "Click on this button if you want to change the user's icon"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:52
+#: en/addUser.xml:80
 msgid "<emphasis role=\"bold\">Real Name</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:53
+#: en/addUser.xml:82
 msgid "Insert the user's real name into this text box"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:56
+#: en/addUser.xml:86
 msgid "<emphasis role=\"bold\">Login Name</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:57
+#: en/addUser.xml:88
 msgid ""
 "Enter the user login name or let DrakX use a version of the user's real "
 "name. <emphasis role=\"bold\">The login name is case-sensitive.</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><caution><simpara>
-#: en/addUser.xml:61
+#: en/addUser.xml:93
 msgid ""
 "The login entered here should be different to any login currently in use for "
 "your <filename>/home</filename> directory. Some user parameters will be "
@@ -240,34 +251,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:65 en/setupBootloader.xml:124
+#: en/addUser.xml:102 en/setupBootloader.xml:182
 msgid "<emphasis role=\"bold\">Password</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:66
-msgid ""
-"Type in the user password. There is a shield at the end of the text box that "
-"indicates the strength of the password. (See also <xref linkend="
-"\"givePassword\"/>)"
+#: en/addUser.xml:104
+msgid "Type in the user password (remembering the advice in the Note above)."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:68
+#: en/addUser.xml:107
 msgid ""
 "<emphasis role=\"bold\">Password (again):</emphasis> Retype the user "
 "password. DrakX will check that you have not mistyped the password."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:74
+#: en/addUser.xml:114
 msgid ""
 "Any users added while installing Mageia, will have a home directory that is "
 "both read and write protected (umask=0027)"
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:76
+#: en/addUser.xml:117
 msgid ""
 "You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
@@ -275,24 +283,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:79
+#: en/addUser.xml:121
 msgid "The access permissions can also be changed after the install."
 msgstr "The access permissions can also be changed after the install."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:85
+#: en/addUser.xml:128
 msgid "User Management (advanced)"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:87
+#: en/addUser.xml:131
 msgid ""
 "The <emphasis>Advanced</emphasis> option allows you to edit further settings "
 "for the user you are adding."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:91
+#: en/addUser.xml:136
 msgid ""
 "<emphasis>Shell</emphasis>: This drop-down list allows you to change the "
 "shell available to any user you added in the previous screen. Options are "
@@ -300,7 +308,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:143
 msgid ""
 "<emphasis>User ID</emphasis>: Here you can set the user ID for any user you "
 "added in the previous screen. If you are unsure what the purpose of this is, "
@@ -308,7 +316,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:102
+#: en/addUser.xml:149
 msgid ""
 "<emphasis>Group ID</emphasis>: This lets you set the group ID.  Again, if "
 "unsure, leave it blank."
@@ -428,24 +436,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:23
+#: en/bootLive.xml:10
 msgid "Boot Mageia as Live system"
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:28
+#: en/bootLive.xml:14
 msgid "Booting the medium"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:31
+#: en/bootLive.xml:16
 msgid ""
 "You can boot directly from a Live DVD or USB. Usually, you just need to plug "
 "the USB device in or place the DVD in the drive and restart the computer."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:35
+#: en/bootLive.xml:19
 msgid ""
 "If the computer does not automatically boot from the USB or DVD you may need "
 "to reconfigure your BIOS Boot Disk priority. Alternatively, you might try "
@@ -454,7 +462,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><tip><para>
-#: en/bootLive.xml:41
+#: en/bootLive.xml:24
 msgid ""
 "To access the BIOS or boot menu when the computer is starting, you can try "
 "pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or <keycap>Esc</"
@@ -464,7 +472,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/bootLive.xml:50
+#: en/bootLive.xml:32
 msgid ""
 "The actual screen that you will first see when booting from the Live media "
 "will depend on whether your computer motherboard is of the Legacy (BIOS) or "
@@ -472,91 +480,93 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:58
+#: en/bootLive.xml:39
 msgid "In BIOS/CSM/Legacy mode"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:62
+#: en/bootLive.xml:42
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"../live-bootCSM.png\" align=\"center\"/> "
+"</imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:67
+#: en/bootLive.xml:46
 msgid "First screen while booting in BIOS mode"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><title>
-#: en/bootLive.xml:72 en/bootLive.xml:144 en/installer.xml:106
-#: en/installer.xml:154
+#: en/bootLive.xml:50 en/bootLive.xml:104 en/installer.xml:108
+#: en/installer.xml:156
 msgid "Menu"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:75 en/bootLive.xml:147
+#: en/bootLive.xml:52 en/bootLive.xml:106
 msgid "<emphasis role=\"bold\">Boot Mageia</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:77
+#: en/bootLive.xml:53
 msgid ""
 "This option will boot the Mageia Live system from the connected DVD/USB "
 "media (expect a very slow system compared to an installed OS)."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:81
+#: en/bootLive.xml:56
 msgid "Once the boot is done, you can proceed to the installation."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:86 en/bootLive.xml:102
+#: en/bootLive.xml:60 en/bootLive.xml:72
 msgid ""
 "<emphasis role=\"bold\">+ use non-free video drivers (slower to boot)</"
 "emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:89
+#: en/bootLive.xml:62
 msgid "Boot the Mageia Live system using non-free video drivers"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:96 en/bootLive.xml:155 en/installer.xml:109
+#: en/bootLive.xml:68 en/bootLive.xml:112 en/installer.xml:111
 msgid "<emphasis role=\"bold\">Install Mageia</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:98 en/bootLive.xml:157
+#: en/bootLive.xml:69 en/bootLive.xml:113
 msgid "This option will install Mageia to a hard disk."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:105
+#: en/bootLive.xml:74
 msgid "Install Mageia using non-free video drivers"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:111 en/installer.xml:125
+#: en/bootLive.xml:79 en/installer.xml:127
 msgid "<emphasis role=\"bold\">Memory Test</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:113 en/installer.xml:127
+#: en/bootLive.xml:80 en/installer.xml:129
 msgid ""
 "Test the installed RAM by performing multiple read and write operations. "
 "Reboot to end the test."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:118 en/bootLive.xml:161
+#: en/bootLive.xml:84 en/bootLive.xml:116
 msgid "<emphasis role=\"bold\"> F2 Language</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:120 en/bootLive.xml:163
+#: en/bootLive.xml:85 en/bootLive.xml:117
 msgid ""
 "Press <keycap>F2</keycap> to have the installer use a specific language "
 "during the installation. Use the arrow keys to select the language then "
@@ -564,24 +574,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:129
+#: en/bootLive.xml:93
 msgid "In UEFI mode"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:133
+#: en/bootLive.xml:96
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
+"> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:139
+#: en/bootLive.xml:100
 msgid "First screen while booting in UEFI mode"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:149
+#: en/bootLive.xml:107
 msgid ""
 "This option will boot the Mageia Live system from the connected DVD/USB "
 "media (expect a very slow system compared to an installed OS).  Once the "
@@ -589,7 +602,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/bootLive.xml:170
+#: en/bootLive.xml:123
 msgid ""
 "If you booted from a USB stick, you will see the above menu options "
 "duplicated, and in this case, you should choose from the menu pair that will "
@@ -806,12 +819,12 @@ msgstr ""
 "ili estas alĝustigitaj ĉiuj je la loka horo aŭ je UTC/GTM."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:24
+#: en/configureX_card_list.xml:27
 msgid "Choose an X Server (Configure your Graphic Card)"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_card_list.xml:29
+#: en/configureX_card_list.xml:32
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_card_list."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_card_list-im1\"/> </"
@@ -819,36 +832,36 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:35
+#: en/configureX_card_list.xml:38
 msgid ""
 "DrakX has a very comprehensive database of video cards and will usually "
 "correctly identify your video device."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:38
+#: en/configureX_card_list.xml:41
 msgid ""
 "If the installer has not correctly detected your graphic card and you know "
 "which one you have, you can select it from the tree by:"
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_card_list.xml:41 en/configureX_monitor.xml:74
+#: en/configureX_card_list.xml:44 en/configureX_monitor.xml:78
 msgid "Vendor"
 msgstr "Vendinto"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:45
+#: en/configureX_card_list.xml:48
 msgid "then the make of your card"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:49
+#: en/configureX_card_list.xml:52
 msgid "and the model of card"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:53
+#: en/configureX_card_list.xml:56
 msgid ""
 "If you cannot find your card in the vendor lists (because it's not yet in "
 "the database or it's an older card) you may find a suitable driver in the "
@@ -859,14 +872,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><caution><para>
-#: en/configureX_card_list.xml:61
+#: en/configureX_card_list.xml:64
 msgid ""
 "Be aware that if you select an incompatible driver you may only have access "
 "to the <emphasis>Command Line Interface</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:65
+#: en/configureX_card_list.xml:68
 msgid ""
 "Some video card manufacturers provide proprietary drivers for Linux which "
 "may only be available in the <emphasis>Nonfree</emphasis> repository and in "
@@ -877,17 +890,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:11
-msgid "Graphic Card and Monitor Configuration"
+#: en/configureX_chooser.xml:23
+#, fuzzy
+msgid "Graphics Card and Monitor Configuration"
 msgstr "Konfiguri X, grafik-karton kaj monitoron"
 
-#.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
-#. 2018/02/15 apb: Some text and typography.
-#. 2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.
-#. 2018/02/23 apb: Typo.
-#. 2019/01/06 apb: Slight reword, split 1st para in two.
 #. type: Content of: <section><mediaobject>
-#: en/configureX_chooser.xml:26
+#: en/configureX_chooser.xml:28
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_chooser."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_chooser-im1\"/> </"
@@ -895,7 +904,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:32
+#: en/configureX_chooser.xml:34
 msgid ""
 "No matter which graphical environment (also known as desktop environment) "
 "you chose for this install of Mageia, they are all based on a graphical user "
@@ -906,31 +915,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:39
+#: en/configureX_chooser.xml:41
 msgid ""
 "Choose the appropriate settings manually if you think the details are "
 "incorrect, or if none are shown."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:44
-msgid "<emphasis role=\"bold\">Graphic Card</emphasis>"
+#: en/configureX_chooser.xml:46
+msgid "<emphasis role=\"bold\">Graphics Card</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:47
+#: en/configureX_chooser.xml:49
 msgid ""
 "If you need to, you can select a specific card from this expandable list. "
 "See <xref linkend=\"configureX_card_list\"/>."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:52
+#: en/configureX_chooser.xml:54
 msgid "<emphasis role=\"bold\">Monitor</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:55
+#: en/configureX_chooser.xml:57
 msgid ""
 "You can choose Plug 'n Play, if applicable, or choose your monitor from the "
 "<emphasis>Vendor</emphasis> or <emphasis>Generic</emphasis> lists. Choose "
@@ -940,22 +949,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:63
+#: en/configureX_chooser.xml:65
 msgid "<emphasis role=\"bold\">Resolution</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:66
+#: en/configureX_chooser.xml:68
 msgid "The resolution and color depth of your monitor can be set here."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:71
+#: en/configureX_chooser.xml:73
 msgid "<emphasis role=\"bold\">Test</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:74
+#: en/configureX_chooser.xml:76
 msgid ""
 "The test button does not always appear during install. If the option is "
 "there, and you test your settings, you should be asked to confirm that your "
@@ -967,17 +976,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:85
+#: en/configureX_chooser.xml:87
 msgid "<emphasis role=\"bold\">Options</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:88
+#: en/configureX_chooser.xml:90
 msgid "Here you can choose to enable or disable various options."
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_chooser.xml:93
+#: en/configureX_chooser.xml:95
 msgid ""
 "There is a risk of damaging a monitor if you choose refresh rates that are "
 "outside the frequency range of that monitor. This applies to older CRT "
@@ -986,19 +995,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_monitor.xml:22
+#: en/configureX_monitor.xml:26
 msgid "Choosing your Monitor"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:25
+#: en/configureX_monitor.xml:29
 msgid ""
 "DrakX has a very comprehensive database of monitors and will usually "
 "correctly identify yours."
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:30
+#: en/configureX_monitor.xml:34
 msgid ""
 "<emphasis role=\"bold\">Selecting a monitor with different characteristics "
 "could damage your monitor or video hardware. Please don't try something "
@@ -1007,7 +1016,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:38
+#: en/configureX_monitor.xml:42
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
@@ -1018,12 +1027,12 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:46
+#: en/configureX_monitor.xml:50
 msgid "Custom"
 msgstr "Akomodata"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:49
+#: en/configureX_monitor.xml:53
 msgid ""
 "This option allows you to set two critical parameters: the vertical refresh "
 "rate and the horizontal sync rate. Vertical refresh determines how often the "
@@ -1032,7 +1041,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:55
+#: en/configureX_monitor.xml:59
 msgid ""
 "It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor "
 "type with a sync range that is beyond the capabilities of your monitor: you "
@@ -1041,56 +1050,56 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:64
+#: en/configureX_monitor.xml:68
 msgid "Plug'n Play"
 msgstr "Plug'n Play"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:67
+#: en/configureX_monitor.xml:71
 msgid ""
 "This is the default option and automatically tries to determine the monitor "
 "type from the monitor database."
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:77
+#: en/configureX_monitor.xml:81
 msgid ""
 "If the installer has not correctly detected your monitor and you know which "
-"one you have, you can select it from the tree by selecting:"
+"one you have, you can choose it from the options by selecting:"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:86
+#: en/configureX_monitor.xml:90
 msgid "Manufacturer"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:90
+#: en/configureX_monitor.xml:94
 msgid "Monitor model"
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:96
+#: en/configureX_monitor.xml:100
 msgid "Generic"
 msgstr "Genera"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:99
+#: en/configureX_monitor.xml:103
 msgid ""
-"Selecting this group will list nearly 30 display configurations such as "
-"1024x768 @ 60Hz and includes flat-panel displays as used in laptops. This is "
-"often a good monitor selection group if you need to use the VESA card driver "
-"when your video hardware cannot be determined automatically.  Once again it "
-"may be wise to be conservative in your selections."
+"Selecting this group will list approximately 30 display configurations such "
+"as 1024x768 @ 60Hz and includes flat-panel displays as used in laptops.  "
+"This is often a good monitor selection group if you need to use the VESA "
+"card driver when your video hardware cannot be determined automatically. "
+"Once again, it may be wise to be conservative in your selections."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:22
+#: en/diskdrake.xml:24
 msgid "Custom Disk Partitioning with DiskDrake"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:27
+#: en/diskdrake.xml:29
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-diskdrake.png\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1098,7 +1107,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:38
+#: en/diskdrake.xml:40
 msgid ""
 "Modify the layout of your disk(s) here. You can remove or create partitions, "
 "change the filesystem or size of a partition and even view their details "
@@ -1106,15 +1115,15 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:47
 msgid ""
 "There is a tab at the top for every detected hard disk (or other storage "
-"device, like a USB key). In the screenshot above there are two available "
-"devices: <filename>sda </filename>and <filename>sdb</filename>."
+"device, like a USB key), for example: <filename>sda</filename>, "
+"<filename>sdb</filename>, <filename>sdc</filename> etc."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:52
+#: en/diskdrake.xml:54
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it. "
@@ -1123,21 +1132,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:60
+#: en/diskdrake.xml:62
 msgid ""
 "Continue until you have adjusted everything to your satisfaction, then click "
 "<emphasis>Done</emphasis> when you're ready."
 msgstr ""
 
 #. type: Content of: <section><warning><orderedlist><listitem><para>
-#: en/diskdrake.xml:69
+#: en/diskdrake.xml:71
 msgid ""
 "Take care with the <emphasis>Clear all</emphasis> option, use it only if you "
 "are sure you want to wipe all partitions on the selected storage device."
 msgstr ""
 
 #. type: Content of: <section><warning><orderedlist><listitem><para>
-#: en/diskdrake.xml:75
+#: en/diskdrake.xml:77
 msgid ""
 "If you wish to use encryption on your <filename>/</filename> partition you "
 "must ensure that you have a separate <filename>/boot</filename> partition. "
@@ -1146,7 +1155,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/diskdrake.xml:87
+#: en/diskdrake.xml:89
 msgid ""
 "If you are installing Mageia on a UEFI system, check that an ESP (EFI System "
 "Partition) is present and correctly mounted on <filename>/boot/EFI</"
@@ -1154,19 +1163,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/diskdrake.xml:93
+#: en/diskdrake.xml:95
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
 "partition is present and of the correct type. See Figure 2 below."
 msgstr ""
 
 #. type: Content of: <section><figure><title>
-#: en/diskdrake.xml:101
+#: en/diskdrake.xml:103
 msgid "EFI System Partition"
 msgstr ""
 
 #. type: Content of: <section><figure><mediaobject>
-#: en/diskdrake.xml:104
+#: en/diskdrake.xml:106
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-diskdrake2.png\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1174,17 +1183,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><figure>
-#: en/diskdrake.xml:103 en/diskdrake.xml:117
+#: en/diskdrake.xml:105 en/diskdrake.xml:119
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <section><figure><title>
-#: en/diskdrake.xml:115
+#: en/diskdrake.xml:117
 msgid "BIOS boot partition"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:118 en/doPartitionDisks.xml:201
+#: en/diskdrake.xml:120 en/doPartitionDisks.xml:206
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1203,26 +1212,26 @@ msgid "Partitioning"
 msgstr "Subdiskigante"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:31
 msgid "Suggested Partitioning"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:34
 msgid ""
 "In this screen you can see the content of your hard drive(s) along with the "
 "DrakX partitioning proposals for where to install Mageia."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:34
+#: en/doPartitionDisks.xml:38
 msgid ""
 "The actual options available from those shown below will vary according to "
 "the layout and content of your particular hard drive(s)."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:39
+#: en/doPartitionDisks.xml:43
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1231,17 +1240,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><title>
-#: en/doPartitionDisks.xml:49
+#: en/doPartitionDisks.xml:53
 msgid "Main Options"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:56
 msgid "<emphasis role=\"bold\">Use Existing Partitions</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:59
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1250,12 +1259,12 @@ msgstr ""
 "kiuj povas esti utiligataj por la instalo."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:61
+#: en/doPartitionDisks.xml:65
 msgid "<emphasis role=\"bold\">Use Free Space</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:68
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1264,57 +1273,54 @@ msgstr ""
 "nova Mageja instalo."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:70
+#: en/doPartitionDisks.xml:74
 msgid ""
 "<emphasis role=\"bold\">Use Free Space on a Windows Partition</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:73
+#: en/doPartitionDisks.xml:77
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it. 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 important files!"
+"installation but see the warning below."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para><mediaobject>
+#: en/doPartitionDisks.xml:87
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:79
+#: en/doPartitionDisks.xml:82
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
 "light blue and the proposed Mageia partition in dark blue with their "
 "intended sizes just underneath. You have the option to modify these sizes by "
 "clicking and dragging the gap between both partitions.  See the following "
-"screenshot:"
-msgstr ""
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:87
-msgid "<emphasis role=\"bold\">Erase and use Entire Disk</emphasis>"
-msgstr ""
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:90
-msgid "This option will allocate the entire drive for Mageia"
+"screenshot:<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:97
 msgid ""
-"This will erase ALL data on the selected hard drive. Take care! 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 this option."
+"This involves shrinking the size of the Windows partition, and therefore is "
+"a risky operation, so you should make sure you have backed up all important "
+"files before proceeding."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><important><para>
-#: en/doPartitionDisks.xml:101
+#: en/doPartitionDisks.xml:103
+#, fuzzy
 msgid ""
-"Note that this involves shrinking the size of the Windows partition. The "
-"partition must be \"clean\", meaning that Windows must have closed down "
+"The partition must be \"clean\", meaning that Windows must have closed down "
 "correctly the last time it was used. It must also have been defragmented, "
 "although this is not a guarantee that all files in the partition have been "
-"moved out of the area that is about to be used. It is highly recommended to "
-"back up your personal files."
+"moved out of the area that is about to be used for Mageia."
 msgstr ""
 "Rimarku ke ĉi tio implikas la ŝrumpigon de la vindoza subdisko. La subdisko "
 "devas esti \"pura\", tio estas Vindozo devis fermiĝi senprobleme la lastan "
@@ -1325,11 +1331,29 @@ msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/doPartitionDisks.xml:112
-msgid "<emphasis role=\"bold\">Custom Disk Partitioning</emphasis>"
+msgid "<emphasis role=\"bold\">Erase and use Entire Disk</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/doPartitionDisks.xml:115
+msgid "This option will allocate the entire drive for Mageia"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><warning><para>
+#: en/doPartitionDisks.xml:119
+msgid ""
+"This will erase ALL data on the selected hard drive. Take care! 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 this option."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:127
+msgid "<emphasis role=\"bold\">Custom Disk Partitioning</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:130
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1337,17 +1361,8 @@ msgstr ""
 "Ĉi tio havigas al vi plenan kontrolon sur la lokigo de la instalo en via(j) "
 "fiksita(j)  disko(j)."
 
-#. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:122
-msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
-msgstr ""
-
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:131
+#: en/doPartitionDisks.xml:136
 msgid ""
 "If you are not using the <emphasis>Custom disk partitioning</emphasis> "
 "option, then the installer will allocate the available space according to "
@@ -1355,60 +1370,60 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:137
+#: en/doPartitionDisks.xml:142
 msgid ""
 "If the total available space is less than 50 GB, then only one partition is "
 "created. This will be the <filename>/</filename> (root)  partition."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:143
+#: en/doPartitionDisks.xml:148
 msgid ""
 "If the total available space is greater than 50 GB, then three partitions "
 "are created"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:148
+#: en/doPartitionDisks.xml:153
 msgid ""
 "6/19 of the total available place is allocated to <filename>/</filename> "
 "with a maximum of 50 GB"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:153
+#: en/doPartitionDisks.xml:158
 msgid "1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:158
+#: en/doPartitionDisks.xml:163
 msgid "the rest (at least 12/19) is allocated to <filename>/home</filename>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:165
+#: en/doPartitionDisks.xml:170
 msgid ""
 "This means that from 160 GB or greater available space, the installer will "
 "create three partitions:"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:170
+#: en/doPartitionDisks.xml:175
 msgid "50 GB for <filename>/</filename>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:174
+#: en/doPartitionDisks.xml:179
 msgid "4 GB for <filename>swap</filename>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:178
+#: en/doPartitionDisks.xml:183
 msgid "and the remainder for <filename>/home</filename>"
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:183
+#: en/doPartitionDisks.xml:188
 msgid ""
 "If you are using a UEFI system, the ESP (EFI System Partition) will be "
 "automatically detected - or created if it does not exist yet - and mounted "
@@ -1418,7 +1433,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:189
+#: en/doPartitionDisks.xml:194
 msgid ""
 "If you are using a Legacy (also known as BIOS) system with a GPT partitioned "
 "disk, you need to create a BIOS boot partition if it doesn't already exist. "
@@ -1429,19 +1444,25 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:196
+#: en/doPartitionDisks.xml:201
 msgid "See <xref linkend=\"diskdrake\"/> for information on how to proceed."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:211
+#: en/doPartitionDisks.xml:216
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4.png"
-"\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks4.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks4.png\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
+"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:217
+#: en/doPartitionDisks.xml:226
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
 "previous standard of 512. Due to lack of available hardware, the "
@@ -1450,7 +1471,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:222
+#: en/doPartitionDisks.xml:231
 msgid ""
 "Some SSD devices now use an erase block size over 1 MB. If you have such a "
 "device we suggest that you partition the drive in advance, using an "
@@ -1459,17 +1480,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:229
+#: en/doPartitionDisks.xml:238
 msgid "<emphasis>Align to</emphasis> = MiB"
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:233
+#: en/doPartitionDisks.xml:242
 msgid "<emphasis>Free space preceding (MiB)</emphasis> = 2"
 msgstr ""
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:237
+#: en/doPartitionDisks.xml:246
 msgid ""
 "Also make sure all partitions are created using an even number of megabytes."
 msgstr ""
@@ -1639,12 +1660,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/firewall.xml:7
+#: en/firewall.xml:16
 msgid "Firewall"
 msgstr "Fajromuro (Firewall)"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:10
+#: en/firewall.xml:19
 msgid ""
 "This section allows you to configure some simple firewall rules: they "
 "determine which type of message from the Internet will be accepted by the "
@@ -1652,8 +1673,17 @@ msgid ""
 "system to be accessible from the Internet."
 msgstr ""
 
+#. type: Content of: <section><mediaobject>
+#: en/firewall.xml:26
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-firewall.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+
 #. type: Content of: <section><para>
-#: en/firewall.xml:16
+#: en/firewall.xml:31
 msgid ""
 "In the default setting (no button is checked), no service of the system is "
 "accessible from the network. The <emphasis>Everything (no firewall)</"
@@ -1666,7 +1696,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:25
+#: en/firewall.xml:40
 msgid ""
 "All other options are more or less self-explanatory. As an example, you will "
 "enable the CUPS server if you want printers on your machine to be accessible "
@@ -1674,12 +1704,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:29
+#: en/firewall.xml:44
 msgid "<emphasis role=\"bold\">Advanced</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:31
+#: en/firewall.xml:46
 msgid ""
 "The <emphasis>Advanced</emphasis> option opens a window where you can enable "
 "a series of services by typing a list of <quote>couples</quote> (blank "
@@ -1687,34 +1717,35 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:35
-msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
+#: en/firewall.xml:50
+msgid "<emphasis>&lt;port-number&gt;/&lt;protocol&gt;</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:38
+#: en/firewall.xml:53
 msgid ""
-"- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
-"the service you want to enable (e.g. 873 for the RSYNC service) as defined "
-"in <emphasis>RFC-433</emphasis>;"
+"- <emphasis>&lt;port-number&gt;</emphasis> is the value of the port assigned "
+"to the service you want to enable (e.g. 873 for the RSYNC service) as "
+"defined in <emphasis>RFC-433</emphasis>;"
 msgstr ""
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:42
+#: en/firewall.xml:57
 msgid ""
-"- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
-"<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
+"- <emphasis>&lt;protocol&gt;</emphasis> is one of <emphasis>TCP</emphasis> "
+"or <emphasis>UDP</emphasis> - the internet protocol that is used by the "
+"service."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:47
+#: en/firewall.xml:62
 msgid ""
 "For instance, the entry for enabling access to the RSYNC service therefore "
 "is <emphasis>873/tcp</emphasis>."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:50
+#: en/firewall.xml:65
 msgid ""
 "In case a service is implemented to use both protocols, you specify 2 "
 "couples for the same port."
@@ -1782,12 +1813,12 @@ msgid "Graphical Configuration"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:32
+#: en/installer.xml:34
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, la instalilo de Magejo"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:35
+#: en/installer.xml:37
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -1797,33 +1828,33 @@ msgstr ""
 "estas desegnita por igi vian instaladon aŭ ĝisdatigon tiel facila kiel eble."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:40
+#: en/installer.xml:42
 msgid "The installation steps"
 msgstr "La instal-paŝoj"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:44
+#: en/installer.xml:46
 msgid ""
 "The install process is divided into a number of steps - the status of which "
 "is indicated in a panel to the left of the screen."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:50
+#: en/installer.xml:52
 msgid ""
 "Each step has one or more screens, which may also have <emphasis>Advanced</"
 "emphasis> sections with extra, less commonly required options."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:56
+#: en/installer.xml:58
 msgid ""
 "Most screens have <emphasis>Help</emphasis> buttons for further details "
 "about the particular step."
 msgstr ""
 
 #. type: Content of: <section><section><caution><para>
-#: en/installer.xml:62
+#: en/installer.xml:64
 msgid ""
 "If at some point during the install you decide to abort the installation, it "
 "is possible to reboot, but please think twice before you do this. Once a "
@@ -1833,7 +1864,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><caution><para>
-#: en/installer.xml:68
+#: en/installer.xml:70
 msgid ""
 "If, in spite of this, you are very sure rebooting is what you want, go to a "
 "text terminal by pressing the keys <keycombo> <keycap>Ctrl</keycap> "
@@ -1843,12 +1874,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:86
+#: en/installer.xml:88
 msgid "Installation Welcome Screen"
 msgstr "Bonveniga instal-ekrano"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:88
+#: en/installer.xml:90
 msgid ""
 "The particular screen that you will first see when booting from the "
 "Installation media will depend on whether your computer motherboard is of "
@@ -1856,60 +1887,60 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:92
+#: en/installer.xml:94
 msgid ""
 "The welcome menu screen has various options, however the default option will "
 "start the installer, and is normally all that you will need."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:97
+#: en/installer.xml:99
 msgid "Legacy (BIOS) Systems"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:100
+#: en/installer.xml:102
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome.png\"/> </"
 "imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:111
+#: en/installer.xml:113
 msgid ""
 "Install Mageia to a hard disk. This is the default option, and will "
 "automatically start after a short while unless another option is selected."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:117
+#: en/installer.xml:119
 msgid "<emphasis role=\"bold\">Rescue System</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:119
+#: en/installer.xml:121
 msgid ""
 "This option allows you to either re-install the bootloader for an existing "
 "Mageia installation or you can use it to restore a Windows bootloader."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:132
+#: en/installer.xml:134
 msgid "<emphasis role=\"bold\">F2: Language</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:134
+#: en/installer.xml:136
 msgid "Press F2 for alternative languages."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:140
+#: en/installer.xml:142
 msgid "UEFI Systems"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:142
+#: en/installer.xml:144
 msgid ""
 "From this screen, you can access options by pressing <keycap>e</keycap> to "
 "enter the edit mode. To come back to this screen, press <keycap>Esc</keycap> "
@@ -1917,19 +1948,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:148
+#: en/installer.xml:150
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome2.png\"/> </"
 "imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:157
+#: en/installer.xml:159
 msgid "<emphasis role=\"bold\">Install:</emphasis> Start the Install process"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:162
+#: en/installer.xml:164
 msgid ""
 "<emphasis role=\"bold\">Rescue:</emphasis> This option allows you to either "
 "re-install the bootloader for an existing Mageia installation or you can use "
@@ -1937,31 +1968,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:169
+#: en/installer.xml:171
 msgid ""
 "<emphasis role=\"bold\">F2: Language:</emphasis> Press <keycap>F2</keycap> "
 "for alternative languages."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:174
+#: en/installer.xml:176
 msgid ""
 "If you booted from a USB stick, you will see the above options duplicated, "
 "and in this case, you should use the set that will be suffixed with \"USB\"."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:181
+#: en/installer.xml:183
 msgid "Installation Problems and Possible Solutions"
 msgstr "Instal-problemoj kaj eblaj solvoj"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:184
+#: en/installer.xml:186
 msgid "No Graphical Interface"
 msgstr "Sen grafika interfaco"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:188
+#: en/installer.xml:190
 msgid ""
 "After the initial screen you did not progress to the <emphasis>Language "
 "Selection</emphasis> screen. This can happen with some graphic cards and "
@@ -1970,7 +2001,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:195
+#: en/installer.xml:197
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
 "In this case it is worth trying a text-mode installation. To use this press "
@@ -1981,12 +2012,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:208
+#: en/installer.xml:210
 msgid "The Install Freezes"
 msgstr "Instal-paneoj"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:210
+#: en/installer.xml:212
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic hardware "
@@ -1996,12 +2027,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:218
+#: en/installer.xml:220
 msgid "RAM problem"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:220
+#: en/installer.xml:222
 msgid ""
 "This will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
@@ -2011,12 +2042,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:228
+#: en/installer.xml:230
 msgid "Dynamic partitions"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:230
+#: en/installer.xml:232
 msgid ""
 "If you converted your hard disk from <literal>Basic</literal> format to "
 "<literal>Dynamic</literal> format in Microsoft Windows, then it is not "
@@ -3619,73 +3650,106 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:27
+#: en/setupBootloader.xml:32
 msgid "Bootloader"
 msgstr "Startŝargilo"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:31
+#: en/setupBootloader.xml:36
+#, fuzzy
+msgid "Available Bootloaders"
+msgstr "Startŝargilo"
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:39
 msgid "Grub2"
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><title>
-#: en/setupBootloader.xml:34
-msgid "Grub2 on Legacy MBR/GPT systems"
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:42
+msgid "<emphasis role=\"bold\">Grub2 on Legacy MBR/GPT systems</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:37
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:46
 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:42
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:52
 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:49
-msgid "Grub2-efi on UEFI systems"
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:59
+msgid "<emphasis role=\"bold\">Grub2-efi on UEFI systems</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:52
-msgid "GRUB2-efi will be used exclusively as the bootloader for a UEFI system."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:63
+msgid "GRUB2-efi or rEFInd may be used as the bootloader for a UEFI system."
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:57
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:68
 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:60
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:71
 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 "
-"created by Windows and add grub2-efi to it. If no ESP exists, then one will "
+"created by Windows and add grub2-efi to it.  If no ESP exists, then one will "
 "be created. Although it is possible to have several ESPs, only one is "
 "required, whatever the number of operating systems you have."
 msgstr ""
 
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:82
+msgid "rEFInd"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:85
+msgid "<emphasis role=\"bold\">rEFInd on UEFI systems</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:88
+msgid ""
+"rEFInd has a nice graphical set of options, and can auto-detect installed "
+"EFI bootloaders. See: http://www.rodsbooks.com/refind/"
+msgstr ""
+
+#. type: Content of: <section><section><section><note><para>
+#: en/setupBootloader.xml:95
+msgid ""
+"Please note that in order to be able to use the <literal>rEFInd</literal> "
+"option, an installed EFI System Partition must match your system "
+"architecture: if you have a 32bit EFI System Partition installed on a 64bit "
+"machine for instance, then the rEFInd option will not be displayed/available "
+"to you."
+msgstr ""
+
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:72
+#: en/setupBootloader.xml:106
 msgid "Bootloader Setup"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:76
+#: en/setupBootloader.xml:110
 msgid "Bootloader main options"
 msgstr "Lanĉilaj ĉefaj elektoj"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:79
+#: en/setupBootloader.xml:113
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader.png\"/> </imageobject> <imageobject condition=\"live"
@@ -3694,47 +3758,70 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:91
+#: en/setupBootloader.xml:125
 msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:93
+#. type: Content of: <section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:129
+msgid ""
+"<guimenuitem>GRUB2</guimenuitem> (with either a graphical or a text menu), "
+"can be chosen for both <literal>Legacy MBR/BIOS</literal> systems and "
+"<literal>UEFI</literal> systems."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:136
 msgid ""
-"This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI "
-"systems will not see this option here."
+"<guimenuitem>rEFInd</guimenuitem> (with a graphical menu)  is an alternative "
+"option solely for use with <literal>UEFI</literal> systems."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:98
+#: en/setupBootloader.xml:144
 msgid "<emphasis role=\"bold\">Boot device</emphasis>"
 msgstr ""
 
+#. type: Content of: <section><section><section><itemizedlist><listitem><warning><para>
+#: en/setupBootloader.xml:147
+#, fuzzy
+msgid "Don't change this unless you really know what you are doing."
+msgstr "Ŝanĝu aferojn nur se vi scias tre bone kion vi estas faranta."
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><note><para>
+#: en/setupBootloader.xml:152
+msgid ""
+"There is no option to write GRUB to the boot sector of a partition (e.g: "
+"<filename>sda1</filename>), as this method is considered unreliable."
+msgstr ""
+
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:100
-msgid "Don't change this unless you really know what you are doing"
+#: en/setupBootloader.xml:157
+msgid ""
+"When using UEFI mode, then the <guilabel>Boot device</guilabel> will be "
+"listed as <guimenuitem>EFI System Partition</guimenuitem>."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:105
+#: en/setupBootloader.xml:163
 msgid ""
 "<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:108
+#: en/setupBootloader.xml:166
 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:113
+#: en/setupBootloader.xml:171
 msgid "<emphasis role=\"bold\">Security</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:115
+#: en/setupBootloader.xml:173
 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 "
@@ -3744,34 +3831,34 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:126
+#: en/setupBootloader.xml:184
 msgid "Choose a password for the bootloader (optional)"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:130
+#: en/setupBootloader.xml:188
 msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:132
+#: en/setupBootloader.xml:190
 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:137 en/setupBootloader.xml:212
+#: en/setupBootloader.xml:195 en/setupBootloader.xml:308
 msgid "<emphasis>Advanced</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:141
+#: en/setupBootloader.xml:199
 msgid "<emphasis>Enable ACPI</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:143
+#: en/setupBootloader.xml:201
 msgid ""
 "ACPI (Advanced Configuration and Power Interface) is a standard for power "
 "management. It can save energy by stopping unused devices. Deselecting it "
@@ -3781,24 +3868,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:152
+#: en/setupBootloader.xml:210
 msgid "<emphasis>Enable SMP</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:154
+#: en/setupBootloader.xml:212
 msgid ""
 "This option enables/disables symmetric multiprocessing for multi-core "
 "processors"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:159
+#: en/setupBootloader.xml:217
 msgid "<emphasis>Enable APIC</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:161
+#: en/setupBootloader.xml:219
 msgid ""
 "Enabling this gives the operating system access to the Advanced Programmable "
 "Interrupt Controller. APIC devices permit more complex priority models, and "
@@ -3806,24 +3893,77 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:168
+#: en/setupBootloader.xml:226
 msgid "<emphasis>Enable Local APIC</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:170
+#: en/setupBootloader.xml:228
 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:177
+#: en/setupBootloader.xml:235
 msgid "Bootloader Configuration"
 msgstr ""
 
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:237
+msgid ""
+"If, in the previous section you selected <literal>rEFInd</literal> as the "
+"bootloader to use, you would then be presented with the options shown in the "
+"screenshot directly below. Otherwise, please instead move on to the "
+"subsequent screenshot for your options."
+msgstr ""
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:243
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"rEFIndLoaderConfig.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-rEFIndLoaderConfig.png\"/> </"
+"imageobject>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:253
+#, fuzzy
+msgid "Your rEFInd configuration options:"
+msgstr "Sonoagordo"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:256
+msgid ""
+"<guimenuitem>Install or update rEFInd in the EFI system partition.</"
+"guimenuitem>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:261
+msgid ""
+"<guimenuitem>Install in EFI/Boot partition (workaround for some BIOS's).</"
+"guimenuitem>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:264
+msgid ""
+"With some BIOS's, the newly written bootloaser for Mageia at end of the "
+"installation will not be recognized. In that case, you can use this option "
+"as a workaround for the issue."
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:270
+msgid ""
+"If you did not select rEFInd as the bootloader to use in the previous "
+"section, then your bootloader configurations are shown below:"
+msgstr ""
+
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:180
+#: en/setupBootloader.xml:275
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -3832,42 +3972,42 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:191
+#: en/setupBootloader.xml:286
 msgid "<emphasis role=\"bold\">Default</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:193
+#: en/setupBootloader.xml:288
 msgid "The operating system to be started up by default."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:197
+#: en/setupBootloader.xml:292
 msgid "<emphasis role=\"bold\">Append</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:199
+#: en/setupBootloader.xml:294
 msgid ""
 "This option lets you pass information to the kernel 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:204
+#: en/setupBootloader.xml:299
 msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:206
+#: en/setupBootloader.xml:301
 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, "
-"then untick the Probe Foreign OS option."
+"then untick the <guimenuitem>Probe Foreign OS</guimenuitem> option."
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:215
+#: en/setupBootloader.xml:311
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader4.png\"/> </imageobject> <imageobject condition=\"live"
@@ -3876,12 +4016,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:226
+#: en/setupBootloader.xml:322
 msgid "<emphasis>Video mode</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:228
+#: en/setupBootloader.xml:324
 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 "
@@ -3889,38 +4029,47 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:234
+#: en/setupBootloader.xml:330
 msgid "<emphasis>Do not touch ESP or MBR</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:236
+#: en/setupBootloader.xml:332
 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 "
-"missing. Click<emphasis> Ok</emphasis> if you are sure you understand the "
-"implications, and wish to proceed."
+"missing. Click <guimenuitem>Ok </guimenuitem>only if you are sure you "
+"understand the implications, and wish to proceed."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><warning><para>
+#: en/setupBootloader.xml:338
+msgid ""
+"Chain-loading via legacy bootloaders (GRUB Legacy and LiLo)  is no longer "
+"supported by Mageia as it is likely to fail when attempting to boot this "
+"resulting installation of Mageia. If you use anything other than GRUB2 or "
+"rEFInd for this purpose, then you do so at your own risk!"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:245
+#: en/setupBootloader.xml:348
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png"
 "\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:253
+#: en/setupBootloader.xml:356
 msgid "Other Options"
 msgstr "Aliaj opcioj"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:256
+#: en/setupBootloader.xml:359
 msgid "Using an existing bootloader"
 msgstr "Uzi ekzistantan lanĉilon"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:258
+#: en/setupBootloader.xml:361
 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 "
@@ -3930,12 +4079,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:267
+#: en/setupBootloader.xml:370
 msgid "Installing Without a Bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:269
+#: en/setupBootloader.xml:372
 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 "
diff --git a/docs/docs/stable/installer/es.po b/docs/docs/stable/installer/es.po
index 1b186605..ae729ceb 100644
--- a/docs/docs/stable/installer/es.po
+++ b/docs/docs/stable/installer/es.po
@@ -27,7 +27,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2019-01-19 21:23+0200\n"
+"POT-Creation-Date: 2019-09-08 15:26+0300\n"
 "PO-Revision-Date: 2019-02-02 17:09+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Spanish (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -193,7 +193,7 @@ msgstr ""
 "32 bits."
 
 #. type: Content of: <section><info><title>
-#: en/addUser.xml:3
+#: en/addUser.xml:9
 msgid "User Management"
 msgstr "Administración de usuarios"
 
@@ -203,13 +203,16 @@ msgstr "Administración de usuarios"
 #. 2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
 #.   Also changed 'Advanced User Management' to 'User Management (advanced)'.
 #. 2018/02/24 apb: Changed list style.
+#. 2019/08/10 apb: Added missing 'condition' profile for live-user1.png.
+#. 2019/08/11 apb: [1] Reword 1.1 (including Note) [2] Reword 1.2 Password text.
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:12
+#: en/addUser.xml:28
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
-"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
-"\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata format="
-"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-setRootPassword.png\" format=\"PNG\" revision=\"1\" xml:id="
+"\"setRootPassword-im1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-user1.png\" format=\"PNG\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
 "\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -217,20 +220,18 @@ msgstr ""
 "\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:21
+#: en/addUser.xml:40
 msgid "Set Administrator (root)  Password:"
 msgstr "Establezca la Contraseña del Administrador (root)"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:24
+#: en/addUser.xml:44
+#, fuzzy
 msgid ""
 "It is advisable for all Mageia installations to set a <literal>superuser</"
 "literal> (Administrator) password, usually called the <emphasis>root </"
-"emphasis>password in Linux. As you type a password into the top box a shield "
-"will change from red-to-yellow-to-green depending on the strength of the "
-"password. A green shield shows you are using a strong password. You need to "
-"repeat the same password in the box underneath, to check that the first "
-"entry was not mistyped."
+"emphasis>password in Linux. You need to repeat the same password in the box "
+"underneath, to check that the first entry was not mistyped."
 msgstr ""
 "Es recomendable que todas las instalaciones de Mageia establezcan una "
 "contraseña de  <literal>superusuario</literal> (administrador), generalmente "
@@ -242,7 +243,15 @@ msgstr ""
 "primera entrada no se haya escrito mal."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:32
+#: en/addUser.xml:51
+msgid ""
+"As you type a password into the top box a shield will change from red-to-"
+"yellow-to-green depending on the strength of the password. A green shield "
+"shows you are using a strong password."
+msgstr ""
+
+#. type: Content of: <section><section><note><para>
+#: en/addUser.xml:55
 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."
@@ -252,12 +261,12 @@ msgstr ""
 "caracteres en una contraseña."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:39
+#: en/addUser.xml:63
 msgid "Enter a user"
 msgstr "Introduzca un usuario"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:41
+#: en/addUser.xml:66
 msgid ""
 "Add a User here. A regular user has fewer privileges than the "
 "<literal>superuser</literal> (root), but enough to use the Internet, office "
@@ -270,32 +279,32 @@ msgstr ""
 "usuario promedio pueda usar una computadora."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:47
+#: en/addUser.xml:73
 msgid "<emphasis role=\"bold\">Icon</emphasis>"
 msgstr "<emphasis role=\"bold\">Icono</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:48
+#: en/addUser.xml:75
 msgid "Click on this button if you want to change the user's icon"
 msgstr "Haga clic en este botón si desea cambiar el icono del usuario."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:52
+#: en/addUser.xml:80
 msgid "<emphasis role=\"bold\">Real Name</emphasis>"
 msgstr "<emphasis role=\"bold\">Nombre Real</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:53
+#: en/addUser.xml:82
 msgid "Insert the user's real name into this text box"
 msgstr "Teclee el nombre real del usuario en este cuadro de texto"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:56
+#: en/addUser.xml:86
 msgid "<emphasis role=\"bold\">Login Name</emphasis>"
 msgstr "<emphasis role=\"bold\">Nombre de usuario (login)</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:57
+#: en/addUser.xml:88
 msgid ""
 "Enter the user login name or let DrakX use a version of the user's real "
 "name. <emphasis role=\"bold\">The login name is case-sensitive.</emphasis>"
@@ -305,7 +314,7 @@ msgstr ""
 "mayúsculas de minúsculas.</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><caution><simpara>
-#: en/addUser.xml:61
+#: en/addUser.xml:93
 msgid ""
 "The login entered here should be different to any login currently in use for "
 "your <filename>/home</filename> directory. Some user parameters will be "
@@ -318,23 +327,17 @@ msgstr ""
 "pueden sobrescribir datos reales como los de Firefox, Thunderbird o Kmail..."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:65 en/setupBootloader.xml:124
+#: en/addUser.xml:102 en/setupBootloader.xml:182
 msgid "<emphasis role=\"bold\">Password</emphasis>"
 msgstr "<emphasis role=\"bold\">Contraseña</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:66
-msgid ""
-"Type in the user password. There is a shield at the end of the text box that "
-"indicates the strength of the password. (See also <xref linkend="
-"\"givePassword\"/>)"
+#: en/addUser.xml:104
+msgid "Type in the user password (remembering the advice in the Note above)."
 msgstr ""
-"Escriba la contraseña de usuario. Hay un escudo al final del cuadro de texto "
-"que indica la fortaleza de la contraseña. (Ver también <xref linkend="
-"\"givePassword\"/>)"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:68
+#: en/addUser.xml:107
 msgid ""
 "<emphasis role=\"bold\">Password (again):</emphasis> Retype the user "
 "password. DrakX will check that you have not mistyped the password."
@@ -343,7 +346,7 @@ msgstr ""
 "la contraseña de usuario. DrakX verificará que no la haya escrito mal."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:74
+#: en/addUser.xml:114
 msgid ""
 "Any users added while installing Mageia, will have a home directory that is "
 "both read and write protected (umask=0027)"
@@ -352,7 +355,7 @@ msgstr ""
 "inicio home que está protegido contra lectura y escritura (umask = 0027)"
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:76
+#: en/addUser.xml:117
 msgid ""
 "You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
@@ -363,17 +366,17 @@ msgstr ""
 "Elija <emphasis>Administración de usuarios</emphasis>."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:79
+#: en/addUser.xml:121
 msgid "The access permissions can also be changed after the install."
 msgstr "Los permisos de acceso se pueden cambiar también tras la instalación."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:85
+#: en/addUser.xml:128
 msgid "User Management (advanced)"
 msgstr "Gestión de usuarios (avanzado)"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:87
+#: en/addUser.xml:131
 msgid ""
 "The <emphasis>Advanced</emphasis> option allows you to edit further settings "
 "for the user you are adding."
@@ -382,7 +385,7 @@ msgstr ""
 "adicionales para el usuario que está agregando."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:91
+#: en/addUser.xml:136
 msgid ""
 "<emphasis>Shell</emphasis>: This drop-down list allows you to change the "
 "shell available to any user you added in the previous screen. Options are "
@@ -394,7 +397,7 @@ msgstr ""
 "y <literal>Sh</literal>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:143
 msgid ""
 "<emphasis>User ID</emphasis>: Here you can set the user ID for any user you "
 "added in the previous screen. If you are unsure what the purpose of this is, "
@@ -405,7 +408,7 @@ msgstr ""
 "seguro de cuál es el propósito de esto, déjelo en blanco."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:102
+#: en/addUser.xml:149
 msgid ""
 "<emphasis>Group ID</emphasis>: This lets you set the group ID.  Again, if "
 "unsure, leave it blank."
@@ -563,17 +566,17 @@ msgstr ""
 "sincronización automática de hora y especificar un servidor NTP."
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:23
+#: en/bootLive.xml:10
 msgid "Boot Mageia as Live system"
 msgstr "Iniciar Mageia en modo Live"
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:28
+#: en/bootLive.xml:14
 msgid "Booting the medium"
 msgstr "Arrancando el medio"
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:31
+#: en/bootLive.xml:16
 msgid ""
 "You can boot directly from a Live DVD or USB. Usually, you just need to plug "
 "the USB device in or place the DVD in the drive and restart the computer."
@@ -583,7 +586,7 @@ msgstr ""
 "reiniciar la computadora."
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:35
+#: en/bootLive.xml:19
 msgid ""
 "If the computer does not automatically boot from the USB or DVD you may need "
 "to reconfigure your BIOS Boot Disk priority. Alternatively, you might try "
@@ -597,7 +600,7 @@ msgstr ""
 "computadora."
 
 #. type: Content of: <section><section><tip><para>
-#: en/bootLive.xml:41
+#: en/bootLive.xml:24
 msgid ""
 "To access the BIOS or boot menu when the computer is starting, you can try "
 "pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or <keycap>Esc</"
@@ -613,7 +616,7 @@ msgstr ""
 "selección de posibles opciones."
 
 #. type: Content of: <section><section><note><para>
-#: en/bootLive.xml:50
+#: en/bootLive.xml:32
 msgid ""
 "The actual screen that you will first see when booting from the Live media "
 "will depend on whether your computer motherboard is of the Legacy (BIOS) or "
@@ -624,37 +627,38 @@ msgstr ""
 "Legacy (BIOS) o UEFI."
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:58
+#: en/bootLive.xml:39
 msgid "In BIOS/CSM/Legacy mode"
 msgstr "En modo BIOS/CSM/Legacy"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:62
+#: en/bootLive.xml:42
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"../live-bootCSM.png\" align=\"center\"/> "
+"</imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> </"
+"<imageobject><imagedata fileref=\"dx2-summaryTop.png\" align=\"center\"/></"
 "imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:67
+#: en/bootLive.xml:46
 msgid "First screen while booting in BIOS mode"
 msgstr "Primera pantalla al arrancar en modo BIOS"
 
 #. type: Content of: <section><section><section><itemizedlist><title>
-#: en/bootLive.xml:72 en/bootLive.xml:144 en/installer.xml:106
-#: en/installer.xml:154
+#: en/bootLive.xml:50 en/bootLive.xml:104 en/installer.xml:108
+#: en/installer.xml:156
 msgid "Menu"
 msgstr "Menú"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:75 en/bootLive.xml:147
+#: en/bootLive.xml:52 en/bootLive.xml:106
 msgid "<emphasis role=\"bold\">Boot Mageia</emphasis>"
 msgstr "<emphasis role=\"bold\">Arrancar Mageia</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:77
+#: en/bootLive.xml:53
 msgid ""
 "This option will boot the Mageia Live system from the connected DVD/USB "
 "media (expect a very slow system compared to an installed OS)."
@@ -664,12 +668,12 @@ msgstr ""
 "instalado)."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:81
+#: en/bootLive.xml:56
 msgid "Once the boot is done, you can proceed to the installation."
 msgstr "Una vez teminado el arranque, puede proceder a la instalación."
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:86 en/bootLive.xml:102
+#: en/bootLive.xml:60 en/bootLive.xml:72
 msgid ""
 "<emphasis role=\"bold\">+ use non-free video drivers (slower to boot)</"
 "emphasis>"
@@ -678,32 +682,32 @@ msgstr ""
 "emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:89
+#: en/bootLive.xml:62
 msgid "Boot the Mageia Live system using non-free video drivers"
 msgstr "Arranca el sistema Mageia Live usando controladores de video no libres"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:96 en/bootLive.xml:155 en/installer.xml:109
+#: en/bootLive.xml:68 en/bootLive.xml:112 en/installer.xml:111
 msgid "<emphasis role=\"bold\">Install Mageia</emphasis>"
 msgstr "<emphasis role=\"bold\">Instalar Mageia</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:98 en/bootLive.xml:157
+#: en/bootLive.xml:69 en/bootLive.xml:113
 msgid "This option will install Mageia to a hard disk."
 msgstr "Esta opción instalará Mageia en un disco duro."
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:105
+#: en/bootLive.xml:74
 msgid "Install Mageia using non-free video drivers"
 msgstr "Instalar Mageia usando controladores de vídeo no libres"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:111 en/installer.xml:125
+#: en/bootLive.xml:79 en/installer.xml:127
 msgid "<emphasis role=\"bold\">Memory Test</emphasis>"
 msgstr "<emphasis role=\"bold\">Test de memoria</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:113 en/installer.xml:127
+#: en/bootLive.xml:80 en/installer.xml:129
 msgid ""
 "Test the installed RAM by performing multiple read and write operations. "
 "Reboot to end the test."
@@ -712,12 +716,12 @@ msgstr ""
 "lectura y escritura. Reinicia para terminar la comprobación."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:118 en/bootLive.xml:161
+#: en/bootLive.xml:84 en/bootLive.xml:116
 msgid "<emphasis role=\"bold\"> F2 Language</emphasis>"
 msgstr "<emphasis role=\"bold\"> F2 Idioma</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:120 en/bootLive.xml:163
+#: en/bootLive.xml:85 en/bootLive.xml:117
 msgid ""
 "Press <keycap>F2</keycap> to have the installer use a specific language "
 "during the installation. Use the arrow keys to select the language then "
@@ -728,26 +732,27 @@ msgstr ""
 "y luego presione <keycap>Enter</keycap>."
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:129
+#: en/bootLive.xml:93
 msgid "In UEFI mode"
 msgstr "En modo UEFI"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:133
+#: en/bootLive.xml:96
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:139
+#: en/bootLive.xml:100
 msgid "First screen while booting in UEFI mode"
 msgstr "Primera pantalla al arrancar en modo UEFI"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:149
+#: en/bootLive.xml:107
 msgid ""
 "This option will boot the Mageia Live system from the connected DVD/USB "
 "media (expect a very slow system compared to an installed OS).  Once the "
@@ -758,7 +763,7 @@ msgstr ""
 "instalado). Una vez hecho el arranque, puede proceder a la instalación."
 
 #. type: Content of: <section><section><note><para>
-#: en/bootLive.xml:170
+#: en/bootLive.xml:123
 msgid ""
 "If you booted from a USB stick, you will see the above menu options "
 "duplicated, and in this case, you should choose from the menu pair that will "
@@ -1030,12 +1035,12 @@ msgstr ""
 "están ajustados bien a la hora local bien a UTC/GMT."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:24
+#: en/configureX_card_list.xml:27
 msgid "Choose an X Server (Configure your Graphic Card)"
 msgstr "Escoja un servidor X (Configurando su tarjeta gráfica)"
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_card_list.xml:29
+#: en/configureX_card_list.xml:32
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_card_list."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_card_list-im1\"/> </"
@@ -1046,7 +1051,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:35
+#: en/configureX_card_list.xml:38
 msgid ""
 "DrakX has a very comprehensive database of video cards and will usually "
 "correctly identify your video device."
@@ -1055,7 +1060,7 @@ msgstr ""
 "usualmente puede identificar su tarjeta correctamente."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:38
+#: en/configureX_card_list.xml:41
 msgid ""
 "If the installer has not correctly detected your graphic card and you know "
 "which one you have, you can select it from the tree by:"
@@ -1064,22 +1069,22 @@ msgstr ""
 "sabe cuál es, puede escogerla del árbol:"
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_card_list.xml:41 en/configureX_monitor.xml:74
+#: en/configureX_card_list.xml:44 en/configureX_monitor.xml:78
 msgid "Vendor"
 msgstr "Fabricante"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:45
+#: en/configureX_card_list.xml:48
 msgid "then the make of your card"
 msgstr "entonces la marca de su tarjeta"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:49
+#: en/configureX_card_list.xml:52
 msgid "and the model of card"
 msgstr "y el modelo de su tarjeta"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:53
+#: en/configureX_card_list.xml:56
 msgid ""
 "If you cannot find your card in the vendor lists (because it's not yet in "
 "the database or it's an older card) you may find a suitable driver in the "
@@ -1097,7 +1102,7 @@ msgstr ""
 "proporciona capacidades básicas."
 
 #. type: Content of: <section><caution><para>
-#: en/configureX_card_list.xml:61
+#: en/configureX_card_list.xml:64
 msgid ""
 "Be aware that if you select an incompatible driver you may only have access "
 "to the <emphasis>Command Line Interface</emphasis>"
@@ -1106,7 +1111,7 @@ msgstr ""
 "que solo tenga acceso a la <emphasis>Interfaz de línea de comandos</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:65
+#: en/configureX_card_list.xml:68
 msgid ""
 "Some video card manufacturers provide proprietary drivers for Linux which "
 "may only be available in the <emphasis>Nonfree</emphasis> repository and in "
@@ -1123,17 +1128,13 @@ msgstr ""
 "anteriormente, debe hacer esto después de su primer reinicio."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:11
-msgid "Graphic Card and Monitor Configuration"
+#: en/configureX_chooser.xml:23
+#, fuzzy
+msgid "Graphics Card and Monitor Configuration"
 msgstr "Configuración de la tarjeta gráfica y del monitor"
 
-#.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
-#. 2018/02/15 apb: Some text and typography.
-#. 2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.
-#. 2018/02/23 apb: Typo.
-#. 2019/01/06 apb: Slight reword, split 1st para in two.
 #. type: Content of: <section><mediaobject>
-#: en/configureX_chooser.xml:26
+#: en/configureX_chooser.xml:28
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_chooser."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_chooser-im1\"/> </"
@@ -1144,7 +1145,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:32
+#: en/configureX_chooser.xml:34
 msgid ""
 "No matter which graphical environment (also known as desktop environment) "
 "you chose for this install of Mageia, they are all based on a graphical user "
@@ -1161,7 +1162,7 @@ msgstr ""
 "<quote>X</quote> deben ser correctos."
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:39
+#: en/configureX_chooser.xml:41
 msgid ""
 "Choose the appropriate settings manually if you think the details are "
 "incorrect, or if none are shown."
@@ -1170,12 +1171,13 @@ msgstr ""
 "incorrectos o si no se muestra ninguno."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:44
-msgid "<emphasis role=\"bold\">Graphic Card</emphasis>"
+#: en/configureX_chooser.xml:46
+#, fuzzy
+msgid "<emphasis role=\"bold\">Graphics Card</emphasis>"
 msgstr "<emphasis role=\"bold\">Tarjeta gráfica</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:47
+#: en/configureX_chooser.xml:49
 msgid ""
 "If you need to, you can select a specific card from this expandable list. "
 "See <xref linkend=\"configureX_card_list\"/>."
@@ -1184,12 +1186,12 @@ msgstr ""
 "expandible. Ver <xref linkend=\"configureX_card_list\"/>."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:52
+#: en/configureX_chooser.xml:54
 msgid "<emphasis role=\"bold\">Monitor</emphasis>"
 msgstr "<emphasis role=\"bold\">Monitor</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:55
+#: en/configureX_chooser.xml:57
 msgid ""
 "You can choose Plug 'n Play, if applicable, or choose your monitor from the "
 "<emphasis>Vendor</emphasis> or <emphasis>Generic</emphasis> lists. Choose "
@@ -1204,24 +1206,24 @@ msgstr ""
 "linkend=\"configureX_monitor\"/>."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:63
+#: en/configureX_chooser.xml:65
 msgid "<emphasis role=\"bold\">Resolution</emphasis>"
 msgstr "<emphasis role=\"bold\">Resolución</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:66
+#: en/configureX_chooser.xml:68
 msgid "The resolution and color depth of your monitor can be set here."
 msgstr ""
 "La resolución y la profundidad de color de su monitor se pueden configurar "
 "aquí."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:71
+#: en/configureX_chooser.xml:73
 msgid "<emphasis role=\"bold\">Test</emphasis>"
 msgstr "<emphasis role=\"bold\">Test</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:74
+#: en/configureX_chooser.xml:76
 msgid ""
 "The test button does not always appear during install. If the option is "
 "there, and you test your settings, you should be asked to confirm that your "
@@ -1240,17 +1242,17 @@ msgstr ""
 "la configuración esté en el lado seguro."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:85
+#: en/configureX_chooser.xml:87
 msgid "<emphasis role=\"bold\">Options</emphasis>"
 msgstr "<emphasis role=\"bold\">Opciones</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:88
+#: en/configureX_chooser.xml:90
 msgid "Here you can choose to enable or disable various options."
 msgstr "Aquí puede elegir habilitar o deshabilitar varias opciones."
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_chooser.xml:93
+#: en/configureX_chooser.xml:95
 msgid ""
 "There is a risk of damaging a monitor if you choose refresh rates that are "
 "outside the frequency range of that monitor. This applies to older CRT "
@@ -1263,12 +1265,12 @@ msgstr ""
 "compatible y normalmente entrarán en el modo de espera."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_monitor.xml:22
+#: en/configureX_monitor.xml:26
 msgid "Choosing your Monitor"
 msgstr "Escogiendo su monitor"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:25
+#: en/configureX_monitor.xml:29
 msgid ""
 "DrakX has a very comprehensive database of monitors and will usually "
 "correctly identify yours."
@@ -1277,7 +1279,7 @@ msgstr ""
 "identificar su monitor correctamente."
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:30
+#: en/configureX_monitor.xml:34
 msgid ""
 "<emphasis role=\"bold\">Selecting a monitor with different characteristics "
 "could damage your monitor or video hardware. Please don't try something "
@@ -1290,7 +1292,7 @@ msgstr ""
 "debe consultar la documentación de su monitor."
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:38
+#: en/configureX_monitor.xml:42
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
@@ -1301,12 +1303,12 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:46
+#: en/configureX_monitor.xml:50
 msgid "Custom"
 msgstr "Personalizada"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:49
+#: en/configureX_monitor.xml:53
 msgid ""
 "This option allows you to set two critical parameters: the vertical refresh "
 "rate and the horizontal sync rate. Vertical refresh determines how often the "
@@ -1320,7 +1322,7 @@ msgstr ""
 "líneas de escaneo."
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:55
+#: en/configureX_monitor.xml:59
 msgid ""
 "It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor "
 "type with a sync range that is beyond the capabilities of your monitor: you "
@@ -1333,12 +1335,12 @@ msgstr ""
 "consulte la documentacion de su monitor."
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:64
+#: en/configureX_monitor.xml:68
 msgid "Plug'n Play"
 msgstr "Plug'n Play"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:67
+#: en/configureX_monitor.xml:71
 msgid ""
 "This is the default option and automatically tries to determine the monitor "
 "type from the monitor database."
@@ -1347,37 +1349,39 @@ msgstr ""
 "tipo de monitor a partir de la base de datos de monitores."
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:77
+#: en/configureX_monitor.xml:81
+#, fuzzy
 msgid ""
 "If the installer has not correctly detected your monitor and you know which "
-"one you have, you can select it from the tree by selecting:"
+"one you have, you can choose it from the options by selecting:"
 msgstr ""
 "Si el instalador no pudo identificar su monitor correctamente y usted sabe "
 "cuál es, lo puede escoger del árbol:"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:86
+#: en/configureX_monitor.xml:90
 msgid "Manufacturer"
 msgstr "Fabricante"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:90
+#: en/configureX_monitor.xml:94
 msgid "Monitor model"
 msgstr "Modelo de monitor"
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:96
+#: en/configureX_monitor.xml:100
 msgid "Generic"
 msgstr "Genérico"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:99
+#: en/configureX_monitor.xml:103
+#, fuzzy
 msgid ""
-"Selecting this group will list nearly 30 display configurations such as "
-"1024x768 @ 60Hz and includes flat-panel displays as used in laptops. This is "
-"often a good monitor selection group if you need to use the VESA card driver "
-"when your video hardware cannot be determined automatically.  Once again it "
-"may be wise to be conservative in your selections."
+"Selecting this group will list approximately 30 display configurations such "
+"as 1024x768 @ 60Hz and includes flat-panel displays as used in laptops.  "
+"This is often a good monitor selection group if you need to use the VESA "
+"card driver when your video hardware cannot be determined automatically. "
+"Once again, it may be wise to be conservative in your selections."
 msgstr ""
 "Al seleccionar este grupo, se mostrarán cerca de 30 configuraciones de "
 "pantalla, como 1024x768 @ 60Hz, e incluye pantallas de panel plano como las "
@@ -1387,12 +1391,12 @@ msgstr ""
 "más, puede ser buena idea ser conservador en sus selecciones."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:22
+#: en/diskdrake.xml:24
 msgid "Custom Disk Partitioning with DiskDrake"
 msgstr "Partición de disco personalizada con DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:27
+#: en/diskdrake.xml:29
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-diskdrake.png\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1403,7 +1407,7 @@ msgstr ""
 "<imagedata align=\"center\" fileref=\"live-diskdrake.png\"/> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:38
+#: en/diskdrake.xml:40
 msgid ""
 "Modify the layout of your disk(s) here. You can remove or create partitions, "
 "change the filesystem or size of a partition and even view their details "
@@ -1414,11 +1418,12 @@ msgstr ""
 "incluso ver sus detalles antes de comenzar."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:47
+#, fuzzy
 msgid ""
 "There is a tab at the top for every detected hard disk (or other storage "
-"device, like a USB key). In the screenshot above there are two available "
-"devices: <filename>sda </filename>and <filename>sdb</filename>."
+"device, like a USB key), for example: <filename>sda</filename>, "
+"<filename>sdb</filename>, <filename>sdc</filename> etc."
 msgstr ""
 "Hay una pestaña en la parte superior de cada disco duro detectado (u otro "
 "dispositivo de almacenamiento, como un pendrive USB). En la captura de "
@@ -1426,7 +1431,7 @@ msgstr ""
 "filename>y <filename>sdb</filename>."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:52
+#: en/diskdrake.xml:54
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it. "
@@ -1440,7 +1445,7 @@ msgstr ""
 "partición."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:60
+#: en/diskdrake.xml:62
 msgid ""
 "Continue until you have adjusted everything to your satisfaction, then click "
 "<emphasis>Done</emphasis> when you're ready."
@@ -1449,7 +1454,7 @@ msgstr ""
 "<emphasis>Hecho</emphasis> cuando esté preparado."
 
 #. type: Content of: <section><warning><orderedlist><listitem><para>
-#: en/diskdrake.xml:69
+#: en/diskdrake.xml:71
 msgid ""
 "Take care with the <emphasis>Clear all</emphasis> option, use it only if you "
 "are sure you want to wipe all partitions on the selected storage device."
@@ -1459,7 +1464,7 @@ msgstr ""
 "de almacenamiento seleccionado."
 
 #. type: Content of: <section><warning><orderedlist><listitem><para>
-#: en/diskdrake.xml:75
+#: en/diskdrake.xml:77
 msgid ""
 "If you wish to use encryption on your <filename>/</filename> partition you "
 "must ensure that you have a separate <filename>/boot</filename> partition. "
@@ -1472,7 +1477,7 @@ msgstr ""
 "configurarse, o de lo contrario su sistema no podrá arrancar."
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/diskdrake.xml:87
+#: en/diskdrake.xml:89
 msgid ""
 "If you are installing Mageia on a UEFI system, check that an ESP (EFI System "
 "Partition) is present and correctly mounted on <filename>/boot/EFI</"
@@ -1483,7 +1488,7 @@ msgstr ""
 "boot/EFI</filename>. Vea la Figura 1 a continuación."
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/diskdrake.xml:93
+#: en/diskdrake.xml:95
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
 "partition is present and of the correct type. See Figure 2 below."
@@ -1493,12 +1498,12 @@ msgstr ""
 "continuación."
 
 #. type: Content of: <section><figure><title>
-#: en/diskdrake.xml:101
+#: en/diskdrake.xml:103
 msgid "EFI System Partition"
 msgstr "Partición de Sistema EFI"
 
 #. type: Content of: <section><figure><mediaobject>
-#: en/diskdrake.xml:104
+#: en/diskdrake.xml:106
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-diskdrake2.png\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1509,17 +1514,17 @@ msgstr ""
 "<imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/> </imageobject>"
 
 #. type: Content of: <section><figure>
-#: en/diskdrake.xml:103 en/diskdrake.xml:117
+#: en/diskdrake.xml:105 en/diskdrake.xml:119
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><figure><title>
-#: en/diskdrake.xml:115
+#: en/diskdrake.xml:117
 msgid "BIOS boot partition"
 msgstr "Partición de arranque BIOS"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:118 en/doPartitionDisks.xml:201
+#: en/diskdrake.xml:120 en/doPartitionDisks.xml:206
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1542,12 +1547,12 @@ msgid "Partitioning"
 msgstr "Particionando"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:31
 msgid "Suggested Partitioning"
 msgstr "Particionamiento Sugerido"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:34
 msgid ""
 "In this screen you can see the content of your hard drive(s) along with the "
 "DrakX partitioning proposals for where to install Mageia."
@@ -1556,7 +1561,7 @@ msgstr ""
 "las propuestas de partición de DrakX sobre dónde instalar Mageia."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:34
+#: en/doPartitionDisks.xml:38
 msgid ""
 "The actual options available from those shown below will vary according to "
 "the layout and content of your particular hard drive(s)."
@@ -1566,7 +1571,7 @@ msgstr ""
 "particulares."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:39
+#: en/doPartitionDisks.xml:43
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1579,17 +1584,17 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><itemizedlist><title>
-#: en/doPartitionDisks.xml:49
+#: en/doPartitionDisks.xml:53
 msgid "Main Options"
 msgstr "Opciones principales"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:56
 msgid "<emphasis role=\"bold\">Use Existing Partitions</emphasis>"
 msgstr "<emphasis role=\"bold\">Usar particiones existentes</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:59
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1598,12 +1603,12 @@ msgstr ""
 "compatibles con Linux que pueden ser usadas para la instalación."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:61
+#: en/doPartitionDisks.xml:65
 msgid "<emphasis role=\"bold\">Use Free Space</emphasis>"
 msgstr "<emphasis role=\"bold\">Usar espacio libre</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:68
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1612,7 +1617,7 @@ msgstr ""
 "nueva instalación de Mageia."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:70
+#: en/doPartitionDisks.xml:74
 msgid ""
 "<emphasis role=\"bold\">Use Free Space on a Windows Partition</emphasis>"
 msgstr ""
@@ -1620,12 +1625,12 @@ msgstr ""
 "emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:73
+#: en/doPartitionDisks.xml:77
+#, fuzzy
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it. 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 important files!"
+"installation but see the warning below."
 msgstr ""
 "Si tiene espacio no utilizado en una partición de Windows existente, el "
 "instalador puede ofrecerle usarlo. Esta puede ser una forma útil de hacer "
@@ -1633,14 +1638,28 @@ msgstr ""
 "arriesgada, por lo que debe asegurarse de haber hecho una copia de seguridad "
 "de todos los archivos importantes."
 
+#. type: Content of: <section><itemizedlist><listitem><para><mediaobject>
+#: en/doPartitionDisks.xml:87
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:79
+#: en/doPartitionDisks.xml:82
+#, fuzzy
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
 "light blue and the proposed Mageia partition in dark blue with their "
 "intended sizes just underneath. You have the option to modify these sizes by "
 "clicking and dragging the gap between both partitions.  See the following "
-"screenshot:"
+"screenshot:<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr ""
 "Con esta opción, el instalador muestra la partición restante de Windows en "
 "azul claro y la partición propuesta de Mageia en azul oscuro con sus tamaños "
@@ -1648,36 +1667,22 @@ msgstr ""
 "clic y arrastrando el espacio entre ambas particiones. Vea la siguiente "
 "captura de pantalla:"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:87
-msgid "<emphasis role=\"bold\">Erase and use Entire Disk</emphasis>"
-msgstr "<emphasis role=\"bold\">Borrar y usar el disco entero</emphasis>"
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:90
-msgid "This option will allocate the entire drive for Mageia"
-msgstr "Esta opción asignará todo el disco para Mageia."
-
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:97
 msgid ""
-"This will erase ALL data on the selected hard drive. Take care! 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 this option."
+"This involves shrinking the size of the Windows partition, and therefore is "
+"a risky operation, so you should make sure you have backed up all important "
+"files before proceeding."
 msgstr ""
-"Esto borrará TODOS los datos en el disco duro seleccionado. ¡Tenga cuidado! "
-"Si pretende usar parte del disco para otra cosa, o ya tiene datos en la "
-"unidad que no puede perder, no use esta opción."
 
 #. type: Content of: <section><itemizedlist><listitem><important><para>
-#: en/doPartitionDisks.xml:101
+#: en/doPartitionDisks.xml:103
+#, fuzzy
 msgid ""
-"Note that this involves shrinking the size of the Windows partition. The "
-"partition must be \"clean\", meaning that Windows must have closed down "
+"The partition must be \"clean\", meaning that Windows must have closed down "
 "correctly the last time it was used. It must also have been defragmented, "
 "although this is not a guarantee that all files in the partition have been "
-"moved out of the area that is about to be used. It is highly recommended to "
-"back up your personal files."
+"moved out of the area that is about to be used for Mageia."
 msgstr ""
 "Sea consciente de que esta operación implica una reducción del tamaño de la "
 "partición de Windows. Esta partición debe de estar \"limpia\", es decir, "
@@ -1689,11 +1694,32 @@ msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/doPartitionDisks.xml:112
+msgid "<emphasis role=\"bold\">Erase and use Entire Disk</emphasis>"
+msgstr "<emphasis role=\"bold\">Borrar y usar el disco entero</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:115
+msgid "This option will allocate the entire drive for Mageia"
+msgstr "Esta opción asignará todo el disco para Mageia."
+
+#. type: Content of: <section><itemizedlist><listitem><warning><para>
+#: en/doPartitionDisks.xml:119
+msgid ""
+"This will erase ALL data on the selected hard drive. Take care! 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 this option."
+msgstr ""
+"Esto borrará TODOS los datos en el disco duro seleccionado. ¡Tenga cuidado! "
+"Si pretende usar parte del disco para otra cosa, o ya tiene datos en la "
+"unidad que no puede perder, no use esta opción."
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:127
 msgid "<emphasis role=\"bold\">Custom Disk Partitioning</emphasis>"
 msgstr "<emphasis role=\"bold\">Partición de disco personalizada</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:115
+#: en/doPartitionDisks.xml:130
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1701,21 +1727,8 @@ msgstr ""
 "Esta opción le ofrece el control completo sobre donde colocar su instalación "
 "en su(s)  disco(s) duro(s)."
 
-#. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:122
-msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
-
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:131
+#: en/doPartitionDisks.xml:136
 msgid ""
 "If you are not using the <emphasis>Custom disk partitioning</emphasis> "
 "option, then the installer will allocate the available space according to "
@@ -1726,7 +1739,7 @@ msgstr ""
 "con las siguientes reglas:"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:137
+#: en/doPartitionDisks.xml:142
 msgid ""
 "If the total available space is less than 50 GB, then only one partition is "
 "created. This will be the <filename>/</filename> (root)  partition."
@@ -1735,7 +1748,7 @@ msgstr ""
 "partición. Esta será la partición root<filename>/</filename>."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:143
+#: en/doPartitionDisks.xml:148
 msgid ""
 "If the total available space is greater than 50 GB, then three partitions "
 "are created"
@@ -1743,7 +1756,7 @@ msgstr ""
 "Si el espacio total disponible es superior a 50 GB, se crean tres particiones"
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:148
+#: en/doPartitionDisks.xml:153
 msgid ""
 "6/19 of the total available place is allocated to <filename>/</filename> "
 "with a maximum of 50 GB"
@@ -1752,17 +1765,17 @@ msgstr ""
 "un máximo de 50 GB"
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:153
+#: en/doPartitionDisks.xml:158
 msgid "1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB"
 msgstr "1/19 se asigna a <filename>swap</filename> con un máximo de 4 GB"
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:158
+#: en/doPartitionDisks.xml:163
 msgid "the rest (at least 12/19) is allocated to <filename>/home</filename>"
 msgstr "el resto (al menos 12/19) se asigna a <filename>/home</filename>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:165
+#: en/doPartitionDisks.xml:170
 msgid ""
 "This means that from 160 GB or greater available space, the installer will "
 "create three partitions:"
@@ -1771,22 +1784,22 @@ msgstr ""
 "creará tres particiones:"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:170
+#: en/doPartitionDisks.xml:175
 msgid "50 GB for <filename>/</filename>"
 msgstr "50 GB para <filename>/</filename>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:174
+#: en/doPartitionDisks.xml:179
 msgid "4 GB for <filename>swap</filename>"
 msgstr "4 GB para <filename>swap</filename>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:178
+#: en/doPartitionDisks.xml:183
 msgid "and the remainder for <filename>/home</filename>"
 msgstr "y el resto para <filename>/home</filename>"
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:183
+#: en/doPartitionDisks.xml:188
 msgid ""
 "If you are using a UEFI system, the ESP (EFI System Partition) will be "
 "automatically detected - or created if it does not exist yet - and mounted "
@@ -1801,7 +1814,7 @@ msgstr ""
 "realizado correctamente."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:189
+#: en/doPartitionDisks.xml:194
 msgid ""
 "If you are using a Legacy (also known as BIOS) system with a GPT partitioned "
 "disk, you need to create a BIOS boot partition if it doesn't already exist. "
@@ -1819,23 +1832,28 @@ msgstr ""
 "archivos."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:196
+#: en/doPartitionDisks.xml:201
 msgid "See <xref linkend=\"diskdrake\"/> for information on how to proceed."
 msgstr ""
 "Vea <xref linkend=\"diskdrake\"/> para obtener información sobre cómo "
 "proceder."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:211
+#: en/doPartitionDisks.xml:216
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4.png"
-"\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks4.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks4.png\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4.png"
-"\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:217
+#: en/doPartitionDisks.xml:226
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
 "previous standard of 512. Due to lack of available hardware, the "
@@ -1848,7 +1866,7 @@ msgstr ""
 "probado con dicha unidad."
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:222
+#: en/doPartitionDisks.xml:231
 msgid ""
 "Some SSD devices now use an erase block size over 1 MB. If you have such a "
 "device we suggest that you partition the drive in advance, using an "
@@ -1861,17 +1879,17 @@ msgstr ""
 "partición alternativa como gparted, y use la siguiente configuración:"
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:229
+#: en/doPartitionDisks.xml:238
 msgid "<emphasis>Align to</emphasis> = MiB"
 msgstr "<emphasis>Aliner a</emphasis> = MiB"
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:233
+#: en/doPartitionDisks.xml:242
 msgid "<emphasis>Free space preceding (MiB)</emphasis> = 2"
 msgstr "<emphasis>Espacio libre precedente (MiB)</emphasis> = 2"
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:237
+#: en/doPartitionDisks.xml:246
 msgid ""
 "Also make sure all partitions are created using an even number of megabytes."
 msgstr ""
@@ -2055,12 +2073,12 @@ msgstr ""
 "link> Si tienes alguna duda o quiere contribuir con Mageia."
 
 #. type: Content of: <section><info><title>
-#: en/firewall.xml:7
+#: en/firewall.xml:16
 msgid "Firewall"
 msgstr "Cortafuegos"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:10
+#: en/firewall.xml:19
 msgid ""
 "This section allows you to configure some simple firewall rules: they "
 "determine which type of message from the Internet will be accepted by the "
@@ -2072,8 +2090,18 @@ msgstr ""
 "destino. Esto, a su vez, permite que los servicios correspondientes en el "
 "sistema sean accesibles desde Internet."
 
+#. type: Content of: <section><mediaobject>
+#: en/firewall.xml:26
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-firewall.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome.png\"/> </"
+"imageobject>"
+
 #. type: Content of: <section><para>
-#: en/firewall.xml:16
+#: en/firewall.xml:31
 msgid ""
 "In the default setting (no button is checked), no service of the system is "
 "accessible from the network. The <emphasis>Everything (no firewall)</"
@@ -2094,7 +2122,7 @@ msgstr ""
 "reglas de firewall para pruebas y depuración."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:25
+#: en/firewall.xml:40
 msgid ""
 "All other options are more or less self-explanatory. As an example, you will "
 "enable the CUPS server if you want printers on your machine to be accessible "
@@ -2105,12 +2133,12 @@ msgstr ""
 "accesibles desde la red."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:29
+#: en/firewall.xml:44
 msgid "<emphasis role=\"bold\">Advanced</emphasis>"
 msgstr "<emphasis role=\"bold\">Avanzado</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:31
+#: en/firewall.xml:46
 msgid ""
 "The <emphasis>Advanced</emphasis> option opens a window where you can enable "
 "a series of services by typing a list of <quote>couples</quote> (blank "
@@ -2121,32 +2149,36 @@ msgstr ""
 "quote> (separados por espacios en blaco)"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:35
-msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
+#: en/firewall.xml:50
+#, fuzzy
+msgid "<emphasis>&lt;port-number&gt;/&lt;protocol&gt;</emphasis>"
 msgstr "<emphasis>&lt;port-number>/&lt;protocolo></emphasis>"
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:38
+#: en/firewall.xml:53
+#, fuzzy
 msgid ""
-"- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
-"the service you want to enable (e.g. 873 for the RSYNC service) as defined "
-"in <emphasis>RFC-433</emphasis>;"
+"- <emphasis>&lt;port-number&gt;</emphasis> is the value of the port assigned "
+"to the service you want to enable (e.g. 873 for the RSYNC service) as "
+"defined in <emphasis>RFC-433</emphasis>;"
 msgstr ""
 "- <emphasis>&lt;port-number></emphasis> es el valor del puerto asignado al "
 "servicio que quiere activar (por ejemplo, 873 para el servicio RSYNC) "
 "definido como <emphasis>RFC-433</emphasis>;"
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:42
+#: en/firewall.xml:57
+#, fuzzy
 msgid ""
-"- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
-"<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
+"- <emphasis>&lt;protocol&gt;</emphasis> is one of <emphasis>TCP</emphasis> "
+"or <emphasis>UDP</emphasis> - the internet protocol that is used by the "
+"service."
 msgstr ""
 "- <emphasis>&lt;protocolo></emphasis> es uno de <emphasis>TCP</emphasis> o "
 "<emphasis>UDP</emphasis> - el protocolo de internet que usa el servicio."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:47
+#: en/firewall.xml:62
 msgid ""
 "For instance, the entry for enabling access to the RSYNC service therefore "
 "is <emphasis>873/tcp</emphasis>."
@@ -2155,7 +2187,7 @@ msgstr ""
 "tanto <emphasis>873/tcp</emphasis>."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:50
+#: en/firewall.xml:65
 msgid ""
 "In case a service is implemented to use both protocols, you specify 2 "
 "couples for the same port."
@@ -2242,12 +2274,12 @@ msgid "Graphical Configuration"
 msgstr "Configuración gráfica"
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:32
+#: en/installer.xml:34
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, el instalador de Mageia"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:35
+#: en/installer.xml:37
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -2258,12 +2290,12 @@ msgstr ""
 "posible."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:40
+#: en/installer.xml:42
 msgid "The installation steps"
 msgstr "Los pasos de la instalación"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:44
+#: en/installer.xml:46
 msgid ""
 "The install process is divided into a number of steps - the status of which "
 "is indicated in a panel to the left of the screen."
@@ -2272,7 +2304,7 @@ msgstr ""
 "indica en un panel a la izquierda de la pantalla."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:50
+#: en/installer.xml:52
 msgid ""
 "Each step has one or more screens, which may also have <emphasis>Advanced</"
 "emphasis> sections with extra, less commonly required options."
@@ -2282,7 +2314,7 @@ msgstr ""
 "requeridas."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:56
+#: en/installer.xml:58
 msgid ""
 "Most screens have <emphasis>Help</emphasis> buttons for further details "
 "about the particular step."
@@ -2291,7 +2323,7 @@ msgstr ""
 "más detalles sobre el paso en particular."
 
 #. type: Content of: <section><section><caution><para>
-#: en/installer.xml:62
+#: en/installer.xml:64
 msgid ""
 "If at some point during the install you decide to abort the installation, it "
 "is possible to reboot, but please think twice before you do this. Once a "
@@ -2306,7 +2338,7 @@ msgstr ""
 "encontrarse con un sistema inutilizable."
 
 #. type: Content of: <section><section><caution><para>
-#: en/installer.xml:68
+#: en/installer.xml:70
 msgid ""
 "If, in spite of this, you are very sure rebooting is what you want, go to a "
 "text terminal by pressing the keys <keycombo> <keycap>Ctrl</keycap> "
@@ -2321,12 +2353,12 @@ msgstr ""
 "<keycap>Delete</keycap> </keycombo> a la vez para reiniciar."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:86
+#: en/installer.xml:88
 msgid "Installation Welcome Screen"
 msgstr "Pantalla de bienvenida del Instalador"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:88
+#: en/installer.xml:90
 msgid ""
 "The particular screen that you will first see when booting from the "
 "Installation media will depend on whether your computer motherboard is of "
@@ -2337,7 +2369,7 @@ msgstr ""
 "tipo Legacy (BIOS) o UEFI."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:92
+#: en/installer.xml:94
 msgid ""
 "The welcome menu screen has various options, however the default option will "
 "start the installer, and is normally all that you will need."
@@ -2347,12 +2379,12 @@ msgstr ""
 "necesitará."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:97
+#: en/installer.xml:99
 msgid "Legacy (BIOS) Systems"
 msgstr "Sistemas Legacy (BIOS)"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:100
+#: en/installer.xml:102
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome.png\"/> </"
 "imageobject>"
@@ -2361,7 +2393,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:111
+#: en/installer.xml:113
 msgid ""
 "Install Mageia to a hard disk. This is the default option, and will "
 "automatically start after a short while unless another option is selected."
@@ -2371,12 +2403,12 @@ msgstr ""
 "seleccione otra opción."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:117
+#: en/installer.xml:119
 msgid "<emphasis role=\"bold\">Rescue System</emphasis>"
 msgstr "<emphasis role=\"bold\">Sistea de Rescate</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:119
+#: en/installer.xml:121
 msgid ""
 "This option allows you to either re-install the bootloader for an existing "
 "Mageia installation or you can use it to restore a Windows bootloader."
@@ -2386,22 +2418,22 @@ msgstr ""
 "arranque de Windows."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:132
+#: en/installer.xml:134
 msgid "<emphasis role=\"bold\">F2: Language</emphasis>"
 msgstr "<emphasis role=\"bold\">F2: Idioma</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:134
+#: en/installer.xml:136
 msgid "Press F2 for alternative languages."
 msgstr "Pulse F2 para idiomas alternativos."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:140
+#: en/installer.xml:142
 msgid "UEFI Systems"
 msgstr "Sistemas UEFI"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:142
+#: en/installer.xml:144
 msgid ""
 "From this screen, you can access options by pressing <keycap>e</keycap> to "
 "enter the edit mode. To come back to this screen, press <keycap>Esc</keycap> "
@@ -2413,7 +2445,7 @@ msgstr ""
 "para grabar y salir."
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:148
+#: en/installer.xml:150
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome2.png\"/> </"
 "imageobject>"
@@ -2422,13 +2454,13 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:157
+#: en/installer.xml:159
 msgid "<emphasis role=\"bold\">Install:</emphasis> Start the Install process"
 msgstr ""
 "<emphasis role=\"bold\">Instalar:</emphasis> Inicia el proceso de instalación"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:162
+#: en/installer.xml:164
 msgid ""
 "<emphasis role=\"bold\">Rescue:</emphasis> This option allows you to either "
 "re-install the bootloader for an existing Mageia installation or you can use "
@@ -2439,7 +2471,7 @@ msgstr ""
 "puede usarla para restaurar un cargador de arranque de Windows."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:169
+#: en/installer.xml:171
 msgid ""
 "<emphasis role=\"bold\">F2: Language:</emphasis> Press <keycap>F2</keycap> "
 "for alternative languages."
@@ -2448,7 +2480,7 @@ msgstr ""
 "lenguajes alternativos."
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:174
+#: en/installer.xml:176
 msgid ""
 "If you booted from a USB stick, you will see the above options duplicated, "
 "and in this case, you should use the set that will be suffixed with \"USB\"."
@@ -2457,17 +2489,17 @@ msgstr ""
 "en este caso, debe usar el conjunto que tendrá el sufijo \"USB\"."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:181
+#: en/installer.xml:183
 msgid "Installation Problems and Possible Solutions"
 msgstr "Problemas en la Instalación y Posibles Soluciones."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:184
+#: en/installer.xml:186
 msgid "No Graphical Interface"
 msgstr "No hay Interfaz Gráfica"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:188
+#: en/installer.xml:190
 msgid ""
 "After the initial screen you did not progress to the <emphasis>Language "
 "Selection</emphasis> screen. This can happen with some graphic cards and "
@@ -2480,7 +2512,7 @@ msgstr ""
 "escribiendo <command>vgalo</command> en el prompt del sistema."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:195
+#: en/installer.xml:197
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
 "In this case it is worth trying a text-mode installation. To use this press "
@@ -2498,12 +2530,12 @@ msgstr ""
 "modo texto."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:208
+#: en/installer.xml:210
 msgid "The Install Freezes"
 msgstr "La Instalación se congela"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:210
+#: en/installer.xml:212
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic hardware "
@@ -2518,12 +2550,12 @@ msgstr ""
 "combinar con otros parámetros según sea necesario."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:218
+#: en/installer.xml:220
 msgid "RAM problem"
 msgstr "Problema de RAM"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:220
+#: en/installer.xml:222
 msgid ""
 "This will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
@@ -2539,12 +2571,12 @@ msgstr ""
 "256MB de RAM."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:228
+#: en/installer.xml:230
 msgid "Dynamic partitions"
 msgstr "Particiones dinámicas"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:230
+#: en/installer.xml:232
 msgid ""
 "If you converted your hard disk from <literal>Basic</literal> format to "
 "<literal>Dynamic</literal> format in Microsoft Windows, then it is not "
@@ -4548,22 +4580,29 @@ msgstr ""
 "efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link>"
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:27
+#: en/setupBootloader.xml:32
 msgid "Bootloader"
 msgstr "Cargador de arranque"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:31
+#: en/setupBootloader.xml:36
+#, fuzzy
+msgid "Available Bootloaders"
+msgstr "Cargador de arranque"
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:39
 msgid "Grub2"
 msgstr "Grub2"
 
-#. type: Content of: <section><section><itemizedlist><title>
-#: en/setupBootloader.xml:34
-msgid "Grub2 on Legacy MBR/GPT systems"
-msgstr "Grub2 en sistemas MBR / GPT antiguos"
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:42
+#, fuzzy
+msgid "<emphasis role=\"bold\">Grub2 on Legacy MBR/GPT systems</emphasis>"
+msgstr "<emphasis role=\"bold\">Sistea de Rescate</emphasis>"
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:37
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:46
 msgid ""
 "GRUB2 (with or without graphical menu) will be used exclusively as the "
 "bootloader for a Legacy/MBR or Legacy/GPT system."
@@ -4571,8 +4610,8 @@ msgstr ""
 "GRUB2 (con o sin menú gráfico) se utilizará exclusivamente como cargador de "
 "arranque para un sistema Legacy/MBR o Legacy/GPT."
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:42
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:52
 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."
@@ -4581,20 +4620,22 @@ msgstr ""
 "MBR (Registro de arranque maestro) de su primer disco duro o en la partición "
 "de arranque del BIOS."
 
-#. type: Content of: <section><section><itemizedlist><title>
-#: en/setupBootloader.xml:49
-msgid "Grub2-efi on UEFI systems"
-msgstr "Grub2-efi en sistemas UEFI"
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:59
+#, fuzzy
+msgid "<emphasis role=\"bold\">Grub2-efi on UEFI systems</emphasis>"
+msgstr "<emphasis role=\"bold\">Sistea de Rescate</emphasis>"
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:52
-msgid "GRUB2-efi will be used exclusively as the bootloader for a UEFI system."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:63
+#, fuzzy
+msgid "GRUB2-efi or rEFInd may be used as the bootloader for a UEFI system."
 msgstr ""
 "GRUB2-efi se utilizará exclusivamente como cargador de arranque para un "
 "sistema UEFI."
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:57
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:68
 msgid ""
 "By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI "
 "System Partition)."
@@ -4602,12 +4643,13 @@ msgstr ""
 "De forma predeterminada, un nuevo cargador de arranque (Grub2-efi) se "
 "escribirá en el ESP (partición del sistema EFI)."
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:60
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:71
+#, fuzzy
 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 "
-"created by Windows and add grub2-efi to it. If no ESP exists, then one will "
+"created by Windows and add grub2-efi to it.  If no ESP exists, then one will "
 "be created. Although it is possible to have several ESPs, only one is "
 "required, whatever the number of operating systems you have."
 msgstr ""
@@ -4617,18 +4659,46 @@ msgstr ""
 "creará uno. Aunque es posible tener varios ESP, solo se requiere uno, "
 "independientemente del número de sistemas operativos que tenga."
 
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:82
+msgid "rEFInd"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:85
+#, fuzzy
+msgid "<emphasis role=\"bold\">rEFInd on UEFI systems</emphasis>"
+msgstr "<emphasis role=\"bold\">Icono</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:88
+msgid ""
+"rEFInd has a nice graphical set of options, and can auto-detect installed "
+"EFI bootloaders. See: http://www.rodsbooks.com/refind/"
+msgstr ""
+
+#. type: Content of: <section><section><section><note><para>
+#: en/setupBootloader.xml:95
+msgid ""
+"Please note that in order to be able to use the <literal>rEFInd</literal> "
+"option, an installed EFI System Partition must match your system "
+"architecture: if you have a 32bit EFI System Partition installed on a 64bit "
+"machine for instance, then the rEFInd option will not be displayed/available "
+"to you."
+msgstr ""
+
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:72
+#: en/setupBootloader.xml:106
 msgid "Bootloader Setup"
 msgstr "Configuración del cargador de arranque."
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:76
+#: en/setupBootloader.xml:110
 msgid "Bootloader main options"
 msgstr "Opciones principales del cargador de arranque"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:79
+#: en/setupBootloader.xml:113
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader.png\"/> </imageobject> <imageobject condition=\"live"
@@ -4641,37 +4711,58 @@ msgstr ""
 "im1\"/></imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:91
+#: en/setupBootloader.xml:125
 msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
 msgstr "<emphasis role=\"bold\">Cargador de arranque a usar</emphasis>"
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:93
+#. type: Content of: <section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:129
 msgid ""
-"This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI "
-"systems will not see this option here."
+"<guimenuitem>GRUB2</guimenuitem> (with either a graphical or a text menu), "
+"can be chosen for both <literal>Legacy MBR/BIOS</literal> systems and "
+"<literal>UEFI</literal> systems."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:136
+msgid ""
+"<guimenuitem>rEFInd</guimenuitem> (with a graphical menu)  is an alternative "
+"option solely for use with <literal>UEFI</literal> systems."
 msgstr ""
-"Esta función solo está disponible para los sistemas Legacy MBR / BIOS. Los "
-"usuarios de los sistemas UEFI no verán esta opción aquí."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:98
+#: en/setupBootloader.xml:144
 msgid "<emphasis role=\"bold\">Boot device</emphasis>"
 msgstr "<emphasis role=\"bold\">Dispositivo de arranque</emphasis>"
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:100
-msgid "Don't change this unless you really know what you are doing"
+#. type: Content of: <section><section><section><itemizedlist><listitem><warning><para>
+#: en/setupBootloader.xml:147
+#, fuzzy
+msgid "Don't change this unless you really know what you are doing."
 msgstr "No cambie esto a menos que realmente sepa lo que está haciendo."
 
+#. type: Content of: <section><section><section><itemizedlist><listitem><note><para>
+#: en/setupBootloader.xml:152
+msgid ""
+"There is no option to write GRUB to the boot sector of a partition (e.g: "
+"<filename>sda1</filename>), as this method is considered unreliable."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:157
+msgid ""
+"When using UEFI mode, then the <guilabel>Boot device</guilabel> will be "
+"listed as <guimenuitem>EFI System Partition</guimenuitem>."
+msgstr ""
+
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:105
+#: en/setupBootloader.xml:163
 msgid ""
 "<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
 msgstr "1"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:108
+#: en/setupBootloader.xml:166
 msgid ""
 "This text box lets you set a delay, in seconds, before the default operating "
 "system is started up."
@@ -4680,12 +4771,12 @@ msgstr ""
 "que se inicie el sistema operativo predeterminado."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:113
+#: en/setupBootloader.xml:171
 msgid "<emphasis role=\"bold\">Security</emphasis>"
 msgstr "<emphasis role=\"bold\">Seguridad</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:115
+#: en/setupBootloader.xml:173
 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 "
@@ -4701,17 +4792,17 @@ msgstr ""
 "continuación."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:126
+#: en/setupBootloader.xml:184
 msgid "Choose a password for the bootloader (optional)"
 msgstr "Elija una contraseña para el cargador de arranque (opcional)"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:130
+#: en/setupBootloader.xml:188
 msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
 msgstr "<emphasis role=\"bold\">Contraseña (otra vez)</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:132
+#: en/setupBootloader.xml:190
 msgid ""
 "Retype the password and DrakX will check that it matches with the one set "
 "above"
@@ -4720,17 +4811,17 @@ msgstr ""
 "establecida arriba"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:137 en/setupBootloader.xml:212
+#: en/setupBootloader.xml:195 en/setupBootloader.xml:308
 msgid "<emphasis>Advanced</emphasis>"
 msgstr "<emphasis>Avanzado</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:141
+#: en/setupBootloader.xml:199
 msgid "<emphasis>Enable ACPI</emphasis>"
 msgstr "<emphasis>Habilitar ACPI</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:143
+#: en/setupBootloader.xml:201
 msgid ""
 "ACPI (Advanced Configuration and Power Interface) is a standard for power "
 "management. It can save energy by stopping unused devices. Deselecting it "
@@ -4745,12 +4836,12 @@ msgstr ""
 "algunos problemas (por ejemplo, reinicios aleatorios o bloqueos del sistema)."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:152
+#: en/setupBootloader.xml:210
 msgid "<emphasis>Enable SMP</emphasis>"
 msgstr "<emphasis>Activar SMP</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:154
+#: en/setupBootloader.xml:212
 msgid ""
 "This option enables/disables symmetric multiprocessing for multi-core "
 "processors"
@@ -4759,12 +4850,12 @@ msgstr ""
 "procesadores multi-core"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:159
+#: en/setupBootloader.xml:217
 msgid "<emphasis>Enable APIC</emphasis>"
 msgstr "<emphasis>Activar APIC</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:161
+#: en/setupBootloader.xml:219
 msgid ""
 "Enabling this gives the operating system access to the Advanced Programmable "
 "Interrupt Controller. APIC devices permit more complex priority models, and "
@@ -4776,12 +4867,12 @@ msgstr ""
 "interrupción)."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:168
+#: en/setupBootloader.xml:226
 msgid "<emphasis>Enable Local APIC</emphasis>"
 msgstr "<emphasis>Habilitar APIC local</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:170
+#: en/setupBootloader.xml:228
 msgid ""
 "Here you can set Local APIC, which manages all external interrupts for a "
 "specific processor in an SMP system"
@@ -4790,12 +4881,70 @@ msgstr ""
 "externas para un procesador específico en un sistema SMP"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:177
+#: en/setupBootloader.xml:235
 msgid "Bootloader Configuration"
 msgstr "Configuración del cargador de arranque"
 
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:237
+msgid ""
+"If, in the previous section you selected <literal>rEFInd</literal> as the "
+"bootloader to use, you would then be presented with the options shown in the "
+"screenshot directly below. Otherwise, please instead move on to the "
+"subsequent screenshot for your options."
+msgstr ""
+
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:180
+#: en/setupBootloader.xml:243
+#, fuzzy
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"rEFIndLoaderConfig.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-rEFIndLoaderConfig.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:253
+#, fuzzy
+msgid "Your rEFInd configuration options:"
+msgstr "Configurar el sonido"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:256
+msgid ""
+"<guimenuitem>Install or update rEFInd in the EFI system partition.</"
+"guimenuitem>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:261
+msgid ""
+"<guimenuitem>Install in EFI/Boot partition (workaround for some BIOS's).</"
+"guimenuitem>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:264
+msgid ""
+"With some BIOS's, the newly written bootloaser for Mageia at end of the "
+"installation will not be recognized. In that case, you can use this option "
+"as a workaround for the issue."
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:270
+msgid ""
+"If you did not select rEFInd as the bootloader to use in the previous "
+"section, then your bootloader configurations are shown below:"
+msgstr ""
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:275
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -4808,22 +4957,22 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:191
+#: en/setupBootloader.xml:286
 msgid "<emphasis role=\"bold\">Default</emphasis>"
 msgstr "<emphasis role=\"bold\">Por defecto</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:193
+#: en/setupBootloader.xml:288
 msgid "The operating system to be started up by default."
 msgstr "El sistema operativo se inicia de forma predeterminada."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:197
+#: en/setupBootloader.xml:292
 msgid "<emphasis role=\"bold\">Append</emphasis>"
 msgstr "<emphasis role=\"bold\">Adjuntar</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:199
+#: en/setupBootloader.xml:294
 msgid ""
 "This option lets you pass information to the kernel or tell the kernel to "
 "give you more information as it boots."
@@ -4832,23 +4981,24 @@ msgstr ""
 "le brinde más información mientras arranca."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:204
+#: en/setupBootloader.xml:299
 msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
 msgstr "<emphasis role=\"bold\">Sondeo SO distinto</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:206
+#: en/setupBootloader.xml:301
+#, fuzzy
 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, "
-"then untick the Probe Foreign OS option."
+"then untick the <guimenuitem>Probe Foreign OS</guimenuitem> option."
 msgstr ""
 "Si ya tiene otros sistemas operativos instalados, Mageia intenta agregarlos "
 "a su nuevo menú de inicio de Mageia. Si no desea este comportamiento, "
 "desmarque la opción Sondeo OS distinto."
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:215
+#: en/setupBootloader.xml:311
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader4.png\"/> </imageobject> <imageobject condition=\"live"
@@ -4861,12 +5011,12 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:226
+#: en/setupBootloader.xml:322
 msgid "<emphasis>Video mode</emphasis>"
 msgstr "Modo de vídeo"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:228
+#: en/setupBootloader.xml:324
 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 "
@@ -4877,25 +5027,35 @@ msgstr ""
 "le ofrecerán otras opciones de tamaño y profundidad de color."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:234
+#: en/setupBootloader.xml:330
 msgid "<emphasis>Do not touch ESP or MBR</emphasis>"
 msgstr "<emphasis>No toque ni ESP ni MBR</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:236
+#: en/setupBootloader.xml:332
+#, fuzzy
 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 "
-"missing. Click<emphasis> Ok</emphasis> if you are sure you understand the "
-"implications, and wish to proceed."
+"missing. Click <guimenuitem>Ok </guimenuitem>only if you are sure you "
+"understand the implications, and wish to proceed."
 msgstr ""
 "Seleccione esta opción si no desea un arranque de Mageia, pero prefiere "
 "cargarlo desde otro sistema operativo. Recibirá una advertencia de que falta "
 "el cargador de arranque. Haga clic en Aceptar si está seguro de que "
 "comprende las implicaciones y desea continuar."
 
+#. type: Content of: <section><section><section><itemizedlist><listitem><warning><para>
+#: en/setupBootloader.xml:338
+msgid ""
+"Chain-loading via legacy bootloaders (GRUB Legacy and LiLo)  is no longer "
+"supported by Mageia as it is likely to fail when attempting to boot this "
+"resulting installation of Mageia. If you use anything other than GRUB2 or "
+"rEFInd for this purpose, then you do so at your own risk!"
+msgstr ""
+
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:245
+#: en/setupBootloader.xml:348
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png"
 "\"/> </imageobject>"
@@ -4904,17 +5064,17 @@ msgstr ""
 "\"/></imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:253
+#: en/setupBootloader.xml:356
 msgid "Other Options"
 msgstr "Otras opciones"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:256
+#: en/setupBootloader.xml:359
 msgid "Using an existing bootloader"
 msgstr "Usando un cargador de arranque existente"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:258
+#: en/setupBootloader.xml:361
 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 "
@@ -4930,12 +5090,12 @@ msgstr ""
 "Consulte la documentación del sistema operativo correspondiente."
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:267
+#: en/setupBootloader.xml:370
 msgid "Installing Without a Bootloader"
 msgstr "Instalación sin un cargador de arranque"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:269
+#: en/setupBootloader.xml:372
 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 "
@@ -5359,3 +5519,46 @@ msgstr ""
 "El siguiente paso es la copia de archivos al disco duro. Este proceso "
 "debería llevar un poco de tiempo en completarse. Cuando termine, aparecerá "
 "brevemente una pantalla en blanco; esto es normal."
+
+#~ msgid ""
+#~ "Type in the user password. There is a shield at the end of the text box "
+#~ "that indicates the strength of the password. (See also <xref linkend="
+#~ "\"givePassword\"/>)"
+#~ msgstr ""
+#~ "Escriba la contraseña de usuario. Hay un escudo al final del cuadro de "
+#~ "texto que indica la fortaleza de la contraseña. (Ver también <xref "
+#~ "linkend=\"givePassword\"/>)"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> "
+#~ "</imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> "
+#~ "</imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4."
+#~ "png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4."
+#~ "png\"/> </imageobject>"
+
+#~ msgid "Grub2 on Legacy MBR/GPT systems"
+#~ msgstr "Grub2 en sistemas MBR / GPT antiguos"
+
+#~ msgid "Grub2-efi on UEFI systems"
+#~ msgstr "Grub2-efi en sistemas UEFI"
+
+#~ msgid ""
+#~ "This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI "
+#~ "systems will not see this option here."
+#~ msgstr ""
+#~ "Esta función solo está disponible para los sistemas Legacy MBR / BIOS. "
+#~ "Los usuarios de los sistemas UEFI no verán esta opción aquí."
diff --git a/docs/docs/stable/installer/et.po b/docs/docs/stable/installer/et.po
index 3f49efcf..515f70a9 100644
--- a/docs/docs/stable/installer/et.po
+++ b/docs/docs/stable/installer/et.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2019-01-19 21:23+0200\n"
+"POT-Creation-Date: 2019-09-08 15:26+0300\n"
 "PO-Revision-Date: 2019-02-17 19:08+0000\n"
 "Last-Translator: Marek Laane <qiilaq69@gmail.com>\n"
 "Language-Team: Estonian (http://www.transifex.com/MageiaLinux/mageia/"
@@ -176,7 +176,7 @@ msgstr ""
 "sealt üles vajalikud 32-bitised tarkvarapaketid."
 
 #. type: Content of: <section><info><title>
-#: en/addUser.xml:3
+#: en/addUser.xml:9
 msgid "User Management"
 msgstr "Kasutajate haldamine"
 
@@ -186,13 +186,16 @@ msgstr "Kasutajate haldamine"
 #. 2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
 #.   Also changed 'Advanced User Management' to 'User Management (advanced)'.
 #. 2018/02/24 apb: Changed list style.
+#. 2019/08/10 apb: Added missing 'condition' profile for live-user1.png.
+#. 2019/08/11 apb: [1] Reword 1.1 (including Note) [2] Reword 1.2 Password text.
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:12
+#: en/addUser.xml:28
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
-"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
-"\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata format="
-"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-setRootPassword.png\" format=\"PNG\" revision=\"1\" xml:id="
+"\"setRootPassword-im1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-user1.png\" format=\"PNG\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
 "\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -200,20 +203,18 @@ msgstr ""
 "\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:21
+#: en/addUser.xml:40
 msgid "Set Administrator (root)  Password:"
 msgstr "Administraatori (root) parooli määramine"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:24
+#: en/addUser.xml:44
+#, fuzzy
 msgid ""
 "It is advisable for all Mageia installations to set a <literal>superuser</"
 "literal> (Administrator) password, usually called the <emphasis>root </"
-"emphasis>password in Linux. As you type a password into the top box a shield "
-"will change from red-to-yellow-to-green depending on the strength of the "
-"password. A green shield shows you are using a strong password. You need to "
-"repeat the same password in the box underneath, to check that the first "
-"entry was not mistyped."
+"emphasis>password in Linux. You need to repeat the same password in the box "
+"underneath, to check that the first entry was not mistyped."
 msgstr ""
 "Kõigi Mageia paigalduste korral on soovitatav määrata administraatori "
 "(Linuxis kasutatakse selle kohta tavaliselt väljendit <literal>superuser</"
@@ -225,7 +226,15 @@ msgstr ""
 "kirjutatud, neid kahte omavahel võrreldes."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:32
+#: en/addUser.xml:51
+msgid ""
+"As you type a password into the top box a shield will change from red-to-"
+"yellow-to-green depending on the strength of the password. A green shield "
+"shows you are using a strong password."
+msgstr ""
+
+#. type: Content of: <section><section><note><para>
+#: en/addUser.xml:55
 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."
@@ -235,12 +244,12 @@ msgstr ""
 "kui ka väiketähtede) kõrval ka numbreid ja muid märke."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:39
+#: en/addUser.xml:63
 msgid "Enter a user"
 msgstr "Kasutaja lisamine"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:41
+#: en/addUser.xml:66
 msgid ""
 "Add a User here. A regular user has fewer privileges than the "
 "<literal>superuser</literal> (root), but enough to use the Internet, office "
@@ -253,32 +262,32 @@ msgstr ""
 "tavaline kasutaja oma arvutis teeb."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:47
+#: en/addUser.xml:73
 msgid "<emphasis role=\"bold\">Icon</emphasis>"
 msgstr "<emphasis role=\"bold\">Ikoon</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:48
+#: en/addUser.xml:75
 msgid "Click on this button if you want to change the user's icon"
 msgstr "Sellele nupule klõpsates saab muuta kasutaja ikooni."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:52
+#: en/addUser.xml:80
 msgid "<emphasis role=\"bold\">Real Name</emphasis>"
 msgstr "<emphasis role=\"bold\">Pärisnimi</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:53
+#: en/addUser.xml:82
 msgid "Insert the user's real name into this text box"
 msgstr "Siin saab kirja panna kasutaja tegeliku nime."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:56
+#: en/addUser.xml:86
 msgid "<emphasis role=\"bold\">Login Name</emphasis>"
 msgstr "<emphasis role=\"bold\">Kasutajatunnus</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:57
+#: en/addUser.xml:88
 msgid ""
 "Enter the user login name or let DrakX use a version of the user's real "
 "name. <emphasis role=\"bold\">The login name is case-sensitive.</emphasis>"
@@ -288,7 +297,7 @@ msgstr ""
 "emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><caution><simpara>
-#: en/addUser.xml:61
+#: en/addUser.xml:93
 msgid ""
 "The login entered here should be different to any login currently in use for "
 "your <filename>/home</filename> directory. Some user parameters will be "
@@ -302,23 +311,17 @@ msgstr ""
 "näiteks rakendustes Firefox, Thunderbird või KMail ..."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:65 en/setupBootloader.xml:124
+#: en/addUser.xml:102 en/setupBootloader.xml:182
 msgid "<emphasis role=\"bold\">Password</emphasis>"
 msgstr "<emphasis role=\"bold\">Parool</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:66
-msgid ""
-"Type in the user password. There is a shield at the end of the text box that "
-"indicates the strength of the password. (See also <xref linkend="
-"\"givePassword\"/>)"
+#: en/addUser.xml:104
+msgid "Type in the user password (remembering the advice in the Note above)."
 msgstr ""
-"Siin saab kirja panna kasutaja parooli. Tekstikasti lõpus on kilp, mis "
-"näitab parooli tugevust (vt ka <link linkend=\"givePassword\">märkust</"
-"link>)."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:68
+#: en/addUser.xml:107
 msgid ""
 "<emphasis role=\"bold\">Password (again):</emphasis> Retype the user "
 "password. DrakX will check that you have not mistyped the password."
@@ -328,7 +331,7 @@ msgstr ""
 "sellega, mille sisestasite esimesel korral."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:74
+#: en/addUser.xml:114
 msgid ""
 "Any users added while installing Mageia, will have a home directory that is "
 "both read and write protected (umask=0027)"
@@ -337,7 +340,7 @@ msgstr ""
 "lugemis- kui ka kirjutuskaitstud (umask=0027)."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:76
+#: en/addUser.xml:117
 msgid ""
 "You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
@@ -348,17 +351,17 @@ msgstr ""
 "haldamine</emphasis>."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:79
+#: en/addUser.xml:121
 msgid "The access permissions can also be changed after the install."
 msgstr "Ligipääsuõigusi saab mõistagi muuta ka pärast paigaldamist."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:85
+#: en/addUser.xml:128
 msgid "User Management (advanced)"
 msgstr "Põhjalikum kasutajate haldamine"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:87
+#: en/addUser.xml:131
 msgid ""
 "The <emphasis>Advanced</emphasis> option allows you to edit further settings "
 "for the user you are adding."
@@ -367,7 +370,7 @@ msgstr ""
 "muuta lisatava kasutaja mõningaid seadistusi."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:91
+#: en/addUser.xml:136
 msgid ""
 "<emphasis>Shell</emphasis>: This drop-down list allows you to change the "
 "shell available to any user you added in the previous screen. Options are "
@@ -378,7 +381,7 @@ msgstr ""
 "literal>, <literal>Dash</literal> ja <literal>Sh</literal>."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:143
 msgid ""
 "<emphasis>User ID</emphasis>: Here you can set the user ID for any user you "
 "added in the previous screen. If you are unsure what the purpose of this is, "
@@ -389,7 +392,7 @@ msgstr ""
 "siia midagi kirjutage."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:102
+#: en/addUser.xml:149
 msgid ""
 "<emphasis>Group ID</emphasis>: This lets you set the group ID.  Again, if "
 "unsure, leave it blank."
@@ -543,17 +546,17 @@ msgstr ""
 "määrata kindlaks NTP- ehk ajaserveri."
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:23
+#: en/bootLive.xml:10
 msgid "Boot Mageia as Live system"
 msgstr "Mageia laadimine Live-süsteemina"
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:28
+#: en/bootLive.xml:14
 msgid "Booting the medium"
 msgstr "Käivitamine andmekandjalt"
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:31
+#: en/bootLive.xml:16
 msgid ""
 "You can boot directly from a Live DVD or USB. Usually, you just need to plug "
 "the USB device in or place the DVD in the drive and restart the computer."
@@ -563,7 +566,7 @@ msgstr ""
 "taaskäivitada arvuti."
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:35
+#: en/bootLive.xml:19
 msgid ""
 "If the computer does not automatically boot from the USB or DVD you may need "
 "to reconfigure your BIOS Boot Disk priority. Alternatively, you might try "
@@ -576,7 +579,7 @@ msgstr ""
 "arvuti käivitub."
 
 #. type: Content of: <section><section><tip><para>
-#: en/bootLive.xml:41
+#: en/bootLive.xml:24
 msgid ""
 "To access the BIOS or boot menu when the computer is starting, you can try "
 "pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or <keycap>Esc</"
@@ -591,7 +594,7 @@ msgstr ""
 "(üsna tavapärased) on küll ainult osa võimalikest valikutest."
 
 #. type: Content of: <section><section><note><para>
-#: en/bootLive.xml:50
+#: en/bootLive.xml:32
 msgid ""
 "The actual screen that you will first see when booting from the Live media "
 "will depend on whether your computer motherboard is of the Legacy (BIOS) or "
@@ -601,37 +604,38 @@ msgstr ""
 "sellest, kas arvuti emaplaat on pärand- (BIOS) või UEFI süsteemiga."
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:58
+#: en/bootLive.xml:39
 msgid "In BIOS/CSM/Legacy mode"
 msgstr "BIOS-i/CSM-i/Pärandrežiimis"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:62
+#: en/bootLive.xml:42
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"../live-bootCSM.png\" align=\"center\"/> "
+"</imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> </"
+"<imageobject> <imagedata fileref=\"dx2-summaryTop.png\" align=\"center\"/> </"
 "imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:67
+#: en/bootLive.xml:46
 msgid "First screen while booting in BIOS mode"
 msgstr "Esimene ekraan BIOS-i režiimis algkäivitusel"
 
 #. type: Content of: <section><section><section><itemizedlist><title>
-#: en/bootLive.xml:72 en/bootLive.xml:144 en/installer.xml:106
-#: en/installer.xml:154
+#: en/bootLive.xml:50 en/bootLive.xml:104 en/installer.xml:108
+#: en/installer.xml:156
 msgid "Menu"
 msgstr "Menüü"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:75 en/bootLive.xml:147
+#: en/bootLive.xml:52 en/bootLive.xml:106
 msgid "<emphasis role=\"bold\">Boot Mageia</emphasis>"
 msgstr "<emphasis role=\"bold\">Mageia laadimine</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:77
+#: en/bootLive.xml:53
 msgid ""
 "This option will boot the Mageia Live system from the connected DVD/USB "
 "media (expect a very slow system compared to an installed OS)."
@@ -641,12 +645,12 @@ msgstr ""
 "tegutsemine)."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:81
+#: en/bootLive.xml:56
 msgid "Once the boot is done, you can proceed to the installation."
 msgstr "Kui süsteem on laaditud, võite asuda paigaldamise kallale"
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:86 en/bootLive.xml:102
+#: en/bootLive.xml:60 en/bootLive.xml:72
 msgid ""
 "<emphasis role=\"bold\">+ use non-free video drivers (slower to boot)</"
 "emphasis>"
@@ -655,32 +659,32 @@ msgstr ""
 "käivitus)</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:89
+#: en/bootLive.xml:62
 msgid "Boot the Mageia Live system using non-free video drivers"
 msgstr "Mageia Live-süsteemi laadimine mittevabu videodraivereid kasutades"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:96 en/bootLive.xml:155 en/installer.xml:109
+#: en/bootLive.xml:68 en/bootLive.xml:112 en/installer.xml:111
 msgid "<emphasis role=\"bold\">Install Mageia</emphasis>"
 msgstr "<emphasis role=\"bold\">Mageia paigaldamine</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:98 en/bootLive.xml:157
+#: en/bootLive.xml:69 en/bootLive.xml:113
 msgid "This option will install Mageia to a hard disk."
 msgstr "Sel juhul paigaldatakse Mageia kohe kõvakettale."
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:105
+#: en/bootLive.xml:74
 msgid "Install Mageia using non-free video drivers"
 msgstr "Mageia paigaldamine mittevabu videodraivereid kasutades"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:111 en/installer.xml:125
+#: en/bootLive.xml:79 en/installer.xml:127
 msgid "<emphasis role=\"bold\">Memory Test</emphasis>"
 msgstr "<emphasis role=\"bold\">Mälutest</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:113 en/installer.xml:127
+#: en/bootLive.xml:80 en/installer.xml:129
 msgid ""
 "Test the installed RAM by performing multiple read and write operations. "
 "Reboot to end the test."
@@ -689,12 +693,12 @@ msgstr ""
 "kirjutamisoperatsioone ette võttes. Kui test lõpeb, tuleb teha taaskäivitus."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:118 en/bootLive.xml:161
+#: en/bootLive.xml:84 en/bootLive.xml:116
 msgid "<emphasis role=\"bold\"> F2 Language</emphasis>"
 msgstr "<emphasis role=\"bold\"> F2 Keel</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:120 en/bootLive.xml:163
+#: en/bootLive.xml:85 en/bootLive.xml:117
 msgid ""
 "Press <keycap>F2</keycap> to have the installer use a specific language "
 "during the installation. Use the arrow keys to select the language then "
@@ -705,26 +709,27 @@ msgstr ""
 "liikudes ja vajutage siis <keycap>Enter</keycap>."
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:129
+#: en/bootLive.xml:93
 msgid "In UEFI mode"
 msgstr "UEFI režiimis"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:133
+#: en/bootLive.xml:96
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:139
+#: en/bootLive.xml:100
 msgid "First screen while booting in UEFI mode"
 msgstr "Esimene ekraan UEFI režiimis algkäivitusel"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:149
+#: en/bootLive.xml:107
 msgid ""
 "This option will boot the Mageia Live system from the connected DVD/USB "
 "media (expect a very slow system compared to an installed OS).  Once the "
@@ -735,7 +740,7 @@ msgstr ""
 "tegutsemine). Kui süsteem on laaditud, võite asuda paigaldamise kallale."
 
 #. type: Content of: <section><section><note><para>
-#: en/bootLive.xml:170
+#: en/bootLive.xml:123
 msgid ""
 "If you booted from a USB stick, you will see the above menu options "
 "duplicated, and in this case, you should choose from the menu pair that will "
@@ -1004,12 +1009,12 @@ msgstr ""
 "oleksid lültiatud kas kohalikule ajale või siis UTC/GMT-le."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:24
+#: en/configureX_card_list.xml:27
 msgid "Choose an X Server (Configure your Graphic Card)"
 msgstr "X-serveri valimine (graafikakaardi seadistamine)"
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_card_list.xml:29
+#: en/configureX_card_list.xml:32
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_card_list."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_card_list-im1\"/> </"
@@ -1020,7 +1025,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:35
+#: en/configureX_card_list.xml:38
 msgid ""
 "DrakX has a very comprehensive database of video cards and will usually "
 "correctly identify your video device."
@@ -1029,7 +1034,7 @@ msgstr ""
 "teie videoseadme korrektselt tuvastada."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:38
+#: en/configureX_card_list.xml:41
 msgid ""
 "If the installer has not correctly detected your graphic card and you know "
 "which one you have, you can select it from the tree by:"
@@ -1039,22 +1044,22 @@ msgstr ""
 "parameetrite alusel:"
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_card_list.xml:41 en/configureX_monitor.xml:74
+#: en/configureX_card_list.xml:44 en/configureX_monitor.xml:78
 msgid "Vendor"
 msgstr "Tootja"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:45
+#: en/configureX_card_list.xml:48
 msgid "then the make of your card"
 msgstr "seejärel kaardi mark"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:49
+#: en/configureX_card_list.xml:52
 msgid "and the model of card"
 msgstr "ja lõpuks kaardi tüüp"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:53
+#: en/configureX_card_list.xml:56
 msgid ""
 "If you cannot find your card in the vendor lists (because it's not yet in "
 "the database or it's an older card) you may find a suitable driver in the "
@@ -1071,7 +1076,7 @@ msgstr ""
 "pakub kõige elementaarsemaid võimalusi."
 
 #. type: Content of: <section><caution><para>
-#: en/configureX_card_list.xml:61
+#: en/configureX_card_list.xml:64
 msgid ""
 "Be aware that if you select an incompatible driver you may only have access "
 "to the <emphasis>Command Line Interface</emphasis>"
@@ -1080,7 +1085,7 @@ msgstr ""
 "ainult <emphasis>käsurida</emphasis>."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:65
+#: en/configureX_card_list.xml:68
 msgid ""
 "Some video card manufacturers provide proprietary drivers for Linux which "
 "may only be available in the <emphasis>Nonfree</emphasis> repository and in "
@@ -1096,17 +1101,13 @@ msgstr ""
 "seda varem teinud, tasuks see ette võtta esimese taaskäivituse järel."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:11
-msgid "Graphic Card and Monitor Configuration"
+#: en/configureX_chooser.xml:23
+#, fuzzy
+msgid "Graphics Card and Monitor Configuration"
 msgstr "Graafikakaardi ja monitori seadistamine"
 
-#.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
-#. 2018/02/15 apb: Some text and typography.
-#. 2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.
-#. 2018/02/23 apb: Typo.
-#. 2019/01/06 apb: Slight reword, split 1st para in two.
 #. type: Content of: <section><mediaobject>
-#: en/configureX_chooser.xml:26
+#: en/configureX_chooser.xml:28
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_chooser."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_chooser-im1\"/> </"
@@ -1117,7 +1118,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:32
+#: en/configureX_chooser.xml:34
 msgid ""
 "No matter which graphical environment (also known as desktop environment) "
 "you chose for this install of Mageia, they are all based on a graphical user "
@@ -1134,7 +1135,7 @@ msgstr ""
 "quote>'i seadistused korras."
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:39
+#: en/configureX_chooser.xml:41
 msgid ""
 "Choose the appropriate settings manually if you think the details are "
 "incorrect, or if none are shown."
@@ -1143,12 +1144,13 @@ msgstr ""
 "valed või kui midagi ei näidata."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:44
-msgid "<emphasis role=\"bold\">Graphic Card</emphasis>"
+#: en/configureX_chooser.xml:46
+#, fuzzy
+msgid "<emphasis role=\"bold\">Graphics Card</emphasis>"
 msgstr "<emphasis role=\"bold\">Graafikakaart</emphasis>:"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:47
+#: en/configureX_chooser.xml:49
 msgid ""
 "If you need to, you can select a specific card from this expandable list. "
 "See <xref linkend=\"configureX_card_list\"/>."
@@ -1158,12 +1160,12 @@ msgstr ""
 "(graafikakaardi seadistamine)</link>."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:52
+#: en/configureX_chooser.xml:54
 msgid "<emphasis role=\"bold\">Monitor</emphasis>"
 msgstr "<emphasis role=\"bold\">Monitor</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:55
+#: en/configureX_chooser.xml:57
 msgid ""
 "You can choose Plug 'n Play, if applicable, or choose your monitor from the "
 "<emphasis>Vendor</emphasis> or <emphasis>Generic</emphasis> lists. Choose "
@@ -1178,22 +1180,22 @@ msgstr ""
 "<link linkend=\"confiureX_monitor\">Monitori valimine</link>."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:63
+#: en/configureX_chooser.xml:65
 msgid "<emphasis role=\"bold\">Resolution</emphasis>"
 msgstr "<emphasis role=\"bold\">Ekraanilahutus:</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:66
+#: en/configureX_chooser.xml:68
 msgid "The resolution and color depth of your monitor can be set here."
 msgstr "Siin saab määrata vajaliku monitori ekraanilahutuse ja värvisügavuse."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:71
+#: en/configureX_chooser.xml:73
 msgid "<emphasis role=\"bold\">Test</emphasis>"
 msgstr "<emphasis role=\"bold\">Test</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:74
+#: en/configureX_chooser.xml:76
 msgid ""
 "The test button does not always appear during install. If the option is "
 "there, and you test your settings, you should be asked to confirm that your "
@@ -1212,17 +1214,17 @@ msgstr ""
 "seadistused oleksid korras."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:85
+#: en/configureX_chooser.xml:87
 msgid "<emphasis role=\"bold\">Options</emphasis>"
 msgstr "<emphasis role=\"bold\">Eelistused:</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:88
+#: en/configureX_chooser.xml:90
 msgid "Here you can choose to enable or disable various options."
 msgstr "Siin saab mitmesuguseid valikuid lubada või keelata."
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_chooser.xml:93
+#: en/configureX_chooser.xml:95
 msgid ""
 "There is a risk of damaging a monitor if you choose refresh rates that are "
 "outside the frequency range of that monitor. This applies to older CRT "
@@ -1235,12 +1237,12 @@ msgstr ""
 "sagedust omaks ja tüüpiliselt käivitavad puhkerežiimi."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_monitor.xml:22
+#: en/configureX_monitor.xml:26
 msgid "Choosing your Monitor"
 msgstr "Monitori valimine"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:25
+#: en/configureX_monitor.xml:29
 msgid ""
 "DrakX has a very comprehensive database of monitors and will usually "
 "correctly identify yours."
@@ -1249,7 +1251,7 @@ msgstr ""
 "Teie monitori õigesti."
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:30
+#: en/configureX_monitor.xml:34
 msgid ""
 "<emphasis role=\"bold\">Selecting a monitor with different characteristics "
 "could damage your monitor or video hardware. Please don't try something "
@@ -1262,7 +1264,7 @@ msgstr ""
 "emphasis> Kahtluste korrall uurige oma monitori dokumentatsiooni."
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:38
+#: en/configureX_monitor.xml:42
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
@@ -1273,12 +1275,12 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:46
+#: en/configureX_monitor.xml:50
 msgid "Custom"
 msgstr "Kohandatud"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:49
+#: en/configureX_monitor.xml:53
 msgid ""
 "This option allows you to set two critical parameters: the vertical refresh "
 "rate and the horizontal sync rate. Vertical refresh determines how often the "
@@ -1289,7 +1291,7 @@ msgstr ""
 "realaotussageduse ja ekraaniuuendussageduse."
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:55
+#: en/configureX_monitor.xml:59
 msgid ""
 "It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor "
 "type with a sync range that is beyond the capabilities of your monitor: you "
@@ -1302,12 +1304,12 @@ msgstr ""
 "tagasihoidlikum väärtus ja kindlasti uurige monitori dokumentatsiooni."
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:64
+#: en/configureX_monitor.xml:68
 msgid "Plug'n Play"
 msgstr "Plug'n Play"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:67
+#: en/configureX_monitor.xml:71
 msgid ""
 "This is the default option and automatically tries to determine the monitor "
 "type from the monitor database."
@@ -1316,38 +1318,40 @@ msgstr ""
 "monitoride andmebaasi põhjal."
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:77
+#: en/configureX_monitor.xml:81
+#, fuzzy
 msgid ""
 "If the installer has not correctly detected your monitor and you know which "
-"one you have, you can select it from the tree by selecting:"
+"one you have, you can choose it from the options by selecting:"
 msgstr ""
 "Kui paigaldusprogramm ei ole Teie videokaarti õigesti tuvastanud ja Te "
 "teate, milline kaart Teil on, võite valida selle puust järgmiste "
 "parameetrite alusel:"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:86
+#: en/configureX_monitor.xml:90
 msgid "Manufacturer"
 msgstr "Tootja"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:90
+#: en/configureX_monitor.xml:94
 msgid "Monitor model"
 msgstr "Monitori mudel"
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:96
+#: en/configureX_monitor.xml:100
 msgid "Generic"
 msgstr "Tavaline"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:99
+#: en/configureX_monitor.xml:103
+#, fuzzy
 msgid ""
-"Selecting this group will list nearly 30 display configurations such as "
-"1024x768 @ 60Hz and includes flat-panel displays as used in laptops. This is "
-"often a good monitor selection group if you need to use the VESA card driver "
-"when your video hardware cannot be determined automatically.  Once again it "
-"may be wise to be conservative in your selections."
+"Selecting this group will list approximately 30 display configurations such "
+"as 1024x768 @ 60Hz and includes flat-panel displays as used in laptops.  "
+"This is often a good monitor selection group if you need to use the VESA "
+"card driver when your video hardware cannot be determined automatically. "
+"Once again, it may be wise to be conservative in your selections."
 msgstr ""
 "Selles grupis on valida ligemale 30 seadistuse seast, näiteks 1024x768 @ "
 "60Hz, sealhulgas lamekuvarid (Flat panel), mida kasutavad eriti sülearvutid. "
@@ -1356,12 +1360,12 @@ msgstr ""
 "tasub valides olla pigem konservatiivne."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:22
+#: en/diskdrake.xml:24
 msgid "Custom Disk Partitioning with DiskDrake"
 msgstr "Ketta kohandatud partitsioneerimine DiskDrake'i abil"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:27
+#: en/diskdrake.xml:29
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-diskdrake.png\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1372,7 +1376,7 @@ msgstr ""
 "<imagedata align=\"center\" fileref=\"live-diskdrake.png\"/> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:38
+#: en/diskdrake.xml:40
 msgid ""
 "Modify the layout of your disk(s) here. You can remove or create partitions, "
 "change the filesystem or size of a partition and even view their details "
@@ -1383,18 +1387,19 @@ msgstr ""
 "alustamist näha, mida partitsioon sisaldab."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:47
+#, fuzzy
 msgid ""
 "There is a tab at the top for every detected hard disk (or other storage "
-"device, like a USB key). In the screenshot above there are two available "
-"devices: <filename>sda </filename>and <filename>sdb</filename>."
+"device, like a USB key), for example: <filename>sda</filename>, "
+"<filename>sdb</filename>, <filename>sdc</filename> etc."
 msgstr ""
 "Igale leitud kõvakettale või muule salvestusseadmele (näiteks USB-pulgale) "
 "on omaette kaart. Siinsel pildil on näha kaks seadet: <filename>sda</"
 "filename> ja <filename>sdb</filename>."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:52
+#: en/diskdrake.xml:54
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it. "
@@ -1407,7 +1412,7 @@ msgstr ""
 "näiteks nime lisamine või partitsiooni tüübi valimine."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:60
+#: en/diskdrake.xml:62
 msgid ""
 "Continue until you have adjusted everything to your satisfaction, then click "
 "<emphasis>Done</emphasis> when you're ready."
@@ -1416,7 +1421,7 @@ msgstr ""
 "<emphasis>Tehtud</emphasis>."
 
 #. type: Content of: <section><warning><orderedlist><listitem><para>
-#: en/diskdrake.xml:69
+#: en/diskdrake.xml:71
 msgid ""
 "Take care with the <emphasis>Clear all</emphasis> option, use it only if you "
 "are sure you want to wipe all partitions on the selected storage device."
@@ -1426,7 +1431,7 @@ msgstr ""
 "partitsioonid."
 
 #. type: Content of: <section><warning><orderedlist><listitem><para>
-#: en/diskdrake.xml:75
+#: en/diskdrake.xml:77
 msgid ""
 "If you wish to use encryption on your <filename>/</filename> partition you "
 "must ensure that you have a separate <filename>/boot</filename> partition. "
@@ -1439,7 +1444,7 @@ msgstr ""
 "ei ole süsteemi võimalik üldse laadida."
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/diskdrake.xml:87
+#: en/diskdrake.xml:89
 msgid ""
 "If you are installing Mageia on a UEFI system, check that an ESP (EFI System "
 "Partition) is present and correctly mounted on <filename>/boot/EFI</"
@@ -1450,7 +1455,7 @@ msgstr ""
 "EFI</filename> Vt joonist 1 allpool."
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/diskdrake.xml:93
+#: en/diskdrake.xml:95
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
 "partition is present and of the correct type. See Figure 2 below."
@@ -1459,12 +1464,12 @@ msgstr ""
 "tüübiga BIOS-e alglaadimispartitsioon on ikka olemas. Vt joonist 2 allpool."
 
 #. type: Content of: <section><figure><title>
-#: en/diskdrake.xml:101
+#: en/diskdrake.xml:103
 msgid "EFI System Partition"
 msgstr "EFI süsteemipartitsioon"
 
 #. type: Content of: <section><figure><mediaobject>
-#: en/diskdrake.xml:104
+#: en/diskdrake.xml:106
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-diskdrake2.png\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1475,17 +1480,17 @@ msgstr ""
 "<imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/> </imageobject>"
 
 #. type: Content of: <section><figure>
-#: en/diskdrake.xml:103 en/diskdrake.xml:117
+#: en/diskdrake.xml:105 en/diskdrake.xml:119
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><figure><title>
-#: en/diskdrake.xml:115
+#: en/diskdrake.xml:117
 msgid "BIOS boot partition"
 msgstr "BIOSi alglaadimispartitsioon"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:118 en/doPartitionDisks.xml:201
+#: en/diskdrake.xml:120 en/doPartitionDisks.xml:206
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1508,12 +1513,12 @@ msgid "Partitioning"
 msgstr "Kõvaketta jagamine"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:31
 msgid "Suggested Partitioning"
 msgstr "Väljapakutud jagamine"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:34
 msgid ""
 "In this screen you can see the content of your hard drive(s) along with the "
 "DrakX partitioning proposals for where to install Mageia."
@@ -1522,7 +1527,7 @@ msgstr ""
 "DrakXi partitsioneerimisnõustaja pakub Mageia paigaldamiseks."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:34
+#: en/doPartitionDisks.xml:38
 msgid ""
 "The actual options available from those shown below will vary according to "
 "the layout and content of your particular hard drive(s)."
@@ -1531,7 +1536,7 @@ msgstr ""
 "sisust."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:39
+#: en/doPartitionDisks.xml:43
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1544,18 +1549,18 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><itemizedlist><title>
-#: en/doPartitionDisks.xml:49
+#: en/doPartitionDisks.xml:53
 msgid "Main Options"
 msgstr "Põhivalikud"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:56
 msgid "<emphasis role=\"bold\">Use Existing Partitions</emphasis>"
 msgstr ""
 "<emphasis role=\"bold\">Olemasolevate partitsioonide kasutamine</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:59
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1564,12 +1569,12 @@ msgstr ""
 "neid võib kasutada paigaldamiseks."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:61
+#: en/doPartitionDisks.xml:65
 msgid "<emphasis role=\"bold\">Use Free Space</emphasis>"
 msgstr "<emphasis role=\"bold\">Vaba ruumi kasutamine</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:68
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1578,7 +1583,7 @@ msgstr ""
 "uuele Mageia paigaldusele."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:70
+#: en/doPartitionDisks.xml:74
 msgid ""
 "<emphasis role=\"bold\">Use Free Space on a Windows Partition</emphasis>"
 msgstr ""
@@ -1586,12 +1591,12 @@ msgstr ""
 "emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:73
+#: en/doPartitionDisks.xml:77
+#, fuzzy
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it. 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 important files!"
+"installation but see the warning below."
 msgstr ""
 "Kui Teil leidub kasutamata ruumi olemasoleval Windowsi partitsioonil, võib "
 "paigaldusprogramm välja pakkuda selle kasutamise. See võib olla väga "
@@ -1599,14 +1604,28 @@ msgstr ""
 "ajal on see riskantne, mistõttu tuleks kindlasti teha kõigist olulistest "
 "failidest varukoopia!"
 
+#. type: Content of: <section><itemizedlist><listitem><para><mediaobject>
+#: en/doPartitionDisks.xml:87
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:79
+#: en/doPartitionDisks.xml:82
+#, fuzzy
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
 "light blue and the proposed Mageia partition in dark blue with their "
 "intended sizes just underneath. You have the option to modify these sizes by "
 "clicking and dragging the gap between both partitions.  See the following "
-"screenshot:"
+"screenshot:<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr ""
 "Selle valiku korral näitab paigaldusprogramm alles jäävat Windowsi "
 "partitsiooni helesinisena ja tulevast Mageia partitsiooni tumesinisena ning "
@@ -1614,19 +1633,43 @@ msgstr ""
 "muuta, klõpsates partitsioonide vahel asuvale tühialale ja seda lohistades. "
 "Seda näitab allolev pilt."
 
+#. type: Content of: <section><itemizedlist><listitem><warning><para>
+#: en/doPartitionDisks.xml:97
+msgid ""
+"This involves shrinking the size of the Windows partition, and therefore is "
+"a risky operation, so you should make sure you have backed up all important "
+"files before proceeding."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><important><para>
+#: en/doPartitionDisks.xml:103
+#, fuzzy
+msgid ""
+"The partition must be \"clean\", meaning that Windows must have closed down "
+"correctly the last time it was used. It must also have been defragmented, "
+"although this is not a guarantee that all files in the partition have been "
+"moved out of the area that is about to be used for Mageia."
+msgstr ""
+"Pange tähele, et sellega kaasneb Windowsi partitsiooni suuruse vähendamine. "
+"Partitsioon peab olema \"puhas\", see tähendab Windows peab olema viimasel "
+"korral korrektselt suletud. Samuti peab partitsioon olema defragmenteeritud, "
+"ehkki see ei garanteeri veel, et kõik failid on alalt, mida Mageia "
+"paigaldamiseks kasutatakse, tõepoolest eemaldatud. Sellepärast ongi "
+"äärmiselt soovitatav kõik vähegi olulised failid eelnevalt varundada."
+
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:87
+#: en/doPartitionDisks.xml:112
 msgid "<emphasis role=\"bold\">Erase and use Entire Disk</emphasis>"
 msgstr ""
 "<emphasis role=\"bold\">Kogu ketta tühjendamine ja kasutamine</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:90
+#: en/doPartitionDisks.xml:115
 msgid "This option will allocate the entire drive for Mageia"
 msgstr "Selle valimisel kasutatakse kogu ketast ainult Mageia jaoks."
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:119
 msgid ""
 "This will erase ALL data on the selected hard drive. Take care! If you "
 "intend to use part of the disk for something else, or you already have data "
@@ -1636,30 +1679,13 @@ msgstr ""
 "kavatsete kasutada osa kettast millegi muu tarbeks või on Teil juba kettal "
 "andmeid, millest Te ei soovi ilma jääda, ärge seda võimalust valige."
 
-#. type: Content of: <section><itemizedlist><listitem><important><para>
-#: en/doPartitionDisks.xml:101
-msgid ""
-"Note that this involves shrinking the size of the Windows partition. The "
-"partition must be \"clean\", meaning that Windows must have closed down "
-"correctly the last time it was used. It must also have been defragmented, "
-"although this is not a guarantee that all files in the partition have been "
-"moved out of the area that is about to be used. It is highly recommended to "
-"back up your personal files."
-msgstr ""
-"Pange tähele, et sellega kaasneb Windowsi partitsiooni suuruse vähendamine. "
-"Partitsioon peab olema \"puhas\", see tähendab Windows peab olema viimasel "
-"korral korrektselt suletud. Samuti peab partitsioon olema defragmenteeritud, "
-"ehkki see ei garanteeri veel, et kõik failid on alalt, mida Mageia "
-"paigaldamiseks kasutatakse, tõepoolest eemaldatud. Sellepärast ongi "
-"äärmiselt soovitatav kõik vähegi olulised failid eelnevalt varundada."
-
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:112
+#: en/doPartitionDisks.xml:127
 msgid "<emphasis role=\"bold\">Custom Disk Partitioning</emphasis>"
 msgstr "<emphasis role=\"bold\">Ketta jagamine oma tahtmist mööda</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:115
+#: en/doPartitionDisks.xml:130
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1667,21 +1693,8 @@ msgstr ""
 "See valik annab täieliku kontrolli määrata, kuidas ja kuhu Mageia kõvakettal "
 "või -ketastel paigaldatakse."
 
-#. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:122
-msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
-
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:131
+#: en/doPartitionDisks.xml:136
 msgid ""
 "If you are not using the <emphasis>Custom disk partitioning</emphasis> "
 "option, then the installer will allocate the available space according to "
@@ -1692,7 +1705,7 @@ msgstr ""
 "reeglite kohaselt:"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:137
+#: en/doPartitionDisks.xml:142
 msgid ""
 "If the total available space is less than 50 GB, then only one partition is "
 "created. This will be the <filename>/</filename> (root)  partition."
@@ -1701,14 +1714,14 @@ msgstr ""
 "</filename> jaoks ning /home jaoks eraldi partitsiooni ei looda."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:143
+#: en/doPartitionDisks.xml:148
 msgid ""
 "If the total available space is greater than 50 GB, then three partitions "
 "are created"
 msgstr "Kui kokku on saadaval üle 50 GB, luuakse kolm partitsiooni"
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:148
+#: en/doPartitionDisks.xml:153
 msgid ""
 "6/19 of the total available place is allocated to <filename>/</filename> "
 "with a maximum of 50 GB"
@@ -1717,19 +1730,19 @@ msgstr ""
 "maksimaalse suurusega 50 GB"
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:153
+#: en/doPartitionDisks.xml:158
 msgid "1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB"
 msgstr ""
 "1/19 eraldatakse saalealaks (<filename>swap</filename>) maksimaalse "
 "suurusega 4 GB"
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:158
+#: en/doPartitionDisks.xml:163
 msgid "the rest (at least 12/19) is allocated to <filename>/home</filename>"
 msgstr "ülejäänu (vähemalt 12/19) eraldatakse <filename>/home</filename> jaoks"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:165
+#: en/doPartitionDisks.xml:170
 msgid ""
 "This means that from 160 GB or greater available space, the installer will "
 "create three partitions:"
@@ -1738,22 +1751,22 @@ msgstr ""
 "partitsiooni:"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:170
+#: en/doPartitionDisks.xml:175
 msgid "50 GB for <filename>/</filename>"
 msgstr "50 GB <filename>/</filename> jaoks"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:174
+#: en/doPartitionDisks.xml:179
 msgid "4 GB for <filename>swap</filename>"
 msgstr "4 GB <filename>saaleala</filename> jaoks"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:178
+#: en/doPartitionDisks.xml:183
 msgid "and the remainder for <filename>/home</filename>"
 msgstr "ja ülejäänu <filename>/home</filename> jaoks"
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:183
+#: en/doPartitionDisks.xml:188
 msgid ""
 "If you are using a UEFI system, the ESP (EFI System Partition) will be "
 "automatically detected - or created if it does not exist yet - and mounted "
@@ -1768,7 +1781,7 @@ msgstr ""
 "tehtud."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:189
+#: en/doPartitionDisks.xml:194
 msgid ""
 "If you are using a Legacy (also known as BIOS) system with a GPT partitioned "
 "disk, you need to create a BIOS boot partition if it doesn't already exist. "
@@ -1785,23 +1798,28 @@ msgstr ""
 "<quote>BIOS boot partition</quote>."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:196
+#: en/doPartitionDisks.xml:201
 msgid "See <xref linkend=\"diskdrake\"/> for information on how to proceed."
 msgstr ""
 "Kuidas edasi talitada, annab teada peatükk <link linkend=\"diskdrake\">Ketta "
 "kohandatud partitsioneerimine DiskDrake'i abil</link>."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:211
+#: en/doPartitionDisks.xml:216
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4.png"
-"\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks4.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks4.png\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4.png"
-"\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:217
+#: en/doPartitionDisks.xml:226
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
 "previous standard of 512. Due to lack of available hardware, the "
@@ -1814,7 +1832,7 @@ msgstr ""
 "partitsioneerimistööriista niisuguste ketastega testitud."
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:222
+#: en/doPartitionDisks.xml:231
 msgid ""
 "Some SSD devices now use an erase block size over 1 MB. If you have such a "
 "device we suggest that you partition the drive in advance, using an "
@@ -1827,17 +1845,17 @@ msgstr ""
 "näiteks gparted, ja järgmisi sätteid:"
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:229
+#: en/doPartitionDisks.xml:238
 msgid "<emphasis>Align to</emphasis> = MiB"
 msgstr "<emphasis>Align to</emphasis> = MiB"
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:233
+#: en/doPartitionDisks.xml:242
 msgid "<emphasis>Free space preceding (MiB)</emphasis> = 2"
 msgstr "<emphasis>Free space preceding (MiB)</emphasis> = 2"
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:237
+#: en/doPartitionDisks.xml:246
 msgid ""
 "Also make sure all partitions are created using an even number of megabytes."
 msgstr ""
@@ -2025,12 +2043,12 @@ msgstr ""
 "edukasse tulevikku."
 
 #. type: Content of: <section><info><title>
-#: en/firewall.xml:7
+#: en/firewall.xml:16
 msgid "Firewall"
 msgstr "Tulemüür"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:10
+#: en/firewall.xml:19
 msgid ""
 "This section allows you to configure some simple firewall rules: they "
 "determine which type of message from the Internet will be accepted by the "
@@ -2042,8 +2060,18 @@ msgstr ""
 "omakorda võimaldab süsteemi vastavatele teenustele ligi pääseda ka "
 "internetist."
 
+#. type: Content of: <section><mediaobject>
+#: en/firewall.xml:26
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-firewall.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome.png\"/> </"
+"imageobject>"
+
 #. type: Content of: <section><para>
-#: en/firewall.xml:16
+#: en/firewall.xml:31
 msgid ""
 "In the default setting (no button is checked), no service of the system is "
 "accessible from the network. The <emphasis>Everything (no firewall)</"
@@ -2064,7 +2092,7 @@ msgstr ""
 "tühistamiseks näiteks testimise või silumise eesmärgil."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:25
+#: en/firewall.xml:40
 msgid ""
 "All other options are more or less self-explanatory. As an example, you will "
 "enable the CUPS server if you want printers on your machine to be accessible "
@@ -2075,12 +2103,12 @@ msgstr ""
 "oleksid kättesaadavad ka võrgust."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:29
+#: en/firewall.xml:44
 msgid "<emphasis role=\"bold\">Advanced</emphasis>"
 msgstr "<emphasis role=\"bold\">Muud valikud</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:31
+#: en/firewall.xml:46
 msgid ""
 "The <emphasis>Advanced</emphasis> option opens a window where you can enable "
 "a series of services by typing a list of <quote>couples</quote> (blank "
@@ -2091,32 +2119,36 @@ msgstr ""
 "quote> järgmiselt"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:35
-msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
+#: en/firewall.xml:50
+#, fuzzy
+msgid "<emphasis>&lt;port-number&gt;/&lt;protocol&gt;</emphasis>"
 msgstr "<emphasis>&lt;pordi-number>/&lt;protokoll></emphasis>"
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:38
+#: en/firewall.xml:53
+#, fuzzy
 msgid ""
-"- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
-"the service you want to enable (e.g. 873 for the RSYNC service) as defined "
-"in <emphasis>RFC-433</emphasis>;"
+"- <emphasis>&lt;port-number&gt;</emphasis> is the value of the port assigned "
+"to the service you want to enable (e.g. 873 for the RSYNC service) as "
+"defined in <emphasis>RFC-433</emphasis>;"
 msgstr ""
 "- <emphasis>&lt;pordi-number></emphasis> on sisselülitatavale teenusele "
 "omistatud pordi väärtus (nt. 873 RSYNC-i teenuse puhul), nagu seda määratleb "
 "<emphasis>RFC-433</emphasis>;"
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:42
+#: en/firewall.xml:57
+#, fuzzy
 msgid ""
-"- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
-"<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
+"- <emphasis>&lt;protocol&gt;</emphasis> is one of <emphasis>TCP</emphasis> "
+"or <emphasis>UDP</emphasis> - the internet protocol that is used by the "
+"service."
 msgstr ""
 "- <emphasis>&lt;protokoll></emphasis> on kas <emphasis>TCP</emphasis> või "
 "<emphasis>UDP</emphasis> - teenuse kasutatav internetiprotokoll."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:47
+#: en/firewall.xml:62
 msgid ""
 "For instance, the entry for enabling access to the RSYNC service therefore "
 "is <emphasis>873/tcp</emphasis>."
@@ -2125,7 +2157,7 @@ msgstr ""
 "<emphasis>873/tcp</emphasis>."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:50
+#: en/firewall.xml:65
 msgid ""
 "In case a service is implemented to use both protocols, you specify 2 "
 "couples for the same port."
@@ -2212,12 +2244,12 @@ msgid "Graphical Configuration"
 msgstr "Videoseadistused"
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:32
+#: en/installer.xml:34
 msgid "DrakX, the Mageia Installer"
 msgstr "Mageia paigaldusprogramm DrakX"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:35
+#: en/installer.xml:37
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -2228,12 +2260,12 @@ msgstr ""
 "uuendamine oleks kõigile võimalikult lihtne."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:40
+#: en/installer.xml:42
 msgid "The installation steps"
 msgstr "Paigaldamise etapid"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:44
+#: en/installer.xml:46
 msgid ""
 "The install process is divided into a number of steps - the status of which "
 "is indicated in a panel to the left of the screen."
@@ -2242,7 +2274,7 @@ msgstr ""
 "külgpaneelil vasakul."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:50
+#: en/installer.xml:52
 msgid ""
 "Each step has one or more screens, which may also have <emphasis>Advanced</"
 "emphasis> sections with extra, less commonly required options."
@@ -2252,7 +2284,7 @@ msgstr ""
 "valikutega."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:56
+#: en/installer.xml:58
 msgid ""
 "Most screens have <emphasis>Help</emphasis> buttons for further details "
 "about the particular step."
@@ -2261,7 +2293,7 @@ msgstr ""
 "etappi põhjalikumalt."
 
 #. type: Content of: <section><section><caution><para>
-#: en/installer.xml:62
+#: en/installer.xml:64
 msgid ""
 "If at some point during the install you decide to abort the installation, it "
 "is possible to reboot, but please think twice before you do this. Once a "
@@ -2275,7 +2307,7 @@ msgstr ""
 "varasemas olekus ning taaskäivitamise tulemus võib olla mittetöötav masin."
 
 #. type: Content of: <section><section><caution><para>
-#: en/installer.xml:68
+#: en/installer.xml:70
 msgid ""
 "If, in spite of this, you are very sure rebooting is what you want, go to a "
 "text terminal by pressing the keys <keycombo> <keycap>Ctrl</keycap> "
@@ -2290,12 +2322,12 @@ msgstr ""
 "<keycap>Alt</keycap> <keycap>Delete</keycap></keycombo>. "
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:86
+#: en/installer.xml:88
 msgid "Installation Welcome Screen"
 msgstr "Paigaldusprogrammi avaekraan"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:88
+#: en/installer.xml:90
 msgid ""
 "The particular screen that you will first see when booting from the "
 "Installation media will depend on whether your computer motherboard is of "
@@ -2305,7 +2337,7 @@ msgstr ""
 "sõltub sellest, kas arvuti emaplaat on pärand- (BIOS) või UEFI süsteemiga."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:92
+#: en/installer.xml:94
 msgid ""
 "The welcome menu screen has various options, however the default option will "
 "start the installer, and is normally all that you will need."
@@ -2314,12 +2346,12 @@ msgstr ""
 "paigaldusprogrammi, mida tavaliselt ongi vaja."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:97
+#: en/installer.xml:99
 msgid "Legacy (BIOS) Systems"
 msgstr "Pärandsüsteemid (BIOS)"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:100
+#: en/installer.xml:102
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome.png\"/> </"
 "imageobject>"
@@ -2328,7 +2360,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:111
+#: en/installer.xml:113
 msgid ""
 "Install Mageia to a hard disk. This is the default option, and will "
 "automatically start after a short while unless another option is selected."
@@ -2337,12 +2369,12 @@ msgstr ""
 "hetke pärast automaatselt, kui just ei valita mõnda teist võimalust."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:117
+#: en/installer.xml:119
 msgid "<emphasis role=\"bold\">Rescue System</emphasis>"
 msgstr "<emphasis role=\"bold\">Päästesüsteem</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:119
+#: en/installer.xml:121
 msgid ""
 "This option allows you to either re-install the bootloader for an existing "
 "Mageia installation or you can use it to restore a Windows bootloader."
@@ -2351,22 +2383,22 @@ msgstr ""
 "alglaadur, aga selle abil saab ka taastada Windowsi alglaaduri."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:132
+#: en/installer.xml:134
 msgid "<emphasis role=\"bold\">F2: Language</emphasis>"
 msgstr "<emphasis role=\"bold\"> F2 Keel</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:134
+#: en/installer.xml:136
 msgid "Press F2 for alternative languages."
 msgstr "F2 lubab valida teisi keeli."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:140
+#: en/installer.xml:142
 msgid "UEFI Systems"
 msgstr "UEFI süsteemid"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:142
+#: en/installer.xml:144
 msgid ""
 "From this screen, you can access options by pressing <keycap>e</keycap> to "
 "enter the edit mode. To come back to this screen, press <keycap>Esc</keycap> "
@@ -2378,7 +2410,7 @@ msgstr ""
 "<keycap>F10</keycap>, et väljuda tehtud valikuid salvestades."
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:148
+#: en/installer.xml:150
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome2.png\"/> </"
 "imageobject>"
@@ -2387,12 +2419,12 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:157
+#: en/installer.xml:159
 msgid "<emphasis role=\"bold\">Install:</emphasis> Start the Install process"
 msgstr "<emphasis role=\"bold\">Paigaldamine</emphasis> alustab paigaldamisega"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:162
+#: en/installer.xml:164
 msgid ""
 "<emphasis role=\"bold\">Rescue:</emphasis> This option allows you to either "
 "re-install the bootloader for an existing Mageia installation or you can use "
@@ -2403,7 +2435,7 @@ msgstr ""
 "ka taastada Windowsi alglaaduri."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:169
+#: en/installer.xml:171
 msgid ""
 "<emphasis role=\"bold\">F2: Language:</emphasis> Press <keycap>F2</keycap> "
 "for alternative languages."
@@ -2412,7 +2444,7 @@ msgstr ""
 "vajutades saab valida teisi keeli"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:174
+#: en/installer.xml:176
 msgid ""
 "If you booted from a USB stick, you will see the above options duplicated, "
 "and in this case, you should use the set that will be suffixed with \"USB\"."
@@ -2421,17 +2453,17 @@ msgstr ""
 "juhul tuleb valida variant, mille järel seisab \"USB\"."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:181
+#: en/installer.xml:183
 msgid "Installation Problems and Possible Solutions"
 msgstr "Paigaldamisprobleemid ja nende võimalikud lahendused"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:184
+#: en/installer.xml:186
 msgid "No Graphical Interface"
 msgstr "Graafiline liides puudub"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:188
+#: en/installer.xml:190
 msgid ""
 "After the initial screen you did not progress to the <emphasis>Language "
 "Selection</emphasis> screen. This can happen with some graphic cards and "
@@ -2444,7 +2476,7 @@ msgstr ""
 "command>."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:195
+#: en/installer.xml:197
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
 "In this case it is worth trying a text-mode installation. To use this press "
@@ -2462,12 +2494,12 @@ msgstr ""
 "paigaldamisega."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:208
+#: en/installer.xml:210
 msgid "The Install Freezes"
 msgstr "Paigaldamine hangub"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:210
+#: en/installer.xml:212
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic hardware "
@@ -2482,12 +2514,12 @@ msgstr ""
 "teiste võtmetega."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:218
+#: en/installer.xml:220
 msgid "RAM problem"
 msgstr "RAM-i probleem"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:220
+#: en/installer.xml:222
 msgid ""
 "This will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
@@ -2502,12 +2534,12 @@ msgstr ""
 "<literal>mem=256M</literal> määrab, et kasutada on 256 MB mälu."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:228
+#: en/installer.xml:230
 msgid "Dynamic partitions"
 msgstr "Dünaamilised partitsioonid"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:230
+#: en/installer.xml:232
 msgid ""
 "If you converted your hard disk from <literal>Basic</literal> format to "
 "<literal>Dynamic</literal> format in Microsoft Windows, then it is not "
@@ -4494,22 +4526,29 @@ msgstr ""
 "Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link>"
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:27
+#: en/setupBootloader.xml:32
 msgid "Bootloader"
 msgstr "Alglaadur"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:31
+#: en/setupBootloader.xml:36
+#, fuzzy
+msgid "Available Bootloaders"
+msgstr "Alglaadur"
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:39
 msgid "Grub2"
 msgstr "Grub2"
 
-#. type: Content of: <section><section><itemizedlist><title>
-#: en/setupBootloader.xml:34
-msgid "Grub2 on Legacy MBR/GPT systems"
-msgstr "Grub2 MBR/GPT pärandsüsteemis"
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:42
+#, fuzzy
+msgid "<emphasis role=\"bold\">Grub2 on Legacy MBR/GPT systems</emphasis>"
+msgstr "<emphasis role=\"bold\">Päästesüsteem</emphasis>"
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:37
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:46
 msgid ""
 "GRUB2 (with or without graphical menu) will be used exclusively as the "
 "bootloader for a Legacy/MBR or Legacy/GPT system."
@@ -4517,8 +4556,8 @@ msgstr ""
 "Grub2 (graafilise menüüga või ilma selleta) kasutatakse eranditeta "
 "alglaadurina MBR/GPT pärandsüsteemi korral."
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:42
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:52
 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."
@@ -4526,18 +4565,20 @@ msgstr ""
 "Vaikimisi kirjutatakse uus alglaadur kas Teie esimese kõvaketta MBR-i "
 "(Master Boot Record) või BIOS-i alglaadepartitsioonile."
 
-#. type: Content of: <section><section><itemizedlist><title>
-#: en/setupBootloader.xml:49
-msgid "Grub2-efi on UEFI systems"
-msgstr "Grub2-efi UEFI süsteemis"
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:59
+#, fuzzy
+msgid "<emphasis role=\"bold\">Grub2-efi on UEFI systems</emphasis>"
+msgstr "<emphasis role=\"bold\">Päästesüsteem</emphasis>"
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:52
-msgid "GRUB2-efi will be used exclusively as the bootloader for a UEFI system."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:63
+#, fuzzy
+msgid "GRUB2-efi or rEFInd may be used as the bootloader for a UEFI system."
 msgstr "Grub2-efi't kasutatakse eranditeta alglaadurina UEFI süsteemi korral."
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:57
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:68
 msgid ""
 "By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI "
 "System Partition)."
@@ -4545,12 +4586,13 @@ msgstr ""
 "Vaikimisi kirjutatakse uus alglaadur (Grub2-efi) ESP-sse (EFI "
 "süsteemipartitsioonile)."
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:60
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:71
+#, fuzzy
 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 "
-"created by Windows and add grub2-efi to it. If no ESP exists, then one will "
+"created by Windows and add grub2-efi to it.  If no ESP exists, then one will "
 "be created. Although it is possible to have several ESPs, only one is "
 "required, whatever the number of operating systems you have."
 msgstr ""
@@ -4560,18 +4602,46 @@ msgstr ""
 "isegi mitu, aga väga soovitatav on siiski kasutada ainult üht sõltumata "
 "sellest, kui palju on arvutis operatsioonisüsteeme."
 
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:82
+msgid "rEFInd"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:85
+#, fuzzy
+msgid "<emphasis role=\"bold\">rEFInd on UEFI systems</emphasis>"
+msgstr "<emphasis role=\"bold\">Ikoon</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:88
+msgid ""
+"rEFInd has a nice graphical set of options, and can auto-detect installed "
+"EFI bootloaders. See: http://www.rodsbooks.com/refind/"
+msgstr ""
+
+#. type: Content of: <section><section><section><note><para>
+#: en/setupBootloader.xml:95
+msgid ""
+"Please note that in order to be able to use the <literal>rEFInd</literal> "
+"option, an installed EFI System Partition must match your system "
+"architecture: if you have a 32bit EFI System Partition installed on a 64bit "
+"machine for instance, then the rEFInd option will not be displayed/available "
+"to you."
+msgstr ""
+
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:72
+#: en/setupBootloader.xml:106
 msgid "Bootloader Setup"
 msgstr "Alglaaduri häälestamine"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:76
+#: en/setupBootloader.xml:110
 msgid "Bootloader main options"
 msgstr "Alglaaduri põhiseadistused"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:79
+#: en/setupBootloader.xml:113
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader.png\"/> </imageobject> <imageobject condition=\"live"
@@ -4584,37 +4654,58 @@ msgstr ""
 "im1\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:91
+#: en/setupBootloader.xml:125
 msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
 msgstr "<emphasis role=\"bold\">Eelistatav alglaadur</emphasis>"
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:93
+#. type: Content of: <section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:129
+msgid ""
+"<guimenuitem>GRUB2</guimenuitem> (with either a graphical or a text menu), "
+"can be chosen for both <literal>Legacy MBR/BIOS</literal> systems and "
+"<literal>UEFI</literal> systems."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:136
 msgid ""
-"This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI "
-"systems will not see this option here."
+"<guimenuitem>rEFInd</guimenuitem> (with a graphical menu)  is an alternative "
+"option solely for use with <literal>UEFI</literal> systems."
 msgstr ""
-"See valik on saadaval ainult MBR/BIOS-i pärandsüsteemis. UEFI süsteemi "
-"kasutajad isegi ei näe seda."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:98
+#: en/setupBootloader.xml:144
 msgid "<emphasis role=\"bold\">Boot device</emphasis>"
 msgstr "<emphasis role=\"bold\">Alglaadimisseade</emphasis>"
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:100
-msgid "Don't change this unless you really know what you are doing"
+#. type: Content of: <section><section><section><itemizedlist><listitem><warning><para>
+#: en/setupBootloader.xml:147
+#, fuzzy
+msgid "Don't change this unless you really know what you are doing."
 msgstr "Ärge seda muutke, kui Te pole täiesti kindel, et teate, mida teete."
 
+#. type: Content of: <section><section><section><itemizedlist><listitem><note><para>
+#: en/setupBootloader.xml:152
+msgid ""
+"There is no option to write GRUB to the boot sector of a partition (e.g: "
+"<filename>sda1</filename>), as this method is considered unreliable."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:157
+msgid ""
+"When using UEFI mode, then the <guilabel>Boot device</guilabel> will be "
+"listed as <guimenuitem>EFI System Partition</guimenuitem>."
+msgstr ""
+
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:105
+#: en/setupBootloader.xml:163
 msgid ""
 "<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
 msgstr "<emphasis role=\"bold\">Ooteaeg alglaadimisel</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:108
+#: en/setupBootloader.xml:166
 msgid ""
 "This text box lets you set a delay, in seconds, before the default operating "
 "system is started up."
@@ -4623,12 +4714,12 @@ msgstr ""
 "käivitatakse vaikimisi operatsioonisüsteem."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:113
+#: en/setupBootloader.xml:171
 msgid "<emphasis role=\"bold\">Security</emphasis>"
 msgstr "<emphasis role=\"bold\">Turvalisus</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:115
+#: en/setupBootloader.xml:173
 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 "
@@ -4642,18 +4733,18 @@ msgstr ""
 "siin ise määrata."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:126
+#: en/setupBootloader.xml:184
 msgid "Choose a password for the bootloader (optional)"
 msgstr ""
 "Selles kastis saab parooli kindlaks määrata (see pole küll kohustuslik)."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:130
+#: en/setupBootloader.xml:188
 msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
 msgstr "<emphasis role=\"bold\">Parool (uuesti)</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:132
+#: en/setupBootloader.xml:190
 msgid ""
 "Retype the password and DrakX will check that it matches with the one set "
 "above"
@@ -4662,17 +4753,17 @@ msgstr ""
 "see ikka sobib kokku sellega, mille sisestasite esimesel korral."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:137 en/setupBootloader.xml:212
+#: en/setupBootloader.xml:195 en/setupBootloader.xml:308
 msgid "<emphasis>Advanced</emphasis>"
 msgstr "<emphasis>Muud valikud</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:141
+#: en/setupBootloader.xml:199
 msgid "<emphasis>Enable ACPI</emphasis>"
 msgstr "<emphasis>ACPI lubamine</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:143
+#: en/setupBootloader.xml:201
 msgid ""
 "ACPI (Advanced Configuration and Power Interface) is a standard for power "
 "management. It can save energy by stopping unused devices. Deselecting it "
@@ -4687,12 +4778,12 @@ msgstr ""
 "probleeme (näiteks suvalisi taaskäivitusi või süsteemi hangumisi)."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:152
+#: en/setupBootloader.xml:210
 msgid "<emphasis>Enable SMP</emphasis>"
 msgstr "<emphasis>SMP lubamine</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:154
+#: en/setupBootloader.xml:212
 msgid ""
 "This option enables/disables symmetric multiprocessing for multi-core "
 "processors"
@@ -4701,12 +4792,12 @@ msgstr ""
 "protsessorite korral."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:159
+#: en/setupBootloader.xml:217
 msgid "<emphasis>Enable APIC</emphasis>"
 msgstr "<emphasis>APIC lubamine</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:161
+#: en/setupBootloader.xml:219
 msgid ""
 "Enabling this gives the operating system access to the Advanced Programmable "
 "Interrupt Controller. APIC devices permit more complex priority models, and "
@@ -4718,12 +4809,12 @@ msgstr ""
 "täiustatud IRQ (katkestusnõuded) haldamist."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:168
+#: en/setupBootloader.xml:226
 msgid "<emphasis>Enable Local APIC</emphasis>"
 msgstr "<emphasis>Kohaliku APIC lubamine</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:170
+#: en/setupBootloader.xml:228
 msgid ""
 "Here you can set Local APIC, which manages all external interrupts for a "
 "specific processor in an SMP system"
@@ -4732,12 +4823,70 @@ msgstr ""
 "protsessori väliseid katkestusi SMP-süsteemis."
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:177
+#: en/setupBootloader.xml:235
 msgid "Bootloader Configuration"
 msgstr "Alglaaduri seadistamine"
 
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:237
+msgid ""
+"If, in the previous section you selected <literal>rEFInd</literal> as the "
+"bootloader to use, you would then be presented with the options shown in the "
+"screenshot directly below. Otherwise, please instead move on to the "
+"subsequent screenshot for your options."
+msgstr ""
+
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:180
+#: en/setupBootloader.xml:243
+#, fuzzy
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"rEFIndLoaderConfig.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-rEFIndLoaderConfig.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:253
+#, fuzzy
+msgid "Your rEFInd configuration options:"
+msgstr "Heli seadistamine"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:256
+msgid ""
+"<guimenuitem>Install or update rEFInd in the EFI system partition.</"
+"guimenuitem>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:261
+msgid ""
+"<guimenuitem>Install in EFI/Boot partition (workaround for some BIOS's).</"
+"guimenuitem>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:264
+msgid ""
+"With some BIOS's, the newly written bootloaser for Mageia at end of the "
+"installation will not be recognized. In that case, you can use this option "
+"as a workaround for the issue."
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:270
+msgid ""
+"If you did not select rEFInd as the bootloader to use in the previous "
+"section, then your bootloader configurations are shown below:"
+msgstr ""
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:275
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -4750,22 +4899,22 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:191
+#: en/setupBootloader.xml:286
 msgid "<emphasis role=\"bold\">Default</emphasis>"
 msgstr "<emphasis role=\"bold\">Vaikimisi</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:193
+#: en/setupBootloader.xml:288
 msgid "The operating system to be started up by default."
 msgstr "Vaikimisi käivitatav operatsioonisüsteem."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:197
+#: en/setupBootloader.xml:292
 msgid "<emphasis role=\"bold\">Append</emphasis>"
 msgstr "<emphasis role=\"bold\">Lisaargumendid</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:199
+#: en/setupBootloader.xml:294
 msgid ""
 "This option lets you pass information to the kernel or tell the kernel to "
 "give you more information as it boots."
@@ -4774,24 +4923,25 @@ msgstr ""
 "alglaadimise ajal anda rohkem teavet."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:204
+#: en/setupBootloader.xml:299
 msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
 msgstr ""
 "<emphasis role=\"bold\">Võõraste operatsioonisüsteemide otsimine</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:206
+#: en/setupBootloader.xml:301
+#, fuzzy
 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, "
-"then untick the Probe Foreign OS option."
+"then untick the <guimenuitem>Probe Foreign OS</guimenuitem> option."
 msgstr ""
 "Kui arvutisse peaks olema paigaldatud teisigi operatsioonisüsteeme, püüab "
 "Mageia lisada need oma alglaadimismenüüsse. Kui Te seda ei soovi, eemaldage "
 "märge kastikesest Võõraste operatsioonisüsteemide otsimine."
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:215
+#: en/setupBootloader.xml:311
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader4.png\"/> </imageobject> <imageobject condition=\"live"
@@ -4804,12 +4954,12 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:226
+#: en/setupBootloader.xml:322
 msgid "<emphasis>Video mode</emphasis>"
 msgstr "<emphasis>Ekraanilahutus</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:228
+#: en/setupBootloader.xml:324
 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 "
@@ -4820,17 +4970,18 @@ msgstr ""
 "valikute seast."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:234
+#: en/setupBootloader.xml:330
 msgid "<emphasis>Do not touch ESP or MBR</emphasis>"
 msgstr "<emphasis>ESP-i ega MBR-i ei puudutata</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:236
+#: en/setupBootloader.xml:332
+#, fuzzy
 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 "
-"missing. Click<emphasis> Ok</emphasis> if you are sure you understand the "
-"implications, and wish to proceed."
+"missing. Click <guimenuitem>Ok </guimenuitem>only if you are sure you "
+"understand the implications, and wish to proceed."
 msgstr ""
 "See tasub valida juhul, kui Mageia otsese laadimise asemel eelistatakse seda "
 "tööle panna teisest operatsioonisüsteemist ahellaadimisega. Näidatakse "
@@ -4838,8 +4989,17 @@ msgstr ""
 "täiesti kindel, et saate aru, mida see tähendab ja teeb ja tahate ikkagi "
 "jätkata."
 
+#. type: Content of: <section><section><section><itemizedlist><listitem><warning><para>
+#: en/setupBootloader.xml:338
+msgid ""
+"Chain-loading via legacy bootloaders (GRUB Legacy and LiLo)  is no longer "
+"supported by Mageia as it is likely to fail when attempting to boot this "
+"resulting installation of Mageia. If you use anything other than GRUB2 or "
+"rEFInd for this purpose, then you do so at your own risk!"
+msgstr ""
+
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:245
+#: en/setupBootloader.xml:348
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png"
 "\"/> </imageobject>"
@@ -4848,17 +5008,17 @@ msgstr ""
 "\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:253
+#: en/setupBootloader.xml:356
 msgid "Other Options"
 msgstr "Muud sätted"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:256
+#: en/setupBootloader.xml:359
 msgid "Using an existing bootloader"
 msgstr "Olemasoleva alglaaduri kasutamine"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:258
+#: en/setupBootloader.xml:361
 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 "
@@ -4873,12 +5033,12 @@ msgstr ""
 "dokumentatsiooni."
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:267
+#: en/setupBootloader.xml:370
 msgid "Installing Without a Bootloader"
 msgstr "Paigaldamine ilma alglaadurita"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:269
+#: en/setupBootloader.xml:372
 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 "
@@ -5295,3 +5455,46 @@ msgstr ""
 "Järgmisel sammul kopeeritakse failid kõvakettale. See võtab mõne minuti "
 "aega. Lõpus näeb mõnda aega tühja ekraani, millest ei tasu end heidutada "
 "lasta."
+
+#~ msgid ""
+#~ "Type in the user password. There is a shield at the end of the text box "
+#~ "that indicates the strength of the password. (See also <xref linkend="
+#~ "\"givePassword\"/>)"
+#~ msgstr ""
+#~ "Siin saab kirja panna kasutaja parooli. Tekstikasti lõpus on kilp, mis "
+#~ "näitab parooli tugevust (vt ka <link linkend=\"givePassword\">märkust</"
+#~ "link>)."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> "
+#~ "</imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> "
+#~ "</imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4."
+#~ "png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4."
+#~ "png\"/> </imageobject>"
+
+#~ msgid "Grub2 on Legacy MBR/GPT systems"
+#~ msgstr "Grub2 MBR/GPT pärandsüsteemis"
+
+#~ msgid "Grub2-efi on UEFI systems"
+#~ msgstr "Grub2-efi UEFI süsteemis"
+
+#~ msgid ""
+#~ "This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI "
+#~ "systems will not see this option here."
+#~ msgstr ""
+#~ "See valik on saadaval ainult MBR/BIOS-i pärandsüsteemis. UEFI süsteemi "
+#~ "kasutajad isegi ei näe seda."
diff --git a/docs/docs/stable/installer/eu.po b/docs/docs/stable/installer/eu.po
index 6855e7a0..781be6f7 100644
--- a/docs/docs/stable/installer/eu.po
+++ b/docs/docs/stable/installer/eu.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2019-01-19 21:23+0200\n"
+"POT-Creation-Date: 2019-09-08 15:26+0300\n"
 "PO-Revision-Date: 2019-06-18 19:22+0000\n"
 "Last-Translator: Egoitz Rodriguez <egoitzro@gmail.com>\n"
 "Language-Team: Basque (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -151,7 +151,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/addUser.xml:3
+#: en/addUser.xml:9
 msgid "User Management"
 msgstr ""
 
@@ -161,13 +161,16 @@ msgstr ""
 #. 2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
 #.   Also changed 'Advanced User Management' to 'User Management (advanced)'.
 #. 2018/02/24 apb: Changed list style.
+#. 2019/08/10 apb: Added missing 'condition' profile for live-user1.png.
+#. 2019/08/11 apb: [1] Reword 1.1 (including Note) [2] Reword 1.2 Password text.
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:12
+#: en/addUser.xml:28
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
-"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
-"\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata format="
-"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-setRootPassword.png\" format=\"PNG\" revision=\"1\" xml:id="
+"\"setRootPassword-im1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-user1.png\" format=\"PNG\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
 "\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -175,36 +178,41 @@ msgstr ""
 "\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:21
+#: en/addUser.xml:40
 msgid "Set Administrator (root)  Password:"
 msgstr "Ezarri administratzaile (root) pasahitza:"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:24
+#: en/addUser.xml:44
 msgid ""
 "It is advisable for all Mageia installations to set a <literal>superuser</"
 "literal> (Administrator) password, usually called the <emphasis>root </"
-"emphasis>password in Linux. As you type a password into the top box a shield "
-"will change from red-to-yellow-to-green depending on the strength of the "
-"password. A green shield shows you are using a strong password. You need to "
-"repeat the same password in the box underneath, to check that the first "
-"entry was not mistyped."
+"emphasis>password in Linux. You need to repeat the same password in the box "
+"underneath, to check that the first entry was not mistyped."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:32
+#: en/addUser.xml:51
+msgid ""
+"As you type a password into the top box a shield will change from red-to-"
+"yellow-to-green depending on the strength of the password. A green shield "
+"shows you are using a strong password."
+msgstr ""
+
+#. type: Content of: <section><section><note><para>
+#: en/addUser.xml:55
 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:39
+#: en/addUser.xml:63
 msgid "Enter a user"
 msgstr "Sartu erabiltzaile bat"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:41
+#: en/addUser.xml:66
 msgid ""
 "Add a User here. A regular user has fewer privileges than the "
 "<literal>superuser</literal> (root), but enough to use the Internet, office "
@@ -213,39 +221,39 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:47
+#: en/addUser.xml:73
 msgid "<emphasis role=\"bold\">Icon</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:48
+#: en/addUser.xml:75
 msgid "Click on this button if you want to change the user's icon"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:52
+#: en/addUser.xml:80
 msgid "<emphasis role=\"bold\">Real Name</emphasis>"
 msgstr "<emphasis role=\"bold\">Benetako Izena</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:53
+#: en/addUser.xml:82
 msgid "Insert the user's real name into this text box"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:56
+#: en/addUser.xml:86
 msgid "<emphasis role=\"bold\">Login Name</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:57
+#: en/addUser.xml:88
 msgid ""
 "Enter the user login name or let DrakX use a version of the user's real "
 "name. <emphasis role=\"bold\">The login name is case-sensitive.</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><caution><simpara>
-#: en/addUser.xml:61
+#: en/addUser.xml:93
 msgid ""
 "The login entered here should be different to any login currently in use for "
 "your <filename>/home</filename> directory. Some user parameters will be "
@@ -254,34 +262,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:65 en/setupBootloader.xml:124
+#: en/addUser.xml:102 en/setupBootloader.xml:182
 msgid "<emphasis role=\"bold\">Password</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:66
-msgid ""
-"Type in the user password. There is a shield at the end of the text box that "
-"indicates the strength of the password. (See also <xref linkend="
-"\"givePassword\"/>)"
+#: en/addUser.xml:104
+msgid "Type in the user password (remembering the advice in the Note above)."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:68
+#: en/addUser.xml:107
 msgid ""
 "<emphasis role=\"bold\">Password (again):</emphasis> Retype the user "
 "password. DrakX will check that you have not mistyped the password."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:74
+#: en/addUser.xml:114
 msgid ""
 "Any users added while installing Mageia, will have a home directory that is "
 "both read and write protected (umask=0027)"
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:76
+#: en/addUser.xml:117
 msgid ""
 "You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
@@ -289,24 +294,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:79
+#: en/addUser.xml:121
 msgid "The access permissions can also be changed after the install."
 msgstr "Sarbide baimena instalatu ondoren ere aldatu egin daiteke."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:85
+#: en/addUser.xml:128
 msgid "User Management (advanced)"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:87
+#: en/addUser.xml:131
 msgid ""
 "The <emphasis>Advanced</emphasis> option allows you to edit further settings "
 "for the user you are adding."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:91
+#: en/addUser.xml:136
 msgid ""
 "<emphasis>Shell</emphasis>: This drop-down list allows you to change the "
 "shell available to any user you added in the previous screen. Options are "
@@ -314,7 +319,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:143
 msgid ""
 "<emphasis>User ID</emphasis>: Here you can set the user ID for any user you "
 "added in the previous screen. If you are unsure what the purpose of this is, "
@@ -322,7 +327,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:102
+#: en/addUser.xml:149
 msgid ""
 "<emphasis>Group ID</emphasis>: This lets you set the group ID.  Again, if "
 "unsure, leave it blank."
@@ -449,24 +454,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:23
+#: en/bootLive.xml:10
 msgid "Boot Mageia as Live system"
 msgstr "Abiatu Mageia Zuzeneko sistema bezala"
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:28
+#: en/bootLive.xml:14
 msgid "Booting the medium"
 msgstr "Euskarria abiarazten"
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:31
+#: en/bootLive.xml:16
 msgid ""
 "You can boot directly from a Live DVD or USB. Usually, you just need to plug "
 "the USB device in or place the DVD in the drive and restart the computer."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:35
+#: en/bootLive.xml:19
 msgid ""
 "If the computer does not automatically boot from the USB or DVD you may need "
 "to reconfigure your BIOS Boot Disk priority. Alternatively, you might try "
@@ -475,7 +480,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><tip><para>
-#: en/bootLive.xml:41
+#: en/bootLive.xml:24
 msgid ""
 "To access the BIOS or boot menu when the computer is starting, you can try "
 "pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or <keycap>Esc</"
@@ -485,7 +490,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/bootLive.xml:50
+#: en/bootLive.xml:32
 msgid ""
 "The actual screen that you will first see when booting from the Live media "
 "will depend on whether your computer motherboard is of the Legacy (BIOS) or "
@@ -493,91 +498,94 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:58
+#: en/bootLive.xml:39
 msgid "In BIOS/CSM/Legacy mode"
 msgstr "BIOS/CSM/Legacy moduan"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:62
+#: en/bootLive.xml:42
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"../live-bootCSM.png\" align=\"center\"/> "
+"</imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-summaryTop.png\" align=\"center\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:67
+#: en/bootLive.xml:46
 msgid "First screen while booting in BIOS mode"
 msgstr "Lehen pantaila BIOS moduan abiarazten den bitartean"
 
 #. type: Content of: <section><section><section><itemizedlist><title>
-#: en/bootLive.xml:72 en/bootLive.xml:144 en/installer.xml:106
-#: en/installer.xml:154
+#: en/bootLive.xml:50 en/bootLive.xml:104 en/installer.xml:108
+#: en/installer.xml:156
 msgid "Menu"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:75 en/bootLive.xml:147
+#: en/bootLive.xml:52 en/bootLive.xml:106
 msgid "<emphasis role=\"bold\">Boot Mageia</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:77
+#: en/bootLive.xml:53
 msgid ""
 "This option will boot the Mageia Live system from the connected DVD/USB "
 "media (expect a very slow system compared to an installed OS)."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:81
+#: en/bootLive.xml:56
 msgid "Once the boot is done, you can proceed to the installation."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:86 en/bootLive.xml:102
+#: en/bootLive.xml:60 en/bootLive.xml:72
 msgid ""
 "<emphasis role=\"bold\">+ use non-free video drivers (slower to boot)</"
 "emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:89
+#: en/bootLive.xml:62
 msgid "Boot the Mageia Live system using non-free video drivers"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:96 en/bootLive.xml:155 en/installer.xml:109
+#: en/bootLive.xml:68 en/bootLive.xml:112 en/installer.xml:111
 msgid "<emphasis role=\"bold\">Install Mageia</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:98 en/bootLive.xml:157
+#: en/bootLive.xml:69 en/bootLive.xml:113
 msgid "This option will install Mageia to a hard disk."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:105
+#: en/bootLive.xml:74
 msgid "Install Mageia using non-free video drivers"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:111 en/installer.xml:125
+#: en/bootLive.xml:79 en/installer.xml:127
 msgid "<emphasis role=\"bold\">Memory Test</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:113 en/installer.xml:127
+#: en/bootLive.xml:80 en/installer.xml:129
 msgid ""
 "Test the installed RAM by performing multiple read and write operations. "
 "Reboot to end the test."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:118 en/bootLive.xml:161
+#: en/bootLive.xml:84 en/bootLive.xml:116
 msgid "<emphasis role=\"bold\"> F2 Language</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:120 en/bootLive.xml:163
+#: en/bootLive.xml:85 en/bootLive.xml:117
 msgid ""
 "Press <keycap>F2</keycap> to have the installer use a specific language "
 "during the installation. Use the arrow keys to select the language then "
@@ -585,24 +593,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:129
+#: en/bootLive.xml:93
 msgid "In UEFI mode"
 msgstr "UEFI moduan"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:133
+#: en/bootLive.xml:96
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:139
+#: en/bootLive.xml:100
 msgid "First screen while booting in UEFI mode"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:149
+#: en/bootLive.xml:107
 msgid ""
 "This option will boot the Mageia Live system from the connected DVD/USB "
 "media (expect a very slow system compared to an installed OS).  Once the "
@@ -610,7 +621,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/bootLive.xml:170
+#: en/bootLive.xml:123
 msgid ""
 "If you booted from a USB stick, you will see the above menu options "
 "duplicated, and in this case, you should choose from the menu pair that will "
@@ -836,12 +847,12 @@ msgstr ""
 "bertako orduan ezarrita dutela, edota UTC/GMT."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:24
+#: en/configureX_card_list.xml:27
 msgid "Choose an X Server (Configure your Graphic Card)"
 msgstr "Aukeratu X zerbitzari bat (Konfiguratu Txartel Grafikoa)"
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_card_list.xml:29
+#: en/configureX_card_list.xml:32
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_card_list."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_card_list-im1\"/> </"
@@ -849,7 +860,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:35
+#: en/configureX_card_list.xml:38
 msgid ""
 "DrakX has a very comprehensive database of video cards and will usually "
 "correctly identify your video device."
@@ -858,7 +869,7 @@ msgstr ""
 "behar bezala identifikatuko du."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:38
+#: en/configureX_card_list.xml:41
 msgid ""
 "If the installer has not correctly detected your graphic card and you know "
 "which one you have, you can select it from the tree by:"
@@ -867,22 +878,22 @@ msgstr ""
 "duzun baldin badakizu, hautatu ahal izango duzu zuhaitzean:"
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_card_list.xml:41 en/configureX_monitor.xml:74
+#: en/configureX_card_list.xml:44 en/configureX_monitor.xml:78
 msgid "Vendor"
 msgstr "Hornitzailea"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:45
+#: en/configureX_card_list.xml:48
 msgid "then the make of your card"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:49
+#: en/configureX_card_list.xml:52
 msgid "and the model of card"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:53
+#: en/configureX_card_list.xml:56
 msgid ""
 "If you cannot find your card in the vendor lists (because it's not yet in "
 "the database or it's an older card) you may find a suitable driver in the "
@@ -893,14 +904,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><caution><para>
-#: en/configureX_card_list.xml:61
+#: en/configureX_card_list.xml:64
 msgid ""
 "Be aware that if you select an incompatible driver you may only have access "
 "to the <emphasis>Command Line Interface</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:65
+#: en/configureX_card_list.xml:68
 msgid ""
 "Some video card manufacturers provide proprietary drivers for Linux which "
 "may only be available in the <emphasis>Nonfree</emphasis> repository and in "
@@ -911,17 +922,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:11
-msgid "Graphic Card and Monitor Configuration"
+#: en/configureX_chooser.xml:23
+#, fuzzy
+msgid "Graphics Card and Monitor Configuration"
 msgstr "Txartel Grafikoa eta Pantaila Konfigurazioa"
 
-#.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
-#. 2018/02/15 apb: Some text and typography.
-#. 2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.
-#. 2018/02/23 apb: Typo.
-#. 2019/01/06 apb: Slight reword, split 1st para in two.
 #. type: Content of: <section><mediaobject>
-#: en/configureX_chooser.xml:26
+#: en/configureX_chooser.xml:28
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_chooser."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_chooser-im1\"/> </"
@@ -929,7 +936,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:32
+#: en/configureX_chooser.xml:34
 msgid ""
 "No matter which graphical environment (also known as desktop environment) "
 "you chose for this install of Mageia, they are all based on a graphical user "
@@ -940,31 +947,32 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:39
+#: en/configureX_chooser.xml:41
 msgid ""
 "Choose the appropriate settings manually if you think the details are "
 "incorrect, or if none are shown."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:44
-msgid "<emphasis role=\"bold\">Graphic Card</emphasis>"
+#: en/configureX_chooser.xml:46
+#, fuzzy
+msgid "<emphasis role=\"bold\">Graphics Card</emphasis>"
 msgstr "<emphasis role=\"bold\">Txartel Grafikoa</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:47
+#: en/configureX_chooser.xml:49
 msgid ""
 "If you need to, you can select a specific card from this expandable list. "
 "See <xref linkend=\"configureX_card_list\"/>."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:52
+#: en/configureX_chooser.xml:54
 msgid "<emphasis role=\"bold\">Monitor</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:55
+#: en/configureX_chooser.xml:57
 msgid ""
 "You can choose Plug 'n Play, if applicable, or choose your monitor from the "
 "<emphasis>Vendor</emphasis> or <emphasis>Generic</emphasis> lists. Choose "
@@ -974,22 +982,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:63
+#: en/configureX_chooser.xml:65
 msgid "<emphasis role=\"bold\">Resolution</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:66
+#: en/configureX_chooser.xml:68
 msgid "The resolution and color depth of your monitor can be set here."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:71
+#: en/configureX_chooser.xml:73
 msgid "<emphasis role=\"bold\">Test</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:74
+#: en/configureX_chooser.xml:76
 msgid ""
 "The test button does not always appear during install. If the option is "
 "there, and you test your settings, you should be asked to confirm that your "
@@ -1001,17 +1009,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:85
+#: en/configureX_chooser.xml:87
 msgid "<emphasis role=\"bold\">Options</emphasis>"
 msgstr "<emphasis role=\"bold\">Aukerak</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:88
+#: en/configureX_chooser.xml:90
 msgid "Here you can choose to enable or disable various options."
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_chooser.xml:93
+#: en/configureX_chooser.xml:95
 msgid ""
 "There is a risk of damaging a monitor if you choose refresh rates that are "
 "outside the frequency range of that monitor. This applies to older CRT "
@@ -1020,12 +1028,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_monitor.xml:22
+#: en/configureX_monitor.xml:26
 msgid "Choosing your Monitor"
 msgstr "Aukeratu zure Pantaila"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:25
+#: en/configureX_monitor.xml:29
 msgid ""
 "DrakX has a very comprehensive database of monitors and will usually "
 "correctly identify yours."
@@ -1034,7 +1042,7 @@ msgstr ""
 "identifika dezake."
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:30
+#: en/configureX_monitor.xml:34
 msgid ""
 "<emphasis role=\"bold\">Selecting a monitor with different characteristics "
 "could damage your monitor or video hardware. Please don't try something "
@@ -1043,7 +1051,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:38
+#: en/configureX_monitor.xml:42
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
@@ -1054,12 +1062,12 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:46
+#: en/configureX_monitor.xml:50
 msgid "Custom"
 msgstr "Pertsonalizatua"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:49
+#: en/configureX_monitor.xml:53
 msgid ""
 "This option allows you to set two critical parameters: the vertical refresh "
 "rate and the horizontal sync rate. Vertical refresh determines how often the "
@@ -1068,7 +1076,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:55
+#: en/configureX_monitor.xml:59
 msgid ""
 "It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor "
 "type with a sync range that is beyond the capabilities of your monitor: you "
@@ -1081,58 +1089,59 @@ msgstr ""
 "ikusi zure pantailaren dokumentazioa."
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:64
+#: en/configureX_monitor.xml:68
 msgid "Plug'n Play"
 msgstr "Plug'n Play"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:67
+#: en/configureX_monitor.xml:71
 msgid ""
 "This is the default option and automatically tries to determine the monitor "
 "type from the monitor database."
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:77
+#: en/configureX_monitor.xml:81
+#, fuzzy
 msgid ""
 "If the installer has not correctly detected your monitor and you know which "
-"one you have, you can select it from the tree by selecting:"
+"one you have, you can choose it from the options by selecting:"
 msgstr ""
 "Instalatzaileak ez du behar bezala zure pantaila detektatu, eta zein duzun "
 "baldin badakizu, hautatu ahal izango duzu hautaketa zuhaitzean:"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:86
+#: en/configureX_monitor.xml:90
 msgid "Manufacturer"
 msgstr "Fabrikatzailea"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:90
+#: en/configureX_monitor.xml:94
 msgid "Monitor model"
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:96
+#: en/configureX_monitor.xml:100
 msgid "Generic"
 msgstr "Generikoa"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:99
+#: en/configureX_monitor.xml:103
 msgid ""
-"Selecting this group will list nearly 30 display configurations such as "
-"1024x768 @ 60Hz and includes flat-panel displays as used in laptops. This is "
-"often a good monitor selection group if you need to use the VESA card driver "
-"when your video hardware cannot be determined automatically.  Once again it "
-"may be wise to be conservative in your selections."
+"Selecting this group will list approximately 30 display configurations such "
+"as 1024x768 @ 60Hz and includes flat-panel displays as used in laptops.  "
+"This is often a good monitor selection group if you need to use the VESA "
+"card driver when your video hardware cannot be determined automatically. "
+"Once again, it may be wise to be conservative in your selections."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:22
+#: en/diskdrake.xml:24
 msgid "Custom Disk Partitioning with DiskDrake"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:27
+#: en/diskdrake.xml:29
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-diskdrake.png\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1140,7 +1149,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:38
+#: en/diskdrake.xml:40
 msgid ""
 "Modify the layout of your disk(s) here. You can remove or create partitions, "
 "change the filesystem or size of a partition and even view their details "
@@ -1148,15 +1157,15 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:47
 msgid ""
 "There is a tab at the top for every detected hard disk (or other storage "
-"device, like a USB key). In the screenshot above there are two available "
-"devices: <filename>sda </filename>and <filename>sdb</filename>."
+"device, like a USB key), for example: <filename>sda</filename>, "
+"<filename>sdb</filename>, <filename>sdc</filename> etc."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:52
+#: en/diskdrake.xml:54
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it. "
@@ -1165,21 +1174,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:60
+#: en/diskdrake.xml:62
 msgid ""
 "Continue until you have adjusted everything to your satisfaction, then click "
 "<emphasis>Done</emphasis> when you're ready."
 msgstr ""
 
 #. type: Content of: <section><warning><orderedlist><listitem><para>
-#: en/diskdrake.xml:69
+#: en/diskdrake.xml:71
 msgid ""
 "Take care with the <emphasis>Clear all</emphasis> option, use it only if you "
 "are sure you want to wipe all partitions on the selected storage device."
 msgstr ""
 
 #. type: Content of: <section><warning><orderedlist><listitem><para>
-#: en/diskdrake.xml:75
+#: en/diskdrake.xml:77
 msgid ""
 "If you wish to use encryption on your <filename>/</filename> partition you "
 "must ensure that you have a separate <filename>/boot</filename> partition. "
@@ -1188,7 +1197,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/diskdrake.xml:87
+#: en/diskdrake.xml:89
 msgid ""
 "If you are installing Mageia on a UEFI system, check that an ESP (EFI System "
 "Partition) is present and correctly mounted on <filename>/boot/EFI</"
@@ -1196,19 +1205,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/diskdrake.xml:93
+#: en/diskdrake.xml:95
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
 "partition is present and of the correct type. See Figure 2 below."
 msgstr ""
 
 #. type: Content of: <section><figure><title>
-#: en/diskdrake.xml:101
+#: en/diskdrake.xml:103
 msgid "EFI System Partition"
 msgstr "EFI sistema partizioa"
 
 #. type: Content of: <section><figure><mediaobject>
-#: en/diskdrake.xml:104
+#: en/diskdrake.xml:106
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-diskdrake2.png\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1216,17 +1225,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><figure>
-#: en/diskdrake.xml:103 en/diskdrake.xml:117
+#: en/diskdrake.xml:105 en/diskdrake.xml:119
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><figure><title>
-#: en/diskdrake.xml:115
+#: en/diskdrake.xml:117
 msgid "BIOS boot partition"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:118 en/doPartitionDisks.xml:201
+#: en/diskdrake.xml:120 en/doPartitionDisks.xml:206
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1249,26 +1258,26 @@ msgid "Partitioning"
 msgstr "Partizioa egiten"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:31
 msgid "Suggested Partitioning"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:34
 msgid ""
 "In this screen you can see the content of your hard drive(s) along with the "
 "DrakX partitioning proposals for where to install Mageia."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:34
+#: en/doPartitionDisks.xml:38
 msgid ""
 "The actual options available from those shown below will vary according to "
 "the layout and content of your particular hard drive(s)."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:39
+#: en/doPartitionDisks.xml:43
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1281,17 +1290,17 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><itemizedlist><title>
-#: en/doPartitionDisks.xml:49
+#: en/doPartitionDisks.xml:53
 msgid "Main Options"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:56
 msgid "<emphasis role=\"bold\">Use Existing Partitions</emphasis>"
 msgstr "<emphasis role=\"bold\">Erabili Dauden Partizioak</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:59
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1300,12 +1309,12 @@ msgstr ""
 "egin dira eta instalazioa erabili ahal izango du."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:61
+#: en/doPartitionDisks.xml:65
 msgid "<emphasis role=\"bold\">Use Free Space</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:68
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1314,57 +1323,54 @@ msgstr ""
 "erabiliko da zure Mageia instalazio berriarentzat."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:70
+#: en/doPartitionDisks.xml:74
 msgid ""
 "<emphasis role=\"bold\">Use Free Space on a Windows Partition</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:73
+#: en/doPartitionDisks.xml:77
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it. 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 important files!"
+"installation but see the warning below."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para><mediaobject>
+#: en/doPartitionDisks.xml:87
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:79
+#: en/doPartitionDisks.xml:82
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
 "light blue and the proposed Mageia partition in dark blue with their "
 "intended sizes just underneath. You have the option to modify these sizes by "
 "clicking and dragging the gap between both partitions.  See the following "
-"screenshot:"
-msgstr ""
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:87
-msgid "<emphasis role=\"bold\">Erase and use Entire Disk</emphasis>"
-msgstr ""
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:90
-msgid "This option will allocate the entire drive for Mageia"
+"screenshot:<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:97
 msgid ""
-"This will erase ALL data on the selected hard drive. Take care! 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 this option."
+"This involves shrinking the size of the Windows partition, and therefore is "
+"a risky operation, so you should make sure you have backed up all important "
+"files before proceeding."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><important><para>
-#: en/doPartitionDisks.xml:101
+#: en/doPartitionDisks.xml:103
+#, fuzzy
 msgid ""
-"Note that this involves shrinking the size of the Windows partition. The "
-"partition must be \"clean\", meaning that Windows must have closed down "
+"The partition must be \"clean\", meaning that Windows must have closed down "
 "correctly the last time it was used. It must also have been defragmented, "
 "although this is not a guarantee that all files in the partition have been "
-"moved out of the area that is about to be used. It is highly recommended to "
-"back up your personal files."
+"moved out of the area that is about to be used for Mageia."
 msgstr ""
 "Kontutan prozedura hori dakar Windows partizioaren tamaina murrizteko. "
 "Partizio honek \"garbi \" egon beharko du, hau da, Windows azken aldiz "
@@ -1375,11 +1381,29 @@ msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/doPartitionDisks.xml:112
-msgid "<emphasis role=\"bold\">Custom Disk Partitioning</emphasis>"
+msgid "<emphasis role=\"bold\">Erase and use Entire Disk</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/doPartitionDisks.xml:115
+msgid "This option will allocate the entire drive for Mageia"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><warning><para>
+#: en/doPartitionDisks.xml:119
+msgid ""
+"This will erase ALL data on the selected hard drive. Take care! 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 this option."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:127
+msgid "<emphasis role=\"bold\">Custom Disk Partitioning</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:130
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1387,17 +1411,8 @@ msgstr ""
 "Honek erabateko kontrola ematen dizu instalazioan jartzen zure disko "
 "gogorrean."
 
-#. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:122
-msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
-msgstr ""
-
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:131
+#: en/doPartitionDisks.xml:136
 msgid ""
 "If you are not using the <emphasis>Custom disk partitioning</emphasis> "
 "option, then the installer will allocate the available space according to "
@@ -1405,60 +1420,60 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:137
+#: en/doPartitionDisks.xml:142
 msgid ""
 "If the total available space is less than 50 GB, then only one partition is "
 "created. This will be the <filename>/</filename> (root)  partition."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:143
+#: en/doPartitionDisks.xml:148
 msgid ""
 "If the total available space is greater than 50 GB, then three partitions "
 "are created"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:148
+#: en/doPartitionDisks.xml:153
 msgid ""
 "6/19 of the total available place is allocated to <filename>/</filename> "
 "with a maximum of 50 GB"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:153
+#: en/doPartitionDisks.xml:158
 msgid "1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:158
+#: en/doPartitionDisks.xml:163
 msgid "the rest (at least 12/19) is allocated to <filename>/home</filename>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:165
+#: en/doPartitionDisks.xml:170
 msgid ""
 "This means that from 160 GB or greater available space, the installer will "
 "create three partitions:"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:170
+#: en/doPartitionDisks.xml:175
 msgid "50 GB for <filename>/</filename>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:174
+#: en/doPartitionDisks.xml:179
 msgid "4 GB for <filename>swap</filename>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:178
+#: en/doPartitionDisks.xml:183
 msgid "and the remainder for <filename>/home</filename>"
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:183
+#: en/doPartitionDisks.xml:188
 msgid ""
 "If you are using a UEFI system, the ESP (EFI System Partition) will be "
 "automatically detected - or created if it does not exist yet - and mounted "
@@ -1468,7 +1483,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:189
+#: en/doPartitionDisks.xml:194
 msgid ""
 "If you are using a Legacy (also known as BIOS) system with a GPT partitioned "
 "disk, you need to create a BIOS boot partition if it doesn't already exist. "
@@ -1479,19 +1494,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:196
+#: en/doPartitionDisks.xml:201
 msgid "See <xref linkend=\"diskdrake\"/> for information on how to proceed."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:211
+#: en/doPartitionDisks.xml:216
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4.png"
-"\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks4.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks4.png\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:217
+#: en/doPartitionDisks.xml:226
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
 "previous standard of 512. Due to lack of available hardware, the "
@@ -1500,7 +1522,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:222
+#: en/doPartitionDisks.xml:231
 msgid ""
 "Some SSD devices now use an erase block size over 1 MB. If you have such a "
 "device we suggest that you partition the drive in advance, using an "
@@ -1509,17 +1531,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:229
+#: en/doPartitionDisks.xml:238
 msgid "<emphasis>Align to</emphasis> = MiB"
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:233
+#: en/doPartitionDisks.xml:242
 msgid "<emphasis>Free space preceding (MiB)</emphasis> = 2"
 msgstr ""
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:237
+#: en/doPartitionDisks.xml:246
 msgid ""
 "Also make sure all partitions are created using an even number of megabytes."
 msgstr ""
@@ -1693,12 +1715,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/firewall.xml:7
+#: en/firewall.xml:16
 msgid "Firewall"
 msgstr "Suhesia"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:10
+#: en/firewall.xml:19
 msgid ""
 "This section allows you to configure some simple firewall rules: they "
 "determine which type of message from the Internet will be accepted by the "
@@ -1706,8 +1728,18 @@ msgid ""
 "system to be accessible from the Internet."
 msgstr ""
 
+#. type: Content of: <section><mediaobject>
+#: en/firewall.xml:26
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-firewall.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"Root.png\"/> </"
+"imageobject>"
+
 #. type: Content of: <section><para>
-#: en/firewall.xml:16
+#: en/firewall.xml:31
 msgid ""
 "In the default setting (no button is checked), no service of the system is "
 "accessible from the network. The <emphasis>Everything (no firewall)</"
@@ -1720,7 +1752,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:25
+#: en/firewall.xml:40
 msgid ""
 "All other options are more or less self-explanatory. As an example, you will "
 "enable the CUPS server if you want printers on your machine to be accessible "
@@ -1728,12 +1760,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:29
+#: en/firewall.xml:44
 msgid "<emphasis role=\"bold\">Advanced</emphasis>"
 msgstr "<emphasis role=\"bold\">Aurreratua</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:31
+#: en/firewall.xml:46
 msgid ""
 "The <emphasis>Advanced</emphasis> option opens a window where you can enable "
 "a series of services by typing a list of <quote>couples</quote> (blank "
@@ -1741,27 +1773,29 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:35
-msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
+#: en/firewall.xml:50
+#, fuzzy
+msgid "<emphasis>&lt;port-number&gt;/&lt;protocol&gt;</emphasis>"
 msgstr "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:38
+#: en/firewall.xml:53
 msgid ""
-"- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
-"the service you want to enable (e.g. 873 for the RSYNC service) as defined "
-"in <emphasis>RFC-433</emphasis>;"
+"- <emphasis>&lt;port-number&gt;</emphasis> is the value of the port assigned "
+"to the service you want to enable (e.g. 873 for the RSYNC service) as "
+"defined in <emphasis>RFC-433</emphasis>;"
 msgstr ""
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:42
+#: en/firewall.xml:57
 msgid ""
-"- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
-"<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
+"- <emphasis>&lt;protocol&gt;</emphasis> is one of <emphasis>TCP</emphasis> "
+"or <emphasis>UDP</emphasis> - the internet protocol that is used by the "
+"service."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:47
+#: en/firewall.xml:62
 msgid ""
 "For instance, the entry for enabling access to the RSYNC service therefore "
 "is <emphasis>873/tcp</emphasis>."
@@ -1770,7 +1804,7 @@ msgstr ""
 "emphasis> da."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:50
+#: en/firewall.xml:65
 msgid ""
 "In case a service is implemented to use both protocols, you specify 2 "
 "couples for the same port."
@@ -1840,12 +1874,12 @@ msgid "Graphical Configuration"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:32
+#: en/installer.xml:34
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, Mageia Instalatzilea"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:35
+#: en/installer.xml:37
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -1856,33 +1890,33 @@ msgstr ""
 "bezain erraz egiten laguntzeko."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:40
+#: en/installer.xml:42
 msgid "The installation steps"
 msgstr "Instalazio urratsak"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:44
+#: en/installer.xml:46
 msgid ""
 "The install process is divided into a number of steps - the status of which "
 "is indicated in a panel to the left of the screen."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:50
+#: en/installer.xml:52
 msgid ""
 "Each step has one or more screens, which may also have <emphasis>Advanced</"
 "emphasis> sections with extra, less commonly required options."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:56
+#: en/installer.xml:58
 msgid ""
 "Most screens have <emphasis>Help</emphasis> buttons for further details "
 "about the particular step."
 msgstr ""
 
 #. type: Content of: <section><section><caution><para>
-#: en/installer.xml:62
+#: en/installer.xml:64
 msgid ""
 "If at some point during the install you decide to abort the installation, it "
 "is possible to reboot, but please think twice before you do this. Once a "
@@ -1892,7 +1926,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><caution><para>
-#: en/installer.xml:68
+#: en/installer.xml:70
 msgid ""
 "If, in spite of this, you are very sure rebooting is what you want, go to a "
 "text terminal by pressing the keys <keycombo> <keycap>Ctrl</keycap> "
@@ -1902,12 +1936,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:86
+#: en/installer.xml:88
 msgid "Installation Welcome Screen"
 msgstr "Instalazio Ongi etorri Pantaila"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:88
+#: en/installer.xml:90
 msgid ""
 "The particular screen that you will first see when booting from the "
 "Installation media will depend on whether your computer motherboard is of "
@@ -1915,60 +1949,60 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:92
+#: en/installer.xml:94
 msgid ""
 "The welcome menu screen has various options, however the default option will "
 "start the installer, and is normally all that you will need."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:97
+#: en/installer.xml:99
 msgid "Legacy (BIOS) Systems"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:100
+#: en/installer.xml:102
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome.png\"/> </"
 "imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:111
+#: en/installer.xml:113
 msgid ""
 "Install Mageia to a hard disk. This is the default option, and will "
 "automatically start after a short while unless another option is selected."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:117
+#: en/installer.xml:119
 msgid "<emphasis role=\"bold\">Rescue System</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:119
+#: en/installer.xml:121
 msgid ""
 "This option allows you to either re-install the bootloader for an existing "
 "Mageia installation or you can use it to restore a Windows bootloader."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:132
+#: en/installer.xml:134
 msgid "<emphasis role=\"bold\">F2: Language</emphasis>"
 msgstr "<emphasis role=\"bold\">F2: Hizkuntza</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:134
+#: en/installer.xml:136
 msgid "Press F2 for alternative languages."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:140
+#: en/installer.xml:142
 msgid "UEFI Systems"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:142
+#: en/installer.xml:144
 msgid ""
 "From this screen, you can access options by pressing <keycap>e</keycap> to "
 "enter the edit mode. To come back to this screen, press <keycap>Esc</keycap> "
@@ -1976,19 +2010,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:148
+#: en/installer.xml:150
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome2.png\"/> </"
 "imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:157
+#: en/installer.xml:159
 msgid "<emphasis role=\"bold\">Install:</emphasis> Start the Install process"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:162
+#: en/installer.xml:164
 msgid ""
 "<emphasis role=\"bold\">Rescue:</emphasis> This option allows you to either "
 "re-install the bootloader for an existing Mageia installation or you can use "
@@ -1996,31 +2030,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:169
+#: en/installer.xml:171
 msgid ""
 "<emphasis role=\"bold\">F2: Language:</emphasis> Press <keycap>F2</keycap> "
 "for alternative languages."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:174
+#: en/installer.xml:176
 msgid ""
 "If you booted from a USB stick, you will see the above options duplicated, "
 "and in this case, you should use the set that will be suffixed with \"USB\"."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:181
+#: en/installer.xml:183
 msgid "Installation Problems and Possible Solutions"
 msgstr "Instalazio arazoak eta Konponbide Posibleak"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:184
+#: en/installer.xml:186
 msgid "No Graphical Interface"
 msgstr "Interfaze Grafikorik gabe"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:188
+#: en/installer.xml:190
 msgid ""
 "After the initial screen you did not progress to the <emphasis>Language "
 "Selection</emphasis> screen. This can happen with some graphic cards and "
@@ -2029,7 +2063,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:195
+#: en/installer.xml:197
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
 "In this case it is worth trying a text-mode installation. To use this press "
@@ -2040,12 +2074,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:208
+#: en/installer.xml:210
 msgid "The Install Freezes"
 msgstr "Instalatu Osagaiak"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:210
+#: en/installer.xml:212
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic hardware "
@@ -2055,12 +2089,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:218
+#: en/installer.xml:220
 msgid "RAM problem"
 msgstr "RAM arazoak"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:220
+#: en/installer.xml:222
 msgid ""
 "This will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
@@ -2070,12 +2104,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:228
+#: en/installer.xml:230
 msgid "Dynamic partitions"
 msgstr "Partizio dinamikoak"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:230
+#: en/installer.xml:232
 msgid ""
 "If you converted your hard disk from <literal>Basic</literal> format to "
 "<literal>Dynamic</literal> format in Microsoft Windows, then it is not "
@@ -3728,73 +3762,109 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:27
+#: en/setupBootloader.xml:32
 msgid "Bootloader"
 msgstr "Abio zamatzailea"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:31
+#: en/setupBootloader.xml:36
+#, fuzzy
+msgid "Available Bootloaders"
+msgstr "Abio zamatzailea"
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:39
 msgid "Grub2"
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><title>
-#: en/setupBootloader.xml:34
-msgid "Grub2 on Legacy MBR/GPT systems"
-msgstr ""
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:42
+#, fuzzy
+msgid "<emphasis role=\"bold\">Grub2 on Legacy MBR/GPT systems</emphasis>"
+msgstr "<emphasis role=\"bold\">F2: Hizkuntza</emphasis>"
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:37
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:46
 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:42
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:52
 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:49
-msgid "Grub2-efi on UEFI systems"
-msgstr "Grub2-efi UEFI sistemetan"
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:59
+#, fuzzy
+msgid "<emphasis role=\"bold\">Grub2-efi on UEFI systems</emphasis>"
+msgstr "<emphasis role=\"bold\">Aukerak</emphasis>"
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:52
-msgid "GRUB2-efi will be used exclusively as the bootloader for a UEFI system."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:63
+msgid "GRUB2-efi or rEFInd may be used as the bootloader for a UEFI system."
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:57
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:68
 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:60
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:71
 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 "
-"created by Windows and add grub2-efi to it. If no ESP exists, then one will "
+"created by Windows and add grub2-efi to it.  If no ESP exists, then one will "
 "be created. Although it is possible to have several ESPs, only one is "
 "required, whatever the number of operating systems you have."
 msgstr ""
 
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:82
+msgid "rEFInd"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:85
+#, fuzzy
+msgid "<emphasis role=\"bold\">rEFInd on UEFI systems</emphasis>"
+msgstr "<emphasis role=\"bold\">Proxiak</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:88
+msgid ""
+"rEFInd has a nice graphical set of options, and can auto-detect installed "
+"EFI bootloaders. See: http://www.rodsbooks.com/refind/"
+msgstr ""
+
+#. type: Content of: <section><section><section><note><para>
+#: en/setupBootloader.xml:95
+msgid ""
+"Please note that in order to be able to use the <literal>rEFInd</literal> "
+"option, an installed EFI System Partition must match your system "
+"architecture: if you have a 32bit EFI System Partition installed on a 64bit "
+"machine for instance, then the rEFInd option will not be displayed/available "
+"to you."
+msgstr ""
+
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:72
+#: en/setupBootloader.xml:106
 msgid "Bootloader Setup"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:76
+#: en/setupBootloader.xml:110
 msgid "Bootloader main options"
 msgstr "Abio kargatzailearen aukera nagusiak"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:79
+#: en/setupBootloader.xml:113
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader.png\"/> </imageobject> <imageobject condition=\"live"
@@ -3803,47 +3873,70 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:91
+#: en/setupBootloader.xml:125
 msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:93
+#. type: Content of: <section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:129
 msgid ""
-"This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI "
-"systems will not see this option here."
+"<guimenuitem>GRUB2</guimenuitem> (with either a graphical or a text menu), "
+"can be chosen for both <literal>Legacy MBR/BIOS</literal> systems and "
+"<literal>UEFI</literal> systems."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:136
+msgid ""
+"<guimenuitem>rEFInd</guimenuitem> (with a graphical menu)  is an alternative "
+"option solely for use with <literal>UEFI</literal> systems."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:98
+#: en/setupBootloader.xml:144
 msgid "<emphasis role=\"bold\">Boot device</emphasis>"
 msgstr ""
 
+#. type: Content of: <section><section><section><itemizedlist><listitem><warning><para>
+#: en/setupBootloader.xml:147
+#, fuzzy
+msgid "Don't change this unless you really know what you are doing."
+msgstr "Gauza bakarra aldatzen duzunean, oso ondo dakizu zer egiten ari zaren."
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><note><para>
+#: en/setupBootloader.xml:152
+msgid ""
+"There is no option to write GRUB to the boot sector of a partition (e.g: "
+"<filename>sda1</filename>), as this method is considered unreliable."
+msgstr ""
+
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:100
-msgid "Don't change this unless you really know what you are doing"
+#: en/setupBootloader.xml:157
+msgid ""
+"When using UEFI mode, then the <guilabel>Boot device</guilabel> will be "
+"listed as <guimenuitem>EFI System Partition</guimenuitem>."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:105
+#: en/setupBootloader.xml:163
 msgid ""
 "<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:108
+#: en/setupBootloader.xml:166
 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:113
+#: en/setupBootloader.xml:171
 msgid "<emphasis role=\"bold\">Security</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:115
+#: en/setupBootloader.xml:173
 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 "
@@ -3853,34 +3946,34 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:126
+#: en/setupBootloader.xml:184
 msgid "Choose a password for the bootloader (optional)"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:130
+#: en/setupBootloader.xml:188
 msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:132
+#: en/setupBootloader.xml:190
 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:137 en/setupBootloader.xml:212
+#: en/setupBootloader.xml:195 en/setupBootloader.xml:308
 msgid "<emphasis>Advanced</emphasis>"
 msgstr "<emphasis>Aurreratuak</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:141
+#: en/setupBootloader.xml:199
 msgid "<emphasis>Enable ACPI</emphasis>"
 msgstr "<emphasis>Gaitu ACPI</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:143
+#: en/setupBootloader.xml:201
 msgid ""
 "ACPI (Advanced Configuration and Power Interface) is a standard for power "
 "management. It can save energy by stopping unused devices. Deselecting it "
@@ -3890,24 +3983,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:152
+#: en/setupBootloader.xml:210
 msgid "<emphasis>Enable SMP</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:154
+#: en/setupBootloader.xml:212
 msgid ""
 "This option enables/disables symmetric multiprocessing for multi-core "
 "processors"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:159
+#: en/setupBootloader.xml:217
 msgid "<emphasis>Enable APIC</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:161
+#: en/setupBootloader.xml:219
 msgid ""
 "Enabling this gives the operating system access to the Advanced Programmable "
 "Interrupt Controller. APIC devices permit more complex priority models, and "
@@ -3915,24 +4008,82 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:168
+#: en/setupBootloader.xml:226
 msgid "<emphasis>Enable Local APIC</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:170
+#: en/setupBootloader.xml:228
 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:177
+#: en/setupBootloader.xml:235
 msgid "Bootloader Configuration"
 msgstr "Abio zamatzailearen konfiguraketa"
 
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:237
+msgid ""
+"If, in the previous section you selected <literal>rEFInd</literal> as the "
+"bootloader to use, you would then be presented with the options shown in the "
+"screenshot directly below. Otherwise, please instead move on to the "
+"subsequent screenshot for your options."
+msgstr ""
+
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:180
+#: en/setupBootloader.xml:243
+#, fuzzy
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"rEFIndLoaderConfig.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-rEFIndLoaderConfig.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:253
+#, fuzzy
+msgid "Your rEFInd configuration options:"
+msgstr "Soinu Konfiguraketa"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:256
+msgid ""
+"<guimenuitem>Install or update rEFInd in the EFI system partition.</"
+"guimenuitem>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:261
+msgid ""
+"<guimenuitem>Install in EFI/Boot partition (workaround for some BIOS's).</"
+"guimenuitem>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:264
+msgid ""
+"With some BIOS's, the newly written bootloaser for Mageia at end of the "
+"installation will not be recognized. In that case, you can use this option "
+"as a workaround for the issue."
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:270
+msgid ""
+"If you did not select rEFInd as the bootloader to use in the previous "
+"section, then your bootloader configurations are shown below:"
+msgstr ""
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:275
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -3945,42 +4096,42 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:191
+#: en/setupBootloader.xml:286
 msgid "<emphasis role=\"bold\">Default</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:193
+#: en/setupBootloader.xml:288
 msgid "The operating system to be started up by default."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:197
+#: en/setupBootloader.xml:292
 msgid "<emphasis role=\"bold\">Append</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:199
+#: en/setupBootloader.xml:294
 msgid ""
 "This option lets you pass information to the kernel 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:204
+#: en/setupBootloader.xml:299
 msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:206
+#: en/setupBootloader.xml:301
 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, "
-"then untick the Probe Foreign OS option."
+"then untick the <guimenuitem>Probe Foreign OS</guimenuitem> option."
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:215
+#: en/setupBootloader.xml:311
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader4.png\"/> </imageobject> <imageobject condition=\"live"
@@ -3989,12 +4140,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:226
+#: en/setupBootloader.xml:322
 msgid "<emphasis>Video mode</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:228
+#: en/setupBootloader.xml:324
 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 "
@@ -4002,38 +4153,47 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:234
+#: en/setupBootloader.xml:330
 msgid "<emphasis>Do not touch ESP or MBR</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:236
+#: en/setupBootloader.xml:332
 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 "
-"missing. Click<emphasis> Ok</emphasis> if you are sure you understand the "
-"implications, and wish to proceed."
+"missing. Click <guimenuitem>Ok </guimenuitem>only if you are sure you "
+"understand the implications, and wish to proceed."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><warning><para>
+#: en/setupBootloader.xml:338
+msgid ""
+"Chain-loading via legacy bootloaders (GRUB Legacy and LiLo)  is no longer "
+"supported by Mageia as it is likely to fail when attempting to boot this "
+"resulting installation of Mageia. If you use anything other than GRUB2 or "
+"rEFInd for this purpose, then you do so at your own risk!"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:245
+#: en/setupBootloader.xml:348
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png"
 "\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:253
+#: en/setupBootloader.xml:356
 msgid "Other Options"
 msgstr "Beste aukera batzuk"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:256
+#: en/setupBootloader.xml:359
 msgid "Using an existing bootloader"
 msgstr "Existitzen den abio kargatzaile bat erabiliz"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:258
+#: en/setupBootloader.xml:361
 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 "
@@ -4043,12 +4203,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:267
+#: en/setupBootloader.xml:370
 msgid "Installing Without a Bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:269
+#: en/setupBootloader.xml:372
 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 "
@@ -4387,3 +4547,6 @@ msgid ""
 "take a little while to complete. When it is finishing you will briefly get a "
 "blank screen - this is normal."
 msgstr ""
+
+#~ msgid "Grub2-efi on UEFI systems"
+#~ msgstr "Grub2-efi UEFI sistemetan"
diff --git a/docs/docs/stable/installer/fr.po b/docs/docs/stable/installer/fr.po
index a1fe910f..35729e83 100644
--- a/docs/docs/stable/installer/fr.po
+++ b/docs/docs/stable/installer/fr.po
@@ -29,7 +29,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2019-01-19 21:23+0200\n"
+"POT-Creation-Date: 2019-09-08 15:26+0300\n"
 "PO-Revision-Date: 2019-07-11 17:15+0000\n"
 "Last-Translator: Yves Brungard\n"
 "Language-Team: French (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -196,7 +196,7 @@ msgstr ""
 "trouvera les paquetages 32 bits nécessaires."
 
 #. type: Content of: <section><info><title>
-#: en/addUser.xml:3
+#: en/addUser.xml:9
 msgid "User Management"
 msgstr "Gestion des utilisateurs"
 
@@ -206,13 +206,16 @@ msgstr "Gestion des utilisateurs"
 #. 2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
 #.   Also changed 'Advanced User Management' to 'User Management (advanced)'.
 #. 2018/02/24 apb: Changed list style.
+#. 2019/08/10 apb: Added missing 'condition' profile for live-user1.png.
+#. 2019/08/11 apb: [1] Reword 1.1 (including Note) [2] Reword 1.2 Password text.
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:12
+#: en/addUser.xml:28
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
-"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
-"\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata format="
-"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-setRootPassword.png\" format=\"PNG\" revision=\"1\" xml:id="
+"\"setRootPassword-im1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-user1.png\" format=\"PNG\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
 "\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -220,20 +223,18 @@ msgstr ""
 "\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:21
+#: en/addUser.xml:40
 msgid "Set Administrator (root)  Password:"
 msgstr "Définir le mot de passe Administrateur (Root) :"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:24
+#: en/addUser.xml:44
+#, fuzzy
 msgid ""
 "It is advisable for all Mageia installations to set a <literal>superuser</"
 "literal> (Administrator) password, usually called the <emphasis>root </"
-"emphasis>password in Linux. As you type a password into the top box a shield "
-"will change from red-to-yellow-to-green depending on the strength of the "
-"password. A green shield shows you are using a strong password. You need to "
-"repeat the same password in the box underneath, to check that the first "
-"entry was not mistyped."
+"emphasis>password in Linux. You need to repeat the same password in the box "
+"underneath, to check that the first entry was not mistyped."
 msgstr ""
 "Pour chaque installation de Mageia, il est conseillé de définir un mot de "
 "passe <emphasis role=\"bold\">superutilisateur</emphasis> (ou "
@@ -245,7 +246,15 @@ msgstr ""
 "n'y a pas d'erreur de saisie."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:32
+#: en/addUser.xml:51
+msgid ""
+"As you type a password into the top box a shield will change from red-to-"
+"yellow-to-green depending on the strength of the password. A green shield "
+"shows you are using a strong password."
+msgstr ""
+
+#. type: Content of: <section><section><note><para>
+#: en/addUser.xml:55
 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."
@@ -255,12 +264,12 @@ msgstr ""
 "autres caractères dans votre mot de passe."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:39
+#: en/addUser.xml:63
 msgid "Enter a user"
 msgstr "Indiquer un utilisateur"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:41
+#: en/addUser.xml:66
 msgid ""
 "Add a User here. A regular user has fewer privileges than the "
 "<literal>superuser</literal> (root), but enough to use the Internet, office "
@@ -273,32 +282,32 @@ msgstr ""
 "vidéo ainsi que toutes les utilisations normales d'un ordinateur. "
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:47
+#: en/addUser.xml:73
 msgid "<emphasis role=\"bold\">Icon</emphasis>"
 msgstr "<emphasis role=\"bold\">Icône</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:48
+#: en/addUser.xml:75
 msgid "Click on this button if you want to change the user's icon"
 msgstr "Cliquez sur ce bouton si vous voulez changer l'icône de l'utilisateur"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:52
+#: en/addUser.xml:80
 msgid "<emphasis role=\"bold\">Real Name</emphasis>"
 msgstr "<emphasis role=\"bold\">Nom complet</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:53
+#: en/addUser.xml:82
 msgid "Insert the user's real name into this text box"
 msgstr "Indiquez ici le nom complet de l'utilisateur"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:56
+#: en/addUser.xml:86
 msgid "<emphasis role=\"bold\">Login Name</emphasis>"
 msgstr "<emphasis role=\"bold\">Identifiant</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:57
+#: en/addUser.xml:88
 msgid ""
 "Enter the user login name or let DrakX use a version of the user's real "
 "name. <emphasis role=\"bold\">The login name is case-sensitive.</emphasis>"
@@ -308,7 +317,7 @@ msgstr ""
 "est sensible à la casse.</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><caution><simpara>
-#: en/addUser.xml:61
+#: en/addUser.xml:93
 msgid ""
 "The login entered here should be different to any login currently in use for "
 "your <filename>/home</filename> directory. Some user parameters will be "
@@ -321,23 +330,17 @@ msgstr ""
 "existants, par exemple les paramètres de Firefox, Thunderbird ou Kmail..."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:65 en/setupBootloader.xml:124
+#: en/addUser.xml:102 en/setupBootloader.xml:182
 msgid "<emphasis role=\"bold\">Password</emphasis>"
 msgstr "<emphasis role=\"bold\">Mot de passe</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:66
-msgid ""
-"Type in the user password. There is a shield at the end of the text box that "
-"indicates the strength of the password. (See also <xref linkend="
-"\"givePassword\"/>)"
+#: en/addUser.xml:104
+msgid "Type in the user password (remembering the advice in the Note above)."
 msgstr ""
-"Indiquez dans ce champ le mot de passe utilisateur. On retrouve à droite le "
-"bouclier qui indique la force du mot de passe. (voir aussi <xref linkend="
-"\"givePassword\"/>)"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:68
+#: en/addUser.xml:107
 msgid ""
 "<emphasis role=\"bold\">Password (again):</emphasis> Retype the user "
 "password. DrakX will check that you have not mistyped the password."
@@ -346,7 +349,7 @@ msgstr ""
 "de passe et Drakx va vérifier qu'il est bien identique au précédent."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:74
+#: en/addUser.xml:114
 msgid ""
 "Any users added while installing Mageia, will have a home directory that is "
 "both read and write protected (umask=0027)"
@@ -355,7 +358,7 @@ msgstr ""
 "répertoire /home protégé en lecture et en écriture (umask=0027)."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:76
+#: en/addUser.xml:117
 msgid ""
 "You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
@@ -366,18 +369,18 @@ msgstr ""
 "emphasis>. Choisir <emphasis>Gestion des utilisateurs</emphasis> "
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:79
+#: en/addUser.xml:121
 msgid "The access permissions can also be changed after the install."
 msgstr ""
 "Les permissions d'accès peuvent aussi être changées après l'installation."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:85
+#: en/addUser.xml:128
 msgid "User Management (advanced)"
 msgstr "Gestion des utilisateurs (avancé)"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:87
+#: en/addUser.xml:131
 msgid ""
 "The <emphasis>Advanced</emphasis> option allows you to edit further settings "
 "for the user you are adding."
@@ -386,7 +389,7 @@ msgstr ""
 "les paramètres pour l'utilisateur que vous avez ajouté."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:91
+#: en/addUser.xml:136
 msgid ""
 "<emphasis>Shell</emphasis>: This drop-down list allows you to change the "
 "shell available to any user you added in the previous screen. Options are "
@@ -398,7 +401,7 @@ msgstr ""
 "<literal>Dash</literal> et <literal>Sh</literal>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:143
 msgid ""
 "<emphasis>User ID</emphasis>: Here you can set the user ID for any user you "
 "added in the previous screen. If you are unsure what the purpose of this is, "
@@ -409,7 +412,7 @@ msgstr ""
 "précédent. En cas de doute, laissez ce champs vide. "
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:102
+#: en/addUser.xml:149
 msgid ""
 "<emphasis>Group ID</emphasis>: This lets you set the group ID.  Again, if "
 "unsure, leave it blank."
@@ -568,17 +571,17 @@ msgstr ""
 "synchronisation automatique de l'heure et spécifier un serveur NTP."
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:23
+#: en/bootLive.xml:10
 msgid "Boot Mageia as Live system"
 msgstr "Démarrer Mageia comme système Live"
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:28
+#: en/bootLive.xml:14
 msgid "Booting the medium"
 msgstr "Démarrer"
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:31
+#: en/bootLive.xml:16
 msgid ""
 "You can boot directly from a Live DVD or USB. Usually, you just need to plug "
 "the USB device in or place the DVD in the drive and restart the computer."
@@ -588,7 +591,7 @@ msgstr ""
 "DVD dans le lecteur, puis redémarrer l'ordinateur."
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:35
+#: en/bootLive.xml:19
 msgid ""
 "If the computer does not automatically boot from the USB or DVD you may need "
 "to reconfigure your BIOS Boot Disk priority. Alternatively, you might try "
@@ -601,7 +604,7 @@ msgstr ""
 "de démarrage pour sélectionner sur lequel l'ordinateur va démarrer."
 
 #. type: Content of: <section><section><tip><para>
-#: en/bootLive.xml:41
+#: en/bootLive.xml:24
 msgid ""
 "To access the BIOS or boot menu when the computer is starting, you can try "
 "pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or <keycap>Esc</"
@@ -617,7 +620,7 @@ msgstr ""
 "utilisées, mais il est possible que ça soit une autre touche. "
 
 #. type: Content of: <section><section><note><para>
-#: en/bootLive.xml:50
+#: en/bootLive.xml:32
 msgid ""
 "The actual screen that you will first see when booting from the Live media "
 "will depend on whether your computer motherboard is of the Legacy (BIOS) or "
@@ -628,37 +631,38 @@ msgstr ""
 "l'ancien système BIOS ou si elle est UEFI."
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:58
+#: en/bootLive.xml:39
 msgid "In BIOS/CSM/Legacy mode"
 msgstr "Dans le mode Bios, csm ou legacy"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:62
+#: en/bootLive.xml:42
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"../live-bootCSM.png\" align=\"center\"/> "
+"</imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> </"
+"<imageobject><imagedata fileref=\"dx2-summaryTop.png\" align=\"center\"/></"
 "imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:67
+#: en/bootLive.xml:46
 msgid "First screen while booting in BIOS mode"
 msgstr "Premier écran lors du démarrage en mode BIOS"
 
 #. type: Content of: <section><section><section><itemizedlist><title>
-#: en/bootLive.xml:72 en/bootLive.xml:144 en/installer.xml:106
-#: en/installer.xml:154
+#: en/bootLive.xml:50 en/bootLive.xml:104 en/installer.xml:108
+#: en/installer.xml:156
 msgid "Menu"
 msgstr "Menu"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:75 en/bootLive.xml:147
+#: en/bootLive.xml:52 en/bootLive.xml:106
 msgid "<emphasis role=\"bold\">Boot Mageia</emphasis>"
 msgstr "<emphasis role=\"bold\">Démarrer Mageia</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:77
+#: en/bootLive.xml:53
 msgid ""
 "This option will boot the Mageia Live system from the connected DVD/USB "
 "media (expect a very slow system compared to an installed OS)."
@@ -668,13 +672,13 @@ msgstr ""
 "disque dur)."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:81
+#: en/bootLive.xml:56
 msgid "Once the boot is done, you can proceed to the installation."
 msgstr ""
 "Une fois que le système a démarré, vous pourrez procéder à l'installation."
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:86 en/bootLive.xml:102
+#: en/bootLive.xml:60 en/bootLive.xml:72
 msgid ""
 "<emphasis role=\"bold\">+ use non-free video drivers (slower to boot)</"
 "emphasis>"
@@ -683,35 +687,35 @@ msgstr ""
 "(Démarrage plus lent)</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:89
+#: en/bootLive.xml:62
 msgid "Boot the Mageia Live system using non-free video drivers"
 msgstr ""
 "Démarrage de Mageia Live en utilisant des pilotes vidéos propriétaires."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:96 en/bootLive.xml:155 en/installer.xml:109
+#: en/bootLive.xml:68 en/bootLive.xml:112 en/installer.xml:111
 msgid "<emphasis role=\"bold\">Install Mageia</emphasis>"
 msgstr "<emphasis role=\"bold\">Installer Mageia</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:98 en/bootLive.xml:157
+#: en/bootLive.xml:69 en/bootLive.xml:113
 msgid "This option will install Mageia to a hard disk."
 msgstr ""
 "Installer Mageia : ce choix installera Mageia directement sur votre disque "
 "dur."
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:105
+#: en/bootLive.xml:74
 msgid "Install Mageia using non-free video drivers"
 msgstr "Installer Mageia en utilisant les pilotes vidéos propriétaires."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:111 en/installer.xml:125
+#: en/bootLive.xml:79 en/installer.xml:127
 msgid "<emphasis role=\"bold\">Memory Test</emphasis>"
 msgstr "<emphasis role=\"bold\">Test de la mémoire vive</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:113 en/installer.xml:127
+#: en/bootLive.xml:80 en/installer.xml:129
 msgid ""
 "Test the installed RAM by performing multiple read and write operations. "
 "Reboot to end the test."
@@ -720,12 +724,12 @@ msgstr ""
 "d'écriture. L'ordinateur redémarrera à la fin du test. "
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:118 en/bootLive.xml:161
+#: en/bootLive.xml:84 en/bootLive.xml:116
 msgid "<emphasis role=\"bold\"> F2 Language</emphasis>"
 msgstr "<emphasis role=\"bold\">F2 Langage</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:120 en/bootLive.xml:163
+#: en/bootLive.xml:85 en/bootLive.xml:117
 msgid ""
 "Press <keycap>F2</keycap> to have the installer use a specific language "
 "during the installation. Use the arrow keys to select the language then "
@@ -736,26 +740,27 @@ msgstr ""
 "sélectionner la langue, et appuyez sur <keycap>Entrer</keycap>. "
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:129
+#: en/bootLive.xml:93
 msgid "In UEFI mode"
 msgstr "En mode UEFI"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:133
+#: en/bootLive.xml:96
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject><imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/></imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:139
+#: en/bootLive.xml:100
 msgid "First screen while booting in UEFI mode"
 msgstr "Premier écran lors du démarrage en mode UEFI"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:149
+#: en/bootLive.xml:107
 msgid ""
 "This option will boot the Mageia Live system from the connected DVD/USB "
 "media (expect a very slow system compared to an installed OS).  Once the "
@@ -766,7 +771,7 @@ msgstr ""
 "disque dur). Une fois démarré, vous pourrez procéder à l'installation."
 
 #. type: Content of: <section><section><note><para>
-#: en/bootLive.xml:170
+#: en/bootLive.xml:123
 msgid ""
 "If you booted from a USB stick, you will see the above menu options "
 "duplicated, and in this case, you should choose from the menu pair that will "
@@ -1040,12 +1045,12 @@ msgstr ""
 "tous être réglés sur la même heure (heure locale ou GMT/UTC)."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:24
+#: en/configureX_card_list.xml:27
 msgid "Choose an X Server (Configure your Graphic Card)"
 msgstr "Choisissez un serveur d'affichage (serveur X)"
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_card_list.xml:29
+#: en/configureX_card_list.xml:32
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_card_list."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_card_list-im1\"/> </"
@@ -1056,7 +1061,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:35
+#: en/configureX_card_list.xml:38
 msgid ""
 "DrakX has a very comprehensive database of video cards and will usually "
 "correctly identify your video device."
@@ -1065,7 +1070,7 @@ msgstr ""
 "graphiques et identifie en général correctement votre matériel."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:38
+#: en/configureX_card_list.xml:41
 msgid ""
 "If the installer has not correctly detected your graphic card and you know "
 "which one you have, you can select it from the tree by:"
@@ -1074,22 +1079,22 @@ msgstr ""
 "vous connaissez celle-ci, vous pouvez le sélectionner dans l'arborescence :"
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_card_list.xml:41 en/configureX_monitor.xml:74
+#: en/configureX_card_list.xml:44 en/configureX_monitor.xml:78
 msgid "Vendor"
 msgstr "Fabricant"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:45
+#: en/configureX_card_list.xml:48
 msgid "then the make of your card"
 msgstr "puis, la marque de votre carte"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:49
+#: en/configureX_card_list.xml:52
 msgid "and the model of card"
 msgstr "et le modèle de la carte"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:53
+#: en/configureX_card_list.xml:56
 msgid ""
 "If you cannot find your card in the vendor lists (because it's not yet in "
 "the database or it's an older card) you may find a suitable driver in the "
@@ -1105,7 +1110,7 @@ msgstr ""
 "utilisez le pilote VESA, qui fournit les fonctionnalités de base."
 
 #. type: Content of: <section><caution><para>
-#: en/configureX_card_list.xml:61
+#: en/configureX_card_list.xml:64
 msgid ""
 "Be aware that if you select an incompatible driver you may only have access "
 "to the <emphasis>Command Line Interface</emphasis>"
@@ -1114,7 +1119,7 @@ msgstr ""
 "emphasis> si le pilote sélectionné est inadapté."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:65
+#: en/configureX_card_list.xml:68
 msgid ""
 "Some video card manufacturers provide proprietary drivers for Linux which "
 "may only be available in the <emphasis>Nonfree</emphasis> repository and in "
@@ -1131,17 +1136,13 @@ msgstr ""
 "devrez le faire après le premier redémarrage. "
 
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:11
-msgid "Graphic Card and Monitor Configuration"
+#: en/configureX_chooser.xml:23
+#, fuzzy
+msgid "Graphics Card and Monitor Configuration"
 msgstr "Configuration de X, de la carte graphique et du moniteur"
 
-#.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
-#. 2018/02/15 apb: Some text and typography.
-#. 2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.
-#. 2018/02/23 apb: Typo.
-#. 2019/01/06 apb: Slight reword, split 1st para in two.
 #. type: Content of: <section><mediaobject>
-#: en/configureX_chooser.xml:26
+#: en/configureX_chooser.xml:28
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_chooser."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_chooser-im1\"/> </"
@@ -1152,7 +1153,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:32
+#: en/configureX_chooser.xml:34
 msgid ""
 "No matter which graphical environment (also known as desktop environment) "
 "you chose for this install of Mageia, they are all based on a graphical user "
@@ -1169,7 +1170,7 @@ msgstr ""
 "doivent être corrects. "
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:39
+#: en/configureX_chooser.xml:41
 msgid ""
 "Choose the appropriate settings manually if you think the details are "
 "incorrect, or if none are shown."
@@ -1178,12 +1179,13 @@ msgstr ""
 "détails sont incorrects, ou si rien n'est affiché."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:44
-msgid "<emphasis role=\"bold\">Graphic Card</emphasis>"
+#: en/configureX_chooser.xml:46
+#, fuzzy
+msgid "<emphasis role=\"bold\">Graphics Card</emphasis>"
 msgstr "<emphasis role=\"bold\">Carte graphique</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:47
+#: en/configureX_chooser.xml:49
 msgid ""
 "If you need to, you can select a specific card from this expandable list. "
 "See <xref linkend=\"configureX_card_list\"/>."
@@ -1192,12 +1194,12 @@ msgstr ""
 "cette liste déroulante. Voir <xref linkend=\"configureX_card_list\"/>."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:52
+#: en/configureX_chooser.xml:54
 msgid "<emphasis role=\"bold\">Monitor</emphasis>"
 msgstr "<emphasis role=\"bold\">Moniteur</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:55
+#: en/configureX_chooser.xml:57
 msgid ""
 "You can choose Plug 'n Play, if applicable, or choose your monitor from the "
 "<emphasis>Vendor</emphasis> or <emphasis>Generic</emphasis> lists. Choose "
@@ -1213,23 +1215,23 @@ msgstr ""
 "\"configureX_monitor\"/>."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:63
+#: en/configureX_chooser.xml:65
 msgid "<emphasis role=\"bold\">Resolution</emphasis>"
 msgstr "<emphasis role=\"bold\">Résolution</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:66
+#: en/configureX_chooser.xml:68
 msgid "The resolution and color depth of your monitor can be set here."
 msgstr ""
 "Indiquez ici la résolution et la profondeur de couleurs de votre moniteur."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:71
+#: en/configureX_chooser.xml:73
 msgid "<emphasis role=\"bold\">Test</emphasis>"
 msgstr "<emphasis role=\"bold\">Test</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:74
+#: en/configureX_chooser.xml:76
 msgid ""
 "The test button does not always appear during install. If the option is "
 "there, and you test your settings, you should be asked to confirm that your "
@@ -1248,17 +1250,17 @@ msgstr ""
 "disponible, redoublez de précautions dans le choix des paramètres."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:85
+#: en/configureX_chooser.xml:87
 msgid "<emphasis role=\"bold\">Options</emphasis>"
 msgstr "<emphasis role=\"bold\">Options</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:88
+#: en/configureX_chooser.xml:90
 msgid "Here you can choose to enable or disable various options."
 msgstr "Choisir ici de valider ou d'invalider différentes options."
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_chooser.xml:93
+#: en/configureX_chooser.xml:95
 msgid ""
 "There is a risk of damaging a monitor if you choose refresh rates that are "
 "outside the frequency range of that monitor. This applies to older CRT "
@@ -1271,12 +1273,12 @@ msgstr ""
 "et entreront en mode veille."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_monitor.xml:22
+#: en/configureX_monitor.xml:26
 msgid "Choosing your Monitor"
 msgstr "Choisissez un moniteur"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:25
+#: en/configureX_monitor.xml:29
 msgid ""
 "DrakX has a very comprehensive database of monitors and will usually "
 "correctly identify yours."
@@ -1285,7 +1287,7 @@ msgstr ""
 "votre matériel est bien identifié."
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:30
+#: en/configureX_monitor.xml:34
 msgid ""
 "<emphasis role=\"bold\">Selecting a monitor with different characteristics "
 "could damage your monitor or video hardware. Please don't try something "
@@ -1298,7 +1300,7 @@ msgstr ""
 "doute, consultez la documentation de votre moniteur. "
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:38
+#: en/configureX_monitor.xml:42
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
@@ -1309,12 +1311,12 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:46
+#: en/configureX_monitor.xml:50
 msgid "Custom"
 msgstr "Partitionnement de disque personnalisé"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:49
+#: en/configureX_monitor.xml:53
 msgid ""
 "This option allows you to set two critical parameters: the vertical refresh "
 "rate and the horizontal sync rate. Vertical refresh determines how often the "
@@ -1328,7 +1330,7 @@ msgstr ""
 "horizontale détermine la fréquence à laquelle les lignes sont affichées."
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:55
+#: en/configureX_monitor.xml:59
 msgid ""
 "It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor "
 "type with a sync range that is beyond the capabilities of your monitor: you "
@@ -1342,12 +1344,12 @@ msgstr ""
 "de votre matériel."
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:64
+#: en/configureX_monitor.xml:68
 msgid "Plug'n Play"
 msgstr "Plug'n Play"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:67
+#: en/configureX_monitor.xml:71
 msgid ""
 "This is the default option and automatically tries to determine the monitor "
 "type from the monitor database."
@@ -1356,38 +1358,40 @@ msgstr ""
 "le type de moniteur à partir de la base de données."
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:77
+#: en/configureX_monitor.xml:81
+#, fuzzy
 msgid ""
 "If the installer has not correctly detected your monitor and you know which "
-"one you have, you can select it from the tree by selecting:"
+"one you have, you can choose it from the options by selecting:"
 msgstr ""
 "Si le système n'a pas déterminé correctement votre matériel et si vous "
 "connaissez ses références, vous pouvez le sélectionner dans l'arborescence "
 "en sélectionnant dans l'ordre :"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:86
+#: en/configureX_monitor.xml:90
 msgid "Manufacturer"
 msgstr "Fabriquant"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:90
+#: en/configureX_monitor.xml:94
 msgid "Monitor model"
 msgstr "Modèle du moniteur"
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:96
+#: en/configureX_monitor.xml:100
 msgid "Generic"
 msgstr "Générique"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:99
+#: en/configureX_monitor.xml:103
+#, fuzzy
 msgid ""
-"Selecting this group will list nearly 30 display configurations such as "
-"1024x768 @ 60Hz and includes flat-panel displays as used in laptops. This is "
-"often a good monitor selection group if you need to use the VESA card driver "
-"when your video hardware cannot be determined automatically.  Once again it "
-"may be wise to be conservative in your selections."
+"Selecting this group will list approximately 30 display configurations such "
+"as 1024x768 @ 60Hz and includes flat-panel displays as used in laptops.  "
+"This is often a good monitor selection group if you need to use the VESA "
+"card driver when your video hardware cannot be determined automatically. "
+"Once again, it may be wise to be conservative in your selections."
 msgstr ""
 "La sélection de ce groupe permet de choisir parmi 30 configurations "
 "d'affichage telles que le 1024x768 @ 60Hz et comprend les écrans plats tels "
@@ -1397,12 +1401,12 @@ msgstr ""
 "choix."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:22
+#: en/diskdrake.xml:24
 msgid "Custom Disk Partitioning with DiskDrake"
 msgstr "Partitionnement personnalisé du disque avec DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:27
+#: en/diskdrake.xml:29
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-diskdrake.png\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1413,7 +1417,7 @@ msgstr ""
 "\"><imagedata align=\"center\" fileref=\"live-diskdrake.png\"/></imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:38
+#: en/diskdrake.xml:40
 msgid ""
 "Modify the layout of your disk(s) here. You can remove or create partitions, "
 "change the filesystem or size of a partition and even view their details "
@@ -1425,11 +1429,12 @@ msgstr ""
 "modifications."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:47
+#, fuzzy
 msgid ""
 "There is a tab at the top for every detected hard disk (or other storage "
-"device, like a USB key). In the screenshot above there are two available "
-"devices: <filename>sda </filename>and <filename>sdb</filename>."
+"device, like a USB key), for example: <filename>sda</filename>, "
+"<filename>sdb</filename>, <filename>sdc</filename> etc."
 msgstr ""
 "En haut, il y a un onglet pour chaque disque dur détecté (ou d'autres "
 "supports de stockage comme une clé USB). Sur la capture d'écran ci-dessus, "
@@ -1437,7 +1442,7 @@ msgstr ""
 "filename>."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:52
+#: en/diskdrake.xml:54
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it. "
@@ -1451,7 +1456,7 @@ msgstr ""
 "(label) ou le choix d'un type."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:60
+#: en/diskdrake.xml:62
 msgid ""
 "Continue until you have adjusted everything to your satisfaction, then click "
 "<emphasis>Done</emphasis> when you're ready."
@@ -1460,7 +1465,7 @@ msgstr ""
 "<emphasis>OK</emphasis> lorsque tout est prêt."
 
 #. type: Content of: <section><warning><orderedlist><listitem><para>
-#: en/diskdrake.xml:69
+#: en/diskdrake.xml:71
 msgid ""
 "Take care with the <emphasis>Clear all</emphasis> option, use it only if you "
 "are sure you want to wipe all partitions on the selected storage device."
@@ -1470,7 +1475,7 @@ msgstr ""
 "périphérique sélectionné."
 
 #. type: Content of: <section><warning><orderedlist><listitem><para>
-#: en/diskdrake.xml:75
+#: en/diskdrake.xml:77
 msgid ""
 "If you wish to use encryption on your <filename>/</filename> partition you "
 "must ensure that you have a separate <filename>/boot</filename> partition. "
@@ -1483,7 +1488,7 @@ msgstr ""
 "chiffrée, sinon le système ne pourra pas s'amorcer."
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/diskdrake.xml:87
+#: en/diskdrake.xml:89
 msgid ""
 "If you are installing Mageia on a UEFI system, check that an ESP (EFI System "
 "Partition) is present and correctly mounted on <filename>/boot/EFI</"
@@ -1494,7 +1499,7 @@ msgstr ""
 "montée sur <filename>/boot/EFI</filename>. Voir Figure 1 ci-dessous."
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/diskdrake.xml:93
+#: en/diskdrake.xml:95
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
 "partition is present and of the correct type. See Figure 2 below."
@@ -1504,12 +1509,12 @@ msgstr ""
 "type requis. Voir Figure 2 ci-dessous."
 
 #. type: Content of: <section><figure><title>
-#: en/diskdrake.xml:101
+#: en/diskdrake.xml:103
 msgid "EFI System Partition"
 msgstr "Partition système EFI"
 
 #. type: Content of: <section><figure><mediaobject>
-#: en/diskdrake.xml:104
+#: en/diskdrake.xml:106
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-diskdrake2.png\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1521,17 +1526,17 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><figure>
-#: en/diskdrake.xml:103 en/diskdrake.xml:117
+#: en/diskdrake.xml:105 en/diskdrake.xml:119
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><figure><title>
-#: en/diskdrake.xml:115
+#: en/diskdrake.xml:117
 msgid "BIOS boot partition"
 msgstr "Partition de démarrage du BIOS"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:118 en/doPartitionDisks.xml:201
+#: en/diskdrake.xml:120 en/doPartitionDisks.xml:206
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1554,12 +1559,12 @@ msgid "Partitioning"
 msgstr "Partitionnement"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:31
 msgid "Suggested Partitioning"
 msgstr "Suggestion de partitionnement"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:34
 msgid ""
 "In this screen you can see the content of your hard drive(s) along with the "
 "DrakX partitioning proposals for where to install Mageia."
@@ -1568,7 +1573,7 @@ msgstr ""
 "faites par DrakX pour l'endroit où installer Mageia."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:34
+#: en/doPartitionDisks.xml:38
 msgid ""
 "The actual options available from those shown below will vary according to "
 "the layout and content of your particular hard drive(s)."
@@ -1577,7 +1582,7 @@ msgstr ""
 "l'agencement  et du contenu de chaque disque(s) dur(s) en particulier."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:39
+#: en/doPartitionDisks.xml:43
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1590,17 +1595,17 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><itemizedlist><title>
-#: en/doPartitionDisks.xml:49
+#: en/doPartitionDisks.xml:53
 msgid "Main Options"
 msgstr "Options principales"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:56
 msgid "<emphasis role=\"bold\">Use Existing Partitions</emphasis>"
 msgstr "<emphasis role=\"bold\">Utiliser les partitions existantes</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:59
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1609,12 +1614,12 @@ msgstr ""
 "ont été trouvées et sont utilisables pour l'installation de Mageia."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:61
+#: en/doPartitionDisks.xml:65
 msgid "<emphasis role=\"bold\">Use Free Space</emphasis>"
 msgstr "<emphasis role=\"bold\">Utiliser l'espace libre</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:68
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1623,7 +1628,7 @@ msgstr ""
 "l'utilisera pour l'installation de Mageia."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:70
+#: en/doPartitionDisks.xml:74
 msgid ""
 "<emphasis role=\"bold\">Use Free Space on a Windows Partition</emphasis>"
 msgstr ""
@@ -1631,12 +1636,12 @@ msgstr ""
 "emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:73
+#: en/doPartitionDisks.xml:77
+#, fuzzy
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it. 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 important files!"
+"installation but see the warning below."
 msgstr ""
 "Si vous avez de l'espace libre sur un partition Windows, l'installateur peu "
 "vous proposer de l'utiliser. Cela peut être une façon pratique de faire de "
@@ -1644,14 +1649,28 @@ msgstr ""
 "risquée, vous devriez donc vous assurer de posséder une sauvegarde de tous "
 "les fichiers importants."
 
+#. type: Content of: <section><itemizedlist><listitem><para><mediaobject>
+#: en/doPartitionDisks.xml:87
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"><imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks2.png\"/></imageobject><imageobject condition=\"live"
+"\"><imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/></"
+"imageobject>"
+
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:79
+#: en/doPartitionDisks.xml:82
+#, fuzzy
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
 "light blue and the proposed Mageia partition in dark blue with their "
 "intended sizes just underneath. You have the option to modify these sizes by "
 "clicking and dragging the gap between both partitions.  See the following "
-"screenshot:"
+"screenshot:<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr ""
 "Avec cette option, l'installateur affiche la partition Windows restante en "
 "bleu clair et la future partition Mageia en bleu foncé, avec leurs tailles "
@@ -1659,19 +1678,44 @@ msgstr ""
 "cliquant et en déplaçant la limite entre les deux partitions. Voir la "
 "capture d'écran ci-dessous."
 
+#. type: Content of: <section><itemizedlist><listitem><warning><para>
+#: en/doPartitionDisks.xml:97
+msgid ""
+"This involves shrinking the size of the Windows partition, and therefore is "
+"a risky operation, so you should make sure you have backed up all important "
+"files before proceeding."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><important><para>
+#: en/doPartitionDisks.xml:103
+#, fuzzy
+msgid ""
+"The partition must be \"clean\", meaning that Windows must have closed down "
+"correctly the last time it was used. It must also have been defragmented, "
+"although this is not a guarantee that all files in the partition have been "
+"moved out of the area that is about to be used for Mageia."
+msgstr ""
+"Noter que cela impose de rétrécir la partition Windows. La partition doit "
+"être \"intègre\", signifiant que Windows doit s'être correctement arrêté "
+"lors de sa dernière utilisation. La partition doit avoir été défragmentée "
+"également, bien que ce ne soit pas une garantie que tous les fichiers de la "
+"partition aient été déplacés en dehors de la zone à utiliser. Il est "
+"fortement recommandé de sauvegarder ses données personnelles importantes au "
+"préalable."
+
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:87
+#: en/doPartitionDisks.xml:112
 msgid "<emphasis role=\"bold\">Erase and use Entire Disk</emphasis>"
 msgstr ""
 "<emphasis role=\"bold\">Effacer tout et utiliser le disque entier</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:90
+#: en/doPartitionDisks.xml:115
 msgid "This option will allocate the entire drive for Mageia"
 msgstr "Cette option attribue tout l'espace disque à Mageia."
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:119
 msgid ""
 "This will erase ALL data on the selected hard drive. Take care! If you "
 "intend to use part of the disk for something else, or you already have data "
@@ -1682,32 +1726,14 @@ msgstr ""
 "données déjà présentes sur le disque ne doivent pas être perdues, alors ne "
 "pas utiliser cette option."
 
-#. type: Content of: <section><itemizedlist><listitem><important><para>
-#: en/doPartitionDisks.xml:101
-msgid ""
-"Note that this involves shrinking the size of the Windows partition. The "
-"partition must be \"clean\", meaning that Windows must have closed down "
-"correctly the last time it was used. It must also have been defragmented, "
-"although this is not a guarantee that all files in the partition have been "
-"moved out of the area that is about to be used. It is highly recommended to "
-"back up your personal files."
-msgstr ""
-"Noter que cela impose de rétrécir la partition Windows. La partition doit "
-"être \"intègre\", signifiant que Windows doit s'être correctement arrêté "
-"lors de sa dernière utilisation. La partition doit avoir été défragmentée "
-"également, bien que ce ne soit pas une garantie que tous les fichiers de la "
-"partition aient été déplacés en dehors de la zone à utiliser. Il est "
-"fortement recommandé de sauvegarder ses données personnelles importantes au "
-"préalable."
-
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:112
+#: en/doPartitionDisks.xml:127
 msgid "<emphasis role=\"bold\">Custom Disk Partitioning</emphasis>"
 msgstr ""
 "<emphasis role=\"bold\">Partitionnement du disque personnalisé</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:115
+#: en/doPartitionDisks.xml:130
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1715,21 +1741,8 @@ msgstr ""
 "Ceci vous donne le contrôle complet sur la localisation de votre "
 "installation sur le(s)  disque(s)."
 
-#. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:122
-msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject condition=\"classical\"><imagedata align=\"center\" fileref="
-"\"dx2-doPartitionDisks2.png\"/></imageobject><imageobject condition=\"live"
-"\"><imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/></"
-"imageobject>"
-
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:131
+#: en/doPartitionDisks.xml:136
 msgid ""
 "If you are not using the <emphasis>Custom disk partitioning</emphasis> "
 "option, then the installer will allocate the available space according to "
@@ -1740,7 +1753,7 @@ msgstr ""
 "les règles suivantes :"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:137
+#: en/doPartitionDisks.xml:142
 msgid ""
 "If the total available space is less than 50 GB, then only one partition is "
 "created. This will be the <filename>/</filename> (root)  partition."
@@ -1749,7 +1762,7 @@ msgstr ""
 "créée. Ce sera le répertoire <filename>/</filename> (racine)."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:143
+#: en/doPartitionDisks.xml:148
 msgid ""
 "If the total available space is greater than 50 GB, then three partitions "
 "are created"
@@ -1758,7 +1771,7 @@ msgstr ""
 "sont créées. "
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:148
+#: en/doPartitionDisks.xml:153
 msgid ""
 "6/19 of the total available place is allocated to <filename>/</filename> "
 "with a maximum of 50 GB"
@@ -1767,20 +1780,20 @@ msgstr ""
 "répertoires <filename>/</filename>, jusqu'à un maximum de 50 Go."
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:153
+#: en/doPartitionDisks.xml:158
 msgid "1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB"
 msgstr ""
 "1/19ème est alloué au <filename>SWAP</filename> avec un maximum de 4 Go."
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:158
+#: en/doPartitionDisks.xml:163
 msgid "the rest (at least 12/19) is allocated to <filename>/home</filename>"
 msgstr ""
 "Le reste (à minima 12/19ème) est alloué au répertoire utilisateur <filename>/"
 "home</filename>."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:165
+#: en/doPartitionDisks.xml:170
 msgid ""
 "This means that from 160 GB or greater available space, the installer will "
 "create three partitions:"
@@ -1789,22 +1802,22 @@ msgstr ""
 "créera trois partitions : "
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:170
+#: en/doPartitionDisks.xml:175
 msgid "50 GB for <filename>/</filename>"
 msgstr "50 Go pour <filename>/</filename>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:174
+#: en/doPartitionDisks.xml:179
 msgid "4 GB for <filename>swap</filename>"
 msgstr "4 Go pour le <filename>swap</filename>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:178
+#: en/doPartitionDisks.xml:183
 msgid "and the remainder for <filename>/home</filename>"
 msgstr "et le reste pour<filename>/home</filename>"
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:183
+#: en/doPartitionDisks.xml:188
 msgid ""
 "If you are using a UEFI system, the ESP (EFI System Partition) will be "
 "automatically detected - or created if it does not exist yet - and mounted "
@@ -1819,7 +1832,7 @@ msgstr ""
 "l'opération a été effectuée correctement "
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:189
+#: en/doPartitionDisks.xml:194
 msgid ""
 "If you are using a Legacy (also known as BIOS) system with a GPT partitioned "
 "disk, you need to create a BIOS boot partition if it doesn't already exist. "
@@ -1836,23 +1849,28 @@ msgstr ""
 "vous d'avoir sélectionné le système de fichiers <quote>BIOS boot</quote>."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:196
+#: en/doPartitionDisks.xml:201
 msgid "See <xref linkend=\"diskdrake\"/> for information on how to proceed."
 msgstr ""
 "Lire <xref linkend=\"diskdrake\"/> pour avoir des indications sur la manière "
 "de procéder."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:211
+#: en/doPartitionDisks.xml:216
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4.png"
-"\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks4.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks4.png\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject><imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4.png"
-"\"/></imageobject>"
+"<imageobject condition=\"classical\"><imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks.png\"/></imageobject><imageobject condition=\"live"
+"\"><imagedata align=\"center\" fileref=\"live-doPartitionDisks.png\"/></"
+"imageobject>"
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:217
+#: en/doPartitionDisks.xml:226
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
 "previous standard of 512. Due to lack of available hardware, the "
@@ -1865,7 +1883,7 @@ msgstr ""
 "n'a pas pu être testé avec de tels disques."
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:222
+#: en/doPartitionDisks.xml:231
 msgid ""
 "Some SSD devices now use an erase block size over 1 MB. If you have such a "
 "device we suggest that you partition the drive in advance, using an "
@@ -1878,17 +1896,17 @@ msgstr ""
 "configuration suivante :"
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:229
+#: en/doPartitionDisks.xml:238
 msgid "<emphasis>Align to</emphasis> = MiB"
 msgstr "<emphasis role=\"bold\">Alignement </emphasis> = Mo"
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:233
+#: en/doPartitionDisks.xml:242
 msgid "<emphasis>Free space preceding (MiB)</emphasis> = 2"
 msgstr "<emphasis>Espace disque initial (Mo)</emphasis> = 2"
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:237
+#: en/doPartitionDisks.xml:246
 msgid ""
 "Also make sure all partitions are created using an even number of megabytes."
 msgstr ""
@@ -2076,12 +2094,12 @@ msgstr ""
 "link> pour toute question ou si vous désirez contribuer à Mageia."
 
 #. type: Content of: <section><info><title>
-#: en/firewall.xml:7
+#: en/firewall.xml:16
 msgid "Firewall"
 msgstr "Pare-feu"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:10
+#: en/firewall.xml:19
 msgid ""
 "This section allows you to configure some simple firewall rules: they "
 "determine which type of message from the Internet will be accepted by the "
@@ -2093,8 +2111,18 @@ msgstr ""
 "acceptés par le système cible. Ceci autorise, en somme, les services "
 "correspondant d'être accessibles depuis Internet."
 
+#. type: Content of: <section><mediaobject>
+#: en/firewall.xml:26
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-firewall.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject><imagedata align=\"center\" fileref=\"dx-welcome.png\"/></"
+"imageobject>"
+
 #. type: Content of: <section><para>
-#: en/firewall.xml:16
+#: en/firewall.xml:31
 msgid ""
 "In the default setting (no button is checked), no service of the system is "
 "accessible from the network. The <emphasis>Everything (no firewall)</"
@@ -2115,7 +2143,7 @@ msgstr ""
 "de débogage."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:25
+#: en/firewall.xml:40
 msgid ""
 "All other options are more or less self-explanatory. As an example, you will "
 "enable the CUPS server if you want printers on your machine to be accessible "
@@ -2126,12 +2154,12 @@ msgstr ""
 "soient accessible depuis le réseau."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:29
+#: en/firewall.xml:44
 msgid "<emphasis role=\"bold\">Advanced</emphasis>"
 msgstr "<emphasis role=\"bold\">Avancé</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:31
+#: en/firewall.xml:46
 msgid ""
 "The <emphasis>Advanced</emphasis> option opens a window where you can enable "
 "a series of services by typing a list of <quote>couples</quote> (blank "
@@ -2142,33 +2170,37 @@ msgstr ""
 "quote> (séparés par des espaces)"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:35
-msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
+#: en/firewall.xml:50
+#, fuzzy
+msgid "<emphasis>&lt;port-number&gt;/&lt;protocol&gt;</emphasis>"
 msgstr "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:38
+#: en/firewall.xml:53
+#, fuzzy
 msgid ""
-"- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
-"the service you want to enable (e.g. 873 for the RSYNC service) as defined "
-"in <emphasis>RFC-433</emphasis>;"
+"- <emphasis>&lt;port-number&gt;</emphasis> is the value of the port assigned "
+"to the service you want to enable (e.g. 873 for the RSYNC service) as "
+"defined in <emphasis>RFC-433</emphasis>;"
 msgstr ""
 "- <emphasis>&lt;port-number></emphasis> est la valeur du port affecté au "
 "service vous voulez autoriser (par exemple 873pour le service RSYNC) tel que "
 "défini dans la spécification <emphasis>RFC-433</emphasis>;"
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:42
+#: en/firewall.xml:57
+#, fuzzy
 msgid ""
-"- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
-"<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
+"- <emphasis>&lt;protocol&gt;</emphasis> is one of <emphasis>TCP</emphasis> "
+"or <emphasis>UDP</emphasis> - the internet protocol that is used by the "
+"service."
 msgstr ""
 "- <emphasis>&lt;protocole></emphasis> est soit <emphasis>TCP</emphasis>, "
 "soit <emphasis>UDP</emphasis> - le protocole internet qui est utilisé par le "
 "service."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:47
+#: en/firewall.xml:62
 msgid ""
 "For instance, the entry for enabling access to the RSYNC service therefore "
 "is <emphasis>873/tcp</emphasis>."
@@ -2177,7 +2209,7 @@ msgstr ""
 "<emphasis>873/tcp</emphasis>."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:50
+#: en/firewall.xml:65
 msgid ""
 "In case a service is implemented to use both protocols, you specify 2 "
 "couples for the same port."
@@ -2266,12 +2298,12 @@ msgid "Graphical Configuration"
 msgstr "Configuration graphique"
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:32
+#: en/installer.xml:34
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, l'installateur de Mageia"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:35
+#: en/installer.xml:37
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -2282,12 +2314,12 @@ msgstr ""
 "mise à jour aussi aisée que possible."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:40
+#: en/installer.xml:42
 msgid "The installation steps"
 msgstr "Les étapes de l'installation"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:44
+#: en/installer.xml:46
 msgid ""
 "The install process is divided into a number of steps - the status of which "
 "is indicated in a panel to the left of the screen."
@@ -2296,7 +2328,7 @@ msgstr ""
 "suivies dans le panneau latéral à gauche de l'écran."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:50
+#: en/installer.xml:52
 msgid ""
 "Each step has one or more screens, which may also have <emphasis>Advanced</"
 "emphasis> sections with extra, less commonly required options."
@@ -2306,7 +2338,7 @@ msgstr ""
 "supplémentaires moins communes."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:56
+#: en/installer.xml:58
 msgid ""
 "Most screens have <emphasis>Help</emphasis> buttons for further details "
 "about the particular step."
@@ -2315,7 +2347,7 @@ msgstr ""
 "apporte davantage d'explications au sujet de l'étape particulière."
 
 #. type: Content of: <section><section><caution><para>
-#: en/installer.xml:62
+#: en/installer.xml:64
 msgid ""
 "If at some point during the install you decide to abort the installation, it "
 "is possible to reboot, but please think twice before you do this. Once a "
@@ -2330,7 +2362,7 @@ msgstr ""
 "peut très bien rendre le système inutilisable."
 
 #. type: Content of: <section><section><caution><para>
-#: en/installer.xml:68
+#: en/installer.xml:70
 msgid ""
 "If, in spite of this, you are very sure rebooting is what you want, go to a "
 "text terminal by pressing the keys <keycombo> <keycap>Ctrl</keycap> "
@@ -2345,12 +2377,12 @@ msgstr ""
 "keycombo> pour redémarrer."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:86
+#: en/installer.xml:88
 msgid "Installation Welcome Screen"
 msgstr "Ecran d'accueil de l'installation"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:88
+#: en/installer.xml:90
 msgid ""
 "The particular screen that you will first see when booting from the "
 "Installation media will depend on whether your computer motherboard is of "
@@ -2361,7 +2393,7 @@ msgstr ""
 "utiliser l'ancien système (BIOS) ou si elle est UEFI."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:92
+#: en/installer.xml:94
 msgid ""
 "The welcome menu screen has various options, however the default option will "
 "start the installer, and is normally all that you will need."
@@ -2371,12 +2403,12 @@ msgstr ""
 "la plupart du temps."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:97
+#: en/installer.xml:99
 msgid "Legacy (BIOS) Systems"
 msgstr "BIOS en mode Legacy"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:100
+#: en/installer.xml:102
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome.png\"/> </"
 "imageobject>"
@@ -2385,7 +2417,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:111
+#: en/installer.xml:113
 msgid ""
 "Install Mageia to a hard disk. This is the default option, and will "
 "automatically start after a short while unless another option is selected."
@@ -2395,12 +2427,12 @@ msgstr ""
 "n'est sélectionnée."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:117
+#: en/installer.xml:119
 msgid "<emphasis role=\"bold\">Rescue System</emphasis>"
 msgstr "<emphasis role=\"bold\">Système de récupération</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:119
+#: en/installer.xml:121
 msgid ""
 "This option allows you to either re-install the bootloader for an existing "
 "Mageia installation or you can use it to restore a Windows bootloader."
@@ -2410,22 +2442,22 @@ msgstr ""
 "d'amorçage de Windows."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:132
+#: en/installer.xml:134
 msgid "<emphasis role=\"bold\">F2: Language</emphasis>"
 msgstr "<emphasis role=\"bold\">F2 : Langage</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:134
+#: en/installer.xml:136
 msgid "Press F2 for alternative languages."
 msgstr "Appuyez sur F2 pour changer de langue."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:140
+#: en/installer.xml:142
 msgid "UEFI Systems"
 msgstr "systèmes UEFI"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:142
+#: en/installer.xml:144
 msgid ""
 "From this screen, you can access options by pressing <keycap>e</keycap> to "
 "enter the edit mode. To come back to this screen, press <keycap>Esc</keycap> "
@@ -2437,7 +2469,7 @@ msgstr ""
 "sauvegarder ou presser <keycap>F10</keycap> pour quitter en sauvegardant. "
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:148
+#: en/installer.xml:150
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome2.png\"/> </"
 "imageobject>"
@@ -2446,14 +2478,14 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:157
+#: en/installer.xml:159
 msgid "<emphasis role=\"bold\">Install:</emphasis> Start the Install process"
 msgstr ""
 "<emphasis role=\"bold\">Installer :</emphasis> Démarrer le processus "
 "d'installation"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:162
+#: en/installer.xml:164
 msgid ""
 "<emphasis role=\"bold\">Rescue:</emphasis> This option allows you to either "
 "re-install the bootloader for an existing Mageia installation or you can use "
@@ -2464,7 +2496,7 @@ msgstr ""
 "Mageia existante, ou de restaurer un programme d'amorçage de Windows."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:169
+#: en/installer.xml:171
 msgid ""
 "<emphasis role=\"bold\">F2: Language:</emphasis> Press <keycap>F2</keycap> "
 "for alternative languages."
@@ -2473,7 +2505,7 @@ msgstr ""
 "keycap> pour d'autres langages."
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:174
+#: en/installer.xml:176
 msgid ""
 "If you booted from a USB stick, you will see the above options duplicated, "
 "and in this case, you should use the set that will be suffixed with \"USB\"."
@@ -2483,17 +2515,17 @@ msgstr ""
 "suffixe \"USB\"."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:181
+#: en/installer.xml:183
 msgid "Installation Problems and Possible Solutions"
 msgstr "Problèmes d'installation et solutions possibles"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:184
+#: en/installer.xml:186
 msgid "No Graphical Interface"
 msgstr "Pas d'interface graphique"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:188
+#: en/installer.xml:190
 msgid ""
 "After the initial screen you did not progress to the <emphasis>Language "
 "Selection</emphasis> screen. This can happen with some graphic cards and "
@@ -2506,7 +2538,7 @@ msgstr ""
 "<command>vgalo</command> dans l'invite de commande."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:195
+#: en/installer.xml:197
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
 "In this case it is worth trying a text-mode installation. To use this press "
@@ -2524,12 +2556,12 @@ msgstr ""
 "continuer l'installation en mode texte."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:208
+#: en/installer.xml:210
 msgid "The Install Freezes"
 msgstr "L'installation se fige"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:210
+#: en/installer.xml:212
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic hardware "
@@ -2544,12 +2576,12 @@ msgstr ""
 "avec les précédentes si nécessaire."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:218
+#: en/installer.xml:220
 msgid "RAM problem"
 msgstr "Problème de mémoire vive"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:220
+#: en/installer.xml:222
 msgid ""
 "This will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
@@ -2565,12 +2597,12 @@ msgstr ""
 "256Mo de RAM."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:228
+#: en/installer.xml:230
 msgid "Dynamic partitions"
 msgstr "Partitions dynamiques"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:230
+#: en/installer.xml:232
 msgid ""
 "If you converted your hard disk from <literal>Basic</literal> format to "
 "<literal>Dynamic</literal> format in Microsoft Windows, then it is not "
@@ -4604,22 +4636,29 @@ msgstr ""
 "link>"
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:27
+#: en/setupBootloader.xml:32
 msgid "Bootloader"
 msgstr "Programme d'amorçage"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:31
+#: en/setupBootloader.xml:36
+#, fuzzy
+msgid "Available Bootloaders"
+msgstr "Programme d'amorçage"
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:39
 msgid "Grub2"
 msgstr "Grub2"
 
-#. type: Content of: <section><section><itemizedlist><title>
-#: en/setupBootloader.xml:34
-msgid "Grub2 on Legacy MBR/GPT systems"
-msgstr "Grub2 sur des systèmes MBR/Legacy et GPT/Legacy "
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:42
+#, fuzzy
+msgid "<emphasis role=\"bold\">Grub2 on Legacy MBR/GPT systems</emphasis>"
+msgstr "<emphasis role=\"bold\">Système de récupération</emphasis>"
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:37
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:46
 msgid ""
 "GRUB2 (with or without graphical menu) will be used exclusively as the "
 "bootloader for a Legacy/MBR or Legacy/GPT system."
@@ -4627,8 +4666,8 @@ msgstr ""
 "GRUB2 (avec ou sans menu graphique) sera utilisé pour un système MBR/Legacy "
 "ou GPT/Legacy"
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:42
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:52
 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."
@@ -4637,19 +4676,21 @@ msgstr ""
 "(Master Boot Record) de votre disque dur, soit dans la partition BIOS "
 "d'amorçage."
 
-#. type: Content of: <section><section><itemizedlist><title>
-#: en/setupBootloader.xml:49
-msgid "Grub2-efi on UEFI systems"
-msgstr "Grub2-efi sur des systèmes UEFI"
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:59
+#, fuzzy
+msgid "<emphasis role=\"bold\">Grub2-efi on UEFI systems</emphasis>"
+msgstr "<emphasis role=\"bold\">Système de récupération</emphasis>"
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:52
-msgid "GRUB2-efi will be used exclusively as the bootloader for a UEFI system."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:63
+#, fuzzy
+msgid "GRUB2-efi or rEFInd may be used as the bootloader for a UEFI system."
 msgstr ""
 "GRUB2-efi sera utilisé comme gestionnaire d'amorçage pour un système UEFI."
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:57
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:68
 msgid ""
 "By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI "
 "System Partition)."
@@ -4657,12 +4698,13 @@ msgstr ""
 "Par défaut, un nouveau programme d'amorçage (Grub2-efi) sera écrit dans "
 "l'ESP (Partition de système EFI)."
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:60
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:71
+#, fuzzy
 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 "
-"created by Windows and add grub2-efi to it. If no ESP exists, then one will "
+"created by Windows and add grub2-efi to it.  If no ESP exists, then one will "
 "be created. Although it is possible to have several ESPs, only one is "
 "required, whatever the number of operating systems you have."
 msgstr ""
@@ -4672,18 +4714,46 @@ msgstr ""
 "d'avoir plusieurs ESP, une seule est suffisante, quel que soit le nombre de "
 "systèmes d'exploitation installés."
 
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:82
+msgid "rEFInd"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:85
+#, fuzzy
+msgid "<emphasis role=\"bold\">rEFInd on UEFI systems</emphasis>"
+msgstr "<emphasis role=\"bold\">Icône</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:88
+msgid ""
+"rEFInd has a nice graphical set of options, and can auto-detect installed "
+"EFI bootloaders. See: http://www.rodsbooks.com/refind/"
+msgstr ""
+
+#. type: Content of: <section><section><section><note><para>
+#: en/setupBootloader.xml:95
+msgid ""
+"Please note that in order to be able to use the <literal>rEFInd</literal> "
+"option, an installed EFI System Partition must match your system "
+"architecture: if you have a 32bit EFI System Partition installed on a 64bit "
+"machine for instance, then the rEFInd option will not be displayed/available "
+"to you."
+msgstr ""
+
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:72
+#: en/setupBootloader.xml:106
 msgid "Bootloader Setup"
 msgstr "Configuration du programme d'amorçage"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:76
+#: en/setupBootloader.xml:110
 msgid "Bootloader main options"
 msgstr "Principales options du chargeur de démarrage"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:79
+#: en/setupBootloader.xml:113
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader.png\"/> </imageobject> <imageobject condition=\"live"
@@ -4696,33 +4766,54 @@ msgstr ""
 "im1\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:91
+#: en/setupBootloader.xml:125
 msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
 msgstr "<emphasis role=\"bold\">Gestionnaire d'amorçage à utiliser</emphasis>"
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:93
+#. type: Content of: <section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:129
 msgid ""
-"This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI "
-"systems will not see this option here."
+"<guimenuitem>GRUB2</guimenuitem> (with either a graphical or a text menu), "
+"can be chosen for both <literal>Legacy MBR/BIOS</literal> systems and "
+"<literal>UEFI</literal> systems."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:136
+msgid ""
+"<guimenuitem>rEFInd</guimenuitem> (with a graphical menu)  is an alternative "
+"option solely for use with <literal>UEFI</literal> systems."
 msgstr ""
-"Cette fonctionnalité n'est disponible que sur les systèmes MBR/BIOS en mode "
-"Legacy. Les utilisateurs de systèmes UEFI ne verront pas cette option ici."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:98
+#: en/setupBootloader.xml:144
 msgid "<emphasis role=\"bold\">Boot device</emphasis>"
 msgstr "<emphasis role=\"bold\">Périphérique d'amorçage</emphasis>"
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:100
-msgid "Don't change this unless you really know what you are doing"
+#. type: Content of: <section><section><section><itemizedlist><listitem><warning><para>
+#: en/setupBootloader.xml:147
+#, fuzzy
+msgid "Don't change this unless you really know what you are doing."
 msgstr ""
 "Ne modifiez rien ici, à moins que vous ne sachiez réellement ce que vous "
 "faites."
 
+#. type: Content of: <section><section><section><itemizedlist><listitem><note><para>
+#: en/setupBootloader.xml:152
+msgid ""
+"There is no option to write GRUB to the boot sector of a partition (e.g: "
+"<filename>sda1</filename>), as this method is considered unreliable."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:157
+msgid ""
+"When using UEFI mode, then the <guilabel>Boot device</guilabel> will be "
+"listed as <guimenuitem>EFI System Partition</guimenuitem>."
+msgstr ""
+
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:105
+#: en/setupBootloader.xml:163
 msgid ""
 "<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
 msgstr ""
@@ -4730,7 +4821,7 @@ msgstr ""
 "emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:108
+#: en/setupBootloader.xml:166
 msgid ""
 "This text box lets you set a delay, in seconds, before the default operating "
 "system is started up."
@@ -4739,12 +4830,12 @@ msgstr ""
 "le démarrage du système d'exploitation par défaut."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:113
+#: en/setupBootloader.xml:171
 msgid "<emphasis role=\"bold\">Security</emphasis>"
 msgstr "<emphasis role=\"bold\">Sécurité</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:115
+#: en/setupBootloader.xml:173
 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 "
@@ -4760,17 +4851,17 @@ msgstr ""
 "est celui défini ci-après."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:126
+#: en/setupBootloader.xml:184
 msgid "Choose a password for the bootloader (optional)"
 msgstr "Choisissez un mot de passe pour le programme d'amorçage (optionnel)"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:130
+#: en/setupBootloader.xml:188
 msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
 msgstr "<emphasis role=\"bold\">Mot de passe (vérification)</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:132
+#: en/setupBootloader.xml:190
 msgid ""
 "Retype the password and DrakX will check that it matches with the one set "
 "above"
@@ -4779,17 +4870,17 @@ msgstr ""
 "identique au précédent. "
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:137 en/setupBootloader.xml:212
+#: en/setupBootloader.xml:195 en/setupBootloader.xml:308
 msgid "<emphasis>Advanced</emphasis>"
 msgstr "<emphasis>Avancé</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:141
+#: en/setupBootloader.xml:199
 msgid "<emphasis>Enable ACPI</emphasis>"
 msgstr "<emphasis>Activer ACPI</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:143
+#: en/setupBootloader.xml:201
 msgid ""
 "ACPI (Advanced Configuration and Power Interface) is a standard for power "
 "management. It can save energy by stopping unused devices. Deselecting it "
@@ -4805,12 +4896,12 @@ msgstr ""
 "des blocages)."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:152
+#: en/setupBootloader.xml:210
 msgid "<emphasis>Enable SMP</emphasis>"
 msgstr "<emphasis>Activer SMP</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:154
+#: en/setupBootloader.xml:212
 msgid ""
 "This option enables/disables symmetric multiprocessing for multi-core "
 "processors"
@@ -4819,12 +4910,12 @@ msgstr ""
 "processeurs multi-cœurs."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:159
+#: en/setupBootloader.xml:217
 msgid "<emphasis>Enable APIC</emphasis>"
 msgstr "<emphasis>Activer APIC</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:161
+#: en/setupBootloader.xml:219
 msgid ""
 "Enabling this gives the operating system access to the Advanced Programmable "
 "Interrupt Controller. APIC devices permit more complex priority models, and "
@@ -4836,12 +4927,12 @@ msgstr ""
 "gestion des IRQ (Interrupt Request, Requête d'interruption)."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:168
+#: en/setupBootloader.xml:226
 msgid "<emphasis>Enable Local APIC</emphasis>"
 msgstr "<emphasis>Activer APIC local</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:170
+#: en/setupBootloader.xml:228
 msgid ""
 "Here you can set Local APIC, which manages all external interrupts for a "
 "specific processor in an SMP system"
@@ -4850,12 +4941,70 @@ msgstr ""
 "interruptions externes pour un processeur spécifique d'un système SMP."
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:177
+#: en/setupBootloader.xml:235
 msgid "Bootloader Configuration"
 msgstr "Configuration du programme d'amorçage"
 
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:237
+msgid ""
+"If, in the previous section you selected <literal>rEFInd</literal> as the "
+"bootloader to use, you would then be presented with the options shown in the "
+"screenshot directly below. Otherwise, please instead move on to the "
+"subsequent screenshot for your options."
+msgstr ""
+
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:180
+#: en/setupBootloader.xml:243
+#, fuzzy
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"rEFIndLoaderConfig.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-rEFIndLoaderConfig.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"><imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks.png\"/></imageobject><imageobject condition=\"live"
+"\"><imagedata align=\"center\" fileref=\"live-doPartitionDisks.png\"/></"
+"imageobject>"
+
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:253
+#, fuzzy
+msgid "Your rEFInd configuration options:"
+msgstr "Configuration du son"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:256
+msgid ""
+"<guimenuitem>Install or update rEFInd in the EFI system partition.</"
+"guimenuitem>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:261
+msgid ""
+"<guimenuitem>Install in EFI/Boot partition (workaround for some BIOS's).</"
+"guimenuitem>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:264
+msgid ""
+"With some BIOS's, the newly written bootloaser for Mageia at end of the "
+"installation will not be recognized. In that case, you can use this option "
+"as a workaround for the issue."
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:270
+msgid ""
+"If you did not select rEFInd as the bootloader to use in the previous "
+"section, then your bootloader configurations are shown below:"
+msgstr ""
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:275
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -4868,22 +5017,22 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:191
+#: en/setupBootloader.xml:286
 msgid "<emphasis role=\"bold\">Default</emphasis>"
 msgstr "<emphasis role=\"bold\">Choix par défaut</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:193
+#: en/setupBootloader.xml:288
 msgid "The operating system to be started up by default."
 msgstr "Système d'exploitation démarré par défaut."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:197
+#: en/setupBootloader.xml:292
 msgid "<emphasis role=\"bold\">Append</emphasis>"
 msgstr "<emphasis role=\"bold\">Ajouter des options</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:199
+#: en/setupBootloader.xml:294
 msgid ""
 "This option lets you pass information to the kernel or tell the kernel to "
 "give you more information as it boots."
@@ -4892,23 +5041,24 @@ msgstr ""
 "d'informations lors du démarrage."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:204
+#: en/setupBootloader.xml:299
 msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
 msgstr "<emphasis role=\"bold\">Détecter d'autres OS</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:206
+#: en/setupBootloader.xml:301
+#, fuzzy
 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, "
-"then untick the Probe Foreign OS option."
+"then untick the <guimenuitem>Probe Foreign OS</guimenuitem> option."
 msgstr ""
 "Si vous avez d'autres systèmes d'exploitation installés, Mageia tente de les "
 "ajouter à votre nouveau menu de démarrage. Si vous ne le voulez pas, "
 "décochez la case « Détecter d'autres OS »."
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:215
+#: en/setupBootloader.xml:311
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader4.png\"/> </imageobject> <imageobject condition=\"live"
@@ -4921,12 +5071,12 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:226
+#: en/setupBootloader.xml:322
 msgid "<emphasis>Video mode</emphasis>"
 msgstr "<emphasis>Mode Vidéo</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:228
+#: en/setupBootloader.xml:324
 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 "
@@ -4938,17 +5088,18 @@ msgstr ""
 "seront proposées."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:234
+#: en/setupBootloader.xml:330
 msgid "<emphasis>Do not touch ESP or MBR</emphasis>"
 msgstr "<emphasis>Ne pas toucher à l'ESP ou au MBR</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:236
+#: en/setupBootloader.xml:332
+#, fuzzy
 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 "
-"missing. Click<emphasis> Ok</emphasis> if you are sure you understand the "
-"implications, and wish to proceed."
+"missing. Click <guimenuitem>Ok </guimenuitem>only if you are sure you "
+"understand the implications, and wish to proceed."
 msgstr ""
 "Choisissez cette option si vous ne voulez pas démarrer sur Mageia, mais "
 "préférez le démarrer en chaîne à partir d'un autre système d'exploitation. "
@@ -4956,8 +5107,17 @@ msgstr ""
 "Cliquez sur <emphasis>Ok</emphasis> si vous êtes sûr de comprendre les "
 "implications et souhaitez quand-même continuer."
 
+#. type: Content of: <section><section><section><itemizedlist><listitem><warning><para>
+#: en/setupBootloader.xml:338
+msgid ""
+"Chain-loading via legacy bootloaders (GRUB Legacy and LiLo)  is no longer "
+"supported by Mageia as it is likely to fail when attempting to boot this "
+"resulting installation of Mageia. If you use anything other than GRUB2 or "
+"rEFInd for this purpose, then you do so at your own risk!"
+msgstr ""
+
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:245
+#: en/setupBootloader.xml:348
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png"
 "\"/> </imageobject>"
@@ -4966,17 +5126,17 @@ msgstr ""
 "\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:253
+#: en/setupBootloader.xml:356
 msgid "Other Options"
 msgstr "Autres options"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:256
+#: en/setupBootloader.xml:359
 msgid "Using an existing bootloader"
 msgstr "Utiliser un chargeur de démarrage existant.  "
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:258
+#: en/setupBootloader.xml:361
 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 "
@@ -4991,12 +5151,12 @@ msgstr ""
 "automatiquement. Voir la documentation du système d'exploitation en question."
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:267
+#: en/setupBootloader.xml:370
 msgid "Installing Without a Bootloader"
 msgstr "Installer sans programme d'amorçage"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:269
+#: en/setupBootloader.xml:372
 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 "
@@ -5420,3 +5580,47 @@ msgstr ""
 "La prochaine étape consiste à copier les fichiers vers le disque dur. Cela "
 "devrait prendre quelques instants. Vers la fin, vous verrez brièvement un "
 "écran blanc : c'est normal."
+
+#~ msgid ""
+#~ "Type in the user password. There is a shield at the end of the text box "
+#~ "that indicates the strength of the password. (See also <xref linkend="
+#~ "\"givePassword\"/>)"
+#~ msgstr ""
+#~ "Indiquez dans ce champ le mot de passe utilisateur. On retrouve à droite "
+#~ "le bouclier qui indique la force du mot de passe. (voir aussi <xref "
+#~ "linkend=\"givePassword\"/>)"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> "
+#~ "</imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> "
+#~ "</imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject><imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/></imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4."
+#~ "png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject><imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4."
+#~ "png\"/></imageobject>"
+
+#~ msgid "Grub2 on Legacy MBR/GPT systems"
+#~ msgstr "Grub2 sur des systèmes MBR/Legacy et GPT/Legacy "
+
+#~ msgid "Grub2-efi on UEFI systems"
+#~ msgstr "Grub2-efi sur des systèmes UEFI"
+
+#~ msgid ""
+#~ "This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI "
+#~ "systems will not see this option here."
+#~ msgstr ""
+#~ "Cette fonctionnalité n'est disponible que sur les systèmes MBR/BIOS en "
+#~ "mode Legacy. Les utilisateurs de systèmes UEFI ne verront pas cette "
+#~ "option ici."
diff --git a/docs/docs/stable/installer/help.pot b/docs/docs/stable/installer/help.pot
index 2ea988ca..95c4ebc8 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-19 21:23+0200\n"
+"POT-Creation-Date: 2019-09-08 15:26+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"
@@ -139,7 +139,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/addUser.xml:3
+#: en/addUser.xml:9
 msgid "User Management"
 msgstr ""
 
@@ -149,46 +149,55 @@ msgstr ""
 #. 2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
 #.   Also changed 'Advanced User Management' to 'User Management (advanced)'.
 #. 2018/02/24 apb: Changed list style.
+#. 2019/08/10 apb: Added missing 'condition' profile for live-user1.png.
+#. 2019/08/11 apb: [1] Reword 1.1 (including Note) [2] Reword 1.2 Password text.
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:12
+#: en/addUser.xml:28
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" "
-"fileref=\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" "
-"xml:id=\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata "
-"format=\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" "
+"fileref=\"dx2-setRootPassword.png\" format=\"PNG\" revision=\"1\" "
+"xml:id=\"setRootPassword-im1\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-user1.png\" format=\"PNG\"/> "
+"</imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:21
+#: en/addUser.xml:40
 msgid "Set Administrator (root)  Password:"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:24
+#: en/addUser.xml:44
 msgid ""
 "It is advisable for all Mageia installations to set a "
 "<literal>superuser</literal> (Administrator) password, usually called the "
-"<emphasis>root </emphasis>password in Linux. As you type a password into the "
-"top box a shield will change from red-to-yellow-to-green depending on the "
-"strength of the password. A green shield shows you are using a strong "
-"password. You need to repeat the same password in the box underneath, to "
-"check that the first entry was not mistyped."
+"<emphasis>root </emphasis>password in Linux. You need to repeat the same "
+"password in the box underneath, to check that the first entry was not "
+"mistyped."
+msgstr ""
+
+#. type: Content of: <section><section><note><para>
+#: en/addUser.xml:51
+msgid ""
+"As you type a password into the top box a shield will change from "
+"red-to-yellow-to-green depending on the strength of the password. A green "
+"shield shows you are using a strong password."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:32
+#: en/addUser.xml:55
 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:39
+#: en/addUser.xml:63
 msgid "Enter a user"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:41
+#: en/addUser.xml:66
 msgid ""
 "Add a User here. A regular user has fewer privileges than the "
 "<literal>superuser</literal> (root), but enough to use the Internet, office "
@@ -197,39 +206,39 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:47
+#: en/addUser.xml:73
 msgid "<emphasis role=\"bold\">Icon</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:48
+#: en/addUser.xml:75
 msgid "Click on this button if you want to change the user's icon"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:52
+#: en/addUser.xml:80
 msgid "<emphasis role=\"bold\">Real Name</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:53
+#: en/addUser.xml:82
 msgid "Insert the user's real name into this text box"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:56
+#: en/addUser.xml:86
 msgid "<emphasis role=\"bold\">Login Name</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:57
+#: en/addUser.xml:88
 msgid ""
 "Enter the user login name or let DrakX use a version of the user's real "
 "name. <emphasis role=\"bold\">The login name is case-sensitive.</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><caution><simpara>
-#: en/addUser.xml:61
+#: en/addUser.xml:93
 msgid ""
 "The login entered here should be different to any login currently in use for "
 "your <filename>/home</filename> directory. Some user parameters will be "
@@ -238,34 +247,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:65 en/setupBootloader.xml:124
+#: en/addUser.xml:102 en/setupBootloader.xml:182
 msgid "<emphasis role=\"bold\">Password</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:66
-msgid ""
-"Type in the user password. There is a shield at the end of the text box that "
-"indicates the strength of the password. (See also <xref "
-"linkend=\"givePassword\"/>)"
+#: en/addUser.xml:104
+msgid "Type in the user password (remembering the advice in the Note above)."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:68
+#: en/addUser.xml:107
 msgid ""
 "<emphasis role=\"bold\">Password (again):</emphasis> Retype the user "
 "password. DrakX will check that you have not mistyped the password."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:74
+#: en/addUser.xml:114
 msgid ""
 "Any users added while installing Mageia, will have a home directory that is "
 "both read and write protected (umask=0027)"
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:76
+#: en/addUser.xml:117
 msgid ""
 "You can add any extra needed users in the <emphasis>Configuration - "
 "Summary</emphasis> step during the install. Choose <emphasis>User "
@@ -273,24 +279,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:79
+#: en/addUser.xml:121
 msgid "The access permissions can also be changed after the install."
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:85
+#: en/addUser.xml:128
 msgid "User Management (advanced)"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:87
+#: en/addUser.xml:131
 msgid ""
 "The <emphasis>Advanced</emphasis> option allows you to edit further settings "
 "for the user you are adding."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:91
+#: en/addUser.xml:136
 msgid ""
 "<emphasis>Shell</emphasis>: This drop-down list allows you to change the "
 "shell available to any user you added in the previous screen. Options are "
@@ -298,7 +304,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:143
 msgid ""
 "<emphasis>User ID</emphasis>: Here you can set the user ID for any user you "
 "added in the previous screen. If you are unsure what the purpose of this is, "
@@ -306,7 +312,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:102
+#: en/addUser.xml:149
 msgid ""
 "<emphasis>Group ID</emphasis>: This lets you set the group ID.  Again, if "
 "unsure, leave it blank."
@@ -428,24 +434,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:23
+#: en/bootLive.xml:10
 msgid "Boot Mageia as Live system"
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:28
+#: en/bootLive.xml:14
 msgid "Booting the medium"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:31
+#: en/bootLive.xml:16
 msgid ""
 "You can boot directly from a Live DVD or USB. Usually, you just need to plug "
 "the USB device in or place the DVD in the drive and restart the computer."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:35
+#: en/bootLive.xml:19
 msgid ""
 "If the computer does not automatically boot from the USB or DVD you may need "
 "to reconfigure your BIOS Boot Disk priority. Alternatively, you might try "
@@ -454,7 +460,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><tip><para>
-#: en/bootLive.xml:41
+#: en/bootLive.xml:24
 msgid ""
 "To access the BIOS or boot menu when the computer is starting, you can try "
 "pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or "
@@ -465,7 +471,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/bootLive.xml:50
+#: en/bootLive.xml:32
 msgid ""
 "The actual screen that you will first see when booting from the Live media "
 "will depend on whether your computer motherboard is of the Legacy (BIOS) or "
@@ -473,90 +479,90 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:58
+#: en/bootLive.xml:39
 msgid "In BIOS/CSM/Legacy mode"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:62
+#: en/bootLive.xml:42
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> "
+"<imageobject> <imagedata fileref=\"../live-bootCSM.png\" align=\"center\"/> "
 "</imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:67
+#: en/bootLive.xml:46
 msgid "First screen while booting in BIOS mode"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><title>
-#: en/bootLive.xml:72 en/bootLive.xml:144 en/installer.xml:106 en/installer.xml:154
+#: en/bootLive.xml:50 en/bootLive.xml:104 en/installer.xml:108 en/installer.xml:156
 msgid "Menu"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:75 en/bootLive.xml:147
+#: en/bootLive.xml:52 en/bootLive.xml:106
 msgid "<emphasis role=\"bold\">Boot Mageia</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:77
+#: en/bootLive.xml:53
 msgid ""
 "This option will boot the Mageia Live system from the connected DVD/USB "
 "media (expect a very slow system compared to an installed OS)."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:81
+#: en/bootLive.xml:56
 msgid "Once the boot is done, you can proceed to the installation."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:86 en/bootLive.xml:102
+#: en/bootLive.xml:60 en/bootLive.xml:72
 msgid ""
 "<emphasis role=\"bold\">+ use non-free video drivers (slower to "
 "boot)</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:89
+#: en/bootLive.xml:62
 msgid "Boot the Mageia Live system using non-free video drivers"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:96 en/bootLive.xml:155 en/installer.xml:109
+#: en/bootLive.xml:68 en/bootLive.xml:112 en/installer.xml:111
 msgid "<emphasis role=\"bold\">Install Mageia</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:98 en/bootLive.xml:157
+#: en/bootLive.xml:69 en/bootLive.xml:113
 msgid "This option will install Mageia to a hard disk."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:105
+#: en/bootLive.xml:74
 msgid "Install Mageia using non-free video drivers"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:111 en/installer.xml:125
+#: en/bootLive.xml:79 en/installer.xml:127
 msgid "<emphasis role=\"bold\">Memory Test</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:113 en/installer.xml:127
+#: en/bootLive.xml:80 en/installer.xml:129
 msgid ""
 "Test the installed RAM by performing multiple read and write "
 "operations. Reboot to end the test."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:118 en/bootLive.xml:161
+#: en/bootLive.xml:84 en/bootLive.xml:116
 msgid "<emphasis role=\"bold\"> F2 Language</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:120 en/bootLive.xml:163
+#: en/bootLive.xml:85 en/bootLive.xml:117
 msgid ""
 "Press <keycap>F2</keycap> to have the installer use a specific language "
 "during the installation. Use the arrow keys to select the language then "
@@ -564,24 +570,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:129
+#: en/bootLive.xml:93
 msgid "In UEFI mode"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:133
+#: en/bootLive.xml:96
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
-"format=\"PNG\" revision=\"1\" 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:139
+#: en/bootLive.xml:100
 msgid "First screen while booting in UEFI mode"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:149
+#: en/bootLive.xml:107
 msgid ""
 "This option will boot the Mageia Live system from the connected DVD/USB "
 "media (expect a very slow system compared to an installed OS).  Once the "
@@ -589,7 +595,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/bootLive.xml:170
+#: en/bootLive.xml:123
 msgid ""
 "If you booted from a USB stick, you will see the above menu options "
 "duplicated, and in this case, you should choose from the menu pair that will "
@@ -804,12 +810,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:24
+#: en/configureX_card_list.xml:27
 msgid "Choose an X Server (Configure your Graphic Card)"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_card_list.xml:29
+#: en/configureX_card_list.xml:32
 msgid ""
 "<imageobject> <imagedata align=\"center\" "
 "fileref=\"dx2-configureX_card_list.png\" format=\"PNG\" revision=\"1\" "
@@ -817,36 +823,36 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:35
+#: en/configureX_card_list.xml:38
 msgid ""
 "DrakX has a very comprehensive database of video cards and will usually "
 "correctly identify your video device."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:38
+#: en/configureX_card_list.xml:41
 msgid ""
 "If the installer has not correctly detected your graphic card and you know "
 "which one you have, you can select it from the tree by:"
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_card_list.xml:41 en/configureX_monitor.xml:74
+#: en/configureX_card_list.xml:44 en/configureX_monitor.xml:78
 msgid "Vendor"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:45
+#: en/configureX_card_list.xml:48
 msgid "then the make of your card"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:49
+#: en/configureX_card_list.xml:52
 msgid "and the model of card"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:53
+#: en/configureX_card_list.xml:56
 msgid ""
 "If you cannot find your card in the vendor lists (because it's not yet in "
 "the database or it's an older card) you may find a suitable driver in the "
@@ -857,14 +863,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><caution><para>
-#: en/configureX_card_list.xml:61
+#: en/configureX_card_list.xml:64
 msgid ""
 "Be aware that if you select an incompatible driver you may only have access "
 "to the <emphasis>Command Line Interface</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:65
+#: en/configureX_card_list.xml:68
 msgid ""
 "Some video card manufacturers provide proprietary drivers for Linux which "
 "may only be available in the <emphasis>Nonfree</emphasis> repository and in "
@@ -875,17 +881,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:11
-msgid "Graphic Card and Monitor Configuration"
+#: en/configureX_chooser.xml:23
+msgid "Graphics Card and Monitor Configuration"
 msgstr ""
 
-#.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
-#. 2018/02/15 apb: Some text and typography.
-#. 2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.
-#. 2018/02/23 apb: Typo.
-#. 2019/01/06 apb: Slight reword, split 1st para in two.
 #. type: Content of: <section><mediaobject>
-#: en/configureX_chooser.xml:26
+#: en/configureX_chooser.xml:28
 msgid ""
 "<imageobject> <imagedata align=\"center\" "
 "fileref=\"dx2-configureX_chooser.png\" format=\"PNG\" revision=\"1\" "
@@ -893,7 +894,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:32
+#: en/configureX_chooser.xml:34
 msgid ""
 "No matter which graphical environment (also known as desktop environment) "
 "you chose for this install of Mageia, they are all based on a graphical user "
@@ -904,31 +905,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:39
+#: en/configureX_chooser.xml:41
 msgid ""
 "Choose the appropriate settings manually if you think the details are "
 "incorrect, or if none are shown."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:44
-msgid "<emphasis role=\"bold\">Graphic Card</emphasis>"
+#: en/configureX_chooser.xml:46
+msgid "<emphasis role=\"bold\">Graphics Card</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:47
+#: en/configureX_chooser.xml:49
 msgid ""
 "If you need to, you can select a specific card from this expandable "
 "list. See <xref linkend=\"configureX_card_list\"/>."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:52
+#: en/configureX_chooser.xml:54
 msgid "<emphasis role=\"bold\">Monitor</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:55
+#: en/configureX_chooser.xml:57
 msgid ""
 "You can choose Plug 'n Play, if applicable, or choose your monitor from the "
 "<emphasis>Vendor</emphasis> or <emphasis>Generic</emphasis> lists. Choose "
@@ -938,22 +939,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:63
+#: en/configureX_chooser.xml:65
 msgid "<emphasis role=\"bold\">Resolution</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:66
+#: en/configureX_chooser.xml:68
 msgid "The resolution and color depth of your monitor can be set here."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:71
+#: en/configureX_chooser.xml:73
 msgid "<emphasis role=\"bold\">Test</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:74
+#: en/configureX_chooser.xml:76
 msgid ""
 "The test button does not always appear during install. If the option is "
 "there, and you test your settings, you should be asked to confirm that your "
@@ -965,17 +966,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:85
+#: en/configureX_chooser.xml:87
 msgid "<emphasis role=\"bold\">Options</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:88
+#: en/configureX_chooser.xml:90
 msgid "Here you can choose to enable or disable various options."
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_chooser.xml:93
+#: en/configureX_chooser.xml:95
 msgid ""
 "There is a risk of damaging a monitor if you choose refresh rates that are "
 "outside the frequency range of that monitor. This applies to older CRT "
@@ -984,19 +985,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_monitor.xml:22
+#: en/configureX_monitor.xml:26
 msgid "Choosing your Monitor"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:25
+#: en/configureX_monitor.xml:29
 msgid ""
 "DrakX has a very comprehensive database of monitors and will usually "
 "correctly identify yours."
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:30
+#: en/configureX_monitor.xml:34
 msgid ""
 "<emphasis role=\"bold\">Selecting a monitor with different characteristics "
 "could damage your monitor or video hardware. Please don't try something "
@@ -1005,7 +1006,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:38
+#: en/configureX_monitor.xml:42
 msgid ""
 "<imageobject> <imagedata align=\"center\" "
 "fileref=\"dx2-configureX_monitor.png\" format=\"PNG\" revision=\"1\" "
@@ -1013,12 +1014,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:46
+#: en/configureX_monitor.xml:50
 msgid "Custom"
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:49
+#: en/configureX_monitor.xml:53
 msgid ""
 "This option allows you to set two critical parameters: the vertical refresh "
 "rate and the horizontal sync rate. Vertical refresh determines how often the "
@@ -1027,7 +1028,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:55
+#: en/configureX_monitor.xml:59
 msgid ""
 "It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor "
 "type with a sync range that is beyond the capabilities of your monitor: you "
@@ -1036,56 +1037,57 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:64
+#: en/configureX_monitor.xml:68
 msgid "Plug'n Play"
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:67
+#: en/configureX_monitor.xml:71
 msgid ""
 "This is the default option and automatically tries to determine the monitor "
 "type from the monitor database."
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:77
+#: en/configureX_monitor.xml:81
 msgid ""
 "If the installer has not correctly detected your monitor and you know which "
-"one you have, you can select it from the tree by selecting:"
+"one you have, you can choose it from the options by selecting:"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:86
+#: en/configureX_monitor.xml:90
 msgid "Manufacturer"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:90
+#: en/configureX_monitor.xml:94
 msgid "Monitor model"
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:96
+#: en/configureX_monitor.xml:100
 msgid "Generic"
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:99
+#: en/configureX_monitor.xml:103
 msgid ""
-"Selecting this group will list nearly 30 display configurations such as "
-"1024x768 @ 60Hz and includes flat-panel displays as used in laptops. This is "
-"often a good monitor selection group if you need to use the VESA card driver "
-"when your video hardware cannot be determined automatically.  Once again it "
-"may be wise to be conservative in your selections."
+"Selecting this group will list approximately 30 display configurations such "
+"as 1024x768 @ 60Hz and includes flat-panel displays as used in laptops.  "
+"This is often a good monitor selection group if you need to use the VESA "
+"card driver when your video hardware cannot be determined "
+"automatically. Once again, it may be wise to be conservative in your "
+"selections."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:22
+#: en/diskdrake.xml:24
 msgid "Custom Disk Partitioning with DiskDrake"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:27
+#: en/diskdrake.xml:29
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" "
 "fileref=\"dx2-diskdrake.png\"/> </imageobject> <imageobject "
@@ -1094,7 +1096,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:38
+#: en/diskdrake.xml:40
 msgid ""
 "Modify the layout of your disk(s) here. You can remove or create partitions, "
 "change the filesystem or size of a partition and even view their details "
@@ -1102,15 +1104,15 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:47
 msgid ""
 "There is a tab at the top for every detected hard disk (or other storage "
-"device, like a USB key). In the screenshot above there are two available "
-"devices: <filename>sda </filename>and <filename>sdb</filename>."
+"device, like a USB key), for example: <filename>sda</filename>, "
+"<filename>sdb</filename>, <filename>sdc</filename> etc."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:52
+#: en/diskdrake.xml:54
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe "
@@ -1119,21 +1121,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:60
+#: en/diskdrake.xml:62
 msgid ""
 "Continue until you have adjusted everything to your satisfaction, then click "
 "<emphasis>Done</emphasis> when you're ready."
 msgstr ""
 
 #. type: Content of: <section><warning><orderedlist><listitem><para>
-#: en/diskdrake.xml:69
+#: en/diskdrake.xml:71
 msgid ""
 "Take care with the <emphasis>Clear all</emphasis> option, use it only if you "
 "are sure you want to wipe all partitions on the selected storage device."
 msgstr ""
 
 #. type: Content of: <section><warning><orderedlist><listitem><para>
-#: en/diskdrake.xml:75
+#: en/diskdrake.xml:77
 msgid ""
 "If you wish to use encryption on your <filename>/</filename> partition you "
 "must ensure that you have a separate <filename>/boot</filename> "
@@ -1142,7 +1144,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/diskdrake.xml:87
+#: en/diskdrake.xml:89
 msgid ""
 "If you are installing Mageia on a UEFI system, check that an ESP (EFI System "
 "Partition) is present and correctly mounted on "
@@ -1150,19 +1152,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/diskdrake.xml:93
+#: en/diskdrake.xml:95
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
 "partition is present and of the correct type. See Figure 2 below."
 msgstr ""
 
 #. type: Content of: <section><figure><title>
-#: en/diskdrake.xml:101
+#: en/diskdrake.xml:103
 msgid "EFI System Partition"
 msgstr ""
 
 #. type: Content of: <section><figure><mediaobject>
-#: en/diskdrake.xml:104
+#: en/diskdrake.xml:106
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" "
 "fileref=\"dx2-diskdrake2.png\"/> </imageobject> <imageobject "
@@ -1171,17 +1173,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><figure>
-#: en/diskdrake.xml:103 en/diskdrake.xml:117
+#: en/diskdrake.xml:105 en/diskdrake.xml:119
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <section><figure><title>
-#: en/diskdrake.xml:115
+#: en/diskdrake.xml:117
 msgid "BIOS boot partition"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:118 en/doPartitionDisks.xml:201
+#: en/diskdrake.xml:120 en/doPartitionDisks.xml:206
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" "
 "fileref=\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject "
@@ -1200,26 +1202,26 @@ msgid "Partitioning"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:31
 msgid "Suggested Partitioning"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:34
 msgid ""
 "In this screen you can see the content of your hard drive(s) along with the "
 "DrakX partitioning proposals for where to install Mageia."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:34
+#: en/doPartitionDisks.xml:38
 msgid ""
 "The actual options available from those shown below will vary according to "
 "the layout and content of your particular hard drive(s)."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:39
+#: en/doPartitionDisks.xml:43
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" "
 "fileref=\"dx2-doPartitionDisks.png\"/> </imageobject> <imageobject "
@@ -1228,110 +1230,115 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><title>
-#: en/doPartitionDisks.xml:49
+#: en/doPartitionDisks.xml:53
 msgid "Main Options"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:56
 msgid "<emphasis role=\"bold\">Use Existing Partitions</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:59
 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><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:61
+#: en/doPartitionDisks.xml:65
 msgid "<emphasis role=\"bold\">Use Free Space</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:68
 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><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:70
+#: en/doPartitionDisks.xml:74
 msgid "<emphasis role=\"bold\">Use Free Space on a Windows Partition</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:73
+#: en/doPartitionDisks.xml:77
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it. 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 important files!"
+"installation but see the warning below."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para><mediaobject>
+#: en/doPartitionDisks.xml:87
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" "
+"fileref=\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata align=\"center\" "
+"fileref=\"live-doPartitionDisks2.png\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:79
+#: en/doPartitionDisks.xml:82
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
 "light blue and the proposed Mageia partition in dark blue with their "
 "intended sizes just underneath. You have the option to modify these sizes by "
 "clicking and dragging the gap between both partitions.  See the following "
-"screenshot:"
+"screenshot:<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><warning><para>
+#: en/doPartitionDisks.xml:97
+msgid ""
+"This involves shrinking the size of the Windows partition, and therefore is "
+"a risky operation, so you should make sure you have backed up all important "
+"files before proceeding."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><important><para>
+#: en/doPartitionDisks.xml:103
+msgid ""
+"The partition must be \"clean\", meaning that Windows must have closed down "
+"correctly the last time it was used. It must also have been defragmented, "
+"although this is not a guarantee that all files in the partition have been "
+"moved out of the area that is about to be used for Mageia."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:87
+#: en/doPartitionDisks.xml:112
 msgid "<emphasis role=\"bold\">Erase and use Entire Disk</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:90
+#: en/doPartitionDisks.xml:115
 msgid "This option will allocate the entire drive for Mageia"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:119
 msgid ""
 "This will erase ALL data on the selected hard drive. Take care! 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 this option."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><important><para>
-#: en/doPartitionDisks.xml:101
-msgid ""
-"Note that this involves shrinking the size of the Windows partition. The "
-"partition must be \"clean\", meaning that Windows must have closed down "
-"correctly the last time it was used. It must also have been defragmented, "
-"although this is not a guarantee that all files in the partition have been "
-"moved out of the area that is about to be used. It is highly recommended to "
-"back up your personal files."
-msgstr ""
-
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:112
+#: en/doPartitionDisks.xml:127
 msgid "<emphasis role=\"bold\">Custom Disk Partitioning</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:115
+#: en/doPartitionDisks.xml:130
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
 msgstr ""
 
-#. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:122
-msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" "
-"fileref=\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata align=\"center\" "
-"fileref=\"live-doPartitionDisks2.png\"/> </imageobject>"
-msgstr ""
-
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:131
+#: en/doPartitionDisks.xml:136
 msgid ""
 "If you are not using the <emphasis>Custom disk partitioning</emphasis> "
 "option, then the installer will allocate the available space according to "
@@ -1339,60 +1346,60 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:137
+#: en/doPartitionDisks.xml:142
 msgid ""
 "If the total available space is less than 50 GB, then only one partition is "
 "created. This will be the <filename>/</filename> (root)  partition."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:143
+#: en/doPartitionDisks.xml:148
 msgid ""
 "If the total available space is greater than 50 GB, then three partitions "
 "are created"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:148
+#: en/doPartitionDisks.xml:153
 msgid ""
 "6/19 of the total available place is allocated to <filename>/</filename> "
 "with a maximum of 50 GB"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:153
+#: en/doPartitionDisks.xml:158
 msgid "1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:158
+#: en/doPartitionDisks.xml:163
 msgid "the rest (at least 12/19) is allocated to <filename>/home</filename>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:165
+#: en/doPartitionDisks.xml:170
 msgid ""
 "This means that from 160 GB or greater available space, the installer will "
 "create three partitions:"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:170
+#: en/doPartitionDisks.xml:175
 msgid "50 GB for <filename>/</filename>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:174
+#: en/doPartitionDisks.xml:179
 msgid "4 GB for <filename>swap</filename>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:178
+#: en/doPartitionDisks.xml:183
 msgid "and the remainder for <filename>/home</filename>"
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:183
+#: en/doPartitionDisks.xml:188
 msgid ""
 "If you are using a UEFI system, the ESP (EFI System Partition) will be "
 "automatically detected - or created if it does not exist yet - and mounted "
@@ -1402,7 +1409,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:189
+#: en/doPartitionDisks.xml:194
 msgid ""
 "If you are using a Legacy (also known as BIOS) system with a GPT partitioned "
 "disk, you need to create a BIOS boot partition if it doesn't already "
@@ -1413,19 +1420,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:196
+#: en/doPartitionDisks.xml:201
 msgid "See <xref linkend=\"diskdrake\"/> for information on how to proceed."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:211
+#: en/doPartitionDisks.xml:216
 msgid ""
-"<imageobject> <imagedata align=\"center\" "
-"fileref=\"dx2-doPartitionDisks4.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" "
+"fileref=\"dx2-doPartitionDisks4.png\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata align=\"center\" "
+"fileref=\"live-doPartitionDisks4.png\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:217
+#: en/doPartitionDisks.xml:226
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
 "previous standard of 512. Due to lack of available hardware, the "
@@ -1434,7 +1443,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:222
+#: en/doPartitionDisks.xml:231
 msgid ""
 "Some SSD devices now use an erase block size over 1 MB. If you have such a "
 "device we suggest that you partition the drive in advance, using an "
@@ -1443,17 +1452,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:229
+#: en/doPartitionDisks.xml:238
 msgid "<emphasis>Align to</emphasis> = MiB"
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:233
+#: en/doPartitionDisks.xml:242
 msgid "<emphasis>Free space preceding (MiB)</emphasis> = 2"
 msgstr ""
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:237
+#: en/doPartitionDisks.xml:246
 msgid "Also make sure all partitions are created using an even number of megabytes."
 msgstr ""
 
@@ -1601,12 +1610,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/firewall.xml:7
+#: en/firewall.xml:16
 msgid "Firewall"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:10
+#: en/firewall.xml:19
 msgid ""
 "This section allows you to configure some simple firewall rules: they "
 "determine which type of message from the Internet will be accepted by the "
@@ -1614,8 +1623,15 @@ msgid ""
 "system to be accessible from the Internet."
 msgstr ""
 
+#. type: Content of: <section><mediaobject>
+#: en/firewall.xml:26
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-firewall.png\"/> "
+"</imageobject>"
+msgstr ""
+
 #. type: Content of: <section><para>
-#: en/firewall.xml:16
+#: en/firewall.xml:31
 msgid ""
 "In the default setting (no button is checked), no service of the system is "
 "accessible from the network. The <emphasis>Everything (no "
@@ -1628,7 +1644,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:25
+#: en/firewall.xml:40
 msgid ""
 "All other options are more or less self-explanatory. As an example, you will "
 "enable the CUPS server if you want printers on your machine to be accessible "
@@ -1636,12 +1652,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:29
+#: en/firewall.xml:44
 msgid "<emphasis role=\"bold\">Advanced</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:31
+#: en/firewall.xml:46
 msgid ""
 "The <emphasis>Advanced</emphasis> option opens a window where you can enable "
 "a series of services by typing a list of <quote>couples</quote> (blank "
@@ -1649,35 +1665,35 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:35
-msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
+#: en/firewall.xml:50
+msgid "<emphasis>&lt;port-number&gt;/&lt;protocol&gt;</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:38
+#: en/firewall.xml:53
 msgid ""
-"- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
-"the service you want to enable (e.g. 873 for the RSYNC service) as defined "
-"in <emphasis>RFC-433</emphasis>;"
+"- <emphasis>&lt;port-number&gt;</emphasis> is the value of the port assigned "
+"to the service you want to enable (e.g. 873 for the RSYNC service) as "
+"defined in <emphasis>RFC-433</emphasis>;"
 msgstr ""
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:42
+#: en/firewall.xml:57
 msgid ""
-"- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
-"<emphasis>UDP</emphasis> - the internet protocol that is used by the "
+"- <emphasis>&lt;protocol&gt;</emphasis> is one of <emphasis>TCP</emphasis> "
+"or <emphasis>UDP</emphasis> - the internet protocol that is used by the "
 "service."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:47
+#: en/firewall.xml:62
 msgid ""
 "For instance, the entry for enabling access to the RSYNC service therefore "
 "is <emphasis>873/tcp</emphasis>."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:50
+#: en/firewall.xml:65
 msgid ""
 "In case a service is implemented to use both protocols, you specify 2 "
 "couples for the same port."
@@ -1745,12 +1761,12 @@ msgid "Graphical Configuration"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:32
+#: en/installer.xml:34
 msgid "DrakX, the Mageia Installer"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/installer.xml:35
+#: en/installer.xml:37
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -1758,19 +1774,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:40
+#: en/installer.xml:42
 msgid "The installation steps"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:44
+#: en/installer.xml:46
 msgid ""
 "The install process is divided into a number of steps - the status of which "
 "is indicated in a panel to the left of the screen."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:50
+#: en/installer.xml:52
 msgid ""
 "Each step has one or more screens, which may also have "
 "<emphasis>Advanced</emphasis> sections with extra, less commonly required "
@@ -1778,14 +1794,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:56
+#: en/installer.xml:58
 msgid ""
 "Most screens have <emphasis>Help</emphasis> buttons for further details "
 "about the particular step."
 msgstr ""
 
 #. type: Content of: <section><section><caution><para>
-#: en/installer.xml:62
+#: en/installer.xml:64
 msgid ""
 "If at some point during the install you decide to abort the installation, it "
 "is possible to reboot, but please think twice before you do this. Once a "
@@ -1795,7 +1811,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><caution><para>
-#: en/installer.xml:68
+#: en/installer.xml:70
 msgid ""
 "If, in spite of this, you are very sure rebooting is what you want, go to a "
 "text terminal by pressing the keys <keycombo> <keycap>Ctrl</keycap> "
@@ -1805,12 +1821,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:86
+#: en/installer.xml:88
 msgid "Installation Welcome Screen"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:88
+#: en/installer.xml:90
 msgid ""
 "The particular screen that you will first see when booting from the "
 "Installation media will depend on whether your computer motherboard is of "
@@ -1818,60 +1834,60 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:92
+#: en/installer.xml:94
 msgid ""
 "The welcome menu screen has various options, however the default option will "
 "start the installer, and is normally all that you will need."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:97
+#: en/installer.xml:99
 msgid "Legacy (BIOS) Systems"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:100
+#: en/installer.xml:102
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome.png\"/> "
 "</imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:111
+#: en/installer.xml:113
 msgid ""
 "Install Mageia to a hard disk. This is the default option, and will "
 "automatically start after a short while unless another option is selected."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:117
+#: en/installer.xml:119
 msgid "<emphasis role=\"bold\">Rescue System</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:119
+#: en/installer.xml:121
 msgid ""
 "This option allows you to either re-install the bootloader for an existing "
 "Mageia installation or you can use it to restore a Windows bootloader."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:132
+#: en/installer.xml:134
 msgid "<emphasis role=\"bold\">F2: Language</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:134
+#: en/installer.xml:136
 msgid "Press F2 for alternative languages."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:140
+#: en/installer.xml:142
 msgid "UEFI Systems"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:142
+#: en/installer.xml:144
 msgid ""
 "From this screen, you can access options by pressing <keycap>e</keycap> to "
 "enter the edit mode. To come back to this screen, press <keycap>Esc</keycap> "
@@ -1879,19 +1895,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:148
+#: en/installer.xml:150
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome2.png\"/> "
 "</imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:157
+#: en/installer.xml:159
 msgid "<emphasis role=\"bold\">Install:</emphasis> Start the Install process"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:162
+#: en/installer.xml:164
 msgid ""
 "<emphasis role=\"bold\">Rescue:</emphasis> This option allows you to either "
 "re-install the bootloader for an existing Mageia installation or you can use "
@@ -1899,31 +1915,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:169
+#: en/installer.xml:171
 msgid ""
 "<emphasis role=\"bold\">F2: Language:</emphasis> Press <keycap>F2</keycap> "
 "for alternative languages."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:174
+#: en/installer.xml:176
 msgid ""
 "If you booted from a USB stick, you will see the above options duplicated, "
 "and in this case, you should use the set that will be suffixed with \"USB\"."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:181
+#: en/installer.xml:183
 msgid "Installation Problems and Possible Solutions"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:184
+#: en/installer.xml:186
 msgid "No Graphical Interface"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:188
+#: en/installer.xml:190
 msgid ""
 "After the initial screen you did not progress to the <emphasis>Language "
 "Selection</emphasis> screen. This can happen with some graphic cards and "
@@ -1932,7 +1948,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:195
+#: en/installer.xml:197
 msgid ""
 "If the hardware is very old, a graphical installation may not be "
 "possible. In this case it is worth trying a text-mode installation. To use "
@@ -1944,12 +1960,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:208
+#: en/installer.xml:210
 msgid "The Install Freezes"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:210
+#: en/installer.xml:212
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic hardware "
@@ -1959,12 +1975,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:218
+#: en/installer.xml:220
 msgid "RAM problem"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:220
+#: en/installer.xml:222
 msgid ""
 "This will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
@@ -1974,12 +1990,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:228
+#: en/installer.xml:230
 msgid "Dynamic partitions"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:230
+#: en/installer.xml:232
 msgid ""
 "If you converted your hard disk from <literal>Basic</literal> format to "
 "<literal>Dynamic</literal> format in Microsoft Windows, then it is not "
@@ -3568,73 +3584,105 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:27
+#: en/setupBootloader.xml:32
 msgid "Bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:31
+#: en/setupBootloader.xml:36
+msgid "Available Bootloaders"
+msgstr ""
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:39
 msgid "Grub2"
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><title>
-#: en/setupBootloader.xml:34
-msgid "Grub2 on Legacy MBR/GPT systems"
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:42
+msgid "<emphasis role=\"bold\">Grub2 on Legacy MBR/GPT systems</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:37
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:46
 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:42
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:52
 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:49
-msgid "Grub2-efi on UEFI systems"
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:59
+msgid "<emphasis role=\"bold\">Grub2-efi on UEFI systems</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:52
-msgid "GRUB2-efi will be used exclusively as the bootloader for a UEFI system."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:63
+msgid "GRUB2-efi or rEFInd may be used as the bootloader for a UEFI system."
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:57
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:68
 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:60
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:71
 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 "
-"created by Windows and add grub2-efi to it. If no ESP exists, then one will "
+"created by Windows and add grub2-efi to it.  If no ESP exists, then one will "
 "be created. Although it is possible to have several ESPs, only one is "
 "required, whatever the number of operating systems you have."
 msgstr ""
 
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:82
+msgid "rEFInd"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:85
+msgid "<emphasis role=\"bold\">rEFInd on UEFI systems</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:88
+msgid ""
+"rEFInd has a nice graphical set of options, and can auto-detect installed "
+"EFI bootloaders. See: http://www.rodsbooks.com/refind/"
+msgstr ""
+
+#. type: Content of: <section><section><section><note><para>
+#: en/setupBootloader.xml:95
+msgid ""
+"Please note that in order to be able to use the <literal>rEFInd</literal> "
+"option, an installed EFI System Partition must match your system "
+"architecture: if you have a 32bit EFI System Partition installed on a 64bit "
+"machine for instance, then the rEFInd option will not be displayed/available "
+"to you."
+msgstr ""
+
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:72
+#: en/setupBootloader.xml:106
 msgid "Bootloader Setup"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:76
+#: en/setupBootloader.xml:110
 msgid "Bootloader main options"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:79
+#: en/setupBootloader.xml:113
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" "
 "fileref=\"dx2-setupBootloader.png\"/> </imageobject> <imageobject "
@@ -3643,46 +3691,68 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:91
+#: en/setupBootloader.xml:125
 msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:93
+#. type: Content of: <section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:129
+msgid ""
+"<guimenuitem>GRUB2</guimenuitem> (with either a graphical or a text menu), "
+"can be chosen for both <literal>Legacy MBR/BIOS</literal> systems and "
+"<literal>UEFI</literal> systems."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:136
 msgid ""
-"This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI "
-"systems will not see this option here."
+"<guimenuitem>rEFInd</guimenuitem> (with a graphical menu)  is an alternative "
+"option solely for use with <literal>UEFI</literal> systems."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:98
+#: en/setupBootloader.xml:144
 msgid "<emphasis role=\"bold\">Boot device</emphasis>"
 msgstr ""
 
+#. type: Content of: <section><section><section><itemizedlist><listitem><warning><para>
+#: en/setupBootloader.xml:147
+msgid "Don't change this unless you really know what you are doing."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><note><para>
+#: en/setupBootloader.xml:152
+msgid ""
+"There is no option to write GRUB to the boot sector of a partition (e.g: "
+"<filename>sda1</filename>), as this method is considered unreliable."
+msgstr ""
+
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:100
-msgid "Don't change this unless you really know what you are doing"
+#: en/setupBootloader.xml:157
+msgid ""
+"When using UEFI mode, then the <guilabel>Boot device</guilabel> will be "
+"listed as <guimenuitem>EFI System Partition</guimenuitem>."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:105
+#: en/setupBootloader.xml:163
 msgid "<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:108
+#: en/setupBootloader.xml:166
 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:113
+#: en/setupBootloader.xml:171
 msgid "<emphasis role=\"bold\">Security</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:115
+#: en/setupBootloader.xml:173
 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 "
@@ -3692,34 +3762,34 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:126
+#: en/setupBootloader.xml:184
 msgid "Choose a password for the bootloader (optional)"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:130
+#: en/setupBootloader.xml:188
 msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:132
+#: en/setupBootloader.xml:190
 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:137 en/setupBootloader.xml:212
+#: en/setupBootloader.xml:195 en/setupBootloader.xml:308
 msgid "<emphasis>Advanced</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:141
+#: en/setupBootloader.xml:199
 msgid "<emphasis>Enable ACPI</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:143
+#: en/setupBootloader.xml:201
 msgid ""
 "ACPI (Advanced Configuration and Power Interface) is a standard for power "
 "management. It can save energy by stopping unused devices. Deselecting it "
@@ -3729,24 +3799,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:152
+#: en/setupBootloader.xml:210
 msgid "<emphasis>Enable SMP</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:154
+#: en/setupBootloader.xml:212
 msgid ""
 "This option enables/disables symmetric multiprocessing for multi-core "
 "processors"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:159
+#: en/setupBootloader.xml:217
 msgid "<emphasis>Enable APIC</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:161
+#: en/setupBootloader.xml:219
 msgid ""
 "Enabling this gives the operating system access to the Advanced Programmable "
 "Interrupt Controller. APIC devices permit more complex priority models, and "
@@ -3754,24 +3824,76 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:168
+#: en/setupBootloader.xml:226
 msgid "<emphasis>Enable Local APIC</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:170
+#: en/setupBootloader.xml:228
 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:177
+#: en/setupBootloader.xml:235
 msgid "Bootloader Configuration"
 msgstr ""
 
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:237
+msgid ""
+"If, in the previous section you selected <literal>rEFInd</literal> as the "
+"bootloader to use, you would then be presented with the options shown in the "
+"screenshot directly below. Otherwise, please instead move on to the "
+"subsequent screenshot for your options."
+msgstr ""
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:243
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" "
+"fileref=\"rEFIndLoaderConfig.png\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata align=\"center\" "
+"fileref=\"live-rEFIndLoaderConfig.png\"/> </imageobject>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:253
+msgid "Your rEFInd configuration options:"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:256
+msgid ""
+"<guimenuitem>Install or update rEFInd in the EFI system "
+"partition.</guimenuitem>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:261
+msgid ""
+"<guimenuitem>Install in EFI/Boot partition (workaround for some "
+"BIOS's).</guimenuitem>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:264
+msgid ""
+"With some BIOS's, the newly written bootloaser for Mageia at end of the "
+"installation will not be recognized. In that case, you can use this option "
+"as a workaround for the issue."
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:270
+msgid ""
+"If you did not select rEFInd as the bootloader to use in the previous "
+"section, then your bootloader configurations are shown below:"
+msgstr ""
+
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:180
+#: en/setupBootloader.xml:275
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" "
 "fileref=\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject "
@@ -3780,42 +3902,42 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:191
+#: en/setupBootloader.xml:286
 msgid "<emphasis role=\"bold\">Default</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:193
+#: en/setupBootloader.xml:288
 msgid "The operating system to be started up by default."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:197
+#: en/setupBootloader.xml:292
 msgid "<emphasis role=\"bold\">Append</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:199
+#: en/setupBootloader.xml:294
 msgid ""
 "This option lets you pass information to the kernel 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:204
+#: en/setupBootloader.xml:299
 msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:206
+#: en/setupBootloader.xml:301
 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, "
-"then untick the Probe Foreign OS option."
+"then untick the <guimenuitem>Probe Foreign OS</guimenuitem> option."
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:215
+#: en/setupBootloader.xml:311
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" "
 "fileref=\"dx2-setupBootloader4.png\"/> </imageobject> <imageobject "
@@ -3824,12 +3946,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:226
+#: en/setupBootloader.xml:322
 msgid "<emphasis>Video mode</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:228
+#: en/setupBootloader.xml:324
 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 "
@@ -3837,38 +3959,47 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:234
+#: en/setupBootloader.xml:330
 msgid "<emphasis>Do not touch ESP or MBR</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:236
+#: en/setupBootloader.xml:332
 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 "
-"missing. Click<emphasis> Ok</emphasis> if you are sure you understand the "
-"implications, and wish to proceed."
+"missing. Click <guimenuitem>Ok </guimenuitem>only if you are sure you "
+"understand the implications, and wish to proceed."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><warning><para>
+#: en/setupBootloader.xml:338
+msgid ""
+"Chain-loading via legacy bootloaders (GRUB Legacy and LiLo)  is no longer "
+"supported by Mageia as it is likely to fail when attempting to boot this "
+"resulting installation of Mageia. If you use anything other than GRUB2 or "
+"rEFInd for this purpose, then you do so at your own risk!"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:245
+#: en/setupBootloader.xml:348
 msgid ""
 "<imageobject> <imagedata align=\"center\" "
 "fileref=\"live-setupBootloader5.png\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:253
+#: en/setupBootloader.xml:356
 msgid "Other Options"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:256
+#: en/setupBootloader.xml:359
 msgid "Using an existing bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:258
+#: en/setupBootloader.xml:361
 msgid ""
 "The exact procedure for adding Mageia to an existing bootloader is beyond "
 "the scope of this documentation. However in most cases it will involve "
@@ -3878,12 +4009,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:267
+#: en/setupBootloader.xml:370
 msgid "Installing Without a Bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:269
+#: en/setupBootloader.xml:372
 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 "
diff --git a/docs/docs/stable/installer/hi.po b/docs/docs/stable/installer/hi.po
index e701ee2f..1c8700a8 100644
--- a/docs/docs/stable/installer/hi.po
+++ b/docs/docs/stable/installer/hi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2019-01-19 21:23+0200\n"
+"POT-Creation-Date: 2019-09-08 15:26+0300\n"
 "PO-Revision-Date: 2019-01-19 19:25+0000\n"
 "Last-Translator: Panwar108 <caspian7pena@gmail.com>\n"
 "Language-Team: Hindi (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -144,7 +144,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/addUser.xml:3
+#: en/addUser.xml:9
 msgid "User Management"
 msgstr ""
 
@@ -154,13 +154,16 @@ msgstr ""
 #. 2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
 #.   Also changed 'Advanced User Management' to 'User Management (advanced)'.
 #. 2018/02/24 apb: Changed list style.
+#. 2019/08/10 apb: Added missing 'condition' profile for live-user1.png.
+#. 2019/08/11 apb: [1] Reword 1.1 (including Note) [2] Reword 1.2 Password text.
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:12
+#: en/addUser.xml:28
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
-"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
-"\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata format="
-"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-setRootPassword.png\" format=\"PNG\" revision=\"1\" xml:id="
+"\"setRootPassword-im1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-user1.png\" format=\"PNG\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
 "\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -168,36 +171,41 @@ msgstr ""
 "\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:21
+#: en/addUser.xml:40
 msgid "Set Administrator (root)  Password:"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:24
+#: en/addUser.xml:44
 msgid ""
 "It is advisable for all Mageia installations to set a <literal>superuser</"
 "literal> (Administrator) password, usually called the <emphasis>root </"
-"emphasis>password in Linux. As you type a password into the top box a shield "
-"will change from red-to-yellow-to-green depending on the strength of the "
-"password. A green shield shows you are using a strong password. You need to "
-"repeat the same password in the box underneath, to check that the first "
-"entry was not mistyped."
+"emphasis>password in Linux. You need to repeat the same password in the box "
+"underneath, to check that the first entry was not mistyped."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:32
+#: en/addUser.xml:51
+msgid ""
+"As you type a password into the top box a shield will change from red-to-"
+"yellow-to-green depending on the strength of the password. A green shield "
+"shows you are using a strong password."
+msgstr ""
+
+#. type: Content of: <section><section><note><para>
+#: en/addUser.xml:55
 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:39
+#: en/addUser.xml:63
 msgid "Enter a user"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:41
+#: en/addUser.xml:66
 msgid ""
 "Add a User here. A regular user has fewer privileges than the "
 "<literal>superuser</literal> (root), but enough to use the Internet, office "
@@ -206,39 +214,39 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:47
+#: en/addUser.xml:73
 msgid "<emphasis role=\"bold\">Icon</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:48
+#: en/addUser.xml:75
 msgid "Click on this button if you want to change the user's icon"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:52
+#: en/addUser.xml:80
 msgid "<emphasis role=\"bold\">Real Name</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:53
+#: en/addUser.xml:82
 msgid "Insert the user's real name into this text box"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:56
+#: en/addUser.xml:86
 msgid "<emphasis role=\"bold\">Login Name</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:57
+#: en/addUser.xml:88
 msgid ""
 "Enter the user login name or let DrakX use a version of the user's real "
 "name. <emphasis role=\"bold\">The login name is case-sensitive.</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><caution><simpara>
-#: en/addUser.xml:61
+#: en/addUser.xml:93
 msgid ""
 "The login entered here should be different to any login currently in use for "
 "your <filename>/home</filename> directory. Some user parameters will be "
@@ -247,34 +255,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:65 en/setupBootloader.xml:124
+#: en/addUser.xml:102 en/setupBootloader.xml:182
 msgid "<emphasis role=\"bold\">Password</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:66
-msgid ""
-"Type in the user password. There is a shield at the end of the text box that "
-"indicates the strength of the password. (See also <xref linkend="
-"\"givePassword\"/>)"
+#: en/addUser.xml:104
+msgid "Type in the user password (remembering the advice in the Note above)."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:68
+#: en/addUser.xml:107
 msgid ""
 "<emphasis role=\"bold\">Password (again):</emphasis> Retype the user "
 "password. DrakX will check that you have not mistyped the password."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:74
+#: en/addUser.xml:114
 msgid ""
 "Any users added while installing Mageia, will have a home directory that is "
 "both read and write protected (umask=0027)"
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:76
+#: en/addUser.xml:117
 msgid ""
 "You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
@@ -282,24 +287,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:79
+#: en/addUser.xml:121
 msgid "The access permissions can also be changed after the install."
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:85
+#: en/addUser.xml:128
 msgid "User Management (advanced)"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:87
+#: en/addUser.xml:131
 msgid ""
 "The <emphasis>Advanced</emphasis> option allows you to edit further settings "
 "for the user you are adding."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:91
+#: en/addUser.xml:136
 msgid ""
 "<emphasis>Shell</emphasis>: This drop-down list allows you to change the "
 "shell available to any user you added in the previous screen. Options are "
@@ -307,7 +312,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:143
 msgid ""
 "<emphasis>User ID</emphasis>: Here you can set the user ID for any user you "
 "added in the previous screen. If you are unsure what the purpose of this is, "
@@ -315,7 +320,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:102
+#: en/addUser.xml:149
 msgid ""
 "<emphasis>Group ID</emphasis>: This lets you set the group ID.  Again, if "
 "unsure, leave it blank."
@@ -435,24 +440,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:23
+#: en/bootLive.xml:10
 msgid "Boot Mageia as Live system"
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:28
+#: en/bootLive.xml:14
 msgid "Booting the medium"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:31
+#: en/bootLive.xml:16
 msgid ""
 "You can boot directly from a Live DVD or USB. Usually, you just need to plug "
 "the USB device in or place the DVD in the drive and restart the computer."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:35
+#: en/bootLive.xml:19
 msgid ""
 "If the computer does not automatically boot from the USB or DVD you may need "
 "to reconfigure your BIOS Boot Disk priority. Alternatively, you might try "
@@ -461,7 +466,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><tip><para>
-#: en/bootLive.xml:41
+#: en/bootLive.xml:24
 msgid ""
 "To access the BIOS or boot menu when the computer is starting, you can try "
 "pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or <keycap>Esc</"
@@ -471,7 +476,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/bootLive.xml:50
+#: en/bootLive.xml:32
 msgid ""
 "The actual screen that you will first see when booting from the Live media "
 "will depend on whether your computer motherboard is of the Legacy (BIOS) or "
@@ -479,91 +484,94 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:58
+#: en/bootLive.xml:39
 msgid "In BIOS/CSM/Legacy mode"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:62
+#: en/bootLive.xml:42
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"../live-bootCSM.png\" align=\"center\"/> "
+"</imageobject>"
 msgstr ""
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackagesTree.png"
+"\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:67
+#: en/bootLive.xml:46
 msgid "First screen while booting in BIOS mode"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><title>
-#: en/bootLive.xml:72 en/bootLive.xml:144 en/installer.xml:106
-#: en/installer.xml:154
+#: en/bootLive.xml:50 en/bootLive.xml:104 en/installer.xml:108
+#: en/installer.xml:156
 msgid "Menu"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:75 en/bootLive.xml:147
+#: en/bootLive.xml:52 en/bootLive.xml:106
 msgid "<emphasis role=\"bold\">Boot Mageia</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:77
+#: en/bootLive.xml:53
 msgid ""
 "This option will boot the Mageia Live system from the connected DVD/USB "
 "media (expect a very slow system compared to an installed OS)."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:81
+#: en/bootLive.xml:56
 msgid "Once the boot is done, you can proceed to the installation."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:86 en/bootLive.xml:102
+#: en/bootLive.xml:60 en/bootLive.xml:72
 msgid ""
 "<emphasis role=\"bold\">+ use non-free video drivers (slower to boot)</"
 "emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:89
+#: en/bootLive.xml:62
 msgid "Boot the Mageia Live system using non-free video drivers"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:96 en/bootLive.xml:155 en/installer.xml:109
+#: en/bootLive.xml:68 en/bootLive.xml:112 en/installer.xml:111
 msgid "<emphasis role=\"bold\">Install Mageia</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:98 en/bootLive.xml:157
+#: en/bootLive.xml:69 en/bootLive.xml:113
 msgid "This option will install Mageia to a hard disk."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:105
+#: en/bootLive.xml:74
 msgid "Install Mageia using non-free video drivers"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:111 en/installer.xml:125
+#: en/bootLive.xml:79 en/installer.xml:127
 msgid "<emphasis role=\"bold\">Memory Test</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:113 en/installer.xml:127
+#: en/bootLive.xml:80 en/installer.xml:129
 msgid ""
 "Test the installed RAM by performing multiple read and write operations. "
 "Reboot to end the test."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:118 en/bootLive.xml:161
+#: en/bootLive.xml:84 en/bootLive.xml:116
 msgid "<emphasis role=\"bold\"> F2 Language</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:120 en/bootLive.xml:163
+#: en/bootLive.xml:85 en/bootLive.xml:117
 msgid ""
 "Press <keycap>F2</keycap> to have the installer use a specific language "
 "during the installation. Use the arrow keys to select the language then "
@@ -571,24 +579,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:129
+#: en/bootLive.xml:93
 msgid "In UEFI mode"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:133
+#: en/bootLive.xml:96
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackagesTree.png"
+"\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:139
+#: en/bootLive.xml:100
 msgid "First screen while booting in UEFI mode"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:149
+#: en/bootLive.xml:107
 msgid ""
 "This option will boot the Mageia Live system from the connected DVD/USB "
 "media (expect a very slow system compared to an installed OS).  Once the "
@@ -596,7 +607,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/bootLive.xml:170
+#: en/bootLive.xml:123
 msgid ""
 "If you booted from a USB stick, you will see the above menu options "
 "duplicated, and in this case, you should choose from the menu pair that will "
@@ -818,12 +829,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:24
+#: en/configureX_card_list.xml:27
 msgid "Choose an X Server (Configure your Graphic Card)"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_card_list.xml:29
+#: en/configureX_card_list.xml:32
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_card_list."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_card_list-im1\"/> </"
@@ -831,36 +842,36 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:35
+#: en/configureX_card_list.xml:38
 msgid ""
 "DrakX has a very comprehensive database of video cards and will usually "
 "correctly identify your video device."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:38
+#: en/configureX_card_list.xml:41
 msgid ""
 "If the installer has not correctly detected your graphic card and you know "
 "which one you have, you can select it from the tree by:"
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_card_list.xml:41 en/configureX_monitor.xml:74
+#: en/configureX_card_list.xml:44 en/configureX_monitor.xml:78
 msgid "Vendor"
 msgstr "विक्रेता"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:45
+#: en/configureX_card_list.xml:48
 msgid "then the make of your card"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:49
+#: en/configureX_card_list.xml:52
 msgid "and the model of card"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:53
+#: en/configureX_card_list.xml:56
 msgid ""
 "If you cannot find your card in the vendor lists (because it's not yet in "
 "the database or it's an older card) you may find a suitable driver in the "
@@ -871,14 +882,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><caution><para>
-#: en/configureX_card_list.xml:61
+#: en/configureX_card_list.xml:64
 msgid ""
 "Be aware that if you select an incompatible driver you may only have access "
 "to the <emphasis>Command Line Interface</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:65
+#: en/configureX_card_list.xml:68
 msgid ""
 "Some video card manufacturers provide proprietary drivers for Linux which "
 "may only be available in the <emphasis>Nonfree</emphasis> repository and in "
@@ -889,17 +900,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:11
-msgid "Graphic Card and Monitor Configuration"
+#: en/configureX_chooser.xml:23
+msgid "Graphics Card and Monitor Configuration"
 msgstr ""
 
-#.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
-#. 2018/02/15 apb: Some text and typography.
-#. 2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.
-#. 2018/02/23 apb: Typo.
-#. 2019/01/06 apb: Slight reword, split 1st para in two.
 #. type: Content of: <section><mediaobject>
-#: en/configureX_chooser.xml:26
+#: en/configureX_chooser.xml:28
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_chooser."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_chooser-im1\"/> </"
@@ -907,7 +913,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:32
+#: en/configureX_chooser.xml:34
 msgid ""
 "No matter which graphical environment (also known as desktop environment) "
 "you chose for this install of Mageia, they are all based on a graphical user "
@@ -918,31 +924,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:39
+#: en/configureX_chooser.xml:41
 msgid ""
 "Choose the appropriate settings manually if you think the details are "
 "incorrect, or if none are shown."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:44
-msgid "<emphasis role=\"bold\">Graphic Card</emphasis>"
+#: en/configureX_chooser.xml:46
+msgid "<emphasis role=\"bold\">Graphics Card</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:47
+#: en/configureX_chooser.xml:49
 msgid ""
 "If you need to, you can select a specific card from this expandable list. "
 "See <xref linkend=\"configureX_card_list\"/>."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:52
+#: en/configureX_chooser.xml:54
 msgid "<emphasis role=\"bold\">Monitor</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:55
+#: en/configureX_chooser.xml:57
 msgid ""
 "You can choose Plug 'n Play, if applicable, or choose your monitor from the "
 "<emphasis>Vendor</emphasis> or <emphasis>Generic</emphasis> lists. Choose "
@@ -952,22 +958,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:63
+#: en/configureX_chooser.xml:65
 msgid "<emphasis role=\"bold\">Resolution</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:66
+#: en/configureX_chooser.xml:68
 msgid "The resolution and color depth of your monitor can be set here."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:71
+#: en/configureX_chooser.xml:73
 msgid "<emphasis role=\"bold\">Test</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:74
+#: en/configureX_chooser.xml:76
 msgid ""
 "The test button does not always appear during install. If the option is "
 "there, and you test your settings, you should be asked to confirm that your "
@@ -979,17 +985,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:85
+#: en/configureX_chooser.xml:87
 msgid "<emphasis role=\"bold\">Options</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:88
+#: en/configureX_chooser.xml:90
 msgid "Here you can choose to enable or disable various options."
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_chooser.xml:93
+#: en/configureX_chooser.xml:95
 msgid ""
 "There is a risk of damaging a monitor if you choose refresh rates that are "
 "outside the frequency range of that monitor. This applies to older CRT "
@@ -998,19 +1004,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_monitor.xml:22
+#: en/configureX_monitor.xml:26
 msgid "Choosing your Monitor"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:25
+#: en/configureX_monitor.xml:29
 msgid ""
 "DrakX has a very comprehensive database of monitors and will usually "
 "correctly identify yours."
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:30
+#: en/configureX_monitor.xml:34
 msgid ""
 "<emphasis role=\"bold\">Selecting a monitor with different characteristics "
 "could damage your monitor or video hardware. Please don't try something "
@@ -1019,7 +1025,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:38
+#: en/configureX_monitor.xml:42
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
@@ -1027,12 +1033,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:46
+#: en/configureX_monitor.xml:50
 msgid "Custom"
 msgstr "इच्छानुसार"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:49
+#: en/configureX_monitor.xml:53
 msgid ""
 "This option allows you to set two critical parameters: the vertical refresh "
 "rate and the horizontal sync rate. Vertical refresh determines how often the "
@@ -1041,7 +1047,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:55
+#: en/configureX_monitor.xml:59
 msgid ""
 "It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor "
 "type with a sync range that is beyond the capabilities of your monitor: you "
@@ -1050,56 +1056,56 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:64
+#: en/configureX_monitor.xml:68
 msgid "Plug'n Play"
 msgstr "प्लग और प्ले"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:67
+#: en/configureX_monitor.xml:71
 msgid ""
 "This is the default option and automatically tries to determine the monitor "
 "type from the monitor database."
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:77
+#: en/configureX_monitor.xml:81
 msgid ""
 "If the installer has not correctly detected your monitor and you know which "
-"one you have, you can select it from the tree by selecting:"
+"one you have, you can choose it from the options by selecting:"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:86
+#: en/configureX_monitor.xml:90
 msgid "Manufacturer"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:90
+#: en/configureX_monitor.xml:94
 msgid "Monitor model"
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:96
+#: en/configureX_monitor.xml:100
 msgid "Generic"
 msgstr "सामान्य"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:99
+#: en/configureX_monitor.xml:103
 msgid ""
-"Selecting this group will list nearly 30 display configurations such as "
-"1024x768 @ 60Hz and includes flat-panel displays as used in laptops. This is "
-"often a good monitor selection group if you need to use the VESA card driver "
-"when your video hardware cannot be determined automatically.  Once again it "
-"may be wise to be conservative in your selections."
+"Selecting this group will list approximately 30 display configurations such "
+"as 1024x768 @ 60Hz and includes flat-panel displays as used in laptops.  "
+"This is often a good monitor selection group if you need to use the VESA "
+"card driver when your video hardware cannot be determined automatically. "
+"Once again, it may be wise to be conservative in your selections."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:22
+#: en/diskdrake.xml:24
 msgid "Custom Disk Partitioning with DiskDrake"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:27
+#: en/diskdrake.xml:29
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-diskdrake.png\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1107,7 +1113,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:38
+#: en/diskdrake.xml:40
 msgid ""
 "Modify the layout of your disk(s) here. You can remove or create partitions, "
 "change the filesystem or size of a partition and even view their details "
@@ -1115,15 +1121,15 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:47
 msgid ""
 "There is a tab at the top for every detected hard disk (or other storage "
-"device, like a USB key). In the screenshot above there are two available "
-"devices: <filename>sda </filename>and <filename>sdb</filename>."
+"device, like a USB key), for example: <filename>sda</filename>, "
+"<filename>sdb</filename>, <filename>sdc</filename> etc."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:52
+#: en/diskdrake.xml:54
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it. "
@@ -1132,21 +1138,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:60
+#: en/diskdrake.xml:62
 msgid ""
 "Continue until you have adjusted everything to your satisfaction, then click "
 "<emphasis>Done</emphasis> when you're ready."
 msgstr ""
 
 #. type: Content of: <section><warning><orderedlist><listitem><para>
-#: en/diskdrake.xml:69
+#: en/diskdrake.xml:71
 msgid ""
 "Take care with the <emphasis>Clear all</emphasis> option, use it only if you "
 "are sure you want to wipe all partitions on the selected storage device."
 msgstr ""
 
 #. type: Content of: <section><warning><orderedlist><listitem><para>
-#: en/diskdrake.xml:75
+#: en/diskdrake.xml:77
 msgid ""
 "If you wish to use encryption on your <filename>/</filename> partition you "
 "must ensure that you have a separate <filename>/boot</filename> partition. "
@@ -1155,7 +1161,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/diskdrake.xml:87
+#: en/diskdrake.xml:89
 msgid ""
 "If you are installing Mageia on a UEFI system, check that an ESP (EFI System "
 "Partition) is present and correctly mounted on <filename>/boot/EFI</"
@@ -1163,19 +1169,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/diskdrake.xml:93
+#: en/diskdrake.xml:95
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
 "partition is present and of the correct type. See Figure 2 below."
 msgstr ""
 
 #. type: Content of: <section><figure><title>
-#: en/diskdrake.xml:101
+#: en/diskdrake.xml:103
 msgid "EFI System Partition"
 msgstr ""
 
 #. type: Content of: <section><figure><mediaobject>
-#: en/diskdrake.xml:104
+#: en/diskdrake.xml:106
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-diskdrake2.png\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1183,17 +1189,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><figure>
-#: en/diskdrake.xml:103 en/diskdrake.xml:117
+#: en/diskdrake.xml:105 en/diskdrake.xml:119
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <section><figure><title>
-#: en/diskdrake.xml:115
+#: en/diskdrake.xml:117
 msgid "BIOS boot partition"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:118 en/doPartitionDisks.xml:201
+#: en/diskdrake.xml:120 en/doPartitionDisks.xml:206
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1212,26 +1218,26 @@ msgid "Partitioning"
 msgstr "विभाजनीकरण"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:31
 msgid "Suggested Partitioning"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:34
 msgid ""
 "In this screen you can see the content of your hard drive(s) along with the "
 "DrakX partitioning proposals for where to install Mageia."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:34
+#: en/doPartitionDisks.xml:38
 msgid ""
 "The actual options available from those shown below will vary according to "
 "the layout and content of your particular hard drive(s)."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:39
+#: en/doPartitionDisks.xml:43
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1240,111 +1246,116 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><title>
-#: en/doPartitionDisks.xml:49
+#: en/doPartitionDisks.xml:53
 msgid "Main Options"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:56
 msgid "<emphasis role=\"bold\">Use Existing Partitions</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:59
 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><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:61
+#: en/doPartitionDisks.xml:65
 msgid "<emphasis role=\"bold\">Use Free Space</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:68
 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><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:70
+#: en/doPartitionDisks.xml:74
 msgid ""
 "<emphasis role=\"bold\">Use Free Space on a Windows Partition</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:73
+#: en/doPartitionDisks.xml:77
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it. 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 important files!"
+"installation but see the warning below."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para><mediaobject>
+#: en/doPartitionDisks.xml:87
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:79
+#: en/doPartitionDisks.xml:82
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
 "light blue and the proposed Mageia partition in dark blue with their "
 "intended sizes just underneath. You have the option to modify these sizes by "
 "clicking and dragging the gap between both partitions.  See the following "
-"screenshot:"
+"screenshot:<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><warning><para>
+#: en/doPartitionDisks.xml:97
+msgid ""
+"This involves shrinking the size of the Windows partition, and therefore is "
+"a risky operation, so you should make sure you have backed up all important "
+"files before proceeding."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><important><para>
+#: en/doPartitionDisks.xml:103
+msgid ""
+"The partition must be \"clean\", meaning that Windows must have closed down "
+"correctly the last time it was used. It must also have been defragmented, "
+"although this is not a guarantee that all files in the partition have been "
+"moved out of the area that is about to be used for Mageia."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:87
+#: en/doPartitionDisks.xml:112
 msgid "<emphasis role=\"bold\">Erase and use Entire Disk</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:90
+#: en/doPartitionDisks.xml:115
 msgid "This option will allocate the entire drive for Mageia"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:119
 msgid ""
 "This will erase ALL data on the selected hard drive. Take care! 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 this option."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><important><para>
-#: en/doPartitionDisks.xml:101
-msgid ""
-"Note that this involves shrinking the size of the Windows partition. The "
-"partition must be \"clean\", meaning that Windows must have closed down "
-"correctly the last time it was used. It must also have been defragmented, "
-"although this is not a guarantee that all files in the partition have been "
-"moved out of the area that is about to be used. It is highly recommended to "
-"back up your personal files."
-msgstr ""
-
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:112
+#: en/doPartitionDisks.xml:127
 msgid "<emphasis role=\"bold\">Custom Disk Partitioning</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:115
+#: en/doPartitionDisks.xml:130
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
 msgstr ""
 
-#. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:122
-msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
-msgstr ""
-
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:131
+#: en/doPartitionDisks.xml:136
 msgid ""
 "If you are not using the <emphasis>Custom disk partitioning</emphasis> "
 "option, then the installer will allocate the available space according to "
@@ -1352,60 +1363,60 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:137
+#: en/doPartitionDisks.xml:142
 msgid ""
 "If the total available space is less than 50 GB, then only one partition is "
 "created. This will be the <filename>/</filename> (root)  partition."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:143
+#: en/doPartitionDisks.xml:148
 msgid ""
 "If the total available space is greater than 50 GB, then three partitions "
 "are created"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:148
+#: en/doPartitionDisks.xml:153
 msgid ""
 "6/19 of the total available place is allocated to <filename>/</filename> "
 "with a maximum of 50 GB"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:153
+#: en/doPartitionDisks.xml:158
 msgid "1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:158
+#: en/doPartitionDisks.xml:163
 msgid "the rest (at least 12/19) is allocated to <filename>/home</filename>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:165
+#: en/doPartitionDisks.xml:170
 msgid ""
 "This means that from 160 GB or greater available space, the installer will "
 "create three partitions:"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:170
+#: en/doPartitionDisks.xml:175
 msgid "50 GB for <filename>/</filename>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:174
+#: en/doPartitionDisks.xml:179
 msgid "4 GB for <filename>swap</filename>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:178
+#: en/doPartitionDisks.xml:183
 msgid "and the remainder for <filename>/home</filename>"
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:183
+#: en/doPartitionDisks.xml:188
 msgid ""
 "If you are using a UEFI system, the ESP (EFI System Partition) will be "
 "automatically detected - or created if it does not exist yet - and mounted "
@@ -1415,7 +1426,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:189
+#: en/doPartitionDisks.xml:194
 msgid ""
 "If you are using a Legacy (also known as BIOS) system with a GPT partitioned "
 "disk, you need to create a BIOS boot partition if it doesn't already exist. "
@@ -1426,19 +1437,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:196
+#: en/doPartitionDisks.xml:201
 msgid "See <xref linkend=\"diskdrake\"/> for information on how to proceed."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:211
+#: en/doPartitionDisks.xml:216
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4.png"
-"\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks4.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks4.png\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
+"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
+"\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata format="
+"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:217
+#: en/doPartitionDisks.xml:226
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
 "previous standard of 512. Due to lack of available hardware, the "
@@ -1447,7 +1465,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:222
+#: en/doPartitionDisks.xml:231
 msgid ""
 "Some SSD devices now use an erase block size over 1 MB. If you have such a "
 "device we suggest that you partition the drive in advance, using an "
@@ -1456,17 +1474,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:229
+#: en/doPartitionDisks.xml:238
 msgid "<emphasis>Align to</emphasis> = MiB"
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:233
+#: en/doPartitionDisks.xml:242
 msgid "<emphasis>Free space preceding (MiB)</emphasis> = 2"
 msgstr ""
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:237
+#: en/doPartitionDisks.xml:246
 msgid ""
 "Also make sure all partitions are created using an even number of megabytes."
 msgstr ""
@@ -1623,12 +1641,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/firewall.xml:7
+#: en/firewall.xml:16
 msgid "Firewall"
 msgstr "अग्नि-भीतिका"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:10
+#: en/firewall.xml:19
 msgid ""
 "This section allows you to configure some simple firewall rules: they "
 "determine which type of message from the Internet will be accepted by the "
@@ -1636,8 +1654,18 @@ msgid ""
 "system to be accessible from the Internet."
 msgstr ""
 
+#. type: Content of: <section><mediaobject>
+#: en/firewall.xml:26
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-firewall.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackagesTree.png"
+"\" align=\"center\"/> </imageobject>"
+
 #. type: Content of: <section><para>
-#: en/firewall.xml:16
+#: en/firewall.xml:31
 msgid ""
 "In the default setting (no button is checked), no service of the system is "
 "accessible from the network. The <emphasis>Everything (no firewall)</"
@@ -1650,7 +1678,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:25
+#: en/firewall.xml:40
 msgid ""
 "All other options are more or less self-explanatory. As an example, you will "
 "enable the CUPS server if you want printers on your machine to be accessible "
@@ -1658,12 +1686,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:29
+#: en/firewall.xml:44
 msgid "<emphasis role=\"bold\">Advanced</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:31
+#: en/firewall.xml:46
 msgid ""
 "The <emphasis>Advanced</emphasis> option opens a window where you can enable "
 "a series of services by typing a list of <quote>couples</quote> (blank "
@@ -1671,34 +1699,35 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:35
-msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
+#: en/firewall.xml:50
+msgid "<emphasis>&lt;port-number&gt;/&lt;protocol&gt;</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:38
+#: en/firewall.xml:53
 msgid ""
-"- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
-"the service you want to enable (e.g. 873 for the RSYNC service) as defined "
-"in <emphasis>RFC-433</emphasis>;"
+"- <emphasis>&lt;port-number&gt;</emphasis> is the value of the port assigned "
+"to the service you want to enable (e.g. 873 for the RSYNC service) as "
+"defined in <emphasis>RFC-433</emphasis>;"
 msgstr ""
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:42
+#: en/firewall.xml:57
 msgid ""
-"- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
-"<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
+"- <emphasis>&lt;protocol&gt;</emphasis> is one of <emphasis>TCP</emphasis> "
+"or <emphasis>UDP</emphasis> - the internet protocol that is used by the "
+"service."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:47
+#: en/firewall.xml:62
 msgid ""
 "For instance, the entry for enabling access to the RSYNC service therefore "
 "is <emphasis>873/tcp</emphasis>."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:50
+#: en/firewall.xml:65
 msgid ""
 "In case a service is implemented to use both protocols, you specify 2 "
 "couples for the same port."
@@ -1766,12 +1795,12 @@ msgid "Graphical Configuration"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:32
+#: en/installer.xml:34
 msgid "DrakX, the Mageia Installer"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/installer.xml:35
+#: en/installer.xml:37
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -1779,33 +1808,33 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:40
+#: en/installer.xml:42
 msgid "The installation steps"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:44
+#: en/installer.xml:46
 msgid ""
 "The install process is divided into a number of steps - the status of which "
 "is indicated in a panel to the left of the screen."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:50
+#: en/installer.xml:52
 msgid ""
 "Each step has one or more screens, which may also have <emphasis>Advanced</"
 "emphasis> sections with extra, less commonly required options."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:56
+#: en/installer.xml:58
 msgid ""
 "Most screens have <emphasis>Help</emphasis> buttons for further details "
 "about the particular step."
 msgstr ""
 
 #. type: Content of: <section><section><caution><para>
-#: en/installer.xml:62
+#: en/installer.xml:64
 msgid ""
 "If at some point during the install you decide to abort the installation, it "
 "is possible to reboot, but please think twice before you do this. Once a "
@@ -1815,7 +1844,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><caution><para>
-#: en/installer.xml:68
+#: en/installer.xml:70
 msgid ""
 "If, in spite of this, you are very sure rebooting is what you want, go to a "
 "text terminal by pressing the keys <keycombo> <keycap>Ctrl</keycap> "
@@ -1825,12 +1854,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:86
+#: en/installer.xml:88
 msgid "Installation Welcome Screen"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:88
+#: en/installer.xml:90
 msgid ""
 "The particular screen that you will first see when booting from the "
 "Installation media will depend on whether your computer motherboard is of "
@@ -1838,60 +1867,60 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:92
+#: en/installer.xml:94
 msgid ""
 "The welcome menu screen has various options, however the default option will "
 "start the installer, and is normally all that you will need."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:97
+#: en/installer.xml:99
 msgid "Legacy (BIOS) Systems"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:100
+#: en/installer.xml:102
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome.png\"/> </"
 "imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:111
+#: en/installer.xml:113
 msgid ""
 "Install Mageia to a hard disk. This is the default option, and will "
 "automatically start after a short while unless another option is selected."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:117
+#: en/installer.xml:119
 msgid "<emphasis role=\"bold\">Rescue System</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:119
+#: en/installer.xml:121
 msgid ""
 "This option allows you to either re-install the bootloader for an existing "
 "Mageia installation or you can use it to restore a Windows bootloader."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:132
+#: en/installer.xml:134
 msgid "<emphasis role=\"bold\">F2: Language</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:134
+#: en/installer.xml:136
 msgid "Press F2 for alternative languages."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:140
+#: en/installer.xml:142
 msgid "UEFI Systems"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:142
+#: en/installer.xml:144
 msgid ""
 "From this screen, you can access options by pressing <keycap>e</keycap> to "
 "enter the edit mode. To come back to this screen, press <keycap>Esc</keycap> "
@@ -1899,19 +1928,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:148
+#: en/installer.xml:150
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome2.png\"/> </"
 "imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:157
+#: en/installer.xml:159
 msgid "<emphasis role=\"bold\">Install:</emphasis> Start the Install process"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:162
+#: en/installer.xml:164
 msgid ""
 "<emphasis role=\"bold\">Rescue:</emphasis> This option allows you to either "
 "re-install the bootloader for an existing Mageia installation or you can use "
@@ -1919,31 +1948,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:169
+#: en/installer.xml:171
 msgid ""
 "<emphasis role=\"bold\">F2: Language:</emphasis> Press <keycap>F2</keycap> "
 "for alternative languages."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:174
+#: en/installer.xml:176
 msgid ""
 "If you booted from a USB stick, you will see the above options duplicated, "
 "and in this case, you should use the set that will be suffixed with \"USB\"."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:181
+#: en/installer.xml:183
 msgid "Installation Problems and Possible Solutions"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:184
+#: en/installer.xml:186
 msgid "No Graphical Interface"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:188
+#: en/installer.xml:190
 msgid ""
 "After the initial screen you did not progress to the <emphasis>Language "
 "Selection</emphasis> screen. This can happen with some graphic cards and "
@@ -1952,7 +1981,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:195
+#: en/installer.xml:197
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
 "In this case it is worth trying a text-mode installation. To use this press "
@@ -1963,12 +1992,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:208
+#: en/installer.xml:210
 msgid "The Install Freezes"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:210
+#: en/installer.xml:212
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic hardware "
@@ -1978,12 +2007,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:218
+#: en/installer.xml:220
 msgid "RAM problem"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:220
+#: en/installer.xml:222
 msgid ""
 "This will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
@@ -1993,12 +2022,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:228
+#: en/installer.xml:230
 msgid "Dynamic partitions"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:230
+#: en/installer.xml:232
 msgid ""
 "If you converted your hard disk from <literal>Basic</literal> format to "
 "<literal>Dynamic</literal> format in Microsoft Windows, then it is not "
@@ -3582,73 +3611,106 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:27
+#: en/setupBootloader.xml:32
 msgid "Bootloader"
 msgstr "बूटलोडर"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:31
+#: en/setupBootloader.xml:36
+#, fuzzy
+msgid "Available Bootloaders"
+msgstr "बूटलोडर"
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:39
 msgid "Grub2"
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><title>
-#: en/setupBootloader.xml:34
-msgid "Grub2 on Legacy MBR/GPT systems"
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:42
+msgid "<emphasis role=\"bold\">Grub2 on Legacy MBR/GPT systems</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:37
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:46
 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:42
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:52
 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:49
-msgid "Grub2-efi on UEFI systems"
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:59
+msgid "<emphasis role=\"bold\">Grub2-efi on UEFI systems</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:52
-msgid "GRUB2-efi will be used exclusively as the bootloader for a UEFI system."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:63
+msgid "GRUB2-efi or rEFInd may be used as the bootloader for a UEFI system."
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:57
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:68
 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:60
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:71
 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 "
-"created by Windows and add grub2-efi to it. If no ESP exists, then one will "
+"created by Windows and add grub2-efi to it.  If no ESP exists, then one will "
 "be created. Although it is possible to have several ESPs, only one is "
 "required, whatever the number of operating systems you have."
 msgstr ""
 
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:82
+msgid "rEFInd"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:85
+msgid "<emphasis role=\"bold\">rEFInd on UEFI systems</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:88
+msgid ""
+"rEFInd has a nice graphical set of options, and can auto-detect installed "
+"EFI bootloaders. See: http://www.rodsbooks.com/refind/"
+msgstr ""
+
+#. type: Content of: <section><section><section><note><para>
+#: en/setupBootloader.xml:95
+msgid ""
+"Please note that in order to be able to use the <literal>rEFInd</literal> "
+"option, an installed EFI System Partition must match your system "
+"architecture: if you have a 32bit EFI System Partition installed on a 64bit "
+"machine for instance, then the rEFInd option will not be displayed/available "
+"to you."
+msgstr ""
+
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:72
+#: en/setupBootloader.xml:106
 msgid "Bootloader Setup"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:76
+#: en/setupBootloader.xml:110
 msgid "Bootloader main options"
 msgstr "बूटलोडर के मुख्य विकल्प"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:79
+#: en/setupBootloader.xml:113
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader.png\"/> </imageobject> <imageobject condition=\"live"
@@ -3657,47 +3719,69 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:91
+#: en/setupBootloader.xml:125
 msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:93
+#. type: Content of: <section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:129
+msgid ""
+"<guimenuitem>GRUB2</guimenuitem> (with either a graphical or a text menu), "
+"can be chosen for both <literal>Legacy MBR/BIOS</literal> systems and "
+"<literal>UEFI</literal> systems."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:136
 msgid ""
-"This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI "
-"systems will not see this option here."
+"<guimenuitem>rEFInd</guimenuitem> (with a graphical menu)  is an alternative "
+"option solely for use with <literal>UEFI</literal> systems."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:98
+#: en/setupBootloader.xml:144
 msgid "<emphasis role=\"bold\">Boot device</emphasis>"
 msgstr ""
 
+#. type: Content of: <section><section><section><itemizedlist><listitem><warning><para>
+#: en/setupBootloader.xml:147
+msgid "Don't change this unless you really know what you are doing."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><note><para>
+#: en/setupBootloader.xml:152
+msgid ""
+"There is no option to write GRUB to the boot sector of a partition (e.g: "
+"<filename>sda1</filename>), as this method is considered unreliable."
+msgstr ""
+
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:100
-msgid "Don't change this unless you really know what you are doing"
+#: en/setupBootloader.xml:157
+msgid ""
+"When using UEFI mode, then the <guilabel>Boot device</guilabel> will be "
+"listed as <guimenuitem>EFI System Partition</guimenuitem>."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:105
+#: en/setupBootloader.xml:163
 msgid ""
 "<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:108
+#: en/setupBootloader.xml:166
 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:113
+#: en/setupBootloader.xml:171
 msgid "<emphasis role=\"bold\">Security</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:115
+#: en/setupBootloader.xml:173
 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 "
@@ -3707,34 +3791,34 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:126
+#: en/setupBootloader.xml:184
 msgid "Choose a password for the bootloader (optional)"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:130
+#: en/setupBootloader.xml:188
 msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:132
+#: en/setupBootloader.xml:190
 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:137 en/setupBootloader.xml:212
+#: en/setupBootloader.xml:195 en/setupBootloader.xml:308
 msgid "<emphasis>Advanced</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:141
+#: en/setupBootloader.xml:199
 msgid "<emphasis>Enable ACPI</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:143
+#: en/setupBootloader.xml:201
 msgid ""
 "ACPI (Advanced Configuration and Power Interface) is a standard for power "
 "management. It can save energy by stopping unused devices. Deselecting it "
@@ -3744,24 +3828,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:152
+#: en/setupBootloader.xml:210
 msgid "<emphasis>Enable SMP</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:154
+#: en/setupBootloader.xml:212
 msgid ""
 "This option enables/disables symmetric multiprocessing for multi-core "
 "processors"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:159
+#: en/setupBootloader.xml:217
 msgid "<emphasis>Enable APIC</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:161
+#: en/setupBootloader.xml:219
 msgid ""
 "Enabling this gives the operating system access to the Advanced Programmable "
 "Interrupt Controller. APIC devices permit more complex priority models, and "
@@ -3769,24 +3853,81 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:168
+#: en/setupBootloader.xml:226
 msgid "<emphasis>Enable Local APIC</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:170
+#: en/setupBootloader.xml:228
 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:177
+#: en/setupBootloader.xml:235
 msgid "Bootloader Configuration"
 msgstr ""
 
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:237
+msgid ""
+"If, in the previous section you selected <literal>rEFInd</literal> as the "
+"bootloader to use, you would then be presented with the options shown in the "
+"screenshot directly below. Otherwise, please instead move on to the "
+"subsequent screenshot for your options."
+msgstr ""
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:243
+#, fuzzy
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"rEFIndLoaderConfig.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-rEFIndLoaderConfig.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
+"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
+"\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata format="
+"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:253
+msgid "Your rEFInd configuration options:"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:256
+msgid ""
+"<guimenuitem>Install or update rEFInd in the EFI system partition.</"
+"guimenuitem>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:261
+msgid ""
+"<guimenuitem>Install in EFI/Boot partition (workaround for some BIOS's).</"
+"guimenuitem>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:264
+msgid ""
+"With some BIOS's, the newly written bootloaser for Mageia at end of the "
+"installation will not be recognized. In that case, you can use this option "
+"as a workaround for the issue."
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:270
+msgid ""
+"If you did not select rEFInd as the bootloader to use in the previous "
+"section, then your bootloader configurations are shown below:"
+msgstr ""
+
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:180
+#: en/setupBootloader.xml:275
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -3795,42 +3936,42 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:191
+#: en/setupBootloader.xml:286
 msgid "<emphasis role=\"bold\">Default</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:193
+#: en/setupBootloader.xml:288
 msgid "The operating system to be started up by default."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:197
+#: en/setupBootloader.xml:292
 msgid "<emphasis role=\"bold\">Append</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:199
+#: en/setupBootloader.xml:294
 msgid ""
 "This option lets you pass information to the kernel 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:204
+#: en/setupBootloader.xml:299
 msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:206
+#: en/setupBootloader.xml:301
 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, "
-"then untick the Probe Foreign OS option."
+"then untick the <guimenuitem>Probe Foreign OS</guimenuitem> option."
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:215
+#: en/setupBootloader.xml:311
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader4.png\"/> </imageobject> <imageobject condition=\"live"
@@ -3839,12 +3980,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:226
+#: en/setupBootloader.xml:322
 msgid "<emphasis>Video mode</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:228
+#: en/setupBootloader.xml:324
 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 "
@@ -3852,38 +3993,47 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:234
+#: en/setupBootloader.xml:330
 msgid "<emphasis>Do not touch ESP or MBR</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:236
+#: en/setupBootloader.xml:332
 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 "
-"missing. Click<emphasis> Ok</emphasis> if you are sure you understand the "
-"implications, and wish to proceed."
+"missing. Click <guimenuitem>Ok </guimenuitem>only if you are sure you "
+"understand the implications, and wish to proceed."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><warning><para>
+#: en/setupBootloader.xml:338
+msgid ""
+"Chain-loading via legacy bootloaders (GRUB Legacy and LiLo)  is no longer "
+"supported by Mageia as it is likely to fail when attempting to boot this "
+"resulting installation of Mageia. If you use anything other than GRUB2 or "
+"rEFInd for this purpose, then you do so at your own risk!"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:245
+#: en/setupBootloader.xml:348
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png"
 "\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:253
+#: en/setupBootloader.xml:356
 msgid "Other Options"
 msgstr "अन्य विकल्प"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:256
+#: en/setupBootloader.xml:359
 msgid "Using an existing bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:258
+#: en/setupBootloader.xml:361
 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 "
@@ -3893,12 +4043,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:267
+#: en/setupBootloader.xml:370
 msgid "Installing Without a Bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:269
+#: en/setupBootloader.xml:372
 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 "
diff --git a/docs/docs/stable/installer/hr.po b/docs/docs/stable/installer/hr.po
index 3f5346b4..7440aa50 100644
--- a/docs/docs/stable/installer/hr.po
+++ b/docs/docs/stable/installer/hr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2019-01-19 21:23+0200\n"
+"POT-Creation-Date: 2019-09-08 15:26+0300\n"
 "PO-Revision-Date: 2019-01-19 19:25+0000\n"
 "Last-Translator: Ivica  Kolić <ikoli@yahoo.com>\n"
 "Language-Team: Croatian (http://www.transifex.com/MageiaLinux/mageia/"
@@ -143,7 +143,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/addUser.xml:3
+#: en/addUser.xml:9
 msgid "User Management"
 msgstr ""
 
@@ -153,13 +153,16 @@ msgstr ""
 #. 2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
 #.   Also changed 'Advanced User Management' to 'User Management (advanced)'.
 #. 2018/02/24 apb: Changed list style.
+#. 2019/08/10 apb: Added missing 'condition' profile for live-user1.png.
+#. 2019/08/11 apb: [1] Reword 1.1 (including Note) [2] Reword 1.2 Password text.
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:12
+#: en/addUser.xml:28
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
-"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
-"\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata format="
-"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-setRootPassword.png\" format=\"PNG\" revision=\"1\" xml:id="
+"\"setRootPassword-im1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-user1.png\" format=\"PNG\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
 "\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -167,36 +170,41 @@ msgstr ""
 "\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:21
+#: en/addUser.xml:40
 msgid "Set Administrator (root)  Password:"
 msgstr "Poostavi administratorsku (root) lozinku:"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:24
+#: en/addUser.xml:44
 msgid ""
 "It is advisable for all Mageia installations to set a <literal>superuser</"
 "literal> (Administrator) password, usually called the <emphasis>root </"
-"emphasis>password in Linux. As you type a password into the top box a shield "
-"will change from red-to-yellow-to-green depending on the strength of the "
-"password. A green shield shows you are using a strong password. You need to "
-"repeat the same password in the box underneath, to check that the first "
-"entry was not mistyped."
+"emphasis>password in Linux. You need to repeat the same password in the box "
+"underneath, to check that the first entry was not mistyped."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:32
+#: en/addUser.xml:51
+msgid ""
+"As you type a password into the top box a shield will change from red-to-"
+"yellow-to-green depending on the strength of the password. A green shield "
+"shows you are using a strong password."
+msgstr ""
+
+#. type: Content of: <section><section><note><para>
+#: en/addUser.xml:55
 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:39
+#: en/addUser.xml:63
 msgid "Enter a user"
 msgstr "Unesite korisnika"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:41
+#: en/addUser.xml:66
 msgid ""
 "Add a User here. A regular user has fewer privileges than the "
 "<literal>superuser</literal> (root), but enough to use the Internet, office "
@@ -205,39 +213,39 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:47
+#: en/addUser.xml:73
 msgid "<emphasis role=\"bold\">Icon</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:48
+#: en/addUser.xml:75
 msgid "Click on this button if you want to change the user's icon"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:52
+#: en/addUser.xml:80
 msgid "<emphasis role=\"bold\">Real Name</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:53
+#: en/addUser.xml:82
 msgid "Insert the user's real name into this text box"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:56
+#: en/addUser.xml:86
 msgid "<emphasis role=\"bold\">Login Name</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:57
+#: en/addUser.xml:88
 msgid ""
 "Enter the user login name or let DrakX use a version of the user's real "
 "name. <emphasis role=\"bold\">The login name is case-sensitive.</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><caution><simpara>
-#: en/addUser.xml:61
+#: en/addUser.xml:93
 msgid ""
 "The login entered here should be different to any login currently in use for "
 "your <filename>/home</filename> directory. Some user parameters will be "
@@ -246,34 +254,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:65 en/setupBootloader.xml:124
+#: en/addUser.xml:102 en/setupBootloader.xml:182
 msgid "<emphasis role=\"bold\">Password</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:66
-msgid ""
-"Type in the user password. There is a shield at the end of the text box that "
-"indicates the strength of the password. (See also <xref linkend="
-"\"givePassword\"/>)"
+#: en/addUser.xml:104
+msgid "Type in the user password (remembering the advice in the Note above)."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:68
+#: en/addUser.xml:107
 msgid ""
 "<emphasis role=\"bold\">Password (again):</emphasis> Retype the user "
 "password. DrakX will check that you have not mistyped the password."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:74
+#: en/addUser.xml:114
 msgid ""
 "Any users added while installing Mageia, will have a home directory that is "
 "both read and write protected (umask=0027)"
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:76
+#: en/addUser.xml:117
 msgid ""
 "You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
@@ -281,24 +286,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:79
+#: en/addUser.xml:121
 msgid "The access permissions can also be changed after the install."
 msgstr "Dozvole pristupa također se mogu promjeniti nakon instlacije."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:85
+#: en/addUser.xml:128
 msgid "User Management (advanced)"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:87
+#: en/addUser.xml:131
 msgid ""
 "The <emphasis>Advanced</emphasis> option allows you to edit further settings "
 "for the user you are adding."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:91
+#: en/addUser.xml:136
 msgid ""
 "<emphasis>Shell</emphasis>: This drop-down list allows you to change the "
 "shell available to any user you added in the previous screen. Options are "
@@ -306,7 +311,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:143
 msgid ""
 "<emphasis>User ID</emphasis>: Here you can set the user ID for any user you "
 "added in the previous screen. If you are unsure what the purpose of this is, "
@@ -314,7 +319,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:102
+#: en/addUser.xml:149
 msgid ""
 "<emphasis>Group ID</emphasis>: This lets you set the group ID.  Again, if "
 "unsure, leave it blank."
@@ -434,24 +439,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:23
+#: en/bootLive.xml:10
 msgid "Boot Mageia as Live system"
 msgstr "Podigni Mageia kao živi sustav"
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:28
+#: en/bootLive.xml:14
 msgid "Booting the medium"
 msgstr "Podižem medij"
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:31
+#: en/bootLive.xml:16
 msgid ""
 "You can boot directly from a Live DVD or USB. Usually, you just need to plug "
 "the USB device in or place the DVD in the drive and restart the computer."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:35
+#: en/bootLive.xml:19
 msgid ""
 "If the computer does not automatically boot from the USB or DVD you may need "
 "to reconfigure your BIOS Boot Disk priority. Alternatively, you might try "
@@ -460,7 +465,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><tip><para>
-#: en/bootLive.xml:41
+#: en/bootLive.xml:24
 msgid ""
 "To access the BIOS or boot menu when the computer is starting, you can try "
 "pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or <keycap>Esc</"
@@ -470,7 +475,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/bootLive.xml:50
+#: en/bootLive.xml:32
 msgid ""
 "The actual screen that you will first see when booting from the Live media "
 "will depend on whether your computer motherboard is of the Legacy (BIOS) or "
@@ -478,91 +483,93 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:58
+#: en/bootLive.xml:39
 msgid "In BIOS/CSM/Legacy mode"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:62
+#: en/bootLive.xml:42
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"../live-bootCSM.png\" align=\"center\"/> "
+"</imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:67
+#: en/bootLive.xml:46
 msgid "First screen while booting in BIOS mode"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><title>
-#: en/bootLive.xml:72 en/bootLive.xml:144 en/installer.xml:106
-#: en/installer.xml:154
+#: en/bootLive.xml:50 en/bootLive.xml:104 en/installer.xml:108
+#: en/installer.xml:156
 msgid "Menu"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:75 en/bootLive.xml:147
+#: en/bootLive.xml:52 en/bootLive.xml:106
 msgid "<emphasis role=\"bold\">Boot Mageia</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:77
+#: en/bootLive.xml:53
 msgid ""
 "This option will boot the Mageia Live system from the connected DVD/USB "
 "media (expect a very slow system compared to an installed OS)."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:81
+#: en/bootLive.xml:56
 msgid "Once the boot is done, you can proceed to the installation."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:86 en/bootLive.xml:102
+#: en/bootLive.xml:60 en/bootLive.xml:72
 msgid ""
 "<emphasis role=\"bold\">+ use non-free video drivers (slower to boot)</"
 "emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:89
+#: en/bootLive.xml:62
 msgid "Boot the Mageia Live system using non-free video drivers"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:96 en/bootLive.xml:155 en/installer.xml:109
+#: en/bootLive.xml:68 en/bootLive.xml:112 en/installer.xml:111
 msgid "<emphasis role=\"bold\">Install Mageia</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:98 en/bootLive.xml:157
+#: en/bootLive.xml:69 en/bootLive.xml:113
 msgid "This option will install Mageia to a hard disk."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:105
+#: en/bootLive.xml:74
 msgid "Install Mageia using non-free video drivers"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:111 en/installer.xml:125
+#: en/bootLive.xml:79 en/installer.xml:127
 msgid "<emphasis role=\"bold\">Memory Test</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:113 en/installer.xml:127
+#: en/bootLive.xml:80 en/installer.xml:129
 msgid ""
 "Test the installed RAM by performing multiple read and write operations. "
 "Reboot to end the test."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:118 en/bootLive.xml:161
+#: en/bootLive.xml:84 en/bootLive.xml:116
 msgid "<emphasis role=\"bold\"> F2 Language</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:120 en/bootLive.xml:163
+#: en/bootLive.xml:85 en/bootLive.xml:117
 msgid ""
 "Press <keycap>F2</keycap> to have the installer use a specific language "
 "during the installation. Use the arrow keys to select the language then "
@@ -570,24 +577,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:129
+#: en/bootLive.xml:93
 msgid "In UEFI mode"
 msgstr "U UEFI načinu rada"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:133
+#: en/bootLive.xml:96
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
+"\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:139
+#: en/bootLive.xml:100
 msgid "First screen while booting in UEFI mode"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:149
+#: en/bootLive.xml:107
 msgid ""
 "This option will boot the Mageia Live system from the connected DVD/USB "
 "media (expect a very slow system compared to an installed OS).  Once the "
@@ -595,7 +605,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/bootLive.xml:170
+#: en/bootLive.xml:123
 msgid ""
 "If you booted from a USB stick, you will see the above menu options "
 "duplicated, and in this case, you should choose from the menu pair that will "
@@ -814,12 +824,12 @@ msgstr ""
 "svi postavljeni na lokalno vrijeme ili na "
 
 #. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:24
+#: en/configureX_card_list.xml:27
 msgid "Choose an X Server (Configure your Graphic Card)"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_card_list.xml:29
+#: en/configureX_card_list.xml:32
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_card_list."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_card_list-im1\"/> </"
@@ -827,36 +837,36 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:35
+#: en/configureX_card_list.xml:38
 msgid ""
 "DrakX has a very comprehensive database of video cards and will usually "
 "correctly identify your video device."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:38
+#: en/configureX_card_list.xml:41
 msgid ""
 "If the installer has not correctly detected your graphic card and you know "
 "which one you have, you can select it from the tree by:"
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_card_list.xml:41 en/configureX_monitor.xml:74
+#: en/configureX_card_list.xml:44 en/configureX_monitor.xml:78
 msgid "Vendor"
 msgstr "Proizvođač"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:45
+#: en/configureX_card_list.xml:48
 msgid "then the make of your card"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:49
+#: en/configureX_card_list.xml:52
 msgid "and the model of card"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:53
+#: en/configureX_card_list.xml:56
 msgid ""
 "If you cannot find your card in the vendor lists (because it's not yet in "
 "the database or it's an older card) you may find a suitable driver in the "
@@ -867,14 +877,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><caution><para>
-#: en/configureX_card_list.xml:61
+#: en/configureX_card_list.xml:64
 msgid ""
 "Be aware that if you select an incompatible driver you may only have access "
 "to the <emphasis>Command Line Interface</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:65
+#: en/configureX_card_list.xml:68
 msgid ""
 "Some video card manufacturers provide proprietary drivers for Linux which "
 "may only be available in the <emphasis>Nonfree</emphasis> repository and in "
@@ -885,17 +895,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:11
-msgid "Graphic Card and Monitor Configuration"
+#: en/configureX_chooser.xml:23
+#, fuzzy
+msgid "Graphics Card and Monitor Configuration"
 msgstr "Konfiguracija grafičke kartice i monitora"
 
-#.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
-#. 2018/02/15 apb: Some text and typography.
-#. 2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.
-#. 2018/02/23 apb: Typo.
-#. 2019/01/06 apb: Slight reword, split 1st para in two.
 #. type: Content of: <section><mediaobject>
-#: en/configureX_chooser.xml:26
+#: en/configureX_chooser.xml:28
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_chooser."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_chooser-im1\"/> </"
@@ -903,7 +909,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:32
+#: en/configureX_chooser.xml:34
 msgid ""
 "No matter which graphical environment (also known as desktop environment) "
 "you chose for this install of Mageia, they are all based on a graphical user "
@@ -914,31 +920,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:39
+#: en/configureX_chooser.xml:41
 msgid ""
 "Choose the appropriate settings manually if you think the details are "
 "incorrect, or if none are shown."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:44
-msgid "<emphasis role=\"bold\">Graphic Card</emphasis>"
+#: en/configureX_chooser.xml:46
+msgid "<emphasis role=\"bold\">Graphics Card</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:47
+#: en/configureX_chooser.xml:49
 msgid ""
 "If you need to, you can select a specific card from this expandable list. "
 "See <xref linkend=\"configureX_card_list\"/>."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:52
+#: en/configureX_chooser.xml:54
 msgid "<emphasis role=\"bold\">Monitor</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:55
+#: en/configureX_chooser.xml:57
 msgid ""
 "You can choose Plug 'n Play, if applicable, or choose your monitor from the "
 "<emphasis>Vendor</emphasis> or <emphasis>Generic</emphasis> lists. Choose "
@@ -948,22 +954,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:63
+#: en/configureX_chooser.xml:65
 msgid "<emphasis role=\"bold\">Resolution</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:66
+#: en/configureX_chooser.xml:68
 msgid "The resolution and color depth of your monitor can be set here."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:71
+#: en/configureX_chooser.xml:73
 msgid "<emphasis role=\"bold\">Test</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:74
+#: en/configureX_chooser.xml:76
 msgid ""
 "The test button does not always appear during install. If the option is "
 "there, and you test your settings, you should be asked to confirm that your "
@@ -975,17 +981,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:85
+#: en/configureX_chooser.xml:87
 msgid "<emphasis role=\"bold\">Options</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:88
+#: en/configureX_chooser.xml:90
 msgid "Here you can choose to enable or disable various options."
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_chooser.xml:93
+#: en/configureX_chooser.xml:95
 msgid ""
 "There is a risk of damaging a monitor if you choose refresh rates that are "
 "outside the frequency range of that monitor. This applies to older CRT "
@@ -994,12 +1000,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_monitor.xml:22
+#: en/configureX_monitor.xml:26
 msgid "Choosing your Monitor"
 msgstr "Izaberite vaš monitor"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:25
+#: en/configureX_monitor.xml:29
 msgid ""
 "DrakX has a very comprehensive database of monitors and will usually "
 "correctly identify yours."
@@ -1008,7 +1014,7 @@ msgstr ""
 "identificirati vaš."
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:30
+#: en/configureX_monitor.xml:34
 msgid ""
 "<emphasis role=\"bold\">Selecting a monitor with different characteristics "
 "could damage your monitor or video hardware. Please don't try something "
@@ -1017,7 +1023,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:38
+#: en/configureX_monitor.xml:42
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
@@ -1028,12 +1034,12 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:46
+#: en/configureX_monitor.xml:50
 msgid "Custom"
 msgstr "Prilagođeno"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:49
+#: en/configureX_monitor.xml:53
 msgid ""
 "This option allows you to set two critical parameters: the vertical refresh "
 "rate and the horizontal sync rate. Vertical refresh determines how often the "
@@ -1042,7 +1048,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:55
+#: en/configureX_monitor.xml:59
 msgid ""
 "It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor "
 "type with a sync range that is beyond the capabilities of your monitor: you "
@@ -1051,56 +1057,56 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:64
+#: en/configureX_monitor.xml:68
 msgid "Plug'n Play"
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:67
+#: en/configureX_monitor.xml:71
 msgid ""
 "This is the default option and automatically tries to determine the monitor "
 "type from the monitor database."
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:77
+#: en/configureX_monitor.xml:81
 msgid ""
 "If the installer has not correctly detected your monitor and you know which "
-"one you have, you can select it from the tree by selecting:"
+"one you have, you can choose it from the options by selecting:"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:86
+#: en/configureX_monitor.xml:90
 msgid "Manufacturer"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:90
+#: en/configureX_monitor.xml:94
 msgid "Monitor model"
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:96
+#: en/configureX_monitor.xml:100
 msgid "Generic"
 msgstr "Generički"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:99
+#: en/configureX_monitor.xml:103
 msgid ""
-"Selecting this group will list nearly 30 display configurations such as "
-"1024x768 @ 60Hz and includes flat-panel displays as used in laptops. This is "
-"often a good monitor selection group if you need to use the VESA card driver "
-"when your video hardware cannot be determined automatically.  Once again it "
-"may be wise to be conservative in your selections."
+"Selecting this group will list approximately 30 display configurations such "
+"as 1024x768 @ 60Hz and includes flat-panel displays as used in laptops.  "
+"This is often a good monitor selection group if you need to use the VESA "
+"card driver when your video hardware cannot be determined automatically. "
+"Once again, it may be wise to be conservative in your selections."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:22
+#: en/diskdrake.xml:24
 msgid "Custom Disk Partitioning with DiskDrake"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:27
+#: en/diskdrake.xml:29
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-diskdrake.png\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1108,7 +1114,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:38
+#: en/diskdrake.xml:40
 msgid ""
 "Modify the layout of your disk(s) here. You can remove or create partitions, "
 "change the filesystem or size of a partition and even view their details "
@@ -1116,15 +1122,15 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:47
 msgid ""
 "There is a tab at the top for every detected hard disk (or other storage "
-"device, like a USB key). In the screenshot above there are two available "
-"devices: <filename>sda </filename>and <filename>sdb</filename>."
+"device, like a USB key), for example: <filename>sda</filename>, "
+"<filename>sdb</filename>, <filename>sdc</filename> etc."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:52
+#: en/diskdrake.xml:54
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it. "
@@ -1133,21 +1139,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:60
+#: en/diskdrake.xml:62
 msgid ""
 "Continue until you have adjusted everything to your satisfaction, then click "
 "<emphasis>Done</emphasis> when you're ready."
 msgstr ""
 
 #. type: Content of: <section><warning><orderedlist><listitem><para>
-#: en/diskdrake.xml:69
+#: en/diskdrake.xml:71
 msgid ""
 "Take care with the <emphasis>Clear all</emphasis> option, use it only if you "
 "are sure you want to wipe all partitions on the selected storage device."
 msgstr ""
 
 #. type: Content of: <section><warning><orderedlist><listitem><para>
-#: en/diskdrake.xml:75
+#: en/diskdrake.xml:77
 msgid ""
 "If you wish to use encryption on your <filename>/</filename> partition you "
 "must ensure that you have a separate <filename>/boot</filename> partition. "
@@ -1156,7 +1162,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/diskdrake.xml:87
+#: en/diskdrake.xml:89
 msgid ""
 "If you are installing Mageia on a UEFI system, check that an ESP (EFI System "
 "Partition) is present and correctly mounted on <filename>/boot/EFI</"
@@ -1164,19 +1170,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/diskdrake.xml:93
+#: en/diskdrake.xml:95
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
 "partition is present and of the correct type. See Figure 2 below."
 msgstr ""
 
 #. type: Content of: <section><figure><title>
-#: en/diskdrake.xml:101
+#: en/diskdrake.xml:103
 msgid "EFI System Partition"
 msgstr ""
 
 #. type: Content of: <section><figure><mediaobject>
-#: en/diskdrake.xml:104
+#: en/diskdrake.xml:106
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-diskdrake2.png\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1184,17 +1190,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><figure>
-#: en/diskdrake.xml:103 en/diskdrake.xml:117
+#: en/diskdrake.xml:105 en/diskdrake.xml:119
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><figure><title>
-#: en/diskdrake.xml:115
+#: en/diskdrake.xml:117
 msgid "BIOS boot partition"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:118 en/doPartitionDisks.xml:201
+#: en/diskdrake.xml:120 en/doPartitionDisks.xml:206
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1217,26 +1223,26 @@ msgid "Partitioning"
 msgstr "Particioniranje"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:31
 msgid "Suggested Partitioning"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:34
 msgid ""
 "In this screen you can see the content of your hard drive(s) along with the "
 "DrakX partitioning proposals for where to install Mageia."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:34
+#: en/doPartitionDisks.xml:38
 msgid ""
 "The actual options available from those shown below will vary according to "
 "the layout and content of your particular hard drive(s)."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:39
+#: en/doPartitionDisks.xml:43
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1245,111 +1251,116 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><title>
-#: en/doPartitionDisks.xml:49
+#: en/doPartitionDisks.xml:53
 msgid "Main Options"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:56
 msgid "<emphasis role=\"bold\">Use Existing Partitions</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:59
 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><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:61
+#: en/doPartitionDisks.xml:65
 msgid "<emphasis role=\"bold\">Use Free Space</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:68
 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><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:70
+#: en/doPartitionDisks.xml:74
 msgid ""
 "<emphasis role=\"bold\">Use Free Space on a Windows Partition</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:73
+#: en/doPartitionDisks.xml:77
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it. 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 important files!"
+"installation but see the warning below."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para><mediaobject>
+#: en/doPartitionDisks.xml:87
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:79
+#: en/doPartitionDisks.xml:82
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
 "light blue and the proposed Mageia partition in dark blue with their "
 "intended sizes just underneath. You have the option to modify these sizes by "
 "clicking and dragging the gap between both partitions.  See the following "
-"screenshot:"
+"screenshot:<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><warning><para>
+#: en/doPartitionDisks.xml:97
+msgid ""
+"This involves shrinking the size of the Windows partition, and therefore is "
+"a risky operation, so you should make sure you have backed up all important "
+"files before proceeding."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><important><para>
+#: en/doPartitionDisks.xml:103
+msgid ""
+"The partition must be \"clean\", meaning that Windows must have closed down "
+"correctly the last time it was used. It must also have been defragmented, "
+"although this is not a guarantee that all files in the partition have been "
+"moved out of the area that is about to be used for Mageia."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:87
+#: en/doPartitionDisks.xml:112
 msgid "<emphasis role=\"bold\">Erase and use Entire Disk</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:90
+#: en/doPartitionDisks.xml:115
 msgid "This option will allocate the entire drive for Mageia"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:119
 msgid ""
 "This will erase ALL data on the selected hard drive. Take care! 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 this option."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><important><para>
-#: en/doPartitionDisks.xml:101
-msgid ""
-"Note that this involves shrinking the size of the Windows partition. The "
-"partition must be \"clean\", meaning that Windows must have closed down "
-"correctly the last time it was used. It must also have been defragmented, "
-"although this is not a guarantee that all files in the partition have been "
-"moved out of the area that is about to be used. It is highly recommended to "
-"back up your personal files."
-msgstr ""
-
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:112
+#: en/doPartitionDisks.xml:127
 msgid "<emphasis role=\"bold\">Custom Disk Partitioning</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:115
+#: en/doPartitionDisks.xml:130
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
 msgstr ""
 
-#. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:122
-msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
-msgstr ""
-
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:131
+#: en/doPartitionDisks.xml:136
 msgid ""
 "If you are not using the <emphasis>Custom disk partitioning</emphasis> "
 "option, then the installer will allocate the available space according to "
@@ -1357,60 +1368,60 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:137
+#: en/doPartitionDisks.xml:142
 msgid ""
 "If the total available space is less than 50 GB, then only one partition is "
 "created. This will be the <filename>/</filename> (root)  partition."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:143
+#: en/doPartitionDisks.xml:148
 msgid ""
 "If the total available space is greater than 50 GB, then three partitions "
 "are created"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:148
+#: en/doPartitionDisks.xml:153
 msgid ""
 "6/19 of the total available place is allocated to <filename>/</filename> "
 "with a maximum of 50 GB"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:153
+#: en/doPartitionDisks.xml:158
 msgid "1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:158
+#: en/doPartitionDisks.xml:163
 msgid "the rest (at least 12/19) is allocated to <filename>/home</filename>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:165
+#: en/doPartitionDisks.xml:170
 msgid ""
 "This means that from 160 GB or greater available space, the installer will "
 "create three partitions:"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:170
+#: en/doPartitionDisks.xml:175
 msgid "50 GB for <filename>/</filename>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:174
+#: en/doPartitionDisks.xml:179
 msgid "4 GB for <filename>swap</filename>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:178
+#: en/doPartitionDisks.xml:183
 msgid "and the remainder for <filename>/home</filename>"
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:183
+#: en/doPartitionDisks.xml:188
 msgid ""
 "If you are using a UEFI system, the ESP (EFI System Partition) will be "
 "automatically detected - or created if it does not exist yet - and mounted "
@@ -1420,7 +1431,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:189
+#: en/doPartitionDisks.xml:194
 msgid ""
 "If you are using a Legacy (also known as BIOS) system with a GPT partitioned "
 "disk, you need to create a BIOS boot partition if it doesn't already exist. "
@@ -1431,19 +1442,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:196
+#: en/doPartitionDisks.xml:201
 msgid "See <xref linkend=\"diskdrake\"/> for information on how to proceed."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:211
+#: en/doPartitionDisks.xml:216
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4.png"
-"\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks4.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks4.png\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:217
+#: en/doPartitionDisks.xml:226
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
 "previous standard of 512. Due to lack of available hardware, the "
@@ -1452,7 +1470,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:222
+#: en/doPartitionDisks.xml:231
 msgid ""
 "Some SSD devices now use an erase block size over 1 MB. If you have such a "
 "device we suggest that you partition the drive in advance, using an "
@@ -1461,17 +1479,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:229
+#: en/doPartitionDisks.xml:238
 msgid "<emphasis>Align to</emphasis> = MiB"
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:233
+#: en/doPartitionDisks.xml:242
 msgid "<emphasis>Free space preceding (MiB)</emphasis> = 2"
 msgstr ""
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:237
+#: en/doPartitionDisks.xml:246
 msgid ""
 "Also make sure all partitions are created using an even number of megabytes."
 msgstr ""
@@ -1628,12 +1646,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/firewall.xml:7
+#: en/firewall.xml:16
 msgid "Firewall"
 msgstr "Vatrozid"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:10
+#: en/firewall.xml:19
 msgid ""
 "This section allows you to configure some simple firewall rules: they "
 "determine which type of message from the Internet will be accepted by the "
@@ -1641,8 +1659,17 @@ msgid ""
 "system to be accessible from the Internet."
 msgstr ""
 
+#. type: Content of: <section><mediaobject>
+#: en/firewall.xml:26
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-firewall.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+
 #. type: Content of: <section><para>
-#: en/firewall.xml:16
+#: en/firewall.xml:31
 msgid ""
 "In the default setting (no button is checked), no service of the system is "
 "accessible from the network. The <emphasis>Everything (no firewall)</"
@@ -1655,7 +1682,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:25
+#: en/firewall.xml:40
 msgid ""
 "All other options are more or less self-explanatory. As an example, you will "
 "enable the CUPS server if you want printers on your machine to be accessible "
@@ -1663,12 +1690,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:29
+#: en/firewall.xml:44
 msgid "<emphasis role=\"bold\">Advanced</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:31
+#: en/firewall.xml:46
 msgid ""
 "The <emphasis>Advanced</emphasis> option opens a window where you can enable "
 "a series of services by typing a list of <quote>couples</quote> (blank "
@@ -1676,34 +1703,35 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:35
-msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
+#: en/firewall.xml:50
+msgid "<emphasis>&lt;port-number&gt;/&lt;protocol&gt;</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:38
+#: en/firewall.xml:53
 msgid ""
-"- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
-"the service you want to enable (e.g. 873 for the RSYNC service) as defined "
-"in <emphasis>RFC-433</emphasis>;"
+"- <emphasis>&lt;port-number&gt;</emphasis> is the value of the port assigned "
+"to the service you want to enable (e.g. 873 for the RSYNC service) as "
+"defined in <emphasis>RFC-433</emphasis>;"
 msgstr ""
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:42
+#: en/firewall.xml:57
 msgid ""
-"- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
-"<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
+"- <emphasis>&lt;protocol&gt;</emphasis> is one of <emphasis>TCP</emphasis> "
+"or <emphasis>UDP</emphasis> - the internet protocol that is used by the "
+"service."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:47
+#: en/firewall.xml:62
 msgid ""
 "For instance, the entry for enabling access to the RSYNC service therefore "
 "is <emphasis>873/tcp</emphasis>."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:50
+#: en/firewall.xml:65
 msgid ""
 "In case a service is implemented to use both protocols, you specify 2 "
 "couples for the same port."
@@ -1771,12 +1799,12 @@ msgid "Graphical Configuration"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:32
+#: en/installer.xml:34
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, Mageia instalacijski program"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:35
+#: en/installer.xml:37
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -1784,33 +1812,33 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:40
+#: en/installer.xml:42
 msgid "The installation steps"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:44
+#: en/installer.xml:46
 msgid ""
 "The install process is divided into a number of steps - the status of which "
 "is indicated in a panel to the left of the screen."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:50
+#: en/installer.xml:52
 msgid ""
 "Each step has one or more screens, which may also have <emphasis>Advanced</"
 "emphasis> sections with extra, less commonly required options."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:56
+#: en/installer.xml:58
 msgid ""
 "Most screens have <emphasis>Help</emphasis> buttons for further details "
 "about the particular step."
 msgstr ""
 
 #. type: Content of: <section><section><caution><para>
-#: en/installer.xml:62
+#: en/installer.xml:64
 msgid ""
 "If at some point during the install you decide to abort the installation, it "
 "is possible to reboot, but please think twice before you do this. Once a "
@@ -1820,7 +1848,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><caution><para>
-#: en/installer.xml:68
+#: en/installer.xml:70
 msgid ""
 "If, in spite of this, you are very sure rebooting is what you want, go to a "
 "text terminal by pressing the keys <keycombo> <keycap>Ctrl</keycap> "
@@ -1830,12 +1858,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:86
+#: en/installer.xml:88
 msgid "Installation Welcome Screen"
 msgstr "Instalacijski zaslon dobrodošlice"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:88
+#: en/installer.xml:90
 msgid ""
 "The particular screen that you will first see when booting from the "
 "Installation media will depend on whether your computer motherboard is of "
@@ -1843,60 +1871,60 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:92
+#: en/installer.xml:94
 msgid ""
 "The welcome menu screen has various options, however the default option will "
 "start the installer, and is normally all that you will need."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:97
+#: en/installer.xml:99
 msgid "Legacy (BIOS) Systems"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:100
+#: en/installer.xml:102
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome.png\"/> </"
 "imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:111
+#: en/installer.xml:113
 msgid ""
 "Install Mageia to a hard disk. This is the default option, and will "
 "automatically start after a short while unless another option is selected."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:117
+#: en/installer.xml:119
 msgid "<emphasis role=\"bold\">Rescue System</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:119
+#: en/installer.xml:121
 msgid ""
 "This option allows you to either re-install the bootloader for an existing "
 "Mageia installation or you can use it to restore a Windows bootloader."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:132
+#: en/installer.xml:134
 msgid "<emphasis role=\"bold\">F2: Language</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:134
+#: en/installer.xml:136
 msgid "Press F2 for alternative languages."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:140
+#: en/installer.xml:142
 msgid "UEFI Systems"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:142
+#: en/installer.xml:144
 msgid ""
 "From this screen, you can access options by pressing <keycap>e</keycap> to "
 "enter the edit mode. To come back to this screen, press <keycap>Esc</keycap> "
@@ -1904,19 +1932,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:148
+#: en/installer.xml:150
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome2.png\"/> </"
 "imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:157
+#: en/installer.xml:159
 msgid "<emphasis role=\"bold\">Install:</emphasis> Start the Install process"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:162
+#: en/installer.xml:164
 msgid ""
 "<emphasis role=\"bold\">Rescue:</emphasis> This option allows you to either "
 "re-install the bootloader for an existing Mageia installation or you can use "
@@ -1924,31 +1952,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:169
+#: en/installer.xml:171
 msgid ""
 "<emphasis role=\"bold\">F2: Language:</emphasis> Press <keycap>F2</keycap> "
 "for alternative languages."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:174
+#: en/installer.xml:176
 msgid ""
 "If you booted from a USB stick, you will see the above options duplicated, "
 "and in this case, you should use the set that will be suffixed with \"USB\"."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:181
+#: en/installer.xml:183
 msgid "Installation Problems and Possible Solutions"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:184
+#: en/installer.xml:186
 msgid "No Graphical Interface"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:188
+#: en/installer.xml:190
 msgid ""
 "After the initial screen you did not progress to the <emphasis>Language "
 "Selection</emphasis> screen. This can happen with some graphic cards and "
@@ -1957,7 +1985,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:195
+#: en/installer.xml:197
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
 "In this case it is worth trying a text-mode installation. To use this press "
@@ -1968,12 +1996,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:208
+#: en/installer.xml:210
 msgid "The Install Freezes"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:210
+#: en/installer.xml:212
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic hardware "
@@ -1983,12 +2011,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:218
+#: en/installer.xml:220
 msgid "RAM problem"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:220
+#: en/installer.xml:222
 msgid ""
 "This will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
@@ -1998,12 +2026,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:228
+#: en/installer.xml:230
 msgid "Dynamic partitions"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:230
+#: en/installer.xml:232
 msgid ""
 "If you converted your hard disk from <literal>Basic</literal> format to "
 "<literal>Dynamic</literal> format in Microsoft Windows, then it is not "
@@ -3587,73 +3615,106 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:27
+#: en/setupBootloader.xml:32
 msgid "Bootloader"
 msgstr "Program za pokretanje sustava"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:31
+#: en/setupBootloader.xml:36
+#, fuzzy
+msgid "Available Bootloaders"
+msgstr "Program za pokretanje sustava"
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:39
 msgid "Grub2"
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><title>
-#: en/setupBootloader.xml:34
-msgid "Grub2 on Legacy MBR/GPT systems"
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:42
+msgid "<emphasis role=\"bold\">Grub2 on Legacy MBR/GPT systems</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:37
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:46
 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:42
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:52
 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:49
-msgid "Grub2-efi on UEFI systems"
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:59
+msgid "<emphasis role=\"bold\">Grub2-efi on UEFI systems</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:52
-msgid "GRUB2-efi will be used exclusively as the bootloader for a UEFI system."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:63
+msgid "GRUB2-efi or rEFInd may be used as the bootloader for a UEFI system."
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:57
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:68
 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:60
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:71
 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 "
-"created by Windows and add grub2-efi to it. If no ESP exists, then one will "
+"created by Windows and add grub2-efi to it.  If no ESP exists, then one will "
 "be created. Although it is possible to have several ESPs, only one is "
 "required, whatever the number of operating systems you have."
 msgstr ""
 
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:82
+msgid "rEFInd"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:85
+msgid "<emphasis role=\"bold\">rEFInd on UEFI systems</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:88
+msgid ""
+"rEFInd has a nice graphical set of options, and can auto-detect installed "
+"EFI bootloaders. See: http://www.rodsbooks.com/refind/"
+msgstr ""
+
+#. type: Content of: <section><section><section><note><para>
+#: en/setupBootloader.xml:95
+msgid ""
+"Please note that in order to be able to use the <literal>rEFInd</literal> "
+"option, an installed EFI System Partition must match your system "
+"architecture: if you have a 32bit EFI System Partition installed on a 64bit "
+"machine for instance, then the rEFInd option will not be displayed/available "
+"to you."
+msgstr ""
+
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:72
+#: en/setupBootloader.xml:106
 msgid "Bootloader Setup"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:76
+#: en/setupBootloader.xml:110
 msgid "Bootloader main options"
 msgstr "Glavne postavke bootloadera"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:79
+#: en/setupBootloader.xml:113
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader.png\"/> </imageobject> <imageobject condition=\"live"
@@ -3662,47 +3723,69 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:91
+#: en/setupBootloader.xml:125
 msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:93
+#. type: Content of: <section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:129
+msgid ""
+"<guimenuitem>GRUB2</guimenuitem> (with either a graphical or a text menu), "
+"can be chosen for both <literal>Legacy MBR/BIOS</literal> systems and "
+"<literal>UEFI</literal> systems."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:136
 msgid ""
-"This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI "
-"systems will not see this option here."
+"<guimenuitem>rEFInd</guimenuitem> (with a graphical menu)  is an alternative "
+"option solely for use with <literal>UEFI</literal> systems."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:98
+#: en/setupBootloader.xml:144
 msgid "<emphasis role=\"bold\">Boot device</emphasis>"
 msgstr ""
 
+#. type: Content of: <section><section><section><itemizedlist><listitem><warning><para>
+#: en/setupBootloader.xml:147
+msgid "Don't change this unless you really know what you are doing."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><note><para>
+#: en/setupBootloader.xml:152
+msgid ""
+"There is no option to write GRUB to the boot sector of a partition (e.g: "
+"<filename>sda1</filename>), as this method is considered unreliable."
+msgstr ""
+
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:100
-msgid "Don't change this unless you really know what you are doing"
+#: en/setupBootloader.xml:157
+msgid ""
+"When using UEFI mode, then the <guilabel>Boot device</guilabel> will be "
+"listed as <guimenuitem>EFI System Partition</guimenuitem>."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:105
+#: en/setupBootloader.xml:163
 msgid ""
 "<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:108
+#: en/setupBootloader.xml:166
 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:113
+#: en/setupBootloader.xml:171
 msgid "<emphasis role=\"bold\">Security</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:115
+#: en/setupBootloader.xml:173
 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 "
@@ -3712,34 +3795,34 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:126
+#: en/setupBootloader.xml:184
 msgid "Choose a password for the bootloader (optional)"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:130
+#: en/setupBootloader.xml:188
 msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:132
+#: en/setupBootloader.xml:190
 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:137 en/setupBootloader.xml:212
+#: en/setupBootloader.xml:195 en/setupBootloader.xml:308
 msgid "<emphasis>Advanced</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:141
+#: en/setupBootloader.xml:199
 msgid "<emphasis>Enable ACPI</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:143
+#: en/setupBootloader.xml:201
 msgid ""
 "ACPI (Advanced Configuration and Power Interface) is a standard for power "
 "management. It can save energy by stopping unused devices. Deselecting it "
@@ -3749,24 +3832,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:152
+#: en/setupBootloader.xml:210
 msgid "<emphasis>Enable SMP</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:154
+#: en/setupBootloader.xml:212
 msgid ""
 "This option enables/disables symmetric multiprocessing for multi-core "
 "processors"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:159
+#: en/setupBootloader.xml:217
 msgid "<emphasis>Enable APIC</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:161
+#: en/setupBootloader.xml:219
 msgid ""
 "Enabling this gives the operating system access to the Advanced Programmable "
 "Interrupt Controller. APIC devices permit more complex priority models, and "
@@ -3774,24 +3857,82 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:168
+#: en/setupBootloader.xml:226
 msgid "<emphasis>Enable Local APIC</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:170
+#: en/setupBootloader.xml:228
 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:177
+#: en/setupBootloader.xml:235
 msgid "Bootloader Configuration"
 msgstr "Podešavanje bootloadera"
 
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:237
+msgid ""
+"If, in the previous section you selected <literal>rEFInd</literal> as the "
+"bootloader to use, you would then be presented with the options shown in the "
+"screenshot directly below. Otherwise, please instead move on to the "
+"subsequent screenshot for your options."
+msgstr ""
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:243
+#, fuzzy
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"rEFIndLoaderConfig.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-rEFIndLoaderConfig.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:253
+#, fuzzy
+msgid "Your rEFInd configuration options:"
+msgstr "Konfiguracija zvuka"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:256
+msgid ""
+"<guimenuitem>Install or update rEFInd in the EFI system partition.</"
+"guimenuitem>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:261
+msgid ""
+"<guimenuitem>Install in EFI/Boot partition (workaround for some BIOS's).</"
+"guimenuitem>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:264
+msgid ""
+"With some BIOS's, the newly written bootloaser for Mageia at end of the "
+"installation will not be recognized. In that case, you can use this option "
+"as a workaround for the issue."
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:270
+msgid ""
+"If you did not select rEFInd as the bootloader to use in the previous "
+"section, then your bootloader configurations are shown below:"
+msgstr ""
+
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:180
+#: en/setupBootloader.xml:275
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -3800,42 +3941,42 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:191
+#: en/setupBootloader.xml:286
 msgid "<emphasis role=\"bold\">Default</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:193
+#: en/setupBootloader.xml:288
 msgid "The operating system to be started up by default."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:197
+#: en/setupBootloader.xml:292
 msgid "<emphasis role=\"bold\">Append</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:199
+#: en/setupBootloader.xml:294
 msgid ""
 "This option lets you pass information to the kernel 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:204
+#: en/setupBootloader.xml:299
 msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:206
+#: en/setupBootloader.xml:301
 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, "
-"then untick the Probe Foreign OS option."
+"then untick the <guimenuitem>Probe Foreign OS</guimenuitem> option."
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:215
+#: en/setupBootloader.xml:311
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader4.png\"/> </imageobject> <imageobject condition=\"live"
@@ -3844,12 +3985,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:226
+#: en/setupBootloader.xml:322
 msgid "<emphasis>Video mode</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:228
+#: en/setupBootloader.xml:324
 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 "
@@ -3857,38 +3998,47 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:234
+#: en/setupBootloader.xml:330
 msgid "<emphasis>Do not touch ESP or MBR</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:236
+#: en/setupBootloader.xml:332
 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 "
-"missing. Click<emphasis> Ok</emphasis> if you are sure you understand the "
-"implications, and wish to proceed."
+"missing. Click <guimenuitem>Ok </guimenuitem>only if you are sure you "
+"understand the implications, and wish to proceed."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><warning><para>
+#: en/setupBootloader.xml:338
+msgid ""
+"Chain-loading via legacy bootloaders (GRUB Legacy and LiLo)  is no longer "
+"supported by Mageia as it is likely to fail when attempting to boot this "
+"resulting installation of Mageia. If you use anything other than GRUB2 or "
+"rEFInd for this purpose, then you do so at your own risk!"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:245
+#: en/setupBootloader.xml:348
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png"
 "\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:253
+#: en/setupBootloader.xml:356
 msgid "Other Options"
 msgstr "Ostali izbori"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:256
+#: en/setupBootloader.xml:359
 msgid "Using an existing bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:258
+#: en/setupBootloader.xml:361
 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 "
@@ -3898,12 +4048,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:267
+#: en/setupBootloader.xml:370
 msgid "Installing Without a Bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:269
+#: en/setupBootloader.xml:372
 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 "
diff --git a/docs/docs/stable/installer/hu.po b/docs/docs/stable/installer/hu.po
index 4b0927a5..8c8b04ca 100644
--- a/docs/docs/stable/installer/hu.po
+++ b/docs/docs/stable/installer/hu.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2019-01-19 21:23+0200\n"
+"POT-Creation-Date: 2019-09-08 15:26+0300\n"
 "PO-Revision-Date: 2019-01-19 19:25+0000\n"
 "Last-Translator: Laszlo Espadas\n"
 "Language-Team: Hungarian (http://www.transifex.com/MageiaLinux/mageia/"
@@ -153,7 +153,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/addUser.xml:3
+#: en/addUser.xml:9
 msgid "User Management"
 msgstr ""
 
@@ -163,13 +163,16 @@ msgstr ""
 #. 2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
 #.   Also changed 'Advanced User Management' to 'User Management (advanced)'.
 #. 2018/02/24 apb: Changed list style.
+#. 2019/08/10 apb: Added missing 'condition' profile for live-user1.png.
+#. 2019/08/11 apb: [1] Reword 1.1 (including Note) [2] Reword 1.2 Password text.
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:12
+#: en/addUser.xml:28
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
-"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
-"\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata format="
-"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-setRootPassword.png\" format=\"PNG\" revision=\"1\" xml:id="
+"\"setRootPassword-im1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-user1.png\" format=\"PNG\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
 "\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -177,36 +180,41 @@ msgstr ""
 "\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:21
+#: en/addUser.xml:40
 msgid "Set Administrator (root)  Password:"
 msgstr "A rendszergazdai (root) jelszó beállítása"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:24
+#: en/addUser.xml:44
 msgid ""
 "It is advisable for all Mageia installations to set a <literal>superuser</"
 "literal> (Administrator) password, usually called the <emphasis>root </"
-"emphasis>password in Linux. As you type a password into the top box a shield "
-"will change from red-to-yellow-to-green depending on the strength of the "
-"password. A green shield shows you are using a strong password. You need to "
-"repeat the same password in the box underneath, to check that the first "
-"entry was not mistyped."
+"emphasis>password in Linux. You need to repeat the same password in the box "
+"underneath, to check that the first entry was not mistyped."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:32
+#: en/addUser.xml:51
+msgid ""
+"As you type a password into the top box a shield will change from red-to-"
+"yellow-to-green depending on the strength of the password. A green shield "
+"shows you are using a strong password."
+msgstr ""
+
+#. type: Content of: <section><section><note><para>
+#: en/addUser.xml:55
 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:39
+#: en/addUser.xml:63
 msgid "Enter a user"
 msgstr "Adjon meg egy felhasználót"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:41
+#: en/addUser.xml:66
 msgid ""
 "Add a User here. A regular user has fewer privileges than the "
 "<literal>superuser</literal> (root), but enough to use the Internet, office "
@@ -215,39 +223,39 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:47
+#: en/addUser.xml:73
 msgid "<emphasis role=\"bold\">Icon</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:48
+#: en/addUser.xml:75
 msgid "Click on this button if you want to change the user's icon"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:52
+#: en/addUser.xml:80
 msgid "<emphasis role=\"bold\">Real Name</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:53
+#: en/addUser.xml:82
 msgid "Insert the user's real name into this text box"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:56
+#: en/addUser.xml:86
 msgid "<emphasis role=\"bold\">Login Name</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:57
+#: en/addUser.xml:88
 msgid ""
 "Enter the user login name or let DrakX use a version of the user's real "
 "name. <emphasis role=\"bold\">The login name is case-sensitive.</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><caution><simpara>
-#: en/addUser.xml:61
+#: en/addUser.xml:93
 msgid ""
 "The login entered here should be different to any login currently in use for "
 "your <filename>/home</filename> directory. Some user parameters will be "
@@ -256,34 +264,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:65 en/setupBootloader.xml:124
+#: en/addUser.xml:102 en/setupBootloader.xml:182
 msgid "<emphasis role=\"bold\">Password</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:66
-msgid ""
-"Type in the user password. There is a shield at the end of the text box that "
-"indicates the strength of the password. (See also <xref linkend="
-"\"givePassword\"/>)"
+#: en/addUser.xml:104
+msgid "Type in the user password (remembering the advice in the Note above)."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:68
+#: en/addUser.xml:107
 msgid ""
 "<emphasis role=\"bold\">Password (again):</emphasis> Retype the user "
 "password. DrakX will check that you have not mistyped the password."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:74
+#: en/addUser.xml:114
 msgid ""
 "Any users added while installing Mageia, will have a home directory that is "
 "both read and write protected (umask=0027)"
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:76
+#: en/addUser.xml:117
 msgid ""
 "You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
@@ -291,24 +296,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:79
+#: en/addUser.xml:121
 msgid "The access permissions can also be changed after the install."
 msgstr "A hozzáférési jogosultságok a telepítés után is módosíthatók."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:85
+#: en/addUser.xml:128
 msgid "User Management (advanced)"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:87
+#: en/addUser.xml:131
 msgid ""
 "The <emphasis>Advanced</emphasis> option allows you to edit further settings "
 "for the user you are adding."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:91
+#: en/addUser.xml:136
 msgid ""
 "<emphasis>Shell</emphasis>: This drop-down list allows you to change the "
 "shell available to any user you added in the previous screen. Options are "
@@ -316,7 +321,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:143
 msgid ""
 "<emphasis>User ID</emphasis>: Here you can set the user ID for any user you "
 "added in the previous screen. If you are unsure what the purpose of this is, "
@@ -324,7 +329,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:102
+#: en/addUser.xml:149
 msgid ""
 "<emphasis>Group ID</emphasis>: This lets you set the group ID.  Again, if "
 "unsure, leave it blank."
@@ -444,24 +449,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:23
+#: en/bootLive.xml:10
 msgid "Boot Mageia as Live system"
 msgstr "Mageia indítása mint Live rendszer"
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:28
+#: en/bootLive.xml:14
 msgid "Booting the medium"
 msgstr "Betöltés az adathordozóról"
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:31
+#: en/bootLive.xml:16
 msgid ""
 "You can boot directly from a Live DVD or USB. Usually, you just need to plug "
 "the USB device in or place the DVD in the drive and restart the computer."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:35
+#: en/bootLive.xml:19
 msgid ""
 "If the computer does not automatically boot from the USB or DVD you may need "
 "to reconfigure your BIOS Boot Disk priority. Alternatively, you might try "
@@ -470,7 +475,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><tip><para>
-#: en/bootLive.xml:41
+#: en/bootLive.xml:24
 msgid ""
 "To access the BIOS or boot menu when the computer is starting, you can try "
 "pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or <keycap>Esc</"
@@ -480,7 +485,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/bootLive.xml:50
+#: en/bootLive.xml:32
 msgid ""
 "The actual screen that you will first see when booting from the Live media "
 "will depend on whether your computer motherboard is of the Legacy (BIOS) or "
@@ -488,91 +493,93 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:58
+#: en/bootLive.xml:39
 msgid "In BIOS/CSM/Legacy mode"
 msgstr "BIOS/CSM/Legacy módban"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:62
+#: en/bootLive.xml:42
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"../live-bootCSM.png\" align=\"center\"/> "
+"</imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:67
+#: en/bootLive.xml:46
 msgid "First screen while booting in BIOS mode"
 msgstr "Az első képernyő a BIOS módban történő indítás során"
 
 #. type: Content of: <section><section><section><itemizedlist><title>
-#: en/bootLive.xml:72 en/bootLive.xml:144 en/installer.xml:106
-#: en/installer.xml:154
+#: en/bootLive.xml:50 en/bootLive.xml:104 en/installer.xml:108
+#: en/installer.xml:156
 msgid "Menu"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:75 en/bootLive.xml:147
+#: en/bootLive.xml:52 en/bootLive.xml:106
 msgid "<emphasis role=\"bold\">Boot Mageia</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:77
+#: en/bootLive.xml:53
 msgid ""
 "This option will boot the Mageia Live system from the connected DVD/USB "
 "media (expect a very slow system compared to an installed OS)."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:81
+#: en/bootLive.xml:56
 msgid "Once the boot is done, you can proceed to the installation."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:86 en/bootLive.xml:102
+#: en/bootLive.xml:60 en/bootLive.xml:72
 msgid ""
 "<emphasis role=\"bold\">+ use non-free video drivers (slower to boot)</"
 "emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:89
+#: en/bootLive.xml:62
 msgid "Boot the Mageia Live system using non-free video drivers"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:96 en/bootLive.xml:155 en/installer.xml:109
+#: en/bootLive.xml:68 en/bootLive.xml:112 en/installer.xml:111
 msgid "<emphasis role=\"bold\">Install Mageia</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:98 en/bootLive.xml:157
+#: en/bootLive.xml:69 en/bootLive.xml:113
 msgid "This option will install Mageia to a hard disk."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:105
+#: en/bootLive.xml:74
 msgid "Install Mageia using non-free video drivers"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:111 en/installer.xml:125
+#: en/bootLive.xml:79 en/installer.xml:127
 msgid "<emphasis role=\"bold\">Memory Test</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:113 en/installer.xml:127
+#: en/bootLive.xml:80 en/installer.xml:129
 msgid ""
 "Test the installed RAM by performing multiple read and write operations. "
 "Reboot to end the test."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:118 en/bootLive.xml:161
+#: en/bootLive.xml:84 en/bootLive.xml:116
 msgid "<emphasis role=\"bold\"> F2 Language</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:120 en/bootLive.xml:163
+#: en/bootLive.xml:85 en/bootLive.xml:117
 msgid ""
 "Press <keycap>F2</keycap> to have the installer use a specific language "
 "during the installation. Use the arrow keys to select the language then "
@@ -580,24 +587,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:129
+#: en/bootLive.xml:93
 msgid "In UEFI mode"
 msgstr "UEFI módal"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:133
+#: en/bootLive.xml:96
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:139
+#: en/bootLive.xml:100
 msgid "First screen while booting in UEFI mode"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:149
+#: en/bootLive.xml:107
 msgid ""
 "This option will boot the Mageia Live system from the connected DVD/USB "
 "media (expect a very slow system compared to an installed OS).  Once the "
@@ -605,7 +615,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/bootLive.xml:170
+#: en/bootLive.xml:123
 msgid ""
 "If you booted from a USB stick, you will see the above menu options "
 "duplicated, and in this case, you should choose from the menu pair that will "
@@ -822,12 +832,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:24
+#: en/configureX_card_list.xml:27
 msgid "Choose an X Server (Configure your Graphic Card)"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_card_list.xml:29
+#: en/configureX_card_list.xml:32
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_card_list."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_card_list-im1\"/> </"
@@ -835,36 +845,36 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:35
+#: en/configureX_card_list.xml:38
 msgid ""
 "DrakX has a very comprehensive database of video cards and will usually "
 "correctly identify your video device."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:38
+#: en/configureX_card_list.xml:41
 msgid ""
 "If the installer has not correctly detected your graphic card and you know "
 "which one you have, you can select it from the tree by:"
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_card_list.xml:41 en/configureX_monitor.xml:74
+#: en/configureX_card_list.xml:44 en/configureX_monitor.xml:78
 msgid "Vendor"
 msgstr "Gyártó"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:45
+#: en/configureX_card_list.xml:48
 msgid "then the make of your card"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:49
+#: en/configureX_card_list.xml:52
 msgid "and the model of card"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:53
+#: en/configureX_card_list.xml:56
 msgid ""
 "If you cannot find your card in the vendor lists (because it's not yet in "
 "the database or it's an older card) you may find a suitable driver in the "
@@ -875,14 +885,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><caution><para>
-#: en/configureX_card_list.xml:61
+#: en/configureX_card_list.xml:64
 msgid ""
 "Be aware that if you select an incompatible driver you may only have access "
 "to the <emphasis>Command Line Interface</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:65
+#: en/configureX_card_list.xml:68
 msgid ""
 "Some video card manufacturers provide proprietary drivers for Linux which "
 "may only be available in the <emphasis>Nonfree</emphasis> repository and in "
@@ -893,17 +903,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:11
-msgid "Graphic Card and Monitor Configuration"
+#: en/configureX_chooser.xml:23
+#, fuzzy
+msgid "Graphics Card and Monitor Configuration"
 msgstr "Videó-kártya és Monitor beállítások"
 
-#.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
-#. 2018/02/15 apb: Some text and typography.
-#. 2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.
-#. 2018/02/23 apb: Typo.
-#. 2019/01/06 apb: Slight reword, split 1st para in two.
 #. type: Content of: <section><mediaobject>
-#: en/configureX_chooser.xml:26
+#: en/configureX_chooser.xml:28
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_chooser."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_chooser-im1\"/> </"
@@ -911,7 +917,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:32
+#: en/configureX_chooser.xml:34
 msgid ""
 "No matter which graphical environment (also known as desktop environment) "
 "you chose for this install of Mageia, they are all based on a graphical user "
@@ -922,31 +928,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:39
+#: en/configureX_chooser.xml:41
 msgid ""
 "Choose the appropriate settings manually if you think the details are "
 "incorrect, or if none are shown."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:44
-msgid "<emphasis role=\"bold\">Graphic Card</emphasis>"
+#: en/configureX_chooser.xml:46
+msgid "<emphasis role=\"bold\">Graphics Card</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:47
+#: en/configureX_chooser.xml:49
 msgid ""
 "If you need to, you can select a specific card from this expandable list. "
 "See <xref linkend=\"configureX_card_list\"/>."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:52
+#: en/configureX_chooser.xml:54
 msgid "<emphasis role=\"bold\">Monitor</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:55
+#: en/configureX_chooser.xml:57
 msgid ""
 "You can choose Plug 'n Play, if applicable, or choose your monitor from the "
 "<emphasis>Vendor</emphasis> or <emphasis>Generic</emphasis> lists. Choose "
@@ -956,22 +962,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:63
+#: en/configureX_chooser.xml:65
 msgid "<emphasis role=\"bold\">Resolution</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:66
+#: en/configureX_chooser.xml:68
 msgid "The resolution and color depth of your monitor can be set here."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:71
+#: en/configureX_chooser.xml:73
 msgid "<emphasis role=\"bold\">Test</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:74
+#: en/configureX_chooser.xml:76
 msgid ""
 "The test button does not always appear during install. If the option is "
 "there, and you test your settings, you should be asked to confirm that your "
@@ -983,17 +989,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:85
+#: en/configureX_chooser.xml:87
 msgid "<emphasis role=\"bold\">Options</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:88
+#: en/configureX_chooser.xml:90
 msgid "Here you can choose to enable or disable various options."
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_chooser.xml:93
+#: en/configureX_chooser.xml:95
 msgid ""
 "There is a risk of damaging a monitor if you choose refresh rates that are "
 "outside the frequency range of that monitor. This applies to older CRT "
@@ -1002,19 +1008,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_monitor.xml:22
+#: en/configureX_monitor.xml:26
 msgid "Choosing your Monitor"
 msgstr "Monitor kiválasztása"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:25
+#: en/configureX_monitor.xml:29
 msgid ""
 "DrakX has a very comprehensive database of monitors and will usually "
 "correctly identify yours."
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:30
+#: en/configureX_monitor.xml:34
 msgid ""
 "<emphasis role=\"bold\">Selecting a monitor with different characteristics "
 "could damage your monitor or video hardware. Please don't try something "
@@ -1023,7 +1029,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:38
+#: en/configureX_monitor.xml:42
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
@@ -1034,12 +1040,12 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:46
+#: en/configureX_monitor.xml:50
 msgid "Custom"
 msgstr "Egyéni"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:49
+#: en/configureX_monitor.xml:53
 msgid ""
 "This option allows you to set two critical parameters: the vertical refresh "
 "rate and the horizontal sync rate. Vertical refresh determines how often the "
@@ -1048,7 +1054,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:55
+#: en/configureX_monitor.xml:59
 msgid ""
 "It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor "
 "type with a sync range that is beyond the capabilities of your monitor: you "
@@ -1057,56 +1063,56 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:64
+#: en/configureX_monitor.xml:68
 msgid "Plug'n Play"
 msgstr "Plug and Play"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:67
+#: en/configureX_monitor.xml:71
 msgid ""
 "This is the default option and automatically tries to determine the monitor "
 "type from the monitor database."
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:77
+#: en/configureX_monitor.xml:81
 msgid ""
 "If the installer has not correctly detected your monitor and you know which "
-"one you have, you can select it from the tree by selecting:"
+"one you have, you can choose it from the options by selecting:"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:86
+#: en/configureX_monitor.xml:90
 msgid "Manufacturer"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:90
+#: en/configureX_monitor.xml:94
 msgid "Monitor model"
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:96
+#: en/configureX_monitor.xml:100
 msgid "Generic"
 msgstr "Általános"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:99
+#: en/configureX_monitor.xml:103
 msgid ""
-"Selecting this group will list nearly 30 display configurations such as "
-"1024x768 @ 60Hz and includes flat-panel displays as used in laptops. This is "
-"often a good monitor selection group if you need to use the VESA card driver "
-"when your video hardware cannot be determined automatically.  Once again it "
-"may be wise to be conservative in your selections."
+"Selecting this group will list approximately 30 display configurations such "
+"as 1024x768 @ 60Hz and includes flat-panel displays as used in laptops.  "
+"This is often a good monitor selection group if you need to use the VESA "
+"card driver when your video hardware cannot be determined automatically. "
+"Once again, it may be wise to be conservative in your selections."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:22
+#: en/diskdrake.xml:24
 msgid "Custom Disk Partitioning with DiskDrake"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:27
+#: en/diskdrake.xml:29
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-diskdrake.png\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1114,7 +1120,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:38
+#: en/diskdrake.xml:40
 msgid ""
 "Modify the layout of your disk(s) here. You can remove or create partitions, "
 "change the filesystem or size of a partition and even view their details "
@@ -1122,15 +1128,15 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:47
 msgid ""
 "There is a tab at the top for every detected hard disk (or other storage "
-"device, like a USB key). In the screenshot above there are two available "
-"devices: <filename>sda </filename>and <filename>sdb</filename>."
+"device, like a USB key), for example: <filename>sda</filename>, "
+"<filename>sdb</filename>, <filename>sdc</filename> etc."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:52
+#: en/diskdrake.xml:54
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it. "
@@ -1139,21 +1145,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:60
+#: en/diskdrake.xml:62
 msgid ""
 "Continue until you have adjusted everything to your satisfaction, then click "
 "<emphasis>Done</emphasis> when you're ready."
 msgstr ""
 
 #. type: Content of: <section><warning><orderedlist><listitem><para>
-#: en/diskdrake.xml:69
+#: en/diskdrake.xml:71
 msgid ""
 "Take care with the <emphasis>Clear all</emphasis> option, use it only if you "
 "are sure you want to wipe all partitions on the selected storage device."
 msgstr ""
 
 #. type: Content of: <section><warning><orderedlist><listitem><para>
-#: en/diskdrake.xml:75
+#: en/diskdrake.xml:77
 msgid ""
 "If you wish to use encryption on your <filename>/</filename> partition you "
 "must ensure that you have a separate <filename>/boot</filename> partition. "
@@ -1162,7 +1168,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/diskdrake.xml:87
+#: en/diskdrake.xml:89
 msgid ""
 "If you are installing Mageia on a UEFI system, check that an ESP (EFI System "
 "Partition) is present and correctly mounted on <filename>/boot/EFI</"
@@ -1170,19 +1176,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/diskdrake.xml:93
+#: en/diskdrake.xml:95
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
 "partition is present and of the correct type. See Figure 2 below."
 msgstr ""
 
 #. type: Content of: <section><figure><title>
-#: en/diskdrake.xml:101
+#: en/diskdrake.xml:103
 msgid "EFI System Partition"
 msgstr "EFI rendszer partíció"
 
 #. type: Content of: <section><figure><mediaobject>
-#: en/diskdrake.xml:104
+#: en/diskdrake.xml:106
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-diskdrake2.png\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1190,17 +1196,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><figure>
-#: en/diskdrake.xml:103 en/diskdrake.xml:117
+#: en/diskdrake.xml:105 en/diskdrake.xml:119
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><figure><title>
-#: en/diskdrake.xml:115
+#: en/diskdrake.xml:117
 msgid "BIOS boot partition"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:118 en/doPartitionDisks.xml:201
+#: en/diskdrake.xml:120 en/doPartitionDisks.xml:206
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1223,26 +1229,26 @@ msgid "Partitioning"
 msgstr "Partícionálás"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:31
 msgid "Suggested Partitioning"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:34
 msgid ""
 "In this screen you can see the content of your hard drive(s) along with the "
 "DrakX partitioning proposals for where to install Mageia."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:34
+#: en/doPartitionDisks.xml:38
 msgid ""
 "The actual options available from those shown below will vary according to "
 "the layout and content of your particular hard drive(s)."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:39
+#: en/doPartitionDisks.xml:43
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1251,111 +1257,116 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><title>
-#: en/doPartitionDisks.xml:49
+#: en/doPartitionDisks.xml:53
 msgid "Main Options"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:56
 msgid "<emphasis role=\"bold\">Use Existing Partitions</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:59
 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><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:61
+#: en/doPartitionDisks.xml:65
 msgid "<emphasis role=\"bold\">Use Free Space</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:68
 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><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:70
+#: en/doPartitionDisks.xml:74
 msgid ""
 "<emphasis role=\"bold\">Use Free Space on a Windows Partition</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:73
+#: en/doPartitionDisks.xml:77
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it. 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 important files!"
+"installation but see the warning below."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para><mediaobject>
+#: en/doPartitionDisks.xml:87
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:79
+#: en/doPartitionDisks.xml:82
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
 "light blue and the proposed Mageia partition in dark blue with their "
 "intended sizes just underneath. You have the option to modify these sizes by "
 "clicking and dragging the gap between both partitions.  See the following "
-"screenshot:"
+"screenshot:<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><warning><para>
+#: en/doPartitionDisks.xml:97
+msgid ""
+"This involves shrinking the size of the Windows partition, and therefore is "
+"a risky operation, so you should make sure you have backed up all important "
+"files before proceeding."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><important><para>
+#: en/doPartitionDisks.xml:103
+msgid ""
+"The partition must be \"clean\", meaning that Windows must have closed down "
+"correctly the last time it was used. It must also have been defragmented, "
+"although this is not a guarantee that all files in the partition have been "
+"moved out of the area that is about to be used for Mageia."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:87
+#: en/doPartitionDisks.xml:112
 msgid "<emphasis role=\"bold\">Erase and use Entire Disk</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:90
+#: en/doPartitionDisks.xml:115
 msgid "This option will allocate the entire drive for Mageia"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:119
 msgid ""
 "This will erase ALL data on the selected hard drive. Take care! 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 this option."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><important><para>
-#: en/doPartitionDisks.xml:101
-msgid ""
-"Note that this involves shrinking the size of the Windows partition. The "
-"partition must be \"clean\", meaning that Windows must have closed down "
-"correctly the last time it was used. It must also have been defragmented, "
-"although this is not a guarantee that all files in the partition have been "
-"moved out of the area that is about to be used. It is highly recommended to "
-"back up your personal files."
-msgstr ""
-
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:112
+#: en/doPartitionDisks.xml:127
 msgid "<emphasis role=\"bold\">Custom Disk Partitioning</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:115
+#: en/doPartitionDisks.xml:130
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
 msgstr ""
 
-#. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:122
-msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
-msgstr ""
-
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:131
+#: en/doPartitionDisks.xml:136
 msgid ""
 "If you are not using the <emphasis>Custom disk partitioning</emphasis> "
 "option, then the installer will allocate the available space according to "
@@ -1363,60 +1374,60 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:137
+#: en/doPartitionDisks.xml:142
 msgid ""
 "If the total available space is less than 50 GB, then only one partition is "
 "created. This will be the <filename>/</filename> (root)  partition."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:143
+#: en/doPartitionDisks.xml:148
 msgid ""
 "If the total available space is greater than 50 GB, then three partitions "
 "are created"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:148
+#: en/doPartitionDisks.xml:153
 msgid ""
 "6/19 of the total available place is allocated to <filename>/</filename> "
 "with a maximum of 50 GB"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:153
+#: en/doPartitionDisks.xml:158
 msgid "1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:158
+#: en/doPartitionDisks.xml:163
 msgid "the rest (at least 12/19) is allocated to <filename>/home</filename>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:165
+#: en/doPartitionDisks.xml:170
 msgid ""
 "This means that from 160 GB or greater available space, the installer will "
 "create three partitions:"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:170
+#: en/doPartitionDisks.xml:175
 msgid "50 GB for <filename>/</filename>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:174
+#: en/doPartitionDisks.xml:179
 msgid "4 GB for <filename>swap</filename>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:178
+#: en/doPartitionDisks.xml:183
 msgid "and the remainder for <filename>/home</filename>"
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:183
+#: en/doPartitionDisks.xml:188
 msgid ""
 "If you are using a UEFI system, the ESP (EFI System Partition) will be "
 "automatically detected - or created if it does not exist yet - and mounted "
@@ -1426,7 +1437,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:189
+#: en/doPartitionDisks.xml:194
 msgid ""
 "If you are using a Legacy (also known as BIOS) system with a GPT partitioned "
 "disk, you need to create a BIOS boot partition if it doesn't already exist. "
@@ -1437,19 +1448,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:196
+#: en/doPartitionDisks.xml:201
 msgid "See <xref linkend=\"diskdrake\"/> for information on how to proceed."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:211
+#: en/doPartitionDisks.xml:216
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4.png"
-"\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks4.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks4.png\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:217
+#: en/doPartitionDisks.xml:226
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
 "previous standard of 512. Due to lack of available hardware, the "
@@ -1458,7 +1476,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:222
+#: en/doPartitionDisks.xml:231
 msgid ""
 "Some SSD devices now use an erase block size over 1 MB. If you have such a "
 "device we suggest that you partition the drive in advance, using an "
@@ -1467,17 +1485,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:229
+#: en/doPartitionDisks.xml:238
 msgid "<emphasis>Align to</emphasis> = MiB"
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:233
+#: en/doPartitionDisks.xml:242
 msgid "<emphasis>Free space preceding (MiB)</emphasis> = 2"
 msgstr ""
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:237
+#: en/doPartitionDisks.xml:246
 msgid ""
 "Also make sure all partitions are created using an even number of megabytes."
 msgstr ""
@@ -1648,12 +1666,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/firewall.xml:7
+#: en/firewall.xml:16
 msgid "Firewall"
 msgstr "Tűzfal"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:10
+#: en/firewall.xml:19
 msgid ""
 "This section allows you to configure some simple firewall rules: they "
 "determine which type of message from the Internet will be accepted by the "
@@ -1661,8 +1679,17 @@ msgid ""
 "system to be accessible from the Internet."
 msgstr ""
 
+#. type: Content of: <section><mediaobject>
+#: en/firewall.xml:26
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-firewall.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+
 #. type: Content of: <section><para>
-#: en/firewall.xml:16
+#: en/firewall.xml:31
 msgid ""
 "In the default setting (no button is checked), no service of the system is "
 "accessible from the network. The <emphasis>Everything (no firewall)</"
@@ -1675,7 +1702,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:25
+#: en/firewall.xml:40
 msgid ""
 "All other options are more or less self-explanatory. As an example, you will "
 "enable the CUPS server if you want printers on your machine to be accessible "
@@ -1683,12 +1710,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:29
+#: en/firewall.xml:44
 msgid "<emphasis role=\"bold\">Advanced</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:31
+#: en/firewall.xml:46
 msgid ""
 "The <emphasis>Advanced</emphasis> option opens a window where you can enable "
 "a series of services by typing a list of <quote>couples</quote> (blank "
@@ -1696,34 +1723,36 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:35
-msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
+#: en/firewall.xml:50
+#, fuzzy
+msgid "<emphasis>&lt;port-number&gt;/&lt;protocol&gt;</emphasis>"
 msgstr "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:38
+#: en/firewall.xml:53
 msgid ""
-"- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
-"the service you want to enable (e.g. 873 for the RSYNC service) as defined "
-"in <emphasis>RFC-433</emphasis>;"
+"- <emphasis>&lt;port-number&gt;</emphasis> is the value of the port assigned "
+"to the service you want to enable (e.g. 873 for the RSYNC service) as "
+"defined in <emphasis>RFC-433</emphasis>;"
 msgstr ""
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:42
+#: en/firewall.xml:57
 msgid ""
-"- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
-"<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
+"- <emphasis>&lt;protocol&gt;</emphasis> is one of <emphasis>TCP</emphasis> "
+"or <emphasis>UDP</emphasis> - the internet protocol that is used by the "
+"service."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:47
+#: en/firewall.xml:62
 msgid ""
 "For instance, the entry for enabling access to the RSYNC service therefore "
 "is <emphasis>873/tcp</emphasis>."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:50
+#: en/firewall.xml:65
 msgid ""
 "In case a service is implemented to use both protocols, you specify 2 "
 "couples for the same port."
@@ -1791,12 +1820,12 @@ msgid "Graphical Configuration"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:32
+#: en/installer.xml:34
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, a Mageia telepítő"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:35
+#: en/installer.xml:37
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -1804,33 +1833,33 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:40
+#: en/installer.xml:42
 msgid "The installation steps"
 msgstr "Telepítési lépések"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:44
+#: en/installer.xml:46
 msgid ""
 "The install process is divided into a number of steps - the status of which "
 "is indicated in a panel to the left of the screen."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:50
+#: en/installer.xml:52
 msgid ""
 "Each step has one or more screens, which may also have <emphasis>Advanced</"
 "emphasis> sections with extra, less commonly required options."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:56
+#: en/installer.xml:58
 msgid ""
 "Most screens have <emphasis>Help</emphasis> buttons for further details "
 "about the particular step."
 msgstr ""
 
 #. type: Content of: <section><section><caution><para>
-#: en/installer.xml:62
+#: en/installer.xml:64
 msgid ""
 "If at some point during the install you decide to abort the installation, it "
 "is possible to reboot, but please think twice before you do this. Once a "
@@ -1840,7 +1869,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><caution><para>
-#: en/installer.xml:68
+#: en/installer.xml:70
 msgid ""
 "If, in spite of this, you are very sure rebooting is what you want, go to a "
 "text terminal by pressing the keys <keycombo> <keycap>Ctrl</keycap> "
@@ -1850,12 +1879,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:86
+#: en/installer.xml:88
 msgid "Installation Welcome Screen"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:88
+#: en/installer.xml:90
 msgid ""
 "The particular screen that you will first see when booting from the "
 "Installation media will depend on whether your computer motherboard is of "
@@ -1863,60 +1892,60 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:92
+#: en/installer.xml:94
 msgid ""
 "The welcome menu screen has various options, however the default option will "
 "start the installer, and is normally all that you will need."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:97
+#: en/installer.xml:99
 msgid "Legacy (BIOS) Systems"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:100
+#: en/installer.xml:102
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome.png\"/> </"
 "imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:111
+#: en/installer.xml:113
 msgid ""
 "Install Mageia to a hard disk. This is the default option, and will "
 "automatically start after a short while unless another option is selected."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:117
+#: en/installer.xml:119
 msgid "<emphasis role=\"bold\">Rescue System</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:119
+#: en/installer.xml:121
 msgid ""
 "This option allows you to either re-install the bootloader for an existing "
 "Mageia installation or you can use it to restore a Windows bootloader."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:132
+#: en/installer.xml:134
 msgid "<emphasis role=\"bold\">F2: Language</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:134
+#: en/installer.xml:136
 msgid "Press F2 for alternative languages."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:140
+#: en/installer.xml:142
 msgid "UEFI Systems"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:142
+#: en/installer.xml:144
 msgid ""
 "From this screen, you can access options by pressing <keycap>e</keycap> to "
 "enter the edit mode. To come back to this screen, press <keycap>Esc</keycap> "
@@ -1924,19 +1953,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:148
+#: en/installer.xml:150
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome2.png\"/> </"
 "imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:157
+#: en/installer.xml:159
 msgid "<emphasis role=\"bold\">Install:</emphasis> Start the Install process"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:162
+#: en/installer.xml:164
 msgid ""
 "<emphasis role=\"bold\">Rescue:</emphasis> This option allows you to either "
 "re-install the bootloader for an existing Mageia installation or you can use "
@@ -1944,31 +1973,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:169
+#: en/installer.xml:171
 msgid ""
 "<emphasis role=\"bold\">F2: Language:</emphasis> Press <keycap>F2</keycap> "
 "for alternative languages."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:174
+#: en/installer.xml:176
 msgid ""
 "If you booted from a USB stick, you will see the above options duplicated, "
 "and in this case, you should use the set that will be suffixed with \"USB\"."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:181
+#: en/installer.xml:183
 msgid "Installation Problems and Possible Solutions"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:184
+#: en/installer.xml:186
 msgid "No Graphical Interface"
 msgstr "Nincs grafikus felület"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:188
+#: en/installer.xml:190
 msgid ""
 "After the initial screen you did not progress to the <emphasis>Language "
 "Selection</emphasis> screen. This can happen with some graphic cards and "
@@ -1977,7 +2006,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:195
+#: en/installer.xml:197
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
 "In this case it is worth trying a text-mode installation. To use this press "
@@ -1988,12 +2017,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:208
+#: en/installer.xml:210
 msgid "The Install Freezes"
 msgstr "A telepítés lefagy"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:210
+#: en/installer.xml:212
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic hardware "
@@ -2003,12 +2032,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:218
+#: en/installer.xml:220
 msgid "RAM problem"
 msgstr "RAM hiba"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:220
+#: en/installer.xml:222
 msgid ""
 "This will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
@@ -2018,12 +2047,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:228
+#: en/installer.xml:230
 msgid "Dynamic partitions"
 msgstr "Dinamikus partíciók"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:230
+#: en/installer.xml:232
 msgid ""
 "If you converted your hard disk from <literal>Basic</literal> format to "
 "<literal>Dynamic</literal> format in Microsoft Windows, then it is not "
@@ -3618,73 +3647,106 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:27
+#: en/setupBootloader.xml:32
 msgid "Bootloader"
 msgstr "Rendszerbetöltő"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:31
+#: en/setupBootloader.xml:36
+#, fuzzy
+msgid "Available Bootloaders"
+msgstr "Rendszerbetöltő"
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:39
 msgid "Grub2"
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><title>
-#: en/setupBootloader.xml:34
-msgid "Grub2 on Legacy MBR/GPT systems"
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:42
+msgid "<emphasis role=\"bold\">Grub2 on Legacy MBR/GPT systems</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:37
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:46
 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:42
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:52
 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:49
-msgid "Grub2-efi on UEFI systems"
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:59
+msgid "<emphasis role=\"bold\">Grub2-efi on UEFI systems</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:52
-msgid "GRUB2-efi will be used exclusively as the bootloader for a UEFI system."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:63
+msgid "GRUB2-efi or rEFInd may be used as the bootloader for a UEFI system."
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:57
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:68
 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:60
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:71
 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 "
-"created by Windows and add grub2-efi to it. If no ESP exists, then one will "
+"created by Windows and add grub2-efi to it.  If no ESP exists, then one will "
 "be created. Although it is possible to have several ESPs, only one is "
 "required, whatever the number of operating systems you have."
 msgstr ""
 
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:82
+msgid "rEFInd"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:85
+msgid "<emphasis role=\"bold\">rEFInd on UEFI systems</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:88
+msgid ""
+"rEFInd has a nice graphical set of options, and can auto-detect installed "
+"EFI bootloaders. See: http://www.rodsbooks.com/refind/"
+msgstr ""
+
+#. type: Content of: <section><section><section><note><para>
+#: en/setupBootloader.xml:95
+msgid ""
+"Please note that in order to be able to use the <literal>rEFInd</literal> "
+"option, an installed EFI System Partition must match your system "
+"architecture: if you have a 32bit EFI System Partition installed on a 64bit "
+"machine for instance, then the rEFInd option will not be displayed/available "
+"to you."
+msgstr ""
+
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:72
+#: en/setupBootloader.xml:106
 msgid "Bootloader Setup"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:76
+#: en/setupBootloader.xml:110
 msgid "Bootloader main options"
 msgstr "Rendszerindítási beállítások"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:79
+#: en/setupBootloader.xml:113
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader.png\"/> </imageobject> <imageobject condition=\"live"
@@ -3693,47 +3755,69 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:91
+#: en/setupBootloader.xml:125
 msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:93
+#. type: Content of: <section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:129
+msgid ""
+"<guimenuitem>GRUB2</guimenuitem> (with either a graphical or a text menu), "
+"can be chosen for both <literal>Legacy MBR/BIOS</literal> systems and "
+"<literal>UEFI</literal> systems."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:136
 msgid ""
-"This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI "
-"systems will not see this option here."
+"<guimenuitem>rEFInd</guimenuitem> (with a graphical menu)  is an alternative "
+"option solely for use with <literal>UEFI</literal> systems."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:98
+#: en/setupBootloader.xml:144
 msgid "<emphasis role=\"bold\">Boot device</emphasis>"
 msgstr ""
 
+#. type: Content of: <section><section><section><itemizedlist><listitem><warning><para>
+#: en/setupBootloader.xml:147
+msgid "Don't change this unless you really know what you are doing."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><note><para>
+#: en/setupBootloader.xml:152
+msgid ""
+"There is no option to write GRUB to the boot sector of a partition (e.g: "
+"<filename>sda1</filename>), as this method is considered unreliable."
+msgstr ""
+
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:100
-msgid "Don't change this unless you really know what you are doing"
+#: en/setupBootloader.xml:157
+msgid ""
+"When using UEFI mode, then the <guilabel>Boot device</guilabel> will be "
+"listed as <guimenuitem>EFI System Partition</guimenuitem>."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:105
+#: en/setupBootloader.xml:163
 msgid ""
 "<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:108
+#: en/setupBootloader.xml:166
 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:113
+#: en/setupBootloader.xml:171
 msgid "<emphasis role=\"bold\">Security</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:115
+#: en/setupBootloader.xml:173
 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 "
@@ -3743,34 +3827,34 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:126
+#: en/setupBootloader.xml:184
 msgid "Choose a password for the bootloader (optional)"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:130
+#: en/setupBootloader.xml:188
 msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:132
+#: en/setupBootloader.xml:190
 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:137 en/setupBootloader.xml:212
+#: en/setupBootloader.xml:195 en/setupBootloader.xml:308
 msgid "<emphasis>Advanced</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:141
+#: en/setupBootloader.xml:199
 msgid "<emphasis>Enable ACPI</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:143
+#: en/setupBootloader.xml:201
 msgid ""
 "ACPI (Advanced Configuration and Power Interface) is a standard for power "
 "management. It can save energy by stopping unused devices. Deselecting it "
@@ -3780,24 +3864,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:152
+#: en/setupBootloader.xml:210
 msgid "<emphasis>Enable SMP</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:154
+#: en/setupBootloader.xml:212
 msgid ""
 "This option enables/disables symmetric multiprocessing for multi-core "
 "processors"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:159
+#: en/setupBootloader.xml:217
 msgid "<emphasis>Enable APIC</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:161
+#: en/setupBootloader.xml:219
 msgid ""
 "Enabling this gives the operating system access to the Advanced Programmable "
 "Interrupt Controller. APIC devices permit more complex priority models, and "
@@ -3805,24 +3889,82 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:168
+#: en/setupBootloader.xml:226
 msgid "<emphasis>Enable Local APIC</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:170
+#: en/setupBootloader.xml:228
 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:177
+#: en/setupBootloader.xml:235
 msgid "Bootloader Configuration"
 msgstr "Rendszerindító beállítása"
 
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:237
+msgid ""
+"If, in the previous section you selected <literal>rEFInd</literal> as the "
+"bootloader to use, you would then be presented with the options shown in the "
+"screenshot directly below. Otherwise, please instead move on to the "
+"subsequent screenshot for your options."
+msgstr ""
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:243
+#, fuzzy
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"rEFIndLoaderConfig.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-rEFIndLoaderConfig.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:253
+#, fuzzy
+msgid "Your rEFInd configuration options:"
+msgstr "Hang beállítása"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:256
+msgid ""
+"<guimenuitem>Install or update rEFInd in the EFI system partition.</"
+"guimenuitem>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:261
+msgid ""
+"<guimenuitem>Install in EFI/Boot partition (workaround for some BIOS's).</"
+"guimenuitem>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:264
+msgid ""
+"With some BIOS's, the newly written bootloaser for Mageia at end of the "
+"installation will not be recognized. In that case, you can use this option "
+"as a workaround for the issue."
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:270
+msgid ""
+"If you did not select rEFInd as the bootloader to use in the previous "
+"section, then your bootloader configurations are shown below:"
+msgstr ""
+
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:180
+#: en/setupBootloader.xml:275
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -3831,42 +3973,42 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:191
+#: en/setupBootloader.xml:286
 msgid "<emphasis role=\"bold\">Default</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:193
+#: en/setupBootloader.xml:288
 msgid "The operating system to be started up by default."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:197
+#: en/setupBootloader.xml:292
 msgid "<emphasis role=\"bold\">Append</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:199
+#: en/setupBootloader.xml:294
 msgid ""
 "This option lets you pass information to the kernel 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:204
+#: en/setupBootloader.xml:299
 msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:206
+#: en/setupBootloader.xml:301
 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, "
-"then untick the Probe Foreign OS option."
+"then untick the <guimenuitem>Probe Foreign OS</guimenuitem> option."
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:215
+#: en/setupBootloader.xml:311
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader4.png\"/> </imageobject> <imageobject condition=\"live"
@@ -3875,12 +4017,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:226
+#: en/setupBootloader.xml:322
 msgid "<emphasis>Video mode</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:228
+#: en/setupBootloader.xml:324
 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 "
@@ -3888,38 +4030,47 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:234
+#: en/setupBootloader.xml:330
 msgid "<emphasis>Do not touch ESP or MBR</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:236
+#: en/setupBootloader.xml:332
 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 "
-"missing. Click<emphasis> Ok</emphasis> if you are sure you understand the "
-"implications, and wish to proceed."
+"missing. Click <guimenuitem>Ok </guimenuitem>only if you are sure you "
+"understand the implications, and wish to proceed."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><warning><para>
+#: en/setupBootloader.xml:338
+msgid ""
+"Chain-loading via legacy bootloaders (GRUB Legacy and LiLo)  is no longer "
+"supported by Mageia as it is likely to fail when attempting to boot this "
+"resulting installation of Mageia. If you use anything other than GRUB2 or "
+"rEFInd for this purpose, then you do so at your own risk!"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:245
+#: en/setupBootloader.xml:348
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png"
 "\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:253
+#: en/setupBootloader.xml:356
 msgid "Other Options"
 msgstr "Egyéb beállítások"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:256
+#: en/setupBootloader.xml:359
 msgid "Using an existing bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:258
+#: en/setupBootloader.xml:361
 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 "
@@ -3929,12 +4080,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:267
+#: en/setupBootloader.xml:370
 msgid "Installing Without a Bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:269
+#: en/setupBootloader.xml:372
 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 "
diff --git a/docs/docs/stable/installer/id.po b/docs/docs/stable/installer/id.po
index 445752c5..ebb66d9f 100644
--- a/docs/docs/stable/installer/id.po
+++ b/docs/docs/stable/installer/id.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2019-01-19 21:23+0200\n"
+"POT-Creation-Date: 2019-09-08 15:26+0300\n"
 "PO-Revision-Date: 2019-01-19 19:25+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Indonesian (http://www.transifex.com/MageiaLinux/mageia/"
@@ -142,7 +142,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/addUser.xml:3
+#: en/addUser.xml:9
 msgid "User Management"
 msgstr ""
 
@@ -152,46 +152,57 @@ msgstr ""
 #. 2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
 #.   Also changed 'Advanced User Management' to 'User Management (advanced)'.
 #. 2018/02/24 apb: Changed list style.
+#. 2019/08/10 apb: Added missing 'condition' profile for live-user1.png.
+#. 2019/08/11 apb: [1] Reword 1.1 (including Note) [2] Reword 1.2 Password text.
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:12
+#: en/addUser.xml:28
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
-"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
-"\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata format="
-"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-setRootPassword.png\" format=\"PNG\" revision=\"1\" xml:id="
+"\"setRootPassword-im1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-user1.png\" format=\"PNG\"/> </imageobject>"
 msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
+"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:21
+#: en/addUser.xml:40
 msgid "Set Administrator (root)  Password:"
 msgstr "Atur Sandi Administrator (root):"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:24
+#: en/addUser.xml:44
 msgid ""
 "It is advisable for all Mageia installations to set a <literal>superuser</"
 "literal> (Administrator) password, usually called the <emphasis>root </"
-"emphasis>password in Linux. As you type a password into the top box a shield "
-"will change from red-to-yellow-to-green depending on the strength of the "
-"password. A green shield shows you are using a strong password. You need to "
-"repeat the same password in the box underneath, to check that the first "
-"entry was not mistyped."
+"emphasis>password in Linux. You need to repeat the same password in the box "
+"underneath, to check that the first entry was not mistyped."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:32
+#: en/addUser.xml:51
+msgid ""
+"As you type a password into the top box a shield will change from red-to-"
+"yellow-to-green depending on the strength of the password. A green shield "
+"shows you are using a strong password."
+msgstr ""
+
+#. type: Content of: <section><section><note><para>
+#: en/addUser.xml:55
 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:39
+#: en/addUser.xml:63
 msgid "Enter a user"
 msgstr "Masukkan pengguna"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:41
+#: en/addUser.xml:66
 msgid ""
 "Add a User here. A regular user has fewer privileges than the "
 "<literal>superuser</literal> (root), but enough to use the Internet, office "
@@ -200,39 +211,39 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:47
+#: en/addUser.xml:73
 msgid "<emphasis role=\"bold\">Icon</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:48
+#: en/addUser.xml:75
 msgid "Click on this button if you want to change the user's icon"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:52
+#: en/addUser.xml:80
 msgid "<emphasis role=\"bold\">Real Name</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:53
+#: en/addUser.xml:82
 msgid "Insert the user's real name into this text box"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:56
+#: en/addUser.xml:86
 msgid "<emphasis role=\"bold\">Login Name</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:57
+#: en/addUser.xml:88
 msgid ""
 "Enter the user login name or let DrakX use a version of the user's real "
 "name. <emphasis role=\"bold\">The login name is case-sensitive.</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><caution><simpara>
-#: en/addUser.xml:61
+#: en/addUser.xml:93
 msgid ""
 "The login entered here should be different to any login currently in use for "
 "your <filename>/home</filename> directory. Some user parameters will be "
@@ -241,34 +252,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:65 en/setupBootloader.xml:124
+#: en/addUser.xml:102 en/setupBootloader.xml:182
 msgid "<emphasis role=\"bold\">Password</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:66
-msgid ""
-"Type in the user password. There is a shield at the end of the text box that "
-"indicates the strength of the password. (See also <xref linkend="
-"\"givePassword\"/>)"
+#: en/addUser.xml:104
+msgid "Type in the user password (remembering the advice in the Note above)."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:68
+#: en/addUser.xml:107
 msgid ""
 "<emphasis role=\"bold\">Password (again):</emphasis> Retype the user "
 "password. DrakX will check that you have not mistyped the password."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:74
+#: en/addUser.xml:114
 msgid ""
 "Any users added while installing Mageia, will have a home directory that is "
 "both read and write protected (umask=0027)"
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:76
+#: en/addUser.xml:117
 msgid ""
 "You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
@@ -276,24 +284,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:79
+#: en/addUser.xml:121
 msgid "The access permissions can also be changed after the install."
 msgstr "Perizinan hak akses juga bisa diubah setelah instalasi."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:85
+#: en/addUser.xml:128
 msgid "User Management (advanced)"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:87
+#: en/addUser.xml:131
 msgid ""
 "The <emphasis>Advanced</emphasis> option allows you to edit further settings "
 "for the user you are adding."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:91
+#: en/addUser.xml:136
 msgid ""
 "<emphasis>Shell</emphasis>: This drop-down list allows you to change the "
 "shell available to any user you added in the previous screen. Options are "
@@ -301,7 +309,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:143
 msgid ""
 "<emphasis>User ID</emphasis>: Here you can set the user ID for any user you "
 "added in the previous screen. If you are unsure what the purpose of this is, "
@@ -309,7 +317,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:102
+#: en/addUser.xml:149
 msgid ""
 "<emphasis>Group ID</emphasis>: This lets you set the group ID.  Again, if "
 "unsure, leave it blank."
@@ -429,24 +437,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:23
+#: en/bootLive.xml:10
 msgid "Boot Mageia as Live system"
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:28
+#: en/bootLive.xml:14
 msgid "Booting the medium"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:31
+#: en/bootLive.xml:16
 msgid ""
 "You can boot directly from a Live DVD or USB. Usually, you just need to plug "
 "the USB device in or place the DVD in the drive and restart the computer."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:35
+#: en/bootLive.xml:19
 msgid ""
 "If the computer does not automatically boot from the USB or DVD you may need "
 "to reconfigure your BIOS Boot Disk priority. Alternatively, you might try "
@@ -455,7 +463,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><tip><para>
-#: en/bootLive.xml:41
+#: en/bootLive.xml:24
 msgid ""
 "To access the BIOS or boot menu when the computer is starting, you can try "
 "pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or <keycap>Esc</"
@@ -465,7 +473,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/bootLive.xml:50
+#: en/bootLive.xml:32
 msgid ""
 "The actual screen that you will first see when booting from the Live media "
 "will depend on whether your computer motherboard is of the Legacy (BIOS) or "
@@ -473,91 +481,93 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:58
+#: en/bootLive.xml:39
 msgid "In BIOS/CSM/Legacy mode"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:62
+#: en/bootLive.xml:42
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"../live-bootCSM.png\" align=\"center\"/> "
+"</imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:67
+#: en/bootLive.xml:46
 msgid "First screen while booting in BIOS mode"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><title>
-#: en/bootLive.xml:72 en/bootLive.xml:144 en/installer.xml:106
-#: en/installer.xml:154
+#: en/bootLive.xml:50 en/bootLive.xml:104 en/installer.xml:108
+#: en/installer.xml:156
 msgid "Menu"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:75 en/bootLive.xml:147
+#: en/bootLive.xml:52 en/bootLive.xml:106
 msgid "<emphasis role=\"bold\">Boot Mageia</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:77
+#: en/bootLive.xml:53
 msgid ""
 "This option will boot the Mageia Live system from the connected DVD/USB "
 "media (expect a very slow system compared to an installed OS)."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:81
+#: en/bootLive.xml:56
 msgid "Once the boot is done, you can proceed to the installation."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:86 en/bootLive.xml:102
+#: en/bootLive.xml:60 en/bootLive.xml:72
 msgid ""
 "<emphasis role=\"bold\">+ use non-free video drivers (slower to boot)</"
 "emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:89
+#: en/bootLive.xml:62
 msgid "Boot the Mageia Live system using non-free video drivers"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:96 en/bootLive.xml:155 en/installer.xml:109
+#: en/bootLive.xml:68 en/bootLive.xml:112 en/installer.xml:111
 msgid "<emphasis role=\"bold\">Install Mageia</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:98 en/bootLive.xml:157
+#: en/bootLive.xml:69 en/bootLive.xml:113
 msgid "This option will install Mageia to a hard disk."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:105
+#: en/bootLive.xml:74
 msgid "Install Mageia using non-free video drivers"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:111 en/installer.xml:125
+#: en/bootLive.xml:79 en/installer.xml:127
 msgid "<emphasis role=\"bold\">Memory Test</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:113 en/installer.xml:127
+#: en/bootLive.xml:80 en/installer.xml:129
 msgid ""
 "Test the installed RAM by performing multiple read and write operations. "
 "Reboot to end the test."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:118 en/bootLive.xml:161
+#: en/bootLive.xml:84 en/bootLive.xml:116
 msgid "<emphasis role=\"bold\"> F2 Language</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:120 en/bootLive.xml:163
+#: en/bootLive.xml:85 en/bootLive.xml:117
 msgid ""
 "Press <keycap>F2</keycap> to have the installer use a specific language "
 "during the installation. Use the arrow keys to select the language then "
@@ -565,24 +575,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:129
+#: en/bootLive.xml:93
 msgid "In UEFI mode"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:133
+#: en/bootLive.xml:96
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
+"> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:139
+#: en/bootLive.xml:100
 msgid "First screen while booting in UEFI mode"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:149
+#: en/bootLive.xml:107
 msgid ""
 "This option will boot the Mageia Live system from the connected DVD/USB "
 "media (expect a very slow system compared to an installed OS).  Once the "
@@ -590,7 +603,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/bootLive.xml:170
+#: en/bootLive.xml:123
 msgid ""
 "If you booted from a USB stick, you will see the above menu options "
 "duplicated, and in this case, you should choose from the menu pair that will "
@@ -809,12 +822,12 @@ msgstr ""
 "semua diatur ke waktu lokal, atau semua ke UTC/GMT."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:24
+#: en/configureX_card_list.xml:27
 msgid "Choose an X Server (Configure your Graphic Card)"
 msgstr "Pilih Server X (Konfigurasi Perangkat Grafis Anda)"
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_card_list.xml:29
+#: en/configureX_card_list.xml:32
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_card_list."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_card_list-im1\"/> </"
@@ -822,7 +835,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:35
+#: en/configureX_card_list.xml:38
 msgid ""
 "DrakX has a very comprehensive database of video cards and will usually "
 "correctly identify your video device."
@@ -831,7 +844,7 @@ msgstr ""
 "mengidentifikasi perangkat video Anda dengan benar."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:38
+#: en/configureX_card_list.xml:41
 msgid ""
 "If the installer has not correctly detected your graphic card and you know "
 "which one you have, you can select it from the tree by:"
@@ -840,22 +853,22 @@ msgstr ""
 "mengetahui mana yang Anda punya, Anda bisa memilihnya dari pohon dengan:"
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_card_list.xml:41 en/configureX_monitor.xml:74
+#: en/configureX_card_list.xml:44 en/configureX_monitor.xml:78
 msgid "Vendor"
 msgstr "Vendor"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:45
+#: en/configureX_card_list.xml:48
 msgid "then the make of your card"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:49
+#: en/configureX_card_list.xml:52
 msgid "and the model of card"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:53
+#: en/configureX_card_list.xml:56
 msgid ""
 "If you cannot find your card in the vendor lists (because it's not yet in "
 "the database or it's an older card) you may find a suitable driver in the "
@@ -866,14 +879,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><caution><para>
-#: en/configureX_card_list.xml:61
+#: en/configureX_card_list.xml:64
 msgid ""
 "Be aware that if you select an incompatible driver you may only have access "
 "to the <emphasis>Command Line Interface</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:65
+#: en/configureX_card_list.xml:68
 msgid ""
 "Some video card manufacturers provide proprietary drivers for Linux which "
 "may only be available in the <emphasis>Nonfree</emphasis> repository and in "
@@ -884,17 +897,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:11
-msgid "Graphic Card and Monitor Configuration"
+#: en/configureX_chooser.xml:23
+#, fuzzy
+msgid "Graphics Card and Monitor Configuration"
 msgstr "Konfigurasi Perangkat Grafis dan Monitor"
 
-#.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
-#. 2018/02/15 apb: Some text and typography.
-#. 2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.
-#. 2018/02/23 apb: Typo.
-#. 2019/01/06 apb: Slight reword, split 1st para in two.
 #. type: Content of: <section><mediaobject>
-#: en/configureX_chooser.xml:26
+#: en/configureX_chooser.xml:28
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_chooser."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_chooser-im1\"/> </"
@@ -902,7 +911,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:32
+#: en/configureX_chooser.xml:34
 msgid ""
 "No matter which graphical environment (also known as desktop environment) "
 "you chose for this install of Mageia, they are all based on a graphical user "
@@ -913,31 +922,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:39
+#: en/configureX_chooser.xml:41
 msgid ""
 "Choose the appropriate settings manually if you think the details are "
 "incorrect, or if none are shown."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:44
-msgid "<emphasis role=\"bold\">Graphic Card</emphasis>"
+#: en/configureX_chooser.xml:46
+msgid "<emphasis role=\"bold\">Graphics Card</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:47
+#: en/configureX_chooser.xml:49
 msgid ""
 "If you need to, you can select a specific card from this expandable list. "
 "See <xref linkend=\"configureX_card_list\"/>."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:52
+#: en/configureX_chooser.xml:54
 msgid "<emphasis role=\"bold\">Monitor</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:55
+#: en/configureX_chooser.xml:57
 msgid ""
 "You can choose Plug 'n Play, if applicable, or choose your monitor from the "
 "<emphasis>Vendor</emphasis> or <emphasis>Generic</emphasis> lists. Choose "
@@ -947,22 +956,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:63
+#: en/configureX_chooser.xml:65
 msgid "<emphasis role=\"bold\">Resolution</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:66
+#: en/configureX_chooser.xml:68
 msgid "The resolution and color depth of your monitor can be set here."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:71
+#: en/configureX_chooser.xml:73
 msgid "<emphasis role=\"bold\">Test</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:74
+#: en/configureX_chooser.xml:76
 msgid ""
 "The test button does not always appear during install. If the option is "
 "there, and you test your settings, you should be asked to confirm that your "
@@ -974,17 +983,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:85
+#: en/configureX_chooser.xml:87
 msgid "<emphasis role=\"bold\">Options</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:88
+#: en/configureX_chooser.xml:90
 msgid "Here you can choose to enable or disable various options."
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_chooser.xml:93
+#: en/configureX_chooser.xml:95
 msgid ""
 "There is a risk of damaging a monitor if you choose refresh rates that are "
 "outside the frequency range of that monitor. This applies to older CRT "
@@ -993,12 +1002,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_monitor.xml:22
+#: en/configureX_monitor.xml:26
 msgid "Choosing your Monitor"
 msgstr "Pemilihan Monitor"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:25
+#: en/configureX_monitor.xml:29
 msgid ""
 "DrakX has a very comprehensive database of monitors and will usually "
 "correctly identify yours."
@@ -1007,7 +1016,7 @@ msgstr ""
 "monitor Anda dengan tepat."
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:30
+#: en/configureX_monitor.xml:34
 msgid ""
 "<emphasis role=\"bold\">Selecting a monitor with different characteristics "
 "could damage your monitor or video hardware. Please don't try something "
@@ -1016,7 +1025,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:38
+#: en/configureX_monitor.xml:42
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
@@ -1027,12 +1036,12 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:46
+#: en/configureX_monitor.xml:50
 msgid "Custom"
 msgstr "Sesuaian"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:49
+#: en/configureX_monitor.xml:53
 msgid ""
 "This option allows you to set two critical parameters: the vertical refresh "
 "rate and the horizontal sync rate. Vertical refresh determines how often the "
@@ -1041,7 +1050,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:55
+#: en/configureX_monitor.xml:59
 msgid ""
 "It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor "
 "type with a sync range that is beyond the capabilities of your monitor: you "
@@ -1054,59 +1063,60 @@ msgstr ""
 "miliki."
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:64
+#: en/configureX_monitor.xml:68
 msgid "Plug'n Play"
 msgstr "Plug'n Play"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:67
+#: en/configureX_monitor.xml:71
 msgid ""
 "This is the default option and automatically tries to determine the monitor "
 "type from the monitor database."
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:77
+#: en/configureX_monitor.xml:81
+#, fuzzy
 msgid ""
 "If the installer has not correctly detected your monitor and you know which "
-"one you have, you can select it from the tree by selecting:"
+"one you have, you can choose it from the options by selecting:"
 msgstr ""
 "Jika installer tidak mendeteksi monitor Anda dengan benar dan Anda "
 "mengetahui jenis monitor yang Anda miliki, Anda bisa memilihnya dari pohon "
 "dengan memilih:"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:86
+#: en/configureX_monitor.xml:90
 msgid "Manufacturer"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:90
+#: en/configureX_monitor.xml:94
 msgid "Monitor model"
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:96
+#: en/configureX_monitor.xml:100
 msgid "Generic"
 msgstr "Generik"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:99
+#: en/configureX_monitor.xml:103
 msgid ""
-"Selecting this group will list nearly 30 display configurations such as "
-"1024x768 @ 60Hz and includes flat-panel displays as used in laptops. This is "
-"often a good monitor selection group if you need to use the VESA card driver "
-"when your video hardware cannot be determined automatically.  Once again it "
-"may be wise to be conservative in your selections."
+"Selecting this group will list approximately 30 display configurations such "
+"as 1024x768 @ 60Hz and includes flat-panel displays as used in laptops.  "
+"This is often a good monitor selection group if you need to use the VESA "
+"card driver when your video hardware cannot be determined automatically. "
+"Once again, it may be wise to be conservative in your selections."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:22
+#: en/diskdrake.xml:24
 msgid "Custom Disk Partitioning with DiskDrake"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:27
+#: en/diskdrake.xml:29
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-diskdrake.png\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1114,7 +1124,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:38
+#: en/diskdrake.xml:40
 msgid ""
 "Modify the layout of your disk(s) here. You can remove or create partitions, "
 "change the filesystem or size of a partition and even view their details "
@@ -1122,15 +1132,15 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:47
 msgid ""
 "There is a tab at the top for every detected hard disk (or other storage "
-"device, like a USB key). In the screenshot above there are two available "
-"devices: <filename>sda </filename>and <filename>sdb</filename>."
+"device, like a USB key), for example: <filename>sda</filename>, "
+"<filename>sdb</filename>, <filename>sdc</filename> etc."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:52
+#: en/diskdrake.xml:54
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it. "
@@ -1139,21 +1149,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:60
+#: en/diskdrake.xml:62
 msgid ""
 "Continue until you have adjusted everything to your satisfaction, then click "
 "<emphasis>Done</emphasis> when you're ready."
 msgstr ""
 
 #. type: Content of: <section><warning><orderedlist><listitem><para>
-#: en/diskdrake.xml:69
+#: en/diskdrake.xml:71
 msgid ""
 "Take care with the <emphasis>Clear all</emphasis> option, use it only if you "
 "are sure you want to wipe all partitions on the selected storage device."
 msgstr ""
 
 #. type: Content of: <section><warning><orderedlist><listitem><para>
-#: en/diskdrake.xml:75
+#: en/diskdrake.xml:77
 msgid ""
 "If you wish to use encryption on your <filename>/</filename> partition you "
 "must ensure that you have a separate <filename>/boot</filename> partition. "
@@ -1162,7 +1172,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/diskdrake.xml:87
+#: en/diskdrake.xml:89
 msgid ""
 "If you are installing Mageia on a UEFI system, check that an ESP (EFI System "
 "Partition) is present and correctly mounted on <filename>/boot/EFI</"
@@ -1170,19 +1180,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/diskdrake.xml:93
+#: en/diskdrake.xml:95
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
 "partition is present and of the correct type. See Figure 2 below."
 msgstr ""
 
 #. type: Content of: <section><figure><title>
-#: en/diskdrake.xml:101
+#: en/diskdrake.xml:103
 msgid "EFI System Partition"
 msgstr "Sistem Partisi EFI"
 
 #. type: Content of: <section><figure><mediaobject>
-#: en/diskdrake.xml:104
+#: en/diskdrake.xml:106
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-diskdrake2.png\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1190,17 +1200,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><figure>
-#: en/diskdrake.xml:103 en/diskdrake.xml:117
+#: en/diskdrake.xml:105 en/diskdrake.xml:119
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><figure><title>
-#: en/diskdrake.xml:115
+#: en/diskdrake.xml:117
 msgid "BIOS boot partition"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:118 en/doPartitionDisks.xml:201
+#: en/diskdrake.xml:120 en/doPartitionDisks.xml:206
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1219,26 +1229,26 @@ msgid "Partitioning"
 msgstr "Pemartisian"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:31
 msgid "Suggested Partitioning"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:34
 msgid ""
 "In this screen you can see the content of your hard drive(s) along with the "
 "DrakX partitioning proposals for where to install Mageia."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:34
+#: en/doPartitionDisks.xml:38
 msgid ""
 "The actual options available from those shown below will vary according to "
 "the layout and content of your particular hard drive(s)."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:39
+#: en/doPartitionDisks.xml:43
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1247,17 +1257,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><title>
-#: en/doPartitionDisks.xml:49
+#: en/doPartitionDisks.xml:53
 msgid "Main Options"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:56
 msgid "<emphasis role=\"bold\">Use Existing Partitions</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:59
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1266,12 +1276,12 @@ msgstr ""
 "ditemukan dan mungkin bisa digunakan untuk instalasi."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:61
+#: en/doPartitionDisks.xml:65
 msgid "<emphasis role=\"bold\">Use Free Space</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:68
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1280,57 +1290,54 @@ msgstr ""
 "ini akan menggunakannya untuk menginstall Mageia."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:70
+#: en/doPartitionDisks.xml:74
 msgid ""
 "<emphasis role=\"bold\">Use Free Space on a Windows Partition</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:73
+#: en/doPartitionDisks.xml:77
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it. 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 important files!"
+"installation but see the warning below."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para><mediaobject>
+#: en/doPartitionDisks.xml:87
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:79
+#: en/doPartitionDisks.xml:82
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
 "light blue and the proposed Mageia partition in dark blue with their "
 "intended sizes just underneath. You have the option to modify these sizes by "
 "clicking and dragging the gap between both partitions.  See the following "
-"screenshot:"
-msgstr ""
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:87
-msgid "<emphasis role=\"bold\">Erase and use Entire Disk</emphasis>"
-msgstr ""
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:90
-msgid "This option will allocate the entire drive for Mageia"
+"screenshot:<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:97
 msgid ""
-"This will erase ALL data on the selected hard drive. Take care! 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 this option."
+"This involves shrinking the size of the Windows partition, and therefore is "
+"a risky operation, so you should make sure you have backed up all important "
+"files before proceeding."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><important><para>
-#: en/doPartitionDisks.xml:101
+#: en/doPartitionDisks.xml:103
+#, fuzzy
 msgid ""
-"Note that this involves shrinking the size of the Windows partition. The "
-"partition must be \"clean\", meaning that Windows must have closed down "
+"The partition must be \"clean\", meaning that Windows must have closed down "
 "correctly the last time it was used. It must also have been defragmented, "
 "although this is not a guarantee that all files in the partition have been "
-"moved out of the area that is about to be used. It is highly recommended to "
-"back up your personal files."
+"moved out of the area that is about to be used for Mageia."
 msgstr ""
 "Perhatikan bahwa ini akan mengurangi ukuran dari partisi Windows. Partisi "
 "harus \"bersih\", maksudnya, Windows harus dimatikan dengan benar saat "
@@ -1340,28 +1347,37 @@ msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/doPartitionDisks.xml:112
-msgid "<emphasis role=\"bold\">Custom Disk Partitioning</emphasis>"
+msgid "<emphasis role=\"bold\">Erase and use Entire Disk</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/doPartitionDisks.xml:115
+msgid "This option will allocate the entire drive for Mageia"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><warning><para>
+#: en/doPartitionDisks.xml:119
 msgid ""
-"This gives you complete control over the placing of the installation on your "
-"hard drive(s)."
+"This will erase ALL data on the selected hard drive. Take care! 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 this option."
 msgstr ""
-"Ini memberi Anda kendali penuh untuk menempatkan instalasi pada harddisk."
 
-#. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:122
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:127
+msgid "<emphasis role=\"bold\">Custom Disk Partitioning</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:130
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
+"This gives you complete control over the placing of the installation on your "
+"hard drive(s)."
 msgstr ""
+"Ini memberi Anda kendali penuh untuk menempatkan instalasi pada harddisk."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:131
+#: en/doPartitionDisks.xml:136
 msgid ""
 "If you are not using the <emphasis>Custom disk partitioning</emphasis> "
 "option, then the installer will allocate the available space according to "
@@ -1369,60 +1385,60 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:137
+#: en/doPartitionDisks.xml:142
 msgid ""
 "If the total available space is less than 50 GB, then only one partition is "
 "created. This will be the <filename>/</filename> (root)  partition."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:143
+#: en/doPartitionDisks.xml:148
 msgid ""
 "If the total available space is greater than 50 GB, then three partitions "
 "are created"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:148
+#: en/doPartitionDisks.xml:153
 msgid ""
 "6/19 of the total available place is allocated to <filename>/</filename> "
 "with a maximum of 50 GB"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:153
+#: en/doPartitionDisks.xml:158
 msgid "1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:158
+#: en/doPartitionDisks.xml:163
 msgid "the rest (at least 12/19) is allocated to <filename>/home</filename>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:165
+#: en/doPartitionDisks.xml:170
 msgid ""
 "This means that from 160 GB or greater available space, the installer will "
 "create three partitions:"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:170
+#: en/doPartitionDisks.xml:175
 msgid "50 GB for <filename>/</filename>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:174
+#: en/doPartitionDisks.xml:179
 msgid "4 GB for <filename>swap</filename>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:178
+#: en/doPartitionDisks.xml:183
 msgid "and the remainder for <filename>/home</filename>"
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:183
+#: en/doPartitionDisks.xml:188
 msgid ""
 "If you are using a UEFI system, the ESP (EFI System Partition) will be "
 "automatically detected - or created if it does not exist yet - and mounted "
@@ -1432,7 +1448,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:189
+#: en/doPartitionDisks.xml:194
 msgid ""
 "If you are using a Legacy (also known as BIOS) system with a GPT partitioned "
 "disk, you need to create a BIOS boot partition if it doesn't already exist. "
@@ -1443,19 +1459,25 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:196
+#: en/doPartitionDisks.xml:201
 msgid "See <xref linkend=\"diskdrake\"/> for information on how to proceed."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:211
+#: en/doPartitionDisks.xml:216
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4.png"
-"\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks4.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks4.png\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
+"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:217
+#: en/doPartitionDisks.xml:226
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
 "previous standard of 512. Due to lack of available hardware, the "
@@ -1464,7 +1486,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:222
+#: en/doPartitionDisks.xml:231
 msgid ""
 "Some SSD devices now use an erase block size over 1 MB. If you have such a "
 "device we suggest that you partition the drive in advance, using an "
@@ -1473,17 +1495,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:229
+#: en/doPartitionDisks.xml:238
 msgid "<emphasis>Align to</emphasis> = MiB"
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:233
+#: en/doPartitionDisks.xml:242
 msgid "<emphasis>Free space preceding (MiB)</emphasis> = 2"
 msgstr ""
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:237
+#: en/doPartitionDisks.xml:246
 msgid ""
 "Also make sure all partitions are created using an even number of megabytes."
 msgstr ""
@@ -1654,12 +1676,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/firewall.xml:7
+#: en/firewall.xml:16
 msgid "Firewall"
 msgstr "Firewall"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:10
+#: en/firewall.xml:19
 msgid ""
 "This section allows you to configure some simple firewall rules: they "
 "determine which type of message from the Internet will be accepted by the "
@@ -1667,8 +1689,17 @@ msgid ""
 "system to be accessible from the Internet."
 msgstr ""
 
+#. type: Content of: <section><mediaobject>
+#: en/firewall.xml:26
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-firewall.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+
 #. type: Content of: <section><para>
-#: en/firewall.xml:16
+#: en/firewall.xml:31
 msgid ""
 "In the default setting (no button is checked), no service of the system is "
 "accessible from the network. The <emphasis>Everything (no firewall)</"
@@ -1681,7 +1712,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:25
+#: en/firewall.xml:40
 msgid ""
 "All other options are more or less self-explanatory. As an example, you will "
 "enable the CUPS server if you want printers on your machine to be accessible "
@@ -1689,12 +1720,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:29
+#: en/firewall.xml:44
 msgid "<emphasis role=\"bold\">Advanced</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:31
+#: en/firewall.xml:46
 msgid ""
 "The <emphasis>Advanced</emphasis> option opens a window where you can enable "
 "a series of services by typing a list of <quote>couples</quote> (blank "
@@ -1702,34 +1733,35 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:35
-msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
+#: en/firewall.xml:50
+msgid "<emphasis>&lt;port-number&gt;/&lt;protocol&gt;</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:38
+#: en/firewall.xml:53
 msgid ""
-"- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
-"the service you want to enable (e.g. 873 for the RSYNC service) as defined "
-"in <emphasis>RFC-433</emphasis>;"
+"- <emphasis>&lt;port-number&gt;</emphasis> is the value of the port assigned "
+"to the service you want to enable (e.g. 873 for the RSYNC service) as "
+"defined in <emphasis>RFC-433</emphasis>;"
 msgstr ""
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:42
+#: en/firewall.xml:57
 msgid ""
-"- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
-"<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
+"- <emphasis>&lt;protocol&gt;</emphasis> is one of <emphasis>TCP</emphasis> "
+"or <emphasis>UDP</emphasis> - the internet protocol that is used by the "
+"service."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:47
+#: en/firewall.xml:62
 msgid ""
 "For instance, the entry for enabling access to the RSYNC service therefore "
 "is <emphasis>873/tcp</emphasis>."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:50
+#: en/firewall.xml:65
 msgid ""
 "In case a service is implemented to use both protocols, you specify 2 "
 "couples for the same port."
@@ -1797,12 +1829,12 @@ msgid "Graphical Configuration"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:32
+#: en/installer.xml:34
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, Installer Mageia"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:35
+#: en/installer.xml:37
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -1813,33 +1845,33 @@ msgstr ""
 "mungkin."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:40
+#: en/installer.xml:42
 msgid "The installation steps"
 msgstr "Langkah-langkah instalasi"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:44
+#: en/installer.xml:46
 msgid ""
 "The install process is divided into a number of steps - the status of which "
 "is indicated in a panel to the left of the screen."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:50
+#: en/installer.xml:52
 msgid ""
 "Each step has one or more screens, which may also have <emphasis>Advanced</"
 "emphasis> sections with extra, less commonly required options."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:56
+#: en/installer.xml:58
 msgid ""
 "Most screens have <emphasis>Help</emphasis> buttons for further details "
 "about the particular step."
 msgstr ""
 
 #. type: Content of: <section><section><caution><para>
-#: en/installer.xml:62
+#: en/installer.xml:64
 msgid ""
 "If at some point during the install you decide to abort the installation, it "
 "is possible to reboot, but please think twice before you do this. Once a "
@@ -1849,7 +1881,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><caution><para>
-#: en/installer.xml:68
+#: en/installer.xml:70
 msgid ""
 "If, in spite of this, you are very sure rebooting is what you want, go to a "
 "text terminal by pressing the keys <keycombo> <keycap>Ctrl</keycap> "
@@ -1859,12 +1891,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:86
+#: en/installer.xml:88
 msgid "Installation Welcome Screen"
 msgstr "Layar Selamat Datang untuk Instalasi"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:88
+#: en/installer.xml:90
 msgid ""
 "The particular screen that you will first see when booting from the "
 "Installation media will depend on whether your computer motherboard is of "
@@ -1872,60 +1904,60 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:92
+#: en/installer.xml:94
 msgid ""
 "The welcome menu screen has various options, however the default option will "
 "start the installer, and is normally all that you will need."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:97
+#: en/installer.xml:99
 msgid "Legacy (BIOS) Systems"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:100
+#: en/installer.xml:102
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome.png\"/> </"
 "imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:111
+#: en/installer.xml:113
 msgid ""
 "Install Mageia to a hard disk. This is the default option, and will "
 "automatically start after a short while unless another option is selected."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:117
+#: en/installer.xml:119
 msgid "<emphasis role=\"bold\">Rescue System</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:119
+#: en/installer.xml:121
 msgid ""
 "This option allows you to either re-install the bootloader for an existing "
 "Mageia installation or you can use it to restore a Windows bootloader."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:132
+#: en/installer.xml:134
 msgid "<emphasis role=\"bold\">F2: Language</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:134
+#: en/installer.xml:136
 msgid "Press F2 for alternative languages."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:140
+#: en/installer.xml:142
 msgid "UEFI Systems"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:142
+#: en/installer.xml:144
 msgid ""
 "From this screen, you can access options by pressing <keycap>e</keycap> to "
 "enter the edit mode. To come back to this screen, press <keycap>Esc</keycap> "
@@ -1933,19 +1965,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:148
+#: en/installer.xml:150
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome2.png\"/> </"
 "imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:157
+#: en/installer.xml:159
 msgid "<emphasis role=\"bold\">Install:</emphasis> Start the Install process"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:162
+#: en/installer.xml:164
 msgid ""
 "<emphasis role=\"bold\">Rescue:</emphasis> This option allows you to either "
 "re-install the bootloader for an existing Mageia installation or you can use "
@@ -1953,31 +1985,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:169
+#: en/installer.xml:171
 msgid ""
 "<emphasis role=\"bold\">F2: Language:</emphasis> Press <keycap>F2</keycap> "
 "for alternative languages."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:174
+#: en/installer.xml:176
 msgid ""
 "If you booted from a USB stick, you will see the above options duplicated, "
 "and in this case, you should use the set that will be suffixed with \"USB\"."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:181
+#: en/installer.xml:183
 msgid "Installation Problems and Possible Solutions"
 msgstr "Masalah Instalasi dan Kemungkinan Solusinya"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:184
+#: en/installer.xml:186
 msgid "No Graphical Interface"
 msgstr "Tidak Ada Antarmuka Grafis"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:188
+#: en/installer.xml:190
 msgid ""
 "After the initial screen you did not progress to the <emphasis>Language "
 "Selection</emphasis> screen. This can happen with some graphic cards and "
@@ -1986,7 +2018,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:195
+#: en/installer.xml:197
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
 "In this case it is worth trying a text-mode installation. To use this press "
@@ -1997,12 +2029,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:208
+#: en/installer.xml:210
 msgid "The Install Freezes"
 msgstr "Instalasi Membeku"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:210
+#: en/installer.xml:212
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic hardware "
@@ -2012,12 +2044,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:218
+#: en/installer.xml:220
 msgid "RAM problem"
 msgstr "Masalah RAM"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:220
+#: en/installer.xml:222
 msgid ""
 "This will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
@@ -2027,12 +2059,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:228
+#: en/installer.xml:230
 msgid "Dynamic partitions"
 msgstr "Partisi dinamis"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:230
+#: en/installer.xml:232
 msgid ""
 "If you converted your hard disk from <literal>Basic</literal> format to "
 "<literal>Dynamic</literal> format in Microsoft Windows, then it is not "
@@ -3644,73 +3676,106 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:27
+#: en/setupBootloader.xml:32
 msgid "Bootloader"
 msgstr "Bootloader"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:31
+#: en/setupBootloader.xml:36
+#, fuzzy
+msgid "Available Bootloaders"
+msgstr "Bootloader"
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:39
 msgid "Grub2"
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><title>
-#: en/setupBootloader.xml:34
-msgid "Grub2 on Legacy MBR/GPT systems"
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:42
+msgid "<emphasis role=\"bold\">Grub2 on Legacy MBR/GPT systems</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:37
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:46
 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:42
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:52
 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:49
-msgid "Grub2-efi on UEFI systems"
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:59
+msgid "<emphasis role=\"bold\">Grub2-efi on UEFI systems</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:52
-msgid "GRUB2-efi will be used exclusively as the bootloader for a UEFI system."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:63
+msgid "GRUB2-efi or rEFInd may be used as the bootloader for a UEFI system."
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:57
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:68
 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:60
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:71
 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 "
-"created by Windows and add grub2-efi to it. If no ESP exists, then one will "
+"created by Windows and add grub2-efi to it.  If no ESP exists, then one will "
 "be created. Although it is possible to have several ESPs, only one is "
 "required, whatever the number of operating systems you have."
 msgstr ""
 
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:82
+msgid "rEFInd"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:85
+msgid "<emphasis role=\"bold\">rEFInd on UEFI systems</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:88
+msgid ""
+"rEFInd has a nice graphical set of options, and can auto-detect installed "
+"EFI bootloaders. See: http://www.rodsbooks.com/refind/"
+msgstr ""
+
+#. type: Content of: <section><section><section><note><para>
+#: en/setupBootloader.xml:95
+msgid ""
+"Please note that in order to be able to use the <literal>rEFInd</literal> "
+"option, an installed EFI System Partition must match your system "
+"architecture: if you have a 32bit EFI System Partition installed on a 64bit "
+"machine for instance, then the rEFInd option will not be displayed/available "
+"to you."
+msgstr ""
+
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:72
+#: en/setupBootloader.xml:106
 msgid "Bootloader Setup"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:76
+#: en/setupBootloader.xml:110
 msgid "Bootloader main options"
 msgstr "Pilihan utama Bootloader"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:79
+#: en/setupBootloader.xml:113
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader.png\"/> </imageobject> <imageobject condition=\"live"
@@ -3719,47 +3784,70 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:91
+#: en/setupBootloader.xml:125
 msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:93
+#. type: Content of: <section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:129
+msgid ""
+"<guimenuitem>GRUB2</guimenuitem> (with either a graphical or a text menu), "
+"can be chosen for both <literal>Legacy MBR/BIOS</literal> systems and "
+"<literal>UEFI</literal> systems."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:136
 msgid ""
-"This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI "
-"systems will not see this option here."
+"<guimenuitem>rEFInd</guimenuitem> (with a graphical menu)  is an alternative "
+"option solely for use with <literal>UEFI</literal> systems."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:98
+#: en/setupBootloader.xml:144
 msgid "<emphasis role=\"bold\">Boot device</emphasis>"
 msgstr ""
 
+#. type: Content of: <section><section><section><itemizedlist><listitem><warning><para>
+#: en/setupBootloader.xml:147
+#, fuzzy
+msgid "Don't change this unless you really know what you are doing."
+msgstr "Hanya ubah sesuatu jika Anda sangat mengetahui hal tersebut."
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><note><para>
+#: en/setupBootloader.xml:152
+msgid ""
+"There is no option to write GRUB to the boot sector of a partition (e.g: "
+"<filename>sda1</filename>), as this method is considered unreliable."
+msgstr ""
+
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:100
-msgid "Don't change this unless you really know what you are doing"
+#: en/setupBootloader.xml:157
+msgid ""
+"When using UEFI mode, then the <guilabel>Boot device</guilabel> will be "
+"listed as <guimenuitem>EFI System Partition</guimenuitem>."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:105
+#: en/setupBootloader.xml:163
 msgid ""
 "<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:108
+#: en/setupBootloader.xml:166
 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:113
+#: en/setupBootloader.xml:171
 msgid "<emphasis role=\"bold\">Security</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:115
+#: en/setupBootloader.xml:173
 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 "
@@ -3769,34 +3857,34 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:126
+#: en/setupBootloader.xml:184
 msgid "Choose a password for the bootloader (optional)"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:130
+#: en/setupBootloader.xml:188
 msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:132
+#: en/setupBootloader.xml:190
 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:137 en/setupBootloader.xml:212
+#: en/setupBootloader.xml:195 en/setupBootloader.xml:308
 msgid "<emphasis>Advanced</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:141
+#: en/setupBootloader.xml:199
 msgid "<emphasis>Enable ACPI</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:143
+#: en/setupBootloader.xml:201
 msgid ""
 "ACPI (Advanced Configuration and Power Interface) is a standard for power "
 "management. It can save energy by stopping unused devices. Deselecting it "
@@ -3806,24 +3894,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:152
+#: en/setupBootloader.xml:210
 msgid "<emphasis>Enable SMP</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:154
+#: en/setupBootloader.xml:212
 msgid ""
 "This option enables/disables symmetric multiprocessing for multi-core "
 "processors"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:159
+#: en/setupBootloader.xml:217
 msgid "<emphasis>Enable APIC</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:161
+#: en/setupBootloader.xml:219
 msgid ""
 "Enabling this gives the operating system access to the Advanced Programmable "
 "Interrupt Controller. APIC devices permit more complex priority models, and "
@@ -3831,24 +3919,77 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:168
+#: en/setupBootloader.xml:226
 msgid "<emphasis>Enable Local APIC</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:170
+#: en/setupBootloader.xml:228
 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:177
+#: en/setupBootloader.xml:235
 msgid "Bootloader Configuration"
 msgstr "Konfigurasi Bootloader"
 
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:237
+msgid ""
+"If, in the previous section you selected <literal>rEFInd</literal> as the "
+"bootloader to use, you would then be presented with the options shown in the "
+"screenshot directly below. Otherwise, please instead move on to the "
+"subsequent screenshot for your options."
+msgstr ""
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:243
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"rEFIndLoaderConfig.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-rEFIndLoaderConfig.png\"/> </"
+"imageobject>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:253
+#, fuzzy
+msgid "Your rEFInd configuration options:"
+msgstr "Konfigurasi Suara"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:256
+msgid ""
+"<guimenuitem>Install or update rEFInd in the EFI system partition.</"
+"guimenuitem>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:261
+msgid ""
+"<guimenuitem>Install in EFI/Boot partition (workaround for some BIOS's).</"
+"guimenuitem>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:264
+msgid ""
+"With some BIOS's, the newly written bootloaser for Mageia at end of the "
+"installation will not be recognized. In that case, you can use this option "
+"as a workaround for the issue."
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:270
+msgid ""
+"If you did not select rEFInd as the bootloader to use in the previous "
+"section, then your bootloader configurations are shown below:"
+msgstr ""
+
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:180
+#: en/setupBootloader.xml:275
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -3857,42 +3998,42 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:191
+#: en/setupBootloader.xml:286
 msgid "<emphasis role=\"bold\">Default</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:193
+#: en/setupBootloader.xml:288
 msgid "The operating system to be started up by default."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:197
+#: en/setupBootloader.xml:292
 msgid "<emphasis role=\"bold\">Append</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:199
+#: en/setupBootloader.xml:294
 msgid ""
 "This option lets you pass information to the kernel 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:204
+#: en/setupBootloader.xml:299
 msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:206
+#: en/setupBootloader.xml:301
 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, "
-"then untick the Probe Foreign OS option."
+"then untick the <guimenuitem>Probe Foreign OS</guimenuitem> option."
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:215
+#: en/setupBootloader.xml:311
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader4.png\"/> </imageobject> <imageobject condition=\"live"
@@ -3901,12 +4042,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:226
+#: en/setupBootloader.xml:322
 msgid "<emphasis>Video mode</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:228
+#: en/setupBootloader.xml:324
 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 "
@@ -3914,38 +4055,47 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:234
+#: en/setupBootloader.xml:330
 msgid "<emphasis>Do not touch ESP or MBR</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:236
+#: en/setupBootloader.xml:332
 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 "
-"missing. Click<emphasis> Ok</emphasis> if you are sure you understand the "
-"implications, and wish to proceed."
+"missing. Click <guimenuitem>Ok </guimenuitem>only if you are sure you "
+"understand the implications, and wish to proceed."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><warning><para>
+#: en/setupBootloader.xml:338
+msgid ""
+"Chain-loading via legacy bootloaders (GRUB Legacy and LiLo)  is no longer "
+"supported by Mageia as it is likely to fail when attempting to boot this "
+"resulting installation of Mageia. If you use anything other than GRUB2 or "
+"rEFInd for this purpose, then you do so at your own risk!"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:245
+#: en/setupBootloader.xml:348
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png"
 "\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:253
+#: en/setupBootloader.xml:356
 msgid "Other Options"
 msgstr "Opsi Lain"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:256
+#: en/setupBootloader.xml:359
 msgid "Using an existing bootloader"
 msgstr "Gunakan bootloader yang ada"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:258
+#: en/setupBootloader.xml:361
 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 "
@@ -3955,12 +4105,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:267
+#: en/setupBootloader.xml:370
 msgid "Installing Without a Bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:269
+#: en/setupBootloader.xml:372
 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 "
diff --git a/docs/docs/stable/installer/it.po b/docs/docs/stable/installer/it.po
index ae5c644d..574ae9bf 100644
--- a/docs/docs/stable/installer/it.po
+++ b/docs/docs/stable/installer/it.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2019-01-19 21:23+0200\n"
+"POT-Creation-Date: 2019-09-08 15:26+0300\n"
 "PO-Revision-Date: 2019-01-19 19:25+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Italian (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -151,7 +151,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/addUser.xml:3
+#: en/addUser.xml:9
 msgid "User Management"
 msgstr ""
 
@@ -161,46 +161,57 @@ msgstr ""
 #. 2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
 #.   Also changed 'Advanced User Management' to 'User Management (advanced)'.
 #. 2018/02/24 apb: Changed list style.
+#. 2019/08/10 apb: Added missing 'condition' profile for live-user1.png.
+#. 2019/08/11 apb: [1] Reword 1.1 (including Note) [2] Reword 1.2 Password text.
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:12
+#: en/addUser.xml:28
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
-"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
-"\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata format="
-"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-setRootPassword.png\" format=\"PNG\" revision=\"1\" xml:id="
+"\"setRootPassword-im1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-user1.png\" format=\"PNG\"/> </imageobject>"
 msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
+"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:21
+#: en/addUser.xml:40
 msgid "Set Administrator (root)  Password:"
 msgstr "Imposta la password dell'amministratore (root):"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:24
+#: en/addUser.xml:44
 msgid ""
 "It is advisable for all Mageia installations to set a <literal>superuser</"
 "literal> (Administrator) password, usually called the <emphasis>root </"
-"emphasis>password in Linux. As you type a password into the top box a shield "
-"will change from red-to-yellow-to-green depending on the strength of the "
-"password. A green shield shows you are using a strong password. You need to "
-"repeat the same password in the box underneath, to check that the first "
-"entry was not mistyped."
+"emphasis>password in Linux. You need to repeat the same password in the box "
+"underneath, to check that the first entry was not mistyped."
+msgstr ""
+
+#. type: Content of: <section><section><note><para>
+#: en/addUser.xml:51
+msgid ""
+"As you type a password into the top box a shield will change from red-to-"
+"yellow-to-green depending on the strength of the password. A green shield "
+"shows you are using a strong password."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:32
+#: en/addUser.xml:55
 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:39
+#: en/addUser.xml:63
 msgid "Enter a user"
 msgstr "Inserisci un utente"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:41
+#: en/addUser.xml:66
 msgid ""
 "Add a User here. A regular user has fewer privileges than the "
 "<literal>superuser</literal> (root), but enough to use the Internet, office "
@@ -209,39 +220,39 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:47
+#: en/addUser.xml:73
 msgid "<emphasis role=\"bold\">Icon</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:48
+#: en/addUser.xml:75
 msgid "Click on this button if you want to change the user's icon"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:52
+#: en/addUser.xml:80
 msgid "<emphasis role=\"bold\">Real Name</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:53
+#: en/addUser.xml:82
 msgid "Insert the user's real name into this text box"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:56
+#: en/addUser.xml:86
 msgid "<emphasis role=\"bold\">Login Name</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:57
+#: en/addUser.xml:88
 msgid ""
 "Enter the user login name or let DrakX use a version of the user's real "
 "name. <emphasis role=\"bold\">The login name is case-sensitive.</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><caution><simpara>
-#: en/addUser.xml:61
+#: en/addUser.xml:93
 msgid ""
 "The login entered here should be different to any login currently in use for "
 "your <filename>/home</filename> directory. Some user parameters will be "
@@ -250,34 +261,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:65 en/setupBootloader.xml:124
+#: en/addUser.xml:102 en/setupBootloader.xml:182
 msgid "<emphasis role=\"bold\">Password</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:66
-msgid ""
-"Type in the user password. There is a shield at the end of the text box that "
-"indicates the strength of the password. (See also <xref linkend="
-"\"givePassword\"/>)"
+#: en/addUser.xml:104
+msgid "Type in the user password (remembering the advice in the Note above)."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:68
+#: en/addUser.xml:107
 msgid ""
 "<emphasis role=\"bold\">Password (again):</emphasis> Retype the user "
 "password. DrakX will check that you have not mistyped the password."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:74
+#: en/addUser.xml:114
 msgid ""
 "Any users added while installing Mageia, will have a home directory that is "
 "both read and write protected (umask=0027)"
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:76
+#: en/addUser.xml:117
 msgid ""
 "You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
@@ -285,25 +293,25 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:79
+#: en/addUser.xml:121
 msgid "The access permissions can also be changed after the install."
 msgstr ""
 "I permessi di accesso possono anche essere cambiati dopo l'installazione."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:85
+#: en/addUser.xml:128
 msgid "User Management (advanced)"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:87
+#: en/addUser.xml:131
 msgid ""
 "The <emphasis>Advanced</emphasis> option allows you to edit further settings "
 "for the user you are adding."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:91
+#: en/addUser.xml:136
 msgid ""
 "<emphasis>Shell</emphasis>: This drop-down list allows you to change the "
 "shell available to any user you added in the previous screen. Options are "
@@ -311,7 +319,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:143
 msgid ""
 "<emphasis>User ID</emphasis>: Here you can set the user ID for any user you "
 "added in the previous screen. If you are unsure what the purpose of this is, "
@@ -319,7 +327,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:102
+#: en/addUser.xml:149
 msgid ""
 "<emphasis>Group ID</emphasis>: This lets you set the group ID.  Again, if "
 "unsure, leave it blank."
@@ -439,24 +447,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:23
+#: en/bootLive.xml:10
 msgid "Boot Mageia as Live system"
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:28
+#: en/bootLive.xml:14
 msgid "Booting the medium"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:31
+#: en/bootLive.xml:16
 msgid ""
 "You can boot directly from a Live DVD or USB. Usually, you just need to plug "
 "the USB device in or place the DVD in the drive and restart the computer."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:35
+#: en/bootLive.xml:19
 msgid ""
 "If the computer does not automatically boot from the USB or DVD you may need "
 "to reconfigure your BIOS Boot Disk priority. Alternatively, you might try "
@@ -465,7 +473,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><tip><para>
-#: en/bootLive.xml:41
+#: en/bootLive.xml:24
 msgid ""
 "To access the BIOS or boot menu when the computer is starting, you can try "
 "pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or <keycap>Esc</"
@@ -475,7 +483,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/bootLive.xml:50
+#: en/bootLive.xml:32
 msgid ""
 "The actual screen that you will first see when booting from the Live media "
 "will depend on whether your computer motherboard is of the Legacy (BIOS) or "
@@ -483,91 +491,94 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:58
+#: en/bootLive.xml:39
 msgid "In BIOS/CSM/Legacy mode"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:62
+#: en/bootLive.xml:42
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"../live-bootCSM.png\" align=\"center\"/> "
+"</imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
+"> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:67
+#: en/bootLive.xml:46
 msgid "First screen while booting in BIOS mode"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><title>
-#: en/bootLive.xml:72 en/bootLive.xml:144 en/installer.xml:106
-#: en/installer.xml:154
+#: en/bootLive.xml:50 en/bootLive.xml:104 en/installer.xml:108
+#: en/installer.xml:156
 msgid "Menu"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:75 en/bootLive.xml:147
+#: en/bootLive.xml:52 en/bootLive.xml:106
 msgid "<emphasis role=\"bold\">Boot Mageia</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:77
+#: en/bootLive.xml:53
 msgid ""
 "This option will boot the Mageia Live system from the connected DVD/USB "
 "media (expect a very slow system compared to an installed OS)."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:81
+#: en/bootLive.xml:56
 msgid "Once the boot is done, you can proceed to the installation."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:86 en/bootLive.xml:102
+#: en/bootLive.xml:60 en/bootLive.xml:72
 msgid ""
 "<emphasis role=\"bold\">+ use non-free video drivers (slower to boot)</"
 "emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:89
+#: en/bootLive.xml:62
 msgid "Boot the Mageia Live system using non-free video drivers"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:96 en/bootLive.xml:155 en/installer.xml:109
+#: en/bootLive.xml:68 en/bootLive.xml:112 en/installer.xml:111
 msgid "<emphasis role=\"bold\">Install Mageia</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:98 en/bootLive.xml:157
+#: en/bootLive.xml:69 en/bootLive.xml:113
 msgid "This option will install Mageia to a hard disk."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:105
+#: en/bootLive.xml:74
 msgid "Install Mageia using non-free video drivers"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:111 en/installer.xml:125
+#: en/bootLive.xml:79 en/installer.xml:127
 msgid "<emphasis role=\"bold\">Memory Test</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:113 en/installer.xml:127
+#: en/bootLive.xml:80 en/installer.xml:129
 msgid ""
 "Test the installed RAM by performing multiple read and write operations. "
 "Reboot to end the test."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:118 en/bootLive.xml:161
+#: en/bootLive.xml:84 en/bootLive.xml:116
 msgid "<emphasis role=\"bold\"> F2 Language</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:120 en/bootLive.xml:163
+#: en/bootLive.xml:85 en/bootLive.xml:117
 msgid ""
 "Press <keycap>F2</keycap> to have the installer use a specific language "
 "during the installation. Use the arrow keys to select the language then "
@@ -575,24 +586,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:129
+#: en/bootLive.xml:93
 msgid "In UEFI mode"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:133
+#: en/bootLive.xml:96
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
+"> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:139
+#: en/bootLive.xml:100
 msgid "First screen while booting in UEFI mode"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:149
+#: en/bootLive.xml:107
 msgid ""
 "This option will boot the Mageia Live system from the connected DVD/USB "
 "media (expect a very slow system compared to an installed OS).  Once the "
@@ -600,7 +614,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/bootLive.xml:170
+#: en/bootLive.xml:123
 msgid ""
 "If you booted from a USB stick, you will see the above menu options "
 "duplicated, and in this case, you should choose from the menu pair that will "
@@ -817,12 +831,12 @@ msgstr ""
 "tutti impostati sull'ora locale o tutti con UTC/GMT."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:24
+#: en/configureX_card_list.xml:27
 msgid "Choose an X Server (Configure your Graphic Card)"
 msgstr "Scegli un server X (configura la tua scheda video)"
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_card_list.xml:29
+#: en/configureX_card_list.xml:32
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_card_list."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_card_list-im1\"/> </"
@@ -830,7 +844,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:35
+#: en/configureX_card_list.xml:38
 msgid ""
 "DrakX has a very comprehensive database of video cards and will usually "
 "correctly identify your video device."
@@ -839,7 +853,7 @@ msgstr ""
 "correttamente il dispositivo video."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:38
+#: en/configureX_card_list.xml:41
 msgid ""
 "If the installer has not correctly detected your graphic card and you know "
 "which one you have, you can select it from the tree by:"
@@ -848,22 +862,22 @@ msgstr ""
 "sai di quale si trtta puoi selezionarla dall'elenco:"
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_card_list.xml:41 en/configureX_monitor.xml:74
+#: en/configureX_card_list.xml:44 en/configureX_monitor.xml:78
 msgid "Vendor"
 msgstr "Marca"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:45
+#: en/configureX_card_list.xml:48
 msgid "then the make of your card"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:49
+#: en/configureX_card_list.xml:52
 msgid "and the model of card"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:53
+#: en/configureX_card_list.xml:56
 msgid ""
 "If you cannot find your card in the vendor lists (because it's not yet in "
 "the database or it's an older card) you may find a suitable driver in the "
@@ -874,14 +888,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><caution><para>
-#: en/configureX_card_list.xml:61
+#: en/configureX_card_list.xml:64
 msgid ""
 "Be aware that if you select an incompatible driver you may only have access "
 "to the <emphasis>Command Line Interface</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:65
+#: en/configureX_card_list.xml:68
 msgid ""
 "Some video card manufacturers provide proprietary drivers for Linux which "
 "may only be available in the <emphasis>Nonfree</emphasis> repository and in "
@@ -892,17 +906,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:11
-msgid "Graphic Card and Monitor Configuration"
+#: en/configureX_chooser.xml:23
+#, fuzzy
+msgid "Graphics Card and Monitor Configuration"
 msgstr "Scheda video e configurazione del monitor"
 
-#.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
-#. 2018/02/15 apb: Some text and typography.
-#. 2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.
-#. 2018/02/23 apb: Typo.
-#. 2019/01/06 apb: Slight reword, split 1st para in two.
 #. type: Content of: <section><mediaobject>
-#: en/configureX_chooser.xml:26
+#: en/configureX_chooser.xml:28
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_chooser."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_chooser-im1\"/> </"
@@ -910,7 +920,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:32
+#: en/configureX_chooser.xml:34
 msgid ""
 "No matter which graphical environment (also known as desktop environment) "
 "you chose for this install of Mageia, they are all based on a graphical user "
@@ -921,31 +931,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:39
+#: en/configureX_chooser.xml:41
 msgid ""
 "Choose the appropriate settings manually if you think the details are "
 "incorrect, or if none are shown."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:44
-msgid "<emphasis role=\"bold\">Graphic Card</emphasis>"
+#: en/configureX_chooser.xml:46
+msgid "<emphasis role=\"bold\">Graphics Card</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:47
+#: en/configureX_chooser.xml:49
 msgid ""
 "If you need to, you can select a specific card from this expandable list. "
 "See <xref linkend=\"configureX_card_list\"/>."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:52
+#: en/configureX_chooser.xml:54
 msgid "<emphasis role=\"bold\">Monitor</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:55
+#: en/configureX_chooser.xml:57
 msgid ""
 "You can choose Plug 'n Play, if applicable, or choose your monitor from the "
 "<emphasis>Vendor</emphasis> or <emphasis>Generic</emphasis> lists. Choose "
@@ -955,22 +965,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:63
+#: en/configureX_chooser.xml:65
 msgid "<emphasis role=\"bold\">Resolution</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:66
+#: en/configureX_chooser.xml:68
 msgid "The resolution and color depth of your monitor can be set here."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:71
+#: en/configureX_chooser.xml:73
 msgid "<emphasis role=\"bold\">Test</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:74
+#: en/configureX_chooser.xml:76
 msgid ""
 "The test button does not always appear during install. If the option is "
 "there, and you test your settings, you should be asked to confirm that your "
@@ -982,17 +992,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:85
+#: en/configureX_chooser.xml:87
 msgid "<emphasis role=\"bold\">Options</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:88
+#: en/configureX_chooser.xml:90
 msgid "Here you can choose to enable or disable various options."
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_chooser.xml:93
+#: en/configureX_chooser.xml:95
 msgid ""
 "There is a risk of damaging a monitor if you choose refresh rates that are "
 "outside the frequency range of that monitor. This applies to older CRT "
@@ -1001,12 +1011,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_monitor.xml:22
+#: en/configureX_monitor.xml:26
 msgid "Choosing your Monitor"
 msgstr "Scegliere proprio monitor"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:25
+#: en/configureX_monitor.xml:29
 msgid ""
 "DrakX has a very comprehensive database of monitors and will usually "
 "correctly identify yours."
@@ -1015,7 +1025,7 @@ msgstr ""
 "identificherà correttamente il tuo."
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:30
+#: en/configureX_monitor.xml:34
 msgid ""
 "<emphasis role=\"bold\">Selecting a monitor with different characteristics "
 "could damage your monitor or video hardware. Please don't try something "
@@ -1024,7 +1034,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:38
+#: en/configureX_monitor.xml:42
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
@@ -1035,12 +1045,12 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:46
+#: en/configureX_monitor.xml:50
 msgid "Custom"
 msgstr "Personalizzato"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:49
+#: en/configureX_monitor.xml:53
 msgid ""
 "This option allows you to set two critical parameters: the vertical refresh "
 "rate and the horizontal sync rate. Vertical refresh determines how often the "
@@ -1049,7 +1059,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:55
+#: en/configureX_monitor.xml:59
 msgid ""
 "It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor "
 "type with a sync range that is beyond the capabilities of your monitor: you "
@@ -1058,56 +1068,59 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:64
+#: en/configureX_monitor.xml:68
 msgid "Plug'n Play"
 msgstr "Plug'n Play"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:67
+#: en/configureX_monitor.xml:71
 msgid ""
 "This is the default option and automatically tries to determine the monitor "
 "type from the monitor database."
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:77
+#: en/configureX_monitor.xml:81
+#, fuzzy
 msgid ""
 "If the installer has not correctly detected your monitor and you know which "
-"one you have, you can select it from the tree by selecting:"
+"one you have, you can choose it from the options by selecting:"
 msgstr ""
+"Se l'installer non ha identificato correttamente la tua scheda video e tu "
+"sai di quale si trtta puoi selezionarla dall'elenco:"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:86
+#: en/configureX_monitor.xml:90
 msgid "Manufacturer"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:90
+#: en/configureX_monitor.xml:94
 msgid "Monitor model"
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:96
+#: en/configureX_monitor.xml:100
 msgid "Generic"
 msgstr "Generico"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:99
+#: en/configureX_monitor.xml:103
 msgid ""
-"Selecting this group will list nearly 30 display configurations such as "
-"1024x768 @ 60Hz and includes flat-panel displays as used in laptops. This is "
-"often a good monitor selection group if you need to use the VESA card driver "
-"when your video hardware cannot be determined automatically.  Once again it "
-"may be wise to be conservative in your selections."
+"Selecting this group will list approximately 30 display configurations such "
+"as 1024x768 @ 60Hz and includes flat-panel displays as used in laptops.  "
+"This is often a good monitor selection group if you need to use the VESA "
+"card driver when your video hardware cannot be determined automatically. "
+"Once again, it may be wise to be conservative in your selections."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:22
+#: en/diskdrake.xml:24
 msgid "Custom Disk Partitioning with DiskDrake"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:27
+#: en/diskdrake.xml:29
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-diskdrake.png\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1115,7 +1128,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:38
+#: en/diskdrake.xml:40
 msgid ""
 "Modify the layout of your disk(s) here. You can remove or create partitions, "
 "change the filesystem or size of a partition and even view their details "
@@ -1123,15 +1136,15 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:47
 msgid ""
 "There is a tab at the top for every detected hard disk (or other storage "
-"device, like a USB key). In the screenshot above there are two available "
-"devices: <filename>sda </filename>and <filename>sdb</filename>."
+"device, like a USB key), for example: <filename>sda</filename>, "
+"<filename>sdb</filename>, <filename>sdc</filename> etc."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:52
+#: en/diskdrake.xml:54
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it. "
@@ -1140,21 +1153,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:60
+#: en/diskdrake.xml:62
 msgid ""
 "Continue until you have adjusted everything to your satisfaction, then click "
 "<emphasis>Done</emphasis> when you're ready."
 msgstr ""
 
 #. type: Content of: <section><warning><orderedlist><listitem><para>
-#: en/diskdrake.xml:69
+#: en/diskdrake.xml:71
 msgid ""
 "Take care with the <emphasis>Clear all</emphasis> option, use it only if you "
 "are sure you want to wipe all partitions on the selected storage device."
 msgstr ""
 
 #. type: Content of: <section><warning><orderedlist><listitem><para>
-#: en/diskdrake.xml:75
+#: en/diskdrake.xml:77
 msgid ""
 "If you wish to use encryption on your <filename>/</filename> partition you "
 "must ensure that you have a separate <filename>/boot</filename> partition. "
@@ -1163,7 +1176,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/diskdrake.xml:87
+#: en/diskdrake.xml:89
 msgid ""
 "If you are installing Mageia on a UEFI system, check that an ESP (EFI System "
 "Partition) is present and correctly mounted on <filename>/boot/EFI</"
@@ -1171,19 +1184,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/diskdrake.xml:93
+#: en/diskdrake.xml:95
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
 "partition is present and of the correct type. See Figure 2 below."
 msgstr ""
 
 #. type: Content of: <section><figure><title>
-#: en/diskdrake.xml:101
+#: en/diskdrake.xml:103
 msgid "EFI System Partition"
 msgstr ""
 
 #. type: Content of: <section><figure><mediaobject>
-#: en/diskdrake.xml:104
+#: en/diskdrake.xml:106
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-diskdrake2.png\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1191,17 +1204,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><figure>
-#: en/diskdrake.xml:103 en/diskdrake.xml:117
+#: en/diskdrake.xml:105 en/diskdrake.xml:119
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><figure><title>
-#: en/diskdrake.xml:115
+#: en/diskdrake.xml:117
 msgid "BIOS boot partition"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:118 en/doPartitionDisks.xml:201
+#: en/diskdrake.xml:120 en/doPartitionDisks.xml:206
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1220,26 +1233,26 @@ msgid "Partitioning"
 msgstr "Partizionamento"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:31
 msgid "Suggested Partitioning"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:34
 msgid ""
 "In this screen you can see the content of your hard drive(s) along with the "
 "DrakX partitioning proposals for where to install Mageia."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:34
+#: en/doPartitionDisks.xml:38
 msgid ""
 "The actual options available from those shown below will vary according to "
 "the layout and content of your particular hard drive(s)."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:39
+#: en/doPartitionDisks.xml:43
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1248,17 +1261,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><title>
-#: en/doPartitionDisks.xml:49
+#: en/doPartitionDisks.xml:53
 msgid "Main Options"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:56
 msgid "<emphasis role=\"bold\">Use Existing Partitions</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:59
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1267,12 +1280,12 @@ msgstr ""
 "Linux compatibili e potrebbero essere usate per l'installazione."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:61
+#: en/doPartitionDisks.xml:65
 msgid "<emphasis role=\"bold\">Use Free Space</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:68
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1281,82 +1294,87 @@ msgstr ""
 "per la tua nuova installazione di Mageia."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:70
+#: en/doPartitionDisks.xml:74
 msgid ""
 "<emphasis role=\"bold\">Use Free Space on a Windows Partition</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:73
+#: en/doPartitionDisks.xml:77
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it. 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 important files!"
+"installation but see the warning below."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para><mediaobject>
+#: en/doPartitionDisks.xml:87
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:79
+#: en/doPartitionDisks.xml:82
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
 "light blue and the proposed Mageia partition in dark blue with their "
 "intended sizes just underneath. You have the option to modify these sizes by "
 "clicking and dragging the gap between both partitions.  See the following "
-"screenshot:"
+"screenshot:<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><warning><para>
+#: en/doPartitionDisks.xml:97
+msgid ""
+"This involves shrinking the size of the Windows partition, and therefore is "
+"a risky operation, so you should make sure you have backed up all important "
+"files before proceeding."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><important><para>
+#: en/doPartitionDisks.xml:103
+msgid ""
+"The partition must be \"clean\", meaning that Windows must have closed down "
+"correctly the last time it was used. It must also have been defragmented, "
+"although this is not a guarantee that all files in the partition have been "
+"moved out of the area that is about to be used for Mageia."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:87
+#: en/doPartitionDisks.xml:112
 msgid "<emphasis role=\"bold\">Erase and use Entire Disk</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:90
+#: en/doPartitionDisks.xml:115
 msgid "This option will allocate the entire drive for Mageia"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:119
 msgid ""
 "This will erase ALL data on the selected hard drive. Take care! 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 this option."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><important><para>
-#: en/doPartitionDisks.xml:101
-msgid ""
-"Note that this involves shrinking the size of the Windows partition. The "
-"partition must be \"clean\", meaning that Windows must have closed down "
-"correctly the last time it was used. It must also have been defragmented, "
-"although this is not a guarantee that all files in the partition have been "
-"moved out of the area that is about to be used. It is highly recommended to "
-"back up your personal files."
-msgstr ""
-
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:112
+#: en/doPartitionDisks.xml:127
 msgid "<emphasis role=\"bold\">Custom Disk Partitioning</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:115
+#: en/doPartitionDisks.xml:130
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
 msgstr ""
 
-#. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:122
-msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
-msgstr ""
-
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:131
+#: en/doPartitionDisks.xml:136
 msgid ""
 "If you are not using the <emphasis>Custom disk partitioning</emphasis> "
 "option, then the installer will allocate the available space according to "
@@ -1364,60 +1382,60 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:137
+#: en/doPartitionDisks.xml:142
 msgid ""
 "If the total available space is less than 50 GB, then only one partition is "
 "created. This will be the <filename>/</filename> (root)  partition."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:143
+#: en/doPartitionDisks.xml:148
 msgid ""
 "If the total available space is greater than 50 GB, then three partitions "
 "are created"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:148
+#: en/doPartitionDisks.xml:153
 msgid ""
 "6/19 of the total available place is allocated to <filename>/</filename> "
 "with a maximum of 50 GB"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:153
+#: en/doPartitionDisks.xml:158
 msgid "1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:158
+#: en/doPartitionDisks.xml:163
 msgid "the rest (at least 12/19) is allocated to <filename>/home</filename>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:165
+#: en/doPartitionDisks.xml:170
 msgid ""
 "This means that from 160 GB or greater available space, the installer will "
 "create three partitions:"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:170
+#: en/doPartitionDisks.xml:175
 msgid "50 GB for <filename>/</filename>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:174
+#: en/doPartitionDisks.xml:179
 msgid "4 GB for <filename>swap</filename>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:178
+#: en/doPartitionDisks.xml:183
 msgid "and the remainder for <filename>/home</filename>"
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:183
+#: en/doPartitionDisks.xml:188
 msgid ""
 "If you are using a UEFI system, the ESP (EFI System Partition) will be "
 "automatically detected - or created if it does not exist yet - and mounted "
@@ -1427,7 +1445,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:189
+#: en/doPartitionDisks.xml:194
 msgid ""
 "If you are using a Legacy (also known as BIOS) system with a GPT partitioned "
 "disk, you need to create a BIOS boot partition if it doesn't already exist. "
@@ -1438,19 +1456,25 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:196
+#: en/doPartitionDisks.xml:201
 msgid "See <xref linkend=\"diskdrake\"/> for information on how to proceed."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:211
+#: en/doPartitionDisks.xml:216
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4.png"
-"\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks4.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks4.png\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
+"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:217
+#: en/doPartitionDisks.xml:226
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
 "previous standard of 512. Due to lack of available hardware, the "
@@ -1459,7 +1483,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:222
+#: en/doPartitionDisks.xml:231
 msgid ""
 "Some SSD devices now use an erase block size over 1 MB. If you have such a "
 "device we suggest that you partition the drive in advance, using an "
@@ -1468,17 +1492,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:229
+#: en/doPartitionDisks.xml:238
 msgid "<emphasis>Align to</emphasis> = MiB"
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:233
+#: en/doPartitionDisks.xml:242
 msgid "<emphasis>Free space preceding (MiB)</emphasis> = 2"
 msgstr ""
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:237
+#: en/doPartitionDisks.xml:246
 msgid ""
 "Also make sure all partitions are created using an even number of megabytes."
 msgstr ""
@@ -1646,12 +1670,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/firewall.xml:7
+#: en/firewall.xml:16
 msgid "Firewall"
 msgstr "Firewall"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:10
+#: en/firewall.xml:19
 msgid ""
 "This section allows you to configure some simple firewall rules: they "
 "determine which type of message from the Internet will be accepted by the "
@@ -1659,8 +1683,18 @@ msgid ""
 "system to be accessible from the Internet."
 msgstr ""
 
+#. type: Content of: <section><mediaobject>
+#: en/firewall.xml:26
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-firewall.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
+"> </imageobject>"
+
 #. type: Content of: <section><para>
-#: en/firewall.xml:16
+#: en/firewall.xml:31
 msgid ""
 "In the default setting (no button is checked), no service of the system is "
 "accessible from the network. The <emphasis>Everything (no firewall)</"
@@ -1673,7 +1707,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:25
+#: en/firewall.xml:40
 msgid ""
 "All other options are more or less self-explanatory. As an example, you will "
 "enable the CUPS server if you want printers on your machine to be accessible "
@@ -1681,12 +1715,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:29
+#: en/firewall.xml:44
 msgid "<emphasis role=\"bold\">Advanced</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:31
+#: en/firewall.xml:46
 msgid ""
 "The <emphasis>Advanced</emphasis> option opens a window where you can enable "
 "a series of services by typing a list of <quote>couples</quote> (blank "
@@ -1694,34 +1728,35 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:35
-msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
+#: en/firewall.xml:50
+msgid "<emphasis>&lt;port-number&gt;/&lt;protocol&gt;</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:38
+#: en/firewall.xml:53
 msgid ""
-"- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
-"the service you want to enable (e.g. 873 for the RSYNC service) as defined "
-"in <emphasis>RFC-433</emphasis>;"
+"- <emphasis>&lt;port-number&gt;</emphasis> is the value of the port assigned "
+"to the service you want to enable (e.g. 873 for the RSYNC service) as "
+"defined in <emphasis>RFC-433</emphasis>;"
 msgstr ""
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:42
+#: en/firewall.xml:57
 msgid ""
-"- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
-"<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
+"- <emphasis>&lt;protocol&gt;</emphasis> is one of <emphasis>TCP</emphasis> "
+"or <emphasis>UDP</emphasis> - the internet protocol that is used by the "
+"service."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:47
+#: en/firewall.xml:62
 msgid ""
 "For instance, the entry for enabling access to the RSYNC service therefore "
 "is <emphasis>873/tcp</emphasis>."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:50
+#: en/firewall.xml:65
 msgid ""
 "In case a service is implemented to use both protocols, you specify 2 "
 "couples for the same port."
@@ -1789,12 +1824,12 @@ msgid "Graphical Configuration"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:32
+#: en/installer.xml:34
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, l'assistente all'installazione di Mageia"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:35
+#: en/installer.xml:37
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -1805,33 +1840,33 @@ msgstr ""
 "possibile."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:40
+#: en/installer.xml:42
 msgid "The installation steps"
 msgstr "I passi dell'installazione"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:44
+#: en/installer.xml:46
 msgid ""
 "The install process is divided into a number of steps - the status of which "
 "is indicated in a panel to the left of the screen."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:50
+#: en/installer.xml:52
 msgid ""
 "Each step has one or more screens, which may also have <emphasis>Advanced</"
 "emphasis> sections with extra, less commonly required options."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:56
+#: en/installer.xml:58
 msgid ""
 "Most screens have <emphasis>Help</emphasis> buttons for further details "
 "about the particular step."
 msgstr ""
 
 #. type: Content of: <section><section><caution><para>
-#: en/installer.xml:62
+#: en/installer.xml:64
 msgid ""
 "If at some point during the install you decide to abort the installation, it "
 "is possible to reboot, but please think twice before you do this. Once a "
@@ -1841,7 +1876,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><caution><para>
-#: en/installer.xml:68
+#: en/installer.xml:70
 msgid ""
 "If, in spite of this, you are very sure rebooting is what you want, go to a "
 "text terminal by pressing the keys <keycombo> <keycap>Ctrl</keycap> "
@@ -1851,12 +1886,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:86
+#: en/installer.xml:88
 msgid "Installation Welcome Screen"
 msgstr "Schermata di benvenuto dell'installazione"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:88
+#: en/installer.xml:90
 msgid ""
 "The particular screen that you will first see when booting from the "
 "Installation media will depend on whether your computer motherboard is of "
@@ -1864,60 +1899,60 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:92
+#: en/installer.xml:94
 msgid ""
 "The welcome menu screen has various options, however the default option will "
 "start the installer, and is normally all that you will need."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:97
+#: en/installer.xml:99
 msgid "Legacy (BIOS) Systems"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:100
+#: en/installer.xml:102
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome.png\"/> </"
 "imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:111
+#: en/installer.xml:113
 msgid ""
 "Install Mageia to a hard disk. This is the default option, and will "
 "automatically start after a short while unless another option is selected."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:117
+#: en/installer.xml:119
 msgid "<emphasis role=\"bold\">Rescue System</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:119
+#: en/installer.xml:121
 msgid ""
 "This option allows you to either re-install the bootloader for an existing "
 "Mageia installation or you can use it to restore a Windows bootloader."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:132
+#: en/installer.xml:134
 msgid "<emphasis role=\"bold\">F2: Language</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:134
+#: en/installer.xml:136
 msgid "Press F2 for alternative languages."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:140
+#: en/installer.xml:142
 msgid "UEFI Systems"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:142
+#: en/installer.xml:144
 msgid ""
 "From this screen, you can access options by pressing <keycap>e</keycap> to "
 "enter the edit mode. To come back to this screen, press <keycap>Esc</keycap> "
@@ -1925,19 +1960,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:148
+#: en/installer.xml:150
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome2.png\"/> </"
 "imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:157
+#: en/installer.xml:159
 msgid "<emphasis role=\"bold\">Install:</emphasis> Start the Install process"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:162
+#: en/installer.xml:164
 msgid ""
 "<emphasis role=\"bold\">Rescue:</emphasis> This option allows you to either "
 "re-install the bootloader for an existing Mageia installation or you can use "
@@ -1945,31 +1980,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:169
+#: en/installer.xml:171
 msgid ""
 "<emphasis role=\"bold\">F2: Language:</emphasis> Press <keycap>F2</keycap> "
 "for alternative languages."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:174
+#: en/installer.xml:176
 msgid ""
 "If you booted from a USB stick, you will see the above options duplicated, "
 "and in this case, you should use the set that will be suffixed with \"USB\"."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:181
+#: en/installer.xml:183
 msgid "Installation Problems and Possible Solutions"
 msgstr "Problemi relativi all'installazione e soluzioni possibili"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:184
+#: en/installer.xml:186
 msgid "No Graphical Interface"
 msgstr "Nessuna interfaccia grafica"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:188
+#: en/installer.xml:190
 msgid ""
 "After the initial screen you did not progress to the <emphasis>Language "
 "Selection</emphasis> screen. This can happen with some graphic cards and "
@@ -1978,7 +2013,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:195
+#: en/installer.xml:197
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
 "In this case it is worth trying a text-mode installation. To use this press "
@@ -1989,12 +2024,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:208
+#: en/installer.xml:210
 msgid "The Install Freezes"
 msgstr "L'installazione si blocca"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:210
+#: en/installer.xml:212
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic hardware "
@@ -2004,12 +2039,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:218
+#: en/installer.xml:220
 msgid "RAM problem"
 msgstr "Problema relativo alla RAM"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:220
+#: en/installer.xml:222
 msgid ""
 "This will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
@@ -2019,12 +2054,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:228
+#: en/installer.xml:230
 msgid "Dynamic partitions"
 msgstr "Partizioni dinamiche"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:230
+#: en/installer.xml:232
 msgid ""
 "If you converted your hard disk from <literal>Basic</literal> format to "
 "<literal>Dynamic</literal> format in Microsoft Windows, then it is not "
@@ -3628,73 +3663,106 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:27
+#: en/setupBootloader.xml:32
 msgid "Bootloader"
 msgstr "Bootloader"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:31
+#: en/setupBootloader.xml:36
+#, fuzzy
+msgid "Available Bootloaders"
+msgstr "Bootloader"
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:39
 msgid "Grub2"
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><title>
-#: en/setupBootloader.xml:34
-msgid "Grub2 on Legacy MBR/GPT systems"
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:42
+msgid "<emphasis role=\"bold\">Grub2 on Legacy MBR/GPT systems</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:37
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:46
 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:42
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:52
 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:49
-msgid "Grub2-efi on UEFI systems"
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:59
+msgid "<emphasis role=\"bold\">Grub2-efi on UEFI systems</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:52
-msgid "GRUB2-efi will be used exclusively as the bootloader for a UEFI system."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:63
+msgid "GRUB2-efi or rEFInd may be used as the bootloader for a UEFI system."
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:57
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:68
 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:60
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:71
 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 "
-"created by Windows and add grub2-efi to it. If no ESP exists, then one will "
+"created by Windows and add grub2-efi to it.  If no ESP exists, then one will "
 "be created. Although it is possible to have several ESPs, only one is "
 "required, whatever the number of operating systems you have."
 msgstr ""
 
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:82
+msgid "rEFInd"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:85
+msgid "<emphasis role=\"bold\">rEFInd on UEFI systems</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:88
+msgid ""
+"rEFInd has a nice graphical set of options, and can auto-detect installed "
+"EFI bootloaders. See: http://www.rodsbooks.com/refind/"
+msgstr ""
+
+#. type: Content of: <section><section><section><note><para>
+#: en/setupBootloader.xml:95
+msgid ""
+"Please note that in order to be able to use the <literal>rEFInd</literal> "
+"option, an installed EFI System Partition must match your system "
+"architecture: if you have a 32bit EFI System Partition installed on a 64bit "
+"machine for instance, then the rEFInd option will not be displayed/available "
+"to you."
+msgstr ""
+
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:72
+#: en/setupBootloader.xml:106
 msgid "Bootloader Setup"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:76
+#: en/setupBootloader.xml:110
 msgid "Bootloader main options"
 msgstr "Opzioni principali del bootloader"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:79
+#: en/setupBootloader.xml:113
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader.png\"/> </imageobject> <imageobject condition=\"live"
@@ -3703,47 +3771,70 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:91
+#: en/setupBootloader.xml:125
 msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:93
+#. type: Content of: <section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:129
 msgid ""
-"This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI "
-"systems will not see this option here."
+"<guimenuitem>GRUB2</guimenuitem> (with either a graphical or a text menu), "
+"can be chosen for both <literal>Legacy MBR/BIOS</literal> systems and "
+"<literal>UEFI</literal> systems."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:136
+msgid ""
+"<guimenuitem>rEFInd</guimenuitem> (with a graphical menu)  is an alternative "
+"option solely for use with <literal>UEFI</literal> systems."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:98
+#: en/setupBootloader.xml:144
 msgid "<emphasis role=\"bold\">Boot device</emphasis>"
 msgstr ""
 
+#. type: Content of: <section><section><section><itemizedlist><listitem><warning><para>
+#: en/setupBootloader.xml:147
+#, fuzzy
+msgid "Don't change this unless you really know what you are doing."
+msgstr "Cambia le cose solo quando sai veramente bene cosa stai facendo."
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><note><para>
+#: en/setupBootloader.xml:152
+msgid ""
+"There is no option to write GRUB to the boot sector of a partition (e.g: "
+"<filename>sda1</filename>), as this method is considered unreliable."
+msgstr ""
+
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:100
-msgid "Don't change this unless you really know what you are doing"
+#: en/setupBootloader.xml:157
+msgid ""
+"When using UEFI mode, then the <guilabel>Boot device</guilabel> will be "
+"listed as <guimenuitem>EFI System Partition</guimenuitem>."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:105
+#: en/setupBootloader.xml:163
 msgid ""
 "<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:108
+#: en/setupBootloader.xml:166
 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:113
+#: en/setupBootloader.xml:171
 msgid "<emphasis role=\"bold\">Security</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:115
+#: en/setupBootloader.xml:173
 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 "
@@ -3753,34 +3844,34 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:126
+#: en/setupBootloader.xml:184
 msgid "Choose a password for the bootloader (optional)"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:130
+#: en/setupBootloader.xml:188
 msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:132
+#: en/setupBootloader.xml:190
 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:137 en/setupBootloader.xml:212
+#: en/setupBootloader.xml:195 en/setupBootloader.xml:308
 msgid "<emphasis>Advanced</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:141
+#: en/setupBootloader.xml:199
 msgid "<emphasis>Enable ACPI</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:143
+#: en/setupBootloader.xml:201
 msgid ""
 "ACPI (Advanced Configuration and Power Interface) is a standard for power "
 "management. It can save energy by stopping unused devices. Deselecting it "
@@ -3790,24 +3881,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:152
+#: en/setupBootloader.xml:210
 msgid "<emphasis>Enable SMP</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:154
+#: en/setupBootloader.xml:212
 msgid ""
 "This option enables/disables symmetric multiprocessing for multi-core "
 "processors"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:159
+#: en/setupBootloader.xml:217
 msgid "<emphasis>Enable APIC</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:161
+#: en/setupBootloader.xml:219
 msgid ""
 "Enabling this gives the operating system access to the Advanced Programmable "
 "Interrupt Controller. APIC devices permit more complex priority models, and "
@@ -3815,24 +3906,77 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:168
+#: en/setupBootloader.xml:226
 msgid "<emphasis>Enable Local APIC</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:170
+#: en/setupBootloader.xml:228
 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:177
+#: en/setupBootloader.xml:235
 msgid "Bootloader Configuration"
 msgstr "Configurazione del bootloader"
 
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:237
+msgid ""
+"If, in the previous section you selected <literal>rEFInd</literal> as the "
+"bootloader to use, you would then be presented with the options shown in the "
+"screenshot directly below. Otherwise, please instead move on to the "
+"subsequent screenshot for your options."
+msgstr ""
+
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:180
+#: en/setupBootloader.xml:243
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"rEFIndLoaderConfig.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-rEFIndLoaderConfig.png\"/> </"
+"imageobject>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:253
+#, fuzzy
+msgid "Your rEFInd configuration options:"
+msgstr "Configurazione audio"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:256
+msgid ""
+"<guimenuitem>Install or update rEFInd in the EFI system partition.</"
+"guimenuitem>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:261
+msgid ""
+"<guimenuitem>Install in EFI/Boot partition (workaround for some BIOS's).</"
+"guimenuitem>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:264
+msgid ""
+"With some BIOS's, the newly written bootloaser for Mageia at end of the "
+"installation will not be recognized. In that case, you can use this option "
+"as a workaround for the issue."
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:270
+msgid ""
+"If you did not select rEFInd as the bootloader to use in the previous "
+"section, then your bootloader configurations are shown below:"
+msgstr ""
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:275
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -3841,42 +3985,42 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:191
+#: en/setupBootloader.xml:286
 msgid "<emphasis role=\"bold\">Default</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:193
+#: en/setupBootloader.xml:288
 msgid "The operating system to be started up by default."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:197
+#: en/setupBootloader.xml:292
 msgid "<emphasis role=\"bold\">Append</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:199
+#: en/setupBootloader.xml:294
 msgid ""
 "This option lets you pass information to the kernel 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:204
+#: en/setupBootloader.xml:299
 msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:206
+#: en/setupBootloader.xml:301
 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, "
-"then untick the Probe Foreign OS option."
+"then untick the <guimenuitem>Probe Foreign OS</guimenuitem> option."
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:215
+#: en/setupBootloader.xml:311
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader4.png\"/> </imageobject> <imageobject condition=\"live"
@@ -3885,12 +4029,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:226
+#: en/setupBootloader.xml:322
 msgid "<emphasis>Video mode</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:228
+#: en/setupBootloader.xml:324
 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 "
@@ -3898,38 +4042,47 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:234
+#: en/setupBootloader.xml:330
 msgid "<emphasis>Do not touch ESP or MBR</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:236
+#: en/setupBootloader.xml:332
 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 "
-"missing. Click<emphasis> Ok</emphasis> if you are sure you understand the "
-"implications, and wish to proceed."
+"missing. Click <guimenuitem>Ok </guimenuitem>only if you are sure you "
+"understand the implications, and wish to proceed."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><warning><para>
+#: en/setupBootloader.xml:338
+msgid ""
+"Chain-loading via legacy bootloaders (GRUB Legacy and LiLo)  is no longer "
+"supported by Mageia as it is likely to fail when attempting to boot this "
+"resulting installation of Mageia. If you use anything other than GRUB2 or "
+"rEFInd for this purpose, then you do so at your own risk!"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:245
+#: en/setupBootloader.xml:348
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png"
 "\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:253
+#: en/setupBootloader.xml:356
 msgid "Other Options"
 msgstr "Altre Opzioni"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:256
+#: en/setupBootloader.xml:359
 msgid "Using an existing bootloader"
 msgstr "Usare un bootloader esistente"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:258
+#: en/setupBootloader.xml:361
 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 "
@@ -3939,12 +4092,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:267
+#: en/setupBootloader.xml:370
 msgid "Installing Without a Bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:269
+#: en/setupBootloader.xml:372
 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 "
diff --git a/docs/docs/stable/installer/ja.po b/docs/docs/stable/installer/ja.po
index 49fb5c2d..7d6a6f09 100644
--- a/docs/docs/stable/installer/ja.po
+++ b/docs/docs/stable/installer/ja.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2019-01-19 21:23+0200\n"
+"POT-Creation-Date: 2019-09-08 15:26+0300\n"
 "PO-Revision-Date: 2019-01-20 01:40+0000\n"
 "Last-Translator: Masanori Kakura <kakurasan@gmail.com>\n"
 "Language-Team: Japanese (http://www.transifex.com/MageiaLinux/mageia/"
@@ -174,7 +174,7 @@ msgstr ""
 "必要な 32 ビットのパッケージを見つけることができるでしょう。"
 
 #. type: Content of: <section><info><title>
-#: en/addUser.xml:3
+#: en/addUser.xml:9
 msgid "User Management"
 msgstr "ユーザの管理"
 
@@ -184,13 +184,16 @@ msgstr "ユーザの管理"
 #. 2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
 #.   Also changed 'Advanced User Management' to 'User Management (advanced)'.
 #. 2018/02/24 apb: Changed list style.
+#. 2019/08/10 apb: Added missing 'condition' profile for live-user1.png.
+#. 2019/08/11 apb: [1] Reword 1.1 (including Note) [2] Reword 1.2 Password text.
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:12
+#: en/addUser.xml:28
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
-"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
-"\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata format="
-"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-setRootPassword.png\" format=\"PNG\" revision=\"1\" xml:id="
+"\"setRootPassword-im1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-user1.png\" format=\"PNG\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
 "\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -198,20 +201,18 @@ msgstr ""
 "\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:21
+#: en/addUser.xml:40
 msgid "Set Administrator (root)  Password:"
 msgstr "管理者 (root) のパスワードを設定する:"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:24
+#: en/addUser.xml:44
+#, fuzzy
 msgid ""
 "It is advisable for all Mageia installations to set a <literal>superuser</"
 "literal> (Administrator) password, usually called the <emphasis>root </"
-"emphasis>password in Linux. As you type a password into the top box a shield "
-"will change from red-to-yellow-to-green depending on the strength of the "
-"password. A green shield shows you are using a strong password. You need to "
-"repeat the same password in the box underneath, to check that the first "
-"entry was not mistyped."
+"emphasis>password in Linux. You need to repeat the same password in the box "
+"underneath, to check that the first entry was not mistyped."
 msgstr ""
 "Mageia のインストールされたすべての環境で<literal>スーパーユーザ</literal> "
 "(管理者) のパスワードを設定することが望ましいです。これは通常、Linux の "
@@ -222,7 +223,15 @@ msgstr ""
 "に同じパスワードを繰り返し入力する必要があります。"
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:32
+#: en/addUser.xml:51
+msgid ""
+"As you type a password into the top box a shield will change from red-to-"
+"yellow-to-green depending on the strength of the password. A green shield "
+"shows you are using a strong password."
+msgstr ""
+
+#. type: Content of: <section><section><note><para>
+#: en/addUser.xml:55
 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."
@@ -231,12 +240,12 @@ msgstr ""
 "(大文字と小文字), 数字, 他の文字を混在させて使うのが最適です。"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:39
+#: en/addUser.xml:63
 msgid "Enter a user"
 msgstr "ユーザを入力する"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:41
+#: en/addUser.xml:66
 msgid ""
 "Add a User here. A regular user has fewer privileges than the "
 "<literal>superuser</literal> (root), but enough to use the Internet, office "
@@ -249,32 +258,32 @@ msgstr ""
 "行ったりするのには十分です。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:47
+#: en/addUser.xml:73
 msgid "<emphasis role=\"bold\">Icon</emphasis>"
 msgstr "<emphasis role=\"bold\">アイコン</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:48
+#: en/addUser.xml:75
 msgid "Click on this button if you want to change the user's icon"
 msgstr "このユーザのアイコンを変更したい場合にこのボタンをクリックします。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:52
+#: en/addUser.xml:80
 msgid "<emphasis role=\"bold\">Real Name</emphasis>"
 msgstr "<emphasis role=\"bold\">本名</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:53
+#: en/addUser.xml:82
 msgid "Insert the user's real name into this text box"
 msgstr "このテキスト ボックスにこのユーザの本名を入力します。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:56
+#: en/addUser.xml:86
 msgid "<emphasis role=\"bold\">Login Name</emphasis>"
 msgstr "<emphasis role=\"bold\">ログイン名</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:57
+#: en/addUser.xml:88
 msgid ""
 "Enter the user login name or let DrakX use a version of the user's real "
 "name. <emphasis role=\"bold\">The login name is case-sensitive.</emphasis>"
@@ -284,7 +293,7 @@ msgstr ""
 "文字と小文字を区別します。</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><caution><simpara>
-#: en/addUser.xml:61
+#: en/addUser.xml:93
 msgid ""
 "The login entered here should be different to any login currently in use for "
 "your <filename>/home</filename> directory. Some user parameters will be "
@@ -297,22 +306,17 @@ msgstr ""
 "ような実際のデータを上書きするかもしれません。"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:65 en/setupBootloader.xml:124
+#: en/addUser.xml:102 en/setupBootloader.xml:182
 msgid "<emphasis role=\"bold\">Password</emphasis>"
 msgstr "<emphasis role=\"bold\">パスワード</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:66
-msgid ""
-"Type in the user password. There is a shield at the end of the text box that "
-"indicates the strength of the password. (See also <xref linkend="
-"\"givePassword\"/>)"
+#: en/addUser.xml:104
+msgid "Type in the user password (remembering the advice in the Note above)."
 msgstr ""
-"ユーザのパスワードを入力します。テキスト ボックスの右端にはパスワードの強度を"
-"示す盾が表示されます。(<xref linkend=\"givePassword\"/>も参照)"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:68
+#: en/addUser.xml:107
 msgid ""
 "<emphasis role=\"bold\">Password (again):</emphasis> Retype the user "
 "password. DrakX will check that you have not mistyped the password."
@@ -322,7 +326,7 @@ msgstr ""
 "していないかをチェックします。"
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:74
+#: en/addUser.xml:114
 msgid ""
 "Any users added while installing Mageia, will have a home directory that is "
 "both read and write protected (umask=0027)"
@@ -331,7 +335,7 @@ msgstr ""
 "ム ディレクトリ (umask=0027) が用意されます。"
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:76
+#: en/addUser.xml:117
 msgid ""
 "You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
@@ -341,17 +345,17 @@ msgstr ""
 "ステップで追加できます。<emphasis>ユーザの管理</emphasis>を選択してください。"
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:79
+#: en/addUser.xml:121
 msgid "The access permissions can also be changed after the install."
 msgstr "アクセス権はインストール後に変更することもできます。"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:85
+#: en/addUser.xml:128
 msgid "User Management (advanced)"
 msgstr "ユーザの管理 (上級)"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:87
+#: en/addUser.xml:131
 msgid ""
 "The <emphasis>Advanced</emphasis> option allows you to edit further settings "
 "for the user you are adding."
@@ -360,7 +364,7 @@ msgstr ""
 "きます。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:91
+#: en/addUser.xml:136
 msgid ""
 "<emphasis>Shell</emphasis>: This drop-down list allows you to change the "
 "shell available to any user you added in the previous screen. Options are "
@@ -371,7 +375,7 @@ msgstr ""
 "<literal>Dash</literal>, <literal>Sh</literal> です。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:143
 msgid ""
 "<emphasis>User ID</emphasis>: Here you can set the user ID for any user you "
 "added in the previous screen. If you are unsure what the purpose of this is, "
@@ -382,7 +386,7 @@ msgstr ""
 "い。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:102
+#: en/addUser.xml:149
 msgid ""
 "<emphasis>Group ID</emphasis>: This lets you set the group ID.  Again, if "
 "unsure, leave it blank."
@@ -538,17 +542,17 @@ msgstr ""
 "行えます。"
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:23
+#: en/bootLive.xml:10
 msgid "Boot Mageia as Live system"
 msgstr "Mageia をライブ システムとしてブートする"
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:28
+#: en/bootLive.xml:14
 msgid "Booting the medium"
 msgstr "メディアをブートする"
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:31
+#: en/bootLive.xml:16
 msgid ""
 "You can boot directly from a Live DVD or USB. Usually, you just need to plug "
 "the USB device in or place the DVD in the drive and restart the computer."
@@ -557,7 +561,7 @@ msgstr ""
 "し込むか DVD をドライブに挿入してコンピュータを再起動するだけです。"
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:35
+#: en/bootLive.xml:19
 msgid ""
 "If the computer does not automatically boot from the USB or DVD you may need "
 "to reconfigure your BIOS Boot Disk priority. Alternatively, you might try "
@@ -569,7 +573,7 @@ msgstr ""
 "バイスから起動するかを選択するメニューを試してみるとよいでしょう。"
 
 #. type: Content of: <section><section><tip><para>
-#: en/bootLive.xml:41
+#: en/bootLive.xml:24
 msgid ""
 "To access the BIOS or boot menu when the computer is starting, you can try "
 "pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or <keycap>Esc</"
@@ -583,7 +587,7 @@ msgstr ""
 "<keycap>F10</keycap>, <keycap>F11</keycap> のいずれかを押してみてください。"
 
 #. type: Content of: <section><section><note><para>
-#: en/bootLive.xml:50
+#: en/bootLive.xml:32
 msgid ""
 "The actual screen that you will first see when booting from the Live media "
 "will depend on whether your computer motherboard is of the Legacy (BIOS) or "
@@ -593,37 +597,38 @@ msgstr ""
 "マザーボードが Legacy (BIOS) か UEFI かの種類によって変わります。"
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:58
+#: en/bootLive.xml:39
 msgid "In BIOS/CSM/Legacy mode"
 msgstr "BIOS/CSM/Legacy モード"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:62
+#: en/bootLive.xml:42
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"../live-bootCSM.png\" align=\"center\"/> "
+"</imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> </"
+"<imageobject> <imagedata fileref=\"dx2-summaryTop.png\" align=\"center\"/> </"
 "imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:67
+#: en/bootLive.xml:46
 msgid "First screen while booting in BIOS mode"
 msgstr "BIOS モードにおけるブート時の最初の画面"
 
 #. type: Content of: <section><section><section><itemizedlist><title>
-#: en/bootLive.xml:72 en/bootLive.xml:144 en/installer.xml:106
-#: en/installer.xml:154
+#: en/bootLive.xml:50 en/bootLive.xml:104 en/installer.xml:108
+#: en/installer.xml:156
 msgid "Menu"
 msgstr "メニュー"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:75 en/bootLive.xml:147
+#: en/bootLive.xml:52 en/bootLive.xml:106
 msgid "<emphasis role=\"bold\">Boot Mageia</emphasis>"
 msgstr "<emphasis role=\"bold\">Mageia を起動</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:77
+#: en/bootLive.xml:53
 msgid ""
 "This option will boot the Mageia Live system from the connected DVD/USB "
 "media (expect a very slow system compared to an installed OS)."
@@ -633,12 +638,12 @@ msgstr ""
 "てください)。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:81
+#: en/bootLive.xml:56
 msgid "Once the boot is done, you can proceed to the installation."
 msgstr "ブートが完了すれば、インストールを行うことができます。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:86 en/bootLive.xml:102
+#: en/bootLive.xml:60 en/bootLive.xml:72
 msgid ""
 "<emphasis role=\"bold\">+ use non-free video drivers (slower to boot)</"
 "emphasis>"
@@ -647,33 +652,33 @@ msgstr ""
 "す)</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:89
+#: en/bootLive.xml:62
 msgid "Boot the Mageia Live system using non-free video drivers"
 msgstr ""
 "非フリーなビデオ ドライバを用いて Mageia ライブ システムをブートします。"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:96 en/bootLive.xml:155 en/installer.xml:109
+#: en/bootLive.xml:68 en/bootLive.xml:112 en/installer.xml:111
 msgid "<emphasis role=\"bold\">Install Mageia</emphasis>"
 msgstr "<emphasis role=\"bold\">Mageia をインストール</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:98 en/bootLive.xml:157
+#: en/bootLive.xml:69 en/bootLive.xml:113
 msgid "This option will install Mageia to a hard disk."
 msgstr "この選択肢は Mageia をハード ディスクにインストールします。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:105
+#: en/bootLive.xml:74
 msgid "Install Mageia using non-free video drivers"
 msgstr "非フリーなビデオ ドライバを用いて Mageia をインストールします。"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:111 en/installer.xml:125
+#: en/bootLive.xml:79 en/installer.xml:127
 msgid "<emphasis role=\"bold\">Memory Test</emphasis>"
 msgstr "<emphasis role=\"bold\">メモリをテスト</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:113 en/installer.xml:127
+#: en/bootLive.xml:80 en/installer.xml:129
 msgid ""
 "Test the installed RAM by performing multiple read and write operations. "
 "Reboot to end the test."
@@ -682,12 +687,12 @@ msgstr ""
 "テストを終了します。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:118 en/bootLive.xml:161
+#: en/bootLive.xml:84 en/bootLive.xml:116
 msgid "<emphasis role=\"bold\"> F2 Language</emphasis>"
 msgstr "<emphasis role=\"bold\"> F2 言語</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:120 en/bootLive.xml:163
+#: en/bootLive.xml:85 en/bootLive.xml:117
 msgid ""
 "Press <keycap>F2</keycap> to have the installer use a specific language "
 "during the installation. Use the arrow keys to select the language then "
@@ -697,26 +702,27 @@ msgstr ""
 "言語を選択して <keycap>Enter</keycap> を押します。"
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:129
+#: en/bootLive.xml:93
 msgid "In UEFI mode"
 msgstr "UEFI モード"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:133
+#: en/bootLive.xml:96
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:139
+#: en/bootLive.xml:100
 msgid "First screen while booting in UEFI mode"
 msgstr "UEFI モードにおけるブート時の最初の画面"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:149
+#: en/bootLive.xml:107
 msgid ""
 "This option will boot the Mageia Live system from the connected DVD/USB "
 "media (expect a very slow system compared to an installed OS).  Once the "
@@ -727,7 +733,7 @@ msgstr ""
 "てください)。ブートが完了すれば、インストールを行うことができます。"
 
 #. type: Content of: <section><section><note><para>
-#: en/bootLive.xml:170
+#: en/bootLive.xml:123
 msgid ""
 "If you booted from a USB stick, you will see the above menu options "
 "duplicated, and in this case, you should choose from the menu pair that will "
@@ -992,12 +998,12 @@ msgstr ""
 "に設定するか、もしくはすべてが UTC/GMT になるようにしてください。"
 
 #. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:24
+#: en/configureX_card_list.xml:27
 msgid "Choose an X Server (Configure your Graphic Card)"
 msgstr "X サーバを選択する (グラフィック カードを設定する)"
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_card_list.xml:29
+#: en/configureX_card_list.xml:32
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_card_list."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_card_list-im1\"/> </"
@@ -1008,7 +1014,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:35
+#: en/configureX_card_list.xml:38
 msgid ""
 "DrakX has a very comprehensive database of video cards and will usually "
 "correctly identify your video device."
@@ -1017,7 +1023,7 @@ msgstr ""
 "お使いのビデオ デバイスを正しく識別します。"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:38
+#: en/configureX_card_list.xml:41
 msgid ""
 "If the installer has not correctly detected your graphic card and you know "
 "which one you have, you can select it from the tree by:"
@@ -1027,22 +1033,22 @@ msgstr ""
 "ができます:"
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_card_list.xml:41 en/configureX_monitor.xml:74
+#: en/configureX_card_list.xml:44 en/configureX_monitor.xml:78
 msgid "Vendor"
 msgstr "ベンダ"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:45
+#: en/configureX_card_list.xml:48
 msgid "then the make of your card"
 msgstr "お使いのカードのメーカー"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:49
+#: en/configureX_card_list.xml:52
 msgid "and the model of card"
 msgstr "カードのモデル"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:53
+#: en/configureX_card_list.xml:56
 msgid ""
 "If you cannot find your card in the vendor lists (because it's not yet in "
 "the database or it's an older card) you may find a suitable driver in the "
@@ -1058,7 +1064,7 @@ msgstr ""
 "機能を提供する VESA ドライバを使用するという選択肢があります。"
 
 #. type: Content of: <section><caution><para>
-#: en/configureX_card_list.xml:61
+#: en/configureX_card_list.xml:64
 msgid ""
 "Be aware that if you select an incompatible driver you may only have access "
 "to the <emphasis>Command Line Interface</emphasis>"
@@ -1067,7 +1073,7 @@ msgstr ""
 "emphasis>しか利用できないという点に留意してください。"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:65
+#: en/configureX_card_list.xml:68
 msgid ""
 "Some video card manufacturers provide proprietary drivers for Linux which "
 "may only be available in the <emphasis>Nonfree</emphasis> repository and in "
@@ -1083,17 +1089,13 @@ msgstr ""
 "最初の再起動後にこれを行うのがよいでしょう。"
 
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:11
-msgid "Graphic Card and Monitor Configuration"
+#: en/configureX_chooser.xml:23
+#, fuzzy
+msgid "Graphics Card and Monitor Configuration"
 msgstr "グラフィック カードとモニタを設定する"
 
-#.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
-#. 2018/02/15 apb: Some text and typography.
-#. 2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.
-#. 2018/02/23 apb: Typo.
-#. 2019/01/06 apb: Slight reword, split 1st para in two.
 #. type: Content of: <section><mediaobject>
-#: en/configureX_chooser.xml:26
+#: en/configureX_chooser.xml:28
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_chooser."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_chooser-im1\"/> </"
@@ -1104,7 +1106,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:32
+#: en/configureX_chooser.xml:34
 msgid ""
 "No matter which graphical environment (also known as desktop environment) "
 "you chose for this install of Mageia, they are all based on a graphical user "
@@ -1121,7 +1123,7 @@ msgstr ""
 "である必要があります。"
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:39
+#: en/configureX_chooser.xml:41
 msgid ""
 "Choose the appropriate settings manually if you think the details are "
 "incorrect, or if none are shown."
@@ -1130,12 +1132,13 @@ msgstr ""
 "しい設定を選択してください。"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:44
-msgid "<emphasis role=\"bold\">Graphic Card</emphasis>"
+#: en/configureX_chooser.xml:46
+#, fuzzy
+msgid "<emphasis role=\"bold\">Graphics Card</emphasis>"
 msgstr "Window System<emphasis role=\"bold\">グラフィック カード</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:47
+#: en/configureX_chooser.xml:49
 msgid ""
 "If you need to, you can select a specific card from this expandable list. "
 "See <xref linkend=\"configureX_card_list\"/>."
@@ -1144,12 +1147,12 @@ msgstr ""
 "linkend=\"configureX_card_list\"/> を参照してください。"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:52
+#: en/configureX_chooser.xml:54
 msgid "<emphasis role=\"bold\">Monitor</emphasis>"
 msgstr "<emphasis role=\"bold\">モニタ</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:55
+#: en/configureX_chooser.xml:57
 msgid ""
 "You can choose Plug 'n Play, if applicable, or choose your monitor from the "
 "<emphasis>Vendor</emphasis> or <emphasis>Generic</emphasis> lists. Choose "
@@ -1164,22 +1167,22 @@ msgstr ""
 "い。"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:63
+#: en/configureX_chooser.xml:65
 msgid "<emphasis role=\"bold\">Resolution</emphasis>"
 msgstr "<emphasis role=\"bold\">解像度</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:66
+#: en/configureX_chooser.xml:68
 msgid "The resolution and color depth of your monitor can be set here."
 msgstr "お使いのモニタの解像度と色深度をここで設定できます。"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:71
+#: en/configureX_chooser.xml:73
 msgid "<emphasis role=\"bold\">Test</emphasis>"
 msgstr "<emphasis role=\"bold\">テスト</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:74
+#: en/configureX_chooser.xml:76
 msgid ""
 "The test button does not always appear during install. If the option is "
 "there, and you test your settings, you should be asked to confirm that your "
@@ -1196,17 +1199,17 @@ msgstr ""
 "はあなたの設定が安全かを確認してください。"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:85
+#: en/configureX_chooser.xml:87
 msgid "<emphasis role=\"bold\">Options</emphasis>"
 msgstr "<emphasis role=\"bold\">オプション</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:88
+#: en/configureX_chooser.xml:90
 msgid "Here you can choose to enable or disable various options."
 msgstr "ここで色々な項目を有効にしたり無効にしたりできます。"
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_chooser.xml:93
+#: en/configureX_chooser.xml:95
 msgid ""
 "There is a risk of damaging a monitor if you choose refresh rates that are "
 "outside the frequency range of that monitor. This applies to older CRT "
@@ -1218,12 +1221,12 @@ msgstr ""
 "ない周波数を受け付けずに通常はスタンバイ モードに入ります。"
 
 #. type: Content of: <section><info><title>
-#: en/configureX_monitor.xml:22
+#: en/configureX_monitor.xml:26
 msgid "Choosing your Monitor"
 msgstr "モニタを選択する"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:25
+#: en/configureX_monitor.xml:29
 msgid ""
 "DrakX has a very comprehensive database of monitors and will usually "
 "correctly identify yours."
@@ -1232,7 +1235,7 @@ msgstr ""
 "のモニタを正しく識別します。"
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:30
+#: en/configureX_monitor.xml:34
 msgid ""
 "<emphasis role=\"bold\">Selecting a monitor with different characteristics "
 "could damage your monitor or video hardware. Please don't try something "
@@ -1245,7 +1248,7 @@ msgstr ""
 "ください。"
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:38
+#: en/configureX_monitor.xml:42
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
@@ -1256,12 +1259,12 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:46
+#: en/configureX_monitor.xml:50
 msgid "Custom"
 msgstr "カスタム"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:49
+#: en/configureX_monitor.xml:53
 msgid ""
 "This option allows you to set two critical parameters: the vertical refresh "
 "rate and the horizontal sync rate. Vertical refresh determines how often the "
@@ -1273,7 +1276,7 @@ msgstr ""
 "表示される速度となります。"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:55
+#: en/configureX_monitor.xml:59
 msgid ""
 "It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor "
 "type with a sync range that is beyond the capabilities of your monitor: you "
@@ -1285,12 +1288,12 @@ msgstr ""
 "点があれば、控えめな設定を選択した上でモニタの説明書をご覧ください。"
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:64
+#: en/configureX_monitor.xml:68
 msgid "Plug'n Play"
 msgstr "プラグ アンド プレイ"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:67
+#: en/configureX_monitor.xml:71
 msgid ""
 "This is the default option and automatically tries to determine the monitor "
 "type from the monitor database."
@@ -1299,38 +1302,40 @@ msgstr ""
 "みます。"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:77
+#: en/configureX_monitor.xml:81
+#, fuzzy
 msgid ""
 "If the installer has not correctly detected your monitor and you know which "
-"one you have, you can select it from the tree by selecting:"
+"one you have, you can choose it from the options by selecting:"
 msgstr ""
 "もしインストーラがお使いのモニタを正しく検出せず、かつあなたがお使いのモニタ"
 "を把握しているのであれば、以下を選択することでツリーの一覧から選択することが"
 "できます:"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:86
+#: en/configureX_monitor.xml:90
 msgid "Manufacturer"
 msgstr "メーカー"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:90
+#: en/configureX_monitor.xml:94
 msgid "Monitor model"
 msgstr "モニタのモデル"
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:96
+#: en/configureX_monitor.xml:100
 msgid "Generic"
 msgstr "一般"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:99
+#: en/configureX_monitor.xml:103
+#, fuzzy
 msgid ""
-"Selecting this group will list nearly 30 display configurations such as "
-"1024x768 @ 60Hz and includes flat-panel displays as used in laptops. This is "
-"often a good monitor selection group if you need to use the VESA card driver "
-"when your video hardware cannot be determined automatically.  Once again it "
-"may be wise to be conservative in your selections."
+"Selecting this group will list approximately 30 display configurations such "
+"as 1024x768 @ 60Hz and includes flat-panel displays as used in laptops.  "
+"This is often a good monitor selection group if you need to use the VESA "
+"card driver when your video hardware cannot be determined automatically. "
+"Once again, it may be wise to be conservative in your selections."
 msgstr ""
 "このグループを選択すると 1024x768 @ 60Hz のような約 30 のディスプレイ設定が一"
 "覧表示され、ラップトップで使用されるフラット パネル ディスプレイも含まれま"
@@ -1339,12 +1344,12 @@ msgstr ""
 "すが、設定は控えめにするのが賢明でしょう。"
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:22
+#: en/diskdrake.xml:24
 msgid "Custom Disk Partitioning with DiskDrake"
 msgstr "DiskDrake によるパーティションのカスタム設定"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:27
+#: en/diskdrake.xml:29
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-diskdrake.png\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1355,7 +1360,7 @@ msgstr ""
 "<imagedata align=\"center\" fileref=\"live-diskdrake.png\"/> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:38
+#: en/diskdrake.xml:40
 msgid ""
 "Modify the layout of your disk(s) here. You can remove or create partitions, "
 "change the filesystem or size of a partition and even view their details "
@@ -1366,18 +1371,19 @@ msgstr ""
 "にそれらの詳細を見ることさえできます。"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:47
+#, fuzzy
 msgid ""
 "There is a tab at the top for every detected hard disk (or other storage "
-"device, like a USB key). In the screenshot above there are two available "
-"devices: <filename>sda </filename>and <filename>sdb</filename>."
+"device, like a USB key), for example: <filename>sda</filename>, "
+"<filename>sdb</filename>, <filename>sdc</filename> etc."
 msgstr ""
 "検出された各ハード ディスク (または他の USB キーのようなストレージ デバイス) "
 "の上部にタブがあります。上のスクリーンショットでは二つの利用可能なデバイス: "
 "<filename>sda</filename> と <filename>sdb</filename> があります。"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:52
+#: en/diskdrake.xml:54
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it. "
@@ -1390,7 +1396,7 @@ msgstr ""
 "の種類を選択したりといった追加の項目を提供します。"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:60
+#: en/diskdrake.xml:62
 msgid ""
 "Continue until you have adjusted everything to your satisfaction, then click "
 "<emphasis>Done</emphasis> when you're ready."
@@ -1399,7 +1405,7 @@ msgstr ""
 "emphasis>をクリックします。"
 
 #. type: Content of: <section><warning><orderedlist><listitem><para>
-#: en/diskdrake.xml:69
+#: en/diskdrake.xml:71
 msgid ""
 "Take care with the <emphasis>Clear all</emphasis> option, use it only if you "
 "are sure you want to wipe all partitions on the selected storage device."
@@ -1409,7 +1415,7 @@ msgstr ""
 "す。"
 
 #. type: Content of: <section><warning><orderedlist><listitem><para>
-#: en/diskdrake.xml:75
+#: en/diskdrake.xml:77
 msgid ""
 "If you wish to use encryption on your <filename>/</filename> partition you "
 "must ensure that you have a separate <filename>/boot</filename> partition. "
@@ -1422,7 +1428,7 @@ msgstr ""
 "はお使いのシステムは起動不能になります。"
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/diskdrake.xml:87
+#: en/diskdrake.xml:89
 msgid ""
 "If you are installing Mageia on a UEFI system, check that an ESP (EFI System "
 "Partition) is present and correctly mounted on <filename>/boot/EFI</"
@@ -1433,7 +1439,7 @@ msgstr ""
 "をチェックしてください。下の図 1 を参照してください。"
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/diskdrake.xml:93
+#: en/diskdrake.xml:95
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
 "partition is present and of the correct type. See Figure 2 below."
@@ -1443,12 +1449,12 @@ msgstr ""
 "ださい。"
 
 #. type: Content of: <section><figure><title>
-#: en/diskdrake.xml:101
+#: en/diskdrake.xml:103
 msgid "EFI System Partition"
 msgstr "EFI システム パーティション"
 
 #. type: Content of: <section><figure><mediaobject>
-#: en/diskdrake.xml:104
+#: en/diskdrake.xml:106
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-diskdrake2.png\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1459,17 +1465,17 @@ msgstr ""
 "<imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/> </imageobject>"
 
 #. type: Content of: <section><figure>
-#: en/diskdrake.xml:103 en/diskdrake.xml:117
+#: en/diskdrake.xml:105 en/diskdrake.xml:119
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><figure><title>
-#: en/diskdrake.xml:115
+#: en/diskdrake.xml:117
 msgid "BIOS boot partition"
 msgstr "BIOS ブート パーティション"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:118 en/doPartitionDisks.xml:201
+#: en/diskdrake.xml:120 en/doPartitionDisks.xml:206
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1492,12 +1498,12 @@ msgid "Partitioning"
 msgstr "パーティションの設定"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:31
 msgid "Suggested Partitioning"
 msgstr "自動パーティション設定"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:34
 msgid ""
 "In this screen you can see the content of your hard drive(s) along with the "
 "DrakX partitioning proposals for where to install Mageia."
@@ -1506,7 +1512,7 @@ msgstr ""
 "ル先の提案と一緒に見ることができます。"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:34
+#: en/doPartitionDisks.xml:38
 msgid ""
 "The actual options available from those shown below will vary according to "
 "the layout and content of your particular hard drive(s)."
@@ -1515,7 +1521,7 @@ msgstr ""
 "イアウトや内容によって変化します。"
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:39
+#: en/doPartitionDisks.xml:43
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1528,17 +1534,17 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><itemizedlist><title>
-#: en/doPartitionDisks.xml:49
+#: en/doPartitionDisks.xml:53
 msgid "Main Options"
 msgstr "主な選択肢"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:56
 msgid "<emphasis role=\"bold\">Use Existing Partitions</emphasis>"
 msgstr "<emphasis role=\"bold\">既存のパーティションを使う</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:59
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1547,12 +1553,12 @@ msgstr ""
 "り、インストールに使用できます。"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:61
+#: en/doPartitionDisks.xml:65
 msgid "<emphasis role=\"bold\">Use Free Space</emphasis>"
 msgstr "<emphasis role=\"bold\">空き領域を使う</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:68
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1561,51 +1567,89 @@ msgstr ""
 "Mageia のインストールに使用します。"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:70
+#: en/doPartitionDisks.xml:74
 msgid ""
 "<emphasis role=\"bold\">Use Free Space on a Windows Partition</emphasis>"
 msgstr ""
 "<emphasis role=\"bold\">Windows パーティションの空き領域を使う</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:73
+#: en/doPartitionDisks.xml:77
+#, fuzzy
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it. 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 important files!"
+"installation but see the warning below."
 msgstr ""
 "既存の Windows パーティションに空き領域がある場合、インストーラはそれを使用す"
 "ることを提案するかもしれません。これは新しく Mageia をインストールする領域を"
 "作成するための有用な方法になりえますが、リスクのある操作となるため、大事な"
 "ファイルは事前にバックアップしておくのがよいでしょう!"
 
+#. type: Content of: <section><itemizedlist><listitem><para><mediaobject>
+#: en/doPartitionDisks.xml:87
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:79
+#: en/doPartitionDisks.xml:82
+#, fuzzy
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
 "light blue and the proposed Mageia partition in dark blue with their "
 "intended sizes just underneath. You have the option to modify these sizes by "
 "clicking and dragging the gap between both partitions.  See the following "
-"screenshot:"
+"screenshot:<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr ""
 "この選択肢では、インストーラは残っている Windows パーティションを明るい青色"
 "で、Mageia 用に提案されたパーティションを暗い青色で、それぞれサイズも反映して"
 "下に表示します。これらのサイズは両方のパーティションの隙間のクリックとドラッ"
 "グで変更できます。下のスクリーンショットをご覧ください。"
 
+#. type: Content of: <section><itemizedlist><listitem><warning><para>
+#: en/doPartitionDisks.xml:97
+msgid ""
+"This involves shrinking the size of the Windows partition, and therefore is "
+"a risky operation, so you should make sure you have backed up all important "
+"files before proceeding."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><important><para>
+#: en/doPartitionDisks.xml:103
+#, fuzzy
+msgid ""
+"The partition must be \"clean\", meaning that Windows must have closed down "
+"correctly the last time it was used. It must also have been defragmented, "
+"although this is not a guarantee that all files in the partition have been "
+"moved out of the area that is about to be used for Mageia."
+msgstr ""
+"これは Windows のパーティションのサイズを縮めることを伴います。パーティション"
+"は \"クリーン\" でなければならず、これは Windows を前回使用したときに正常に終"
+"了していなければならないことを意味します。また、このパーティション内のすべて"
+"のファイルがこれから使用される領域から出ていくという保証ではないもののデフラ"
+"グもされている必要があります。個人的なファイルはバックアップすることを強く推"
+"奨します。"
+
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:87
+#: en/doPartitionDisks.xml:112
 msgid "<emphasis role=\"bold\">Erase and use Entire Disk</emphasis>"
 msgstr "<emphasis role=\"bold\">ディスク全体を消去して使用</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:90
+#: en/doPartitionDisks.xml:115
 msgid "This option will allocate the entire drive for Mageia"
 msgstr "この選択肢ではドライブの全体を Mageia 用に割り当てます。"
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:119
 msgid ""
 "This will erase ALL data on the selected hard drive. Take care! If you "
 "intend to use part of the disk for something else, or you already have data "
@@ -1616,30 +1660,13 @@ msgstr ""
 "上にデータがあってそれが削除されることに備えていない場合、この選択肢は使用し"
 "ないでください。"
 
-#. type: Content of: <section><itemizedlist><listitem><important><para>
-#: en/doPartitionDisks.xml:101
-msgid ""
-"Note that this involves shrinking the size of the Windows partition. The "
-"partition must be \"clean\", meaning that Windows must have closed down "
-"correctly the last time it was used. It must also have been defragmented, "
-"although this is not a guarantee that all files in the partition have been "
-"moved out of the area that is about to be used. It is highly recommended to "
-"back up your personal files."
-msgstr ""
-"これは Windows のパーティションのサイズを縮めることを伴います。パーティション"
-"は \"クリーン\" でなければならず、これは Windows を前回使用したときに正常に終"
-"了していなければならないことを意味します。また、このパーティション内のすべて"
-"のファイルがこれから使用される領域から出ていくという保証ではないもののデフラ"
-"グもされている必要があります。個人的なファイルはバックアップすることを強く推"
-"奨します。"
-
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:112
+#: en/doPartitionDisks.xml:127
 msgid "<emphasis role=\"bold\">Custom Disk Partitioning</emphasis>"
 msgstr "<emphasis role=\"bold\">パーティションを手動で設定</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:115
+#: en/doPartitionDisks.xml:130
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1647,21 +1674,8 @@ msgstr ""
 "これはお使いのハード ドライブ上のインストール場所を完全にコントロールすること"
 "ができます。"
 
-#. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:122
-msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
-
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:131
+#: en/doPartitionDisks.xml:136
 msgid ""
 "If you are not using the <emphasis>Custom disk partitioning</emphasis> "
 "option, then the installer will allocate the available space according to "
@@ -1671,7 +1685,7 @@ msgstr ""
 "は利用可能な領域を以下のルールに従って割り当てます:"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:137
+#: en/doPartitionDisks.xml:142
 msgid ""
 "If the total available space is less than 50 GB, then only one partition is "
 "created. This will be the <filename>/</filename> (root)  partition."
@@ -1680,7 +1694,7 @@ msgstr ""
 "<filename>/</filename> (ルート) パーティションになります。"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:143
+#: en/doPartitionDisks.xml:148
 msgid ""
 "If the total available space is greater than 50 GB, then three partitions "
 "are created"
@@ -1688,7 +1702,7 @@ msgstr ""
 "合計空き領域が 50 GB を超える場合、三つのパーティションが作成されます。"
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:148
+#: en/doPartitionDisks.xml:153
 msgid ""
 "6/19 of the total available place is allocated to <filename>/</filename> "
 "with a maximum of 50 GB"
@@ -1697,18 +1711,18 @@ msgstr ""
 "す。"
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:153
+#: en/doPartitionDisks.xml:158
 msgid "1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB"
 msgstr "1/19 が<filename>スワップ</filename>に最大で 4 GB 割り当てられます。"
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:158
+#: en/doPartitionDisks.xml:163
 msgid "the rest (at least 12/19) is allocated to <filename>/home</filename>"
 msgstr ""
 "残り (最低でも 12/19) が <filename>/home</filename> に割り当てられます。"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:165
+#: en/doPartitionDisks.xml:170
 msgid ""
 "This means that from 160 GB or greater available space, the installer will "
 "create three partitions:"
@@ -1717,22 +1731,22 @@ msgstr ""
 "を作成することを意味します:"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:170
+#: en/doPartitionDisks.xml:175
 msgid "50 GB for <filename>/</filename>"
 msgstr "<filename>/</filename> 用に 50 GB"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:174
+#: en/doPartitionDisks.xml:179
 msgid "4 GB for <filename>swap</filename>"
 msgstr "<filename>スワップ</filename>用に 4 GB"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:178
+#: en/doPartitionDisks.xml:183
 msgid "and the remainder for <filename>/home</filename>"
 msgstr "<filename>/home</filename> 用に残りすべて"
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:183
+#: en/doPartitionDisks.xml:188
 msgid ""
 "If you are using a UEFI system, the ESP (EFI System Partition) will be "
 "automatically detected - or created if it does not exist yet - and mounted "
@@ -1746,7 +1760,7 @@ msgstr ""
 "ションを手動で設定</emphasis>を選択することです。"
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:189
+#: en/doPartitionDisks.xml:194
 msgid ""
 "If you are using a Legacy (also known as BIOS) system with a GPT partitioned "
 "disk, you need to create a BIOS boot partition if it doesn't already exist. "
@@ -1763,22 +1777,27 @@ msgstr ""
 "成することができます。"
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:196
+#: en/doPartitionDisks.xml:201
 msgid "See <xref linkend=\"diskdrake\"/> for information on how to proceed."
 msgstr ""
 "続行する方法の詳細は <xref linkend=\"diskdrake\"/> を参照してください。"
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:211
+#: en/doPartitionDisks.xml:216
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4.png"
-"\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks4.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks4.png\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4.png"
-"\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:217
+#: en/doPartitionDisks.xml:226
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
 "previous standard of 512. Due to lack of available hardware, the "
@@ -1791,7 +1810,7 @@ msgstr ""
 "ブをテストしていません。"
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:222
+#: en/doPartitionDisks.xml:231
 msgid ""
 "Some SSD devices now use an erase block size over 1 MB. If you have such a "
 "device we suggest that you partition the drive in advance, using an "
@@ -1804,17 +1823,17 @@ msgstr ""
 "設定を用いることを提案します:"
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:229
+#: en/doPartitionDisks.xml:238
 msgid "<emphasis>Align to</emphasis> = MiB"
 msgstr "<emphasis>位置あわせ</emphasis> = MiB"
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:233
+#: en/doPartitionDisks.xml:242
 msgid "<emphasis>Free space preceding (MiB)</emphasis> = 2"
 msgstr "<emphasis>前方の空き領域 (MiB)</emphasis> = 2"
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:237
+#: en/doPartitionDisks.xml:246
 msgid ""
 "Also make sure all partitions are created using an even number of megabytes."
 msgstr ""
@@ -2001,12 +2020,12 @@ msgstr ""
 "い。"
 
 #. type: Content of: <section><info><title>
-#: en/firewall.xml:7
+#: en/firewall.xml:16
 msgid "Firewall"
 msgstr "ファイアウォール"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:10
+#: en/firewall.xml:19
 msgid ""
 "This section allows you to configure some simple firewall rules: they "
 "determine which type of message from the Internet will be accepted by the "
@@ -2018,8 +2037,18 @@ msgstr ""
 "入れるかを決定します。これは、その後で、システム上の対応するサービスをイン"
 "ターネットからアクセス可能にします。"
 
+#. type: Content of: <section><mediaobject>
+#: en/firewall.xml:26
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-firewall.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome.png\"/> </"
+"imageobject>"
+
 #. type: Content of: <section><para>
-#: en/firewall.xml:16
+#: en/firewall.xml:31
 msgid ""
 "In the default setting (no button is checked), no service of the system is "
 "accessible from the network. The <emphasis>Everything (no firewall)</"
@@ -2039,7 +2068,7 @@ msgstr ""
 "無効化することです。"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:25
+#: en/firewall.xml:40
 msgid ""
 "All other options are more or less self-explanatory. As an example, you will "
 "enable the CUPS server if you want printers on your machine to be accessible "
@@ -2049,12 +2078,12 @@ msgstr ""
 "ンタをネットワークからアクセス可能にしたい場合は CUPS サーバを有効にします。"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:29
+#: en/firewall.xml:44
 msgid "<emphasis role=\"bold\">Advanced</emphasis>"
 msgstr "<emphasis role=\"bold\">上級</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:31
+#: en/firewall.xml:46
 msgid ""
 "The <emphasis>Advanced</emphasis> option opens a window where you can enable "
 "a series of services by typing a list of <quote>couples</quote> (blank "
@@ -2064,33 +2093,37 @@ msgstr ""
 "の一覧 (空白区切り) を入力することで複数のサービスを有効にできます"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:35
-msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
+#: en/firewall.xml:50
+#, fuzzy
+msgid "<emphasis>&lt;port-number&gt;/&lt;protocol&gt;</emphasis>"
 msgstr "<emphasis>&lt;ポート番号>/&lt;プロトコル></emphasis>"
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:38
+#: en/firewall.xml:53
+#, fuzzy
 msgid ""
-"- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
-"the service you want to enable (e.g. 873 for the RSYNC service) as defined "
-"in <emphasis>RFC-433</emphasis>;"
+"- <emphasis>&lt;port-number&gt;</emphasis> is the value of the port assigned "
+"to the service you want to enable (e.g. 873 for the RSYNC service) as "
+"defined in <emphasis>RFC-433</emphasis>;"
 msgstr ""
 "- <emphasis>&lt;ポート番号></emphasis>は有効にしたいサービスに割り当てられる"
 "ポートの値 (例 RSYNC サービスの場合 873) で、<emphasis>RFC-433</emphasis> で"
 "定められています;"
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:42
+#: en/firewall.xml:57
+#, fuzzy
 msgid ""
-"- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
-"<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
+"- <emphasis>&lt;protocol&gt;</emphasis> is one of <emphasis>TCP</emphasis> "
+"or <emphasis>UDP</emphasis> - the internet protocol that is used by the "
+"service."
 msgstr ""
 "- <emphasis>&lt;プロトコル></emphasis> は <emphasis>TCP</emphasis> もしくは "
 "<emphasis>UDP</emphasis> のいずれかです - そのサービスによって用いられるイン"
 "ターネット プロトコルです。"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:47
+#: en/firewall.xml:62
 msgid ""
 "For instance, the entry for enabling access to the RSYNC service therefore "
 "is <emphasis>873/tcp</emphasis>."
@@ -2099,7 +2132,7 @@ msgstr ""
 "<emphasis>873/tcp</emphasis> となります。"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:50
+#: en/firewall.xml:65
 msgid ""
 "In case a service is implemented to use both protocols, you specify 2 "
 "couples for the same port."
@@ -2185,12 +2218,12 @@ msgid "Graphical Configuration"
 msgstr "グラフィカル設定"
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:32
+#: en/installer.xml:34
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, Mageia インストーラ"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:35
+#: en/installer.xml:37
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -2201,12 +2234,12 @@ msgstr ""
 "に設計されています。"
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:40
+#: en/installer.xml:42
 msgid "The installation steps"
 msgstr "インストールのステップ"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:44
+#: en/installer.xml:46
 msgid ""
 "The install process is divided into a number of steps - the status of which "
 "is indicated in a panel to the left of the screen."
@@ -2215,7 +2248,7 @@ msgstr ""
 "パネルに示されます。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:50
+#: en/installer.xml:52
 msgid ""
 "Each step has one or more screens, which may also have <emphasis>Advanced</"
 "emphasis> sections with extra, less commonly required options."
@@ -2224,7 +2257,7 @@ msgstr ""
 "目のための<emphasis>上級</emphasis>セクションもあります。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:56
+#: en/installer.xml:58
 msgid ""
 "Most screens have <emphasis>Help</emphasis> buttons for further details "
 "about the particular step."
@@ -2233,7 +2266,7 @@ msgstr ""
 "いての詳細を見ることができます。"
 
 #. type: Content of: <section><section><caution><para>
-#: en/installer.xml:62
+#: en/installer.xml:64
 msgid ""
 "If at some point during the install you decide to abort the installation, it "
 "is possible to reboot, but please think twice before you do this. Once a "
@@ -2248,7 +2281,7 @@ msgstr ""
 "です。"
 
 #. type: Content of: <section><section><caution><para>
-#: en/installer.xml:68
+#: en/installer.xml:70
 msgid ""
 "If, in spite of this, you are very sure rebooting is what you want, go to a "
 "text terminal by pressing the keys <keycombo> <keycap>Ctrl</keycap> "
@@ -2262,12 +2295,12 @@ msgstr ""
 "keycap> <keycap>Delete</keycap> </keycombo> を同時に押すと再起動します。"
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:86
+#: en/installer.xml:88
 msgid "Installation Welcome Screen"
 msgstr "インストールのようこそ画面"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:88
+#: en/installer.xml:90
 msgid ""
 "The particular screen that you will first see when booting from the "
 "Installation media will depend on whether your computer motherboard is of "
@@ -2277,7 +2310,7 @@ msgstr ""
 "ピュータのマザーボードが Legacy (BIOS) か UEFI かの種類によって変わります。"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:92
+#: en/installer.xml:94
 msgid ""
 "The welcome menu screen has various options, however the default option will "
 "start the installer, and is normally all that you will need."
@@ -2286,12 +2319,12 @@ msgstr ""
 "トーラは開始するため、通常はこれで問題ありません。"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:97
+#: en/installer.xml:99
 msgid "Legacy (BIOS) Systems"
 msgstr "Legacy (BIOS) システム"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:100
+#: en/installer.xml:102
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome.png\"/> </"
 "imageobject>"
@@ -2300,7 +2333,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:111
+#: en/installer.xml:113
 msgid ""
 "Install Mageia to a hard disk. This is the default option, and will "
 "automatically start after a short while unless another option is selected."
@@ -2309,12 +2342,12 @@ msgstr ""
 "ションが選択されていなければしばらくしてから自動的に開始します。"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:117
+#: en/installer.xml:119
 msgid "<emphasis role=\"bold\">Rescue System</emphasis>"
 msgstr "<emphasis role=\"bold\">システムを復旧</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:119
+#: en/installer.xml:121
 msgid ""
 "This option allows you to either re-install the bootloader for an existing "
 "Mageia installation or you can use it to restore a Windows bootloader."
@@ -2323,22 +2356,22 @@ msgstr ""
 "Windows のブート ローダの復元が行えます。"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:132
+#: en/installer.xml:134
 msgid "<emphasis role=\"bold\">F2: Language</emphasis>"
 msgstr "<emphasis role=\"bold\">F2: 言語</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:134
+#: en/installer.xml:136
 msgid "Press F2 for alternative languages."
 msgstr "F2 を押すと言語を変更できます。"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:140
+#: en/installer.xml:142
 msgid "UEFI Systems"
 msgstr "UEFI システム"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:142
+#: en/installer.xml:144
 msgid ""
 "From this screen, you can access options by pressing <keycap>e</keycap> to "
 "enter the edit mode. To come back to this screen, press <keycap>Esc</keycap> "
@@ -2349,7 +2382,7 @@ msgstr ""
 "ずに終了するか、<keycap>F10</keycap> を押して設定を保存して終了します。"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:148
+#: en/installer.xml:150
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome2.png\"/> </"
 "imageobject>"
@@ -2358,13 +2391,13 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:157
+#: en/installer.xml:159
 msgid "<emphasis role=\"bold\">Install:</emphasis> Start the Install process"
 msgstr ""
 "<emphasis role=\"bold\">インストール:</emphasis> インストールを開始します。"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:162
+#: en/installer.xml:164
 msgid ""
 "<emphasis role=\"bold\">Rescue:</emphasis> This option allows you to either "
 "re-install the bootloader for an existing Mageia installation or you can use "
@@ -2375,7 +2408,7 @@ msgstr ""
 "ます。"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:169
+#: en/installer.xml:171
 msgid ""
 "<emphasis role=\"bold\">F2: Language:</emphasis> Press <keycap>F2</keycap> "
 "for alternative languages."
@@ -2383,7 +2416,7 @@ msgstr ""
 "<emphasis role=\"bold\">F2: 言語:</emphasis> F2 を押すと言語を変更できます。"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:174
+#: en/installer.xml:176
 msgid ""
 "If you booted from a USB stick, you will see the above options duplicated, "
 "and in this case, you should use the set that will be suffixed with \"USB\"."
@@ -2392,17 +2425,17 @@ msgstr ""
 "が、\"USB\" で終わるものを選択してください。"
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:181
+#: en/installer.xml:183
 msgid "Installation Problems and Possible Solutions"
 msgstr "インストールの問題と解決法"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:184
+#: en/installer.xml:186
 msgid "No Graphical Interface"
 msgstr "グラフィカル インターフェースが表示されない"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:188
+#: en/installer.xml:190
 msgid ""
 "After the initial screen you did not progress to the <emphasis>Language "
 "Selection</emphasis> screen. This can happen with some graphic cards and "
@@ -2414,7 +2447,7 @@ msgstr ""
 "<command>vgalo</command> を入力して低解像度の使用を試してください。"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:195
+#: en/installer.xml:197
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
 "In this case it is worth trying a text-mode installation. To use this press "
@@ -2431,12 +2464,12 @@ msgstr ""
 "<keycap>ENTER</keycap> を押し、テキスト モードでインストールを続行します。"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:208
+#: en/installer.xml:210
 msgid "The Install Freezes"
 msgstr "インストール時にフリーズする"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:210
+#: en/installer.xml:212
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic hardware "
@@ -2451,12 +2484,12 @@ msgstr ""
 "できます。"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:218
+#: en/installer.xml:220
 msgid "RAM problem"
 msgstr "RAM の問題"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:220
+#: en/installer.xml:222
 msgid ""
 "This will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
@@ -2471,12 +2504,12 @@ msgstr ""
 "えば <literal>mem=256M</literal> は 256MB の RAM を指定します。"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:228
+#: en/installer.xml:230
 msgid "Dynamic partitions"
 msgstr "ダイナミック パーティション"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:230
+#: en/installer.xml:232
 msgid ""
 "If you converted your hard disk from <literal>Basic</literal> format to "
 "<literal>Dynamic</literal> format in Microsoft Windows, then it is not "
@@ -4456,22 +4489,29 @@ msgstr ""
 "efi_and_Mageia</link>"
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:27
+#: en/setupBootloader.xml:32
 msgid "Bootloader"
 msgstr "ブート ローダ"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:31
+#: en/setupBootloader.xml:36
+#, fuzzy
+msgid "Available Bootloaders"
+msgstr "ブート ローダ"
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:39
 msgid "Grub2"
 msgstr "Grub2"
 
-#. type: Content of: <section><section><itemizedlist><title>
-#: en/setupBootloader.xml:34
-msgid "Grub2 on Legacy MBR/GPT systems"
-msgstr "Legacy MBR/GPT システム上の Grub2"
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:42
+#, fuzzy
+msgid "<emphasis role=\"bold\">Grub2 on Legacy MBR/GPT systems</emphasis>"
+msgstr "<emphasis role=\"bold\">システムを復旧</emphasis>"
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:37
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:46
 msgid ""
 "GRUB2 (with or without graphical menu) will be used exclusively as the "
 "bootloader for a Legacy/MBR or Legacy/GPT system."
@@ -4479,8 +4519,8 @@ msgstr ""
 "GRUB2 (グラフィカル メニューありとなし) は Legacy/MBR または Legacy/GPT のシ"
 "ステムで排他的に用いられます。"
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:42
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:52
 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."
@@ -4488,19 +4528,21 @@ msgstr ""
 "既定では、新しいブート ローダは 第一ハード ディスクの MBR (Master Boot "
 "Record) または BIOS ブート パーティションに書き込まれます。"
 
-#. type: Content of: <section><section><itemizedlist><title>
-#: en/setupBootloader.xml:49
-msgid "Grub2-efi on UEFI systems"
-msgstr "UEFI システム上の Grub2-efi"
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:59
+#, fuzzy
+msgid "<emphasis role=\"bold\">Grub2-efi on UEFI systems</emphasis>"
+msgstr "<emphasis role=\"bold\">システムを復旧</emphasis>"
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:52
-msgid "GRUB2-efi will be used exclusively as the bootloader for a UEFI system."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:63
+#, fuzzy
+msgid "GRUB2-efi or rEFInd may be used as the bootloader for a UEFI system."
 msgstr ""
 "GRUB2-efi は UEFI システム用のブート ローダとして排他的に用いられます。"
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:57
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:68
 msgid ""
 "By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI "
 "System Partition)."
@@ -4508,12 +4550,13 @@ msgstr ""
 "既定では、新しいブート ローダ (Grub2-efi) は ESP (EFI System Partition) に書"
 "き込まれます。"
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:60
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:71
+#, fuzzy
 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 "
-"created by Windows and add grub2-efi to it. If no ESP exists, then one will "
+"created by Windows and add grub2-efi to it.  If no ESP exists, then one will "
 "be created. Although it is possible to have several ESPs, only one is "
 "required, whatever the number of operating systems you have."
 msgstr ""
@@ -4522,18 +4565,46 @@ msgstr ""
 "成された既存の ESP を検出して grub2-efi を追加します。ESP は複数持つこともで"
 "きますが、オペレーティング システムの数が幾つあっても一つしか必要ありません。"
 
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:82
+msgid "rEFInd"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:85
+#, fuzzy
+msgid "<emphasis role=\"bold\">rEFInd on UEFI systems</emphasis>"
+msgstr "<emphasis role=\"bold\">アイコン</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:88
+msgid ""
+"rEFInd has a nice graphical set of options, and can auto-detect installed "
+"EFI bootloaders. See: http://www.rodsbooks.com/refind/"
+msgstr ""
+
+#. type: Content of: <section><section><section><note><para>
+#: en/setupBootloader.xml:95
+msgid ""
+"Please note that in order to be able to use the <literal>rEFInd</literal> "
+"option, an installed EFI System Partition must match your system "
+"architecture: if you have a 32bit EFI System Partition installed on a 64bit "
+"machine for instance, then the rEFInd option will not be displayed/available "
+"to you."
+msgstr ""
+
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:72
+#: en/setupBootloader.xml:106
 msgid "Bootloader Setup"
 msgstr "ブート ローダの設定"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:76
+#: en/setupBootloader.xml:110
 msgid "Bootloader main options"
 msgstr "ブート ローダの主な設定"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:79
+#: en/setupBootloader.xml:113
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader.png\"/> </imageobject> <imageobject condition=\"live"
@@ -4546,38 +4617,59 @@ msgstr ""
 "im1\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:91
+#: en/setupBootloader.xml:125
 msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
 msgstr "<emphasis role=\"bold\">使用するブート ローダ</emphasis>"
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:93
+#. type: Content of: <section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:129
+msgid ""
+"<guimenuitem>GRUB2</guimenuitem> (with either a graphical or a text menu), "
+"can be chosen for both <literal>Legacy MBR/BIOS</literal> systems and "
+"<literal>UEFI</literal> systems."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:136
 msgid ""
-"This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI "
-"systems will not see this option here."
+"<guimenuitem>rEFInd</guimenuitem> (with a graphical menu)  is an alternative "
+"option solely for use with <literal>UEFI</literal> systems."
 msgstr ""
-"この機能は Legacy MBR/BIOS システムでのみ利用可能です。UEFI システムのユーザ"
-"はこの設定をここで見ることはありません。"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:98
+#: en/setupBootloader.xml:144
 msgid "<emphasis role=\"bold\">Boot device</emphasis>"
 msgstr "<emphasis role=\"bold\">起動デバイス</emphasis>"
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:100
-msgid "Don't change this unless you really know what you are doing"
+#. type: Content of: <section><section><section><itemizedlist><listitem><warning><para>
+#: en/setupBootloader.xml:147
+#, fuzzy
+msgid "Don't change this unless you really know what you are doing."
 msgstr ""
 "これは何をしているのか本当に分かっているのでなければ変更しないでください。"
 
+#. type: Content of: <section><section><section><itemizedlist><listitem><note><para>
+#: en/setupBootloader.xml:152
+msgid ""
+"There is no option to write GRUB to the boot sector of a partition (e.g: "
+"<filename>sda1</filename>), as this method is considered unreliable."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:157
+msgid ""
+"When using UEFI mode, then the <guilabel>Boot device</guilabel> will be "
+"listed as <guimenuitem>EFI System Partition</guimenuitem>."
+msgstr ""
+
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:105
+#: en/setupBootloader.xml:163
 msgid ""
 "<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
 msgstr "<emphasis role=\"bold\">既定のイメージが起動するまでの秒数</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:108
+#: en/setupBootloader.xml:166
 msgid ""
 "This text box lets you set a delay, in seconds, before the default operating "
 "system is started up."
@@ -4586,12 +4678,12 @@ msgstr ""
 "秒数を設定できます。"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:113
+#: en/setupBootloader.xml:171
 msgid "<emphasis role=\"bold\">Security</emphasis>"
 msgstr "<emphasis role=\"bold\">セキュリティ</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:115
+#: en/setupBootloader.xml:173
 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 "
@@ -4605,17 +4697,17 @@ msgstr ""
 "<literal>root</literal> で、パスワードは後でここで決めたものです。"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:126
+#: en/setupBootloader.xml:184
 msgid "Choose a password for the bootloader (optional)"
 msgstr "ブート ローダのパスワードを決めます (任意)"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:130
+#: en/setupBootloader.xml:188
 msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
 msgstr "<emphasis role=\"bold\">パスワード (再入力)</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:132
+#: en/setupBootloader.xml:190
 msgid ""
 "Retype the password and DrakX will check that it matches with the one set "
 "above"
@@ -4623,17 +4715,17 @@ msgstr ""
 "パスワードを再入力し、DrakX は上のパスワードと一致するかをチェックします。"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:137 en/setupBootloader.xml:212
+#: en/setupBootloader.xml:195 en/setupBootloader.xml:308
 msgid "<emphasis>Advanced</emphasis>"
 msgstr "<emphasis>上級</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:141
+#: en/setupBootloader.xml:199
 msgid "<emphasis>Enable ACPI</emphasis>"
 msgstr "<emphasis>ACPI を有効にする</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:143
+#: en/setupBootloader.xml:201
 msgid ""
 "ACPI (Advanced Configuration and Power Interface) is a standard for power "
 "management. It can save energy by stopping unused devices. Deselecting it "
@@ -4648,12 +4740,12 @@ msgstr ""
 "ランダムに再起動が起こったりシステムが固まったりする場合)。"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:152
+#: en/setupBootloader.xml:210
 msgid "<emphasis>Enable SMP</emphasis>"
 msgstr "<emphasis>SMP を有効にする</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:154
+#: en/setupBootloader.xml:212
 msgid ""
 "This option enables/disables symmetric multiprocessing for multi-core "
 "processors"
@@ -4662,12 +4754,12 @@ msgstr ""
 "化します。"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:159
+#: en/setupBootloader.xml:217
 msgid "<emphasis>Enable APIC</emphasis>"
 msgstr "<emphasis>APIC を有効にする</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:161
+#: en/setupBootloader.xml:219
 msgid ""
 "Enabling this gives the operating system access to the Advanced Programmable "
 "Interrupt Controller. APIC devices permit more complex priority models, and "
@@ -4678,12 +4770,12 @@ msgstr ""
 "デルや高度な IRQ (割り込み要求) の管理を可能にします。"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:168
+#: en/setupBootloader.xml:226
 msgid "<emphasis>Enable Local APIC</emphasis>"
 msgstr "<emphasis>ローカル APIC を有効にする</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:170
+#: en/setupBootloader.xml:228
 msgid ""
 "Here you can set Local APIC, which manages all external interrupts for a "
 "specific processor in an SMP system"
@@ -4692,12 +4784,70 @@ msgstr ""
 "対するすべての外部割り込みを管理します。"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:177
+#: en/setupBootloader.xml:235
 msgid "Bootloader Configuration"
 msgstr "ブート ローダの設定"
 
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:237
+msgid ""
+"If, in the previous section you selected <literal>rEFInd</literal> as the "
+"bootloader to use, you would then be presented with the options shown in the "
+"screenshot directly below. Otherwise, please instead move on to the "
+"subsequent screenshot for your options."
+msgstr ""
+
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:180
+#: en/setupBootloader.xml:243
+#, fuzzy
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"rEFIndLoaderConfig.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-rEFIndLoaderConfig.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:253
+#, fuzzy
+msgid "Your rEFInd configuration options:"
+msgstr "サウンドの設定"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:256
+msgid ""
+"<guimenuitem>Install or update rEFInd in the EFI system partition.</"
+"guimenuitem>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:261
+msgid ""
+"<guimenuitem>Install in EFI/Boot partition (workaround for some BIOS's).</"
+"guimenuitem>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:264
+msgid ""
+"With some BIOS's, the newly written bootloaser for Mageia at end of the "
+"installation will not be recognized. In that case, you can use this option "
+"as a workaround for the issue."
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:270
+msgid ""
+"If you did not select rEFInd as the bootloader to use in the previous "
+"section, then your bootloader configurations are shown below:"
+msgstr ""
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:275
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -4710,22 +4860,22 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:191
+#: en/setupBootloader.xml:286
 msgid "<emphasis role=\"bold\">Default</emphasis>"
 msgstr "<emphasis role=\"bold\">既定</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:193
+#: en/setupBootloader.xml:288
 msgid "The operating system to be started up by default."
 msgstr "開始する既定のオペレーティング システムです。"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:197
+#: en/setupBootloader.xml:292
 msgid "<emphasis role=\"bold\">Append</emphasis>"
 msgstr "<emphasis role=\"bold\">追加文字列</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:199
+#: en/setupBootloader.xml:294
 msgid ""
 "This option lets you pass information to the kernel or tell the kernel to "
 "give you more information as it boots."
@@ -4734,23 +4884,24 @@ msgstr ""
 "うにカーネルに伝えたりします。"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:204
+#: en/setupBootloader.xml:299
 msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
 msgstr "<emphasis role=\"bold\">他の OS がないか調べる</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:206
+#: en/setupBootloader.xml:301
+#, fuzzy
 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, "
-"then untick the Probe Foreign OS option."
+"then untick the <guimenuitem>Probe Foreign OS</guimenuitem> option."
 msgstr ""
 "既に他のオペレーティング システムがインストールされている場合、Mageia はこれ"
 "らを新しい Mageia のブート メニューに追加しようとします。この動作を望まない場"
 "合、他の OS がないか調べるための選択を外します。"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:215
+#: en/setupBootloader.xml:311
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader4.png\"/> </imageobject> <imageobject condition=\"live"
@@ -4763,12 +4914,12 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:226
+#: en/setupBootloader.xml:322
 msgid "<emphasis>Video mode</emphasis>"
 msgstr "<emphasis>ビデオ モード</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:228
+#: en/setupBootloader.xml:324
 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 "
@@ -4778,24 +4929,34 @@ msgstr ""
 "形をクリックするとサイズと色深度の他の項目が表示されます。"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:234
+#: en/setupBootloader.xml:330
 msgid "<emphasis>Do not touch ESP or MBR</emphasis>"
 msgstr "<emphasis>ESP や MBR に書き込まない</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:236
+#: en/setupBootloader.xml:332
+#, fuzzy
 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 "
-"missing. Click<emphasis> Ok</emphasis> if you are sure you understand the "
-"implications, and wish to proceed."
+"missing. Click <guimenuitem>Ok </guimenuitem>only if you are sure you "
+"understand the implications, and wish to proceed."
 msgstr ""
 "Mageia をブート可能にせずに他の OS からチェイン ロードしたい場合にこれを選択"
 "します。ブート ローダがないことが警告されます。その結果どうなるかを確かに理解"
 "しており、かつ続行したいのであれば <emphasis>Ok</emphasis> をクリックします。"
 
+#. type: Content of: <section><section><section><itemizedlist><listitem><warning><para>
+#: en/setupBootloader.xml:338
+msgid ""
+"Chain-loading via legacy bootloaders (GRUB Legacy and LiLo)  is no longer "
+"supported by Mageia as it is likely to fail when attempting to boot this "
+"resulting installation of Mageia. If you use anything other than GRUB2 or "
+"rEFInd for this purpose, then you do so at your own risk!"
+msgstr ""
+
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:245
+#: en/setupBootloader.xml:348
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png"
 "\"/> </imageobject>"
@@ -4804,17 +4965,17 @@ msgstr ""
 "\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:253
+#: en/setupBootloader.xml:356
 msgid "Other Options"
 msgstr "その他のオプション"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:256
+#: en/setupBootloader.xml:359
 msgid "Using an existing bootloader"
 msgstr "既存のブート ローダを使用する"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:258
+#: en/setupBootloader.xml:361
 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 "
@@ -4829,12 +4990,12 @@ msgstr ""
 "テムのドキュメントを参照してください。"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:267
+#: en/setupBootloader.xml:370
 msgid "Installing Without a Bootloader"
 msgstr "ブート ローダなしのインストール"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:269
+#: en/setupBootloader.xml:372
 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 "
@@ -5249,3 +5410,45 @@ msgid ""
 msgstr ""
 "次の段階はハード ディスクへのファイルのコピーです。これが完了するまでにはしば"
 "らくかかるはずです。完了すると、少しの間画面が黒くなります - これは正常です。"
+
+#~ msgid ""
+#~ "Type in the user password. There is a shield at the end of the text box "
+#~ "that indicates the strength of the password. (See also <xref linkend="
+#~ "\"givePassword\"/>)"
+#~ msgstr ""
+#~ "ユーザのパスワードを入力します。テキスト ボックスの右端にはパスワードの強"
+#~ "度を示す盾が表示されます。(<xref linkend=\"givePassword\"/>も参照)"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> "
+#~ "</imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> "
+#~ "</imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4."
+#~ "png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4."
+#~ "png\"/> </imageobject>"
+
+#~ msgid "Grub2 on Legacy MBR/GPT systems"
+#~ msgstr "Legacy MBR/GPT システム上の Grub2"
+
+#~ msgid "Grub2-efi on UEFI systems"
+#~ msgstr "UEFI システム上の Grub2-efi"
+
+#~ msgid ""
+#~ "This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI "
+#~ "systems will not see this option here."
+#~ msgstr ""
+#~ "この機能は Legacy MBR/BIOS システムでのみ利用可能です。UEFI システムのユー"
+#~ "ザはこの設定をここで見ることはありません。"
diff --git a/docs/docs/stable/installer/nb.po b/docs/docs/stable/installer/nb.po
index 8ee66e49..c361d416 100644
--- a/docs/docs/stable/installer/nb.po
+++ b/docs/docs/stable/installer/nb.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2019-01-19 21:23+0200\n"
+"POT-Creation-Date: 2019-09-08 15:26+0300\n"
 "PO-Revision-Date: 2019-01-20 12:19+0000\n"
 "Last-Translator: Karl Morten Ramberg <karl.m.ramberg@gmail.com>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/MageiaLinux/mageia/"
@@ -171,7 +171,7 @@ msgstr ""
 "installereren finne de nødvendige 32-biters pakkene der."
 
 #. type: Content of: <section><info><title>
-#: en/addUser.xml:3
+#: en/addUser.xml:9
 msgid "User Management"
 msgstr "Brukerhåndtering"
 
@@ -181,13 +181,16 @@ msgstr "Brukerhåndtering"
 #. 2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
 #.   Also changed 'Advanced User Management' to 'User Management (advanced)'.
 #. 2018/02/24 apb: Changed list style.
+#. 2019/08/10 apb: Added missing 'condition' profile for live-user1.png.
+#. 2019/08/11 apb: [1] Reword 1.1 (including Note) [2] Reword 1.2 Password text.
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:12
+#: en/addUser.xml:28
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
-"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
-"\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata format="
-"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-setRootPassword.png\" format=\"PNG\" revision=\"1\" xml:id="
+"\"setRootPassword-im1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-user1.png\" format=\"PNG\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
 "\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -195,20 +198,18 @@ msgstr ""
 "\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:21
+#: en/addUser.xml:40
 msgid "Set Administrator (root)  Password:"
 msgstr "Angi Adminstrasjons (root) Passord:"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:24
+#: en/addUser.xml:44
+#, fuzzy
 msgid ""
 "It is advisable for all Mageia installations to set a <literal>superuser</"
 "literal> (Administrator) password, usually called the <emphasis>root </"
-"emphasis>password in Linux. As you type a password into the top box a shield "
-"will change from red-to-yellow-to-green depending on the strength of the "
-"password. A green shield shows you are using a strong password. You need to "
-"repeat the same password in the box underneath, to check that the first "
-"entry was not mistyped."
+"emphasis>password in Linux. You need to repeat the same password in the box "
+"underneath, to check that the first entry was not mistyped."
 msgstr ""
 "Det er tilrådelig for alle  Mageia  installasjoner å angi et <literal> "
 "superbruker</literal> (administrator) passord, vanligvis kalt <emphasis> "
@@ -219,7 +220,15 @@ msgstr ""
 "oppføringen ikke ble stavet feil."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:32
+#: en/addUser.xml:51
+msgid ""
+"As you type a password into the top box a shield will change from red-to-"
+"yellow-to-green depending on the strength of the password. A green shield "
+"shows you are using a strong password."
+msgstr ""
+
+#. type: Content of: <section><section><note><para>
+#: en/addUser.xml:55
 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."
@@ -228,12 +237,12 @@ msgstr ""
 "bokstaver (store og små bokstaver), tall og andre tegn i et passord."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:39
+#: en/addUser.xml:63
 msgid "Enter a user"
 msgstr "Angi en bruker"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:41
+#: en/addUser.xml:66
 msgid ""
 "Add a User here. A regular user has fewer privileges than the "
 "<literal>superuser</literal> (root), but enough to use the Internet, office "
@@ -246,34 +255,34 @@ msgstr ""
 "bruker datamaskinen til."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:47
+#: en/addUser.xml:73
 msgid "<emphasis role=\"bold\">Icon</emphasis>"
 msgstr "<emphasis role=\"bold\">Ikon</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:48
+#: en/addUser.xml:75
 msgid "Click on this button if you want to change the user's icon"
 msgstr ""
 "<guibutton>Ikon</guibutton>: Hvis du klikker på denne knappen vil "
 "brukerikonet endres."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:52
+#: en/addUser.xml:80
 msgid "<emphasis role=\"bold\">Real Name</emphasis>"
 msgstr "<emphasis role=\"bold\">Virkelig Navn</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:53
+#: en/addUser.xml:82
 msgid "Insert the user's real name into this text box"
 msgstr " Skriv inn brukerens virkelige navn i tekstboksen."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:56
+#: en/addUser.xml:86
 msgid "<emphasis role=\"bold\">Login Name</emphasis>"
 msgstr "<emphasis role=\"bold\">Innloggingsnavn</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:57
+#: en/addUser.xml:88
 msgid ""
 "Enter the user login name or let DrakX use a version of the user's real "
 "name. <emphasis role=\"bold\">The login name is case-sensitive.</emphasis>"
@@ -283,7 +292,7 @@ msgstr ""
 "skiller på store og små bokstaver. </emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><caution><simpara>
-#: en/addUser.xml:61
+#: en/addUser.xml:93
 msgid ""
 "The login entered here should be different to any login currently in use for "
 "your <filename>/home</filename> directory. Some user parameters will be "
@@ -296,23 +305,17 @@ msgstr ""
 "Firefox, Thunderbird eller Kmail-data ..."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:65 en/setupBootloader.xml:124
+#: en/addUser.xml:102 en/setupBootloader.xml:182
 msgid "<emphasis role=\"bold\">Password</emphasis>"
 msgstr "<emphasis role=\"bold\">Passord</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:66
-msgid ""
-"Type in the user password. There is a shield at the end of the text box that "
-"indicates the strength of the password. (See also <xref linkend="
-"\"givePassword\"/>)"
+#: en/addUser.xml:104
+msgid "Type in the user password (remembering the advice in the Note above)."
 msgstr ""
-"Skriv inn ønsket passord for brukeren. Det er et skjold på slutten av "
-"tekstboksen som angir styrken til passordet. (Se også <xref linkend="
-"\"givePassword\"/>)"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:68
+#: en/addUser.xml:107
 msgid ""
 "<emphasis role=\"bold\">Password (again):</emphasis> Retype the user "
 "password. DrakX will check that you have not mistyped the password."
@@ -321,7 +324,7 @@ msgstr ""
 "kontrollere at du ikke har skrevet passordet feil."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:74
+#: en/addUser.xml:114
 msgid ""
 "Any users added while installing Mageia, will have a home directory that is "
 "both read and write protected (umask=0027)"
@@ -330,7 +333,7 @@ msgstr ""
 "hjemmekatalog som er både lese og skrivebeskyttet (umask =0027)."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:76
+#: en/addUser.xml:117
 msgid ""
 "You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
@@ -341,17 +344,17 @@ msgstr ""
 "Brukeradministrasjon </emphasis>."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:79
+#: en/addUser.xml:121
 msgid "The access permissions can also be changed after the install."
 msgstr "Tilgangstillatelsene kan også endres etter installasjonen."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:85
+#: en/addUser.xml:128
 msgid "User Management (advanced)"
 msgstr "Brukerhåndtering (avansert)"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:87
+#: en/addUser.xml:131
 msgid ""
 "The <emphasis>Advanced</emphasis> option allows you to edit further settings "
 "for the user you are adding."
@@ -360,7 +363,7 @@ msgstr ""
 "innstillinger for brukeren du legger til."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:91
+#: en/addUser.xml:136
 msgid ""
 "<emphasis>Shell</emphasis>: This drop-down list allows you to change the "
 "shell available to any user you added in the previous screen. Options are "
@@ -372,7 +375,7 @@ msgstr ""
 "literal>  og  <literal>Sh </literal>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:143
 msgid ""
 "<emphasis>User ID</emphasis>: Here you can set the user ID for any user you "
 "added in the previous screen. If you are unsure what the purpose of this is, "
@@ -383,7 +386,7 @@ msgstr ""
 "formålet med dette er, la det være tomt."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:102
+#: en/addUser.xml:149
 msgid ""
 "<emphasis>Group ID</emphasis>: This lets you set the group ID.  Again, if "
 "unsure, leave it blank."
@@ -540,17 +543,17 @@ msgstr ""
 "tidssynkronisering og angi en NTP-server."
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:23
+#: en/bootLive.xml:10
 msgid "Boot Mageia as Live system"
 msgstr "Start Mageia som et Live system"
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:28
+#: en/bootLive.xml:14
 msgid "Booting the medium"
 msgstr "Start mediet"
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:31
+#: en/bootLive.xml:16
 msgid ""
 "You can boot directly from a Live DVD or USB. Usually, you just need to plug "
 "the USB device in or place the DVD in the drive and restart the computer."
@@ -560,7 +563,7 @@ msgstr ""
 "datamaskinen på nytt."
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:35
+#: en/bootLive.xml:19
 msgid ""
 "If the computer does not automatically boot from the USB or DVD you may need "
 "to reconfigure your BIOS Boot Disk priority. Alternatively, you might try "
@@ -572,7 +575,7 @@ msgstr ""
 "til oppstartsmenyen for å velge en enhet som datamaskinen starter opp fra."
 
 #. type: Content of: <section><section><tip><para>
-#: en/bootLive.xml:41
+#: en/bootLive.xml:24
 msgid ""
 "To access the BIOS or boot menu when the computer is starting, you can try "
 "pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or <keycap>Esc</"
@@ -588,7 +591,7 @@ msgstr ""
 "alternativer."
 
 #. type: Content of: <section><section><note><para>
-#: en/bootLive.xml:50
+#: en/bootLive.xml:32
 msgid ""
 "The actual screen that you will first see when booting from the Live media "
 "will depend on whether your computer motherboard is of the Legacy (BIOS) or "
@@ -599,37 +602,38 @@ msgstr ""
 "UEFI-typen."
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:58
+#: en/bootLive.xml:39
 msgid "In BIOS/CSM/Legacy mode"
 msgstr "I BIOS/CSM/historisk modus"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:62
+#: en/bootLive.xml:42
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"../live-bootCSM.png\" align=\"center\"/> "
+"</imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> </"
+"<imageobject> <imagedata fileref=\"dx2-summaryTop.png\" align=\"center\"/> </"
 "imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:67
+#: en/bootLive.xml:46
 msgid "First screen while booting in BIOS mode"
 msgstr "Første skjermbilde mens systemet starter i BIOS modus"
 
 #. type: Content of: <section><section><section><itemizedlist><title>
-#: en/bootLive.xml:72 en/bootLive.xml:144 en/installer.xml:106
-#: en/installer.xml:154
+#: en/bootLive.xml:50 en/bootLive.xml:104 en/installer.xml:108
+#: en/installer.xml:156
 msgid "Menu"
 msgstr "Meny"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:75 en/bootLive.xml:147
+#: en/bootLive.xml:52 en/bootLive.xml:106
 msgid "<emphasis role=\"bold\">Boot Mageia</emphasis>"
 msgstr "<emphasis role=\"bold\">Start Mageia</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:77
+#: en/bootLive.xml:53
 msgid ""
 "This option will boot the Mageia Live system from the connected DVD/USB "
 "media (expect a very slow system compared to an installed OS)."
@@ -638,12 +642,12 @@ msgstr ""
 "USB-mediet (forvent et veldig tregt systemsammenlignet med et installert OS)."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:81
+#: en/bootLive.xml:56
 msgid "Once the boot is done, you can proceed to the installation."
 msgstr "Når oppstarten er ferdig, kan du fortsette til installasjonen."
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:86 en/bootLive.xml:102
+#: en/bootLive.xml:60 en/bootLive.xml:72
 msgid ""
 "<emphasis role=\"bold\">+ use non-free video drivers (slower to boot)</"
 "emphasis>"
@@ -652,32 +656,32 @@ msgstr ""
 "emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:89
+#: en/bootLive.xml:62
 msgid "Boot the Mageia Live system using non-free video drivers"
 msgstr "Start Mageia Live-systemet med ikke-frie video drivere"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:96 en/bootLive.xml:155 en/installer.xml:109
+#: en/bootLive.xml:68 en/bootLive.xml:112 en/installer.xml:111
 msgid "<emphasis role=\"bold\">Install Mageia</emphasis>"
 msgstr "<emphasis role=\"bold\">Installer Mageia</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:98 en/bootLive.xml:157
+#: en/bootLive.xml:69 en/bootLive.xml:113
 msgid "This option will install Mageia to a hard disk."
 msgstr "Dette valget installerer Mageia på harddisken."
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:105
+#: en/bootLive.xml:74
 msgid "Install Mageia using non-free video drivers"
 msgstr "Installer Mageia med ikke-frie video drivere"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:111 en/installer.xml:125
+#: en/bootLive.xml:79 en/installer.xml:127
 msgid "<emphasis role=\"bold\">Memory Test</emphasis>"
 msgstr "<emphasis role=\"bold\">Minne Test</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:113 en/installer.xml:127
+#: en/bootLive.xml:80 en/installer.xml:129
 msgid ""
 "Test the installed RAM by performing multiple read and write operations. "
 "Reboot to end the test."
@@ -686,12 +690,12 @@ msgstr ""
 "Start på nytt for å avslutte testen."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:118 en/bootLive.xml:161
+#: en/bootLive.xml:84 en/bootLive.xml:116
 msgid "<emphasis role=\"bold\"> F2 Language</emphasis>"
 msgstr "<emphasis role=\"bold\"> F2 Spåk</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:120 en/bootLive.xml:163
+#: en/bootLive.xml:85 en/bootLive.xml:117
 msgid ""
 "Press <keycap>F2</keycap> to have the installer use a specific language "
 "during the installation. Use the arrow keys to select the language then "
@@ -702,26 +706,27 @@ msgstr ""
 "deretter på<keycap>Enter</keycap>."
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:129
+#: en/bootLive.xml:93
 msgid "In UEFI mode"
 msgstr "I UEFI modus"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:133
+#: en/bootLive.xml:96
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:139
+#: en/bootLive.xml:100
 msgid "First screen while booting in UEFI mode"
 msgstr "Første skjermbilde mens systemet starter fra UEFI på disken"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:149
+#: en/bootLive.xml:107
 msgid ""
 "This option will boot the Mageia Live system from the connected DVD/USB "
 "media (expect a very slow system compared to an installed OS).  Once the "
@@ -732,7 +737,7 @@ msgstr ""
 "OS). Ette oppstat kan du fotsette med installasjon av systemet."
 
 #. type: Content of: <section><section><note><para>
-#: en/bootLive.xml:170
+#: en/bootLive.xml:123
 msgid ""
 "If you booted from a USB stick, you will see the above menu options "
 "duplicated, and in this case, you should choose from the menu pair that will "
@@ -1001,12 +1006,12 @@ msgstr ""
 "til samme lokaltid eller UTC."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:24
+#: en/configureX_card_list.xml:27
 msgid "Choose an X Server (Configure your Graphic Card)"
 msgstr "Velg en X-tjener (Konfigurer grafikk kortet ditt)"
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_card_list.xml:29
+#: en/configureX_card_list.xml:32
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_card_list."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_card_list-im1\"/> </"
@@ -1017,7 +1022,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:35
+#: en/configureX_card_list.xml:38
 msgid ""
 "DrakX has a very comprehensive database of video cards and will usually "
 "correctly identify your video device."
@@ -1026,7 +1031,7 @@ msgstr ""
 "identifisere videoenheten riktig."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:38
+#: en/configureX_card_list.xml:41
 msgid ""
 "If the installer has not correctly detected your graphic card and you know "
 "which one you have, you can select it from the tree by:"
@@ -1035,22 +1040,22 @@ msgstr ""
 "du vet hvilket du har, kan du velge det fra treet ved å:"
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_card_list.xml:41 en/configureX_monitor.xml:74
+#: en/configureX_card_list.xml:44 en/configureX_monitor.xml:78
 msgid "Vendor"
 msgstr "Produsent"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:45
+#: en/configureX_card_list.xml:48
 msgid "then the make of your card"
 msgstr "så kort merket"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:49
+#: en/configureX_card_list.xml:52
 msgid "and the model of card"
 msgstr "så kort modellen"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:53
+#: en/configureX_card_list.xml:56
 msgid ""
 "If you cannot find your card in the vendor lists (because it's not yet in "
 "the database or it's an older card) you may find a suitable driver in the "
@@ -1067,7 +1072,7 @@ msgstr ""
 "grunnleggende funksjoner."
 
 #. type: Content of: <section><caution><para>
-#: en/configureX_card_list.xml:61
+#: en/configureX_card_list.xml:64
 msgid ""
 "Be aware that if you select an incompatible driver you may only have access "
 "to the <emphasis>Command Line Interface</emphasis>"
@@ -1076,7 +1081,7 @@ msgstr ""
 "bare få tilgang til <emphasis>kommandolinjegrensesnittet</emphasis>."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:65
+#: en/configureX_card_list.xml:68
 msgid ""
 "Some video card manufacturers provide proprietary drivers for Linux which "
 "may only be available in the <emphasis>Nonfree</emphasis> repository and in "
@@ -1092,17 +1097,13 @@ msgstr ""
 "omstart."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:11
-msgid "Graphic Card and Monitor Configuration"
+#: en/configureX_chooser.xml:23
+#, fuzzy
+msgid "Graphics Card and Monitor Configuration"
 msgstr "Grafikk kort og Skjerm konfigurasjon"
 
-#.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
-#. 2018/02/15 apb: Some text and typography.
-#. 2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.
-#. 2018/02/23 apb: Typo.
-#. 2019/01/06 apb: Slight reword, split 1st para in two.
 #. type: Content of: <section><mediaobject>
-#: en/configureX_chooser.xml:26
+#: en/configureX_chooser.xml:28
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_chooser."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_chooser-im1\"/> </"
@@ -1113,7 +1114,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:32
+#: en/configureX_chooser.xml:34
 msgid ""
 "No matter which graphical environment (also known as desktop environment) "
 "you chose for this install of Mageia, they are all based on a graphical user "
@@ -1131,7 +1132,7 @@ msgstr ""
 "vises, eller hvis du tror at detaljene er feil."
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:39
+#: en/configureX_chooser.xml:41
 msgid ""
 "Choose the appropriate settings manually if you think the details are "
 "incorrect, or if none are shown."
@@ -1140,12 +1141,13 @@ msgstr ""
 "feil, eller hvis ingen vises."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:44
-msgid "<emphasis role=\"bold\">Graphic Card</emphasis>"
+#: en/configureX_chooser.xml:46
+#, fuzzy
+msgid "<emphasis role=\"bold\">Graphics Card</emphasis>"
 msgstr "<emphasis role=\"bold\">Skjerm kort</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:47
+#: en/configureX_chooser.xml:49
 msgid ""
 "If you need to, you can select a specific card from this expandable list. "
 "See <xref linkend=\"configureX_card_list\"/>."
@@ -1154,12 +1156,12 @@ msgstr ""
 "<xref linkend=\"configureX_card_list\"/>."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:52
+#: en/configureX_chooser.xml:54
 msgid "<emphasis role=\"bold\">Monitor</emphasis>"
 msgstr "<emphasis role=\"bold\">Skjerm</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:55
+#: en/configureX_chooser.xml:57
 msgid ""
 "You can choose Plug 'n Play, if applicable, or choose your monitor from the "
 "<emphasis>Vendor</emphasis> or <emphasis>Generic</emphasis> lists. Choose "
@@ -1174,22 +1176,22 @@ msgstr ""
 "linkend=\"configureX_monitor\"/>."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:63
+#: en/configureX_chooser.xml:65
 msgid "<emphasis role=\"bold\">Resolution</emphasis>"
 msgstr "<emphasis role=\"bold\">Oppløsning</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:66
+#: en/configureX_chooser.xml:68
 msgid "The resolution and color depth of your monitor can be set here."
 msgstr "Oppløsningen og fargedybden på skjermen din kan stilles inn her."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:71
+#: en/configureX_chooser.xml:73
 msgid "<emphasis role=\"bold\">Test</emphasis>"
 msgstr "<emphasis role=\"bold\">Test</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:74
+#: en/configureX_chooser.xml:76
 msgid ""
 "The test button does not always appear during install. If the option is "
 "there, and you test your settings, you should be asked to confirm that your "
@@ -1208,17 +1210,17 @@ msgstr ""
 "kontrollere at innstillingene er på den sikre siden."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:85
+#: en/configureX_chooser.xml:87
 msgid "<emphasis role=\"bold\">Options</emphasis>"
 msgstr "<emphasis role=\"bold\">Alternativer</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:88
+#: en/configureX_chooser.xml:90
 msgid "Here you can choose to enable or disable various options."
 msgstr "Her kan du velge å aktivere eller deaktivere ulike alternativer."
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_chooser.xml:93
+#: en/configureX_chooser.xml:95
 msgid ""
 "There is a risk of damaging a monitor if you choose refresh rates that are "
 "outside the frequency range of that monitor. This applies to older CRT "
@@ -1231,12 +1233,12 @@ msgstr ""
 "normalt inn i ventemodus."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_monitor.xml:22
+#: en/configureX_monitor.xml:26
 msgid "Choosing your Monitor"
 msgstr "Velg en monitor"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:25
+#: en/configureX_monitor.xml:29
 msgid ""
 "DrakX has a very comprehensive database of monitors and will usually "
 "correctly identify yours."
@@ -1245,7 +1247,7 @@ msgstr ""
 "identifisere dine korrekt."
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:30
+#: en/configureX_monitor.xml:34
 msgid ""
 "<emphasis role=\"bold\">Selecting a monitor with different characteristics "
 "could damage your monitor or video hardware. Please don't try something "
@@ -1257,7 +1259,7 @@ msgstr ""
 "gjør. </emphasis> Hvis du er i tvil, bør du konsultere skjermdokumentasjonen."
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:38
+#: en/configureX_monitor.xml:42
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
@@ -1268,12 +1270,12 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:46
+#: en/configureX_monitor.xml:50
 msgid "Custom"
 msgstr "Egedefinert"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:49
+#: en/configureX_monitor.xml:53
 msgid ""
 "This option allows you to set two critical parameters: the vertical refresh "
 "rate and the horizontal sync rate. Vertical refresh determines how often the "
@@ -1286,7 +1288,7 @@ msgstr ""
 "synkronisering er frekvensen der skannelinjer vises."
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:55
+#: en/configureX_monitor.xml:59
 msgid ""
 "It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor "
 "type with a sync range that is beyond the capabilities of your monitor: you "
@@ -1299,12 +1301,12 @@ msgstr ""
 "skjermdokumentasjonen."
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:64
+#: en/configureX_monitor.xml:68
 msgid "Plug'n Play"
 msgstr "Plug'n Play"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:67
+#: en/configureX_monitor.xml:71
 msgid ""
 "This is the default option and automatically tries to determine the monitor "
 "type from the monitor database."
@@ -1313,37 +1315,39 @@ msgstr ""
 "skjermdatabasen."
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:77
+#: en/configureX_monitor.xml:81
+#, fuzzy
 msgid ""
 "If the installer has not correctly detected your monitor and you know which "
-"one you have, you can select it from the tree by selecting:"
+"one you have, you can choose it from the options by selecting:"
 msgstr ""
 "Hvis installasjonen ikke har registrert skjermen riktig og du vet hvilken du "
 "har, kan du velge den fra treet ved å velge:"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:86
+#: en/configureX_monitor.xml:90
 msgid "Manufacturer"
 msgstr "Produsent"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:90
+#: en/configureX_monitor.xml:94
 msgid "Monitor model"
 msgstr "Skjermmodell"
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:96
+#: en/configureX_monitor.xml:100
 msgid "Generic"
 msgstr "Generisk"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:99
+#: en/configureX_monitor.xml:103
+#, fuzzy
 msgid ""
-"Selecting this group will list nearly 30 display configurations such as "
-"1024x768 @ 60Hz and includes flat-panel displays as used in laptops. This is "
-"often a good monitor selection group if you need to use the VESA card driver "
-"when your video hardware cannot be determined automatically.  Once again it "
-"may be wise to be conservative in your selections."
+"Selecting this group will list approximately 30 display configurations such "
+"as 1024x768 @ 60Hz and includes flat-panel displays as used in laptops.  "
+"This is often a good monitor selection group if you need to use the VESA "
+"card driver when your video hardware cannot be determined automatically. "
+"Once again, it may be wise to be conservative in your selections."
 msgstr ""
 "Hvis du velger denne gruppen, vises nesten 30 visningskonfigurasjoner som "
 "1024x768 @ 60Hz og inkluderer flatskjerm-skjermer som brukes i bærbare "
@@ -1352,12 +1356,12 @@ msgstr ""
 "kan det være lurt å være konservativ i valgene dine."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:22
+#: en/diskdrake.xml:24
 msgid "Custom Disk Partitioning with DiskDrake"
 msgstr "Egendefinert Diskpartisjonering med DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:27
+#: en/diskdrake.xml:29
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-diskdrake.png\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1368,7 +1372,7 @@ msgstr ""
 "<imagedata align=\"center\" fileref=\"live-diskdrake.png\"/> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:38
+#: en/diskdrake.xml:40
 msgid ""
 "Modify the layout of your disk(s) here. You can remove or create partitions, "
 "change the filesystem or size of a partition and even view their details "
@@ -1379,11 +1383,12 @@ msgstr ""
 "til og med se detaljene for den før du starter."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:47
+#, fuzzy
 msgid ""
 "There is a tab at the top for every detected hard disk (or other storage "
-"device, like a USB key). In the screenshot above there are two available "
-"devices: <filename>sda </filename>and <filename>sdb</filename>."
+"device, like a USB key), for example: <filename>sda</filename>, "
+"<filename>sdb</filename>, <filename>sdc</filename> etc."
 msgstr ""
 "For hver oppdaget harddisk, (eller annen lagringsenhet som en USB-nøkkel), "
 "finnes det en kategori øverst . I skjermbildet ovenfor er det to "
@@ -1391,7 +1396,7 @@ msgstr ""
 "filename>."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:52
+#: en/diskdrake.xml:54
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it. "
@@ -1405,14 +1410,14 @@ msgstr ""
 "partisjonstype."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:60
+#: en/diskdrake.xml:62
 msgid ""
 "Continue until you have adjusted everything to your satisfaction, then click "
 "<emphasis>Done</emphasis> when you're ready."
 msgstr "Fortsett til du har justerert alt etter dine ønsker."
 
 #. type: Content of: <section><warning><orderedlist><listitem><para>
-#: en/diskdrake.xml:69
+#: en/diskdrake.xml:71
 msgid ""
 "Take care with the <emphasis>Clear all</emphasis> option, use it only if you "
 "are sure you want to wipe all partitions on the selected storage device."
@@ -1422,7 +1427,7 @@ msgstr ""
 "lageringsenheten."
 
 #. type: Content of: <section><warning><orderedlist><listitem><para>
-#: en/diskdrake.xml:75
+#: en/diskdrake.xml:77
 msgid ""
 "If you wish to use encryption on your <filename>/</filename> partition you "
 "must ensure that you have a separate <filename>/boot</filename> partition. "
@@ -1435,7 +1440,7 @@ msgstr ""
 "Systemet vil i så fall  ikke være mulig å starte."
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/diskdrake.xml:87
+#: en/diskdrake.xml:89
 msgid ""
 "If you are installing Mageia on a UEFI system, check that an ESP (EFI System "
 "Partition) is present and correctly mounted on <filename>/boot/EFI</"
@@ -1446,7 +1451,7 @@ msgstr ""
 "EFI</filename>, se Figur 1 nedenfor"
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/diskdrake.xml:93
+#: en/diskdrake.xml:95
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
 "partition is present and of the correct type. See Figure 2 below."
@@ -1456,12 +1461,12 @@ msgstr ""
 "nedenfor."
 
 #. type: Content of: <section><figure><title>
-#: en/diskdrake.xml:101
+#: en/diskdrake.xml:103
 msgid "EFI System Partition"
 msgstr "EFI System partisjon"
 
 #. type: Content of: <section><figure><mediaobject>
-#: en/diskdrake.xml:104
+#: en/diskdrake.xml:106
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-diskdrake2.png\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1472,17 +1477,17 @@ msgstr ""
 "<imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/> </imageobject>"
 
 #. type: Content of: <section><figure>
-#: en/diskdrake.xml:103 en/diskdrake.xml:117
+#: en/diskdrake.xml:105 en/diskdrake.xml:119
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><figure><title>
-#: en/diskdrake.xml:115
+#: en/diskdrake.xml:117
 msgid "BIOS boot partition"
 msgstr "BIOS oppstarts partisjon"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:118 en/doPartitionDisks.xml:201
+#: en/diskdrake.xml:120 en/doPartitionDisks.xml:206
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1505,12 +1510,12 @@ msgid "Partitioning"
 msgstr "Partisjonering"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:31
 msgid "Suggested Partitioning"
 msgstr "Foreslått partisjonering"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:34
 msgid ""
 "In this screen you can see the content of your hard drive(s) along with the "
 "DrakX partitioning proposals for where to install Mageia."
@@ -1519,7 +1524,7 @@ msgstr ""
 "som DrakX partisjoneringsveiviseren fant for å installereMageia."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:34
+#: en/doPartitionDisks.xml:38
 msgid ""
 "The actual options available from those shown below will vary according to "
 "the layout and content of your particular hard drive(s)."
@@ -1528,7 +1533,7 @@ msgstr ""
 "av hvilken type harddisk (er) og innhold."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:39
+#: en/doPartitionDisks.xml:43
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1541,17 +1546,17 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><itemizedlist><title>
-#: en/doPartitionDisks.xml:49
+#: en/doPartitionDisks.xml:53
 msgid "Main Options"
 msgstr "Hovedalternativer"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:56
 msgid "<emphasis role=\"bold\">Use Existing Partitions</emphasis>"
 msgstr "<emphasis role=\"bold\">Bruk eksisterende partisjoner</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:59
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1560,12 +1565,12 @@ msgstr ""
 "partisjoner blitt funnet og kan brukes til installasjonen."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:61
+#: en/doPartitionDisks.xml:65
 msgid "<emphasis role=\"bold\">Use Free Space</emphasis>"
 msgstr "<emphasis role=\"bold\">Bruk ledig plass</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:68
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1574,33 +1579,47 @@ msgstr ""
 "din nye Mageia-installasjon."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:70
+#: en/doPartitionDisks.xml:74
 msgid ""
 "<emphasis role=\"bold\">Use Free Space on a Windows Partition</emphasis>"
 msgstr ""
 "<emphasis role=\"bold\">Bruk ledig plass på en Windows partisjon</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:73
+#: en/doPartitionDisks.xml:77
+#, fuzzy
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it. 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 important files!"
+"installation but see the warning below."
 msgstr ""
 "Hvis du har ubrukt plass på en eksisterende Windows-partisjon, kan "
 "installatsjonen bruke å bruke den. Dette kan være en nyttig måte å gjøre "
 "plass til din nye Mageia-installasjon, men det er en risikofylt operasjon, "
 "så du bør sørge for at du har sikkerhetskopiert alle viktige filer!"
 
+#. type: Content of: <section><itemizedlist><listitem><para><mediaobject>
+#: en/doPartitionDisks.xml:87
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:79
+#: en/doPartitionDisks.xml:82
+#, fuzzy
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
 "light blue and the proposed Mageia partition in dark blue with their "
 "intended sizes just underneath. You have the option to modify these sizes by "
 "clicking and dragging the gap between both partitions.  See the following "
-"screenshot:"
+"screenshot:<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr ""
 "Med dette alternativet viser installasjonen den gjenværende Windows-"
 "partisjonen i lyseblå og den fremtidige Mageia-partisjonen i mørkeblå med de "
@@ -1608,18 +1627,41 @@ msgstr ""
 "størrelsene ved å klikke og dra mellomrummet mellom begge partisjonene. Se "
 "skjermbildet nedenfor."
 
+#. type: Content of: <section><itemizedlist><listitem><warning><para>
+#: en/doPartitionDisks.xml:97
+msgid ""
+"This involves shrinking the size of the Windows partition, and therefore is "
+"a risky operation, so you should make sure you have backed up all important "
+"files before proceeding."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><important><para>
+#: en/doPartitionDisks.xml:103
+#, fuzzy
+msgid ""
+"The partition must be \"clean\", meaning that Windows must have closed down "
+"correctly the last time it was used. It must also have been defragmented, "
+"although this is not a guarantee that all files in the partition have been "
+"moved out of the area that is about to be used for Mageia."
+msgstr ""
+"Merk at dette innebærer å krympe størrelsen på Windows-partisjonen. "
+"Partisjonen må være \"ren\", noe som betyr at Windows må ha stengt riktig "
+"sist den ble brukt. Det må også være defragmentert, selv om dette ikke er en "
+"garanti for at alle filer i partisjonen er flyttet ut av området som skal "
+"brukes. Det anbefales å sikkerhetskopiere dine personlige filer."
+
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:87
+#: en/doPartitionDisks.xml:112
 msgid "<emphasis role=\"bold\">Erase and use Entire Disk</emphasis>"
 msgstr "<emphasis role=\"bold\">Slett og bruk hele Disken</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:90
+#: en/doPartitionDisks.xml:115
 msgid "This option will allocate the entire drive for Mageia"
 msgstr "Dette alternativet vil bruke hele disken for Mageia"
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:119
 msgid ""
 "This will erase ALL data on the selected hard drive. Take care! If you "
 "intend to use part of the disk for something else, or you already have data "
@@ -1630,29 +1672,13 @@ msgstr ""
 "data på stasjonen du ikke er villig til å miste, ikke bruk  dette "
 "alternativet."
 
-#. type: Content of: <section><itemizedlist><listitem><important><para>
-#: en/doPartitionDisks.xml:101
-msgid ""
-"Note that this involves shrinking the size of the Windows partition. The "
-"partition must be \"clean\", meaning that Windows must have closed down "
-"correctly the last time it was used. It must also have been defragmented, "
-"although this is not a guarantee that all files in the partition have been "
-"moved out of the area that is about to be used. It is highly recommended to "
-"back up your personal files."
-msgstr ""
-"Merk at dette innebærer å krympe størrelsen på Windows-partisjonen. "
-"Partisjonen må være \"ren\", noe som betyr at Windows må ha stengt riktig "
-"sist den ble brukt. Det må også være defragmentert, selv om dette ikke er en "
-"garanti for at alle filer i partisjonen er flyttet ut av området som skal "
-"brukes. Det anbefales å sikkerhetskopiere dine personlige filer."
-
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:112
+#: en/doPartitionDisks.xml:127
 msgid "<emphasis role=\"bold\">Custom Disk Partitioning</emphasis>"
 msgstr "<emphasis role=\"bold\">Egendefinert Disk partisjonering</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:115
+#: en/doPartitionDisks.xml:130
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1660,21 +1686,8 @@ msgstr ""
 "Dette gir deg full kontroll over plasseringen av installasjonen på "
 "harddisken(e) din."
 
-#. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:122
-msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
-
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:131
+#: en/doPartitionDisks.xml:136
 msgid ""
 "If you are not using the <emphasis>Custom disk partitioning</emphasis> "
 "option, then the installer will allocate the available space according to "
@@ -1684,7 +1697,7 @@ msgstr ""
 "installereren tildele ledig plass i henhold til følgende regler:"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:137
+#: en/doPartitionDisks.xml:142
 msgid ""
 "If the total available space is less than 50 GB, then only one partition is "
 "created. This will be the <filename>/</filename> (root)  partition."
@@ -1694,7 +1707,7 @@ msgstr ""
 "partisjonen."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:143
+#: en/doPartitionDisks.xml:148
 msgid ""
 "If the total available space is greater than 50 GB, then three partitions "
 "are created"
@@ -1703,7 +1716,7 @@ msgstr ""
 "opprettet"
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:148
+#: en/doPartitionDisks.xml:153
 msgid ""
 "6/19 of the total available place is allocated to <filename>/</filename> "
 "with a maximum of 50 GB"
@@ -1711,17 +1724,17 @@ msgstr ""
 "6/19 av den totale tilgjengelige plassen er tildelt / med maksimalt 50 GB"
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:153
+#: en/doPartitionDisks.xml:158
 msgid "1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB"
 msgstr "1/19 er brukt til <filename>swap</filename> med et maksimum på 4 GB"
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:158
+#: en/doPartitionDisks.xml:163
 msgid "the rest (at least 12/19) is allocated to <filename>/home</filename>"
 msgstr "resten (minst 12/19) er tildelt <filename>/home</filename>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:165
+#: en/doPartitionDisks.xml:170
 msgid ""
 "This means that from 160 GB or greater available space, the installer will "
 "create three partitions:"
@@ -1730,22 +1743,22 @@ msgstr ""
 "opprette tre partisjoner: "
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:170
+#: en/doPartitionDisks.xml:175
 msgid "50 GB for <filename>/</filename>"
 msgstr "50 GB for <filename>/</filename>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:174
+#: en/doPartitionDisks.xml:179
 msgid "4 GB for <filename>swap</filename>"
 msgstr "4 GB for <filename>swap</filename>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:178
+#: en/doPartitionDisks.xml:183
 msgid "and the remainder for <filename>/home</filename>"
 msgstr "og resterende for <filename>/home</filename>."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:183
+#: en/doPartitionDisks.xml:188
 msgid ""
 "If you are using a UEFI system, the ESP (EFI System Partition) will be "
 "automatically detected - or created if it does not exist yet - and mounted "
@@ -1760,7 +1773,7 @@ msgstr ""
 "blitt gjort riktig"
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:189
+#: en/doPartitionDisks.xml:194
 msgid ""
 "If you are using a Legacy (also known as BIOS) system with a GPT partitioned "
 "disk, you need to create a BIOS boot partition if it doesn't already exist. "
@@ -1776,21 +1789,26 @@ msgstr ""
 "bare <quote>BIOS boot partisjon</quote> som filsystemtype."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:196
+#: en/doPartitionDisks.xml:201
 msgid "See <xref linkend=\"diskdrake\"/> for information on how to proceed."
 msgstr "Se<xref linkend=\"diskdrake\"/> for infomasjon om hvordan å fortsette."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:211
+#: en/doPartitionDisks.xml:216
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4.png"
-"\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks4.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks4.png\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4.png"
-"\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:217
+#: en/doPartitionDisks.xml:226
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
 "previous standard of 512. Due to lack of available hardware, the "
@@ -1803,7 +1821,7 @@ msgstr ""
 "installasjonsprogrammet ikke blitt testet med en slik disk. "
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:222
+#: en/doPartitionDisks.xml:231
 msgid ""
 "Some SSD devices now use an erase block size over 1 MB. If you have such a "
 "device we suggest that you partition the drive in advance, using an "
@@ -1815,17 +1833,17 @@ msgstr ""
 "som gparted, hvis du har en slik enhet, og bruker følgende innstillinger:"
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:229
+#: en/doPartitionDisks.xml:238
 msgid "<emphasis>Align to</emphasis> = MiB"
 msgstr "<emphasis>Juster til</emphasis> = MiB"
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:233
+#: en/doPartitionDisks.xml:242
 msgid "<emphasis>Free space preceding (MiB)</emphasis> = 2"
 msgstr "<emphasis>Ledig plass foran (MiB)</emphasis> = 2"
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:237
+#: en/doPartitionDisks.xml:246
 msgid ""
 "Also make sure all partitions are created using an even number of megabytes."
 msgstr ""
@@ -2009,12 +2027,12 @@ msgstr ""
 "link> hvs du har spørsmål eller vil bidra til Mageia"
 
 #. type: Content of: <section><info><title>
-#: en/firewall.xml:7
+#: en/firewall.xml:16
 msgid "Firewall"
 msgstr "Brannmur"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:10
+#: en/firewall.xml:19
 msgid ""
 "This section allows you to configure some simple firewall rules: they "
 "determine which type of message from the Internet will be accepted by the "
@@ -2026,8 +2044,18 @@ msgstr ""
 "målsystemet. Dette tillater at de tilsvarende tjenestene på systemet er "
 "tilgjengelige fra Internett."
 
+#. type: Content of: <section><mediaobject>
+#: en/firewall.xml:26
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-firewall.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome.png\"/> </"
+"imageobject>"
+
 #. type: Content of: <section><para>
-#: en/firewall.xml:16
+#: en/firewall.xml:31
 msgid ""
 "In the default setting (no button is checked), no service of the system is "
 "accessible from the network. The <emphasis>Everything (no firewall)</"
@@ -2047,7 +2075,7 @@ msgstr ""
 "av hele settet av brannmurregler for testing og feilsøking."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:25
+#: en/firewall.xml:40
 msgid ""
 "All other options are more or less self-explanatory. As an example, you will "
 "enable the CUPS server if you want printers on your machine to be accessible "
@@ -2058,12 +2086,12 @@ msgstr ""
 "maskinen skal være tilgjengelige fra nettverket."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:29
+#: en/firewall.xml:44
 msgid "<emphasis role=\"bold\">Advanced</emphasis>"
 msgstr "<emphasis role=\"bold\">Avansert</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:31
+#: en/firewall.xml:46
 msgid ""
 "The <emphasis>Advanced</emphasis> option opens a window where you can enable "
 "a series of services by typing a list of <quote>couples</quote> (blank "
@@ -2073,33 +2101,37 @@ msgstr ""
 "aktivere en rekke tjenester ved å skrive en liste over par (tom separert)"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:35
-msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
+#: en/firewall.xml:50
+#, fuzzy
+msgid "<emphasis>&lt;port-number&gt;/&lt;protocol&gt;</emphasis>"
 msgstr "<emphasis>&lt;port-nummer>/&lt;protokoll></emphasis>"
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:38
+#: en/firewall.xml:53
+#, fuzzy
 msgid ""
-"- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
-"the service you want to enable (e.g. 873 for the RSYNC service) as defined "
-"in <emphasis>RFC-433</emphasis>;"
+"- <emphasis>&lt;port-number&gt;</emphasis> is the value of the port assigned "
+"to the service you want to enable (e.g. 873 for the RSYNC service) as "
+"defined in <emphasis>RFC-433</emphasis>;"
 msgstr ""
 "- <emphasis>&lt;port-nummer></emphasis> er verdien til porten som er tildelt "
 "tjenesten du vil sette opp ( 873 for RSYNC tjenesten) som definert i "
 "<emphasis>RFC-433</emphasis>;"
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:42
+#: en/firewall.xml:57
+#, fuzzy
 msgid ""
-"- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
-"<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
+"- <emphasis>&lt;protocol&gt;</emphasis> is one of <emphasis>TCP</emphasis> "
+"or <emphasis>UDP</emphasis> - the internet protocol that is used by the "
+"service."
 msgstr ""
 "- <emphasis>&lt;protocol></emphasis> er en av <emphasis>TCP</emphasis> "
 "ellerr <emphasis>UDP</emphasis> - internett protokolenl that isom er brukt "
 "av tjenesten."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:47
+#: en/firewall.xml:62
 msgid ""
 "For instance, the entry for enabling access to the RSYNC service therefore "
 "is <emphasis>873/tcp</emphasis>."
@@ -2108,7 +2140,7 @@ msgstr ""
 "<emphasis>873/tcp</emphasis>."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:50
+#: en/firewall.xml:65
 msgid ""
 "In case a service is implemented to use both protocols, you specify 2 "
 "couples for the same port."
@@ -2195,12 +2227,12 @@ msgid "Graphical Configuration"
 msgstr "Grafisk konfigurasjon"
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:32
+#: en/installer.xml:34
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX er Mageia installereren"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:35
+#: en/installer.xml:37
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -2211,12 +2243,12 @@ msgstr ""
 "mulig."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:40
+#: en/installer.xml:42
 msgid "The installation steps"
 msgstr "Installasjonsfasene"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:44
+#: en/installer.xml:46
 msgid ""
 "The install process is divided into a number of steps - the status of which "
 "is indicated in a panel to the left of the screen."
@@ -2225,7 +2257,7 @@ msgstr ""
 "panel til venstre i skjermbildet."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:50
+#: en/installer.xml:52
 msgid ""
 "Each step has one or more screens, which may also have <emphasis>Advanced</"
 "emphasis> sections with extra, less commonly required options."
@@ -2234,7 +2266,7 @@ msgstr ""
 "Avansert </emphasis> seksjoner med ekstra, mindre vanlige alternativer."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:56
+#: en/installer.xml:58
 msgid ""
 "Most screens have <emphasis>Help</emphasis> buttons for further details "
 "about the particular step."
@@ -2243,7 +2275,7 @@ msgstr ""
 "ytterligere forklaringer om det aktuelle steget."
 
 #. type: Content of: <section><section><caution><para>
-#: en/installer.xml:62
+#: en/installer.xml:64
 msgid ""
 "If at some point during the install you decide to abort the installation, it "
 "is possible to reboot, but please think twice before you do this. Once a "
@@ -2258,7 +2290,7 @@ msgstr ""
 "tilstand, og omstart kan godt gi deg et ubrukbart system. "
 
 #. type: Content of: <section><section><caution><para>
-#: en/installer.xml:68
+#: en/installer.xml:70
 msgid ""
 "If, in spite of this, you are very sure rebooting is what you want, go to a "
 "text terminal by pressing the keys <keycombo> <keycap>Ctrl</keycap> "
@@ -2273,12 +2305,12 @@ msgstr ""
 "keycap><keycap>Delete</keycap></keycombo> samtidige for omstart."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:86
+#: en/installer.xml:88
 msgid "Installation Welcome Screen"
 msgstr "Installasjons velkomstskjermen"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:88
+#: en/installer.xml:90
 msgid ""
 "The particular screen that you will first see when booting from the "
 "Installation media will depend on whether your computer motherboard is of "
@@ -2289,7 +2321,7 @@ msgstr ""
 "UEFI-typen."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:92
+#: en/installer.xml:94
 msgid ""
 "The welcome menu screen has various options, however the default option will "
 "start the installer, and is normally all that you will need."
@@ -2299,12 +2331,12 @@ msgstr ""
 "installasjonen, ."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:97
+#: en/installer.xml:99
 msgid "Legacy (BIOS) Systems"
 msgstr "Eldre (BIOS) Systemer"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:100
+#: en/installer.xml:102
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome.png\"/> </"
 "imageobject>"
@@ -2313,7 +2345,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:111
+#: en/installer.xml:113
 msgid ""
 "Install Mageia to a hard disk. This is the default option, and will "
 "automatically start after a short while unless another option is selected."
@@ -2322,12 +2354,12 @@ msgstr ""
 "automatisk etter en kort stund med mindre andre valg er gjort."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:117
+#: en/installer.xml:119
 msgid "<emphasis role=\"bold\">Rescue System</emphasis>"
 msgstr "<emphasis role=\"bold\">Gjenopprettings System</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:119
+#: en/installer.xml:121
 msgid ""
 "This option allows you to either re-install the bootloader for an existing "
 "Mageia installation or you can use it to restore a Windows bootloader."
@@ -2337,22 +2369,22 @@ msgstr ""
 "en Windows bootloader."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:132
+#: en/installer.xml:134
 msgid "<emphasis role=\"bold\">F2: Language</emphasis>"
 msgstr "<emphasis role=\"bold\">F2: Språk</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:134
+#: en/installer.xml:136
 msgid "Press F2 for alternative languages."
 msgstr "Trykk F2 for alternative språk"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:140
+#: en/installer.xml:142
 msgid "UEFI Systems"
 msgstr "UEFI Systemer"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:142
+#: en/installer.xml:144
 msgid ""
 "From this screen, you can access options by pressing <keycap>e</keycap> to "
 "enter the edit mode. To come back to this screen, press <keycap>Esc</keycap> "
@@ -2365,7 +2397,7 @@ msgstr ""
 "\"F10\"</keycap> for å avslutte med lagring."
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:148
+#: en/installer.xml:150
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome2.png\"/> </"
 "imageobject>"
@@ -2374,13 +2406,13 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:157
+#: en/installer.xml:159
 msgid "<emphasis role=\"bold\">Install:</emphasis> Start the Install process"
 msgstr ""
 "<emphasis role=\"bold\">Installer:</emphasis> Start Installasjons prosessen"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:162
+#: en/installer.xml:164
 msgid ""
 "<emphasis role=\"bold\">Rescue:</emphasis> This option allows you to either "
 "re-install the bootloader for an existing Mageia installation or you can use "
@@ -2392,7 +2424,7 @@ msgstr ""
 "bootloader."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:169
+#: en/installer.xml:171
 msgid ""
 "<emphasis role=\"bold\">F2: Language:</emphasis> Press <keycap>F2</keycap> "
 "for alternative languages."
@@ -2401,7 +2433,7 @@ msgstr ""
 "alternative språk."
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:174
+#: en/installer.xml:176
 msgid ""
 "If you booted from a USB stick, you will see the above options duplicated, "
 "and in this case, you should use the set that will be suffixed with \"USB\"."
@@ -2411,17 +2443,17 @@ msgstr ""
 "navnet."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:181
+#: en/installer.xml:183
 msgid "Installation Problems and Possible Solutions"
 msgstr "Installasjonsproblem og mulige løsninger"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:184
+#: en/installer.xml:186
 msgid "No Graphical Interface"
 msgstr "Ikke Grafisk grensesnitt"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:188
+#: en/installer.xml:190
 msgid ""
 "After the initial screen you did not progress to the <emphasis>Language "
 "Selection</emphasis> screen. This can happen with some graphic cards and "
@@ -2433,7 +2465,7 @@ msgstr ""
 "ved å skrive <command>vgalo</command> ved prompten."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:195
+#: en/installer.xml:197
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
 "In this case it is worth trying a text-mode installation. To use this press "
@@ -2451,12 +2483,12 @@ msgstr ""
 "keycap>for å fortsette installasjonen i tekstmodus."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:208
+#: en/installer.xml:210
 msgid "The Install Freezes"
 msgstr "Installasjonen fryser"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:210
+#: en/installer.xml:212
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic hardware "
@@ -2471,12 +2503,12 @@ msgstr ""
 "kombineres med andre alternativer etter behov."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:218
+#: en/installer.xml:220
 msgid "RAM problem"
 msgstr "RAM problem"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:220
+#: en/installer.xml:222
 msgid ""
 "This will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
@@ -2491,12 +2523,12 @@ msgstr ""
 "<literal> mem =256M </literal> vil angi 256 MB RAM."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:228
+#: en/installer.xml:230
 msgid "Dynamic partitions"
 msgstr "Dynamiske partisjoner"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:230
+#: en/installer.xml:232
 msgid ""
 "If you converted your hard disk from <literal>Basic</literal> format to "
 "<literal>Dynamic</literal> format in Microsoft Windows, then it is not "
@@ -4480,22 +4512,29 @@ msgstr ""
 "efi_and_Mageia\"> https://wiki.mageia.org/en/Grub2-efi_and_Mageia </link>"
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:27
+#: en/setupBootloader.xml:32
 msgid "Bootloader"
 msgstr "Oppstartslaster"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:31
+#: en/setupBootloader.xml:36
+#, fuzzy
+msgid "Available Bootloaders"
+msgstr "Oppstartslaster"
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:39
 msgid "Grub2"
 msgstr "Grub2"
 
-#. type: Content of: <section><section><itemizedlist><title>
-#: en/setupBootloader.xml:34
-msgid "Grub2 on Legacy MBR/GPT systems"
-msgstr "Grub2 på eldre MBR/GPT systemer"
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:42
+#, fuzzy
+msgid "<emphasis role=\"bold\">Grub2 on Legacy MBR/GPT systems</emphasis>"
+msgstr "<emphasis role=\"bold\">Gjenopprettings System</emphasis>"
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:37
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:46
 msgid ""
 "GRUB2 (with or without graphical menu) will be used exclusively as the "
 "bootloader for a Legacy/MBR or Legacy/GPT system."
@@ -4503,8 +4542,8 @@ msgstr ""
 "GRUB2 (med eller uten grafisk meny) vil bli brukt utelukkende som "
 "oppstartslaster for et Legacy/MBR eller Legacy/GPT-system."
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:42
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:52
 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."
@@ -4512,18 +4551,20 @@ msgstr ""
 "Som standard vil en ny oppstartslaster skrives inn i enten MBR (Master Boot "
 "Record) på den første harddisken eller i BIOS-oppstartspartisjonen."
 
-#. type: Content of: <section><section><itemizedlist><title>
-#: en/setupBootloader.xml:49
-msgid "Grub2-efi on UEFI systems"
-msgstr "Grub2-efi på UEFI systemer"
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:59
+#, fuzzy
+msgid "<emphasis role=\"bold\">Grub2-efi on UEFI systems</emphasis>"
+msgstr "<emphasis role=\"bold\">Gjenopprettings System</emphasis>"
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:52
-msgid "GRUB2-efi will be used exclusively as the bootloader for a UEFI system."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:63
+#, fuzzy
+msgid "GRUB2-efi or rEFInd may be used as the bootloader for a UEFI system."
 msgstr "GRUB2-efi vil bare bli brukt som oppstartslaster for et UEFI-system."
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:57
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:68
 msgid ""
 "By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI "
 "System Partition)."
@@ -4531,12 +4572,13 @@ msgstr ""
 "Som standard skrives en ny oppstarstlaster (Grub2-efi) inn i ESP (EFI System "
 "Partition)."
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:60
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:71
+#, fuzzy
 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 "
-"created by Windows and add grub2-efi to it. If no ESP exists, then one will "
+"created by Windows and add grub2-efi to it.  If no ESP exists, then one will "
 "be created. Although it is possible to have several ESPs, only one is "
 "required, whatever the number of operating systems you have."
 msgstr ""
@@ -4547,18 +4589,46 @@ msgstr ""
 "mulig å ha flere ESPer, er det bare en som kreves, uansett antall "
 "operativsystemer du har."
 
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:82
+msgid "rEFInd"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:85
+#, fuzzy
+msgid "<emphasis role=\"bold\">rEFInd on UEFI systems</emphasis>"
+msgstr "<emphasis role=\"bold\">Ikon</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:88
+msgid ""
+"rEFInd has a nice graphical set of options, and can auto-detect installed "
+"EFI bootloaders. See: http://www.rodsbooks.com/refind/"
+msgstr ""
+
+#. type: Content of: <section><section><section><note><para>
+#: en/setupBootloader.xml:95
+msgid ""
+"Please note that in order to be able to use the <literal>rEFInd</literal> "
+"option, an installed EFI System Partition must match your system "
+"architecture: if you have a 32bit EFI System Partition installed on a 64bit "
+"machine for instance, then the rEFInd option will not be displayed/available "
+"to you."
+msgstr ""
+
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:72
+#: en/setupBootloader.xml:106
 msgid "Bootloader Setup"
 msgstr "Oppsett av Oppstartslaster"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:76
+#: en/setupBootloader.xml:110
 msgid "Bootloader main options"
 msgstr "Hovedvalg for oppstartslaster"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:79
+#: en/setupBootloader.xml:113
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader.png\"/> </imageobject> <imageobject condition=\"live"
@@ -4571,31 +4641,52 @@ msgstr ""
 "im1\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:91
+#: en/setupBootloader.xml:125
 msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
 msgstr "<emphasis role=\"bold\">Velg Oppstarter</emphasis>"
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:93
+#. type: Content of: <section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:129
 msgid ""
-"This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI "
-"systems will not see this option here."
+"<guimenuitem>GRUB2</guimenuitem> (with either a graphical or a text menu), "
+"can be chosen for both <literal>Legacy MBR/BIOS</literal> systems and "
+"<literal>UEFI</literal> systems."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:136
+msgid ""
+"<guimenuitem>rEFInd</guimenuitem> (with a graphical menu)  is an alternative "
+"option solely for use with <literal>UEFI</literal> systems."
 msgstr ""
-"Denne funksjonen er bare tilgjengelig for Legacy MBR/BIOS-systemer. Brukere "
-"av UEFI-systemer vil ikke se dette alternativet."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:98
+#: en/setupBootloader.xml:144
 msgid "<emphasis role=\"bold\">Boot device</emphasis>"
 msgstr "<emphasis role=\"bold\">Oppstartsenhet</emphasis>"
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:100
-msgid "Don't change this unless you really know what you are doing"
+#. type: Content of: <section><section><section><itemizedlist><listitem><warning><para>
+#: en/setupBootloader.xml:147
+#, fuzzy
+msgid "Don't change this unless you really know what you are doing."
 msgstr "Gjør ikke endringer i dette med mindre du virkelig vet hva du gjør"
 
+#. type: Content of: <section><section><section><itemizedlist><listitem><note><para>
+#: en/setupBootloader.xml:152
+msgid ""
+"There is no option to write GRUB to the boot sector of a partition (e.g: "
+"<filename>sda1</filename>), as this method is considered unreliable."
+msgstr ""
+
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:105
+#: en/setupBootloader.xml:157
+msgid ""
+"When using UEFI mode, then the <guilabel>Boot device</guilabel> will be "
+"listed as <guimenuitem>EFI System Partition</guimenuitem>."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:163
 msgid ""
 "<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
 msgstr ""
@@ -4603,7 +4694,7 @@ msgstr ""
 "emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:108
+#: en/setupBootloader.xml:166
 msgid ""
 "This text box lets you set a delay, in seconds, before the default operating "
 "system is started up."
@@ -4612,12 +4703,12 @@ msgstr ""
 "operativsystemet er startet opp."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:113
+#: en/setupBootloader.xml:171
 msgid "<emphasis role=\"bold\">Security</emphasis>"
 msgstr "<emphasis role=\"bold\">Sikkerhet</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:115
+#: en/setupBootloader.xml:173
 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 "
@@ -4631,17 +4722,17 @@ msgstr ""
 "literal>og passordet er det som er valgt her etter."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:126
+#: en/setupBootloader.xml:184
 msgid "Choose a password for the bootloader (optional)"
 msgstr "Velg et passord for oppstartslasteren (alternativt)."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:130
+#: en/setupBootloader.xml:188
 msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
 msgstr "<emphasis role=\"bold\">Passord (igjen)</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:132
+#: en/setupBootloader.xml:190
 msgid ""
 "Retype the password and DrakX will check that it matches with the one set "
 "above"
@@ -4650,17 +4741,17 @@ msgstr ""
 "som er angitt ovenfor."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:137 en/setupBootloader.xml:212
+#: en/setupBootloader.xml:195 en/setupBootloader.xml:308
 msgid "<emphasis>Advanced</emphasis>"
 msgstr "<emphasis>Avansert</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:141
+#: en/setupBootloader.xml:199
 msgid "<emphasis>Enable ACPI</emphasis>"
 msgstr "<emphasis>Aktiver ACPI</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:143
+#: en/setupBootloader.xml:201
 msgid ""
 "ACPI (Advanced Configuration and Power Interface) is a standard for power "
 "management. It can save energy by stopping unused devices. Deselecting it "
@@ -4676,12 +4767,12 @@ msgstr ""
 "tilfeldige omstart eller systemlåsing)."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:152
+#: en/setupBootloader.xml:210
 msgid "<emphasis>Enable SMP</emphasis>"
 msgstr "<emphasis>Aktiver SMP</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:154
+#: en/setupBootloader.xml:212
 msgid ""
 "This option enables/disables symmetric multiprocessing for multi-core "
 "processors"
@@ -4690,12 +4781,12 @@ msgstr ""
 "fler-kjerne prosessorer."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:159
+#: en/setupBootloader.xml:217
 msgid "<emphasis>Enable APIC</emphasis>"
 msgstr "<emphasis>Aktiver APIC</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:161
+#: en/setupBootloader.xml:219
 msgid ""
 "Enabling this gives the operating system access to the Advanced Programmable "
 "Interrupt Controller. APIC devices permit more complex priority models, and "
@@ -4707,12 +4798,12 @@ msgstr ""
 "administrasjon."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:168
+#: en/setupBootloader.xml:226
 msgid "<emphasis>Enable Local APIC</emphasis>"
 msgstr "<emphasis>Aktiver Lokal APIC</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:170
+#: en/setupBootloader.xml:228
 msgid ""
 "Here you can set Local APIC, which manages all external interrupts for a "
 "specific processor in an SMP system"
@@ -4721,12 +4812,70 @@ msgstr ""
 "bestemt prosessor i et SMP-system."
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:177
+#: en/setupBootloader.xml:235
 msgid "Bootloader Configuration"
 msgstr "Oppsett av oppstartslaster"
 
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:237
+msgid ""
+"If, in the previous section you selected <literal>rEFInd</literal> as the "
+"bootloader to use, you would then be presented with the options shown in the "
+"screenshot directly below. Otherwise, please instead move on to the "
+"subsequent screenshot for your options."
+msgstr ""
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:243
+#, fuzzy
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"rEFIndLoaderConfig.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-rEFIndLoaderConfig.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:253
+#, fuzzy
+msgid "Your rEFInd configuration options:"
+msgstr "Sett opp lyd"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:256
+msgid ""
+"<guimenuitem>Install or update rEFInd in the EFI system partition.</"
+"guimenuitem>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:261
+msgid ""
+"<guimenuitem>Install in EFI/Boot partition (workaround for some BIOS's).</"
+"guimenuitem>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:264
+msgid ""
+"With some BIOS's, the newly written bootloaser for Mageia at end of the "
+"installation will not be recognized. In that case, you can use this option "
+"as a workaround for the issue."
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:270
+msgid ""
+"If you did not select rEFInd as the bootloader to use in the previous "
+"section, then your bootloader configurations are shown below:"
+msgstr ""
+
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:180
+#: en/setupBootloader.xml:275
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -4739,22 +4888,22 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:191
+#: en/setupBootloader.xml:286
 msgid "<emphasis role=\"bold\">Default</emphasis>"
 msgstr "<emphasis role=\"bold\">Standard</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:193
+#: en/setupBootloader.xml:288
 msgid "The operating system to be started up by default."
 msgstr " Operativsystemet som startes opp som standard"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:197
+#: en/setupBootloader.xml:292
 msgid "<emphasis role=\"bold\">Append</emphasis>"
 msgstr "<emphasis role=\"bold\">Legg til</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:199
+#: en/setupBootloader.xml:294
 msgid ""
 "This option lets you pass information to the kernel or tell the kernel to "
 "give you more information as it boots."
@@ -4763,23 +4912,24 @@ msgstr ""
 "deg mer informasjon når den starter opp."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:204
+#: en/setupBootloader.xml:299
 msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
 msgstr "<emphasis role=\"bold\">Sjekk for fremmed OS</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:206
+#: en/setupBootloader.xml:301
+#, fuzzy
 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, "
-"then untick the Probe Foreign OS option."
+"then untick the <guimenuitem>Probe Foreign OS</guimenuitem> option."
 msgstr ""
 "Hvis du har andre operativsystemer installert, forsøker Mageia å legge dem "
 "til din Mageia oppstartsmeny. Hvis du ikke vil ha denne virkemåten, fjerner "
 "du markeringen for Test for Fremmed OS"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:215
+#: en/setupBootloader.xml:311
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader4.png\"/> </imageobject> <imageobject condition=\"live"
@@ -4792,12 +4942,12 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:226
+#: en/setupBootloader.xml:322
 msgid "<emphasis>Video mode</emphasis>"
 msgstr "<emphasis>Video modus</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:228
+#: en/setupBootloader.xml:324
 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 "
@@ -4808,25 +4958,35 @@ msgstr ""
 "fargedybdealternativer."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:234
+#: en/setupBootloader.xml:330
 msgid "<emphasis>Do not touch ESP or MBR</emphasis>"
 msgstr "<emphasis>Ikke rør ESP eller MBR</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:236
+#: en/setupBootloader.xml:332
+#, fuzzy
 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 "
-"missing. Click<emphasis> Ok</emphasis> if you are sure you understand the "
-"implications, and wish to proceed."
+"missing. Click <guimenuitem>Ok </guimenuitem>only if you are sure you "
+"understand the implications, and wish to proceed."
 msgstr ""
 "Velg dette alternativet hvis du ikke vil ha en oppstartbar Mageia, men vil "
 "heller kjede laste det fra et annet OS. Du får en advarsel om at "
 "oppstartslasteren mangler. Klikk <emphasis>Ok</emphasis> hvis du er sikker "
 "på at du forstår implikasjonene, og ønsker å fortsette."
 
+#. type: Content of: <section><section><section><itemizedlist><listitem><warning><para>
+#: en/setupBootloader.xml:338
+msgid ""
+"Chain-loading via legacy bootloaders (GRUB Legacy and LiLo)  is no longer "
+"supported by Mageia as it is likely to fail when attempting to boot this "
+"resulting installation of Mageia. If you use anything other than GRUB2 or "
+"rEFInd for this purpose, then you do so at your own risk!"
+msgstr ""
+
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:245
+#: en/setupBootloader.xml:348
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png"
 "\"/> </imageobject>"
@@ -4835,17 +4995,17 @@ msgstr ""
 "\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:253
+#: en/setupBootloader.xml:356
 msgid "Other Options"
 msgstr "Andre valg"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:256
+#: en/setupBootloader.xml:359
 msgid "Using an existing bootloader"
 msgstr "Bruker en eksisterende oppstartslaster"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:258
+#: en/setupBootloader.xml:361
 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 "
@@ -4860,12 +5020,12 @@ msgstr ""
 "automatisk. Se dokumentasjonen for det aktuelle operativsystemet."
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:267
+#: en/setupBootloader.xml:370
 msgid "Installing Without a Bootloader"
 msgstr "Innstaller uten en oppstartslaster"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:269
+#: en/setupBootloader.xml:372
 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 "
@@ -5278,3 +5438,46 @@ msgid ""
 msgstr ""
 "Neste steg er kopiering av filene til disken. Dette tar noen minutter. Til "
 "slutt får du en tom skjerm for en stund, noe som er normalt."
+
+#~ msgid ""
+#~ "Type in the user password. There is a shield at the end of the text box "
+#~ "that indicates the strength of the password. (See also <xref linkend="
+#~ "\"givePassword\"/>)"
+#~ msgstr ""
+#~ "Skriv inn ønsket passord for brukeren. Det er et skjold på slutten av "
+#~ "tekstboksen som angir styrken til passordet. (Se også <xref linkend="
+#~ "\"givePassword\"/>)"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> "
+#~ "</imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> "
+#~ "</imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4."
+#~ "png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4."
+#~ "png\"/> </imageobject>"
+
+#~ msgid "Grub2 on Legacy MBR/GPT systems"
+#~ msgstr "Grub2 på eldre MBR/GPT systemer"
+
+#~ msgid "Grub2-efi on UEFI systems"
+#~ msgstr "Grub2-efi på UEFI systemer"
+
+#~ msgid ""
+#~ "This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI "
+#~ "systems will not see this option here."
+#~ msgstr ""
+#~ "Denne funksjonen er bare tilgjengelig for Legacy MBR/BIOS-systemer. "
+#~ "Brukere av UEFI-systemer vil ikke se dette alternativet."
diff --git a/docs/docs/stable/installer/nl.po b/docs/docs/stable/installer/nl.po
index 46c5abca..327dd112 100644
--- a/docs/docs/stable/installer/nl.po
+++ b/docs/docs/stable/installer/nl.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2019-01-19 21:23+0200\n"
+"POT-Creation-Date: 2019-09-08 15:26+0300\n"
 "PO-Revision-Date: 2019-05-03 21:18+0000\n"
 "Last-Translator: dragnadh\n"
 "Language-Team: Dutch (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -180,7 +180,7 @@ msgstr ""
 "bitspakketten worden dan daar opgehaald."
 
 #. type: Content of: <section><info><title>
-#: en/addUser.xml:3
+#: en/addUser.xml:9
 msgid "User Management"
 msgstr "Gebruikersbeheer"
 
@@ -190,13 +190,16 @@ msgstr "Gebruikersbeheer"
 #. 2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
 #.   Also changed 'Advanced User Management' to 'User Management (advanced)'.
 #. 2018/02/24 apb: Changed list style.
+#. 2019/08/10 apb: Added missing 'condition' profile for live-user1.png.
+#. 2019/08/11 apb: [1] Reword 1.1 (including Note) [2] Reword 1.2 Password text.
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:12
+#: en/addUser.xml:28
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
-"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
-"\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata format="
-"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-setRootPassword.png\" format=\"PNG\" revision=\"1\" xml:id="
+"\"setRootPassword-im1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-user1.png\" format=\"PNG\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
 "\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -204,20 +207,18 @@ msgstr ""
 "\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:21
+#: en/addUser.xml:40
 msgid "Set Administrator (root)  Password:"
 msgstr "Beheerderswachtwoord (root)  instellen:"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:24
+#: en/addUser.xml:44
+#, fuzzy
 msgid ""
 "It is advisable for all Mageia installations to set a <literal>superuser</"
 "literal> (Administrator) password, usually called the <emphasis>root </"
-"emphasis>password in Linux. As you type a password into the top box a shield "
-"will change from red-to-yellow-to-green depending on the strength of the "
-"password. A green shield shows you are using a strong password. You need to "
-"repeat the same password in the box underneath, to check that the first "
-"entry was not mistyped."
+"emphasis>password in Linux. You need to repeat the same password in the box "
+"underneath, to check that the first entry was not mistyped."
 msgstr ""
 "Voor elke Mageia installatie wordt aanbevolen een <literal>superuser-"
 "wachtwoord</literal> (beheerderswachtwoord) in te stellen. In Linux heet dit "
@@ -228,7 +229,15 @@ msgstr ""
 "het volgende vak, ter controle om typefouten uit te sluiten."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:32
+#: en/addUser.xml:51
+msgid ""
+"As you type a password into the top box a shield will change from red-to-"
+"yellow-to-green depending on the strength of the password. A green shield "
+"shows you are using a strong password."
+msgstr ""
+
+#. type: Content of: <section><section><note><para>
+#: en/addUser.xml:55
 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."
@@ -238,12 +247,12 @@ msgstr ""
 "en andere tekens."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:39
+#: en/addUser.xml:63
 msgid "Enter a user"
 msgstr "Voer een gebruiker in"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:41
+#: en/addUser.xml:66
 msgid ""
 "Add a User here. A regular user has fewer privileges than the "
 "<literal>superuser</literal> (root), but enough to use the Internet, office "
@@ -256,32 +265,32 @@ msgstr ""
 "normaal mens zijn computer voor gebruikt."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:47
+#: en/addUser.xml:73
 msgid "<emphasis role=\"bold\">Icon</emphasis>"
 msgstr "<emphasis role=\"bold\">Pictogram</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:48
+#: en/addUser.xml:75
 msgid "Click on this button if you want to change the user's icon"
 msgstr "Klik op het pictogram van de gebruiker om het te veranderen."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:52
+#: en/addUser.xml:80
 msgid "<emphasis role=\"bold\">Real Name</emphasis>"
 msgstr "<emphasis role=\"bold\">Volledige naam</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:53
+#: en/addUser.xml:82
 msgid "Insert the user's real name into this text box"
 msgstr "Voer de volledige naam van de gebruiker in dit tekstvak in."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:56
+#: en/addUser.xml:86
 msgid "<emphasis role=\"bold\">Login Name</emphasis>"
 msgstr "<emphasis role=\"bold\">Aanmeldnaam</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:57
+#: en/addUser.xml:88
 msgid ""
 "Enter the user login name or let DrakX use a version of the user's real "
 "name. <emphasis role=\"bold\">The login name is case-sensitive.</emphasis>"
@@ -291,7 +300,7 @@ msgstr ""
 "hoofdlettergevoelig.</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><caution><simpara>
-#: en/addUser.xml:61
+#: en/addUser.xml:93
 msgid ""
 "The login entered here should be different to any login currently in use for "
 "your <filename>/home</filename> directory. Some user parameters will be "
@@ -300,23 +309,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:65 en/setupBootloader.xml:124
+#: en/addUser.xml:102 en/setupBootloader.xml:182
 msgid "<emphasis role=\"bold\">Password</emphasis>"
 msgstr "<emphasis role=\"bold\">Wachtwoord</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:66
-msgid ""
-"Type in the user password. There is a shield at the end of the text box that "
-"indicates the strength of the password. (See also <xref linkend="
-"\"givePassword\"/>)"
+#: en/addUser.xml:104
+msgid "Type in the user password (remembering the advice in the Note above)."
 msgstr ""
-"Typ het wachtwoord van de gebruiker. Aan het eind van het tekstvak is een "
-"schild dat de sterkte van het wachtwoord weergeeft. (Zie ook <xref linkend="
-"\"givePassword\"/>)"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:68
+#: en/addUser.xml:107
 msgid ""
 "<emphasis role=\"bold\">Password (again):</emphasis> Retype the user "
 "password. DrakX will check that you have not mistyped the password."
@@ -325,7 +328,7 @@ msgstr ""
 "gebruikerswachtwoord. DrakX zal checken of beide wachtwoorden gelijk zijn."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:74
+#: en/addUser.xml:114
 msgid ""
 "Any users added while installing Mageia, will have a home directory that is "
 "both read and write protected (umask=0027)"
@@ -334,7 +337,7 @@ msgstr ""
 "thuismap die beschermd is tegen zowel lezen als schrijven (umask=0027)."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:76
+#: en/addUser.xml:117
 msgid ""
 "You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
@@ -345,17 +348,17 @@ msgstr ""
 "<emphasis>Gebruikersbeheer</emphasis>."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:79
+#: en/addUser.xml:121
 msgid "The access permissions can also be changed after the install."
 msgstr "De toegangsrechten kunnen na het installeren ook nog veranderd worden."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:85
+#: en/addUser.xml:128
 msgid "User Management (advanced)"
 msgstr "Gebruikersbeheer (geavanceerd)"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:87
+#: en/addUser.xml:131
 msgid ""
 "The <emphasis>Advanced</emphasis> option allows you to edit further settings "
 "for the user you are adding."
@@ -364,7 +367,7 @@ msgstr ""
 "bewerken voor de gebruiker die u toevoegt."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:91
+#: en/addUser.xml:136
 msgid ""
 "<emphasis>Shell</emphasis>: This drop-down list allows you to change the "
 "shell available to any user you added in the previous screen. Options are "
@@ -376,7 +379,7 @@ msgstr ""
 "zijn de opties."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:143
 msgid ""
 "<emphasis>User ID</emphasis>: Here you can set the user ID for any user you "
 "added in the previous screen. If you are unsure what the purpose of this is, "
@@ -387,7 +390,7 @@ msgstr ""
 "als u niet zeker weet waartoe het dient."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:102
+#: en/addUser.xml:149
 msgid ""
 "<emphasis>Group ID</emphasis>: This lets you set the group ID.  Again, if "
 "unsure, leave it blank."
@@ -537,24 +540,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:23
+#: en/bootLive.xml:10
 msgid "Boot Mageia as Live system"
 msgstr "Start Mageia als Live-systeem"
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:28
+#: en/bootLive.xml:14
 msgid "Booting the medium"
 msgstr "Het medium opstarten"
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:31
+#: en/bootLive.xml:16
 msgid ""
 "You can boot directly from a Live DVD or USB. Usually, you just need to plug "
 "the USB device in or place the DVD in the drive and restart the computer."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:35
+#: en/bootLive.xml:19
 msgid ""
 "If the computer does not automatically boot from the USB or DVD you may need "
 "to reconfigure your BIOS Boot Disk priority. Alternatively, you might try "
@@ -563,7 +566,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><tip><para>
-#: en/bootLive.xml:41
+#: en/bootLive.xml:24
 msgid ""
 "To access the BIOS or boot menu when the computer is starting, you can try "
 "pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or <keycap>Esc</"
@@ -573,7 +576,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/bootLive.xml:50
+#: en/bootLive.xml:32
 msgid ""
 "The actual screen that you will first see when booting from the Live media "
 "will depend on whether your computer motherboard is of the Legacy (BIOS) or "
@@ -581,91 +584,93 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:58
+#: en/bootLive.xml:39
 msgid "In BIOS/CSM/Legacy mode"
 msgstr "In BIOS/CSM/Legacy-modus"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:62
+#: en/bootLive.xml:42
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"../live-bootCSM.png\" align=\"center\"/> "
+"</imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:67
+#: en/bootLive.xml:46
 msgid "First screen while booting in BIOS mode"
 msgstr "Eerste scherm na starten in BIOS-modus"
 
 #. type: Content of: <section><section><section><itemizedlist><title>
-#: en/bootLive.xml:72 en/bootLive.xml:144 en/installer.xml:106
-#: en/installer.xml:154
+#: en/bootLive.xml:50 en/bootLive.xml:104 en/installer.xml:108
+#: en/installer.xml:156
 msgid "Menu"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:75 en/bootLive.xml:147
+#: en/bootLive.xml:52 en/bootLive.xml:106
 msgid "<emphasis role=\"bold\">Boot Mageia</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:77
+#: en/bootLive.xml:53
 msgid ""
 "This option will boot the Mageia Live system from the connected DVD/USB "
 "media (expect a very slow system compared to an installed OS)."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:81
+#: en/bootLive.xml:56
 msgid "Once the boot is done, you can proceed to the installation."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:86 en/bootLive.xml:102
+#: en/bootLive.xml:60 en/bootLive.xml:72
 msgid ""
 "<emphasis role=\"bold\">+ use non-free video drivers (slower to boot)</"
 "emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:89
+#: en/bootLive.xml:62
 msgid "Boot the Mageia Live system using non-free video drivers"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:96 en/bootLive.xml:155 en/installer.xml:109
+#: en/bootLive.xml:68 en/bootLive.xml:112 en/installer.xml:111
 msgid "<emphasis role=\"bold\">Install Mageia</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:98 en/bootLive.xml:157
+#: en/bootLive.xml:69 en/bootLive.xml:113
 msgid "This option will install Mageia to a hard disk."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:105
+#: en/bootLive.xml:74
 msgid "Install Mageia using non-free video drivers"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:111 en/installer.xml:125
+#: en/bootLive.xml:79 en/installer.xml:127
 msgid "<emphasis role=\"bold\">Memory Test</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:113 en/installer.xml:127
+#: en/bootLive.xml:80 en/installer.xml:129
 msgid ""
 "Test the installed RAM by performing multiple read and write operations. "
 "Reboot to end the test."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:118 en/bootLive.xml:161
+#: en/bootLive.xml:84 en/bootLive.xml:116
 msgid "<emphasis role=\"bold\"> F2 Language</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:120 en/bootLive.xml:163
+#: en/bootLive.xml:85 en/bootLive.xml:117
 msgid ""
 "Press <keycap>F2</keycap> to have the installer use a specific language "
 "during the installation. Use the arrow keys to select the language then "
@@ -673,24 +678,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:129
+#: en/bootLive.xml:93
 msgid "In UEFI mode"
 msgstr "In UEFI-modus"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:133
+#: en/bootLive.xml:96
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:139
+#: en/bootLive.xml:100
 msgid "First screen while booting in UEFI mode"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:149
+#: en/bootLive.xml:107
 msgid ""
 "This option will boot the Mageia Live system from the connected DVD/USB "
 "media (expect a very slow system compared to an installed OS).  Once the "
@@ -698,7 +706,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/bootLive.xml:170
+#: en/bootLive.xml:123
 msgid ""
 "If you booted from a USB stick, you will see the above menu options "
 "duplicated, and in this case, you should choose from the menu pair that will "
@@ -924,12 +932,12 @@ msgstr ""
 "allemaal op lokale tijd ingesteld staan, of op UTC/GMT."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:24
+#: en/configureX_card_list.xml:27
 msgid "Choose an X Server (Configure your Graphic Card)"
 msgstr "Kies een X-server (Configureer uw grafische kaart)"
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_card_list.xml:29
+#: en/configureX_card_list.xml:32
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_card_list."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_card_list-im1\"/> </"
@@ -937,7 +945,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:35
+#: en/configureX_card_list.xml:38
 msgid ""
 "DrakX has a very comprehensive database of video cards and will usually "
 "correctly identify your video device."
@@ -946,7 +954,7 @@ msgstr ""
 "grafische kaart gewoonlijk juist identificeren."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:38
+#: en/configureX_card_list.xml:41
 msgid ""
 "If the installer has not correctly detected your graphic card and you know "
 "which one you have, you can select it from the tree by:"
@@ -955,22 +963,22 @@ msgstr ""
 "en u weet welke u heeft, kunt u deze in de boomstructuur selecteren via:"
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_card_list.xml:41 en/configureX_monitor.xml:74
+#: en/configureX_card_list.xml:44 en/configureX_monitor.xml:78
 msgid "Vendor"
 msgstr "Fabrikant"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:45
+#: en/configureX_card_list.xml:48
 msgid "then the make of your card"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:49
+#: en/configureX_card_list.xml:52
 msgid "and the model of card"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:53
+#: en/configureX_card_list.xml:56
 msgid ""
 "If you cannot find your card in the vendor lists (because it's not yet in "
 "the database or it's an older card) you may find a suitable driver in the "
@@ -981,14 +989,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><caution><para>
-#: en/configureX_card_list.xml:61
+#: en/configureX_card_list.xml:64
 msgid ""
 "Be aware that if you select an incompatible driver you may only have access "
 "to the <emphasis>Command Line Interface</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:65
+#: en/configureX_card_list.xml:68
 msgid ""
 "Some video card manufacturers provide proprietary drivers for Linux which "
 "may only be available in the <emphasis>Nonfree</emphasis> repository and in "
@@ -999,17 +1007,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:11
-msgid "Graphic Card and Monitor Configuration"
+#: en/configureX_chooser.xml:23
+#, fuzzy
+msgid "Graphics Card and Monitor Configuration"
 msgstr "Configuratie van grafische kaart en monitor"
 
-#.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
-#. 2018/02/15 apb: Some text and typography.
-#. 2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.
-#. 2018/02/23 apb: Typo.
-#. 2019/01/06 apb: Slight reword, split 1st para in two.
 #. type: Content of: <section><mediaobject>
-#: en/configureX_chooser.xml:26
+#: en/configureX_chooser.xml:28
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_chooser."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_chooser-im1\"/> </"
@@ -1017,7 +1021,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:32
+#: en/configureX_chooser.xml:34
 msgid ""
 "No matter which graphical environment (also known as desktop environment) "
 "you chose for this install of Mageia, they are all based on a graphical user "
@@ -1028,31 +1032,32 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:39
+#: en/configureX_chooser.xml:41
 msgid ""
 "Choose the appropriate settings manually if you think the details are "
 "incorrect, or if none are shown."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:44
-msgid "<emphasis role=\"bold\">Graphic Card</emphasis>"
+#: en/configureX_chooser.xml:46
+#, fuzzy
+msgid "<emphasis role=\"bold\">Graphics Card</emphasis>"
 msgstr "<emphasis role=\"bold\">Grafische kaart</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:47
+#: en/configureX_chooser.xml:49
 msgid ""
 "If you need to, you can select a specific card from this expandable list. "
 "See <xref linkend=\"configureX_card_list\"/>."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:52
+#: en/configureX_chooser.xml:54
 msgid "<emphasis role=\"bold\">Monitor</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:55
+#: en/configureX_chooser.xml:57
 msgid ""
 "You can choose Plug 'n Play, if applicable, or choose your monitor from the "
 "<emphasis>Vendor</emphasis> or <emphasis>Generic</emphasis> lists. Choose "
@@ -1062,22 +1067,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:63
+#: en/configureX_chooser.xml:65
 msgid "<emphasis role=\"bold\">Resolution</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:66
+#: en/configureX_chooser.xml:68
 msgid "The resolution and color depth of your monitor can be set here."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:71
+#: en/configureX_chooser.xml:73
 msgid "<emphasis role=\"bold\">Test</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:74
+#: en/configureX_chooser.xml:76
 msgid ""
 "The test button does not always appear during install. If the option is "
 "there, and you test your settings, you should be asked to confirm that your "
@@ -1089,17 +1094,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:85
+#: en/configureX_chooser.xml:87
 msgid "<emphasis role=\"bold\">Options</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:88
+#: en/configureX_chooser.xml:90
 msgid "Here you can choose to enable or disable various options."
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_chooser.xml:93
+#: en/configureX_chooser.xml:95
 msgid ""
 "There is a risk of damaging a monitor if you choose refresh rates that are "
 "outside the frequency range of that monitor. This applies to older CRT "
@@ -1108,12 +1113,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_monitor.xml:22
+#: en/configureX_monitor.xml:26
 msgid "Choosing your Monitor"
 msgstr "Beeldscherm (Selecteer een monitor)"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:25
+#: en/configureX_monitor.xml:29
 msgid ""
 "DrakX has a very comprehensive database of monitors and will usually "
 "correctly identify yours."
@@ -1122,7 +1127,7 @@ msgstr ""
 "gewoonlijk correct identificeren."
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:30
+#: en/configureX_monitor.xml:34
 msgid ""
 "<emphasis role=\"bold\">Selecting a monitor with different characteristics "
 "could damage your monitor or video hardware. Please don't try something "
@@ -1131,7 +1136,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:38
+#: en/configureX_monitor.xml:42
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
@@ -1142,12 +1147,12 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:46
+#: en/configureX_monitor.xml:50
 msgid "Custom"
 msgstr "Aangepast"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:49
+#: en/configureX_monitor.xml:53
 msgid ""
 "This option allows you to set two critical parameters: the vertical refresh "
 "rate and the horizontal sync rate. Vertical refresh determines how often the "
@@ -1156,7 +1161,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:55
+#: en/configureX_monitor.xml:59
 msgid ""
 "It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor "
 "type with a sync range that is beyond the capabilities of your monitor: you "
@@ -1169,58 +1174,59 @@ msgstr ""
 "terughoudend bij het instellen in geval van twijfel."
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:64
+#: en/configureX_monitor.xml:68
 msgid "Plug'n Play"
 msgstr "Plug'n Play"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:67
+#: en/configureX_monitor.xml:71
 msgid ""
 "This is the default option and automatically tries to determine the monitor "
 "type from the monitor database."
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:77
+#: en/configureX_monitor.xml:81
+#, fuzzy
 msgid ""
 "If the installer has not correctly detected your monitor and you know which "
-"one you have, you can select it from the tree by selecting:"
+"one you have, you can choose it from the options by selecting:"
 msgstr ""
 "Als DrakX uw beeldscherm niet goed herkent en u weet welke monitor u heeft, "
 "kunt u deze als volgt in de boomstructuur kiezen:"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:86
+#: en/configureX_monitor.xml:90
 msgid "Manufacturer"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:90
+#: en/configureX_monitor.xml:94
 msgid "Monitor model"
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:96
+#: en/configureX_monitor.xml:100
 msgid "Generic"
 msgstr "Algemeen"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:99
+#: en/configureX_monitor.xml:103
 msgid ""
-"Selecting this group will list nearly 30 display configurations such as "
-"1024x768 @ 60Hz and includes flat-panel displays as used in laptops. This is "
-"often a good monitor selection group if you need to use the VESA card driver "
-"when your video hardware cannot be determined automatically.  Once again it "
-"may be wise to be conservative in your selections."
+"Selecting this group will list approximately 30 display configurations such "
+"as 1024x768 @ 60Hz and includes flat-panel displays as used in laptops.  "
+"This is often a good monitor selection group if you need to use the VESA "
+"card driver when your video hardware cannot be determined automatically. "
+"Once again, it may be wise to be conservative in your selections."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:22
+#: en/diskdrake.xml:24
 msgid "Custom Disk Partitioning with DiskDrake"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:27
+#: en/diskdrake.xml:29
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-diskdrake.png\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1228,7 +1234,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:38
+#: en/diskdrake.xml:40
 msgid ""
 "Modify the layout of your disk(s) here. You can remove or create partitions, "
 "change the filesystem or size of a partition and even view their details "
@@ -1236,15 +1242,15 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:47
 msgid ""
 "There is a tab at the top for every detected hard disk (or other storage "
-"device, like a USB key). In the screenshot above there are two available "
-"devices: <filename>sda </filename>and <filename>sdb</filename>."
+"device, like a USB key), for example: <filename>sda</filename>, "
+"<filename>sdb</filename>, <filename>sdc</filename> etc."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:52
+#: en/diskdrake.xml:54
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it. "
@@ -1253,21 +1259,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:60
+#: en/diskdrake.xml:62
 msgid ""
 "Continue until you have adjusted everything to your satisfaction, then click "
 "<emphasis>Done</emphasis> when you're ready."
 msgstr ""
 
 #. type: Content of: <section><warning><orderedlist><listitem><para>
-#: en/diskdrake.xml:69
+#: en/diskdrake.xml:71
 msgid ""
 "Take care with the <emphasis>Clear all</emphasis> option, use it only if you "
 "are sure you want to wipe all partitions on the selected storage device."
 msgstr ""
 
 #. type: Content of: <section><warning><orderedlist><listitem><para>
-#: en/diskdrake.xml:75
+#: en/diskdrake.xml:77
 msgid ""
 "If you wish to use encryption on your <filename>/</filename> partition you "
 "must ensure that you have a separate <filename>/boot</filename> partition. "
@@ -1276,7 +1282,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/diskdrake.xml:87
+#: en/diskdrake.xml:89
 msgid ""
 "If you are installing Mageia on a UEFI system, check that an ESP (EFI System "
 "Partition) is present and correctly mounted on <filename>/boot/EFI</"
@@ -1284,19 +1290,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/diskdrake.xml:93
+#: en/diskdrake.xml:95
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
 "partition is present and of the correct type. See Figure 2 below."
 msgstr ""
 
 #. type: Content of: <section><figure><title>
-#: en/diskdrake.xml:101
+#: en/diskdrake.xml:103
 msgid "EFI System Partition"
 msgstr "EFI-systeempartitie"
 
 #. type: Content of: <section><figure><mediaobject>
-#: en/diskdrake.xml:104
+#: en/diskdrake.xml:106
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-diskdrake2.png\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1304,17 +1310,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><figure>
-#: en/diskdrake.xml:103 en/diskdrake.xml:117
+#: en/diskdrake.xml:105 en/diskdrake.xml:119
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><figure><title>
-#: en/diskdrake.xml:115
+#: en/diskdrake.xml:117
 msgid "BIOS boot partition"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:118 en/doPartitionDisks.xml:201
+#: en/diskdrake.xml:120 en/doPartitionDisks.xml:206
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1337,26 +1343,26 @@ msgid "Partitioning"
 msgstr "Partitionering"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:31
 msgid "Suggested Partitioning"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:34
 msgid ""
 "In this screen you can see the content of your hard drive(s) along with the "
 "DrakX partitioning proposals for where to install Mageia."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:34
+#: en/doPartitionDisks.xml:38
 msgid ""
 "The actual options available from those shown below will vary according to "
 "the layout and content of your particular hard drive(s)."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:39
+#: en/doPartitionDisks.xml:43
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1365,17 +1371,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><title>
-#: en/doPartitionDisks.xml:49
+#: en/doPartitionDisks.xml:53
 msgid "Main Options"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:56
 msgid "<emphasis role=\"bold\">Use Existing Partitions</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:59
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1384,12 +1390,12 @@ msgstr ""
 "gevonden die gebruikt kunnen worden voor het installeren."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:61
+#: en/doPartitionDisks.xml:65
 msgid "<emphasis role=\"bold\">Use Free Space</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:68
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1398,57 +1404,54 @@ msgstr ""
 "Mageia-installatie wilt gebruiken, kies dan deze optie."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:70
+#: en/doPartitionDisks.xml:74
 msgid ""
 "<emphasis role=\"bold\">Use Free Space on a Windows Partition</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:73
+#: en/doPartitionDisks.xml:77
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it. 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 important files!"
+"installation but see the warning below."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para><mediaobject>
+#: en/doPartitionDisks.xml:87
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:79
+#: en/doPartitionDisks.xml:82
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
 "light blue and the proposed Mageia partition in dark blue with their "
 "intended sizes just underneath. You have the option to modify these sizes by "
 "clicking and dragging the gap between both partitions.  See the following "
-"screenshot:"
-msgstr ""
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:87
-msgid "<emphasis role=\"bold\">Erase and use Entire Disk</emphasis>"
-msgstr ""
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:90
-msgid "This option will allocate the entire drive for Mageia"
+"screenshot:<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:97
 msgid ""
-"This will erase ALL data on the selected hard drive. Take care! 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 this option."
+"This involves shrinking the size of the Windows partition, and therefore is "
+"a risky operation, so you should make sure you have backed up all important "
+"files before proceeding."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><important><para>
-#: en/doPartitionDisks.xml:101
+#: en/doPartitionDisks.xml:103
+#, fuzzy
 msgid ""
-"Note that this involves shrinking the size of the Windows partition. The "
-"partition must be \"clean\", meaning that Windows must have closed down "
+"The partition must be \"clean\", meaning that Windows must have closed down "
 "correctly the last time it was used. It must also have been defragmented, "
 "although this is not a guarantee that all files in the partition have been "
-"moved out of the area that is about to be used. It is highly recommended to "
-"back up your personal files."
+"moved out of the area that is about to be used for Mageia."
 msgstr ""
 "Merk op dat de Windows partitie hiervoor kleiner gemaakt moet worden, wat "
 "niet zonder enig risico is. De partitie moet \"schoon\" zijn, wat inhoudt "
@@ -1460,11 +1463,29 @@ msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/doPartitionDisks.xml:112
-msgid "<emphasis role=\"bold\">Custom Disk Partitioning</emphasis>"
+msgid "<emphasis role=\"bold\">Erase and use Entire Disk</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/doPartitionDisks.xml:115
+msgid "This option will allocate the entire drive for Mageia"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><warning><para>
+#: en/doPartitionDisks.xml:119
+msgid ""
+"This will erase ALL data on the selected hard drive. Take care! 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 this option."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:127
+msgid "<emphasis role=\"bold\">Custom Disk Partitioning</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:130
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1472,17 +1493,8 @@ msgstr ""
 "Hiermee krijgt u volledige controle over het plaatsen van de installatie op "
 "uw harde schijf of schijven."
 
-#. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:122
-msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
-msgstr ""
-
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:131
+#: en/doPartitionDisks.xml:136
 msgid ""
 "If you are not using the <emphasis>Custom disk partitioning</emphasis> "
 "option, then the installer will allocate the available space according to "
@@ -1490,60 +1502,60 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:137
+#: en/doPartitionDisks.xml:142
 msgid ""
 "If the total available space is less than 50 GB, then only one partition is "
 "created. This will be the <filename>/</filename> (root)  partition."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:143
+#: en/doPartitionDisks.xml:148
 msgid ""
 "If the total available space is greater than 50 GB, then three partitions "
 "are created"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:148
+#: en/doPartitionDisks.xml:153
 msgid ""
 "6/19 of the total available place is allocated to <filename>/</filename> "
 "with a maximum of 50 GB"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:153
+#: en/doPartitionDisks.xml:158
 msgid "1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:158
+#: en/doPartitionDisks.xml:163
 msgid "the rest (at least 12/19) is allocated to <filename>/home</filename>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:165
+#: en/doPartitionDisks.xml:170
 msgid ""
 "This means that from 160 GB or greater available space, the installer will "
 "create three partitions:"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:170
+#: en/doPartitionDisks.xml:175
 msgid "50 GB for <filename>/</filename>"
 msgstr "50 GB voor <filename>/</filename>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:174
+#: en/doPartitionDisks.xml:179
 msgid "4 GB for <filename>swap</filename>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:178
+#: en/doPartitionDisks.xml:183
 msgid "and the remainder for <filename>/home</filename>"
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:183
+#: en/doPartitionDisks.xml:188
 msgid ""
 "If you are using a UEFI system, the ESP (EFI System Partition) will be "
 "automatically detected - or created if it does not exist yet - and mounted "
@@ -1553,7 +1565,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:189
+#: en/doPartitionDisks.xml:194
 msgid ""
 "If you are using a Legacy (also known as BIOS) system with a GPT partitioned "
 "disk, you need to create a BIOS boot partition if it doesn't already exist. "
@@ -1564,19 +1576,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:196
+#: en/doPartitionDisks.xml:201
 msgid "See <xref linkend=\"diskdrake\"/> for information on how to proceed."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:211
+#: en/doPartitionDisks.xml:216
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4.png"
-"\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks4.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks4.png\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject condition=\"classical\"><imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/></imageobject><imageobject condition=\"live"
+"\"><imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/></"
+"imageobject>"
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:217
+#: en/doPartitionDisks.xml:226
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
 "previous standard of 512. Due to lack of available hardware, the "
@@ -1585,7 +1604,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:222
+#: en/doPartitionDisks.xml:231
 msgid ""
 "Some SSD devices now use an erase block size over 1 MB. If you have such a "
 "device we suggest that you partition the drive in advance, using an "
@@ -1594,17 +1613,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:229
+#: en/doPartitionDisks.xml:238
 msgid "<emphasis>Align to</emphasis> = MiB"
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:233
+#: en/doPartitionDisks.xml:242
 msgid "<emphasis>Free space preceding (MiB)</emphasis> = 2"
 msgstr ""
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:237
+#: en/doPartitionDisks.xml:246
 msgid ""
 "Also make sure all partitions are created using an even number of megabytes."
 msgstr ""
@@ -1778,12 +1797,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/firewall.xml:7
+#: en/firewall.xml:16
 msgid "Firewall"
 msgstr "Firewall"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:10
+#: en/firewall.xml:19
 msgid ""
 "This section allows you to configure some simple firewall rules: they "
 "determine which type of message from the Internet will be accepted by the "
@@ -1791,8 +1810,17 @@ msgid ""
 "system to be accessible from the Internet."
 msgstr ""
 
+#. type: Content of: <section><mediaobject>
+#: en/firewall.xml:26
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-firewall.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+
 #. type: Content of: <section><para>
-#: en/firewall.xml:16
+#: en/firewall.xml:31
 msgid ""
 "In the default setting (no button is checked), no service of the system is "
 "accessible from the network. The <emphasis>Everything (no firewall)</"
@@ -1805,7 +1833,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:25
+#: en/firewall.xml:40
 msgid ""
 "All other options are more or less self-explanatory. As an example, you will "
 "enable the CUPS server if you want printers on your machine to be accessible "
@@ -1813,12 +1841,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:29
+#: en/firewall.xml:44
 msgid "<emphasis role=\"bold\">Advanced</emphasis>"
 msgstr "<emphasis role=\"bold\">Geavanceerd</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:31
+#: en/firewall.xml:46
 msgid ""
 "The <emphasis>Advanced</emphasis> option opens a window where you can enable "
 "a series of services by typing a list of <quote>couples</quote> (blank "
@@ -1826,16 +1854,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:35
-msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
+#: en/firewall.xml:50
+#, fuzzy
+msgid "<emphasis>&lt;port-number&gt;/&lt;protocol&gt;</emphasis>"
 msgstr "<emphasis>&lt;poort-nummer>/&lt;protocol></emphasis>"
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:38
+#: en/firewall.xml:53
+#, fuzzy
 msgid ""
-"- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
-"the service you want to enable (e.g. 873 for the RSYNC service) as defined "
-"in <emphasis>RFC-433</emphasis>;"
+"- <emphasis>&lt;port-number&gt;</emphasis> is the value of the port assigned "
+"to the service you want to enable (e.g. 873 for the RSYNC service) as "
+"defined in <emphasis>RFC-433</emphasis>;"
 msgstr ""
 "- <emphasis>&lt;poort-nummer></emphasis>Is de waarde van\n"
 " de poort die is toegewezen aan de dienst die u wilt inschakelen \n"
@@ -1843,17 +1873,19 @@ msgstr ""
 "<emphasis>RFC-433</emphasis>;"
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:42
+#: en/firewall.xml:57
+#, fuzzy
 msgid ""
-"- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
-"<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
+"- <emphasis>&lt;protocol&gt;</emphasis> is one of <emphasis>TCP</emphasis> "
+"or <emphasis>UDP</emphasis> - the internet protocol that is used by the "
+"service."
 msgstr ""
 "- <emphasis>&lt;protocol></emphasis>is één van <emphasis>TCP</emphasis> of "
 "<emphasis>UDP</emphasis> - Het internetprotocol dat door de dienst wordt "
 "gebruikt."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:47
+#: en/firewall.xml:62
 msgid ""
 "For instance, the entry for enabling access to the RSYNC service therefore "
 "is <emphasis>873/tcp</emphasis>."
@@ -1862,7 +1894,7 @@ msgstr ""
 "dienst is dus <emphasis>873/tcp</emphasis>."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:50
+#: en/firewall.xml:65
 msgid ""
 "In case a service is implemented to use both protocols, you specify 2 "
 "couples for the same port."
@@ -1932,12 +1964,12 @@ msgid "Graphical Configuration"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:32
+#: en/installer.xml:34
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, het Mageia-installatieprogramma"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:35
+#: en/installer.xml:37
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -1948,33 +1980,33 @@ msgstr ""
 "ervaren gebruiker bent."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:40
+#: en/installer.xml:42
 msgid "The installation steps"
 msgstr "De Installatiestappen"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:44
+#: en/installer.xml:46
 msgid ""
 "The install process is divided into a number of steps - the status of which "
 "is indicated in a panel to the left of the screen."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:50
+#: en/installer.xml:52
 msgid ""
 "Each step has one or more screens, which may also have <emphasis>Advanced</"
 "emphasis> sections with extra, less commonly required options."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:56
+#: en/installer.xml:58
 msgid ""
 "Most screens have <emphasis>Help</emphasis> buttons for further details "
 "about the particular step."
 msgstr ""
 
 #. type: Content of: <section><section><caution><para>
-#: en/installer.xml:62
+#: en/installer.xml:64
 msgid ""
 "If at some point during the install you decide to abort the installation, it "
 "is possible to reboot, but please think twice before you do this. Once a "
@@ -1984,7 +2016,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><caution><para>
-#: en/installer.xml:68
+#: en/installer.xml:70
 msgid ""
 "If, in spite of this, you are very sure rebooting is what you want, go to a "
 "text terminal by pressing the keys <keycombo> <keycap>Ctrl</keycap> "
@@ -1994,12 +2026,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:86
+#: en/installer.xml:88
 msgid "Installation Welcome Screen"
 msgstr "Allereerste installatiewelkomsscherm"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:88
+#: en/installer.xml:90
 msgid ""
 "The particular screen that you will first see when booting from the "
 "Installation media will depend on whether your computer motherboard is of "
@@ -2007,60 +2039,60 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:92
+#: en/installer.xml:94
 msgid ""
 "The welcome menu screen has various options, however the default option will "
 "start the installer, and is normally all that you will need."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:97
+#: en/installer.xml:99
 msgid "Legacy (BIOS) Systems"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:100
+#: en/installer.xml:102
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome.png\"/> </"
 "imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:111
+#: en/installer.xml:113
 msgid ""
 "Install Mageia to a hard disk. This is the default option, and will "
 "automatically start after a short while unless another option is selected."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:117
+#: en/installer.xml:119
 msgid "<emphasis role=\"bold\">Rescue System</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:119
+#: en/installer.xml:121
 msgid ""
 "This option allows you to either re-install the bootloader for an existing "
 "Mageia installation or you can use it to restore a Windows bootloader."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:132
+#: en/installer.xml:134
 msgid "<emphasis role=\"bold\">F2: Language</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:134
+#: en/installer.xml:136
 msgid "Press F2 for alternative languages."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:140
+#: en/installer.xml:142
 msgid "UEFI Systems"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:142
+#: en/installer.xml:144
 msgid ""
 "From this screen, you can access options by pressing <keycap>e</keycap> to "
 "enter the edit mode. To come back to this screen, press <keycap>Esc</keycap> "
@@ -2068,19 +2100,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:148
+#: en/installer.xml:150
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome2.png\"/> </"
 "imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:157
+#: en/installer.xml:159
 msgid "<emphasis role=\"bold\">Install:</emphasis> Start the Install process"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:162
+#: en/installer.xml:164
 msgid ""
 "<emphasis role=\"bold\">Rescue:</emphasis> This option allows you to either "
 "re-install the bootloader for an existing Mageia installation or you can use "
@@ -2088,31 +2120,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:169
+#: en/installer.xml:171
 msgid ""
 "<emphasis role=\"bold\">F2: Language:</emphasis> Press <keycap>F2</keycap> "
 "for alternative languages."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:174
+#: en/installer.xml:176
 msgid ""
 "If you booted from a USB stick, you will see the above options duplicated, "
 "and in this case, you should use the set that will be suffixed with \"USB\"."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:181
+#: en/installer.xml:183
 msgid "Installation Problems and Possible Solutions"
 msgstr "Installatieproblemen en mogelijke oplossingen"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:184
+#: en/installer.xml:186
 msgid "No Graphical Interface"
 msgstr "Geen grafische interface"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:188
+#: en/installer.xml:190
 msgid ""
 "After the initial screen you did not progress to the <emphasis>Language "
 "Selection</emphasis> screen. This can happen with some graphic cards and "
@@ -2121,7 +2153,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:195
+#: en/installer.xml:197
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
 "In this case it is worth trying a text-mode installation. To use this press "
@@ -2132,12 +2164,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:208
+#: en/installer.xml:210
 msgid "The Install Freezes"
 msgstr "Installatieblokkades"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:210
+#: en/installer.xml:212
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic hardware "
@@ -2147,12 +2179,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:218
+#: en/installer.xml:220
 msgid "RAM problem"
 msgstr "RAM-probleem"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:220
+#: en/installer.xml:222
 msgid ""
 "This will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
@@ -2162,12 +2194,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:228
+#: en/installer.xml:230
 msgid "Dynamic partitions"
 msgstr "Dynamische partities"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:230
+#: en/installer.xml:232
 msgid ""
 "If you converted your hard disk from <literal>Basic</literal> format to "
 "<literal>Dynamic</literal> format in Microsoft Windows, then it is not "
@@ -3807,73 +3839,109 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:27
+#: en/setupBootloader.xml:32
 msgid "Bootloader"
 msgstr "Opstartlader"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:31
+#: en/setupBootloader.xml:36
+#, fuzzy
+msgid "Available Bootloaders"
+msgstr "Opstartlader"
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:39
 msgid "Grub2"
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><title>
-#: en/setupBootloader.xml:34
-msgid "Grub2 on Legacy MBR/GPT systems"
-msgstr ""
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:42
+#, fuzzy
+msgid "<emphasis role=\"bold\">Grub2 on Legacy MBR/GPT systems</emphasis>"
+msgstr "<emphasis role=\"bold\">Aanmeldnaam</emphasis>"
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:37
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:46
 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:42
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:52
 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:49
-msgid "Grub2-efi on UEFI systems"
-msgstr "Grub2-efi op UEFI systemen"
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:59
+#, fuzzy
+msgid "<emphasis role=\"bold\">Grub2-efi on UEFI systems</emphasis>"
+msgstr "<emphasis role=\"bold\">Pictogram</emphasis>"
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:52
-msgid "GRUB2-efi will be used exclusively as the bootloader for a UEFI system."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:63
+msgid "GRUB2-efi or rEFInd may be used as the bootloader for a UEFI system."
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:57
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:68
 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:60
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:71
 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 "
-"created by Windows and add grub2-efi to it. If no ESP exists, then one will "
+"created by Windows and add grub2-efi to it.  If no ESP exists, then one will "
 "be created. Although it is possible to have several ESPs, only one is "
 "required, whatever the number of operating systems you have."
 msgstr ""
 
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:82
+msgid "rEFInd"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:85
+#, fuzzy
+msgid "<emphasis role=\"bold\">rEFInd on UEFI systems</emphasis>"
+msgstr "<emphasis role=\"bold\">Pictogram</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:88
+msgid ""
+"rEFInd has a nice graphical set of options, and can auto-detect installed "
+"EFI bootloaders. See: http://www.rodsbooks.com/refind/"
+msgstr ""
+
+#. type: Content of: <section><section><section><note><para>
+#: en/setupBootloader.xml:95
+msgid ""
+"Please note that in order to be able to use the <literal>rEFInd</literal> "
+"option, an installed EFI System Partition must match your system "
+"architecture: if you have a 32bit EFI System Partition installed on a 64bit "
+"machine for instance, then the rEFInd option will not be displayed/available "
+"to you."
+msgstr ""
+
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:72
+#: en/setupBootloader.xml:106
 msgid "Bootloader Setup"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:76
+#: en/setupBootloader.xml:110
 msgid "Bootloader main options"
 msgstr "Algemene opties voor de opstartlader"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:79
+#: en/setupBootloader.xml:113
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader.png\"/> </imageobject> <imageobject condition=\"live"
@@ -3882,47 +3950,70 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:91
+#: en/setupBootloader.xml:125
 msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:93
+#. type: Content of: <section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:129
 msgid ""
-"This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI "
-"systems will not see this option here."
+"<guimenuitem>GRUB2</guimenuitem> (with either a graphical or a text menu), "
+"can be chosen for both <literal>Legacy MBR/BIOS</literal> systems and "
+"<literal>UEFI</literal> systems."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:136
+msgid ""
+"<guimenuitem>rEFInd</guimenuitem> (with a graphical menu)  is an alternative "
+"option solely for use with <literal>UEFI</literal> systems."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:98
+#: en/setupBootloader.xml:144
 msgid "<emphasis role=\"bold\">Boot device</emphasis>"
 msgstr ""
 
+#. type: Content of: <section><section><section><itemizedlist><listitem><warning><para>
+#: en/setupBootloader.xml:147
+#, fuzzy
+msgid "Don't change this unless you really know what you are doing."
+msgstr "Verander alleen iets als u heel goed weet wat u doet."
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><note><para>
+#: en/setupBootloader.xml:152
+msgid ""
+"There is no option to write GRUB to the boot sector of a partition (e.g: "
+"<filename>sda1</filename>), as this method is considered unreliable."
+msgstr ""
+
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:100
-msgid "Don't change this unless you really know what you are doing"
+#: en/setupBootloader.xml:157
+msgid ""
+"When using UEFI mode, then the <guilabel>Boot device</guilabel> will be "
+"listed as <guimenuitem>EFI System Partition</guimenuitem>."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:105
+#: en/setupBootloader.xml:163
 msgid ""
 "<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:108
+#: en/setupBootloader.xml:166
 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:113
+#: en/setupBootloader.xml:171
 msgid "<emphasis role=\"bold\">Security</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:115
+#: en/setupBootloader.xml:173
 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 "
@@ -3932,34 +4023,34 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:126
+#: en/setupBootloader.xml:184
 msgid "Choose a password for the bootloader (optional)"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:130
+#: en/setupBootloader.xml:188
 msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:132
+#: en/setupBootloader.xml:190
 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:137 en/setupBootloader.xml:212
+#: en/setupBootloader.xml:195 en/setupBootloader.xml:308
 msgid "<emphasis>Advanced</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:141
+#: en/setupBootloader.xml:199
 msgid "<emphasis>Enable ACPI</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:143
+#: en/setupBootloader.xml:201
 msgid ""
 "ACPI (Advanced Configuration and Power Interface) is a standard for power "
 "management. It can save energy by stopping unused devices. Deselecting it "
@@ -3969,24 +4060,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:152
+#: en/setupBootloader.xml:210
 msgid "<emphasis>Enable SMP</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:154
+#: en/setupBootloader.xml:212
 msgid ""
 "This option enables/disables symmetric multiprocessing for multi-core "
 "processors"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:159
+#: en/setupBootloader.xml:217
 msgid "<emphasis>Enable APIC</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:161
+#: en/setupBootloader.xml:219
 msgid ""
 "Enabling this gives the operating system access to the Advanced Programmable "
 "Interrupt Controller. APIC devices permit more complex priority models, and "
@@ -3994,24 +4085,82 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:168
+#: en/setupBootloader.xml:226
 msgid "<emphasis>Enable Local APIC</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:170
+#: en/setupBootloader.xml:228
 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:177
+#: en/setupBootloader.xml:235
 msgid "Bootloader Configuration"
 msgstr "Configuratie van opstartlader"
 
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:237
+msgid ""
+"If, in the previous section you selected <literal>rEFInd</literal> as the "
+"bootloader to use, you would then be presented with the options shown in the "
+"screenshot directly below. Otherwise, please instead move on to the "
+"subsequent screenshot for your options."
+msgstr ""
+
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:180
+#: en/setupBootloader.xml:243
+#, fuzzy
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"rEFIndLoaderConfig.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-rEFIndLoaderConfig.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"><imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/></imageobject><imageobject condition=\"live"
+"\"><imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/></"
+"imageobject>"
+
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:253
+#, fuzzy
+msgid "Your rEFInd configuration options:"
+msgstr "Geluidsconfiguratie"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:256
+msgid ""
+"<guimenuitem>Install or update rEFInd in the EFI system partition.</"
+"guimenuitem>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:261
+msgid ""
+"<guimenuitem>Install in EFI/Boot partition (workaround for some BIOS's).</"
+"guimenuitem>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:264
+msgid ""
+"With some BIOS's, the newly written bootloaser for Mageia at end of the "
+"installation will not be recognized. In that case, you can use this option "
+"as a workaround for the issue."
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:270
+msgid ""
+"If you did not select rEFInd as the bootloader to use in the previous "
+"section, then your bootloader configurations are shown below:"
+msgstr ""
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:275
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -4020,42 +4169,42 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:191
+#: en/setupBootloader.xml:286
 msgid "<emphasis role=\"bold\">Default</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:193
+#: en/setupBootloader.xml:288
 msgid "The operating system to be started up by default."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:197
+#: en/setupBootloader.xml:292
 msgid "<emphasis role=\"bold\">Append</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:199
+#: en/setupBootloader.xml:294
 msgid ""
 "This option lets you pass information to the kernel 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:204
+#: en/setupBootloader.xml:299
 msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:206
+#: en/setupBootloader.xml:301
 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, "
-"then untick the Probe Foreign OS option."
+"then untick the <guimenuitem>Probe Foreign OS</guimenuitem> option."
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:215
+#: en/setupBootloader.xml:311
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader4.png\"/> </imageobject> <imageobject condition=\"live"
@@ -4064,12 +4213,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:226
+#: en/setupBootloader.xml:322
 msgid "<emphasis>Video mode</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:228
+#: en/setupBootloader.xml:324
 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 "
@@ -4077,38 +4226,47 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:234
+#: en/setupBootloader.xml:330
 msgid "<emphasis>Do not touch ESP or MBR</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:236
+#: en/setupBootloader.xml:332
 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 "
-"missing. Click<emphasis> Ok</emphasis> if you are sure you understand the "
-"implications, and wish to proceed."
+"missing. Click <guimenuitem>Ok </guimenuitem>only if you are sure you "
+"understand the implications, and wish to proceed."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><warning><para>
+#: en/setupBootloader.xml:338
+msgid ""
+"Chain-loading via legacy bootloaders (GRUB Legacy and LiLo)  is no longer "
+"supported by Mageia as it is likely to fail when attempting to boot this "
+"resulting installation of Mageia. If you use anything other than GRUB2 or "
+"rEFInd for this purpose, then you do so at your own risk!"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:245
+#: en/setupBootloader.xml:348
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png"
 "\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:253
+#: en/setupBootloader.xml:356
 msgid "Other Options"
 msgstr "Andere opties"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:256
+#: en/setupBootloader.xml:359
 msgid "Using an existing bootloader"
 msgstr "Een bestaande opstartlader gebruiken"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:258
+#: en/setupBootloader.xml:361
 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 "
@@ -4118,12 +4276,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:267
+#: en/setupBootloader.xml:370
 msgid "Installing Without a Bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:269
+#: en/setupBootloader.xml:372
 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 "
@@ -4458,3 +4616,15 @@ msgid ""
 "take a little while to complete. When it is finishing you will briefly get a "
 "blank screen - this is normal."
 msgstr ""
+
+#~ msgid ""
+#~ "Type in the user password. There is a shield at the end of the text box "
+#~ "that indicates the strength of the password. (See also <xref linkend="
+#~ "\"givePassword\"/>)"
+#~ msgstr ""
+#~ "Typ het wachtwoord van de gebruiker. Aan het eind van het tekstvak is een "
+#~ "schild dat de sterkte van het wachtwoord weergeeft. (Zie ook <xref "
+#~ "linkend=\"givePassword\"/>)"
+
+#~ msgid "Grub2-efi on UEFI systems"
+#~ msgstr "Grub2-efi op UEFI systemen"
diff --git a/docs/docs/stable/installer/pl.po b/docs/docs/stable/installer/pl.po
index 18807d23..9de57306 100644
--- a/docs/docs/stable/installer/pl.po
+++ b/docs/docs/stable/installer/pl.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2019-01-19 21:23+0200\n"
+"POT-Creation-Date: 2019-09-08 15:26+0300\n"
 "PO-Revision-Date: 2019-01-19 19:25+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Polish (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -147,7 +147,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/addUser.xml:3
+#: en/addUser.xml:9
 msgid "User Management"
 msgstr ""
 
@@ -157,46 +157,57 @@ msgstr ""
 #. 2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
 #.   Also changed 'Advanced User Management' to 'User Management (advanced)'.
 #. 2018/02/24 apb: Changed list style.
+#. 2019/08/10 apb: Added missing 'condition' profile for live-user1.png.
+#. 2019/08/11 apb: [1] Reword 1.1 (including Note) [2] Reword 1.2 Password text.
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:12
+#: en/addUser.xml:28
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
-"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
-"\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata format="
-"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-setRootPassword.png\" format=\"PNG\" revision=\"1\" xml:id="
+"\"setRootPassword-im1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-user1.png\" format=\"PNG\"/> </imageobject>"
 msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
+"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:21
+#: en/addUser.xml:40
 msgid "Set Administrator (root)  Password:"
 msgstr "Ustawienie hasła administratora (root):"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:24
+#: en/addUser.xml:44
 msgid ""
 "It is advisable for all Mageia installations to set a <literal>superuser</"
 "literal> (Administrator) password, usually called the <emphasis>root </"
-"emphasis>password in Linux. As you type a password into the top box a shield "
-"will change from red-to-yellow-to-green depending on the strength of the "
-"password. A green shield shows you are using a strong password. You need to "
-"repeat the same password in the box underneath, to check that the first "
-"entry was not mistyped."
+"emphasis>password in Linux. You need to repeat the same password in the box "
+"underneath, to check that the first entry was not mistyped."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:32
+#: en/addUser.xml:51
+msgid ""
+"As you type a password into the top box a shield will change from red-to-"
+"yellow-to-green depending on the strength of the password. A green shield "
+"shows you are using a strong password."
+msgstr ""
+
+#. type: Content of: <section><section><note><para>
+#: en/addUser.xml:55
 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:39
+#: en/addUser.xml:63
 msgid "Enter a user"
 msgstr "Dodaj użytkownika"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:41
+#: en/addUser.xml:66
 msgid ""
 "Add a User here. A regular user has fewer privileges than the "
 "<literal>superuser</literal> (root), but enough to use the Internet, office "
@@ -205,39 +216,39 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:47
+#: en/addUser.xml:73
 msgid "<emphasis role=\"bold\">Icon</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:48
+#: en/addUser.xml:75
 msgid "Click on this button if you want to change the user's icon"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:52
+#: en/addUser.xml:80
 msgid "<emphasis role=\"bold\">Real Name</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:53
+#: en/addUser.xml:82
 msgid "Insert the user's real name into this text box"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:56
+#: en/addUser.xml:86
 msgid "<emphasis role=\"bold\">Login Name</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:57
+#: en/addUser.xml:88
 msgid ""
 "Enter the user login name or let DrakX use a version of the user's real "
 "name. <emphasis role=\"bold\">The login name is case-sensitive.</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><caution><simpara>
-#: en/addUser.xml:61
+#: en/addUser.xml:93
 msgid ""
 "The login entered here should be different to any login currently in use for "
 "your <filename>/home</filename> directory. Some user parameters will be "
@@ -246,34 +257,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:65 en/setupBootloader.xml:124
+#: en/addUser.xml:102 en/setupBootloader.xml:182
 msgid "<emphasis role=\"bold\">Password</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:66
-msgid ""
-"Type in the user password. There is a shield at the end of the text box that "
-"indicates the strength of the password. (See also <xref linkend="
-"\"givePassword\"/>)"
+#: en/addUser.xml:104
+msgid "Type in the user password (remembering the advice in the Note above)."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:68
+#: en/addUser.xml:107
 msgid ""
 "<emphasis role=\"bold\">Password (again):</emphasis> Retype the user "
 "password. DrakX will check that you have not mistyped the password."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:74
+#: en/addUser.xml:114
 msgid ""
 "Any users added while installing Mageia, will have a home directory that is "
 "both read and write protected (umask=0027)"
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:76
+#: en/addUser.xml:117
 msgid ""
 "You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
@@ -281,24 +289,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:79
+#: en/addUser.xml:121
 msgid "The access permissions can also be changed after the install."
 msgstr "Ustawienia dostępu mogą być również zmienione po instalacji."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:85
+#: en/addUser.xml:128
 msgid "User Management (advanced)"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:87
+#: en/addUser.xml:131
 msgid ""
 "The <emphasis>Advanced</emphasis> option allows you to edit further settings "
 "for the user you are adding."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:91
+#: en/addUser.xml:136
 msgid ""
 "<emphasis>Shell</emphasis>: This drop-down list allows you to change the "
 "shell available to any user you added in the previous screen. Options are "
@@ -306,7 +314,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:143
 msgid ""
 "<emphasis>User ID</emphasis>: Here you can set the user ID for any user you "
 "added in the previous screen. If you are unsure what the purpose of this is, "
@@ -314,7 +322,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:102
+#: en/addUser.xml:149
 msgid ""
 "<emphasis>Group ID</emphasis>: This lets you set the group ID.  Again, if "
 "unsure, leave it blank."
@@ -434,24 +442,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:23
+#: en/bootLive.xml:10
 msgid "Boot Mageia as Live system"
 msgstr "Uruchom Mageia jako wersję Live"
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:28
+#: en/bootLive.xml:14
 msgid "Booting the medium"
 msgstr "Uruchamianie medium"
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:31
+#: en/bootLive.xml:16
 msgid ""
 "You can boot directly from a Live DVD or USB. Usually, you just need to plug "
 "the USB device in or place the DVD in the drive and restart the computer."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:35
+#: en/bootLive.xml:19
 msgid ""
 "If the computer does not automatically boot from the USB or DVD you may need "
 "to reconfigure your BIOS Boot Disk priority. Alternatively, you might try "
@@ -460,7 +468,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><tip><para>
-#: en/bootLive.xml:41
+#: en/bootLive.xml:24
 msgid ""
 "To access the BIOS or boot menu when the computer is starting, you can try "
 "pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or <keycap>Esc</"
@@ -470,7 +478,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/bootLive.xml:50
+#: en/bootLive.xml:32
 msgid ""
 "The actual screen that you will first see when booting from the Live media "
 "will depend on whether your computer motherboard is of the Legacy (BIOS) or "
@@ -478,91 +486,93 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:58
+#: en/bootLive.xml:39
 msgid "In BIOS/CSM/Legacy mode"
 msgstr "W trybie BIOS/CSM/Legacy"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:62
+#: en/bootLive.xml:42
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"../live-bootCSM.png\" align=\"center\"/> "
+"</imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:67
+#: en/bootLive.xml:46
 msgid "First screen while booting in BIOS mode"
 msgstr "Pierwszy ekran podczas uruchamiania w trybie BIOS"
 
 #. type: Content of: <section><section><section><itemizedlist><title>
-#: en/bootLive.xml:72 en/bootLive.xml:144 en/installer.xml:106
-#: en/installer.xml:154
+#: en/bootLive.xml:50 en/bootLive.xml:104 en/installer.xml:108
+#: en/installer.xml:156
 msgid "Menu"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:75 en/bootLive.xml:147
+#: en/bootLive.xml:52 en/bootLive.xml:106
 msgid "<emphasis role=\"bold\">Boot Mageia</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:77
+#: en/bootLive.xml:53
 msgid ""
 "This option will boot the Mageia Live system from the connected DVD/USB "
 "media (expect a very slow system compared to an installed OS)."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:81
+#: en/bootLive.xml:56
 msgid "Once the boot is done, you can proceed to the installation."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:86 en/bootLive.xml:102
+#: en/bootLive.xml:60 en/bootLive.xml:72
 msgid ""
 "<emphasis role=\"bold\">+ use non-free video drivers (slower to boot)</"
 "emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:89
+#: en/bootLive.xml:62
 msgid "Boot the Mageia Live system using non-free video drivers"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:96 en/bootLive.xml:155 en/installer.xml:109
+#: en/bootLive.xml:68 en/bootLive.xml:112 en/installer.xml:111
 msgid "<emphasis role=\"bold\">Install Mageia</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:98 en/bootLive.xml:157
+#: en/bootLive.xml:69 en/bootLive.xml:113
 msgid "This option will install Mageia to a hard disk."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:105
+#: en/bootLive.xml:74
 msgid "Install Mageia using non-free video drivers"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:111 en/installer.xml:125
+#: en/bootLive.xml:79 en/installer.xml:127
 msgid "<emphasis role=\"bold\">Memory Test</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:113 en/installer.xml:127
+#: en/bootLive.xml:80 en/installer.xml:129
 msgid ""
 "Test the installed RAM by performing multiple read and write operations. "
 "Reboot to end the test."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:118 en/bootLive.xml:161
+#: en/bootLive.xml:84 en/bootLive.xml:116
 msgid "<emphasis role=\"bold\"> F2 Language</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:120 en/bootLive.xml:163
+#: en/bootLive.xml:85 en/bootLive.xml:117
 msgid ""
 "Press <keycap>F2</keycap> to have the installer use a specific language "
 "during the installation. Use the arrow keys to select the language then "
@@ -570,24 +580,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:129
+#: en/bootLive.xml:93
 msgid "In UEFI mode"
 msgstr "W trybie UEFI"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:133
+#: en/bootLive.xml:96
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
+"> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:139
+#: en/bootLive.xml:100
 msgid "First screen while booting in UEFI mode"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:149
+#: en/bootLive.xml:107
 msgid ""
 "This option will boot the Mageia Live system from the connected DVD/USB "
 "media (expect a very slow system compared to an installed OS).  Once the "
@@ -595,7 +608,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/bootLive.xml:170
+#: en/bootLive.xml:123
 msgid ""
 "If you booted from a USB stick, you will see the above menu options "
 "duplicated, and in this case, you should choose from the menu pair that will "
@@ -814,12 +827,12 @@ msgstr ""
 "upewnij się, że wszystkie mają ustawiony czas lokalny, albo UTC/GMT."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:24
+#: en/configureX_card_list.xml:27
 msgid "Choose an X Server (Configure your Graphic Card)"
 msgstr "Wybierz System Graficzny (Skonfiguruj swoją Kartę Graficzną)"
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_card_list.xml:29
+#: en/configureX_card_list.xml:32
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_card_list."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_card_list-im1\"/> </"
@@ -827,7 +840,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:35
+#: en/configureX_card_list.xml:38
 msgid ""
 "DrakX has a very comprehensive database of video cards and will usually "
 "correctly identify your video device."
@@ -836,7 +849,7 @@ msgstr ""
 "zidentyfikuje twoje urządzenie wideo poprawnie."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:38
+#: en/configureX_card_list.xml:41
 msgid ""
 "If the installer has not correctly detected your graphic card and you know "
 "which one you have, you can select it from the tree by:"
@@ -845,22 +858,22 @@ msgstr ""
 "kartę posiadasz, możesz wybrać jedną za pomocą:"
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_card_list.xml:41 en/configureX_monitor.xml:74
+#: en/configureX_card_list.xml:44 en/configureX_monitor.xml:78
 msgid "Vendor"
 msgstr "Dostawca"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:45
+#: en/configureX_card_list.xml:48
 msgid "then the make of your card"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:49
+#: en/configureX_card_list.xml:52
 msgid "and the model of card"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:53
+#: en/configureX_card_list.xml:56
 msgid ""
 "If you cannot find your card in the vendor lists (because it's not yet in "
 "the database or it's an older card) you may find a suitable driver in the "
@@ -871,14 +884,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><caution><para>
-#: en/configureX_card_list.xml:61
+#: en/configureX_card_list.xml:64
 msgid ""
 "Be aware that if you select an incompatible driver you may only have access "
 "to the <emphasis>Command Line Interface</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:65
+#: en/configureX_card_list.xml:68
 msgid ""
 "Some video card manufacturers provide proprietary drivers for Linux which "
 "may only be available in the <emphasis>Nonfree</emphasis> repository and in "
@@ -889,17 +902,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:11
-msgid "Graphic Card and Monitor Configuration"
+#: en/configureX_chooser.xml:23
+#, fuzzy
+msgid "Graphics Card and Monitor Configuration"
 msgstr "Konfiguracja Karty Graficznej i Monitora"
 
-#.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
-#. 2018/02/15 apb: Some text and typography.
-#. 2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.
-#. 2018/02/23 apb: Typo.
-#. 2019/01/06 apb: Slight reword, split 1st para in two.
 #. type: Content of: <section><mediaobject>
-#: en/configureX_chooser.xml:26
+#: en/configureX_chooser.xml:28
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_chooser."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_chooser-im1\"/> </"
@@ -907,7 +916,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:32
+#: en/configureX_chooser.xml:34
 msgid ""
 "No matter which graphical environment (also known as desktop environment) "
 "you chose for this install of Mageia, they are all based on a graphical user "
@@ -918,31 +927,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:39
+#: en/configureX_chooser.xml:41
 msgid ""
 "Choose the appropriate settings manually if you think the details are "
 "incorrect, or if none are shown."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:44
-msgid "<emphasis role=\"bold\">Graphic Card</emphasis>"
+#: en/configureX_chooser.xml:46
+msgid "<emphasis role=\"bold\">Graphics Card</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:47
+#: en/configureX_chooser.xml:49
 msgid ""
 "If you need to, you can select a specific card from this expandable list. "
 "See <xref linkend=\"configureX_card_list\"/>."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:52
+#: en/configureX_chooser.xml:54
 msgid "<emphasis role=\"bold\">Monitor</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:55
+#: en/configureX_chooser.xml:57
 msgid ""
 "You can choose Plug 'n Play, if applicable, or choose your monitor from the "
 "<emphasis>Vendor</emphasis> or <emphasis>Generic</emphasis> lists. Choose "
@@ -952,22 +961,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:63
+#: en/configureX_chooser.xml:65
 msgid "<emphasis role=\"bold\">Resolution</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:66
+#: en/configureX_chooser.xml:68
 msgid "The resolution and color depth of your monitor can be set here."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:71
+#: en/configureX_chooser.xml:73
 msgid "<emphasis role=\"bold\">Test</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:74
+#: en/configureX_chooser.xml:76
 msgid ""
 "The test button does not always appear during install. If the option is "
 "there, and you test your settings, you should be asked to confirm that your "
@@ -979,17 +988,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:85
+#: en/configureX_chooser.xml:87
 msgid "<emphasis role=\"bold\">Options</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:88
+#: en/configureX_chooser.xml:90
 msgid "Here you can choose to enable or disable various options."
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_chooser.xml:93
+#: en/configureX_chooser.xml:95
 msgid ""
 "There is a risk of damaging a monitor if you choose refresh rates that are "
 "outside the frequency range of that monitor. This applies to older CRT "
@@ -998,19 +1007,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_monitor.xml:22
+#: en/configureX_monitor.xml:26
 msgid "Choosing your Monitor"
 msgstr "Wybór monitora"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:25
+#: en/configureX_monitor.xml:29
 msgid ""
 "DrakX has a very comprehensive database of monitors and will usually "
 "correctly identify yours."
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:30
+#: en/configureX_monitor.xml:34
 msgid ""
 "<emphasis role=\"bold\">Selecting a monitor with different characteristics "
 "could damage your monitor or video hardware. Please don't try something "
@@ -1019,7 +1028,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:38
+#: en/configureX_monitor.xml:42
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
@@ -1030,12 +1039,12 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:46
+#: en/configureX_monitor.xml:50
 msgid "Custom"
 msgstr "Własne"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:49
+#: en/configureX_monitor.xml:53
 msgid ""
 "This option allows you to set two critical parameters: the vertical refresh "
 "rate and the horizontal sync rate. Vertical refresh determines how often the "
@@ -1044,7 +1053,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:55
+#: en/configureX_monitor.xml:59
 msgid ""
 "It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor "
 "type with a sync range that is beyond the capabilities of your monitor: you "
@@ -1053,56 +1062,59 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:64
+#: en/configureX_monitor.xml:68
 msgid "Plug'n Play"
 msgstr "Plug'n Play"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:67
+#: en/configureX_monitor.xml:71
 msgid ""
 "This is the default option and automatically tries to determine the monitor "
 "type from the monitor database."
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:77
+#: en/configureX_monitor.xml:81
+#, fuzzy
 msgid ""
 "If the installer has not correctly detected your monitor and you know which "
-"one you have, you can select it from the tree by selecting:"
+"one you have, you can choose it from the options by selecting:"
 msgstr ""
+"Jeżeli instalator nie wykrył twojej karty graficznej poprawnie i wiesz, jaką "
+"kartę posiadasz, możesz wybrać jedną za pomocą:"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:86
+#: en/configureX_monitor.xml:90
 msgid "Manufacturer"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:90
+#: en/configureX_monitor.xml:94
 msgid "Monitor model"
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:96
+#: en/configureX_monitor.xml:100
 msgid "Generic"
 msgstr "Standardowa"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:99
+#: en/configureX_monitor.xml:103
 msgid ""
-"Selecting this group will list nearly 30 display configurations such as "
-"1024x768 @ 60Hz and includes flat-panel displays as used in laptops. This is "
-"often a good monitor selection group if you need to use the VESA card driver "
-"when your video hardware cannot be determined automatically.  Once again it "
-"may be wise to be conservative in your selections."
+"Selecting this group will list approximately 30 display configurations such "
+"as 1024x768 @ 60Hz and includes flat-panel displays as used in laptops.  "
+"This is often a good monitor selection group if you need to use the VESA "
+"card driver when your video hardware cannot be determined automatically. "
+"Once again, it may be wise to be conservative in your selections."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:22
+#: en/diskdrake.xml:24
 msgid "Custom Disk Partitioning with DiskDrake"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:27
+#: en/diskdrake.xml:29
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-diskdrake.png\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1110,7 +1122,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:38
+#: en/diskdrake.xml:40
 msgid ""
 "Modify the layout of your disk(s) here. You can remove or create partitions, "
 "change the filesystem or size of a partition and even view their details "
@@ -1118,15 +1130,15 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:47
 msgid ""
 "There is a tab at the top for every detected hard disk (or other storage "
-"device, like a USB key). In the screenshot above there are two available "
-"devices: <filename>sda </filename>and <filename>sdb</filename>."
+"device, like a USB key), for example: <filename>sda</filename>, "
+"<filename>sdb</filename>, <filename>sdc</filename> etc."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:52
+#: en/diskdrake.xml:54
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it. "
@@ -1135,21 +1147,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:60
+#: en/diskdrake.xml:62
 msgid ""
 "Continue until you have adjusted everything to your satisfaction, then click "
 "<emphasis>Done</emphasis> when you're ready."
 msgstr ""
 
 #. type: Content of: <section><warning><orderedlist><listitem><para>
-#: en/diskdrake.xml:69
+#: en/diskdrake.xml:71
 msgid ""
 "Take care with the <emphasis>Clear all</emphasis> option, use it only if you "
 "are sure you want to wipe all partitions on the selected storage device."
 msgstr ""
 
 #. type: Content of: <section><warning><orderedlist><listitem><para>
-#: en/diskdrake.xml:75
+#: en/diskdrake.xml:77
 msgid ""
 "If you wish to use encryption on your <filename>/</filename> partition you "
 "must ensure that you have a separate <filename>/boot</filename> partition. "
@@ -1158,7 +1170,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/diskdrake.xml:87
+#: en/diskdrake.xml:89
 msgid ""
 "If you are installing Mageia on a UEFI system, check that an ESP (EFI System "
 "Partition) is present and correctly mounted on <filename>/boot/EFI</"
@@ -1166,19 +1178,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/diskdrake.xml:93
+#: en/diskdrake.xml:95
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
 "partition is present and of the correct type. See Figure 2 below."
 msgstr ""
 
 #. type: Content of: <section><figure><title>
-#: en/diskdrake.xml:101
+#: en/diskdrake.xml:103
 msgid "EFI System Partition"
 msgstr "Partycja Systemowa EFI"
 
 #. type: Content of: <section><figure><mediaobject>
-#: en/diskdrake.xml:104
+#: en/diskdrake.xml:106
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-diskdrake2.png\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1186,17 +1198,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><figure>
-#: en/diskdrake.xml:103 en/diskdrake.xml:117
+#: en/diskdrake.xml:105 en/diskdrake.xml:119
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <section><figure><title>
-#: en/diskdrake.xml:115
+#: en/diskdrake.xml:117
 msgid "BIOS boot partition"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:118 en/doPartitionDisks.xml:201
+#: en/diskdrake.xml:120 en/doPartitionDisks.xml:206
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1215,26 +1227,26 @@ msgid "Partitioning"
 msgstr "Partycjonowanie"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:31
 msgid "Suggested Partitioning"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:34
 msgid ""
 "In this screen you can see the content of your hard drive(s) along with the "
 "DrakX partitioning proposals for where to install Mageia."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:34
+#: en/doPartitionDisks.xml:38
 msgid ""
 "The actual options available from those shown below will vary according to "
 "the layout and content of your particular hard drive(s)."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:39
+#: en/doPartitionDisks.xml:43
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1243,17 +1255,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><title>
-#: en/doPartitionDisks.xml:49
+#: en/doPartitionDisks.xml:53
 msgid "Main Options"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:56
 msgid "<emphasis role=\"bold\">Use Existing Partitions</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:59
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1262,12 +1274,12 @@ msgstr ""
 "linuksowe i mogą być użyte do instalacji."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:61
+#: en/doPartitionDisks.xml:65
 msgid "<emphasis role=\"bold\">Use Free Space</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:68
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1276,57 +1288,54 @@ msgstr ""
 "wykorzystane do instalacji Magei."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:70
+#: en/doPartitionDisks.xml:74
 msgid ""
 "<emphasis role=\"bold\">Use Free Space on a Windows Partition</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:73
+#: en/doPartitionDisks.xml:77
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it. 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 important files!"
+"installation but see the warning below."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para><mediaobject>
+#: en/doPartitionDisks.xml:87
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:79
+#: en/doPartitionDisks.xml:82
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
 "light blue and the proposed Mageia partition in dark blue with their "
 "intended sizes just underneath. You have the option to modify these sizes by "
 "clicking and dragging the gap between both partitions.  See the following "
-"screenshot:"
-msgstr ""
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:87
-msgid "<emphasis role=\"bold\">Erase and use Entire Disk</emphasis>"
-msgstr ""
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:90
-msgid "This option will allocate the entire drive for Mageia"
+"screenshot:<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:97
 msgid ""
-"This will erase ALL data on the selected hard drive. Take care! 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 this option."
+"This involves shrinking the size of the Windows partition, and therefore is "
+"a risky operation, so you should make sure you have backed up all important "
+"files before proceeding."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><important><para>
-#: en/doPartitionDisks.xml:101
+#: en/doPartitionDisks.xml:103
+#, fuzzy
 msgid ""
-"Note that this involves shrinking the size of the Windows partition. The "
-"partition must be \"clean\", meaning that Windows must have closed down "
+"The partition must be \"clean\", meaning that Windows must have closed down "
 "correctly the last time it was used. It must also have been defragmented, "
 "although this is not a guarantee that all files in the partition have been "
-"moved out of the area that is about to be used. It is highly recommended to "
-"back up your personal files."
+"moved out of the area that is about to be used for Mageia."
 msgstr ""
 "Zauważ, że ta metoda spowoduje zmniejszenie rozmiaru partycji Windows. "
 "Partycja musi być \"czysta\", co oznacza, że Windows musi być poprawnie "
@@ -1337,28 +1346,37 @@ msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/doPartitionDisks.xml:112
-msgid "<emphasis role=\"bold\">Custom Disk Partitioning</emphasis>"
+msgid "<emphasis role=\"bold\">Erase and use Entire Disk</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/doPartitionDisks.xml:115
+msgid "This option will allocate the entire drive for Mageia"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><warning><para>
+#: en/doPartitionDisks.xml:119
 msgid ""
-"This gives you complete control over the placing of the installation on your "
-"hard drive(s)."
+"This will erase ALL data on the selected hard drive. Take care! 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 this option."
 msgstr ""
-"Ta opcja daje Ci całkowitą kontrolę nad sposobem przeprowadzenia instalacji."
 
-#. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:122
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:127
+msgid "<emphasis role=\"bold\">Custom Disk Partitioning</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:130
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
+"This gives you complete control over the placing of the installation on your "
+"hard drive(s)."
 msgstr ""
+"Ta opcja daje Ci całkowitą kontrolę nad sposobem przeprowadzenia instalacji."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:131
+#: en/doPartitionDisks.xml:136
 msgid ""
 "If you are not using the <emphasis>Custom disk partitioning</emphasis> "
 "option, then the installer will allocate the available space according to "
@@ -1366,60 +1384,60 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:137
+#: en/doPartitionDisks.xml:142
 msgid ""
 "If the total available space is less than 50 GB, then only one partition is "
 "created. This will be the <filename>/</filename> (root)  partition."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:143
+#: en/doPartitionDisks.xml:148
 msgid ""
 "If the total available space is greater than 50 GB, then three partitions "
 "are created"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:148
+#: en/doPartitionDisks.xml:153
 msgid ""
 "6/19 of the total available place is allocated to <filename>/</filename> "
 "with a maximum of 50 GB"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:153
+#: en/doPartitionDisks.xml:158
 msgid "1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:158
+#: en/doPartitionDisks.xml:163
 msgid "the rest (at least 12/19) is allocated to <filename>/home</filename>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:165
+#: en/doPartitionDisks.xml:170
 msgid ""
 "This means that from 160 GB or greater available space, the installer will "
 "create three partitions:"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:170
+#: en/doPartitionDisks.xml:175
 msgid "50 GB for <filename>/</filename>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:174
+#: en/doPartitionDisks.xml:179
 msgid "4 GB for <filename>swap</filename>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:178
+#: en/doPartitionDisks.xml:183
 msgid "and the remainder for <filename>/home</filename>"
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:183
+#: en/doPartitionDisks.xml:188
 msgid ""
 "If you are using a UEFI system, the ESP (EFI System Partition) will be "
 "automatically detected - or created if it does not exist yet - and mounted "
@@ -1429,7 +1447,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:189
+#: en/doPartitionDisks.xml:194
 msgid ""
 "If you are using a Legacy (also known as BIOS) system with a GPT partitioned "
 "disk, you need to create a BIOS boot partition if it doesn't already exist. "
@@ -1440,19 +1458,25 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:196
+#: en/doPartitionDisks.xml:201
 msgid "See <xref linkend=\"diskdrake\"/> for information on how to proceed."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:211
+#: en/doPartitionDisks.xml:216
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4.png"
-"\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks4.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks4.png\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
+"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:217
+#: en/doPartitionDisks.xml:226
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
 "previous standard of 512. Due to lack of available hardware, the "
@@ -1461,7 +1485,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:222
+#: en/doPartitionDisks.xml:231
 msgid ""
 "Some SSD devices now use an erase block size over 1 MB. If you have such a "
 "device we suggest that you partition the drive in advance, using an "
@@ -1470,17 +1494,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:229
+#: en/doPartitionDisks.xml:238
 msgid "<emphasis>Align to</emphasis> = MiB"
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:233
+#: en/doPartitionDisks.xml:242
 msgid "<emphasis>Free space preceding (MiB)</emphasis> = 2"
 msgstr ""
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:237
+#: en/doPartitionDisks.xml:246
 msgid ""
 "Also make sure all partitions are created using an even number of megabytes."
 msgstr ""
@@ -1649,12 +1673,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/firewall.xml:7
+#: en/firewall.xml:16
 msgid "Firewall"
 msgstr "Zapora sieciowa"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:10
+#: en/firewall.xml:19
 msgid ""
 "This section allows you to configure some simple firewall rules: they "
 "determine which type of message from the Internet will be accepted by the "
@@ -1662,8 +1686,17 @@ msgid ""
 "system to be accessible from the Internet."
 msgstr ""
 
+#. type: Content of: <section><mediaobject>
+#: en/firewall.xml:26
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-firewall.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+
 #. type: Content of: <section><para>
-#: en/firewall.xml:16
+#: en/firewall.xml:31
 msgid ""
 "In the default setting (no button is checked), no service of the system is "
 "accessible from the network. The <emphasis>Everything (no firewall)</"
@@ -1676,7 +1709,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:25
+#: en/firewall.xml:40
 msgid ""
 "All other options are more or less self-explanatory. As an example, you will "
 "enable the CUPS server if you want printers on your machine to be accessible "
@@ -1684,12 +1717,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:29
+#: en/firewall.xml:44
 msgid "<emphasis role=\"bold\">Advanced</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:31
+#: en/firewall.xml:46
 msgid ""
 "The <emphasis>Advanced</emphasis> option opens a window where you can enable "
 "a series of services by typing a list of <quote>couples</quote> (blank "
@@ -1697,34 +1730,35 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:35
-msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
+#: en/firewall.xml:50
+msgid "<emphasis>&lt;port-number&gt;/&lt;protocol&gt;</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:38
+#: en/firewall.xml:53
 msgid ""
-"- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
-"the service you want to enable (e.g. 873 for the RSYNC service) as defined "
-"in <emphasis>RFC-433</emphasis>;"
+"- <emphasis>&lt;port-number&gt;</emphasis> is the value of the port assigned "
+"to the service you want to enable (e.g. 873 for the RSYNC service) as "
+"defined in <emphasis>RFC-433</emphasis>;"
 msgstr ""
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:42
+#: en/firewall.xml:57
 msgid ""
-"- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
-"<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
+"- <emphasis>&lt;protocol&gt;</emphasis> is one of <emphasis>TCP</emphasis> "
+"or <emphasis>UDP</emphasis> - the internet protocol that is used by the "
+"service."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:47
+#: en/firewall.xml:62
 msgid ""
 "For instance, the entry for enabling access to the RSYNC service therefore "
 "is <emphasis>873/tcp</emphasis>."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:50
+#: en/firewall.xml:65
 msgid ""
 "In case a service is implemented to use both protocols, you specify 2 "
 "couples for the same port."
@@ -1792,12 +1826,12 @@ msgid "Graphical Configuration"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:32
+#: en/installer.xml:34
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX instalator Mageia"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:35
+#: en/installer.xml:37
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -1808,33 +1842,33 @@ msgstr ""
 "aktualizację łatwą i przyjemną. "
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:40
+#: en/installer.xml:42
 msgid "The installation steps"
 msgstr "Etapy instalacji"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:44
+#: en/installer.xml:46
 msgid ""
 "The install process is divided into a number of steps - the status of which "
 "is indicated in a panel to the left of the screen."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:50
+#: en/installer.xml:52
 msgid ""
 "Each step has one or more screens, which may also have <emphasis>Advanced</"
 "emphasis> sections with extra, less commonly required options."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:56
+#: en/installer.xml:58
 msgid ""
 "Most screens have <emphasis>Help</emphasis> buttons for further details "
 "about the particular step."
 msgstr ""
 
 #. type: Content of: <section><section><caution><para>
-#: en/installer.xml:62
+#: en/installer.xml:64
 msgid ""
 "If at some point during the install you decide to abort the installation, it "
 "is possible to reboot, but please think twice before you do this. Once a "
@@ -1844,7 +1878,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><caution><para>
-#: en/installer.xml:68
+#: en/installer.xml:70
 msgid ""
 "If, in spite of this, you are very sure rebooting is what you want, go to a "
 "text terminal by pressing the keys <keycombo> <keycap>Ctrl</keycap> "
@@ -1854,12 +1888,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:86
+#: en/installer.xml:88
 msgid "Installation Welcome Screen"
 msgstr "Ekran powitalny instalatora"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:88
+#: en/installer.xml:90
 msgid ""
 "The particular screen that you will first see when booting from the "
 "Installation media will depend on whether your computer motherboard is of "
@@ -1867,60 +1901,60 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:92
+#: en/installer.xml:94
 msgid ""
 "The welcome menu screen has various options, however the default option will "
 "start the installer, and is normally all that you will need."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:97
+#: en/installer.xml:99
 msgid "Legacy (BIOS) Systems"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:100
+#: en/installer.xml:102
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome.png\"/> </"
 "imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:111
+#: en/installer.xml:113
 msgid ""
 "Install Mageia to a hard disk. This is the default option, and will "
 "automatically start after a short while unless another option is selected."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:117
+#: en/installer.xml:119
 msgid "<emphasis role=\"bold\">Rescue System</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:119
+#: en/installer.xml:121
 msgid ""
 "This option allows you to either re-install the bootloader for an existing "
 "Mageia installation or you can use it to restore a Windows bootloader."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:132
+#: en/installer.xml:134
 msgid "<emphasis role=\"bold\">F2: Language</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:134
+#: en/installer.xml:136
 msgid "Press F2 for alternative languages."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:140
+#: en/installer.xml:142
 msgid "UEFI Systems"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:142
+#: en/installer.xml:144
 msgid ""
 "From this screen, you can access options by pressing <keycap>e</keycap> to "
 "enter the edit mode. To come back to this screen, press <keycap>Esc</keycap> "
@@ -1928,19 +1962,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:148
+#: en/installer.xml:150
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome2.png\"/> </"
 "imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:157
+#: en/installer.xml:159
 msgid "<emphasis role=\"bold\">Install:</emphasis> Start the Install process"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:162
+#: en/installer.xml:164
 msgid ""
 "<emphasis role=\"bold\">Rescue:</emphasis> This option allows you to either "
 "re-install the bootloader for an existing Mageia installation or you can use "
@@ -1948,31 +1982,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:169
+#: en/installer.xml:171
 msgid ""
 "<emphasis role=\"bold\">F2: Language:</emphasis> Press <keycap>F2</keycap> "
 "for alternative languages."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:174
+#: en/installer.xml:176
 msgid ""
 "If you booted from a USB stick, you will see the above options duplicated, "
 "and in this case, you should use the set that will be suffixed with \"USB\"."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:181
+#: en/installer.xml:183
 msgid "Installation Problems and Possible Solutions"
 msgstr "Problemy z instalacją oraz możliwe rozwiązania"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:184
+#: en/installer.xml:186
 msgid "No Graphical Interface"
 msgstr "Brak graficznego interfejsu"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:188
+#: en/installer.xml:190
 msgid ""
 "After the initial screen you did not progress to the <emphasis>Language "
 "Selection</emphasis> screen. This can happen with some graphic cards and "
@@ -1981,7 +2015,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:195
+#: en/installer.xml:197
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
 "In this case it is worth trying a text-mode installation. To use this press "
@@ -1992,12 +2026,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:208
+#: en/installer.xml:210
 msgid "The Install Freezes"
 msgstr "Zawieszenie się instalacji"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:210
+#: en/installer.xml:212
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic hardware "
@@ -2007,12 +2041,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:218
+#: en/installer.xml:220
 msgid "RAM problem"
 msgstr "Problem z pamięcią RAM"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:220
+#: en/installer.xml:222
 msgid ""
 "This will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
@@ -2022,12 +2056,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:228
+#: en/installer.xml:230
 msgid "Dynamic partitions"
 msgstr "Dynamiczne partycje"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:230
+#: en/installer.xml:232
 msgid ""
 "If you converted your hard disk from <literal>Basic</literal> format to "
 "<literal>Dynamic</literal> format in Microsoft Windows, then it is not "
@@ -3631,73 +3665,106 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:27
+#: en/setupBootloader.xml:32
 msgid "Bootloader"
 msgstr "Program rozruchowy"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:31
+#: en/setupBootloader.xml:36
+#, fuzzy
+msgid "Available Bootloaders"
+msgstr "Program rozruchowy"
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:39
 msgid "Grub2"
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><title>
-#: en/setupBootloader.xml:34
-msgid "Grub2 on Legacy MBR/GPT systems"
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:42
+msgid "<emphasis role=\"bold\">Grub2 on Legacy MBR/GPT systems</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:37
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:46
 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:42
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:52
 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:49
-msgid "Grub2-efi on UEFI systems"
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:59
+msgid "<emphasis role=\"bold\">Grub2-efi on UEFI systems</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:52
-msgid "GRUB2-efi will be used exclusively as the bootloader for a UEFI system."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:63
+msgid "GRUB2-efi or rEFInd may be used as the bootloader for a UEFI system."
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:57
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:68
 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:60
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:71
 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 "
-"created by Windows and add grub2-efi to it. If no ESP exists, then one will "
+"created by Windows and add grub2-efi to it.  If no ESP exists, then one will "
 "be created. Although it is possible to have several ESPs, only one is "
 "required, whatever the number of operating systems you have."
 msgstr ""
 
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:82
+msgid "rEFInd"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:85
+msgid "<emphasis role=\"bold\">rEFInd on UEFI systems</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:88
+msgid ""
+"rEFInd has a nice graphical set of options, and can auto-detect installed "
+"EFI bootloaders. See: http://www.rodsbooks.com/refind/"
+msgstr ""
+
+#. type: Content of: <section><section><section><note><para>
+#: en/setupBootloader.xml:95
+msgid ""
+"Please note that in order to be able to use the <literal>rEFInd</literal> "
+"option, an installed EFI System Partition must match your system "
+"architecture: if you have a 32bit EFI System Partition installed on a 64bit "
+"machine for instance, then the rEFInd option will not be displayed/available "
+"to you."
+msgstr ""
+
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:72
+#: en/setupBootloader.xml:106
 msgid "Bootloader Setup"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:76
+#: en/setupBootloader.xml:110
 msgid "Bootloader main options"
 msgstr "Podstawowe opcje programu rozruchowego"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:79
+#: en/setupBootloader.xml:113
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader.png\"/> </imageobject> <imageobject condition=\"live"
@@ -3706,47 +3773,70 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:91
+#: en/setupBootloader.xml:125
 msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:93
+#. type: Content of: <section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:129
+msgid ""
+"<guimenuitem>GRUB2</guimenuitem> (with either a graphical or a text menu), "
+"can be chosen for both <literal>Legacy MBR/BIOS</literal> systems and "
+"<literal>UEFI</literal> systems."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:136
 msgid ""
-"This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI "
-"systems will not see this option here."
+"<guimenuitem>rEFInd</guimenuitem> (with a graphical menu)  is an alternative "
+"option solely for use with <literal>UEFI</literal> systems."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:98
+#: en/setupBootloader.xml:144
 msgid "<emphasis role=\"bold\">Boot device</emphasis>"
 msgstr ""
 
+#. type: Content of: <section><section><section><itemizedlist><listitem><warning><para>
+#: en/setupBootloader.xml:147
+#, fuzzy
+msgid "Don't change this unless you really know what you are doing."
+msgstr "Zmień to tylko i wyłącznie wtedy, kiedy wiesz co robisz."
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><note><para>
+#: en/setupBootloader.xml:152
+msgid ""
+"There is no option to write GRUB to the boot sector of a partition (e.g: "
+"<filename>sda1</filename>), as this method is considered unreliable."
+msgstr ""
+
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:100
-msgid "Don't change this unless you really know what you are doing"
+#: en/setupBootloader.xml:157
+msgid ""
+"When using UEFI mode, then the <guilabel>Boot device</guilabel> will be "
+"listed as <guimenuitem>EFI System Partition</guimenuitem>."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:105
+#: en/setupBootloader.xml:163
 msgid ""
 "<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:108
+#: en/setupBootloader.xml:166
 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:113
+#: en/setupBootloader.xml:171
 msgid "<emphasis role=\"bold\">Security</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:115
+#: en/setupBootloader.xml:173
 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 "
@@ -3756,34 +3846,34 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:126
+#: en/setupBootloader.xml:184
 msgid "Choose a password for the bootloader (optional)"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:130
+#: en/setupBootloader.xml:188
 msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:132
+#: en/setupBootloader.xml:190
 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:137 en/setupBootloader.xml:212
+#: en/setupBootloader.xml:195 en/setupBootloader.xml:308
 msgid "<emphasis>Advanced</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:141
+#: en/setupBootloader.xml:199
 msgid "<emphasis>Enable ACPI</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:143
+#: en/setupBootloader.xml:201
 msgid ""
 "ACPI (Advanced Configuration and Power Interface) is a standard for power "
 "management. It can save energy by stopping unused devices. Deselecting it "
@@ -3793,24 +3883,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:152
+#: en/setupBootloader.xml:210
 msgid "<emphasis>Enable SMP</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:154
+#: en/setupBootloader.xml:212
 msgid ""
 "This option enables/disables symmetric multiprocessing for multi-core "
 "processors"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:159
+#: en/setupBootloader.xml:217
 msgid "<emphasis>Enable APIC</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:161
+#: en/setupBootloader.xml:219
 msgid ""
 "Enabling this gives the operating system access to the Advanced Programmable "
 "Interrupt Controller. APIC devices permit more complex priority models, and "
@@ -3818,24 +3908,77 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:168
+#: en/setupBootloader.xml:226
 msgid "<emphasis>Enable Local APIC</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:170
+#: en/setupBootloader.xml:228
 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:177
+#: en/setupBootloader.xml:235
 msgid "Bootloader Configuration"
 msgstr "Konfiguracja programu rozruchowego"
 
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:237
+msgid ""
+"If, in the previous section you selected <literal>rEFInd</literal> as the "
+"bootloader to use, you would then be presented with the options shown in the "
+"screenshot directly below. Otherwise, please instead move on to the "
+"subsequent screenshot for your options."
+msgstr ""
+
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:180
+#: en/setupBootloader.xml:243
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"rEFIndLoaderConfig.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-rEFIndLoaderConfig.png\"/> </"
+"imageobject>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:253
+#, fuzzy
+msgid "Your rEFInd configuration options:"
+msgstr "Konfiguracja dźwięku"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:256
+msgid ""
+"<guimenuitem>Install or update rEFInd in the EFI system partition.</"
+"guimenuitem>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:261
+msgid ""
+"<guimenuitem>Install in EFI/Boot partition (workaround for some BIOS's).</"
+"guimenuitem>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:264
+msgid ""
+"With some BIOS's, the newly written bootloaser for Mageia at end of the "
+"installation will not be recognized. In that case, you can use this option "
+"as a workaround for the issue."
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:270
+msgid ""
+"If you did not select rEFInd as the bootloader to use in the previous "
+"section, then your bootloader configurations are shown below:"
+msgstr ""
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:275
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -3844,42 +3987,42 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:191
+#: en/setupBootloader.xml:286
 msgid "<emphasis role=\"bold\">Default</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:193
+#: en/setupBootloader.xml:288
 msgid "The operating system to be started up by default."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:197
+#: en/setupBootloader.xml:292
 msgid "<emphasis role=\"bold\">Append</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:199
+#: en/setupBootloader.xml:294
 msgid ""
 "This option lets you pass information to the kernel 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:204
+#: en/setupBootloader.xml:299
 msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:206
+#: en/setupBootloader.xml:301
 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, "
-"then untick the Probe Foreign OS option."
+"then untick the <guimenuitem>Probe Foreign OS</guimenuitem> option."
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:215
+#: en/setupBootloader.xml:311
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader4.png\"/> </imageobject> <imageobject condition=\"live"
@@ -3888,12 +4031,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:226
+#: en/setupBootloader.xml:322
 msgid "<emphasis>Video mode</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:228
+#: en/setupBootloader.xml:324
 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 "
@@ -3901,38 +4044,47 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:234
+#: en/setupBootloader.xml:330
 msgid "<emphasis>Do not touch ESP or MBR</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:236
+#: en/setupBootloader.xml:332
 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 "
-"missing. Click<emphasis> Ok</emphasis> if you are sure you understand the "
-"implications, and wish to proceed."
+"missing. Click <guimenuitem>Ok </guimenuitem>only if you are sure you "
+"understand the implications, and wish to proceed."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><warning><para>
+#: en/setupBootloader.xml:338
+msgid ""
+"Chain-loading via legacy bootloaders (GRUB Legacy and LiLo)  is no longer "
+"supported by Mageia as it is likely to fail when attempting to boot this "
+"resulting installation of Mageia. If you use anything other than GRUB2 or "
+"rEFInd for this purpose, then you do so at your own risk!"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:245
+#: en/setupBootloader.xml:348
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png"
 "\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:253
+#: en/setupBootloader.xml:356
 msgid "Other Options"
 msgstr "Inne opcje"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:256
+#: en/setupBootloader.xml:359
 msgid "Using an existing bootloader"
 msgstr "Użyj istniejącego bootloader'a."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:258
+#: en/setupBootloader.xml:361
 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 "
@@ -3942,12 +4094,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:267
+#: en/setupBootloader.xml:370
 msgid "Installing Without a Bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:269
+#: en/setupBootloader.xml:372
 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 "
diff --git a/docs/docs/stable/installer/pt.po b/docs/docs/stable/installer/pt.po
index be000803..e119c874 100644
--- a/docs/docs/stable/installer/pt.po
+++ b/docs/docs/stable/installer/pt.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2019-01-19 21:23+0200\n"
+"POT-Creation-Date: 2019-09-08 15:26+0300\n"
 "PO-Revision-Date: 2019-02-06 17:24+0000\n"
 "Last-Translator: Rui <xymarior@yandex.com>\n"
 "Language-Team: Portuguese (http://www.transifex.com/MageiaLinux/mageia/"
@@ -142,7 +142,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/addUser.xml:3
+#: en/addUser.xml:9
 msgid "User Management"
 msgstr ""
 
@@ -152,46 +152,57 @@ msgstr ""
 #. 2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
 #.   Also changed 'Advanced User Management' to 'User Management (advanced)'.
 #. 2018/02/24 apb: Changed list style.
+#. 2019/08/10 apb: Added missing 'condition' profile for live-user1.png.
+#. 2019/08/11 apb: [1] Reword 1.1 (including Note) [2] Reword 1.2 Password text.
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:12
+#: en/addUser.xml:28
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
-"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
-"\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata format="
-"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-setRootPassword.png\" format=\"PNG\" revision=\"1\" xml:id="
+"\"setRootPassword-im1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-user1.png\" format=\"PNG\"/> </imageobject>"
 msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
+"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:21
+#: en/addUser.xml:40
 msgid "Set Administrator (root)  Password:"
 msgstr "Definir Senha de Administrador (raiz):"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:24
+#: en/addUser.xml:44
 msgid ""
 "It is advisable for all Mageia installations to set a <literal>superuser</"
 "literal> (Administrator) password, usually called the <emphasis>root </"
-"emphasis>password in Linux. As you type a password into the top box a shield "
-"will change from red-to-yellow-to-green depending on the strength of the "
-"password. A green shield shows you are using a strong password. You need to "
-"repeat the same password in the box underneath, to check that the first "
-"entry was not mistyped."
+"emphasis>password in Linux. You need to repeat the same password in the box "
+"underneath, to check that the first entry was not mistyped."
+msgstr ""
+
+#. type: Content of: <section><section><note><para>
+#: en/addUser.xml:51
+msgid ""
+"As you type a password into the top box a shield will change from red-to-"
+"yellow-to-green depending on the strength of the password. A green shield "
+"shows you are using a strong password."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:32
+#: en/addUser.xml:55
 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:39
+#: en/addUser.xml:63
 msgid "Enter a user"
 msgstr "Indique um utilizador"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:41
+#: en/addUser.xml:66
 msgid ""
 "Add a User here. A regular user has fewer privileges than the "
 "<literal>superuser</literal> (root), but enough to use the Internet, office "
@@ -200,39 +211,39 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:47
+#: en/addUser.xml:73
 msgid "<emphasis role=\"bold\">Icon</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:48
+#: en/addUser.xml:75
 msgid "Click on this button if you want to change the user's icon"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:52
+#: en/addUser.xml:80
 msgid "<emphasis role=\"bold\">Real Name</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:53
+#: en/addUser.xml:82
 msgid "Insert the user's real name into this text box"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:56
+#: en/addUser.xml:86
 msgid "<emphasis role=\"bold\">Login Name</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:57
+#: en/addUser.xml:88
 msgid ""
 "Enter the user login name or let DrakX use a version of the user's real "
 "name. <emphasis role=\"bold\">The login name is case-sensitive.</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><caution><simpara>
-#: en/addUser.xml:61
+#: en/addUser.xml:93
 msgid ""
 "The login entered here should be different to any login currently in use for "
 "your <filename>/home</filename> directory. Some user parameters will be "
@@ -241,34 +252,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:65 en/setupBootloader.xml:124
+#: en/addUser.xml:102 en/setupBootloader.xml:182
 msgid "<emphasis role=\"bold\">Password</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:66
-msgid ""
-"Type in the user password. There is a shield at the end of the text box that "
-"indicates the strength of the password. (See also <xref linkend="
-"\"givePassword\"/>)"
+#: en/addUser.xml:104
+msgid "Type in the user password (remembering the advice in the Note above)."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:68
+#: en/addUser.xml:107
 msgid ""
 "<emphasis role=\"bold\">Password (again):</emphasis> Retype the user "
 "password. DrakX will check that you have not mistyped the password."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:74
+#: en/addUser.xml:114
 msgid ""
 "Any users added while installing Mageia, will have a home directory that is "
 "both read and write protected (umask=0027)"
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:76
+#: en/addUser.xml:117
 msgid ""
 "You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
@@ -276,25 +284,25 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:79
+#: en/addUser.xml:121
 msgid "The access permissions can also be changed after the install."
 msgstr ""
 "As permissões de acesso, também podem ser alteradas depois da instalação."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:85
+#: en/addUser.xml:128
 msgid "User Management (advanced)"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:87
+#: en/addUser.xml:131
 msgid ""
 "The <emphasis>Advanced</emphasis> option allows you to edit further settings "
 "for the user you are adding."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:91
+#: en/addUser.xml:136
 msgid ""
 "<emphasis>Shell</emphasis>: This drop-down list allows you to change the "
 "shell available to any user you added in the previous screen. Options are "
@@ -302,7 +310,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:143
 msgid ""
 "<emphasis>User ID</emphasis>: Here you can set the user ID for any user you "
 "added in the previous screen. If you are unsure what the purpose of this is, "
@@ -310,7 +318,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:102
+#: en/addUser.xml:149
 msgid ""
 "<emphasis>Group ID</emphasis>: This lets you set the group ID.  Again, if "
 "unsure, leave it blank."
@@ -430,24 +438,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:23
+#: en/bootLive.xml:10
 msgid "Boot Mageia as Live system"
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:28
+#: en/bootLive.xml:14
 msgid "Booting the medium"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:31
+#: en/bootLive.xml:16
 msgid ""
 "You can boot directly from a Live DVD or USB. Usually, you just need to plug "
 "the USB device in or place the DVD in the drive and restart the computer."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:35
+#: en/bootLive.xml:19
 msgid ""
 "If the computer does not automatically boot from the USB or DVD you may need "
 "to reconfigure your BIOS Boot Disk priority. Alternatively, you might try "
@@ -456,7 +464,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><tip><para>
-#: en/bootLive.xml:41
+#: en/bootLive.xml:24
 msgid ""
 "To access the BIOS or boot menu when the computer is starting, you can try "
 "pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or <keycap>Esc</"
@@ -466,7 +474,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/bootLive.xml:50
+#: en/bootLive.xml:32
 msgid ""
 "The actual screen that you will first see when booting from the Live media "
 "will depend on whether your computer motherboard is of the Legacy (BIOS) or "
@@ -474,91 +482,95 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:58
+#: en/bootLive.xml:39
 msgid "In BIOS/CSM/Legacy mode"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:62
+#: en/bootLive.xml:42
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"../live-bootCSM.png\" align=\"center\"/> "
+"</imageobject>"
 msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
+"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:67
+#: en/bootLive.xml:46
 msgid "First screen while booting in BIOS mode"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><title>
-#: en/bootLive.xml:72 en/bootLive.xml:144 en/installer.xml:106
-#: en/installer.xml:154
+#: en/bootLive.xml:50 en/bootLive.xml:104 en/installer.xml:108
+#: en/installer.xml:156
 msgid "Menu"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:75 en/bootLive.xml:147
+#: en/bootLive.xml:52 en/bootLive.xml:106
 msgid "<emphasis role=\"bold\">Boot Mageia</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:77
+#: en/bootLive.xml:53
 msgid ""
 "This option will boot the Mageia Live system from the connected DVD/USB "
 "media (expect a very slow system compared to an installed OS)."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:81
+#: en/bootLive.xml:56
 msgid "Once the boot is done, you can proceed to the installation."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:86 en/bootLive.xml:102
+#: en/bootLive.xml:60 en/bootLive.xml:72
 msgid ""
 "<emphasis role=\"bold\">+ use non-free video drivers (slower to boot)</"
 "emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:89
+#: en/bootLive.xml:62
 msgid "Boot the Mageia Live system using non-free video drivers"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:96 en/bootLive.xml:155 en/installer.xml:109
+#: en/bootLive.xml:68 en/bootLive.xml:112 en/installer.xml:111
 msgid "<emphasis role=\"bold\">Install Mageia</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:98 en/bootLive.xml:157
+#: en/bootLive.xml:69 en/bootLive.xml:113
 msgid "This option will install Mageia to a hard disk."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:105
+#: en/bootLive.xml:74
 msgid "Install Mageia using non-free video drivers"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:111 en/installer.xml:125
+#: en/bootLive.xml:79 en/installer.xml:127
 msgid "<emphasis role=\"bold\">Memory Test</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:113 en/installer.xml:127
+#: en/bootLive.xml:80 en/installer.xml:129
 msgid ""
 "Test the installed RAM by performing multiple read and write operations. "
 "Reboot to end the test."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:118 en/bootLive.xml:161
+#: en/bootLive.xml:84 en/bootLive.xml:116
 msgid "<emphasis role=\"bold\"> F2 Language</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:120 en/bootLive.xml:163
+#: en/bootLive.xml:85 en/bootLive.xml:117
 msgid ""
 "Press <keycap>F2</keycap> to have the installer use a specific language "
 "during the installation. Use the arrow keys to select the language then "
@@ -566,24 +578,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:129
+#: en/bootLive.xml:93
 msgid "In UEFI mode"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:133
+#: en/bootLive.xml:96
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
+"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:139
+#: en/bootLive.xml:100
 msgid "First screen while booting in UEFI mode"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:149
+#: en/bootLive.xml:107
 msgid ""
 "This option will boot the Mageia Live system from the connected DVD/USB "
 "media (expect a very slow system compared to an installed OS).  Once the "
@@ -591,7 +607,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/bootLive.xml:170
+#: en/bootLive.xml:123
 msgid ""
 "If you booted from a USB stick, you will see the above menu options "
 "duplicated, and in this case, you should choose from the menu pair that will "
@@ -806,12 +822,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:24
+#: en/configureX_card_list.xml:27
 msgid "Choose an X Server (Configure your Graphic Card)"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_card_list.xml:29
+#: en/configureX_card_list.xml:32
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_card_list."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_card_list-im1\"/> </"
@@ -819,36 +835,36 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:35
+#: en/configureX_card_list.xml:38
 msgid ""
 "DrakX has a very comprehensive database of video cards and will usually "
 "correctly identify your video device."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:38
+#: en/configureX_card_list.xml:41
 msgid ""
 "If the installer has not correctly detected your graphic card and you know "
 "which one you have, you can select it from the tree by:"
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_card_list.xml:41 en/configureX_monitor.xml:74
+#: en/configureX_card_list.xml:44 en/configureX_monitor.xml:78
 msgid "Vendor"
 msgstr "Vendedor"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:45
+#: en/configureX_card_list.xml:48
 msgid "then the make of your card"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:49
+#: en/configureX_card_list.xml:52
 msgid "and the model of card"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:53
+#: en/configureX_card_list.xml:56
 msgid ""
 "If you cannot find your card in the vendor lists (because it's not yet in "
 "the database or it's an older card) you may find a suitable driver in the "
@@ -859,14 +875,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><caution><para>
-#: en/configureX_card_list.xml:61
+#: en/configureX_card_list.xml:64
 msgid ""
 "Be aware that if you select an incompatible driver you may only have access "
 "to the <emphasis>Command Line Interface</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:65
+#: en/configureX_card_list.xml:68
 msgid ""
 "Some video card manufacturers provide proprietary drivers for Linux which "
 "may only be available in the <emphasis>Nonfree</emphasis> repository and in "
@@ -877,17 +893,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:11
-msgid "Graphic Card and Monitor Configuration"
+#: en/configureX_chooser.xml:23
+#, fuzzy
+msgid "Graphics Card and Monitor Configuration"
 msgstr "Configuração da Placa Gráfica e do Monitor"
 
-#.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
-#. 2018/02/15 apb: Some text and typography.
-#. 2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.
-#. 2018/02/23 apb: Typo.
-#. 2019/01/06 apb: Slight reword, split 1st para in two.
 #. type: Content of: <section><mediaobject>
-#: en/configureX_chooser.xml:26
+#: en/configureX_chooser.xml:28
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_chooser."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_chooser-im1\"/> </"
@@ -895,7 +907,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:32
+#: en/configureX_chooser.xml:34
 msgid ""
 "No matter which graphical environment (also known as desktop environment) "
 "you chose for this install of Mageia, they are all based on a graphical user "
@@ -906,31 +918,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:39
+#: en/configureX_chooser.xml:41
 msgid ""
 "Choose the appropriate settings manually if you think the details are "
 "incorrect, or if none are shown."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:44
-msgid "<emphasis role=\"bold\">Graphic Card</emphasis>"
+#: en/configureX_chooser.xml:46
+msgid "<emphasis role=\"bold\">Graphics Card</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:47
+#: en/configureX_chooser.xml:49
 msgid ""
 "If you need to, you can select a specific card from this expandable list. "
 "See <xref linkend=\"configureX_card_list\"/>."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:52
+#: en/configureX_chooser.xml:54
 msgid "<emphasis role=\"bold\">Monitor</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:55
+#: en/configureX_chooser.xml:57
 msgid ""
 "You can choose Plug 'n Play, if applicable, or choose your monitor from the "
 "<emphasis>Vendor</emphasis> or <emphasis>Generic</emphasis> lists. Choose "
@@ -940,22 +952,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:63
+#: en/configureX_chooser.xml:65
 msgid "<emphasis role=\"bold\">Resolution</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:66
+#: en/configureX_chooser.xml:68
 msgid "The resolution and color depth of your monitor can be set here."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:71
+#: en/configureX_chooser.xml:73
 msgid "<emphasis role=\"bold\">Test</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:74
+#: en/configureX_chooser.xml:76
 msgid ""
 "The test button does not always appear during install. If the option is "
 "there, and you test your settings, you should be asked to confirm that your "
@@ -967,17 +979,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:85
+#: en/configureX_chooser.xml:87
 msgid "<emphasis role=\"bold\">Options</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:88
+#: en/configureX_chooser.xml:90
 msgid "Here you can choose to enable or disable various options."
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_chooser.xml:93
+#: en/configureX_chooser.xml:95
 msgid ""
 "There is a risk of damaging a monitor if you choose refresh rates that are "
 "outside the frequency range of that monitor. This applies to older CRT "
@@ -986,19 +998,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_monitor.xml:22
+#: en/configureX_monitor.xml:26
 msgid "Choosing your Monitor"
 msgstr "Escolha o seu Monitor"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:25
+#: en/configureX_monitor.xml:29
 msgid ""
 "DrakX has a very comprehensive database of monitors and will usually "
 "correctly identify yours."
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:30
+#: en/configureX_monitor.xml:34
 msgid ""
 "<emphasis role=\"bold\">Selecting a monitor with different characteristics "
 "could damage your monitor or video hardware. Please don't try something "
@@ -1007,7 +1019,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:38
+#: en/configureX_monitor.xml:42
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
@@ -1018,12 +1030,12 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:46
+#: en/configureX_monitor.xml:50
 msgid "Custom"
 msgstr "Personalizado"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:49
+#: en/configureX_monitor.xml:53
 msgid ""
 "This option allows you to set two critical parameters: the vertical refresh "
 "rate and the horizontal sync rate. Vertical refresh determines how often the "
@@ -1032,7 +1044,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:55
+#: en/configureX_monitor.xml:59
 msgid ""
 "It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor "
 "type with a sync range that is beyond the capabilities of your monitor: you "
@@ -1041,56 +1053,56 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:64
+#: en/configureX_monitor.xml:68
 msgid "Plug'n Play"
 msgstr "'Plug'n Play'"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:67
+#: en/configureX_monitor.xml:71
 msgid ""
 "This is the default option and automatically tries to determine the monitor "
 "type from the monitor database."
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:77
+#: en/configureX_monitor.xml:81
 msgid ""
 "If the installer has not correctly detected your monitor and you know which "
-"one you have, you can select it from the tree by selecting:"
+"one you have, you can choose it from the options by selecting:"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:86
+#: en/configureX_monitor.xml:90
 msgid "Manufacturer"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:90
+#: en/configureX_monitor.xml:94
 msgid "Monitor model"
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:96
+#: en/configureX_monitor.xml:100
 msgid "Generic"
 msgstr "Genérico"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:99
+#: en/configureX_monitor.xml:103
 msgid ""
-"Selecting this group will list nearly 30 display configurations such as "
-"1024x768 @ 60Hz and includes flat-panel displays as used in laptops. This is "
-"often a good monitor selection group if you need to use the VESA card driver "
-"when your video hardware cannot be determined automatically.  Once again it "
-"may be wise to be conservative in your selections."
+"Selecting this group will list approximately 30 display configurations such "
+"as 1024x768 @ 60Hz and includes flat-panel displays as used in laptops.  "
+"This is often a good monitor selection group if you need to use the VESA "
+"card driver when your video hardware cannot be determined automatically. "
+"Once again, it may be wise to be conservative in your selections."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:22
+#: en/diskdrake.xml:24
 msgid "Custom Disk Partitioning with DiskDrake"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:27
+#: en/diskdrake.xml:29
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-diskdrake.png\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1098,7 +1110,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:38
+#: en/diskdrake.xml:40
 msgid ""
 "Modify the layout of your disk(s) here. You can remove or create partitions, "
 "change the filesystem or size of a partition and even view their details "
@@ -1106,15 +1118,15 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:47
 msgid ""
 "There is a tab at the top for every detected hard disk (or other storage "
-"device, like a USB key). In the screenshot above there are two available "
-"devices: <filename>sda </filename>and <filename>sdb</filename>."
+"device, like a USB key), for example: <filename>sda</filename>, "
+"<filename>sdb</filename>, <filename>sdc</filename> etc."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:52
+#: en/diskdrake.xml:54
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it. "
@@ -1123,21 +1135,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:60
+#: en/diskdrake.xml:62
 msgid ""
 "Continue until you have adjusted everything to your satisfaction, then click "
 "<emphasis>Done</emphasis> when you're ready."
 msgstr ""
 
 #. type: Content of: <section><warning><orderedlist><listitem><para>
-#: en/diskdrake.xml:69
+#: en/diskdrake.xml:71
 msgid ""
 "Take care with the <emphasis>Clear all</emphasis> option, use it only if you "
 "are sure you want to wipe all partitions on the selected storage device."
 msgstr ""
 
 #. type: Content of: <section><warning><orderedlist><listitem><para>
-#: en/diskdrake.xml:75
+#: en/diskdrake.xml:77
 msgid ""
 "If you wish to use encryption on your <filename>/</filename> partition you "
 "must ensure that you have a separate <filename>/boot</filename> partition. "
@@ -1146,7 +1158,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/diskdrake.xml:87
+#: en/diskdrake.xml:89
 msgid ""
 "If you are installing Mageia on a UEFI system, check that an ESP (EFI System "
 "Partition) is present and correctly mounted on <filename>/boot/EFI</"
@@ -1154,19 +1166,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/diskdrake.xml:93
+#: en/diskdrake.xml:95
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
 "partition is present and of the correct type. See Figure 2 below."
 msgstr ""
 
 #. type: Content of: <section><figure><title>
-#: en/diskdrake.xml:101
+#: en/diskdrake.xml:103
 msgid "EFI System Partition"
 msgstr "Partição do Sistema EFI"
 
 #. type: Content of: <section><figure><mediaobject>
-#: en/diskdrake.xml:104
+#: en/diskdrake.xml:106
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-diskdrake2.png\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1174,17 +1186,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><figure>
-#: en/diskdrake.xml:103 en/diskdrake.xml:117
+#: en/diskdrake.xml:105 en/diskdrake.xml:119
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <section><figure><title>
-#: en/diskdrake.xml:115
+#: en/diskdrake.xml:117
 msgid "BIOS boot partition"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:118 en/doPartitionDisks.xml:201
+#: en/diskdrake.xml:120 en/doPartitionDisks.xml:206
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1203,26 +1215,26 @@ msgid "Partitioning"
 msgstr "Particionamento"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:31
 msgid "Suggested Partitioning"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:34
 msgid ""
 "In this screen you can see the content of your hard drive(s) along with the "
 "DrakX partitioning proposals for where to install Mageia."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:34
+#: en/doPartitionDisks.xml:38
 msgid ""
 "The actual options available from those shown below will vary according to "
 "the layout and content of your particular hard drive(s)."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:39
+#: en/doPartitionDisks.xml:43
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1231,17 +1243,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><title>
-#: en/doPartitionDisks.xml:49
+#: en/doPartitionDisks.xml:53
 msgid "Main Options"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:56
 msgid "<emphasis role=\"bold\">Use Existing Partitions</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:59
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1250,94 +1262,99 @@ msgstr ""
 "existentes forem encontradas, estas poderão ser utilizadas para a instalação."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:61
+#: en/doPartitionDisks.xml:65
 msgid "<emphasis role=\"bold\">Use Free Space</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:68
 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><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:70
+#: en/doPartitionDisks.xml:74
 msgid ""
 "<emphasis role=\"bold\">Use Free Space on a Windows Partition</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:73
+#: en/doPartitionDisks.xml:77
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it. 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 important files!"
+"installation but see the warning below."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para><mediaobject>
+#: en/doPartitionDisks.xml:87
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:79
+#: en/doPartitionDisks.xml:82
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
 "light blue and the proposed Mageia partition in dark blue with their "
 "intended sizes just underneath. You have the option to modify these sizes by "
 "clicking and dragging the gap between both partitions.  See the following "
-"screenshot:"
+"screenshot:<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><warning><para>
+#: en/doPartitionDisks.xml:97
+msgid ""
+"This involves shrinking the size of the Windows partition, and therefore is "
+"a risky operation, so you should make sure you have backed up all important "
+"files before proceeding."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><important><para>
+#: en/doPartitionDisks.xml:103
+msgid ""
+"The partition must be \"clean\", meaning that Windows must have closed down "
+"correctly the last time it was used. It must also have been defragmented, "
+"although this is not a guarantee that all files in the partition have been "
+"moved out of the area that is about to be used for Mageia."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:87
+#: en/doPartitionDisks.xml:112
 msgid "<emphasis role=\"bold\">Erase and use Entire Disk</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:90
+#: en/doPartitionDisks.xml:115
 msgid "This option will allocate the entire drive for Mageia"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:119
 msgid ""
 "This will erase ALL data on the selected hard drive. Take care! 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 this option."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><important><para>
-#: en/doPartitionDisks.xml:101
-msgid ""
-"Note that this involves shrinking the size of the Windows partition. The "
-"partition must be \"clean\", meaning that Windows must have closed down "
-"correctly the last time it was used. It must also have been defragmented, "
-"although this is not a guarantee that all files in the partition have been "
-"moved out of the area that is about to be used. It is highly recommended to "
-"back up your personal files."
-msgstr ""
-
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:112
+#: en/doPartitionDisks.xml:127
 msgid "<emphasis role=\"bold\">Custom Disk Partitioning</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:115
+#: en/doPartitionDisks.xml:130
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
 msgstr ""
 
-#. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:122
-msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
-msgstr ""
-
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:131
+#: en/doPartitionDisks.xml:136
 msgid ""
 "If you are not using the <emphasis>Custom disk partitioning</emphasis> "
 "option, then the installer will allocate the available space according to "
@@ -1345,60 +1362,60 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:137
+#: en/doPartitionDisks.xml:142
 msgid ""
 "If the total available space is less than 50 GB, then only one partition is "
 "created. This will be the <filename>/</filename> (root)  partition."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:143
+#: en/doPartitionDisks.xml:148
 msgid ""
 "If the total available space is greater than 50 GB, then three partitions "
 "are created"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:148
+#: en/doPartitionDisks.xml:153
 msgid ""
 "6/19 of the total available place is allocated to <filename>/</filename> "
 "with a maximum of 50 GB"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:153
+#: en/doPartitionDisks.xml:158
 msgid "1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:158
+#: en/doPartitionDisks.xml:163
 msgid "the rest (at least 12/19) is allocated to <filename>/home</filename>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:165
+#: en/doPartitionDisks.xml:170
 msgid ""
 "This means that from 160 GB or greater available space, the installer will "
 "create three partitions:"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:170
+#: en/doPartitionDisks.xml:175
 msgid "50 GB for <filename>/</filename>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:174
+#: en/doPartitionDisks.xml:179
 msgid "4 GB for <filename>swap</filename>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:178
+#: en/doPartitionDisks.xml:183
 msgid "and the remainder for <filename>/home</filename>"
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:183
+#: en/doPartitionDisks.xml:188
 msgid ""
 "If you are using a UEFI system, the ESP (EFI System Partition) will be "
 "automatically detected - or created if it does not exist yet - and mounted "
@@ -1408,7 +1425,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:189
+#: en/doPartitionDisks.xml:194
 msgid ""
 "If you are using a Legacy (also known as BIOS) system with a GPT partitioned "
 "disk, you need to create a BIOS boot partition if it doesn't already exist. "
@@ -1419,19 +1436,25 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:196
+#: en/doPartitionDisks.xml:201
 msgid "See <xref linkend=\"diskdrake\"/> for information on how to proceed."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:211
+#: en/doPartitionDisks.xml:216
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4.png"
-"\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks4.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks4.png\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
+"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:217
+#: en/doPartitionDisks.xml:226
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
 "previous standard of 512. Due to lack of available hardware, the "
@@ -1440,7 +1463,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:222
+#: en/doPartitionDisks.xml:231
 msgid ""
 "Some SSD devices now use an erase block size over 1 MB. If you have such a "
 "device we suggest that you partition the drive in advance, using an "
@@ -1449,17 +1472,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:229
+#: en/doPartitionDisks.xml:238
 msgid "<emphasis>Align to</emphasis> = MiB"
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:233
+#: en/doPartitionDisks.xml:242
 msgid "<emphasis>Free space preceding (MiB)</emphasis> = 2"
 msgstr ""
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:237
+#: en/doPartitionDisks.xml:246
 msgid ""
 "Also make sure all partitions are created using an even number of megabytes."
 msgstr ""
@@ -1622,12 +1645,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/firewall.xml:7
+#: en/firewall.xml:16
 msgid "Firewall"
 msgstr "Firewall"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:10
+#: en/firewall.xml:19
 msgid ""
 "This section allows you to configure some simple firewall rules: they "
 "determine which type of message from the Internet will be accepted by the "
@@ -1635,8 +1658,19 @@ msgid ""
 "system to be accessible from the Internet."
 msgstr ""
 
+#. type: Content of: <section><mediaobject>
+#: en/firewall.xml:26
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-firewall.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
+"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
+"imageobject>"
+
 #. type: Content of: <section><para>
-#: en/firewall.xml:16
+#: en/firewall.xml:31
 msgid ""
 "In the default setting (no button is checked), no service of the system is "
 "accessible from the network. The <emphasis>Everything (no firewall)</"
@@ -1649,7 +1683,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:25
+#: en/firewall.xml:40
 msgid ""
 "All other options are more or less self-explanatory. As an example, you will "
 "enable the CUPS server if you want printers on your machine to be accessible "
@@ -1657,12 +1691,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:29
+#: en/firewall.xml:44
 msgid "<emphasis role=\"bold\">Advanced</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:31
+#: en/firewall.xml:46
 msgid ""
 "The <emphasis>Advanced</emphasis> option opens a window where you can enable "
 "a series of services by typing a list of <quote>couples</quote> (blank "
@@ -1670,34 +1704,35 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:35
-msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
+#: en/firewall.xml:50
+msgid "<emphasis>&lt;port-number&gt;/&lt;protocol&gt;</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:38
+#: en/firewall.xml:53
 msgid ""
-"- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
-"the service you want to enable (e.g. 873 for the RSYNC service) as defined "
-"in <emphasis>RFC-433</emphasis>;"
+"- <emphasis>&lt;port-number&gt;</emphasis> is the value of the port assigned "
+"to the service you want to enable (e.g. 873 for the RSYNC service) as "
+"defined in <emphasis>RFC-433</emphasis>;"
 msgstr ""
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:42
+#: en/firewall.xml:57
 msgid ""
-"- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
-"<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
+"- <emphasis>&lt;protocol&gt;</emphasis> is one of <emphasis>TCP</emphasis> "
+"or <emphasis>UDP</emphasis> - the internet protocol that is used by the "
+"service."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:47
+#: en/firewall.xml:62
 msgid ""
 "For instance, the entry for enabling access to the RSYNC service therefore "
 "is <emphasis>873/tcp</emphasis>."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:50
+#: en/firewall.xml:65
 msgid ""
 "In case a service is implemented to use both protocols, you specify 2 "
 "couples for the same port."
@@ -1765,12 +1800,12 @@ msgid "Graphical Configuration"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:32
+#: en/installer.xml:34
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, o Instalador do Mageia"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:35
+#: en/installer.xml:37
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -1778,33 +1813,33 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:40
+#: en/installer.xml:42
 msgid "The installation steps"
 msgstr "Os passos da instalação"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:44
+#: en/installer.xml:46
 msgid ""
 "The install process is divided into a number of steps - the status of which "
 "is indicated in a panel to the left of the screen."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:50
+#: en/installer.xml:52
 msgid ""
 "Each step has one or more screens, which may also have <emphasis>Advanced</"
 "emphasis> sections with extra, less commonly required options."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:56
+#: en/installer.xml:58
 msgid ""
 "Most screens have <emphasis>Help</emphasis> buttons for further details "
 "about the particular step."
 msgstr ""
 
 #. type: Content of: <section><section><caution><para>
-#: en/installer.xml:62
+#: en/installer.xml:64
 msgid ""
 "If at some point during the install you decide to abort the installation, it "
 "is possible to reboot, but please think twice before you do this. Once a "
@@ -1814,7 +1849,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><caution><para>
-#: en/installer.xml:68
+#: en/installer.xml:70
 msgid ""
 "If, in spite of this, you are very sure rebooting is what you want, go to a "
 "text terminal by pressing the keys <keycombo> <keycap>Ctrl</keycap> "
@@ -1824,12 +1859,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:86
+#: en/installer.xml:88
 msgid "Installation Welcome Screen"
 msgstr "Ecrã de Boas-vindas da Instalação"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:88
+#: en/installer.xml:90
 msgid ""
 "The particular screen that you will first see when booting from the "
 "Installation media will depend on whether your computer motherboard is of "
@@ -1837,60 +1872,60 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:92
+#: en/installer.xml:94
 msgid ""
 "The welcome menu screen has various options, however the default option will "
 "start the installer, and is normally all that you will need."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:97
+#: en/installer.xml:99
 msgid "Legacy (BIOS) Systems"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:100
+#: en/installer.xml:102
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome.png\"/> </"
 "imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:111
+#: en/installer.xml:113
 msgid ""
 "Install Mageia to a hard disk. This is the default option, and will "
 "automatically start after a short while unless another option is selected."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:117
+#: en/installer.xml:119
 msgid "<emphasis role=\"bold\">Rescue System</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:119
+#: en/installer.xml:121
 msgid ""
 "This option allows you to either re-install the bootloader for an existing "
 "Mageia installation or you can use it to restore a Windows bootloader."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:132
+#: en/installer.xml:134
 msgid "<emphasis role=\"bold\">F2: Language</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:134
+#: en/installer.xml:136
 msgid "Press F2 for alternative languages."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:140
+#: en/installer.xml:142
 msgid "UEFI Systems"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:142
+#: en/installer.xml:144
 msgid ""
 "From this screen, you can access options by pressing <keycap>e</keycap> to "
 "enter the edit mode. To come back to this screen, press <keycap>Esc</keycap> "
@@ -1898,19 +1933,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:148
+#: en/installer.xml:150
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome2.png\"/> </"
 "imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:157
+#: en/installer.xml:159
 msgid "<emphasis role=\"bold\">Install:</emphasis> Start the Install process"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:162
+#: en/installer.xml:164
 msgid ""
 "<emphasis role=\"bold\">Rescue:</emphasis> This option allows you to either "
 "re-install the bootloader for an existing Mageia installation or you can use "
@@ -1918,31 +1953,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:169
+#: en/installer.xml:171
 msgid ""
 "<emphasis role=\"bold\">F2: Language:</emphasis> Press <keycap>F2</keycap> "
 "for alternative languages."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:174
+#: en/installer.xml:176
 msgid ""
 "If you booted from a USB stick, you will see the above options duplicated, "
 "and in this case, you should use the set that will be suffixed with \"USB\"."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:181
+#: en/installer.xml:183
 msgid "Installation Problems and Possible Solutions"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:184
+#: en/installer.xml:186
 msgid "No Graphical Interface"
 msgstr "Sem Interface Gráfica"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:188
+#: en/installer.xml:190
 msgid ""
 "After the initial screen you did not progress to the <emphasis>Language "
 "Selection</emphasis> screen. This can happen with some graphic cards and "
@@ -1951,7 +1986,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:195
+#: en/installer.xml:197
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
 "In this case it is worth trying a text-mode installation. To use this press "
@@ -1962,12 +1997,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:208
+#: en/installer.xml:210
 msgid "The Install Freezes"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:210
+#: en/installer.xml:212
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic hardware "
@@ -1977,12 +2012,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:218
+#: en/installer.xml:220
 msgid "RAM problem"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:220
+#: en/installer.xml:222
 msgid ""
 "This will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
@@ -1992,12 +2027,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:228
+#: en/installer.xml:230
 msgid "Dynamic partitions"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:230
+#: en/installer.xml:232
 msgid ""
 "If you converted your hard disk from <literal>Basic</literal> format to "
 "<literal>Dynamic</literal> format in Microsoft Windows, then it is not "
@@ -3584,73 +3619,106 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:27
+#: en/setupBootloader.xml:32
 msgid "Bootloader"
 msgstr "Carregador de Arranque"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:31
+#: en/setupBootloader.xml:36
+#, fuzzy
+msgid "Available Bootloaders"
+msgstr "Carregador de Arranque"
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:39
 msgid "Grub2"
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><title>
-#: en/setupBootloader.xml:34
-msgid "Grub2 on Legacy MBR/GPT systems"
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:42
+msgid "<emphasis role=\"bold\">Grub2 on Legacy MBR/GPT systems</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:37
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:46
 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:42
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:52
 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:49
-msgid "Grub2-efi on UEFI systems"
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:59
+msgid "<emphasis role=\"bold\">Grub2-efi on UEFI systems</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:52
-msgid "GRUB2-efi will be used exclusively as the bootloader for a UEFI system."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:63
+msgid "GRUB2-efi or rEFInd may be used as the bootloader for a UEFI system."
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:57
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:68
 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:60
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:71
 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 "
-"created by Windows and add grub2-efi to it. If no ESP exists, then one will "
+"created by Windows and add grub2-efi to it.  If no ESP exists, then one will "
 "be created. Although it is possible to have several ESPs, only one is "
 "required, whatever the number of operating systems you have."
 msgstr ""
 
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:82
+msgid "rEFInd"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:85
+msgid "<emphasis role=\"bold\">rEFInd on UEFI systems</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:88
+msgid ""
+"rEFInd has a nice graphical set of options, and can auto-detect installed "
+"EFI bootloaders. See: http://www.rodsbooks.com/refind/"
+msgstr ""
+
+#. type: Content of: <section><section><section><note><para>
+#: en/setupBootloader.xml:95
+msgid ""
+"Please note that in order to be able to use the <literal>rEFInd</literal> "
+"option, an installed EFI System Partition must match your system "
+"architecture: if you have a 32bit EFI System Partition installed on a 64bit "
+"machine for instance, then the rEFInd option will not be displayed/available "
+"to you."
+msgstr ""
+
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:72
+#: en/setupBootloader.xml:106
 msgid "Bootloader Setup"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:76
+#: en/setupBootloader.xml:110
 msgid "Bootloader main options"
 msgstr "Opções principais do carregador de arranque"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:79
+#: en/setupBootloader.xml:113
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader.png\"/> </imageobject> <imageobject condition=\"live"
@@ -3659,47 +3727,69 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:91
+#: en/setupBootloader.xml:125
 msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:93
+#. type: Content of: <section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:129
+msgid ""
+"<guimenuitem>GRUB2</guimenuitem> (with either a graphical or a text menu), "
+"can be chosen for both <literal>Legacy MBR/BIOS</literal> systems and "
+"<literal>UEFI</literal> systems."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:136
 msgid ""
-"This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI "
-"systems will not see this option here."
+"<guimenuitem>rEFInd</guimenuitem> (with a graphical menu)  is an alternative "
+"option solely for use with <literal>UEFI</literal> systems."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:98
+#: en/setupBootloader.xml:144
 msgid "<emphasis role=\"bold\">Boot device</emphasis>"
 msgstr ""
 
+#. type: Content of: <section><section><section><itemizedlist><listitem><warning><para>
+#: en/setupBootloader.xml:147
+msgid "Don't change this unless you really know what you are doing."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><note><para>
+#: en/setupBootloader.xml:152
+msgid ""
+"There is no option to write GRUB to the boot sector of a partition (e.g: "
+"<filename>sda1</filename>), as this method is considered unreliable."
+msgstr ""
+
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:100
-msgid "Don't change this unless you really know what you are doing"
+#: en/setupBootloader.xml:157
+msgid ""
+"When using UEFI mode, then the <guilabel>Boot device</guilabel> will be "
+"listed as <guimenuitem>EFI System Partition</guimenuitem>."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:105
+#: en/setupBootloader.xml:163
 msgid ""
 "<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:108
+#: en/setupBootloader.xml:166
 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:113
+#: en/setupBootloader.xml:171
 msgid "<emphasis role=\"bold\">Security</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:115
+#: en/setupBootloader.xml:173
 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 "
@@ -3709,34 +3799,34 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:126
+#: en/setupBootloader.xml:184
 msgid "Choose a password for the bootloader (optional)"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:130
+#: en/setupBootloader.xml:188
 msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:132
+#: en/setupBootloader.xml:190
 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:137 en/setupBootloader.xml:212
+#: en/setupBootloader.xml:195 en/setupBootloader.xml:308
 msgid "<emphasis>Advanced</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:141
+#: en/setupBootloader.xml:199
 msgid "<emphasis>Enable ACPI</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:143
+#: en/setupBootloader.xml:201
 msgid ""
 "ACPI (Advanced Configuration and Power Interface) is a standard for power "
 "management. It can save energy by stopping unused devices. Deselecting it "
@@ -3746,24 +3836,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:152
+#: en/setupBootloader.xml:210
 msgid "<emphasis>Enable SMP</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:154
+#: en/setupBootloader.xml:212
 msgid ""
 "This option enables/disables symmetric multiprocessing for multi-core "
 "processors"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:159
+#: en/setupBootloader.xml:217
 msgid "<emphasis>Enable APIC</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:161
+#: en/setupBootloader.xml:219
 msgid ""
 "Enabling this gives the operating system access to the Advanced Programmable "
 "Interrupt Controller. APIC devices permit more complex priority models, and "
@@ -3771,24 +3861,77 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:168
+#: en/setupBootloader.xml:226
 msgid "<emphasis>Enable Local APIC</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:170
+#: en/setupBootloader.xml:228
 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:177
+#: en/setupBootloader.xml:235
 msgid "Bootloader Configuration"
 msgstr "Configuração do Carregador de Arranque"
 
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:237
+msgid ""
+"If, in the previous section you selected <literal>rEFInd</literal> as the "
+"bootloader to use, you would then be presented with the options shown in the "
+"screenshot directly below. Otherwise, please instead move on to the "
+"subsequent screenshot for your options."
+msgstr ""
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:243
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"rEFIndLoaderConfig.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-rEFIndLoaderConfig.png\"/> </"
+"imageobject>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:253
+#, fuzzy
+msgid "Your rEFInd configuration options:"
+msgstr "Configuração do Som"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:256
+msgid ""
+"<guimenuitem>Install or update rEFInd in the EFI system partition.</"
+"guimenuitem>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:261
+msgid ""
+"<guimenuitem>Install in EFI/Boot partition (workaround for some BIOS's).</"
+"guimenuitem>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:264
+msgid ""
+"With some BIOS's, the newly written bootloaser for Mageia at end of the "
+"installation will not be recognized. In that case, you can use this option "
+"as a workaround for the issue."
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:270
+msgid ""
+"If you did not select rEFInd as the bootloader to use in the previous "
+"section, then your bootloader configurations are shown below:"
+msgstr ""
+
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:180
+#: en/setupBootloader.xml:275
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -3797,42 +3940,42 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:191
+#: en/setupBootloader.xml:286
 msgid "<emphasis role=\"bold\">Default</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:193
+#: en/setupBootloader.xml:288
 msgid "The operating system to be started up by default."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:197
+#: en/setupBootloader.xml:292
 msgid "<emphasis role=\"bold\">Append</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:199
+#: en/setupBootloader.xml:294
 msgid ""
 "This option lets you pass information to the kernel 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:204
+#: en/setupBootloader.xml:299
 msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:206
+#: en/setupBootloader.xml:301
 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, "
-"then untick the Probe Foreign OS option."
+"then untick the <guimenuitem>Probe Foreign OS</guimenuitem> option."
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:215
+#: en/setupBootloader.xml:311
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader4.png\"/> </imageobject> <imageobject condition=\"live"
@@ -3841,12 +3984,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:226
+#: en/setupBootloader.xml:322
 msgid "<emphasis>Video mode</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:228
+#: en/setupBootloader.xml:324
 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 "
@@ -3854,38 +3997,47 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:234
+#: en/setupBootloader.xml:330
 msgid "<emphasis>Do not touch ESP or MBR</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:236
+#: en/setupBootloader.xml:332
 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 "
-"missing. Click<emphasis> Ok</emphasis> if you are sure you understand the "
-"implications, and wish to proceed."
+"missing. Click <guimenuitem>Ok </guimenuitem>only if you are sure you "
+"understand the implications, and wish to proceed."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><warning><para>
+#: en/setupBootloader.xml:338
+msgid ""
+"Chain-loading via legacy bootloaders (GRUB Legacy and LiLo)  is no longer "
+"supported by Mageia as it is likely to fail when attempting to boot this "
+"resulting installation of Mageia. If you use anything other than GRUB2 or "
+"rEFInd for this purpose, then you do so at your own risk!"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:245
+#: en/setupBootloader.xml:348
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png"
 "\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:253
+#: en/setupBootloader.xml:356
 msgid "Other Options"
 msgstr "Outras Opções"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:256
+#: en/setupBootloader.xml:359
 msgid "Using an existing bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:258
+#: en/setupBootloader.xml:361
 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 "
@@ -3895,12 +4047,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:267
+#: en/setupBootloader.xml:370
 msgid "Installing Without a Bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:269
+#: en/setupBootloader.xml:372
 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 "
diff --git a/docs/docs/stable/installer/pt_BR.po b/docs/docs/stable/installer/pt_BR.po
index 2893dfed..a6fd071b 100644
--- a/docs/docs/stable/installer/pt_BR.po
+++ b/docs/docs/stable/installer/pt_BR.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2019-01-19 21:23+0200\n"
+"POT-Creation-Date: 2019-09-08 15:26+0300\n"
 "PO-Revision-Date: 2019-02-09 18:01+0000\n"
 "Last-Translator: Marcio Andre Padula <padula1000@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/MageiaLinux/"
@@ -187,7 +187,7 @@ msgstr ""
 "espelho online, o instalador encontrará os pacotes de 32-bit necessários."
 
 #. type: Content of: <section><info><title>
-#: en/addUser.xml:3
+#: en/addUser.xml:9
 msgid "User Management"
 msgstr "Gerenciamento de Usuários"
 
@@ -197,13 +197,16 @@ msgstr "Gerenciamento de Usuários"
 #. 2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
 #.   Also changed 'Advanced User Management' to 'User Management (advanced)'.
 #. 2018/02/24 apb: Changed list style.
+#. 2019/08/10 apb: Added missing 'condition' profile for live-user1.png.
+#. 2019/08/11 apb: [1] Reword 1.1 (including Note) [2] Reword 1.2 Password text.
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:12
+#: en/addUser.xml:28
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
-"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
-"\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata format="
-"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-setRootPassword.png\" format=\"PNG\" revision=\"1\" xml:id="
+"\"setRootPassword-im1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-user1.png\" format=\"PNG\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
 "\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -211,20 +214,18 @@ msgstr ""
 "\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:21
+#: en/addUser.xml:40
 msgid "Set Administrator (root)  Password:"
 msgstr "Definir senha do administrador (root):"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:24
+#: en/addUser.xml:44
+#, fuzzy
 msgid ""
 "It is advisable for all Mageia installations to set a <literal>superuser</"
 "literal> (Administrator) password, usually called the <emphasis>root </"
-"emphasis>password in Linux. As you type a password into the top box a shield "
-"will change from red-to-yellow-to-green depending on the strength of the "
-"password. A green shield shows you are using a strong password. You need to "
-"repeat the same password in the box underneath, to check that the first "
-"entry was not mistyped."
+"emphasis>password in Linux. You need to repeat the same password in the box "
+"underneath, to check that the first entry was not mistyped."
 msgstr ""
 "É aconselhável que todas as instalações da Mageia definam uma senha de "
 "<literal>superusuário</literal> (Administrador), geralmente chamada de senha "
@@ -235,7 +236,15 @@ msgstr ""
 "verificar se a primeira entrada não foi digitada incorretamente."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:32
+#: en/addUser.xml:51
+msgid ""
+"As you type a password into the top box a shield will change from red-to-"
+"yellow-to-green depending on the strength of the password. A green shield "
+"shows you are using a strong password."
+msgstr ""
+
+#. type: Content of: <section><section><note><para>
+#: en/addUser.xml:55
 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."
@@ -245,12 +254,12 @@ msgstr ""
 "uma senha."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:39
+#: en/addUser.xml:63
 msgid "Enter a user"
 msgstr "Digite um usuário"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:41
+#: en/addUser.xml:66
 msgid ""
 "Add a User here. A regular user has fewer privileges than the "
 "<literal>superuser</literal> (root), but enough to use the Internet, office "
@@ -263,32 +272,32 @@ msgstr ""
 "usuário comum possa usar um computador."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:47
+#: en/addUser.xml:73
 msgid "<emphasis role=\"bold\">Icon</emphasis>"
 msgstr "<emphasis role=\"bold\">Ícone</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:48
+#: en/addUser.xml:75
 msgid "Click on this button if you want to change the user's icon"
 msgstr "Clique neste botão se você deseja mudar o ícone do usuário."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:52
+#: en/addUser.xml:80
 msgid "<emphasis role=\"bold\">Real Name</emphasis>"
 msgstr "<emphasis role=\"bold\">Nome Real</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:53
+#: en/addUser.xml:82
 msgid "Insert the user's real name into this text box"
 msgstr "Insira o nome real do usuário nesta caixa de texto"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:56
+#: en/addUser.xml:86
 msgid "<emphasis role=\"bold\">Login Name</emphasis>"
 msgstr "<emphasis role=\"bold\">Nome de Login</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:57
+#: en/addUser.xml:88
 msgid ""
 "Enter the user login name or let DrakX use a version of the user's real "
 "name. <emphasis role=\"bold\">The login name is case-sensitive.</emphasis>"
@@ -298,7 +307,7 @@ msgstr ""
 "maiúsculas e minúsculas</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><caution><simpara>
-#: en/addUser.xml:61
+#: en/addUser.xml:93
 msgid ""
 "The login entered here should be different to any login currently in use for "
 "your <filename>/home</filename> directory. Some user parameters will be "
@@ -311,22 +320,17 @@ msgstr ""
 "dados reais, como dados do Firefox, Thunderbird ou Kmail ..."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:65 en/setupBootloader.xml:124
+#: en/addUser.xml:102 en/setupBootloader.xml:182
 msgid "<emphasis role=\"bold\">Password</emphasis>"
 msgstr "<emphasis role=\"bold\">Senha</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:66
-msgid ""
-"Type in the user password. There is a shield at the end of the text box that "
-"indicates the strength of the password. (See also <xref linkend="
-"\"givePassword\"/>)"
+#: en/addUser.xml:104
+msgid "Type in the user password (remembering the advice in the Note above)."
 msgstr ""
-"Digite a senha do usuário. Há um escudo no final da caixa de texto que "
-"indica a força da senha. (Veja também <xref linkend=\"givePassword\"/>)"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:68
+#: en/addUser.xml:107
 msgid ""
 "<emphasis role=\"bold\">Password (again):</emphasis> Retype the user "
 "password. DrakX will check that you have not mistyped the password."
@@ -335,7 +339,7 @@ msgstr ""
 "usuário. O DrakX irá verificar se você não digitou a senha incorretamente."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:74
+#: en/addUser.xml:114
 msgid ""
 "Any users added while installing Mageia, will have a home directory that is "
 "both read and write protected (umask=0027)"
@@ -344,7 +348,7 @@ msgstr ""
 "diretório inicial que seja lido e protegido por gravação (umask = 0027)"
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:76
+#: en/addUser.xml:117
 msgid ""
 "You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
@@ -355,18 +359,18 @@ msgstr ""
 "<emphasis>Gerenciamento de usuários</emphasis>."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:79
+#: en/addUser.xml:121
 msgid "The access permissions can also be changed after the install."
 msgstr ""
 "As permissões de acesso também podem ser modificadas depois de instalar."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:85
+#: en/addUser.xml:128
 msgid "User Management (advanced)"
 msgstr "Gerenciamento de usuários (avançado)"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:87
+#: en/addUser.xml:131
 msgid ""
 "The <emphasis>Advanced</emphasis> option allows you to edit further settings "
 "for the user you are adding."
@@ -375,7 +379,7 @@ msgstr ""
 "configurações para o usuário que você está adicionando."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:91
+#: en/addUser.xml:136
 msgid ""
 "<emphasis>Shell</emphasis>: This drop-down list allows you to change the "
 "shell available to any user you added in the previous screen. Options are "
@@ -386,7 +390,7 @@ msgstr ""
 "<literal>Bash</literal>, <literal>Dash</literal> e <literal>Sh</literal>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:143
 msgid ""
 "<emphasis>User ID</emphasis>: Here you can set the user ID for any user you "
 "added in the previous screen. If you are unsure what the purpose of this is, "
@@ -397,7 +401,7 @@ msgstr ""
 "souber qual é o objetivo disso, deixe em branco."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:102
+#: en/addUser.xml:149
 msgid ""
 "<emphasis>Group ID</emphasis>: This lets you set the group ID.  Again, if "
 "unsure, leave it blank."
@@ -555,17 +559,17 @@ msgstr ""
 "automaticamente a sincronização da hora e especificar um servidor NTP."
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:23
+#: en/bootLive.xml:10
 msgid "Boot Mageia as Live system"
 msgstr "Boot para  Mageia com sistema Live"
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:28
+#: en/bootLive.xml:14
 msgid "Booting the medium"
 msgstr "Inicializando o ambiente"
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:31
+#: en/bootLive.xml:16
 msgid ""
 "You can boot directly from a Live DVD or USB. Usually, you just need to plug "
 "the USB device in or place the DVD in the drive and restart the computer."
@@ -575,7 +579,7 @@ msgstr ""
 "computador."
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:35
+#: en/bootLive.xml:19
 msgid ""
 "If the computer does not automatically boot from the USB or DVD you may need "
 "to reconfigure your BIOS Boot Disk priority. Alternatively, you might try "
@@ -589,7 +593,7 @@ msgstr ""
 "qual o computador será inicializado."
 
 #. type: Content of: <section><section><tip><para>
-#: en/bootLive.xml:41
+#: en/bootLive.xml:24
 msgid ""
 "To access the BIOS or boot menu when the computer is starting, you can try "
 "pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or <keycap>Esc</"
@@ -605,7 +609,7 @@ msgstr ""
 "comuns) são apenas uma seleção de opções possíveis."
 
 #. type: Content of: <section><section><note><para>
-#: en/bootLive.xml:50
+#: en/bootLive.xml:32
 msgid ""
 "The actual screen that you will first see when booting from the Live media "
 "will depend on whether your computer motherboard is of the Legacy (BIOS) or "
@@ -615,37 +619,38 @@ msgstr ""
 "dependerá se a placa-mãe do computador é do tipo Legacy (BIOS) ou UEFI."
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:58
+#: en/bootLive.xml:39
 msgid "In BIOS/CSM/Legacy mode"
 msgstr "No modo BIOS/CSM/Legacy"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:62
+#: en/bootLive.xml:42
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"../live-bootCSM.png\" align=\"center\"/> "
+"</imageobject>"
 msgstr ""
-"<imageobject><imagedata align=\"center\" fileref=\"live-bootCSM.png\"/></"
+"<imageobject><imagedata fileref=\"dx2-summaryTop.png\" align=\"center\"/></"
 "imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:67
+#: en/bootLive.xml:46
 msgid "First screen while booting in BIOS mode"
 msgstr "Primeira tela durante a inicialização no modo BIOS"
 
 #. type: Content of: <section><section><section><itemizedlist><title>
-#: en/bootLive.xml:72 en/bootLive.xml:144 en/installer.xml:106
-#: en/installer.xml:154
+#: en/bootLive.xml:50 en/bootLive.xml:104 en/installer.xml:108
+#: en/installer.xml:156
 msgid "Menu"
 msgstr "Menu"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:75 en/bootLive.xml:147
+#: en/bootLive.xml:52 en/bootLive.xml:106
 msgid "<emphasis role=\"bold\">Boot Mageia</emphasis>"
 msgstr "<emphasis role=\"bold\">Inicializar Mageia</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:77
+#: en/bootLive.xml:53
 msgid ""
 "This option will boot the Mageia Live system from the connected DVD/USB "
 "media (expect a very slow system compared to an installed OS)."
@@ -654,13 +659,13 @@ msgstr ""
 "conectada (espere um sistema muito lento comparado a um SO instalado)."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:81
+#: en/bootLive.xml:56
 msgid "Once the boot is done, you can proceed to the installation."
 msgstr ""
 "Quando terminar a inicialização,  você poderá prosseguir com a instalação."
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:86 en/bootLive.xml:102
+#: en/bootLive.xml:60 en/bootLive.xml:72
 msgid ""
 "<emphasis role=\"bold\">+ use non-free video drivers (slower to boot)</"
 "emphasis>"
@@ -669,32 +674,32 @@ msgstr ""
 "\" (inicialização mais lenta)</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:89
+#: en/bootLive.xml:62
 msgid "Boot the Mageia Live system using non-free video drivers"
 msgstr "Inicializar o sistema Mageia Live usando drivers de vídeo non-free"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:96 en/bootLive.xml:155 en/installer.xml:109
+#: en/bootLive.xml:68 en/bootLive.xml:112 en/installer.xml:111
 msgid "<emphasis role=\"bold\">Install Mageia</emphasis>"
 msgstr "<emphasis role=\"bold\">Instalar Mageia</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:98 en/bootLive.xml:157
+#: en/bootLive.xml:69 en/bootLive.xml:113
 msgid "This option will install Mageia to a hard disk."
 msgstr "Esta opção irá instalar o Mageia no disco rígido."
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:105
+#: en/bootLive.xml:74
 msgid "Install Mageia using non-free video drivers"
 msgstr "Instalar Mageia usando drivers de vídeo non-free"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:111 en/installer.xml:125
+#: en/bootLive.xml:79 en/installer.xml:127
 msgid "<emphasis role=\"bold\">Memory Test</emphasis>"
 msgstr "<emphasis role=\"bold\">Teste de Memória</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:113 en/installer.xml:127
+#: en/bootLive.xml:80 en/installer.xml:129
 msgid ""
 "Test the installed RAM by performing multiple read and write operations. "
 "Reboot to end the test."
@@ -703,12 +708,12 @@ msgstr ""
 "gravação. Reinicie para parar o teste."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:118 en/bootLive.xml:161
+#: en/bootLive.xml:84 en/bootLive.xml:116
 msgid "<emphasis role=\"bold\"> F2 Language</emphasis>"
 msgstr "<emphasis role=\"bold\">F2 Idioma</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:120 en/bootLive.xml:163
+#: en/bootLive.xml:85 en/bootLive.xml:117
 msgid ""
 "Press <keycap>F2</keycap> to have the installer use a specific language "
 "during the installation. Use the arrow keys to select the language then "
@@ -719,26 +724,27 @@ msgstr ""
 "idioma então pressione <keycap>Enter</keycap>."
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:129
+#: en/bootLive.xml:93
 msgid "In UEFI mode"
 msgstr "No modo UEFI"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:133
+#: en/bootLive.xml:96
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject><imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/></imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:139
+#: en/bootLive.xml:100
 msgid "First screen while booting in UEFI mode"
 msgstr "Primeira tela durante inicialização no modo UEFI"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:149
+#: en/bootLive.xml:107
 msgid ""
 "This option will boot the Mageia Live system from the connected DVD/USB "
 "media (expect a very slow system compared to an installed OS).  Once the "
@@ -749,7 +755,7 @@ msgstr ""
 "inicialização é feita, você pode prosseguir para a instalação"
 
 #. type: Content of: <section><section><note><para>
-#: en/bootLive.xml:170
+#: en/bootLive.xml:123
 msgid ""
 "If you booted from a USB stick, you will see the above menu options "
 "duplicated, and in this case, you should choose from the menu pair that will "
@@ -1021,12 +1027,12 @@ msgstr ""
 "GMT."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:24
+#: en/configureX_card_list.xml:27
 msgid "Choose an X Server (Configure your Graphic Card)"
 msgstr "Escolha um Servidor X (Configure sua Placa de Vídeo)"
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_card_list.xml:29
+#: en/configureX_card_list.xml:32
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_card_list."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_card_list-im1\"/> </"
@@ -1037,7 +1043,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:35
+#: en/configureX_card_list.xml:38
 msgid ""
 "DrakX has a very comprehensive database of video cards and will usually "
 "correctly identify your video device."
@@ -1046,7 +1052,7 @@ msgstr ""
 "identifica corretamente o seu dispositivo."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:38
+#: en/configureX_card_list.xml:41
 msgid ""
 "If the installer has not correctly detected your graphic card and you know "
 "which one you have, you can select it from the tree by:"
@@ -1055,22 +1061,22 @@ msgstr ""
 "identificá-la, você pode selecioná-la a partir da árvore, escolhendo:"
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_card_list.xml:41 en/configureX_monitor.xml:74
+#: en/configureX_card_list.xml:44 en/configureX_monitor.xml:78
 msgid "Vendor"
 msgstr "Fabricante"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:45
+#: en/configureX_card_list.xml:48
 msgid "then the make of your card"
 msgstr "então a marca da sua placa"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:49
+#: en/configureX_card_list.xml:52
 msgid "and the model of card"
 msgstr "e o modelo da placa"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:53
+#: en/configureX_card_list.xml:56
 msgid ""
 "If you cannot find your card in the vendor lists (because it's not yet in "
 "the database or it's an older card) you may find a suitable driver in the "
@@ -1091,7 +1097,7 @@ msgstr ""
 "recursos básicos."
 
 #. type: Content of: <section><caution><para>
-#: en/configureX_card_list.xml:61
+#: en/configureX_card_list.xml:64
 msgid ""
 "Be aware that if you select an incompatible driver you may only have access "
 "to the <emphasis>Command Line Interface</emphasis>"
@@ -1100,7 +1106,7 @@ msgstr ""
 "acesso somente à <emphasis>Interface de Linha de Comando </emphasis>."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:65
+#: en/configureX_card_list.xml:68
 msgid ""
 "Some video card manufacturers provide proprietary drivers for Linux which "
 "may only be available in the <emphasis>Nonfree</emphasis> repository and in "
@@ -1117,17 +1123,13 @@ msgstr ""
 "fazer isso após a primeira reinicialização."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:11
-msgid "Graphic Card and Monitor Configuration"
+#: en/configureX_chooser.xml:23
+#, fuzzy
+msgid "Graphics Card and Monitor Configuration"
 msgstr "Configuração da placa de vídeo e monitor"
 
-#.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
-#. 2018/02/15 apb: Some text and typography.
-#. 2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.
-#. 2018/02/23 apb: Typo.
-#. 2019/01/06 apb: Slight reword, split 1st para in two.
 #. type: Content of: <section><mediaobject>
-#: en/configureX_chooser.xml:26
+#: en/configureX_chooser.xml:28
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_chooser."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_chooser-im1\"/> </"
@@ -1138,7 +1140,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:32
+#: en/configureX_chooser.xml:34
 msgid ""
 "No matter which graphical environment (also known as desktop environment) "
 "you chose for this install of Mageia, they are all based on a graphical user "
@@ -1155,7 +1157,7 @@ msgstr ""
 "seguintes configurações do X precisam estar corretas."
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:39
+#: en/configureX_chooser.xml:41
 msgid ""
 "Choose the appropriate settings manually if you think the details are "
 "incorrect, or if none are shown."
@@ -1164,12 +1166,13 @@ msgstr ""
 "estão incorretos ou se nenhum deles é exibido."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:44
-msgid "<emphasis role=\"bold\">Graphic Card</emphasis>"
+#: en/configureX_chooser.xml:46
+#, fuzzy
+msgid "<emphasis role=\"bold\">Graphics Card</emphasis>"
 msgstr "<emphasis role=\"bold\">Placa de vídeo</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:47
+#: en/configureX_chooser.xml:49
 msgid ""
 "If you need to, you can select a specific card from this expandable list. "
 "See <xref linkend=\"configureX_card_list\"/>."
@@ -1178,12 +1181,12 @@ msgstr ""
 "expansível. Veja <xref linkend=\"configureX_card_list\"/>."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:52
+#: en/configureX_chooser.xml:54
 msgid "<emphasis role=\"bold\">Monitor</emphasis>"
 msgstr "<emphasis role=\"bold\">Monitor</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:55
+#: en/configureX_chooser.xml:57
 msgid ""
 "You can choose Plug 'n Play, if applicable, or choose your monitor from the "
 "<emphasis>Vendor</emphasis> or <emphasis>Generic</emphasis> lists. Choose "
@@ -1198,23 +1201,23 @@ msgstr ""
 "<xref linkend=\"configureX_monitor\"/>."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:63
+#: en/configureX_chooser.xml:65
 msgid "<emphasis role=\"bold\">Resolution</emphasis>"
 msgstr "<emphasis role=\"bold\">Resolução</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:66
+#: en/configureX_chooser.xml:68
 msgid "The resolution and color depth of your monitor can be set here."
 msgstr ""
 "A resolução e profundidade de cor do seu monitor podem ser definidas aqui."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:71
+#: en/configureX_chooser.xml:73
 msgid "<emphasis role=\"bold\">Test</emphasis>"
 msgstr "<emphasis role=\"bold\">Testar</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:74
+#: en/configureX_chooser.xml:76
 msgid ""
 "The test button does not always appear during install. If the option is "
 "there, and you test your settings, you should be asked to confirm that your "
@@ -1234,17 +1237,17 @@ msgstr ""
 "que suas configuração estão em modo seguro."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:85
+#: en/configureX_chooser.xml:87
 msgid "<emphasis role=\"bold\">Options</emphasis>"
 msgstr "<emphasis role=\"bold\">Opções</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:88
+#: en/configureX_chooser.xml:90
 msgid "Here you can choose to enable or disable various options."
 msgstr "Aqui você consegue escolher habilitar ou desabilitar varias opções."
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_chooser.xml:93
+#: en/configureX_chooser.xml:95
 msgid ""
 "There is a risk of damaging a monitor if you choose refresh rates that are "
 "outside the frequency range of that monitor. This applies to older CRT "
@@ -1257,12 +1260,12 @@ msgstr ""
 "suportada e normalmente entram no modo de espera."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_monitor.xml:22
+#: en/configureX_monitor.xml:26
 msgid "Choosing your Monitor"
 msgstr "Escolhendo seu Monitor"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:25
+#: en/configureX_monitor.xml:29
 msgid ""
 "DrakX has a very comprehensive database of monitors and will usually "
 "correctly identify yours."
@@ -1271,7 +1274,7 @@ msgstr ""
 "identificará corretamente o seu."
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:30
+#: en/configureX_monitor.xml:34
 msgid ""
 "<emphasis role=\"bold\">Selecting a monitor with different characteristics "
 "could damage your monitor or video hardware. Please don't try something "
@@ -1284,7 +1287,7 @@ msgstr ""
 "consultar a documentação do seu monitor."
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:38
+#: en/configureX_monitor.xml:42
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
@@ -1295,12 +1298,12 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:46
+#: en/configureX_monitor.xml:50
 msgid "Custom"
 msgstr "Personalizar"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:49
+#: en/configureX_monitor.xml:53
 msgid ""
 "This option allows you to set two critical parameters: the vertical refresh "
 "rate and the horizontal sync rate. Vertical refresh determines how often the "
@@ -1313,7 +1316,7 @@ msgstr ""
 "horizontal é a taxa na qual as linhas de varredura são exibidas."
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:55
+#: en/configureX_monitor.xml:59
 msgid ""
 "It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor "
 "type with a sync range that is beyond the capabilities of your monitor: you "
@@ -1326,12 +1329,12 @@ msgstr ""
 "configuração conservadora e consulte a documentação de seu monitor."
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:64
+#: en/configureX_monitor.xml:68
 msgid "Plug'n Play"
 msgstr "Plug'n Play"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:67
+#: en/configureX_monitor.xml:71
 msgid ""
 "This is the default option and automatically tries to determine the monitor "
 "type from the monitor database."
@@ -1340,37 +1343,39 @@ msgstr ""
 "do banco de dados do monitor."
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:77
+#: en/configureX_monitor.xml:81
+#, fuzzy
 msgid ""
 "If the installer has not correctly detected your monitor and you know which "
-"one you have, you can select it from the tree by selecting:"
+"one you have, you can choose it from the options by selecting:"
 msgstr ""
 "Se o instalador não detectou corretamente o seu monitor e você sabe "
 "identificá-lo, você pode selecioná-lo a partir da árvore, escolhendo:"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:86
+#: en/configureX_monitor.xml:90
 msgid "Manufacturer"
 msgstr "Fabricante"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:90
+#: en/configureX_monitor.xml:94
 msgid "Monitor model"
 msgstr "Modelo do monitor"
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:96
+#: en/configureX_monitor.xml:100
 msgid "Generic"
 msgstr "Genérico"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:99
+#: en/configureX_monitor.xml:103
+#, fuzzy
 msgid ""
-"Selecting this group will list nearly 30 display configurations such as "
-"1024x768 @ 60Hz and includes flat-panel displays as used in laptops. This is "
-"often a good monitor selection group if you need to use the VESA card driver "
-"when your video hardware cannot be determined automatically.  Once again it "
-"may be wise to be conservative in your selections."
+"Selecting this group will list approximately 30 display configurations such "
+"as 1024x768 @ 60Hz and includes flat-panel displays as used in laptops.  "
+"This is often a good monitor selection group if you need to use the VESA "
+"card driver when your video hardware cannot be determined automatically. "
+"Once again, it may be wise to be conservative in your selections."
 msgstr ""
 " A seleção deste grupo listará cerca de 30 configurações de exibição, como "
 "1024x768 @ 60Hz, e incluirá monitores de tela plana usados ​​em laptops. Isso "
@@ -1379,12 +1384,12 @@ msgstr ""
 "automaticamente. Mais uma vez, pode ser necessário atenção nas suas escolhas."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:22
+#: en/diskdrake.xml:24
 msgid "Custom Disk Partitioning with DiskDrake"
 msgstr "Particionamento de disco personalizado com DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:27
+#: en/diskdrake.xml:29
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-diskdrake.png\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1395,7 +1400,7 @@ msgstr ""
 "\"><imagedata align=\"center\" fileref=\"live-diskdrake.png\"/></imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:38
+#: en/diskdrake.xml:40
 msgid ""
 "Modify the layout of your disk(s) here. You can remove or create partitions, "
 "change the filesystem or size of a partition and even view their details "
@@ -1406,11 +1411,12 @@ msgstr ""
 "mesmo visualizar os detalhes antes de começar."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:47
+#, fuzzy
 msgid ""
 "There is a tab at the top for every detected hard disk (or other storage "
-"device, like a USB key). In the screenshot above there are two available "
-"devices: <filename>sda </filename>and <filename>sdb</filename>."
+"device, like a USB key), for example: <filename>sda</filename>, "
+"<filename>sdb</filename>, <filename>sdc</filename> etc."
 msgstr ""
 "Há uma guia na parte superior para cada disco rígido detectado (ou outro "
 "dispositivo de armazenamento, como uma disco USB). Na imagem acima, há dois "
@@ -1418,7 +1424,7 @@ msgstr ""
 "filename>."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:52
+#: en/diskdrake.xml:54
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it. "
@@ -1432,7 +1438,7 @@ msgstr ""
 "tipo de partição."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:60
+#: en/diskdrake.xml:62
 msgid ""
 "Continue until you have adjusted everything to your satisfaction, then click "
 "<emphasis>Done</emphasis> when you're ready."
@@ -1441,7 +1447,7 @@ msgstr ""
 "clique em <emphasis> Pronto </emphasis> quando estiver pronto."
 
 #. type: Content of: <section><warning><orderedlist><listitem><para>
-#: en/diskdrake.xml:69
+#: en/diskdrake.xml:71
 msgid ""
 "Take care with the <emphasis>Clear all</emphasis> option, use it only if you "
 "are sure you want to wipe all partitions on the selected storage device."
@@ -1451,7 +1457,7 @@ msgstr ""
 "armazenamento selecionado."
 
 #. type: Content of: <section><warning><orderedlist><listitem><para>
-#: en/diskdrake.xml:75
+#: en/diskdrake.xml:77
 msgid ""
 "If you wish to use encryption on your <filename>/</filename> partition you "
 "must ensure that you have a separate <filename>/boot</filename> partition. "
@@ -1464,7 +1470,7 @@ msgstr ""
 "definida, caso contrário, o sistema não será inicializado."
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/diskdrake.xml:87
+#: en/diskdrake.xml:89
 msgid ""
 "If you are installing Mageia on a UEFI system, check that an ESP (EFI System "
 "Partition) is present and correctly mounted on <filename>/boot/EFI</"
@@ -1475,7 +1481,7 @@ msgstr ""
 "boot/EFI</filename>.  Veja a Figura 1 abaixo."
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/diskdrake.xml:93
+#: en/diskdrake.xml:95
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
 "partition is present and of the correct type. See Figure 2 below."
@@ -1485,12 +1491,12 @@ msgstr ""
 "abaixo."
 
 #. type: Content of: <section><figure><title>
-#: en/diskdrake.xml:101
+#: en/diskdrake.xml:103
 msgid "EFI System Partition"
 msgstr "Partição de Sistema EFI"
 
 #. type: Content of: <section><figure><mediaobject>
-#: en/diskdrake.xml:104
+#: en/diskdrake.xml:106
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-diskdrake2.png\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1502,17 +1508,17 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><figure>
-#: en/diskdrake.xml:103 en/diskdrake.xml:117
+#: en/diskdrake.xml:105 en/diskdrake.xml:119
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><figure><title>
-#: en/diskdrake.xml:115
+#: en/diskdrake.xml:117
 msgid "BIOS boot partition"
 msgstr "Partição de inicialização do BIOS (binary IO ystem)"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:118 en/doPartitionDisks.xml:201
+#: en/diskdrake.xml:120 en/doPartitionDisks.xml:206
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1535,12 +1541,12 @@ msgid "Partitioning"
 msgstr "Particionamento"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:31
 msgid "Suggested Partitioning"
 msgstr "Particionamento sugerido"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:34
 msgid ""
 "In this screen you can see the content of your hard drive(s) along with the "
 "DrakX partitioning proposals for where to install Mageia."
@@ -1549,7 +1555,7 @@ msgstr ""
 "propostas de particionamento do DrakX para onde instalar o Mageia."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:34
+#: en/doPartitionDisks.xml:38
 msgid ""
 "The actual options available from those shown below will vary according to "
 "the layout and content of your particular hard drive(s)."
@@ -1558,7 +1564,7 @@ msgstr ""
 "layout e o conteúdo de seu disco rígido(s) específico."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:39
+#: en/doPartitionDisks.xml:43
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1571,17 +1577,17 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><itemizedlist><title>
-#: en/doPartitionDisks.xml:49
+#: en/doPartitionDisks.xml:53
 msgid "Main Options"
 msgstr "Opções Principais"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:56
 msgid "<emphasis role=\"bold\">Use Existing Partitions</emphasis>"
 msgstr "<emphasis role=\"bold\">Usar Partições Existentes </emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:59
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1590,12 +1596,12 @@ msgstr ""
 "o Linux foram encontrados e podem ser utilizadas para a instalação."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:61
+#: en/doPartitionDisks.xml:65
 msgid "<emphasis role=\"bold\">Use Free Space</emphasis>"
 msgstr "<emphasis role=\"bold\">Usar Espaço Livre </emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:68
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1604,7 +1610,7 @@ msgstr ""
 "usá-lo para a sua nova instalação da Mageia."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:70
+#: en/doPartitionDisks.xml:74
 msgid ""
 "<emphasis role=\"bold\">Use Free Space on a Windows Partition</emphasis>"
 msgstr ""
@@ -1612,12 +1618,12 @@ msgstr ""
 "emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:73
+#: en/doPartitionDisks.xml:77
+#, fuzzy
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it. 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 important files!"
+"installation but see the warning below."
 msgstr ""
 "Se você tiver espaço não utilizado em uma partição existente do Windows, o "
 "instalador poderá se oferecer para usá-lo. Esta pode ser uma maneira útil de "
@@ -1625,32 +1631,70 @@ msgstr ""
 "arriscada, portanto, certifique-se de ter feito backup de todos os arquivos "
 "importantes!"
 
+#. type: Content of: <section><itemizedlist><listitem><para><mediaobject>
+#: en/doPartitionDisks.xml:87
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"><imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks2.png\"/></imageobject><imageobject condition=\"live"
+"\"><imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/></"
+"imageobject>"
+
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:79
+#: en/doPartitionDisks.xml:82
+#, fuzzy
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
 "light blue and the proposed Mageia partition in dark blue with their "
 "intended sizes just underneath. You have the option to modify these sizes by "
 "clicking and dragging the gap between both partitions.  See the following "
-"screenshot:"
+"screenshot:<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr ""
 "Com essa opção, o instalador exibe a partição restante do Windows em azul "
 "claro e a partição Mageia proposta em azul escuro com os tamanhos "
 "pretendidos. Você tem a opção de modificar esses tamanhos clicando e "
 "arrastando a lacuna entre as duas partições. Veja a seguinte imagem:"
 
+#. type: Content of: <section><itemizedlist><listitem><warning><para>
+#: en/doPartitionDisks.xml:97
+msgid ""
+"This involves shrinking the size of the Windows partition, and therefore is "
+"a risky operation, so you should make sure you have backed up all important "
+"files before proceeding."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><important><para>
+#: en/doPartitionDisks.xml:103
+#, fuzzy
+msgid ""
+"The partition must be \"clean\", meaning that Windows must have closed down "
+"correctly the last time it was used. It must also have been defragmented, "
+"although this is not a guarantee that all files in the partition have been "
+"moved out of the area that is about to be used for Mageia."
+msgstr ""
+"Note que isto envolve a redução do tamanho da partição do Windows. A "
+"partição deve ser \"limpa\", o que significa que o Windows deve ter fechado "
+"corretamente na última vez que foi usado. Deve também ter sido "
+"desfragmentado, embora isto não seja uma garantia de que todos os arquivos "
+"da partição foram movidos para fora da área que está prestes a ser usada. É "
+"altamente recomendável fazer backup de seus arquivos pessoais."
+
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:87
+#: en/doPartitionDisks.xml:112
 msgid "<emphasis role=\"bold\">Erase and use Entire Disk</emphasis>"
 msgstr "<emphasis role=\"bold\">Apagar e usar o disco inteiro</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:90
+#: en/doPartitionDisks.xml:115
 msgid "This option will allocate the entire drive for Mageia"
 msgstr "Está opção usará todo do espaço para a instalação Mageia"
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:119
 msgid ""
 "This will erase ALL data on the selected hard drive. Take care! If you "
 "intend to use part of the disk for something else, or you already have data "
@@ -1660,31 +1704,14 @@ msgstr ""
 "usar parte do disco para outra coisa, ou se já tem dados na unidade que não "
 "estão salvos em backup, não use essa opção."
 
-#. type: Content of: <section><itemizedlist><listitem><important><para>
-#: en/doPartitionDisks.xml:101
-msgid ""
-"Note that this involves shrinking the size of the Windows partition. The "
-"partition must be \"clean\", meaning that Windows must have closed down "
-"correctly the last time it was used. It must also have been defragmented, "
-"although this is not a guarantee that all files in the partition have been "
-"moved out of the area that is about to be used. It is highly recommended to "
-"back up your personal files."
-msgstr ""
-"Note que isto envolve a redução do tamanho da partição do Windows. A "
-"partição deve ser \"limpa\", o que significa que o Windows deve ter fechado "
-"corretamente na última vez que foi usado. Deve também ter sido "
-"desfragmentado, embora isto não seja uma garantia de que todos os arquivos "
-"da partição foram movidos para fora da área que está prestes a ser usada. É "
-"altamente recomendável fazer backup de seus arquivos pessoais."
-
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:112
+#: en/doPartitionDisks.xml:127
 msgid "<emphasis role=\"bold\">Custom Disk Partitioning</emphasis>"
 msgstr ""
 "<emphasis role=\"bold\">Particionamento de disco personalizado </emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:115
+#: en/doPartitionDisks.xml:130
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1692,21 +1719,8 @@ msgstr ""
 "Isso lhe dará total controle sobre o local da instalação em seu(s) disco(s) "
 "rígido(s)."
 
-#. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:122
-msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject condition=\"classical\"><imagedata align=\"center\" fileref="
-"\"dx2-doPartitionDisks2.png\"/></imageobject><imageobject condition=\"live"
-"\"><imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/></"
-"imageobject>"
-
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:131
+#: en/doPartitionDisks.xml:136
 msgid ""
 "If you are not using the <emphasis>Custom disk partitioning</emphasis> "
 "option, then the installer will allocate the available space according to "
@@ -1717,7 +1731,7 @@ msgstr ""
 "acordo com as seguintes regras:"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:137
+#: en/doPartitionDisks.xml:142
 msgid ""
 "If the total available space is less than 50 GB, then only one partition is "
 "created. This will be the <filename>/</filename> (root)  partition."
@@ -1726,7 +1740,7 @@ msgstr ""
 "criada. Esta será a partição <filename> / </filename>(root)."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:143
+#: en/doPartitionDisks.xml:148
 msgid ""
 "If the total available space is greater than 50 GB, then three partitions "
 "are created"
@@ -1735,7 +1749,7 @@ msgstr ""
 "criadas"
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:148
+#: en/doPartitionDisks.xml:153
 msgid ""
 "6/19 of the total available place is allocated to <filename>/</filename> "
 "with a maximum of 50 GB"
@@ -1744,20 +1758,20 @@ msgstr ""
 "filename> raiz com um máximo de 50 GB"
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:153
+#: en/doPartitionDisks.xml:158
 msgid "1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB"
 msgstr ""
 "1/19 é alocado para partição <filename>swap </filename> com um máximo de 4 GB"
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:158
+#: en/doPartitionDisks.xml:163
 msgid "the rest (at least 12/19) is allocated to <filename>/home</filename>"
 msgstr ""
 "o restante (pelo menos 12/19) é atribuído a partição <filename>/home </"
 "filename>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:165
+#: en/doPartitionDisks.xml:170
 msgid ""
 "This means that from 160 GB or greater available space, the installer will "
 "create three partitions:"
@@ -1766,22 +1780,22 @@ msgstr ""
 "instalador criará três partições:"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:170
+#: en/doPartitionDisks.xml:175
 msgid "50 GB for <filename>/</filename>"
 msgstr "50 GB para <filename>/</filename> "
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:174
+#: en/doPartitionDisks.xml:179
 msgid "4 GB for <filename>swap</filename>"
 msgstr "4 GB para <filename>swap </filename>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:178
+#: en/doPartitionDisks.xml:183
 msgid "and the remainder for <filename>/home</filename>"
 msgstr "e o restante para <filename>/home</filename>"
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:183
+#: en/doPartitionDisks.xml:188
 msgid ""
 "If you are using a UEFI system, the ESP (EFI System Partition) will be "
 "automatically detected - or created if it does not exist yet - and mounted "
@@ -1796,7 +1810,7 @@ msgstr ""
 "corretamente."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:189
+#: en/doPartitionDisks.xml:194
 msgid ""
 "If you are using a Legacy (also known as BIOS) system with a GPT partitioned "
 "disk, you need to create a BIOS boot partition if it doesn't already exist. "
@@ -1814,22 +1828,27 @@ msgstr ""
 "inicialização da BIOS</quote> para o tipo de sistema de arquivos."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:196
+#: en/doPartitionDisks.xml:201
 msgid "See <xref linkend=\"diskdrake\"/> for information on how to proceed."
 msgstr ""
 "Veja <xref linkend=\"diskdrake\"/>para obter informações sobre como proceder."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:211
+#: en/doPartitionDisks.xml:216
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4.png"
-"\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks4.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks4.png\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject><imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4.png"
-"\"/></imageobject>"
+"<imageobject condition=\"classical\"><imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks.png\"/></imageobject><imageobject condition=\"live"
+"\"><imagedata align=\"center\" fileref=\"live-doPartitionDisks.png\"/></"
+"imageobject>"
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:217
+#: en/doPartitionDisks.xml:226
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
 "previous standard of 512. Due to lack of available hardware, the "
@@ -1842,7 +1861,7 @@ msgstr ""
 "testada com essa unidade."
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:222
+#: en/doPartitionDisks.xml:231
 msgid ""
 "Some SSD devices now use an erase block size over 1 MB. If you have such a "
 "device we suggest that you partition the drive in advance, using an "
@@ -1855,17 +1874,17 @@ msgstr ""
 "alternativa, como gparted, e use as seguintes configurações:"
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:229
+#: en/doPartitionDisks.xml:238
 msgid "<emphasis>Align to</emphasis> = MiB"
 msgstr "<emphasis>Alinhar para</emphasis> = MiB"
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:233
+#: en/doPartitionDisks.xml:242
 msgid "<emphasis>Free space preceding (MiB)</emphasis> = 2"
 msgstr "<emphasis>Espaço livre anterior (MiB) </emphasis> = 2"
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:237
+#: en/doPartitionDisks.xml:246
 msgid ""
 "Also make sure all partitions are created using an even number of megabytes."
 msgstr ""
@@ -2050,12 +2069,12 @@ msgstr ""
 "link> se tiver alguma dúvida ou quiser contribuir para a Mageia"
 
 #. type: Content of: <section><info><title>
-#: en/firewall.xml:7
+#: en/firewall.xml:16
 msgid "Firewall"
 msgstr "Firewall"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:10
+#: en/firewall.xml:19
 msgid ""
 "This section allows you to configure some simple firewall rules: they "
 "determine which type of message from the Internet will be accepted by the "
@@ -2067,8 +2086,18 @@ msgstr ""
 "destino. Isso, por sua vez, permite que os serviços correspondentes, no "
 "sistema, sejam acessíveis pela internet."
 
+#. type: Content of: <section><mediaobject>
+#: en/firewall.xml:26
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-firewall.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject><imagedata align=\"center\" fileref=\"dx-welcome.png\"/></"
+"imageobject>"
+
 #. type: Content of: <section><para>
-#: en/firewall.xml:16
+#: en/firewall.xml:31
 msgid ""
 "In the default setting (no button is checked), no service of the system is "
 "accessible from the network. The <emphasis>Everything (no firewall)</"
@@ -2088,7 +2117,7 @@ msgstr ""
 "todo o conjunto de regras do firewall para fins de teste e depuração."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:25
+#: en/firewall.xml:40
 msgid ""
 "All other options are more or less self-explanatory. As an example, you will "
 "enable the CUPS server if you want printers on your machine to be accessible "
@@ -2099,12 +2128,12 @@ msgstr ""
 "sejam acessíveis a partir da rede."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:29
+#: en/firewall.xml:44
 msgid "<emphasis role=\"bold\">Advanced</emphasis>"
 msgstr "<emphasis role=\"bold\">Avançado</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:31
+#: en/firewall.xml:46
 msgid ""
 "The <emphasis>Advanced</emphasis> option opens a window where you can enable "
 "a series of services by typing a list of <quote>couples</quote> (blank "
@@ -2115,32 +2144,36 @@ msgstr ""
 "(separados em branco)"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:35
-msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
+#: en/firewall.xml:50
+#, fuzzy
+msgid "<emphasis>&lt;port-number&gt;/&lt;protocol&gt;</emphasis>"
 msgstr "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:38
+#: en/firewall.xml:53
+#, fuzzy
 msgid ""
-"- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
-"the service you want to enable (e.g. 873 for the RSYNC service) as defined "
-"in <emphasis>RFC-433</emphasis>;"
+"- <emphasis>&lt;port-number&gt;</emphasis> is the value of the port assigned "
+"to the service you want to enable (e.g. 873 for the RSYNC service) as "
+"defined in <emphasis>RFC-433</emphasis>;"
 msgstr ""
 "- <emphasis>&lt;port-number></emphasis> é o valor da porta atribuída ao "
 "serviço que você deseja habilitar (por exemplo, 873 para o serviço RSYNC) "
 "conforme definido no <emphasis>RFC-433</emphasis>;"
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:42
+#: en/firewall.xml:57
+#, fuzzy
 msgid ""
-"- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
-"<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
+"- <emphasis>&lt;protocol&gt;</emphasis> is one of <emphasis>TCP</emphasis> "
+"or <emphasis>UDP</emphasis> - the internet protocol that is used by the "
+"service."
 msgstr ""
 "- <emphasis>&lt;protocol></emphasis> é um do <emphasis>TCP</emphasis> ou "
 "<emphasis>UDP</emphasis> - o protocolo de internet que é usado pelo serviço."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:47
+#: en/firewall.xml:62
 msgid ""
 "For instance, the entry for enabling access to the RSYNC service therefore "
 "is <emphasis>873/tcp</emphasis>."
@@ -2149,7 +2182,7 @@ msgstr ""
 "de <emphasis>873/tcp</emphasis>."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:50
+#: en/firewall.xml:65
 msgid ""
 "In case a service is implemented to use both protocols, you specify 2 "
 "couples for the same port."
@@ -2236,12 +2269,12 @@ msgid "Graphical Configuration"
 msgstr "Configuração Gráfica"
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:32
+#: en/installer.xml:34
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, o Instalador da Mageia"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:35
+#: en/installer.xml:37
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -2252,12 +2285,12 @@ msgstr ""
 "possível."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:40
+#: en/installer.xml:42
 msgid "The installation steps"
 msgstr "As etapas de instalação"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:44
+#: en/installer.xml:46
 msgid ""
 "The install process is divided into a number of steps - the status of which "
 "is indicated in a panel to the left of the screen."
@@ -2266,7 +2299,7 @@ msgstr ""
 "em um painel à esquerda da tela."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:50
+#: en/installer.xml:52
 msgid ""
 "Each step has one or more screens, which may also have <emphasis>Advanced</"
 "emphasis> sections with extra, less commonly required options."
@@ -2276,7 +2309,7 @@ msgstr ""
 "necessárias."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:56
+#: en/installer.xml:58
 msgid ""
 "Most screens have <emphasis>Help</emphasis> buttons for further details "
 "about the particular step."
@@ -2285,7 +2318,7 @@ msgstr ""
 "detalhes sobre a etapa específica."
 
 #. type: Content of: <section><section><caution><para>
-#: en/installer.xml:62
+#: en/installer.xml:64
 msgid ""
 "If at some point during the install you decide to abort the installation, it "
 "is possible to reboot, but please think twice before you do this. Once a "
@@ -2300,7 +2333,7 @@ msgstr ""
 "a reinicialização poderá deixá-lo com um sistema inutilizável."
 
 #. type: Content of: <section><section><caution><para>
-#: en/installer.xml:68
+#: en/installer.xml:70
 msgid ""
 "If, in spite of this, you are very sure rebooting is what you want, go to a "
 "text terminal by pressing the keys <keycombo> <keycap>Ctrl</keycap> "
@@ -2315,12 +2348,12 @@ msgstr ""
 "keycap><keycap> Delete</keycap></keycombo> juntos para reiniciar."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:86
+#: en/installer.xml:88
 msgid "Installation Welcome Screen"
 msgstr "Primeira Tela da Instalação"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:88
+#: en/installer.xml:90
 msgid ""
 "The particular screen that you will first see when booting from the "
 "Installation media will depend on whether your computer motherboard is of "
@@ -2331,7 +2364,7 @@ msgstr ""
 "UEFI."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:92
+#: en/installer.xml:94
 msgid ""
 "The welcome menu screen has various options, however the default option will "
 "start the installer, and is normally all that you will need."
@@ -2340,12 +2373,12 @@ msgstr ""
 "o instalador e normalmente é tudo o que você precisa."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:97
+#: en/installer.xml:99
 msgid "Legacy (BIOS) Systems"
 msgstr "Legacy (BIOS) Sistemas"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:100
+#: en/installer.xml:102
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome.png\"/> </"
 "imageobject>"
@@ -2354,7 +2387,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:111
+#: en/installer.xml:113
 msgid ""
 "Install Mageia to a hard disk. This is the default option, and will "
 "automatically start after a short while unless another option is selected."
@@ -2364,12 +2397,12 @@ msgstr ""
 "selecionada."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:117
+#: en/installer.xml:119
 msgid "<emphasis role=\"bold\">Rescue System</emphasis>"
 msgstr "<emphasis role=\"bold\">Sistema de resgate</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:119
+#: en/installer.xml:121
 msgid ""
 "This option allows you to either re-install the bootloader for an existing "
 "Mageia installation or you can use it to restore a Windows bootloader."
@@ -2379,22 +2412,22 @@ msgstr ""
 "inicialização do Windows."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:132
+#: en/installer.xml:134
 msgid "<emphasis role=\"bold\">F2: Language</emphasis>"
 msgstr "<emphasis role=\"bold\">F2: Idioma</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:134
+#: en/installer.xml:136
 msgid "Press F2 for alternative languages."
 msgstr "Pressione F2 para escolher seu idioma."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:140
+#: en/installer.xml:142
 msgid "UEFI Systems"
 msgstr "UEFI Sistema"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:142
+#: en/installer.xml:144
 msgid ""
 "From this screen, you can access options by pressing <keycap>e</keycap> to "
 "enter the edit mode. To come back to this screen, press <keycap>Esc</keycap> "
@@ -2406,7 +2439,7 @@ msgstr ""
 "para salvar e sair."
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:148
+#: en/installer.xml:150
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome2.png\"/> </"
 "imageobject>"
@@ -2415,13 +2448,13 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:157
+#: en/installer.xml:159
 msgid "<emphasis role=\"bold\">Install:</emphasis> Start the Install process"
 msgstr ""
 "<emphasis role=\"bold\">Instalar:</emphasis> iniciar o processo de instalação"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:162
+#: en/installer.xml:164
 msgid ""
 "<emphasis role=\"bold\">Rescue:</emphasis> This option allows you to either "
 "re-install the bootloader for an existing Mageia installation or you can use "
@@ -2432,7 +2465,7 @@ msgstr ""
 "usá-lo para restaurar um carregador de inicialização do Windows."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:169
+#: en/installer.xml:171
 msgid ""
 "<emphasis role=\"bold\">F2: Language:</emphasis> Press <keycap>F2</keycap> "
 "for alternative languages."
@@ -2441,7 +2474,7 @@ msgstr ""
 "keycap>par outros idiomas."
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:174
+#: en/installer.xml:176
 msgid ""
 "If you booted from a USB stick, you will see the above options duplicated, "
 "and in this case, you should use the set that will be suffixed with \"USB\"."
@@ -2451,17 +2484,17 @@ msgstr ""
 "\"USB\"."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:181
+#: en/installer.xml:183
 msgid "Installation Problems and Possible Solutions"
 msgstr "Problemas de Instalação e Possíveis Soluções"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:184
+#: en/installer.xml:186
 msgid "No Graphical Interface"
 msgstr "Sem Interface Gráfica"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:188
+#: en/installer.xml:190
 msgid ""
 "After the initial screen you did not progress to the <emphasis>Language "
 "Selection</emphasis> screen. This can happen with some graphic cards and "
@@ -2474,7 +2507,7 @@ msgstr ""
 "command>no prompt."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:195
+#: en/installer.xml:197
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
 "In this case it is worth trying a text-mode installation. To use this press "
@@ -2492,12 +2525,12 @@ msgstr ""
 "no modo de texto."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:208
+#: en/installer.xml:210
 msgid "The Install Freezes"
 msgstr "A Instalação Congela"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:210
+#: en/installer.xml:212
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic hardware "
@@ -2512,12 +2545,12 @@ msgstr ""
 "combinada com outros parâmetros, conforme necessário."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:218
+#: en/installer.xml:220
 msgid "RAM problem"
 msgstr "Problema RAM"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:220
+#: en/installer.xml:222
 msgid ""
 "This will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
@@ -2532,12 +2565,12 @@ msgstr ""
 "RAM. por exemplo. <literal>mem= 256M</literal> especificaria 256MB de RAM."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:228
+#: en/installer.xml:230
 msgid "Dynamic partitions"
 msgstr "Partições Dinâmicas"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:230
+#: en/installer.xml:232
 msgid ""
 "If you converted your hard disk from <literal>Basic</literal> format to "
 "<literal>Dynamic</literal> format in Microsoft Windows, then it is not "
@@ -4537,22 +4570,29 @@ msgstr ""
 "Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link>"
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:27
+#: en/setupBootloader.xml:32
 msgid "Bootloader"
 msgstr "Bootloader"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:31
+#: en/setupBootloader.xml:36
+#, fuzzy
+msgid "Available Bootloaders"
+msgstr "Bootloader"
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:39
 msgid "Grub2"
 msgstr "Grub2"
 
-#. type: Content of: <section><section><itemizedlist><title>
-#: en/setupBootloader.xml:34
-msgid "Grub2 on Legacy MBR/GPT systems"
-msgstr "Grub2 em sistemas \"Legacy\" MBR/GPT"
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:42
+#, fuzzy
+msgid "<emphasis role=\"bold\">Grub2 on Legacy MBR/GPT systems</emphasis>"
+msgstr "<emphasis role=\"bold\">Sistema de resgate</emphasis>"
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:37
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:46
 msgid ""
 "GRUB2 (with or without graphical menu) will be used exclusively as the "
 "bootloader for a Legacy/MBR or Legacy/GPT system."
@@ -4560,8 +4600,8 @@ msgstr ""
 "O GRUB2 (com ou sem menu gráfico) será usado exclusivamente como o "
 "\"bootloader\" para um sistema \"Legacy\"/MBR ou \"Legacy\"/GPT."
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:42
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:52
 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."
@@ -4570,20 +4610,22 @@ msgstr ""
 "do seu primeiro disco rígido ou na partição \"boot\" de inicialização do "
 "BIOS."
 
-#. type: Content of: <section><section><itemizedlist><title>
-#: en/setupBootloader.xml:49
-msgid "Grub2-efi on UEFI systems"
-msgstr "Grub2-efi nos sistemas UEFI"
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:59
+#, fuzzy
+msgid "<emphasis role=\"bold\">Grub2-efi on UEFI systems</emphasis>"
+msgstr "<emphasis role=\"bold\">Sistema de resgate</emphasis>"
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:52
-msgid "GRUB2-efi will be used exclusively as the bootloader for a UEFI system."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:63
+#, fuzzy
+msgid "GRUB2-efi or rEFInd may be used as the bootloader for a UEFI system."
 msgstr ""
 "O GRUB2-efi será usado, exclusivamente, como o \"bootloader\" para um "
 "sistema UEFI."
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:57
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:68
 msgid ""
 "By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI "
 "System Partition)."
@@ -4591,12 +4633,13 @@ msgstr ""
 "Por padrão, um novo bootloader (Grub2-efi) será gravado no ESP (EFI System "
 "Partition)."
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:60
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:71
+#, fuzzy
 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 "
-"created by Windows and add grub2-efi to it. If no ESP exists, then one will "
+"created by Windows and add grub2-efi to it.  If no ESP exists, then one will "
 "be created. Although it is possible to have several ESPs, only one is "
 "required, whatever the number of operating systems you have."
 msgstr ""
@@ -4607,18 +4650,46 @@ msgstr ""
 "necessária, para qualquer que seja o número de sistemas operacionais que "
 "você possui."
 
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:82
+msgid "rEFInd"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:85
+#, fuzzy
+msgid "<emphasis role=\"bold\">rEFInd on UEFI systems</emphasis>"
+msgstr "<emphasis role=\"bold\">Ícone</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:88
+msgid ""
+"rEFInd has a nice graphical set of options, and can auto-detect installed "
+"EFI bootloaders. See: http://www.rodsbooks.com/refind/"
+msgstr ""
+
+#. type: Content of: <section><section><section><note><para>
+#: en/setupBootloader.xml:95
+msgid ""
+"Please note that in order to be able to use the <literal>rEFInd</literal> "
+"option, an installed EFI System Partition must match your system "
+"architecture: if you have a 32bit EFI System Partition installed on a 64bit "
+"machine for instance, then the rEFInd option will not be displayed/available "
+"to you."
+msgstr ""
+
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:72
+#: en/setupBootloader.xml:106
 msgid "Bootloader Setup"
 msgstr "Configuração \"Bootloader\""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:76
+#: en/setupBootloader.xml:110
 msgid "Bootloader main options"
 msgstr "Principais Opções do Gerenciador de Inicialização"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:79
+#: en/setupBootloader.xml:113
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader.png\"/> </imageobject> <imageobject condition=\"live"
@@ -4631,32 +4702,53 @@ msgstr ""
 "im1\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:91
+#: en/setupBootloader.xml:125
 msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
 msgstr "<emphasis role=\"bold\">Para usar Bootloader</emphasis>"
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:93
+#. type: Content of: <section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:129
 msgid ""
-"This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI "
-"systems will not see this option here."
+"<guimenuitem>GRUB2</guimenuitem> (with either a graphical or a text menu), "
+"can be chosen for both <literal>Legacy MBR/BIOS</literal> systems and "
+"<literal>UEFI</literal> systems."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:136
+msgid ""
+"<guimenuitem>rEFInd</guimenuitem> (with a graphical menu)  is an alternative "
+"option solely for use with <literal>UEFI</literal> systems."
 msgstr ""
-"Este recurso está disponível apenas para sistemas \"Legacy\" MBR/BIOS. Os "
-"usuários de sistemas UEFI não verão essa opção aqui."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:98
+#: en/setupBootloader.xml:144
 msgid "<emphasis role=\"bold\">Boot device</emphasis>"
 msgstr ""
 "<emphasis role=\"bold\">dispositivo  de inicialização de boot</emphasis>"
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:100
-msgid "Don't change this unless you really know what you are doing"
+#. type: Content of: <section><section><section><itemizedlist><listitem><warning><para>
+#: en/setupBootloader.xml:147
+#, fuzzy
+msgid "Don't change this unless you really know what you are doing."
 msgstr "Não mude isso, a menos que você realmente saiba o que está fazendo"
 
+#. type: Content of: <section><section><section><itemizedlist><listitem><note><para>
+#: en/setupBootloader.xml:152
+msgid ""
+"There is no option to write GRUB to the boot sector of a partition (e.g: "
+"<filename>sda1</filename>), as this method is considered unreliable."
+msgstr ""
+
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:105
+#: en/setupBootloader.xml:157
+msgid ""
+"When using UEFI mode, then the <guilabel>Boot device</guilabel> will be "
+"listed as <guimenuitem>EFI System Partition</guimenuitem>."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:163
 msgid ""
 "<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
 msgstr ""
@@ -4664,7 +4756,7 @@ msgstr ""
 "emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:108
+#: en/setupBootloader.xml:166
 msgid ""
 "This text box lets you set a delay, in seconds, before the default operating "
 "system is started up."
@@ -4673,12 +4765,12 @@ msgstr ""
 "sistema operacional padrão seja inicializado."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:113
+#: en/setupBootloader.xml:171
 msgid "<emphasis role=\"bold\">Security</emphasis>"
 msgstr "<emphasis role=\"bold\">Segurança</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:115
+#: en/setupBootloader.xml:173
 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 "
@@ -4694,17 +4786,17 @@ msgstr ""
 "escolhida daqui em diante."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:126
+#: en/setupBootloader.xml:184
 msgid "Choose a password for the bootloader (optional)"
 msgstr "Escolha uma senha para o \"bootloader\" (opcional)"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:130
+#: en/setupBootloader.xml:188
 msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
 msgstr "<emphasis role=\"bold\">Senha (novamente)</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:132
+#: en/setupBootloader.xml:190
 msgid ""
 "Retype the password and DrakX will check that it matches with the one set "
 "above"
@@ -4712,17 +4804,17 @@ msgstr ""
 "Repita a senha e o DrakX verificará se corresponde ao que foi definido acima"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:137 en/setupBootloader.xml:212
+#: en/setupBootloader.xml:195 en/setupBootloader.xml:308
 msgid "<emphasis>Advanced</emphasis>"
 msgstr "<emphasis>Avançado</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:141
+#: en/setupBootloader.xml:199
 msgid "<emphasis>Enable ACPI</emphasis>"
 msgstr "<emphasis>Ativar ACPI</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:143
+#: en/setupBootloader.xml:201
 msgid ""
 "ACPI (Advanced Configuration and Power Interface) is a standard for power "
 "management. It can save energy by stopping unused devices. Deselecting it "
@@ -4738,12 +4830,12 @@ msgstr ""
 "sistema)."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:152
+#: en/setupBootloader.xml:210
 msgid "<emphasis>Enable SMP</emphasis>"
 msgstr "Ativar SMP"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:154
+#: en/setupBootloader.xml:212
 msgid ""
 "This option enables/disables symmetric multiprocessing for multi-core "
 "processors"
@@ -4752,12 +4844,12 @@ msgstr ""
 "\"multi-core\""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:159
+#: en/setupBootloader.xml:217
 msgid "<emphasis>Enable APIC</emphasis>"
 msgstr "Ativar APIC"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:161
+#: en/setupBootloader.xml:219
 msgid ""
 "Enabling this gives the operating system access to the Advanced Programmable "
 "Interrupt Controller. APIC devices permit more complex priority models, and "
@@ -4768,12 +4860,12 @@ msgstr ""
 "mais complexos e gerenciamento avançado de IRQ (solicitação de interrupção)."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:168
+#: en/setupBootloader.xml:226
 msgid "<emphasis>Enable Local APIC</emphasis>"
 msgstr "<emphasis>Ativar APIC local</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:170
+#: en/setupBootloader.xml:228
 msgid ""
 "Here you can set Local APIC, which manages all external interrupts for a "
 "specific processor in an SMP system"
@@ -4782,12 +4874,70 @@ msgstr ""
 "externas para um processador específico em um sistema SMP"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:177
+#: en/setupBootloader.xml:235
 msgid "Bootloader Configuration"
 msgstr "Configuração do Gerenciador de Inicialização"
 
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:237
+msgid ""
+"If, in the previous section you selected <literal>rEFInd</literal> as the "
+"bootloader to use, you would then be presented with the options shown in the "
+"screenshot directly below. Otherwise, please instead move on to the "
+"subsequent screenshot for your options."
+msgstr ""
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:243
+#, fuzzy
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"rEFIndLoaderConfig.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-rEFIndLoaderConfig.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"><imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks.png\"/></imageobject><imageobject condition=\"live"
+"\"><imagedata align=\"center\" fileref=\"live-doPartitionDisks.png\"/></"
+"imageobject>"
+
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:253
+#, fuzzy
+msgid "Your rEFInd configuration options:"
+msgstr "Configuração de Som"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:256
+msgid ""
+"<guimenuitem>Install or update rEFInd in the EFI system partition.</"
+"guimenuitem>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:261
+msgid ""
+"<guimenuitem>Install in EFI/Boot partition (workaround for some BIOS's).</"
+"guimenuitem>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:264
+msgid ""
+"With some BIOS's, the newly written bootloaser for Mageia at end of the "
+"installation will not be recognized. In that case, you can use this option "
+"as a workaround for the issue."
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:270
+msgid ""
+"If you did not select rEFInd as the bootloader to use in the previous "
+"section, then your bootloader configurations are shown below:"
+msgstr ""
+
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:180
+#: en/setupBootloader.xml:275
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -4800,22 +4950,22 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:191
+#: en/setupBootloader.xml:286
 msgid "<emphasis role=\"bold\">Default</emphasis>"
 msgstr "<emphasis role=\"bold\">Padrão</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:193
+#: en/setupBootloader.xml:288
 msgid "The operating system to be started up by default."
 msgstr "O sistema operacional a ser iniciado por padrão."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:197
+#: en/setupBootloader.xml:292
 msgid "<emphasis role=\"bold\">Append</emphasis>"
 msgstr "<emphasis role=\"bold\">Acrescentar</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:199
+#: en/setupBootloader.xml:294
 msgid ""
 "This option lets you pass information to the kernel or tell the kernel to "
 "give you more information as it boots."
@@ -4824,16 +4974,17 @@ msgstr ""
 "\"kernel\" para lhe dar mais informações ao inicializar."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:204
+#: en/setupBootloader.xml:299
 msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
 msgstr "<emphasis role=\"bold\">Examinar sistema estrangeiro OS</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:206
+#: en/setupBootloader.xml:301
+#, fuzzy
 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, "
-"then untick the Probe Foreign OS option."
+"then untick the <guimenuitem>Probe Foreign OS</guimenuitem> option."
 msgstr ""
 "Se você já tem outros sistemas operacionais instalados, a Mageia tenta "
 "adicioná-los ao seu novo menu de inicialização de boot Mageia. Se você não "
@@ -4841,7 +4992,7 @@ msgstr ""
 "\" Probe Foreign OS."
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:215
+#: en/setupBootloader.xml:311
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader4.png\"/> </imageobject> <imageobject condition=\"live"
@@ -4854,12 +5005,12 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:226
+#: en/setupBootloader.xml:322
 msgid "<emphasis>Video mode</emphasis>"
 msgstr "<emphasis>Modo de vídeo</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:228
+#: en/setupBootloader.xml:324
 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 "
@@ -4870,17 +5021,18 @@ msgstr ""
 "outras opções de tamanho e profundidade de cor."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:234
+#: en/setupBootloader.xml:330
 msgid "<emphasis>Do not touch ESP or MBR</emphasis>"
 msgstr "<emphasis>Não toque em ESP ou MBR</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:236
+#: en/setupBootloader.xml:332
+#, fuzzy
 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 "
-"missing. Click<emphasis> Ok</emphasis> if you are sure you understand the "
-"implications, and wish to proceed."
+"missing. Click <guimenuitem>Ok </guimenuitem>only if you are sure you "
+"understand the implications, and wish to proceed."
 msgstr ""
 "Selecione essa opção se você não quiser a inicialização da Mageia, mas sim,  "
 "seu carregamento em cadeia a partir de outro sistema operacional. Você "
@@ -4888,8 +5040,17 @@ msgstr ""
 "<emphasis>Ok</emphasis> se tiver certeza de que compreende as implicações e "
 "deseja prosseguir."
 
+#. type: Content of: <section><section><section><itemizedlist><listitem><warning><para>
+#: en/setupBootloader.xml:338
+msgid ""
+"Chain-loading via legacy bootloaders (GRUB Legacy and LiLo)  is no longer "
+"supported by Mageia as it is likely to fail when attempting to boot this "
+"resulting installation of Mageia. If you use anything other than GRUB2 or "
+"rEFInd for this purpose, then you do so at your own risk!"
+msgstr ""
+
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:245
+#: en/setupBootloader.xml:348
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png"
 "\"/> </imageobject>"
@@ -4898,17 +5059,17 @@ msgstr ""
 "\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:253
+#: en/setupBootloader.xml:356
 msgid "Other Options"
 msgstr "Outras Opções"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:256
+#: en/setupBootloader.xml:359
 msgid "Using an existing bootloader"
 msgstr "Usando um Gerenciador de Inicialização existente"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:258
+#: en/setupBootloader.xml:361
 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 "
@@ -4924,12 +5085,12 @@ msgstr ""
 "inicialização. Consulte a documentação do sistema operacional relevante."
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:267
+#: en/setupBootloader.xml:370
 msgid "Installing Without a Bootloader"
 msgstr "Instalando sem um gerenciador de inicialização"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:269
+#: en/setupBootloader.xml:372
 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 "
@@ -5349,3 +5510,45 @@ msgstr ""
 "O próximo passo é a cópia de arquivos para o disco rígido. Este processo "
 "deve demorar um pouco para ser concluído. Quando estiver terminando, você "
 "verá brevemente uma tela em branco - isso é normal."
+
+#~ msgid ""
+#~ "Type in the user password. There is a shield at the end of the text box "
+#~ "that indicates the strength of the password. (See also <xref linkend="
+#~ "\"givePassword\"/>)"
+#~ msgstr ""
+#~ "Digite a senha do usuário. Há um escudo no final da caixa de texto que "
+#~ "indica a força da senha. (Veja também <xref linkend=\"givePassword\"/>)"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> "
+#~ "</imageobject>"
+#~ msgstr ""
+#~ "<imageobject><imagedata align=\"center\" fileref=\"live-bootCSM.png\"/></"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject><imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/></imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4."
+#~ "png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject><imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4."
+#~ "png\"/></imageobject>"
+
+#~ msgid "Grub2 on Legacy MBR/GPT systems"
+#~ msgstr "Grub2 em sistemas \"Legacy\" MBR/GPT"
+
+#~ msgid "Grub2-efi on UEFI systems"
+#~ msgstr "Grub2-efi nos sistemas UEFI"
+
+#~ msgid ""
+#~ "This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI "
+#~ "systems will not see this option here."
+#~ msgstr ""
+#~ "Este recurso está disponível apenas para sistemas \"Legacy\" MBR/BIOS. Os "
+#~ "usuários de sistemas UEFI não verão essa opção aqui."
diff --git a/docs/docs/stable/installer/ro.po b/docs/docs/stable/installer/ro.po
index f3498640..1a7f72cf 100644
--- a/docs/docs/stable/installer/ro.po
+++ b/docs/docs/stable/installer/ro.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2019-01-19 21:23+0200\n"
+"POT-Creation-Date: 2019-09-08 15:26+0300\n"
 "PO-Revision-Date: 2019-01-19 19:25+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Romanian (http://www.transifex.com/MageiaLinux/mageia/"
@@ -146,7 +146,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/addUser.xml:3
+#: en/addUser.xml:9
 msgid "User Management"
 msgstr ""
 
@@ -156,46 +156,57 @@ msgstr ""
 #. 2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
 #.   Also changed 'Advanced User Management' to 'User Management (advanced)'.
 #. 2018/02/24 apb: Changed list style.
+#. 2019/08/10 apb: Added missing 'condition' profile for live-user1.png.
+#. 2019/08/11 apb: [1] Reword 1.1 (including Note) [2] Reword 1.2 Password text.
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:12
+#: en/addUser.xml:28
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
-"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
-"\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata format="
-"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-setRootPassword.png\" format=\"PNG\" revision=\"1\" xml:id="
+"\"setRootPassword-im1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-user1.png\" format=\"PNG\"/> </imageobject>"
 msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
+"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:21
+#: en/addUser.xml:40
 msgid "Set Administrator (root)  Password:"
 msgstr "Definiți parola administratorului (root):"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:24
+#: en/addUser.xml:44
 msgid ""
 "It is advisable for all Mageia installations to set a <literal>superuser</"
 "literal> (Administrator) password, usually called the <emphasis>root </"
-"emphasis>password in Linux. As you type a password into the top box a shield "
-"will change from red-to-yellow-to-green depending on the strength of the "
-"password. A green shield shows you are using a strong password. You need to "
-"repeat the same password in the box underneath, to check that the first "
-"entry was not mistyped."
+"emphasis>password in Linux. You need to repeat the same password in the box "
+"underneath, to check that the first entry was not mistyped."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:32
+#: en/addUser.xml:51
+msgid ""
+"As you type a password into the top box a shield will change from red-to-"
+"yellow-to-green depending on the strength of the password. A green shield "
+"shows you are using a strong password."
+msgstr ""
+
+#. type: Content of: <section><section><note><para>
+#: en/addUser.xml:55
 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:39
+#: en/addUser.xml:63
 msgid "Enter a user"
 msgstr "Introduceți un utilizator"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:41
+#: en/addUser.xml:66
 msgid ""
 "Add a User here. A regular user has fewer privileges than the "
 "<literal>superuser</literal> (root), but enough to use the Internet, office "
@@ -204,39 +215,39 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:47
+#: en/addUser.xml:73
 msgid "<emphasis role=\"bold\">Icon</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:48
+#: en/addUser.xml:75
 msgid "Click on this button if you want to change the user's icon"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:52
+#: en/addUser.xml:80
 msgid "<emphasis role=\"bold\">Real Name</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:53
+#: en/addUser.xml:82
 msgid "Insert the user's real name into this text box"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:56
+#: en/addUser.xml:86
 msgid "<emphasis role=\"bold\">Login Name</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:57
+#: en/addUser.xml:88
 msgid ""
 "Enter the user login name or let DrakX use a version of the user's real "
 "name. <emphasis role=\"bold\">The login name is case-sensitive.</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><caution><simpara>
-#: en/addUser.xml:61
+#: en/addUser.xml:93
 msgid ""
 "The login entered here should be different to any login currently in use for "
 "your <filename>/home</filename> directory. Some user parameters will be "
@@ -245,34 +256,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:65 en/setupBootloader.xml:124
+#: en/addUser.xml:102 en/setupBootloader.xml:182
 msgid "<emphasis role=\"bold\">Password</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:66
-msgid ""
-"Type in the user password. There is a shield at the end of the text box that "
-"indicates the strength of the password. (See also <xref linkend="
-"\"givePassword\"/>)"
+#: en/addUser.xml:104
+msgid "Type in the user password (remembering the advice in the Note above)."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:68
+#: en/addUser.xml:107
 msgid ""
 "<emphasis role=\"bold\">Password (again):</emphasis> Retype the user "
 "password. DrakX will check that you have not mistyped the password."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:74
+#: en/addUser.xml:114
 msgid ""
 "Any users added while installing Mageia, will have a home directory that is "
 "both read and write protected (umask=0027)"
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:76
+#: en/addUser.xml:117
 msgid ""
 "You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
@@ -280,24 +288,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:79
+#: en/addUser.xml:121
 msgid "The access permissions can also be changed after the install."
 msgstr "Drepturile de acces pot fi modificate și după instalare."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:85
+#: en/addUser.xml:128
 msgid "User Management (advanced)"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:87
+#: en/addUser.xml:131
 msgid ""
 "The <emphasis>Advanced</emphasis> option allows you to edit further settings "
 "for the user you are adding."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:91
+#: en/addUser.xml:136
 msgid ""
 "<emphasis>Shell</emphasis>: This drop-down list allows you to change the "
 "shell available to any user you added in the previous screen. Options are "
@@ -305,7 +313,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:143
 msgid ""
 "<emphasis>User ID</emphasis>: Here you can set the user ID for any user you "
 "added in the previous screen. If you are unsure what the purpose of this is, "
@@ -313,7 +321,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:102
+#: en/addUser.xml:149
 msgid ""
 "<emphasis>Group ID</emphasis>: This lets you set the group ID.  Again, if "
 "unsure, leave it blank."
@@ -433,24 +441,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:23
+#: en/bootLive.xml:10
 msgid "Boot Mageia as Live system"
 msgstr "Demarează Mageia ca un sistem Live"
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:28
+#: en/bootLive.xml:14
 msgid "Booting the medium"
 msgstr "Se demarează de pe mediu"
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:31
+#: en/bootLive.xml:16
 msgid ""
 "You can boot directly from a Live DVD or USB. Usually, you just need to plug "
 "the USB device in or place the DVD in the drive and restart the computer."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:35
+#: en/bootLive.xml:19
 msgid ""
 "If the computer does not automatically boot from the USB or DVD you may need "
 "to reconfigure your BIOS Boot Disk priority. Alternatively, you might try "
@@ -459,7 +467,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><tip><para>
-#: en/bootLive.xml:41
+#: en/bootLive.xml:24
 msgid ""
 "To access the BIOS or boot menu when the computer is starting, you can try "
 "pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or <keycap>Esc</"
@@ -469,7 +477,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/bootLive.xml:50
+#: en/bootLive.xml:32
 msgid ""
 "The actual screen that you will first see when booting from the Live media "
 "will depend on whether your computer motherboard is of the Legacy (BIOS) or "
@@ -477,91 +485,93 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:58
+#: en/bootLive.xml:39
 msgid "In BIOS/CSM/Legacy mode"
 msgstr "În mod BIOS/CSM/Legacy"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:62
+#: en/bootLive.xml:42
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"../live-bootCSM.png\" align=\"center\"/> "
+"</imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:67
+#: en/bootLive.xml:46
 msgid "First screen while booting in BIOS mode"
 msgstr "Primul ecran la demararea în mod BIOS"
 
 #. type: Content of: <section><section><section><itemizedlist><title>
-#: en/bootLive.xml:72 en/bootLive.xml:144 en/installer.xml:106
-#: en/installer.xml:154
+#: en/bootLive.xml:50 en/bootLive.xml:104 en/installer.xml:108
+#: en/installer.xml:156
 msgid "Menu"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:75 en/bootLive.xml:147
+#: en/bootLive.xml:52 en/bootLive.xml:106
 msgid "<emphasis role=\"bold\">Boot Mageia</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:77
+#: en/bootLive.xml:53
 msgid ""
 "This option will boot the Mageia Live system from the connected DVD/USB "
 "media (expect a very slow system compared to an installed OS)."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:81
+#: en/bootLive.xml:56
 msgid "Once the boot is done, you can proceed to the installation."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:86 en/bootLive.xml:102
+#: en/bootLive.xml:60 en/bootLive.xml:72
 msgid ""
 "<emphasis role=\"bold\">+ use non-free video drivers (slower to boot)</"
 "emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:89
+#: en/bootLive.xml:62
 msgid "Boot the Mageia Live system using non-free video drivers"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:96 en/bootLive.xml:155 en/installer.xml:109
+#: en/bootLive.xml:68 en/bootLive.xml:112 en/installer.xml:111
 msgid "<emphasis role=\"bold\">Install Mageia</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:98 en/bootLive.xml:157
+#: en/bootLive.xml:69 en/bootLive.xml:113
 msgid "This option will install Mageia to a hard disk."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:105
+#: en/bootLive.xml:74
 msgid "Install Mageia using non-free video drivers"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:111 en/installer.xml:125
+#: en/bootLive.xml:79 en/installer.xml:127
 msgid "<emphasis role=\"bold\">Memory Test</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:113 en/installer.xml:127
+#: en/bootLive.xml:80 en/installer.xml:129
 msgid ""
 "Test the installed RAM by performing multiple read and write operations. "
 "Reboot to end the test."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:118 en/bootLive.xml:161
+#: en/bootLive.xml:84 en/bootLive.xml:116
 msgid "<emphasis role=\"bold\"> F2 Language</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:120 en/bootLive.xml:163
+#: en/bootLive.xml:85 en/bootLive.xml:117
 msgid ""
 "Press <keycap>F2</keycap> to have the installer use a specific language "
 "during the installation. Use the arrow keys to select the language then "
@@ -569,24 +579,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:129
+#: en/bootLive.xml:93
 msgid "In UEFI mode"
 msgstr "În mod UEFI"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:133
+#: en/bootLive.xml:96
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
+"> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:139
+#: en/bootLive.xml:100
 msgid "First screen while booting in UEFI mode"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:149
+#: en/bootLive.xml:107
 msgid ""
 "This option will boot the Mageia Live system from the connected DVD/USB "
 "media (expect a very slow system compared to an installed OS).  Once the "
@@ -594,7 +607,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/bootLive.xml:170
+#: en/bootLive.xml:123
 msgid ""
 "If you booted from a USB stick, you will see the above menu options "
 "duplicated, and in this case, you should choose from the menu pair that will "
@@ -814,12 +827,12 @@ msgstr ""
 "asigurați-vă că toate sînt configurate pe ora locală, sau toate pe UTC/GMT."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:24
+#: en/configureX_card_list.xml:27
 msgid "Choose an X Server (Configure your Graphic Card)"
 msgstr "Alegeți un server X (configurați placa grafică)"
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_card_list.xml:29
+#: en/configureX_card_list.xml:32
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_card_list."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_card_list-im1\"/> </"
@@ -827,7 +840,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:35
+#: en/configureX_card_list.xml:38
 msgid ""
 "DrakX has a very comprehensive database of video cards and will usually "
 "correctly identify your video device."
@@ -836,7 +849,7 @@ msgstr ""
 "identifica, în general, corect placa grafică. "
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:38
+#: en/configureX_card_list.xml:41
 msgid ""
 "If the installer has not correctly detected your graphic card and you know "
 "which one you have, you can select it from the tree by:"
@@ -845,22 +858,22 @@ msgstr ""
 "aveți, o puteți alege din arborescență:"
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_card_list.xml:41 en/configureX_monitor.xml:74
+#: en/configureX_card_list.xml:44 en/configureX_monitor.xml:78
 msgid "Vendor"
 msgstr "Producător"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:45
+#: en/configureX_card_list.xml:48
 msgid "then the make of your card"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:49
+#: en/configureX_card_list.xml:52
 msgid "and the model of card"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:53
+#: en/configureX_card_list.xml:56
 msgid ""
 "If you cannot find your card in the vendor lists (because it's not yet in "
 "the database or it's an older card) you may find a suitable driver in the "
@@ -871,14 +884,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><caution><para>
-#: en/configureX_card_list.xml:61
+#: en/configureX_card_list.xml:64
 msgid ""
 "Be aware that if you select an incompatible driver you may only have access "
 "to the <emphasis>Command Line Interface</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:65
+#: en/configureX_card_list.xml:68
 msgid ""
 "Some video card manufacturers provide proprietary drivers for Linux which "
 "may only be available in the <emphasis>Nonfree</emphasis> repository and in "
@@ -889,17 +902,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:11
-msgid "Graphic Card and Monitor Configuration"
+#: en/configureX_chooser.xml:23
+#, fuzzy
+msgid "Graphics Card and Monitor Configuration"
 msgstr "Configurare placă grafică și ecran"
 
-#.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
-#. 2018/02/15 apb: Some text and typography.
-#. 2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.
-#. 2018/02/23 apb: Typo.
-#. 2019/01/06 apb: Slight reword, split 1st para in two.
 #. type: Content of: <section><mediaobject>
-#: en/configureX_chooser.xml:26
+#: en/configureX_chooser.xml:28
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_chooser."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_chooser-im1\"/> </"
@@ -907,7 +916,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:32
+#: en/configureX_chooser.xml:34
 msgid ""
 "No matter which graphical environment (also known as desktop environment) "
 "you chose for this install of Mageia, they are all based on a graphical user "
@@ -918,31 +927,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:39
+#: en/configureX_chooser.xml:41
 msgid ""
 "Choose the appropriate settings manually if you think the details are "
 "incorrect, or if none are shown."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:44
-msgid "<emphasis role=\"bold\">Graphic Card</emphasis>"
+#: en/configureX_chooser.xml:46
+msgid "<emphasis role=\"bold\">Graphics Card</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:47
+#: en/configureX_chooser.xml:49
 msgid ""
 "If you need to, you can select a specific card from this expandable list. "
 "See <xref linkend=\"configureX_card_list\"/>."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:52
+#: en/configureX_chooser.xml:54
 msgid "<emphasis role=\"bold\">Monitor</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:55
+#: en/configureX_chooser.xml:57
 msgid ""
 "You can choose Plug 'n Play, if applicable, or choose your monitor from the "
 "<emphasis>Vendor</emphasis> or <emphasis>Generic</emphasis> lists. Choose "
@@ -952,22 +961,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:63
+#: en/configureX_chooser.xml:65
 msgid "<emphasis role=\"bold\">Resolution</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:66
+#: en/configureX_chooser.xml:68
 msgid "The resolution and color depth of your monitor can be set here."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:71
+#: en/configureX_chooser.xml:73
 msgid "<emphasis role=\"bold\">Test</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:74
+#: en/configureX_chooser.xml:76
 msgid ""
 "The test button does not always appear during install. If the option is "
 "there, and you test your settings, you should be asked to confirm that your "
@@ -979,17 +988,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:85
+#: en/configureX_chooser.xml:87
 msgid "<emphasis role=\"bold\">Options</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:88
+#: en/configureX_chooser.xml:90
 msgid "Here you can choose to enable or disable various options."
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_chooser.xml:93
+#: en/configureX_chooser.xml:95
 msgid ""
 "There is a risk of damaging a monitor if you choose refresh rates that are "
 "outside the frequency range of that monitor. This applies to older CRT "
@@ -998,12 +1007,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_monitor.xml:22
+#: en/configureX_monitor.xml:26
 msgid "Choosing your Monitor"
 msgstr "Alegeți monitorul"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:25
+#: en/configureX_monitor.xml:29
 msgid ""
 "DrakX has a very comprehensive database of monitors and will usually "
 "correctly identify yours."
@@ -1012,7 +1021,7 @@ msgstr ""
 "general va identifica în mod corect monitorul."
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:30
+#: en/configureX_monitor.xml:34
 msgid ""
 "<emphasis role=\"bold\">Selecting a monitor with different characteristics "
 "could damage your monitor or video hardware. Please don't try something "
@@ -1021,7 +1030,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:38
+#: en/configureX_monitor.xml:42
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
@@ -1032,12 +1041,12 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:46
+#: en/configureX_monitor.xml:50
 msgid "Custom"
 msgstr "Personalizat"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:49
+#: en/configureX_monitor.xml:53
 msgid ""
 "This option allows you to set two critical parameters: the vertical refresh "
 "rate and the horizontal sync rate. Vertical refresh determines how often the "
@@ -1046,7 +1055,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:55
+#: en/configureX_monitor.xml:59
 msgid ""
 "It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor "
 "type with a sync range that is beyond the capabilities of your monitor: you "
@@ -1059,59 +1068,60 @@ msgstr ""
 "monitorului."
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:64
+#: en/configureX_monitor.xml:68
 msgid "Plug'n Play"
 msgstr "Plug'n Play"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:67
+#: en/configureX_monitor.xml:71
 msgid ""
 "This is the default option and automatically tries to determine the monitor "
 "type from the monitor database."
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:77
+#: en/configureX_monitor.xml:81
+#, fuzzy
 msgid ""
 "If the installer has not correctly detected your monitor and you know which "
-"one you have, you can select it from the tree by selecting:"
+"one you have, you can choose it from the options by selecting:"
 msgstr ""
 "Dacă instalatorul nu a detectat corect monitorul și îi cunoașteți "
 "referințele, atunci îl puteți alege din arborescență selecționîndu-l în "
 "ordine:"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:86
+#: en/configureX_monitor.xml:90
 msgid "Manufacturer"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:90
+#: en/configureX_monitor.xml:94
 msgid "Monitor model"
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:96
+#: en/configureX_monitor.xml:100
 msgid "Generic"
 msgstr "Generic"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:99
+#: en/configureX_monitor.xml:103
 msgid ""
-"Selecting this group will list nearly 30 display configurations such as "
-"1024x768 @ 60Hz and includes flat-panel displays as used in laptops. This is "
-"often a good monitor selection group if you need to use the VESA card driver "
-"when your video hardware cannot be determined automatically.  Once again it "
-"may be wise to be conservative in your selections."
+"Selecting this group will list approximately 30 display configurations such "
+"as 1024x768 @ 60Hz and includes flat-panel displays as used in laptops.  "
+"This is often a good monitor selection group if you need to use the VESA "
+"card driver when your video hardware cannot be determined automatically. "
+"Once again, it may be wise to be conservative in your selections."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:22
+#: en/diskdrake.xml:24
 msgid "Custom Disk Partitioning with DiskDrake"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:27
+#: en/diskdrake.xml:29
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-diskdrake.png\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1119,7 +1129,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:38
+#: en/diskdrake.xml:40
 msgid ""
 "Modify the layout of your disk(s) here. You can remove or create partitions, "
 "change the filesystem or size of a partition and even view their details "
@@ -1127,15 +1137,15 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:47
 msgid ""
 "There is a tab at the top for every detected hard disk (or other storage "
-"device, like a USB key). In the screenshot above there are two available "
-"devices: <filename>sda </filename>and <filename>sdb</filename>."
+"device, like a USB key), for example: <filename>sda</filename>, "
+"<filename>sdb</filename>, <filename>sdc</filename> etc."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:52
+#: en/diskdrake.xml:54
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it. "
@@ -1144,21 +1154,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:60
+#: en/diskdrake.xml:62
 msgid ""
 "Continue until you have adjusted everything to your satisfaction, then click "
 "<emphasis>Done</emphasis> when you're ready."
 msgstr ""
 
 #. type: Content of: <section><warning><orderedlist><listitem><para>
-#: en/diskdrake.xml:69
+#: en/diskdrake.xml:71
 msgid ""
 "Take care with the <emphasis>Clear all</emphasis> option, use it only if you "
 "are sure you want to wipe all partitions on the selected storage device."
 msgstr ""
 
 #. type: Content of: <section><warning><orderedlist><listitem><para>
-#: en/diskdrake.xml:75
+#: en/diskdrake.xml:77
 msgid ""
 "If you wish to use encryption on your <filename>/</filename> partition you "
 "must ensure that you have a separate <filename>/boot</filename> partition. "
@@ -1167,7 +1177,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/diskdrake.xml:87
+#: en/diskdrake.xml:89
 msgid ""
 "If you are installing Mageia on a UEFI system, check that an ESP (EFI System "
 "Partition) is present and correctly mounted on <filename>/boot/EFI</"
@@ -1175,19 +1185,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/diskdrake.xml:93
+#: en/diskdrake.xml:95
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
 "partition is present and of the correct type. See Figure 2 below."
 msgstr ""
 
 #. type: Content of: <section><figure><title>
-#: en/diskdrake.xml:101
+#: en/diskdrake.xml:103
 msgid "EFI System Partition"
 msgstr "Partiție de sistem EFI"
 
 #. type: Content of: <section><figure><mediaobject>
-#: en/diskdrake.xml:104
+#: en/diskdrake.xml:106
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-diskdrake2.png\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1195,17 +1205,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><figure>
-#: en/diskdrake.xml:103 en/diskdrake.xml:117
+#: en/diskdrake.xml:105 en/diskdrake.xml:119
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><figure><title>
-#: en/diskdrake.xml:115
+#: en/diskdrake.xml:117
 msgid "BIOS boot partition"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:118 en/doPartitionDisks.xml:201
+#: en/diskdrake.xml:120 en/doPartitionDisks.xml:206
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1224,26 +1234,26 @@ msgid "Partitioning"
 msgstr "Partiționare"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:31
 msgid "Suggested Partitioning"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:34
 msgid ""
 "In this screen you can see the content of your hard drive(s) along with the "
 "DrakX partitioning proposals for where to install Mageia."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:34
+#: en/doPartitionDisks.xml:38
 msgid ""
 "The actual options available from those shown below will vary according to "
 "the layout and content of your particular hard drive(s)."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:39
+#: en/doPartitionDisks.xml:43
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1252,17 +1262,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><title>
-#: en/doPartitionDisks.xml:49
+#: en/doPartitionDisks.xml:53
 msgid "Main Options"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:56
 msgid "<emphasis role=\"bold\">Use Existing Partitions</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:59
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1271,12 +1281,12 @@ msgstr ""
 "compatibile Linux au fost găsite și pot fi utilizate pentru instalare."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:61
+#: en/doPartitionDisks.xml:65
 msgid "<emphasis role=\"bold\">Use Free Space</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:68
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1285,57 +1295,54 @@ msgstr ""
 "utiliza pentru noua instalare de Mageia."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:70
+#: en/doPartitionDisks.xml:74
 msgid ""
 "<emphasis role=\"bold\">Use Free Space on a Windows Partition</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:73
+#: en/doPartitionDisks.xml:77
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it. 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 important files!"
+"installation but see the warning below."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para><mediaobject>
+#: en/doPartitionDisks.xml:87
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:79
+#: en/doPartitionDisks.xml:82
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
 "light blue and the proposed Mageia partition in dark blue with their "
 "intended sizes just underneath. You have the option to modify these sizes by "
 "clicking and dragging the gap between both partitions.  See the following "
-"screenshot:"
-msgstr ""
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:87
-msgid "<emphasis role=\"bold\">Erase and use Entire Disk</emphasis>"
-msgstr ""
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:90
-msgid "This option will allocate the entire drive for Mageia"
+"screenshot:<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:97
 msgid ""
-"This will erase ALL data on the selected hard drive. Take care! 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 this option."
+"This involves shrinking the size of the Windows partition, and therefore is "
+"a risky operation, so you should make sure you have backed up all important "
+"files before proceeding."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><important><para>
-#: en/doPartitionDisks.xml:101
+#: en/doPartitionDisks.xml:103
+#, fuzzy
 msgid ""
-"Note that this involves shrinking the size of the Windows partition. The "
-"partition must be \"clean\", meaning that Windows must have closed down "
+"The partition must be \"clean\", meaning that Windows must have closed down "
 "correctly the last time it was used. It must also have been defragmented, "
 "although this is not a guarantee that all files in the partition have been "
-"moved out of the area that is about to be used. It is highly recommended to "
-"back up your personal files."
+"moved out of the area that is about to be used for Mageia."
 msgstr ""
 "Țineți cont că acest lucru implică reducerea dimensiunii partiției Windows. "
 "Partiția trebuie să fie „curată”, adică Windows a fost închis corect ultima "
@@ -1346,11 +1353,29 @@ msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/doPartitionDisks.xml:112
-msgid "<emphasis role=\"bold\">Custom Disk Partitioning</emphasis>"
+msgid "<emphasis role=\"bold\">Erase and use Entire Disk</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/doPartitionDisks.xml:115
+msgid "This option will allocate the entire drive for Mageia"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><warning><para>
+#: en/doPartitionDisks.xml:119
+msgid ""
+"This will erase ALL data on the selected hard drive. Take care! 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 this option."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:127
+msgid "<emphasis role=\"bold\">Custom Disk Partitioning</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:130
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1358,17 +1383,8 @@ msgstr ""
 "Aceasta vă oferă controlul total asupra amplasării instalării pe discurile "
 "dure."
 
-#. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:122
-msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
-msgstr ""
-
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:131
+#: en/doPartitionDisks.xml:136
 msgid ""
 "If you are not using the <emphasis>Custom disk partitioning</emphasis> "
 "option, then the installer will allocate the available space according to "
@@ -1376,60 +1392,60 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:137
+#: en/doPartitionDisks.xml:142
 msgid ""
 "If the total available space is less than 50 GB, then only one partition is "
 "created. This will be the <filename>/</filename> (root)  partition."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:143
+#: en/doPartitionDisks.xml:148
 msgid ""
 "If the total available space is greater than 50 GB, then three partitions "
 "are created"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:148
+#: en/doPartitionDisks.xml:153
 msgid ""
 "6/19 of the total available place is allocated to <filename>/</filename> "
 "with a maximum of 50 GB"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:153
+#: en/doPartitionDisks.xml:158
 msgid "1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:158
+#: en/doPartitionDisks.xml:163
 msgid "the rest (at least 12/19) is allocated to <filename>/home</filename>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:165
+#: en/doPartitionDisks.xml:170
 msgid ""
 "This means that from 160 GB or greater available space, the installer will "
 "create three partitions:"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:170
+#: en/doPartitionDisks.xml:175
 msgid "50 GB for <filename>/</filename>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:174
+#: en/doPartitionDisks.xml:179
 msgid "4 GB for <filename>swap</filename>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:178
+#: en/doPartitionDisks.xml:183
 msgid "and the remainder for <filename>/home</filename>"
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:183
+#: en/doPartitionDisks.xml:188
 msgid ""
 "If you are using a UEFI system, the ESP (EFI System Partition) will be "
 "automatically detected - or created if it does not exist yet - and mounted "
@@ -1439,7 +1455,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:189
+#: en/doPartitionDisks.xml:194
 msgid ""
 "If you are using a Legacy (also known as BIOS) system with a GPT partitioned "
 "disk, you need to create a BIOS boot partition if it doesn't already exist. "
@@ -1450,19 +1466,25 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:196
+#: en/doPartitionDisks.xml:201
 msgid "See <xref linkend=\"diskdrake\"/> for information on how to proceed."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:211
+#: en/doPartitionDisks.xml:216
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4.png"
-"\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks4.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks4.png\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
+"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:217
+#: en/doPartitionDisks.xml:226
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
 "previous standard of 512. Due to lack of available hardware, the "
@@ -1471,7 +1493,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:222
+#: en/doPartitionDisks.xml:231
 msgid ""
 "Some SSD devices now use an erase block size over 1 MB. If you have such a "
 "device we suggest that you partition the drive in advance, using an "
@@ -1480,17 +1502,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:229
+#: en/doPartitionDisks.xml:238
 msgid "<emphasis>Align to</emphasis> = MiB"
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:233
+#: en/doPartitionDisks.xml:242
 msgid "<emphasis>Free space preceding (MiB)</emphasis> = 2"
 msgstr ""
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:237
+#: en/doPartitionDisks.xml:246
 msgid ""
 "Also make sure all partitions are created using an even number of megabytes."
 msgstr ""
@@ -1662,12 +1684,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/firewall.xml:7
+#: en/firewall.xml:16
 msgid "Firewall"
 msgstr "Parafoc"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:10
+#: en/firewall.xml:19
 msgid ""
 "This section allows you to configure some simple firewall rules: they "
 "determine which type of message from the Internet will be accepted by the "
@@ -1675,8 +1697,17 @@ msgid ""
 "system to be accessible from the Internet."
 msgstr ""
 
+#. type: Content of: <section><mediaobject>
+#: en/firewall.xml:26
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-firewall.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+
 #. type: Content of: <section><para>
-#: en/firewall.xml:16
+#: en/firewall.xml:31
 msgid ""
 "In the default setting (no button is checked), no service of the system is "
 "accessible from the network. The <emphasis>Everything (no firewall)</"
@@ -1689,7 +1720,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:25
+#: en/firewall.xml:40
 msgid ""
 "All other options are more or less self-explanatory. As an example, you will "
 "enable the CUPS server if you want printers on your machine to be accessible "
@@ -1697,12 +1728,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:29
+#: en/firewall.xml:44
 msgid "<emphasis role=\"bold\">Advanced</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:31
+#: en/firewall.xml:46
 msgid ""
 "The <emphasis>Advanced</emphasis> option opens a window where you can enable "
 "a series of services by typing a list of <quote>couples</quote> (blank "
@@ -1710,34 +1741,35 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:35
-msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
+#: en/firewall.xml:50
+msgid "<emphasis>&lt;port-number&gt;/&lt;protocol&gt;</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:38
+#: en/firewall.xml:53
 msgid ""
-"- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
-"the service you want to enable (e.g. 873 for the RSYNC service) as defined "
-"in <emphasis>RFC-433</emphasis>;"
+"- <emphasis>&lt;port-number&gt;</emphasis> is the value of the port assigned "
+"to the service you want to enable (e.g. 873 for the RSYNC service) as "
+"defined in <emphasis>RFC-433</emphasis>;"
 msgstr ""
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:42
+#: en/firewall.xml:57
 msgid ""
-"- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
-"<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
+"- <emphasis>&lt;protocol&gt;</emphasis> is one of <emphasis>TCP</emphasis> "
+"or <emphasis>UDP</emphasis> - the internet protocol that is used by the "
+"service."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:47
+#: en/firewall.xml:62
 msgid ""
 "For instance, the entry for enabling access to the RSYNC service therefore "
 "is <emphasis>873/tcp</emphasis>."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:50
+#: en/firewall.xml:65
 msgid ""
 "In case a service is implemented to use both protocols, you specify 2 "
 "couples for the same port."
@@ -1805,12 +1837,12 @@ msgid "Graphical Configuration"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:32
+#: en/installer.xml:34
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, instalatorul Mageia"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:35
+#: en/installer.xml:37
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -1821,33 +1853,33 @@ msgstr ""
 "se poate de ușor."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:40
+#: en/installer.xml:42
 msgid "The installation steps"
 msgstr "Etapele instalării"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:44
+#: en/installer.xml:46
 msgid ""
 "The install process is divided into a number of steps - the status of which "
 "is indicated in a panel to the left of the screen."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:50
+#: en/installer.xml:52
 msgid ""
 "Each step has one or more screens, which may also have <emphasis>Advanced</"
 "emphasis> sections with extra, less commonly required options."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:56
+#: en/installer.xml:58
 msgid ""
 "Most screens have <emphasis>Help</emphasis> buttons for further details "
 "about the particular step."
 msgstr ""
 
 #. type: Content of: <section><section><caution><para>
-#: en/installer.xml:62
+#: en/installer.xml:64
 msgid ""
 "If at some point during the install you decide to abort the installation, it "
 "is possible to reboot, but please think twice before you do this. Once a "
@@ -1857,7 +1889,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><caution><para>
-#: en/installer.xml:68
+#: en/installer.xml:70
 msgid ""
 "If, in spite of this, you are very sure rebooting is what you want, go to a "
 "text terminal by pressing the keys <keycombo> <keycap>Ctrl</keycap> "
@@ -1867,12 +1899,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:86
+#: en/installer.xml:88
 msgid "Installation Welcome Screen"
 msgstr "Ecranul de bun venit al instalării"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:88
+#: en/installer.xml:90
 msgid ""
 "The particular screen that you will first see when booting from the "
 "Installation media will depend on whether your computer motherboard is of "
@@ -1880,60 +1912,60 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:92
+#: en/installer.xml:94
 msgid ""
 "The welcome menu screen has various options, however the default option will "
 "start the installer, and is normally all that you will need."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:97
+#: en/installer.xml:99
 msgid "Legacy (BIOS) Systems"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:100
+#: en/installer.xml:102
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome.png\"/> </"
 "imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:111
+#: en/installer.xml:113
 msgid ""
 "Install Mageia to a hard disk. This is the default option, and will "
 "automatically start after a short while unless another option is selected."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:117
+#: en/installer.xml:119
 msgid "<emphasis role=\"bold\">Rescue System</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:119
+#: en/installer.xml:121
 msgid ""
 "This option allows you to either re-install the bootloader for an existing "
 "Mageia installation or you can use it to restore a Windows bootloader."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:132
+#: en/installer.xml:134
 msgid "<emphasis role=\"bold\">F2: Language</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:134
+#: en/installer.xml:136
 msgid "Press F2 for alternative languages."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:140
+#: en/installer.xml:142
 msgid "UEFI Systems"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:142
+#: en/installer.xml:144
 msgid ""
 "From this screen, you can access options by pressing <keycap>e</keycap> to "
 "enter the edit mode. To come back to this screen, press <keycap>Esc</keycap> "
@@ -1941,19 +1973,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:148
+#: en/installer.xml:150
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome2.png\"/> </"
 "imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:157
+#: en/installer.xml:159
 msgid "<emphasis role=\"bold\">Install:</emphasis> Start the Install process"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:162
+#: en/installer.xml:164
 msgid ""
 "<emphasis role=\"bold\">Rescue:</emphasis> This option allows you to either "
 "re-install the bootloader for an existing Mageia installation or you can use "
@@ -1961,31 +1993,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:169
+#: en/installer.xml:171
 msgid ""
 "<emphasis role=\"bold\">F2: Language:</emphasis> Press <keycap>F2</keycap> "
 "for alternative languages."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:174
+#: en/installer.xml:176
 msgid ""
 "If you booted from a USB stick, you will see the above options duplicated, "
 "and in this case, you should use the set that will be suffixed with \"USB\"."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:181
+#: en/installer.xml:183
 msgid "Installation Problems and Possible Solutions"
 msgstr "Probleme de instalare și soluții posibile"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:184
+#: en/installer.xml:186
 msgid "No Graphical Interface"
 msgstr "Fără interfață grafică"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:188
+#: en/installer.xml:190
 msgid ""
 "After the initial screen you did not progress to the <emphasis>Language "
 "Selection</emphasis> screen. This can happen with some graphic cards and "
@@ -1994,7 +2026,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:195
+#: en/installer.xml:197
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
 "In this case it is worth trying a text-mode installation. To use this press "
@@ -2005,12 +2037,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:208
+#: en/installer.xml:210
 msgid "The Install Freezes"
 msgstr "Instalarea îngheață"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:210
+#: en/installer.xml:212
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic hardware "
@@ -2020,12 +2052,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:218
+#: en/installer.xml:220
 msgid "RAM problem"
 msgstr "Problemă de memorie"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:220
+#: en/installer.xml:222
 msgid ""
 "This will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
@@ -2035,12 +2067,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:228
+#: en/installer.xml:230
 msgid "Dynamic partitions"
 msgstr "Partiții dinamice"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:230
+#: en/installer.xml:232
 msgid ""
 "If you converted your hard disk from <literal>Basic</literal> format to "
 "<literal>Dynamic</literal> format in Microsoft Windows, then it is not "
@@ -3671,73 +3703,106 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:27
+#: en/setupBootloader.xml:32
 msgid "Bootloader"
 msgstr "Încărcător de sistem"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:31
+#: en/setupBootloader.xml:36
+#, fuzzy
+msgid "Available Bootloaders"
+msgstr "Încărcător de sistem"
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:39
 msgid "Grub2"
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><title>
-#: en/setupBootloader.xml:34
-msgid "Grub2 on Legacy MBR/GPT systems"
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:42
+msgid "<emphasis role=\"bold\">Grub2 on Legacy MBR/GPT systems</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:37
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:46
 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:42
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:52
 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:49
-msgid "Grub2-efi on UEFI systems"
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:59
+msgid "<emphasis role=\"bold\">Grub2-efi on UEFI systems</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:52
-msgid "GRUB2-efi will be used exclusively as the bootloader for a UEFI system."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:63
+msgid "GRUB2-efi or rEFInd may be used as the bootloader for a UEFI system."
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:57
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:68
 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:60
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:71
 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 "
-"created by Windows and add grub2-efi to it. If no ESP exists, then one will "
+"created by Windows and add grub2-efi to it.  If no ESP exists, then one will "
 "be created. Although it is possible to have several ESPs, only one is "
 "required, whatever the number of operating systems you have."
 msgstr ""
 
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:82
+msgid "rEFInd"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:85
+msgid "<emphasis role=\"bold\">rEFInd on UEFI systems</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:88
+msgid ""
+"rEFInd has a nice graphical set of options, and can auto-detect installed "
+"EFI bootloaders. See: http://www.rodsbooks.com/refind/"
+msgstr ""
+
+#. type: Content of: <section><section><section><note><para>
+#: en/setupBootloader.xml:95
+msgid ""
+"Please note that in order to be able to use the <literal>rEFInd</literal> "
+"option, an installed EFI System Partition must match your system "
+"architecture: if you have a 32bit EFI System Partition installed on a 64bit "
+"machine for instance, then the rEFInd option will not be displayed/available "
+"to you."
+msgstr ""
+
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:72
+#: en/setupBootloader.xml:106
 msgid "Bootloader Setup"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:76
+#: en/setupBootloader.xml:110
 msgid "Bootloader main options"
 msgstr "Opțiunile principale ale încărcătorului de sistem"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:79
+#: en/setupBootloader.xml:113
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader.png\"/> </imageobject> <imageobject condition=\"live"
@@ -3746,47 +3811,71 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:91
+#: en/setupBootloader.xml:125
 msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:93
+#. type: Content of: <section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:129
+msgid ""
+"<guimenuitem>GRUB2</guimenuitem> (with either a graphical or a text menu), "
+"can be chosen for both <literal>Legacy MBR/BIOS</literal> systems and "
+"<literal>UEFI</literal> systems."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:136
 msgid ""
-"This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI "
-"systems will not see this option here."
+"<guimenuitem>rEFInd</guimenuitem> (with a graphical menu)  is an alternative "
+"option solely for use with <literal>UEFI</literal> systems."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:98
+#: en/setupBootloader.xml:144
 msgid "<emphasis role=\"bold\">Boot device</emphasis>"
 msgstr ""
 
+#. type: Content of: <section><section><section><itemizedlist><listitem><warning><para>
+#: en/setupBootloader.xml:147
+#, fuzzy
+msgid "Don't change this unless you really know what you are doing."
+msgstr ""
+"Faceți modificări numai în cazul în care știți foarte bine ceea ce faceți."
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><note><para>
+#: en/setupBootloader.xml:152
+msgid ""
+"There is no option to write GRUB to the boot sector of a partition (e.g: "
+"<filename>sda1</filename>), as this method is considered unreliable."
+msgstr ""
+
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:100
-msgid "Don't change this unless you really know what you are doing"
+#: en/setupBootloader.xml:157
+msgid ""
+"When using UEFI mode, then the <guilabel>Boot device</guilabel> will be "
+"listed as <guimenuitem>EFI System Partition</guimenuitem>."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:105
+#: en/setupBootloader.xml:163
 msgid ""
 "<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:108
+#: en/setupBootloader.xml:166
 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:113
+#: en/setupBootloader.xml:171
 msgid "<emphasis role=\"bold\">Security</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:115
+#: en/setupBootloader.xml:173
 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 "
@@ -3796,34 +3885,34 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:126
+#: en/setupBootloader.xml:184
 msgid "Choose a password for the bootloader (optional)"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:130
+#: en/setupBootloader.xml:188
 msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:132
+#: en/setupBootloader.xml:190
 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:137 en/setupBootloader.xml:212
+#: en/setupBootloader.xml:195 en/setupBootloader.xml:308
 msgid "<emphasis>Advanced</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:141
+#: en/setupBootloader.xml:199
 msgid "<emphasis>Enable ACPI</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:143
+#: en/setupBootloader.xml:201
 msgid ""
 "ACPI (Advanced Configuration and Power Interface) is a standard for power "
 "management. It can save energy by stopping unused devices. Deselecting it "
@@ -3833,24 +3922,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:152
+#: en/setupBootloader.xml:210
 msgid "<emphasis>Enable SMP</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:154
+#: en/setupBootloader.xml:212
 msgid ""
 "This option enables/disables symmetric multiprocessing for multi-core "
 "processors"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:159
+#: en/setupBootloader.xml:217
 msgid "<emphasis>Enable APIC</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:161
+#: en/setupBootloader.xml:219
 msgid ""
 "Enabling this gives the operating system access to the Advanced Programmable "
 "Interrupt Controller. APIC devices permit more complex priority models, and "
@@ -3858,24 +3947,77 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:168
+#: en/setupBootloader.xml:226
 msgid "<emphasis>Enable Local APIC</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:170
+#: en/setupBootloader.xml:228
 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:177
+#: en/setupBootloader.xml:235
 msgid "Bootloader Configuration"
 msgstr "Configurare încărcător de sistem"
 
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:237
+msgid ""
+"If, in the previous section you selected <literal>rEFInd</literal> as the "
+"bootloader to use, you would then be presented with the options shown in the "
+"screenshot directly below. Otherwise, please instead move on to the "
+"subsequent screenshot for your options."
+msgstr ""
+
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:180
+#: en/setupBootloader.xml:243
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"rEFIndLoaderConfig.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-rEFIndLoaderConfig.png\"/> </"
+"imageobject>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:253
+#, fuzzy
+msgid "Your rEFInd configuration options:"
+msgstr "Configurare sunet"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:256
+msgid ""
+"<guimenuitem>Install or update rEFInd in the EFI system partition.</"
+"guimenuitem>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:261
+msgid ""
+"<guimenuitem>Install in EFI/Boot partition (workaround for some BIOS's).</"
+"guimenuitem>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:264
+msgid ""
+"With some BIOS's, the newly written bootloaser for Mageia at end of the "
+"installation will not be recognized. In that case, you can use this option "
+"as a workaround for the issue."
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:270
+msgid ""
+"If you did not select rEFInd as the bootloader to use in the previous "
+"section, then your bootloader configurations are shown below:"
+msgstr ""
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:275
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -3884,42 +4026,42 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:191
+#: en/setupBootloader.xml:286
 msgid "<emphasis role=\"bold\">Default</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:193
+#: en/setupBootloader.xml:288
 msgid "The operating system to be started up by default."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:197
+#: en/setupBootloader.xml:292
 msgid "<emphasis role=\"bold\">Append</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:199
+#: en/setupBootloader.xml:294
 msgid ""
 "This option lets you pass information to the kernel 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:204
+#: en/setupBootloader.xml:299
 msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:206
+#: en/setupBootloader.xml:301
 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, "
-"then untick the Probe Foreign OS option."
+"then untick the <guimenuitem>Probe Foreign OS</guimenuitem> option."
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:215
+#: en/setupBootloader.xml:311
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader4.png\"/> </imageobject> <imageobject condition=\"live"
@@ -3928,12 +4070,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:226
+#: en/setupBootloader.xml:322
 msgid "<emphasis>Video mode</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:228
+#: en/setupBootloader.xml:324
 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 "
@@ -3941,38 +4083,47 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:234
+#: en/setupBootloader.xml:330
 msgid "<emphasis>Do not touch ESP or MBR</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:236
+#: en/setupBootloader.xml:332
 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 "
-"missing. Click<emphasis> Ok</emphasis> if you are sure you understand the "
-"implications, and wish to proceed."
+"missing. Click <guimenuitem>Ok </guimenuitem>only if you are sure you "
+"understand the implications, and wish to proceed."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><warning><para>
+#: en/setupBootloader.xml:338
+msgid ""
+"Chain-loading via legacy bootloaders (GRUB Legacy and LiLo)  is no longer "
+"supported by Mageia as it is likely to fail when attempting to boot this "
+"resulting installation of Mageia. If you use anything other than GRUB2 or "
+"rEFInd for this purpose, then you do so at your own risk!"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:245
+#: en/setupBootloader.xml:348
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png"
 "\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:253
+#: en/setupBootloader.xml:356
 msgid "Other Options"
 msgstr "Alte opțiuni"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:256
+#: en/setupBootloader.xml:359
 msgid "Using an existing bootloader"
 msgstr "Se utilizează încărcătorul de sistem existent"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:258
+#: en/setupBootloader.xml:361
 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 "
@@ -3982,12 +4133,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:267
+#: en/setupBootloader.xml:370
 msgid "Installing Without a Bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:269
+#: en/setupBootloader.xml:372
 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 "
diff --git a/docs/docs/stable/installer/ru.po b/docs/docs/stable/installer/ru.po
index 9dbf794d..4788d3f5 100644
--- a/docs/docs/stable/installer/ru.po
+++ b/docs/docs/stable/installer/ru.po
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2019-01-19 21:23+0200\n"
+"POT-Creation-Date: 2019-09-08 15:26+0300\n"
 "PO-Revision-Date: 2019-01-20 21:57+0000\n"
 "Last-Translator: AlexL <loginov.alex.valer@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -187,7 +187,7 @@ msgstr ""
 "установки может обнаружить нужные для обновления 32-битные пакеты."
 
 #. type: Content of: <section><info><title>
-#: en/addUser.xml:3
+#: en/addUser.xml:9
 msgid "User Management"
 msgstr "Управление пользователями"
 
@@ -197,13 +197,16 @@ msgstr "Управление пользователями"
 #. 2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
 #.   Also changed 'Advanced User Management' to 'User Management (advanced)'.
 #. 2018/02/24 apb: Changed list style.
+#. 2019/08/10 apb: Added missing 'condition' profile for live-user1.png.
+#. 2019/08/11 apb: [1] Reword 1.1 (including Note) [2] Reword 1.2 Password text.
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:12
+#: en/addUser.xml:28
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
-"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
-"\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata format="
-"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-setRootPassword.png\" format=\"PNG\" revision=\"1\" xml:id="
+"\"setRootPassword-im1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-user1.png\" format=\"PNG\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
 "\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -211,20 +214,18 @@ msgstr ""
 "\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:21
+#: en/addUser.xml:40
 msgid "Set Administrator (root)  Password:"
 msgstr "Восстановление пароля администратора (root):"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:24
+#: en/addUser.xml:44
+#, fuzzy
 msgid ""
 "It is advisable for all Mageia installations to set a <literal>superuser</"
 "literal> (Administrator) password, usually called the <emphasis>root </"
-"emphasis>password in Linux. As you type a password into the top box a shield "
-"will change from red-to-yellow-to-green depending on the strength of the "
-"password. A green shield shows you are using a strong password. You need to "
-"repeat the same password in the box underneath, to check that the first "
-"entry was not mistyped."
+"emphasis>password in Linux. You need to repeat the same password in the box "
+"underneath, to check that the first entry was not mistyped."
 msgstr ""
 "В каждой установлённой системе Mageia следует определить пароль "
 "<emphasis>суперпользователя</emphasis> или администратора. Такой пароль в "
@@ -235,7 +236,15 @@ msgstr ""
 "ниже, чтобы удостовериться, что пароль был указан без ошибок."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:32
+#: en/addUser.xml:51
+msgid ""
+"As you type a password into the top box a shield will change from red-to-"
+"yellow-to-green depending on the strength of the password. A green shield "
+"shows you are using a strong password."
+msgstr ""
+
+#. type: Content of: <section><section><note><para>
+#: en/addUser.xml:55
 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."
@@ -244,12 +253,12 @@ msgstr ""
 "смесь букв (больших и малых), цифр и других символов."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:39
+#: en/addUser.xml:63
 msgid "Enter a user"
 msgstr "Введите пользователя"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:41
+#: en/addUser.xml:66
 msgid ""
 "Add a User here. A regular user has fewer privileges than the "
 "<literal>superuser</literal> (root), but enough to use the Internet, office "
@@ -263,32 +272,32 @@ msgstr ""
 "пользователем за компьютером."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:47
+#: en/addUser.xml:73
 msgid "<emphasis role=\"bold\">Icon</emphasis>"
 msgstr "<emphasis role=\"bold\">Пиктограмма</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:48
+#: en/addUser.xml:75
 msgid "Click on this button if you want to change the user's icon"
 msgstr "С помощью этой кнопки можно изменить значок пользователя"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:52
+#: en/addUser.xml:80
 msgid "<emphasis role=\"bold\">Real Name</emphasis>"
 msgstr "<emphasis role=\"bold\">Настоящее имя</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:53
+#: en/addUser.xml:82
 msgid "Insert the user's real name into this text box"
 msgstr "В этом поле следует указать настоящее имя пользователя."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:56
+#: en/addUser.xml:86
 msgid "<emphasis role=\"bold\">Login Name</emphasis>"
 msgstr "<emphasis role=\"bold\">Логин</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:57
+#: en/addUser.xml:88
 msgid ""
 "Enter the user login name or let DrakX use a version of the user's real "
 "name. <emphasis role=\"bold\">The login name is case-sensitive.</emphasis>"
@@ -299,7 +308,7 @@ msgstr ""
 "регистру.</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><caution><simpara>
-#: en/addUser.xml:61
+#: en/addUser.xml:93
 msgid ""
 "The login entered here should be different to any login currently in use for "
 "your <filename>/home</filename> directory. Some user parameters will be "
@@ -313,22 +322,17 @@ msgstr ""
 "частности Firefox, Thunderbird или KMail."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:65 en/setupBootloader.xml:124
+#: en/addUser.xml:102 en/setupBootloader.xml:182
 msgid "<emphasis role=\"bold\">Password</emphasis>"
 msgstr "<emphasis role=\"bold\">Пароль</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:66
-msgid ""
-"Type in the user password. There is a shield at the end of the text box that "
-"indicates the strength of the password. (See also <xref linkend="
-"\"givePassword\"/>)"
+#: en/addUser.xml:104
+msgid "Type in the user password (remembering the advice in the Note above)."
 msgstr ""
-"В этом поле вы должны указать пароль. Цвет отметки щита рядом с этим полем "
-"соответствует сложности пароля (см. также <xref linkend=\"givePassword\"/>)"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:68
+#: en/addUser.xml:107
 msgid ""
 "<emphasis role=\"bold\">Password (again):</emphasis> Retype the user "
 "password. DrakX will check that you have not mistyped the password."
@@ -338,7 +342,7 @@ msgstr ""
 "пароль с его первоначальным вариантом."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:74
+#: en/addUser.xml:114
 msgid ""
 "Any users added while installing Mageia, will have a home directory that is "
 "both read and write protected (umask=0027)"
@@ -348,7 +352,7 @@ msgstr ""
 "0027)."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:76
+#: en/addUser.xml:117
 msgid ""
 "You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
@@ -359,19 +363,19 @@ msgstr ""
 "управления записями выберите <emphasis>Управление пользователями</emphasis>."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:79
+#: en/addUser.xml:121
 msgid "The access permissions can also be changed after the install."
 msgstr ""
 "Права доступа к домашним каталогам, конечно же, можно изменить и после "
 "завершения установки системы."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:85
+#: en/addUser.xml:128
 msgid "User Management (advanced)"
 msgstr "Дополнительные возможности управления записями пользователей"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:87
+#: en/addUser.xml:131
 msgid ""
 "The <emphasis>Advanced</emphasis> option allows you to edit further settings "
 "for the user you are adding."
@@ -381,7 +385,7 @@ msgstr ""
 "записи, которую вы добавляете."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:91
+#: en/addUser.xml:136
 msgid ""
 "<emphasis>Shell</emphasis>: This drop-down list allows you to change the "
 "shell available to any user you added in the previous screen. Options are "
@@ -394,7 +398,7 @@ msgstr ""
 "literal> и <literal>Sh</literal>."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:143
 msgid ""
 "<emphasis>User ID</emphasis>: Here you can set the user ID for any user you "
 "added in the previous screen. If you are unsure what the purpose of this is, "
@@ -406,7 +410,7 @@ msgstr ""
 "это поле, если вам неизвестны последствия ваших действий."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:102
+#: en/addUser.xml:149
 msgid ""
 "<emphasis>Group ID</emphasis>: This lets you set the group ID.  Again, if "
 "unsure, leave it blank."
@@ -566,17 +570,17 @@ msgstr ""
 "автоматическую синхронизацию времени и указать сервер NTP."
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:23
+#: en/bootLive.xml:10
 msgid "Boot Mageia as Live system"
 msgstr "Загрузка Mageia как Live системы"
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:28
+#: en/bootLive.xml:14
 msgid "Booting the medium"
 msgstr "Загрузка носителя"
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:31
+#: en/bootLive.xml:16
 msgid ""
 "You can boot directly from a Live DVD or USB. Usually, you just need to plug "
 "the USB device in or place the DVD in the drive and restart the computer."
@@ -586,7 +590,7 @@ msgstr ""
 "USB или вставить DVD к устройству чтения и перезагрузить компьютер."
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:35
+#: en/bootLive.xml:19
 msgid ""
 "If the computer does not automatically boot from the USB or DVD you may need "
 "to reconfigure your BIOS Boot Disk priority. Alternatively, you might try "
@@ -600,7 +604,7 @@ msgstr ""
 "компьютере."
 
 #. type: Content of: <section><section><tip><para>
-#: en/bootLive.xml:41
+#: en/bootLive.xml:24
 msgid ""
 "To access the BIOS or boot menu when the computer is starting, you can try "
 "pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or <keycap>Esc</"
@@ -616,7 +620,7 @@ msgstr ""
 "лишь некоторыми из возможных вариантов."
 
 #. type: Content of: <section><section><note><para>
-#: en/bootLive.xml:50
+#: en/bootLive.xml:32
 msgid ""
 "The actual screen that you will first see when booting from the Live media "
 "will depend on whether your computer motherboard is of the Legacy (BIOS) or "
@@ -627,37 +631,38 @@ msgstr ""
 "помощью устаревшей микропрограммы (BIOS) или UEFI."
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:58
+#: en/bootLive.xml:39
 msgid "In BIOS/CSM/Legacy mode"
 msgstr "В режиме BIOS/CSM/Legacy"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:62
+#: en/bootLive.xml:42
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"../live-bootCSM.png\" align=\"center\"/> "
+"</imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> </"
+"<imageobject> <imagedata fileref=\"dx2-summaryTop.png\" align=\"center\"/> </"
 "imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:67
+#: en/bootLive.xml:46
 msgid "First screen while booting in BIOS mode"
 msgstr "Первый экран при загрузке в режиме BIOS"
 
 #. type: Content of: <section><section><section><itemizedlist><title>
-#: en/bootLive.xml:72 en/bootLive.xml:144 en/installer.xml:106
-#: en/installer.xml:154
+#: en/bootLive.xml:50 en/bootLive.xml:104 en/installer.xml:108
+#: en/installer.xml:156
 msgid "Menu"
 msgstr "Меню"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:75 en/bootLive.xml:147
+#: en/bootLive.xml:52 en/bootLive.xml:106
 msgid "<emphasis role=\"bold\">Boot Mageia</emphasis>"
 msgstr "<emphasis role=\"bold\">Загрузить Mageia</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:77
+#: en/bootLive.xml:53
 msgid ""
 "This option will boot the Mageia Live system from the connected DVD/USB "
 "media (expect a very slow system compared to an installed OS)."
@@ -667,13 +672,13 @@ msgstr ""
 "ОС)."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:81
+#: en/bootLive.xml:56
 msgid "Once the boot is done, you can proceed to the installation."
 msgstr ""
 "Как только загрузка системы будет завершена, вы сможете перейти к установке."
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:86 en/bootLive.xml:102
+#: en/bootLive.xml:60 en/bootLive.xml:72
 msgid ""
 "<emphasis role=\"bold\">+ use non-free video drivers (slower to boot)</"
 "emphasis>"
@@ -682,34 +687,34 @@ msgstr ""
 "загрузка)</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:89
+#: en/bootLive.xml:62
 msgid "Boot the Mageia Live system using non-free video drivers"
 msgstr "Загрузить Mageia как Live систему с закрытыми видеодрайверами"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:96 en/bootLive.xml:155 en/installer.xml:109
+#: en/bootLive.xml:68 en/bootLive.xml:112 en/installer.xml:111
 msgid "<emphasis role=\"bold\">Install Mageia</emphasis>"
 msgstr "<emphasis role=\"bold\">Установить Mageia</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:98 en/bootLive.xml:157
+#: en/bootLive.xml:69 en/bootLive.xml:113
 msgid "This option will install Mageia to a hard disk."
 msgstr ""
 "Если будет выбран этот пункт, начнётся процедура установки Mageia на жёсткий "
 "диск."
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:105
+#: en/bootLive.xml:74
 msgid "Install Mageia using non-free video drivers"
 msgstr "Установить Mageia с использованием закрытых видеодрайверов"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:111 en/installer.xml:125
+#: en/bootLive.xml:79 en/installer.xml:127
 msgid "<emphasis role=\"bold\">Memory Test</emphasis>"
 msgstr "<emphasis role=\"bold\">Тестирование памяти</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:113 en/installer.xml:127
+#: en/bootLive.xml:80 en/installer.xml:129
 msgid ""
 "Test the installed RAM by performing multiple read and write operations. "
 "Reboot to end the test."
@@ -719,12 +724,12 @@ msgstr ""
 "перезагрузить компьютер."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:118 en/bootLive.xml:161
+#: en/bootLive.xml:84 en/bootLive.xml:116
 msgid "<emphasis role=\"bold\"> F2 Language</emphasis>"
 msgstr "<emphasis role=\"bold\">F2: Язык</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:120 en/bootLive.xml:163
+#: en/bootLive.xml:85 en/bootLive.xml:117
 msgid ""
 "Press <keycap>F2</keycap> to have the installer use a specific language "
 "during the installation. Use the arrow keys to select the language then "
@@ -735,26 +740,27 @@ msgstr ""
 "клавишу Enter."
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:129
+#: en/bootLive.xml:93
 msgid "In UEFI mode"
 msgstr "В режиме UEFI"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:133
+#: en/bootLive.xml:96
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:139
+#: en/bootLive.xml:100
 msgid "First screen while booting in UEFI mode"
 msgstr "Первый экран при загрузке в режиме UEFI"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:149
+#: en/bootLive.xml:107
 msgid ""
 "This option will boot the Mageia Live system from the connected DVD/USB "
 "media (expect a very slow system compared to an installed OS).  Once the "
@@ -765,7 +771,7 @@ msgstr ""
 "ОС). После завершения загрузки вы можете перейти к установке"
 
 #. type: Content of: <section><section><note><para>
-#: en/bootLive.xml:170
+#: en/bootLive.xml:123
 msgid ""
 "If you booted from a USB stick, you will see the above menu options "
 "duplicated, and in this case, you should choose from the menu pair that will "
@@ -1041,12 +1047,12 @@ msgstr ""
 "GMT)."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:24
+#: en/configureX_card_list.xml:27
 msgid "Choose an X Server (Configure your Graphic Card)"
 msgstr "Выбор графического сервера (настройки вашей графической карты)"
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_card_list.xml:29
+#: en/configureX_card_list.xml:32
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_card_list."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_card_list-im1\"/> </"
@@ -1057,7 +1063,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:35
+#: en/configureX_card_list.xml:38
 msgid ""
 "DrakX has a very comprehensive database of video cards and will usually "
 "correctly identify your video device."
@@ -1066,7 +1072,7 @@ msgstr ""
 "программа может правильно определить ваш видеоадаптер."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:38
+#: en/configureX_card_list.xml:41
 msgid ""
 "If the installer has not correctly detected your graphic card and you know "
 "which one you have, you can select it from the tree by:"
@@ -1076,22 +1082,22 @@ msgstr ""
 "иерархического списка по следующим критериям:"
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_card_list.xml:41 en/configureX_monitor.xml:74
+#: en/configureX_card_list.xml:44 en/configureX_monitor.xml:78
 msgid "Vendor"
 msgstr "Производитель"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:45
+#: en/configureX_card_list.xml:48
 msgid "then the make of your card"
 msgstr "название вашей карты"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:49
+#: en/configureX_card_list.xml:52
 msgid "and the model of card"
 msgstr "модель вашей карты"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:53
+#: en/configureX_card_list.xml:56
 msgid ""
 "If you cannot find your card in the vendor lists (because it's not yet in "
 "the database or it's an older card) you may find a suitable driver in the "
@@ -1109,7 +1115,7 @@ msgstr ""
 "возможности по показу видео."
 
 #. type: Content of: <section><caution><para>
-#: en/configureX_card_list.xml:61
+#: en/configureX_card_list.xml:64
 msgid ""
 "Be aware that if you select an incompatible driver you may only have access "
 "to the <emphasis>Command Line Interface</emphasis>"
@@ -1118,7 +1124,7 @@ msgstr ""
 "доступ только к <emphasis>интерфейсу командной строки</emphasis>."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:65
+#: en/configureX_card_list.xml:68
 msgid ""
 "Some video card manufacturers provide proprietary drivers for Linux which "
 "may only be available in the <emphasis>Nonfree</emphasis> repository and in "
@@ -1135,17 +1141,13 @@ msgstr ""
 "это следует сделать после первой перезагрузки."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:11
-msgid "Graphic Card and Monitor Configuration"
+#: en/configureX_chooser.xml:23
+#, fuzzy
+msgid "Graphics Card and Monitor Configuration"
 msgstr "Настройки графической карты и монитора"
 
-#.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
-#. 2018/02/15 apb: Some text and typography.
-#. 2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.
-#. 2018/02/23 apb: Typo.
-#. 2019/01/06 apb: Slight reword, split 1st para in two.
 #. type: Content of: <section><mediaobject>
-#: en/configureX_chooser.xml:26
+#: en/configureX_chooser.xml:28
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_chooser."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_chooser-im1\"/> </"
@@ -1156,7 +1158,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:32
+#: en/configureX_chooser.xml:34
 msgid ""
 "No matter which graphical environment (also known as desktop environment) "
 "you chose for this install of Mageia, they are all based on a graphical user "
@@ -1173,7 +1175,7 @@ msgstr ""
 "<acronym>X</acronym> должны быть определены правильно."
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:39
+#: en/configureX_chooser.xml:41
 msgid ""
 "Choose the appropriate settings manually if you think the details are "
 "incorrect, or if none are shown."
@@ -1182,12 +1184,13 @@ msgstr ""
 "неправильно, или если никаких параметров не показано."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:44
-msgid "<emphasis role=\"bold\">Graphic Card</emphasis>"
+#: en/configureX_chooser.xml:46
+#, fuzzy
+msgid "<emphasis role=\"bold\">Graphics Card</emphasis>"
 msgstr "<emphasis role=\"bold\">Графическая карта</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:47
+#: en/configureX_chooser.xml:49
 msgid ""
 "If you need to, you can select a specific card from this expandable list. "
 "See <xref linkend=\"configureX_card_list\"/>."
@@ -1196,12 +1199,12 @@ msgstr ""
 "\"configureX_card_list\"/>."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:52
+#: en/configureX_chooser.xml:54
 msgid "<emphasis role=\"bold\">Monitor</emphasis>"
 msgstr "<emphasis role=\"bold\">Монитор</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:55
+#: en/configureX_chooser.xml:57
 msgid ""
 "You can choose Plug 'n Play, if applicable, or choose your monitor from the "
 "<emphasis>Vendor</emphasis> or <emphasis>Generic</emphasis> lists. Choose "
@@ -1217,24 +1220,24 @@ msgstr ""
 "\"configureX_monitor\"/>."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:63
+#: en/configureX_chooser.xml:65
 msgid "<emphasis role=\"bold\">Resolution</emphasis>"
 msgstr "<emphasis role=\"bold\">Разрешение</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:66
+#: en/configureX_chooser.xml:68
 msgid "The resolution and color depth of your monitor can be set here."
 msgstr ""
 "С помощью этого пункта можно выбрать желаемое разрешение и глубину цветов на "
 "вашем мониторе."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:71
+#: en/configureX_chooser.xml:73
 msgid "<emphasis role=\"bold\">Test</emphasis>"
 msgstr "<emphasis role=\"bold\">Проверить</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:74
+#: en/configureX_chooser.xml:76
 msgid ""
 "The test button does not always appear during install. If the option is "
 "there, and you test your settings, you should be asked to confirm that your "
@@ -1255,18 +1258,18 @@ msgstr ""
 "безопасными."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:85
+#: en/configureX_chooser.xml:87
 msgid "<emphasis role=\"bold\">Options</emphasis>"
 msgstr "<emphasis role=\"bold\">Параметры</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:88
+#: en/configureX_chooser.xml:90
 msgid "Here you can choose to enable or disable various options."
 msgstr ""
 "С помощью этого пункта вы можете включить или отключить различные параметры."
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_chooser.xml:93
+#: en/configureX_chooser.xml:95
 msgid ""
 "There is a risk of damaging a monitor if you choose refresh rates that are "
 "outside the frequency range of that monitor. This applies to older CRT "
@@ -1280,12 +1283,12 @@ msgstr ""
 "просто переходят в режим ожидания."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_monitor.xml:22
+#: en/configureX_monitor.xml:26
 msgid "Choosing your Monitor"
 msgstr "Выбор монитора"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:25
+#: en/configureX_monitor.xml:29
 msgid ""
 "DrakX has a very comprehensive database of monitors and will usually "
 "correctly identify yours."
@@ -1294,7 +1297,7 @@ msgstr ""
 "может правильно определить ваш монитор."
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:30
+#: en/configureX_monitor.xml:34
 msgid ""
 "<emphasis role=\"bold\">Selecting a monitor with different characteristics "
 "could damage your monitor or video hardware. Please don't try something "
@@ -1307,7 +1310,7 @@ msgstr ""
 "есть определённые сомнения, обратитесь к документации по вашему монитору."
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:38
+#: en/configureX_monitor.xml:42
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
@@ -1318,12 +1321,12 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:46
+#: en/configureX_monitor.xml:50
 msgid "Custom"
 msgstr "Выборочно"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:49
+#: en/configureX_monitor.xml:53
 msgid ""
 "This option allows you to set two critical parameters: the vertical refresh "
 "rate and the horizontal sync rate. Vertical refresh determines how often the "
@@ -1337,7 +1340,7 @@ msgstr ""
 "будут показаны линии изображения."
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:55
+#: en/configureX_monitor.xml:59
 msgid ""
 "It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor "
 "type with a sync range that is beyond the capabilities of your monitor: you "
@@ -1350,12 +1353,12 @@ msgstr ""
 "с документацией к вашему монитору."
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:64
+#: en/configureX_monitor.xml:68
 msgid "Plug'n Play"
 msgstr "Plug'n'Play"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:67
+#: en/configureX_monitor.xml:71
 msgid ""
 "This is the default option and automatically tries to determine the monitor "
 "type from the monitor database."
@@ -1364,38 +1367,40 @@ msgstr ""
 "базе данных мониторов автоматически."
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:77
+#: en/configureX_monitor.xml:81
+#, fuzzy
 msgid ""
 "If the installer has not correctly detected your monitor and you know which "
-"one you have, you can select it from the tree by selecting:"
+"one you have, you can choose it from the options by selecting:"
 msgstr ""
 "Если установщику не удалось должным образом определить ваш монитор, и вам "
 "известно название этого монитора, вы можете выбрать его из иерархического "
 "списка по следующим критериям:"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:86
+#: en/configureX_monitor.xml:90
 msgid "Manufacturer"
 msgstr "Производитель"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:90
+#: en/configureX_monitor.xml:94
 msgid "Monitor model"
 msgstr "Модель монитора"
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:96
+#: en/configureX_monitor.xml:100
 msgid "Generic"
 msgstr "Обычный"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:99
+#: en/configureX_monitor.xml:103
+#, fuzzy
 msgid ""
-"Selecting this group will list nearly 30 display configurations such as "
-"1024x768 @ 60Hz and includes flat-panel displays as used in laptops. This is "
-"often a good monitor selection group if you need to use the VESA card driver "
-"when your video hardware cannot be determined automatically.  Once again it "
-"may be wise to be conservative in your selections."
+"Selecting this group will list approximately 30 display configurations such "
+"as 1024x768 @ 60Hz and includes flat-panel displays as used in laptops.  "
+"This is often a good monitor selection group if you need to use the VESA "
+"card driver when your video hardware cannot be determined automatically. "
+"Once again, it may be wise to be conservative in your selections."
 msgstr ""
 "Если вы выберете эту группу, будет открыт список из около 30 типовых "
 "настроек дисплеев, подобных 1024x768@60 Гц, в который включены параметры "
@@ -1405,12 +1410,12 @@ msgstr ""
 "автоматически. Опять же, стоит параметры выбирать очень осторожно."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:22
+#: en/diskdrake.xml:24
 msgid "Custom Disk Partitioning with DiskDrake"
 msgstr "Ручная разметка диска на разделы с помощью DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:27
+#: en/diskdrake.xml:29
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-diskdrake.png\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1421,7 +1426,7 @@ msgstr ""
 "<imagedata align=\"center\" fileref=\"live-diskdrake.png\"/> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:38
+#: en/diskdrake.xml:40
 msgid ""
 "Modify the layout of your disk(s) here. You can remove or create partitions, "
 "change the filesystem or size of a partition and even view their details "
@@ -1433,11 +1438,12 @@ msgstr ""
 "разделов до внесения изменений."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:47
+#, fuzzy
 msgid ""
 "There is a tab at the top for every detected hard disk (or other storage "
-"device, like a USB key). In the screenshot above there are two available "
-"devices: <filename>sda </filename>and <filename>sdb</filename>."
+"device, like a USB key), for example: <filename>sda</filename>, "
+"<filename>sdb</filename>, <filename>sdc</filename> etc."
 msgstr ""
 "Вверху для каждого обнаруженного жёсткого диска (или другого устройства "
 "хранения данных, в частности флешек USB) будет отведена вкладка. На "
@@ -1445,7 +1451,7 @@ msgstr ""
 "<filename>sda</filename> и <filename>sdb</filename>."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:52
+#: en/diskdrake.xml:54
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it. "
@@ -1460,7 +1466,7 @@ msgstr ""
 "выбора типа раздела."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:60
+#: en/diskdrake.xml:62
 msgid ""
 "Continue until you have adjusted everything to your satisfaction, then click "
 "<emphasis>Done</emphasis> when you're ready."
@@ -1470,7 +1476,7 @@ msgstr ""
 "emphasis>, когда будут указаны нужные вам параметры."
 
 #. type: Content of: <section><warning><orderedlist><listitem><para>
-#: en/diskdrake.xml:69
+#: en/diskdrake.xml:71
 msgid ""
 "Take care with the <emphasis>Clear all</emphasis> option, use it only if you "
 "are sure you want to wipe all partitions on the selected storage device."
@@ -1480,7 +1486,7 @@ msgstr ""
 "носителе данных были изъяты."
 
 #. type: Content of: <section><warning><orderedlist><listitem><para>
-#: en/diskdrake.xml:75
+#: en/diskdrake.xml:77
 msgid ""
 "If you wish to use encryption on your <filename>/</filename> partition you "
 "must ensure that you have a separate <filename>/boot</filename> partition. "
@@ -1493,7 +1499,7 @@ msgstr ""
 "иначе загрузка системы станет невозможной."
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/diskdrake.xml:87
+#: en/diskdrake.xml:89
 msgid ""
 "If you are installing Mageia on a UEFI system, check that an ESP (EFI System "
 "Partition) is present and correctly mounted on <filename>/boot/EFI</"
@@ -1504,7 +1510,7 @@ msgstr ""
 "(см. ниже)."
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/diskdrake.xml:93
+#: en/diskdrake.xml:95
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
 "partition is present and of the correct type. See Figure 2 below."
@@ -1513,12 +1519,12 @@ msgstr ""
 "существует раздел BIOS надлежащего типа. См. снимок, который приведён ниже."
 
 #. type: Content of: <section><figure><title>
-#: en/diskdrake.xml:101
+#: en/diskdrake.xml:103
 msgid "EFI System Partition"
 msgstr "Раздел системы EFI"
 
 #. type: Content of: <section><figure><mediaobject>
-#: en/diskdrake.xml:104
+#: en/diskdrake.xml:106
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-diskdrake2.png\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1529,17 +1535,17 @@ msgstr ""
 "<imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/> </imageobject>"
 
 #. type: Content of: <section><figure>
-#: en/diskdrake.xml:103 en/diskdrake.xml:117
+#: en/diskdrake.xml:105 en/diskdrake.xml:119
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><figure><title>
-#: en/diskdrake.xml:115
+#: en/diskdrake.xml:117
 msgid "BIOS boot partition"
 msgstr "Загрузочный раздел BIOS"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:118 en/doPartitionDisks.xml:201
+#: en/diskdrake.xml:120 en/doPartitionDisks.xml:206
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1562,12 +1568,12 @@ msgid "Partitioning"
 msgstr "Разметка диска"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:31
 msgid "Suggested Partitioning"
 msgstr "Предлагаемое разбиение на разделы"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:34
 msgid ""
 "In this screen you can see the content of your hard drive(s) along with the "
 "DrakX partitioning proposals for where to install Mageia."
@@ -1577,7 +1583,7 @@ msgstr ""
 "DrakX о месте установки Mageia."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:34
+#: en/doPartitionDisks.xml:38
 msgid ""
 "The actual options available from those shown below will vary according to "
 "the layout and content of your particular hard drive(s)."
@@ -1586,7 +1592,7 @@ msgstr ""
 "комплектации компьютера и содержания дисков."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:39
+#: en/doPartitionDisks.xml:43
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1599,17 +1605,17 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><itemizedlist><title>
-#: en/doPartitionDisks.xml:49
+#: en/doPartitionDisks.xml:53
 msgid "Main Options"
 msgstr "Основные параметры"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:56
 msgid "<emphasis role=\"bold\">Use Existing Partitions</emphasis>"
 msgstr "<emphasis role=\"bold\">Использовать существующие разделы</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:59
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1619,12 +1625,12 @@ msgstr ""
 "системы."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:61
+#: en/doPartitionDisks.xml:65
 msgid "<emphasis role=\"bold\">Use Free Space</emphasis>"
 msgstr "<emphasis role=\"bold\">Использовать свободное пространство</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:68
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1633,7 +1639,7 @@ msgstr ""
 "свободное место, достаточное для установки новой системы Mageia."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:70
+#: en/doPartitionDisks.xml:74
 msgid ""
 "<emphasis role=\"bold\">Use Free Space on a Windows Partition</emphasis>"
 msgstr ""
@@ -1641,12 +1647,12 @@ msgstr ""
 "Windows</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:73
+#: en/doPartitionDisks.xml:77
+#, fuzzy
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it. 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 important files!"
+"installation but see the warning below."
 msgstr ""
 "Если на разделе с Windows есть свободное место, инсталлятор может предложить "
 "воспользоваться им. Этот вариант получения места для установки Mageia может "
@@ -1654,14 +1660,28 @@ msgstr ""
 "поэтому вам следует предварительно создать резервные копии важных для вас "
 "файлов!"
 
+#. type: Content of: <section><itemizedlist><listitem><para><mediaobject>
+#: en/doPartitionDisks.xml:87
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:79
+#: en/doPartitionDisks.xml:82
+#, fuzzy
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
 "light blue and the proposed Mageia partition in dark blue with their "
 "intended sizes just underneath. You have the option to modify these sizes by "
 "clicking and dragging the gap between both partitions.  See the following "
-"screenshot:"
+"screenshot:<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr ""
 "Если будет выбран этот вариант, средство установки покажет остальные разделы "
 "Windows голубым цветом, а будущий раздел с Mageia - тёмно-синим. Размеры "
@@ -1669,20 +1689,45 @@ msgstr ""
 "перетаскиванием риски между ними с помощью указателя мыши. См. приведенный "
 "ниже снимок экрана."
 
+#. type: Content of: <section><itemizedlist><listitem><warning><para>
+#: en/doPartitionDisks.xml:97
+msgid ""
+"This involves shrinking the size of the Windows partition, and therefore is "
+"a risky operation, so you should make sure you have backed up all important "
+"files before proceeding."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><important><para>
+#: en/doPartitionDisks.xml:103
+#, fuzzy
+msgid ""
+"The partition must be \"clean\", meaning that Windows must have closed down "
+"correctly the last time it was used. It must also have been defragmented, "
+"although this is not a guarantee that all files in the partition have been "
+"moved out of the area that is about to be used for Mageia."
+msgstr ""
+"Заметьте, что размер раздела Windows будет уменьшен. Раздел должен быть "
+"«очищен», то есть работа Windows должна быть завершена в штатном режиме во "
+"время последнего сеанса, когда вы пользовались этой операционной системой. "
+"Кроме того, раздел должен быть дефрагментирован, хотя дефрагментация и не "
+"гарантирует полного передвижения файлов с одного места на другое на диске, "
+"который будет использован для Mageia. Мы настоятельно рекомендуем вам "
+"создать резервные копии важных для вас файлов."
+
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:87
+#: en/doPartitionDisks.xml:112
 msgid "<emphasis role=\"bold\">Erase and use Entire Disk</emphasis>"
 msgstr "<emphasis role=\"bold\">Стереть и использовать весь диск</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:90
+#: en/doPartitionDisks.xml:115
 msgid "This option will allocate the entire drive for Mageia"
 msgstr ""
 "При использовании этого варианта для установки Mageia будет использовано всё "
 "место на диске"
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:119
 msgid ""
 "This will erase ALL data on the selected hard drive. Take care! If you "
 "intend to use part of the disk for something else, or you already have data "
@@ -1692,31 +1737,13 @@ msgstr ""
 "впоследствии использована для хранения каких-то данных или на диске уже "
 "хранятся какие-то важные данные, не пользуйтесь этим вариантом."
 
-#. type: Content of: <section><itemizedlist><listitem><important><para>
-#: en/doPartitionDisks.xml:101
-msgid ""
-"Note that this involves shrinking the size of the Windows partition. The "
-"partition must be \"clean\", meaning that Windows must have closed down "
-"correctly the last time it was used. It must also have been defragmented, "
-"although this is not a guarantee that all files in the partition have been "
-"moved out of the area that is about to be used. It is highly recommended to "
-"back up your personal files."
-msgstr ""
-"Заметьте, что размер раздела Windows будет уменьшен. Раздел должен быть "
-"«очищен», то есть работа Windows должна быть завершена в штатном режиме во "
-"время последнего сеанса, когда вы пользовались этой операционной системой. "
-"Кроме того, раздел должен быть дефрагментирован, хотя дефрагментация и не "
-"гарантирует полного передвижения файлов с одного места на другое на диске, "
-"который будет использован для Mageia. Мы настоятельно рекомендуем вам "
-"создать резервные копии важных для вас файлов."
-
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:112
+#: en/doPartitionDisks.xml:127
 msgid "<emphasis role=\"bold\">Custom Disk Partitioning</emphasis>"
 msgstr "<emphasis role=\"bold\">Ручная разметка диска</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:115
+#: en/doPartitionDisks.xml:130
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1724,21 +1751,8 @@ msgstr ""
 "С помощью этого варианта вы можете получить полный доступ к расположению "
 "разделов на вашем диске в соответствии с вашими предпочтениями."
 
-#. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:122
-msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
-
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:131
+#: en/doPartitionDisks.xml:136
 msgid ""
 "If you are not using the <emphasis>Custom disk partitioning</emphasis> "
 "option, then the installer will allocate the available space according to "
@@ -1749,7 +1763,7 @@ msgstr ""
 "правилам:"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:137
+#: en/doPartitionDisks.xml:142
 msgid ""
 "If the total available space is less than 50 GB, then only one partition is "
 "created. This will be the <filename>/</filename> (root)  partition."
@@ -1759,7 +1773,7 @@ msgstr ""
 "создано не будет."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:143
+#: en/doPartitionDisks.xml:148
 msgid ""
 "If the total available space is greater than 50 GB, then three partitions "
 "are created"
@@ -1767,7 +1781,7 @@ msgstr ""
 "Если в целом доступного места более 50 ГБ, то будет создано три раздела"
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:148
+#: en/doPartitionDisks.xml:153
 msgid ""
 "6/19 of the total available place is allocated to <filename>/</filename> "
 "with a maximum of 50 GB"
@@ -1776,18 +1790,18 @@ msgstr ""
 "с максимумом 50 Гб"
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:153
+#: en/doPartitionDisks.xml:158
 msgid "1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB"
 msgstr "1/19 выделяется под <filename>своп</filename> с максимумом 4 Гб"
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:158
+#: en/doPartitionDisks.xml:163
 msgid "the rest (at least 12/19) is allocated to <filename>/home</filename>"
 msgstr ""
 "остальное (по крайней мере 12/19) выделяется под <filename>/home</filename>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:165
+#: en/doPartitionDisks.xml:170
 msgid ""
 "This means that from 160 GB or greater available space, the installer will "
 "create three partitions:"
@@ -1796,22 +1810,22 @@ msgstr ""
 "инсталлятором будет создано три раздела:"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:170
+#: en/doPartitionDisks.xml:175
 msgid "50 GB for <filename>/</filename>"
 msgstr "50 ГБ для <filename>/</filename>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:174
+#: en/doPartitionDisks.xml:179
 msgid "4 GB for <filename>swap</filename>"
 msgstr "4 ГБ для резервной памяти на диске (<filename>свопа</filename>)"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:178
+#: en/doPartitionDisks.xml:183
 msgid "and the remainder for <filename>/home</filename>"
 msgstr "Остальное место будет отдано под <filename>/home</filename>"
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:183
+#: en/doPartitionDisks.xml:188
 msgid ""
 "If you are using a UEFI system, the ESP (EFI System Partition) will be "
 "automatically detected - or created if it does not exist yet - and mounted "
@@ -1826,7 +1840,7 @@ msgstr ""
 "выявление UEFI было выполнено должным образом."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:189
+#: en/doPartitionDisks.xml:194
 msgid ""
 "If you are using a Legacy (also known as BIOS) system with a GPT partitioned "
 "disk, you need to create a BIOS boot partition if it doesn't already exist. "
@@ -1844,23 +1858,28 @@ msgstr ""
 "загрузки BIOS»</quote>."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:196
+#: en/doPartitionDisks.xml:201
 msgid "See <xref linkend=\"diskdrake\"/> for information on how to proceed."
 msgstr ""
 "Дополнительные сведения о дальнейших действиях можно найти в разделе <xref "
 "linkend=\"diskdrake\"/>."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:211
+#: en/doPartitionDisks.xml:216
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4.png"
-"\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks4.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks4.png\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4.png"
-"\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:217
+#: en/doPartitionDisks.xml:226
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
 "previous standard of 512. Due to lack of available hardware, the "
@@ -1873,7 +1892,7 @@ msgstr ""
 "для разделения диска на разделы на таких дисках не выполнялось."
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:222
+#: en/doPartitionDisks.xml:231
 msgid ""
 "Some SSD devices now use an erase block size over 1 MB. If you have such a "
 "device we suggest that you partition the drive in advance, using an "
@@ -1886,17 +1905,17 @@ msgstr ""
 "значений параметров:"
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:229
+#: en/doPartitionDisks.xml:238
 msgid "<emphasis>Align to</emphasis> = MiB"
 msgstr "<emphasis>Выровнять до</emphasis> = Мб"
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:233
+#: en/doPartitionDisks.xml:242
 msgid "<emphasis>Free space preceding (MiB)</emphasis> = 2"
 msgstr "<emphasis>Свободное место перед (Мб)</emphasis> = 2"
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:237
+#: en/doPartitionDisks.xml:246
 msgid ""
 "Also make sure all partitions are created using an even number of megabytes."
 msgstr ""
@@ -2084,12 +2103,12 @@ msgstr ""
 "если хотите узнать больше об участии в сообществе Mageia"
 
 #. type: Content of: <section><info><title>
-#: en/firewall.xml:7
+#: en/firewall.xml:16
 msgid "Firewall"
 msgstr "Файервол"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:10
+#: en/firewall.xml:19
 msgid ""
 "This section allows you to configure some simple firewall rules: they "
 "determine which type of message from the Internet will be accepted by the "
@@ -2101,8 +2120,18 @@ msgstr ""
 "будет приемлемым для системы назначения. Это соответствующим образом сделает "
 "доступ к соответствующим службам системы из сети Интернет."
 
+#. type: Content of: <section><mediaobject>
+#: en/firewall.xml:26
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-firewall.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome.png\"/> </"
+"imageobject>"
+
 #. type: Content of: <section><para>
-#: en/firewall.xml:16
+#: en/firewall.xml:31
 msgid ""
 "In the default setting (no button is checked), no service of the system is "
 "accessible from the network. The <emphasis>Everything (no firewall)</"
@@ -2123,7 +2152,7 @@ msgstr ""
 "тестирования или диагностики."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:25
+#: en/firewall.xml:40
 msgid ""
 "All other options are more or less self-explanatory. As an example, you will "
 "enable the CUPS server if you want printers on your machine to be accessible "
@@ -2134,12 +2163,12 @@ msgstr ""
 "из сети."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:29
+#: en/firewall.xml:44
 msgid "<emphasis role=\"bold\">Advanced</emphasis>"
 msgstr "<emphasis role=\"bold\">Дополнительно</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:31
+#: en/firewall.xml:46
 msgid ""
 "The <emphasis>Advanced</emphasis> option opens a window where you can enable "
 "a series of services by typing a list of <quote>couples</quote> (blank "
@@ -2152,33 +2181,37 @@ msgstr ""
 "(разделённых пробелами)."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:35
-msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
+#: en/firewall.xml:50
+#, fuzzy
+msgid "<emphasis>&lt;port-number&gt;/&lt;protocol&gt;</emphasis>"
 msgstr "<emphasis>&lt;номер порта>/&lt;протокол></emphasis>"
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:38
+#: en/firewall.xml:53
+#, fuzzy
 msgid ""
-"- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
-"the service you want to enable (e.g. 873 for the RSYNC service) as defined "
-"in <emphasis>RFC-433</emphasis>;"
+"- <emphasis>&lt;port-number&gt;</emphasis> is the value of the port assigned "
+"to the service you want to enable (e.g. 873 for the RSYNC service) as "
+"defined in <emphasis>RFC-433</emphasis>;"
 msgstr ""
 "- <emphasis>&lt;номер порта></emphasis> - значение номера порта, связанного "
 "со службой, доступ к которой вы хотите открыть (например, 873 для службы "
 "RSYNC). Номер определяется по протоколу <emphasis>RFC-433</emphasis>;"
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:42
+#: en/firewall.xml:57
+#, fuzzy
 msgid ""
-"- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
-"<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
+"- <emphasis>&lt;protocol&gt;</emphasis> is one of <emphasis>TCP</emphasis> "
+"or <emphasis>UDP</emphasis> - the internet protocol that is used by the "
+"service."
 msgstr ""
 "- <emphasis>&lt;протокол></emphasis> - одно из значений, <emphasis>TCP</"
 "emphasis> или <emphasis>UDP</emphasis> - интернет-протокол, который будет "
 "использоваться для обмена данными со службой."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:47
+#: en/firewall.xml:62
 msgid ""
 "For instance, the entry for enabling access to the RSYNC service therefore "
 "is <emphasis>873/tcp</emphasis>."
@@ -2187,7 +2220,7 @@ msgstr ""
 "<emphasis>873/tcp</emphasis>."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:50
+#: en/firewall.xml:65
 msgid ""
 "In case a service is implemented to use both protocols, you specify 2 "
 "couples for the same port."
@@ -2276,12 +2309,12 @@ msgid "Graphical Configuration"
 msgstr "Настройка графики"
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:32
+#: en/installer.xml:34
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, программа для установки Mageia"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:35
+#: en/installer.xml:37
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -2292,12 +2325,12 @@ msgstr ""
 "системы прошло как можно проще для вас."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:40
+#: en/installer.xml:42
 msgid "The installation steps"
 msgstr "Шаги установки"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:44
+#: en/installer.xml:46
 msgid ""
 "The install process is divided into a number of steps - the status of which "
 "is indicated in a panel to the left of the screen."
@@ -2306,7 +2339,7 @@ msgstr ""
 "будет показан на левой боковой панели экрана."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:50
+#: en/installer.xml:52
 msgid ""
 "Each step has one or more screens, which may also have <emphasis>Advanced</"
 "emphasis> sections with extra, less commonly required options."
@@ -2317,7 +2350,7 @@ msgstr ""
 "так часто как основными."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:56
+#: en/installer.xml:58
 msgid ""
 "Most screens have <emphasis>Help</emphasis> buttons for further details "
 "about the particular step."
@@ -2327,7 +2360,7 @@ msgstr ""
 "текущего шага."
 
 #. type: Content of: <section><section><caution><para>
-#: en/installer.xml:62
+#: en/installer.xml:64
 msgid ""
 "If at some point during the install you decide to abort the installation, it "
 "is possible to reboot, but please think twice before you do this. Once a "
@@ -2342,7 +2375,7 @@ msgstr ""
 "Перезагрузка может привести к невозможности использования системы."
 
 #. type: Content of: <section><section><caution><para>
-#: en/installer.xml:68
+#: en/installer.xml:70
 msgid ""
 "If, in spite of this, you are very sure rebooting is what you want, go to a "
 "text terminal by pressing the keys <keycombo> <keycap>Ctrl</keycap> "
@@ -2358,12 +2391,12 @@ msgstr ""
 "keycombo> одновременно, чтобы перезагрузить компьютер."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:86
+#: en/installer.xml:88
 msgid "Installation Welcome Screen"
 msgstr "Приветственное окно программы установки"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:88
+#: en/installer.xml:90
 msgid ""
 "The particular screen that you will first see when booting from the "
 "Installation media will depend on whether your computer motherboard is of "
@@ -2374,7 +2407,7 @@ msgstr ""
 "устаревшей микропрограммы (BIOS) или UEFI."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:92
+#: en/installer.xml:94
 msgid ""
 "The welcome menu screen has various options, however the default option will "
 "start the installer, and is normally all that you will need."
@@ -2384,12 +2417,12 @@ msgstr ""
 "именно тот пункт, который вам нужен."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:97
+#: en/installer.xml:99
 msgid "Legacy (BIOS) Systems"
 msgstr "Устаревшие системы (BIOS)"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:100
+#: en/installer.xml:102
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome.png\"/> </"
 "imageobject>"
@@ -2398,7 +2431,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:111
+#: en/installer.xml:113
 msgid ""
 "Install Mageia to a hard disk. This is the default option, and will "
 "automatically start after a short while unless another option is selected."
@@ -2407,12 +2440,12 @@ msgstr ""
 "в течение определённого времени не будет выбран другой вариант."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:117
+#: en/installer.xml:119
 msgid "<emphasis role=\"bold\">Rescue System</emphasis>"
 msgstr "<emphasis role=\"bold\">Спасение системы</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:119
+#: en/installer.xml:121
 msgid ""
 "This option allows you to either re-install the bootloader for an existing "
 "Mageia installation or you can use it to restore a Windows bootloader."
@@ -2421,22 +2454,22 @@ msgstr ""
 "установленной Mageia, или восстановить загрузчик Windows."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:132
+#: en/installer.xml:134
 msgid "<emphasis role=\"bold\">F2: Language</emphasis>"
 msgstr "<emphasis role=\"bold\">F2: Язык</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:134
+#: en/installer.xml:136
 msgid "Press F2 for alternative languages."
 msgstr "Нажмите F2, если хотите выбрать другой язык."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:140
+#: en/installer.xml:142
 msgid "UEFI Systems"
 msgstr "Системы UEFI"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:142
+#: en/installer.xml:144
 msgid ""
 "From this screen, you can access options by pressing <keycap>e</keycap> to "
 "enter the edit mode. To come back to this screen, press <keycap>Esc</keycap> "
@@ -2449,7 +2482,7 @@ msgstr ""
 "и выйти из режима редактирования."
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:148
+#: en/installer.xml:150
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome2.png\"/> </"
 "imageobject>"
@@ -2458,13 +2491,13 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:157
+#: en/installer.xml:159
 msgid "<emphasis role=\"bold\">Install:</emphasis> Start the Install process"
 msgstr ""
 "<emphasis role=\"bold\">Установить:</emphasis> начать процедуру установки"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:162
+#: en/installer.xml:164
 msgid ""
 "<emphasis role=\"bold\">Rescue:</emphasis> This option allows you to either "
 "re-install the bootloader for an existing Mageia installation or you can use "
@@ -2475,7 +2508,7 @@ msgstr ""
 "восстановить загрузчик Windows."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:169
+#: en/installer.xml:171
 msgid ""
 "<emphasis role=\"bold\">F2: Language:</emphasis> Press <keycap>F2</keycap> "
 "for alternative languages."
@@ -2484,7 +2517,7 @@ msgstr ""
 "чтобы изменить язык."
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:174
+#: en/installer.xml:176
 msgid ""
 "If you booted from a USB stick, you will see the above options duplicated, "
 "and in this case, you should use the set that will be suffixed with \"USB\"."
@@ -2494,17 +2527,17 @@ msgstr ""
 "одну из этих строк."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:181
+#: en/installer.xml:183
 msgid "Installation Problems and Possible Solutions"
 msgstr "Проблемы с установкой и возможные пути их решения"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:184
+#: en/installer.xml:186
 msgid "No Graphical Interface"
 msgstr "Нет графического интерфейса"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:188
+#: en/installer.xml:190
 msgid ""
 "After the initial screen you did not progress to the <emphasis>Language "
 "Selection</emphasis> screen. This can happen with some graphic cards and "
@@ -2517,7 +2550,7 @@ msgstr ""
 "разрешения. Для этого впишите <command>vgalo</command> в строку запроса."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:195
+#: en/installer.xml:197
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
 "In this case it is worth trying a text-mode installation. To use this press "
@@ -2537,12 +2570,12 @@ msgstr ""
 "текстовом режиме."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:208
+#: en/installer.xml:210
 msgid "The Install Freezes"
 msgstr "Остановка установки"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:210
+#: en/installer.xml:212
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic hardware "
@@ -2559,12 +2592,12 @@ msgstr ""
 "командами."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:218
+#: en/installer.xml:220
 msgid "RAM problem"
 msgstr "Проблемы с RAM (оперативной памятью)"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:220
+#: en/installer.xml:222
 msgid ""
 "This will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
@@ -2581,12 +2614,12 @@ msgstr ""
 "соответствует 256 МБ оперативной памяти."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:228
+#: en/installer.xml:230
 msgid "Dynamic partitions"
 msgstr "Динамические разделы"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:230
+#: en/installer.xml:232
 msgid ""
 "If you converted your hard disk from <literal>Basic</literal> format to "
 "<literal>Dynamic</literal> format in Microsoft Windows, then it is not "
@@ -4628,22 +4661,29 @@ msgstr ""
 "wiki.mageia.org/en/Grub2-efi_and_Mageia</link>"
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:27
+#: en/setupBootloader.xml:32
 msgid "Bootloader"
 msgstr "Начальный загрузчик"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:31
+#: en/setupBootloader.xml:36
+#, fuzzy
+msgid "Available Bootloaders"
+msgstr "Начальный загрузчик"
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:39
 msgid "Grub2"
 msgstr "Grub2"
 
-#. type: Content of: <section><section><itemizedlist><title>
-#: en/setupBootloader.xml:34
-msgid "Grub2 on Legacy MBR/GPT systems"
-msgstr "Grub2 для устаревших систем с MBR/GPT"
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:42
+#, fuzzy
+msgid "<emphasis role=\"bold\">Grub2 on Legacy MBR/GPT systems</emphasis>"
+msgstr "<emphasis role=\"bold\">Спасение системы</emphasis>"
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:37
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:46
 msgid ""
 "GRUB2 (with or without graphical menu) will be used exclusively as the "
 "bootloader for a Legacy/MBR or Legacy/GPT system."
@@ -4651,8 +4691,8 @@ msgstr ""
 "GRUB2 (с графическим меню или без него) будет единственным вариантом "
 "загрузчика для устаревших систем с MBR или GPT."
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:42
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:52
 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."
@@ -4660,18 +4700,20 @@ msgstr ""
 "По умолчанию новый загрузчик будет записан в MBR (Master Boot Record) вашего "
 "первого диска, или в загрузочный раздел BIOS."
 
-#. type: Content of: <section><section><itemizedlist><title>
-#: en/setupBootloader.xml:49
-msgid "Grub2-efi on UEFI systems"
-msgstr "Grub2-efi в системах UEFI"
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:59
+#, fuzzy
+msgid "<emphasis role=\"bold\">Grub2-efi on UEFI systems</emphasis>"
+msgstr "<emphasis role=\"bold\">Спасение системы</emphasis>"
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:52
-msgid "GRUB2-efi will be used exclusively as the bootloader for a UEFI system."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:63
+#, fuzzy
+msgid "GRUB2-efi or rEFInd may be used as the bootloader for a UEFI system."
 msgstr "Для систем UEFI используется только загрузчик GRUB2-efi."
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:57
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:68
 msgid ""
 "By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI "
 "System Partition)."
@@ -4679,12 +4721,13 @@ msgstr ""
 "По умолчанию новый загрузчик (Grub2-efi) будет записан в ESP (системный "
 "раздел EFI)."
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:60
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:71
+#, fuzzy
 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 "
-"created by Windows and add grub2-efi to it. If no ESP exists, then one will "
+"created by Windows and add grub2-efi to it.  If no ESP exists, then one will "
 "be created. Although it is possible to have several ESPs, only one is "
 "required, whatever the number of operating systems you have."
 msgstr ""
@@ -4695,18 +4738,46 @@ msgstr ""
 "ограничиться одним таким разделом, поскольку его достаточно для "
 "произвольного количества установленных вами операционных систем."
 
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:82
+msgid "rEFInd"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:85
+#, fuzzy
+msgid "<emphasis role=\"bold\">rEFInd on UEFI systems</emphasis>"
+msgstr "<emphasis role=\"bold\">Пиктограмма</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:88
+msgid ""
+"rEFInd has a nice graphical set of options, and can auto-detect installed "
+"EFI bootloaders. See: http://www.rodsbooks.com/refind/"
+msgstr ""
+
+#. type: Content of: <section><section><section><note><para>
+#: en/setupBootloader.xml:95
+msgid ""
+"Please note that in order to be able to use the <literal>rEFInd</literal> "
+"option, an installed EFI System Partition must match your system "
+"architecture: if you have a 32bit EFI System Partition installed on a 64bit "
+"machine for instance, then the rEFInd option will not be displayed/available "
+"to you."
+msgstr ""
+
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:72
+#: en/setupBootloader.xml:106
 msgid "Bootloader Setup"
 msgstr "Настройка загрузчика"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:76
+#: en/setupBootloader.xml:110
 msgid "Bootloader main options"
 msgstr "Основные параметры загрузчика"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:79
+#: en/setupBootloader.xml:113
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader.png\"/> </imageobject> <imageobject condition=\"live"
@@ -4719,38 +4790,59 @@ msgstr ""
 "im1\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:91
+#: en/setupBootloader.xml:125
 msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
 msgstr "<emphasis role=\"bold\">Использовать загрузчик</emphasis>"
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:93
+#. type: Content of: <section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:129
 msgid ""
-"This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI "
-"systems will not see this option here."
+"<guimenuitem>GRUB2</guimenuitem> (with either a graphical or a text menu), "
+"can be chosen for both <literal>Legacy MBR/BIOS</literal> systems and "
+"<literal>UEFI</literal> systems."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:136
+msgid ""
+"<guimenuitem>rEFInd</guimenuitem> (with a graphical menu)  is an alternative "
+"option solely for use with <literal>UEFI</literal> systems."
 msgstr ""
-"Этой возможностью можно воспользоваться только на устаревших системах MBR/"
-"BIOS. Пользователи систем UEFI её не увидят."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:98
+#: en/setupBootloader.xml:144
 msgid "<emphasis role=\"bold\">Boot device</emphasis>"
 msgstr "<emphasis role=\"bold\">Загрузочное устройство</emphasis>"
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:100
-msgid "Don't change this unless you really know what you are doing"
+#. type: Content of: <section><section><section><itemizedlist><listitem><warning><para>
+#: en/setupBootloader.xml:147
+#, fuzzy
+msgid "Don't change this unless you really know what you are doing."
 msgstr "Не вносите изменений, если не уверены в их последствиях"
 
+#. type: Content of: <section><section><section><itemizedlist><listitem><note><para>
+#: en/setupBootloader.xml:152
+msgid ""
+"There is no option to write GRUB to the boot sector of a partition (e.g: "
+"<filename>sda1</filename>), as this method is considered unreliable."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:157
+msgid ""
+"When using UEFI mode, then the <guilabel>Boot device</guilabel> will be "
+"listed as <guimenuitem>EFI System Partition</guimenuitem>."
+msgstr ""
+
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:105
+#: en/setupBootloader.xml:163
 msgid ""
 "<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
 msgstr ""
 "<emphasis role=\"bold\">Пауза перед загрузкой основной системы</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:108
+#: en/setupBootloader.xml:166
 msgid ""
 "This text box lets you set a delay, in seconds, before the default operating "
 "system is started up."
@@ -4759,12 +4851,12 @@ msgstr ""
 "операционной системы по умолчанию."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:113
+#: en/setupBootloader.xml:171
 msgid "<emphasis role=\"bold\">Security</emphasis>"
 msgstr "<emphasis role=\"bold\">Безопасность</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:115
+#: en/setupBootloader.xml:173
 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 "
@@ -4779,19 +4871,19 @@ msgstr ""
 "будет выбрать на следующем этапе."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:126
+#: en/setupBootloader.xml:184
 msgid "Choose a password for the bootloader (optional)"
 msgstr ""
 "С помощью этого поля для ввода текста вы можете указать пароль для "
 "загрузчика (опционально)."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:130
+#: en/setupBootloader.xml:188
 msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
 msgstr "<emphasis role=\"bold\">Пароль (ещё раз)</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:132
+#: en/setupBootloader.xml:190
 msgid ""
 "Retype the password and DrakX will check that it matches with the one set "
 "above"
@@ -4800,17 +4892,17 @@ msgstr ""
 "введённый повторно пароль с его первоначальным вариантом."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:137 en/setupBootloader.xml:212
+#: en/setupBootloader.xml:195 en/setupBootloader.xml:308
 msgid "<emphasis>Advanced</emphasis>"
 msgstr "<emphasis>Дополнительно</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:141
+#: en/setupBootloader.xml:199
 msgid "<emphasis>Enable ACPI</emphasis>"
 msgstr "<emphasis>Включить ACPI</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:143
+#: en/setupBootloader.xml:201
 msgid ""
 "ACPI (Advanced Configuration and Power Interface) is a standard for power "
 "management. It can save energy by stopping unused devices. Deselecting it "
@@ -4827,12 +4919,12 @@ msgstr ""
 "(например неожиданные перезагрузки системы или «зависания» системы)."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:152
+#: en/setupBootloader.xml:210
 msgid "<emphasis>Enable SMP</emphasis>"
 msgstr "<emphasis>Включить SMP</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:154
+#: en/setupBootloader.xml:212
 msgid ""
 "This option enables/disables symmetric multiprocessing for multi-core "
 "processors"
@@ -4842,12 +4934,12 @@ msgstr ""
 "процессор."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:159
+#: en/setupBootloader.xml:217
 msgid "<emphasis>Enable APIC</emphasis>"
 msgstr "<emphasis>Включить APIC</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:161
+#: en/setupBootloader.xml:219
 msgid ""
 "Enabling this gives the operating system access to the Advanced Programmable "
 "Interrupt Controller. APIC devices permit more complex priority models, and "
@@ -4860,12 +4952,12 @@ msgstr ""
 "(запросами в отношении прерываний)."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:168
+#: en/setupBootloader.xml:226
 msgid "<emphasis>Enable Local APIC</emphasis>"
 msgstr "<emphasis>Включить локальный APIC</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:170
+#: en/setupBootloader.xml:228
 msgid ""
 "Here you can set Local APIC, which manages all external interrupts for a "
 "specific processor in an SMP system"
@@ -4875,12 +4967,70 @@ msgstr ""
 "системах."
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:177
+#: en/setupBootloader.xml:235
 msgid "Bootloader Configuration"
 msgstr "Настройка загрузчика"
 
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:237
+msgid ""
+"If, in the previous section you selected <literal>rEFInd</literal> as the "
+"bootloader to use, you would then be presented with the options shown in the "
+"screenshot directly below. Otherwise, please instead move on to the "
+"subsequent screenshot for your options."
+msgstr ""
+
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:180
+#: en/setupBootloader.xml:243
+#, fuzzy
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"rEFIndLoaderConfig.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-rEFIndLoaderConfig.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:253
+#, fuzzy
+msgid "Your rEFInd configuration options:"
+msgstr "Настройка звука"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:256
+msgid ""
+"<guimenuitem>Install or update rEFInd in the EFI system partition.</"
+"guimenuitem>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:261
+msgid ""
+"<guimenuitem>Install in EFI/Boot partition (workaround for some BIOS's).</"
+"guimenuitem>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:264
+msgid ""
+"With some BIOS's, the newly written bootloaser for Mageia at end of the "
+"installation will not be recognized. In that case, you can use this option "
+"as a workaround for the issue."
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:270
+msgid ""
+"If you did not select rEFInd as the bootloader to use in the previous "
+"section, then your bootloader configurations are shown below:"
+msgstr ""
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:275
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -4893,22 +5043,22 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:191
+#: en/setupBootloader.xml:286
 msgid "<emphasis role=\"bold\">Default</emphasis>"
 msgstr "<emphasis role=\"bold\">По умолчанию</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:193
+#: en/setupBootloader.xml:288
 msgid "The operating system to be started up by default."
 msgstr "Типичный вариант операционной системы для загрузки."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:197
+#: en/setupBootloader.xml:292
 msgid "<emphasis role=\"bold\">Append</emphasis>"
 msgstr "<emphasis role=\"bold\">Присоединить</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:199
+#: en/setupBootloader.xml:294
 msgid ""
 "This option lets you pass information to the kernel or tell the kernel to "
 "give you more information as it boots."
@@ -4918,23 +5068,24 @@ msgstr ""
 "время загрузки системы."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:204
+#: en/setupBootloader.xml:299
 msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
 msgstr "<emphasis role=\"bold\">Зондирование посторонней ОС</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:206
+#: en/setupBootloader.xml:301
+#, fuzzy
 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, "
-"then untick the Probe Foreign OS option."
+"then untick the <guimenuitem>Probe Foreign OS</guimenuitem> option."
 msgstr ""
 "Если на компьютере уже установлены другие операционные системы, Mageia "
 "попытается добавить эти системы к вашему новому меню загрузки Mageia. Если "
 "вам это не нужно, снимите отметку с пункта Зондирования посторонней ОС."
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:215
+#: en/setupBootloader.xml:311
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader4.png\"/> </imageobject> <imageobject condition=\"live"
@@ -4947,12 +5098,12 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:226
+#: en/setupBootloader.xml:322
 msgid "<emphasis>Video mode</emphasis>"
 msgstr "<emphasis>Видеорежим</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:228
+#: en/setupBootloader.xml:324
 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 "
@@ -4964,17 +5115,18 @@ msgstr ""
 "цветов, которыми можно воспользоваться."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:234
+#: en/setupBootloader.xml:330
 msgid "<emphasis>Do not touch ESP or MBR</emphasis>"
 msgstr "<emphasis>Не трогайте ESP или MBR</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:236
+#: en/setupBootloader.xml:332
+#, fuzzy
 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 "
-"missing. Click<emphasis> Ok</emphasis> if you are sure you understand the "
-"implications, and wish to proceed."
+"missing. Click <guimenuitem>Ok </guimenuitem>only if you are sure you "
+"understand the implications, and wish to proceed."
 msgstr ""
 "Выберите этот вариант, если вам не нужна отдельная загружаемая версия "
 "Mageia, а нужна лишь система, которая будет использоваться в цепной загрузке "
@@ -4982,8 +5134,17 @@ msgstr ""
 "устанавливается загрузчик. Нажмите кнопку <emphasis>ОК</emphasis>, если вы "
 "уверены в последствиях и хотите продолжить установку."
 
+#. type: Content of: <section><section><section><itemizedlist><listitem><warning><para>
+#: en/setupBootloader.xml:338
+msgid ""
+"Chain-loading via legacy bootloaders (GRUB Legacy and LiLo)  is no longer "
+"supported by Mageia as it is likely to fail when attempting to boot this "
+"resulting installation of Mageia. If you use anything other than GRUB2 or "
+"rEFInd for this purpose, then you do so at your own risk!"
+msgstr ""
+
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:245
+#: en/setupBootloader.xml:348
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png"
 "\"/> </imageobject>"
@@ -4992,17 +5153,17 @@ msgstr ""
 "\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:253
+#: en/setupBootloader.xml:356
 msgid "Other Options"
 msgstr "Другие варианты"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:256
+#: en/setupBootloader.xml:359
 msgid "Using an existing bootloader"
 msgstr "Использование уже установленного загрузчика"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:258
+#: en/setupBootloader.xml:361
 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 "
@@ -5018,12 +5179,12 @@ msgstr ""
 "приведены в документации к другой операционной системе."
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:267
+#: en/setupBootloader.xml:370
 msgid "Installing Without a Bootloader"
 msgstr "Установка без загрузчика"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:269
+#: en/setupBootloader.xml:372
 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 "
@@ -5452,3 +5613,46 @@ msgstr ""
 "На следующем шаге произойдёт копирование файлов на жёсткий диск. Эта "
 "процедура займёт несколько минут. В конце процедуры вы определённое время "
 "будете видеть пустой экран. Это нормально."
+
+#~ msgid ""
+#~ "Type in the user password. There is a shield at the end of the text box "
+#~ "that indicates the strength of the password. (See also <xref linkend="
+#~ "\"givePassword\"/>)"
+#~ msgstr ""
+#~ "В этом поле вы должны указать пароль. Цвет отметки щита рядом с этим "
+#~ "полем соответствует сложности пароля (см. также <xref linkend="
+#~ "\"givePassword\"/>)"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> "
+#~ "</imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> "
+#~ "</imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4."
+#~ "png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4."
+#~ "png\"/> </imageobject>"
+
+#~ msgid "Grub2 on Legacy MBR/GPT systems"
+#~ msgstr "Grub2 для устаревших систем с MBR/GPT"
+
+#~ msgid "Grub2-efi on UEFI systems"
+#~ msgstr "Grub2-efi в системах UEFI"
+
+#~ msgid ""
+#~ "This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI "
+#~ "systems will not see this option here."
+#~ msgstr ""
+#~ "Этой возможностью можно воспользоваться только на устаревших системах MBR/"
+#~ "BIOS. Пользователи систем UEFI её не увидят."
diff --git a/docs/docs/stable/installer/sk.po b/docs/docs/stable/installer/sk.po
index 704eb603..e6575fce 100644
--- a/docs/docs/stable/installer/sk.po
+++ b/docs/docs/stable/installer/sk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2019-01-19 21:23+0200\n"
+"POT-Creation-Date: 2019-09-08 15:26+0300\n"
 "PO-Revision-Date: 2019-01-19 19:25+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Slovak (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -142,7 +142,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/addUser.xml:3
+#: en/addUser.xml:9
 msgid "User Management"
 msgstr ""
 
@@ -152,46 +152,57 @@ msgstr ""
 #. 2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
 #.   Also changed 'Advanced User Management' to 'User Management (advanced)'.
 #. 2018/02/24 apb: Changed list style.
+#. 2019/08/10 apb: Added missing 'condition' profile for live-user1.png.
+#. 2019/08/11 apb: [1] Reword 1.1 (including Note) [2] Reword 1.2 Password text.
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:12
+#: en/addUser.xml:28
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
-"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
-"\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata format="
-"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-setRootPassword.png\" format=\"PNG\" revision=\"1\" xml:id="
+"\"setRootPassword-im1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-user1.png\" format=\"PNG\"/> </imageobject>"
 msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
+"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:21
+#: en/addUser.xml:40
 msgid "Set Administrator (root)  Password:"
 msgstr "Nastavenie správcovho (rootovho) hesla:"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:24
+#: en/addUser.xml:44
 msgid ""
 "It is advisable for all Mageia installations to set a <literal>superuser</"
 "literal> (Administrator) password, usually called the <emphasis>root </"
-"emphasis>password in Linux. As you type a password into the top box a shield "
-"will change from red-to-yellow-to-green depending on the strength of the "
-"password. A green shield shows you are using a strong password. You need to "
-"repeat the same password in the box underneath, to check that the first "
-"entry was not mistyped."
+"emphasis>password in Linux. You need to repeat the same password in the box "
+"underneath, to check that the first entry was not mistyped."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:32
+#: en/addUser.xml:51
+msgid ""
+"As you type a password into the top box a shield will change from red-to-"
+"yellow-to-green depending on the strength of the password. A green shield "
+"shows you are using a strong password."
+msgstr ""
+
+#. type: Content of: <section><section><note><para>
+#: en/addUser.xml:55
 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:39
+#: en/addUser.xml:63
 msgid "Enter a user"
 msgstr "Pridať používateľa"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:41
+#: en/addUser.xml:66
 msgid ""
 "Add a User here. A regular user has fewer privileges than the "
 "<literal>superuser</literal> (root), but enough to use the Internet, office "
@@ -200,39 +211,39 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:47
+#: en/addUser.xml:73
 msgid "<emphasis role=\"bold\">Icon</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:48
+#: en/addUser.xml:75
 msgid "Click on this button if you want to change the user's icon"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:52
+#: en/addUser.xml:80
 msgid "<emphasis role=\"bold\">Real Name</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:53
+#: en/addUser.xml:82
 msgid "Insert the user's real name into this text box"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:56
+#: en/addUser.xml:86
 msgid "<emphasis role=\"bold\">Login Name</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:57
+#: en/addUser.xml:88
 msgid ""
 "Enter the user login name or let DrakX use a version of the user's real "
 "name. <emphasis role=\"bold\">The login name is case-sensitive.</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><caution><simpara>
-#: en/addUser.xml:61
+#: en/addUser.xml:93
 msgid ""
 "The login entered here should be different to any login currently in use for "
 "your <filename>/home</filename> directory. Some user parameters will be "
@@ -241,34 +252,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:65 en/setupBootloader.xml:124
+#: en/addUser.xml:102 en/setupBootloader.xml:182
 msgid "<emphasis role=\"bold\">Password</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:66
-msgid ""
-"Type in the user password. There is a shield at the end of the text box that "
-"indicates the strength of the password. (See also <xref linkend="
-"\"givePassword\"/>)"
+#: en/addUser.xml:104
+msgid "Type in the user password (remembering the advice in the Note above)."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:68
+#: en/addUser.xml:107
 msgid ""
 "<emphasis role=\"bold\">Password (again):</emphasis> Retype the user "
 "password. DrakX will check that you have not mistyped the password."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:74
+#: en/addUser.xml:114
 msgid ""
 "Any users added while installing Mageia, will have a home directory that is "
 "both read and write protected (umask=0027)"
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:76
+#: en/addUser.xml:117
 msgid ""
 "You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
@@ -276,24 +284,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:79
+#: en/addUser.xml:121
 msgid "The access permissions can also be changed after the install."
 msgstr "Prístupové oprávnenia možno meniť aj po inštalácii."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:85
+#: en/addUser.xml:128
 msgid "User Management (advanced)"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:87
+#: en/addUser.xml:131
 msgid ""
 "The <emphasis>Advanced</emphasis> option allows you to edit further settings "
 "for the user you are adding."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:91
+#: en/addUser.xml:136
 msgid ""
 "<emphasis>Shell</emphasis>: This drop-down list allows you to change the "
 "shell available to any user you added in the previous screen. Options are "
@@ -301,7 +309,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:143
 msgid ""
 "<emphasis>User ID</emphasis>: Here you can set the user ID for any user you "
 "added in the previous screen. If you are unsure what the purpose of this is, "
@@ -309,7 +317,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:102
+#: en/addUser.xml:149
 msgid ""
 "<emphasis>Group ID</emphasis>: This lets you set the group ID.  Again, if "
 "unsure, leave it blank."
@@ -429,24 +437,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:23
+#: en/bootLive.xml:10
 msgid "Boot Mageia as Live system"
 msgstr "Zaviesť Mageiu ako Živý systém"
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:28
+#: en/bootLive.xml:14
 msgid "Booting the medium"
 msgstr "Zavedenie z dátového nosiča"
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:31
+#: en/bootLive.xml:16
 msgid ""
 "You can boot directly from a Live DVD or USB. Usually, you just need to plug "
 "the USB device in or place the DVD in the drive and restart the computer."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:35
+#: en/bootLive.xml:19
 msgid ""
 "If the computer does not automatically boot from the USB or DVD you may need "
 "to reconfigure your BIOS Boot Disk priority. Alternatively, you might try "
@@ -455,7 +463,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><tip><para>
-#: en/bootLive.xml:41
+#: en/bootLive.xml:24
 msgid ""
 "To access the BIOS or boot menu when the computer is starting, you can try "
 "pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or <keycap>Esc</"
@@ -465,7 +473,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/bootLive.xml:50
+#: en/bootLive.xml:32
 msgid ""
 "The actual screen that you will first see when booting from the Live media "
 "will depend on whether your computer motherboard is of the Legacy (BIOS) or "
@@ -473,91 +481,93 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:58
+#: en/bootLive.xml:39
 msgid "In BIOS/CSM/Legacy mode"
 msgstr "V zastaralom BIOS/CSM režime"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:62
+#: en/bootLive.xml:42
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"../live-bootCSM.png\" align=\"center\"/> "
+"</imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:67
+#: en/bootLive.xml:46
 msgid "First screen while booting in BIOS mode"
 msgstr "Prvá obrazovka počas spúšťania v BIOSovom režime"
 
 #. type: Content of: <section><section><section><itemizedlist><title>
-#: en/bootLive.xml:72 en/bootLive.xml:144 en/installer.xml:106
-#: en/installer.xml:154
+#: en/bootLive.xml:50 en/bootLive.xml:104 en/installer.xml:108
+#: en/installer.xml:156
 msgid "Menu"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:75 en/bootLive.xml:147
+#: en/bootLive.xml:52 en/bootLive.xml:106
 msgid "<emphasis role=\"bold\">Boot Mageia</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:77
+#: en/bootLive.xml:53
 msgid ""
 "This option will boot the Mageia Live system from the connected DVD/USB "
 "media (expect a very slow system compared to an installed OS)."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:81
+#: en/bootLive.xml:56
 msgid "Once the boot is done, you can proceed to the installation."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:86 en/bootLive.xml:102
+#: en/bootLive.xml:60 en/bootLive.xml:72
 msgid ""
 "<emphasis role=\"bold\">+ use non-free video drivers (slower to boot)</"
 "emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:89
+#: en/bootLive.xml:62
 msgid "Boot the Mageia Live system using non-free video drivers"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:96 en/bootLive.xml:155 en/installer.xml:109
+#: en/bootLive.xml:68 en/bootLive.xml:112 en/installer.xml:111
 msgid "<emphasis role=\"bold\">Install Mageia</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:98 en/bootLive.xml:157
+#: en/bootLive.xml:69 en/bootLive.xml:113
 msgid "This option will install Mageia to a hard disk."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:105
+#: en/bootLive.xml:74
 msgid "Install Mageia using non-free video drivers"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:111 en/installer.xml:125
+#: en/bootLive.xml:79 en/installer.xml:127
 msgid "<emphasis role=\"bold\">Memory Test</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:113 en/installer.xml:127
+#: en/bootLive.xml:80 en/installer.xml:129
 msgid ""
 "Test the installed RAM by performing multiple read and write operations. "
 "Reboot to end the test."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:118 en/bootLive.xml:161
+#: en/bootLive.xml:84 en/bootLive.xml:116
 msgid "<emphasis role=\"bold\"> F2 Language</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:120 en/bootLive.xml:163
+#: en/bootLive.xml:85 en/bootLive.xml:117
 msgid ""
 "Press <keycap>F2</keycap> to have the installer use a specific language "
 "during the installation. Use the arrow keys to select the language then "
@@ -565,24 +575,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:129
+#: en/bootLive.xml:93
 msgid "In UEFI mode"
 msgstr "V UEFI režime"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:133
+#: en/bootLive.xml:96
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
+"> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:139
+#: en/bootLive.xml:100
 msgid "First screen while booting in UEFI mode"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:149
+#: en/bootLive.xml:107
 msgid ""
 "This option will boot the Mageia Live system from the connected DVD/USB "
 "media (expect a very slow system compared to an installed OS).  Once the "
@@ -590,7 +603,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/bootLive.xml:170
+#: en/bootLive.xml:123
 msgid ""
 "If you booted from a USB stick, you will see the above menu options "
 "duplicated, and in this case, you should choose from the menu pair that will "
@@ -809,12 +822,12 @@ msgstr ""
 "všetky nastavené na miestny čas, alebo všetky na UTC/GMT."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:24
+#: en/configureX_card_list.xml:27
 msgid "Choose an X Server (Configure your Graphic Card)"
 msgstr "Výber X Servera (Konfigurácia vašej grafickej karty)"
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_card_list.xml:29
+#: en/configureX_card_list.xml:32
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_card_list."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_card_list-im1\"/> </"
@@ -822,7 +835,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:35
+#: en/configureX_card_list.xml:38
 msgid ""
 "DrakX has a very comprehensive database of video cards and will usually "
 "correctly identify your video device."
@@ -831,7 +844,7 @@ msgstr ""
 "identifikuje video zariadenie."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:38
+#: en/configureX_card_list.xml:41
 msgid ""
 "If the installer has not correctly detected your graphic card and you know "
 "which one you have, you can select it from the tree by:"
@@ -840,22 +853,22 @@ msgstr ""
 "viete, akú máte kartu, môžete ju vybrať zo stromu:"
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_card_list.xml:41 en/configureX_monitor.xml:74
+#: en/configureX_card_list.xml:44 en/configureX_monitor.xml:78
 msgid "Vendor"
 msgstr "Výrobca"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:45
+#: en/configureX_card_list.xml:48
 msgid "then the make of your card"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:49
+#: en/configureX_card_list.xml:52
 msgid "and the model of card"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:53
+#: en/configureX_card_list.xml:56
 msgid ""
 "If you cannot find your card in the vendor lists (because it's not yet in "
 "the database or it's an older card) you may find a suitable driver in the "
@@ -866,14 +879,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><caution><para>
-#: en/configureX_card_list.xml:61
+#: en/configureX_card_list.xml:64
 msgid ""
 "Be aware that if you select an incompatible driver you may only have access "
 "to the <emphasis>Command Line Interface</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:65
+#: en/configureX_card_list.xml:68
 msgid ""
 "Some video card manufacturers provide proprietary drivers for Linux which "
 "may only be available in the <emphasis>Nonfree</emphasis> repository and in "
@@ -884,17 +897,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:11
-msgid "Graphic Card and Monitor Configuration"
+#: en/configureX_chooser.xml:23
+#, fuzzy
+msgid "Graphics Card and Monitor Configuration"
 msgstr "Nastavenie grafickej karty a monitoru"
 
-#.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
-#. 2018/02/15 apb: Some text and typography.
-#. 2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.
-#. 2018/02/23 apb: Typo.
-#. 2019/01/06 apb: Slight reword, split 1st para in two.
 #. type: Content of: <section><mediaobject>
-#: en/configureX_chooser.xml:26
+#: en/configureX_chooser.xml:28
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_chooser."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_chooser-im1\"/> </"
@@ -902,7 +911,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:32
+#: en/configureX_chooser.xml:34
 msgid ""
 "No matter which graphical environment (also known as desktop environment) "
 "you chose for this install of Mageia, they are all based on a graphical user "
@@ -913,31 +922,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:39
+#: en/configureX_chooser.xml:41
 msgid ""
 "Choose the appropriate settings manually if you think the details are "
 "incorrect, or if none are shown."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:44
-msgid "<emphasis role=\"bold\">Graphic Card</emphasis>"
+#: en/configureX_chooser.xml:46
+msgid "<emphasis role=\"bold\">Graphics Card</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:47
+#: en/configureX_chooser.xml:49
 msgid ""
 "If you need to, you can select a specific card from this expandable list. "
 "See <xref linkend=\"configureX_card_list\"/>."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:52
+#: en/configureX_chooser.xml:54
 msgid "<emphasis role=\"bold\">Monitor</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:55
+#: en/configureX_chooser.xml:57
 msgid ""
 "You can choose Plug 'n Play, if applicable, or choose your monitor from the "
 "<emphasis>Vendor</emphasis> or <emphasis>Generic</emphasis> lists. Choose "
@@ -947,22 +956,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:63
+#: en/configureX_chooser.xml:65
 msgid "<emphasis role=\"bold\">Resolution</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:66
+#: en/configureX_chooser.xml:68
 msgid "The resolution and color depth of your monitor can be set here."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:71
+#: en/configureX_chooser.xml:73
 msgid "<emphasis role=\"bold\">Test</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:74
+#: en/configureX_chooser.xml:76
 msgid ""
 "The test button does not always appear during install. If the option is "
 "there, and you test your settings, you should be asked to confirm that your "
@@ -974,17 +983,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:85
+#: en/configureX_chooser.xml:87
 msgid "<emphasis role=\"bold\">Options</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:88
+#: en/configureX_chooser.xml:90
 msgid "Here you can choose to enable or disable various options."
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_chooser.xml:93
+#: en/configureX_chooser.xml:95
 msgid ""
 "There is a risk of damaging a monitor if you choose refresh rates that are "
 "outside the frequency range of that monitor. This applies to older CRT "
@@ -993,12 +1002,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_monitor.xml:22
+#: en/configureX_monitor.xml:26
 msgid "Choosing your Monitor"
 msgstr "Výber vášho monitoru"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:25
+#: en/configureX_monitor.xml:29
 msgid ""
 "DrakX has a very comprehensive database of monitors and will usually "
 "correctly identify yours."
@@ -1007,7 +1016,7 @@ msgstr ""
 "ten váš."
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:30
+#: en/configureX_monitor.xml:34
 msgid ""
 "<emphasis role=\"bold\">Selecting a monitor with different characteristics "
 "could damage your monitor or video hardware. Please don't try something "
@@ -1016,7 +1025,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:38
+#: en/configureX_monitor.xml:42
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
@@ -1027,12 +1036,12 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:46
+#: en/configureX_monitor.xml:50
 msgid "Custom"
 msgstr "Vlastný výber"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:49
+#: en/configureX_monitor.xml:53
 msgid ""
 "This option allows you to set two critical parameters: the vertical refresh "
 "rate and the horizontal sync rate. Vertical refresh determines how often the "
@@ -1041,7 +1050,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:55
+#: en/configureX_monitor.xml:59
 msgid ""
 "It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor "
 "type with a sync range that is beyond the capabilities of your monitor: you "
@@ -1054,58 +1063,59 @@ msgstr ""
 "konzervatívne nastavenie a preverte ho v dokumentácii k vášmu monitoru."
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:64
+#: en/configureX_monitor.xml:68
 msgid "Plug'n Play"
 msgstr "Plug'n Play"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:67
+#: en/configureX_monitor.xml:71
 msgid ""
 "This is the default option and automatically tries to determine the monitor "
 "type from the monitor database."
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:77
+#: en/configureX_monitor.xml:81
+#, fuzzy
 msgid ""
 "If the installer has not correctly detected your monitor and you know which "
-"one you have, you can select it from the tree by selecting:"
+"one you have, you can choose it from the options by selecting:"
 msgstr ""
 "Ak inštalátor korektne nerozpoznal váš monitor a vy viete, ktorý máte, "
 "môžete si ho zvoliť zo stromu pomocou výberu:"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:86
+#: en/configureX_monitor.xml:90
 msgid "Manufacturer"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:90
+#: en/configureX_monitor.xml:94
 msgid "Monitor model"
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:96
+#: en/configureX_monitor.xml:100
 msgid "Generic"
 msgstr "Všeobecný"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:99
+#: en/configureX_monitor.xml:103
 msgid ""
-"Selecting this group will list nearly 30 display configurations such as "
-"1024x768 @ 60Hz and includes flat-panel displays as used in laptops. This is "
-"often a good monitor selection group if you need to use the VESA card driver "
-"when your video hardware cannot be determined automatically.  Once again it "
-"may be wise to be conservative in your selections."
+"Selecting this group will list approximately 30 display configurations such "
+"as 1024x768 @ 60Hz and includes flat-panel displays as used in laptops.  "
+"This is often a good monitor selection group if you need to use the VESA "
+"card driver when your video hardware cannot be determined automatically. "
+"Once again, it may be wise to be conservative in your selections."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:22
+#: en/diskdrake.xml:24
 msgid "Custom Disk Partitioning with DiskDrake"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:27
+#: en/diskdrake.xml:29
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-diskdrake.png\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1113,7 +1123,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:38
+#: en/diskdrake.xml:40
 msgid ""
 "Modify the layout of your disk(s) here. You can remove or create partitions, "
 "change the filesystem or size of a partition and even view their details "
@@ -1121,15 +1131,15 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:47
 msgid ""
 "There is a tab at the top for every detected hard disk (or other storage "
-"device, like a USB key). In the screenshot above there are two available "
-"devices: <filename>sda </filename>and <filename>sdb</filename>."
+"device, like a USB key), for example: <filename>sda</filename>, "
+"<filename>sdb</filename>, <filename>sdc</filename> etc."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:52
+#: en/diskdrake.xml:54
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it. "
@@ -1138,21 +1148,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:60
+#: en/diskdrake.xml:62
 msgid ""
 "Continue until you have adjusted everything to your satisfaction, then click "
 "<emphasis>Done</emphasis> when you're ready."
 msgstr ""
 
 #. type: Content of: <section><warning><orderedlist><listitem><para>
-#: en/diskdrake.xml:69
+#: en/diskdrake.xml:71
 msgid ""
 "Take care with the <emphasis>Clear all</emphasis> option, use it only if you "
 "are sure you want to wipe all partitions on the selected storage device."
 msgstr ""
 
 #. type: Content of: <section><warning><orderedlist><listitem><para>
-#: en/diskdrake.xml:75
+#: en/diskdrake.xml:77
 msgid ""
 "If you wish to use encryption on your <filename>/</filename> partition you "
 "must ensure that you have a separate <filename>/boot</filename> partition. "
@@ -1161,7 +1171,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/diskdrake.xml:87
+#: en/diskdrake.xml:89
 msgid ""
 "If you are installing Mageia on a UEFI system, check that an ESP (EFI System "
 "Partition) is present and correctly mounted on <filename>/boot/EFI</"
@@ -1169,19 +1179,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/diskdrake.xml:93
+#: en/diskdrake.xml:95
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
 "partition is present and of the correct type. See Figure 2 below."
 msgstr ""
 
 #. type: Content of: <section><figure><title>
-#: en/diskdrake.xml:101
+#: en/diskdrake.xml:103
 msgid "EFI System Partition"
 msgstr ""
 
 #. type: Content of: <section><figure><mediaobject>
-#: en/diskdrake.xml:104
+#: en/diskdrake.xml:106
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-diskdrake2.png\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1189,17 +1199,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><figure>
-#: en/diskdrake.xml:103 en/diskdrake.xml:117
+#: en/diskdrake.xml:105 en/diskdrake.xml:119
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><figure><title>
-#: en/diskdrake.xml:115
+#: en/diskdrake.xml:117
 msgid "BIOS boot partition"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:118 en/doPartitionDisks.xml:201
+#: en/diskdrake.xml:120 en/doPartitionDisks.xml:206
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1218,26 +1228,26 @@ msgid "Partitioning"
 msgstr "Rozdelenie diskov"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:31
 msgid "Suggested Partitioning"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:34
 msgid ""
 "In this screen you can see the content of your hard drive(s) along with the "
 "DrakX partitioning proposals for where to install Mageia."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:34
+#: en/doPartitionDisks.xml:38
 msgid ""
 "The actual options available from those shown below will vary according to "
 "the layout and content of your particular hard drive(s)."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:39
+#: en/doPartitionDisks.xml:43
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1246,17 +1256,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><title>
-#: en/doPartitionDisks.xml:49
+#: en/doPartitionDisks.xml:53
 msgid "Main Options"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:56
 msgid "<emphasis role=\"bold\">Use Existing Partitions</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:59
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1265,12 +1275,12 @@ msgstr ""
 "kompatibilné partície a môžu byť použité pre inštaláciu."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:61
+#: en/doPartitionDisks.xml:65
 msgid "<emphasis role=\"bold\">Use Free Space</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:68
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1279,57 +1289,54 @@ msgstr ""
 "využije pre vašu novú inštaláciu Mageie."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:70
+#: en/doPartitionDisks.xml:74
 msgid ""
 "<emphasis role=\"bold\">Use Free Space on a Windows Partition</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:73
+#: en/doPartitionDisks.xml:77
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it. 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 important files!"
+"installation but see the warning below."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para><mediaobject>
+#: en/doPartitionDisks.xml:87
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:79
+#: en/doPartitionDisks.xml:82
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
 "light blue and the proposed Mageia partition in dark blue with their "
 "intended sizes just underneath. You have the option to modify these sizes by "
 "clicking and dragging the gap between both partitions.  See the following "
-"screenshot:"
-msgstr ""
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:87
-msgid "<emphasis role=\"bold\">Erase and use Entire Disk</emphasis>"
-msgstr ""
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:90
-msgid "This option will allocate the entire drive for Mageia"
+"screenshot:<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:97
 msgid ""
-"This will erase ALL data on the selected hard drive. Take care! 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 this option."
+"This involves shrinking the size of the Windows partition, and therefore is "
+"a risky operation, so you should make sure you have backed up all important "
+"files before proceeding."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><important><para>
-#: en/doPartitionDisks.xml:101
+#: en/doPartitionDisks.xml:103
+#, fuzzy
 msgid ""
-"Note that this involves shrinking the size of the Windows partition. The "
-"partition must be \"clean\", meaning that Windows must have closed down "
+"The partition must be \"clean\", meaning that Windows must have closed down "
 "correctly the last time it was used. It must also have been defragmented, "
 "although this is not a guarantee that all files in the partition have been "
-"moved out of the area that is about to be used. It is highly recommended to "
-"back up your personal files."
+"moved out of the area that is about to be used for Mageia."
 msgstr ""
 "Pamätajte, že toto znamená zmenšenie veľkosti Windowsovej partície. Partícia "
 "musí byť \"čistá\", to znamená že Windows museli byť korektne vypnuté, keď "
@@ -1339,11 +1346,29 @@ msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/doPartitionDisks.xml:112
-msgid "<emphasis role=\"bold\">Custom Disk Partitioning</emphasis>"
+msgid "<emphasis role=\"bold\">Erase and use Entire Disk</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/doPartitionDisks.xml:115
+msgid "This option will allocate the entire drive for Mageia"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><warning><para>
+#: en/doPartitionDisks.xml:119
+msgid ""
+"This will erase ALL data on the selected hard drive. Take care! 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 this option."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:127
+msgid "<emphasis role=\"bold\">Custom Disk Partitioning</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:130
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1351,17 +1376,8 @@ msgstr ""
 "Toto vám dáva úplnú kontrolu nad umiestnením inštalácie na vašom pevnom "
 "disku (resp. diskoch)."
 
-#. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:122
-msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
-msgstr ""
-
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:131
+#: en/doPartitionDisks.xml:136
 msgid ""
 "If you are not using the <emphasis>Custom disk partitioning</emphasis> "
 "option, then the installer will allocate the available space according to "
@@ -1369,60 +1385,60 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:137
+#: en/doPartitionDisks.xml:142
 msgid ""
 "If the total available space is less than 50 GB, then only one partition is "
 "created. This will be the <filename>/</filename> (root)  partition."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:143
+#: en/doPartitionDisks.xml:148
 msgid ""
 "If the total available space is greater than 50 GB, then three partitions "
 "are created"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:148
+#: en/doPartitionDisks.xml:153
 msgid ""
 "6/19 of the total available place is allocated to <filename>/</filename> "
 "with a maximum of 50 GB"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:153
+#: en/doPartitionDisks.xml:158
 msgid "1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:158
+#: en/doPartitionDisks.xml:163
 msgid "the rest (at least 12/19) is allocated to <filename>/home</filename>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:165
+#: en/doPartitionDisks.xml:170
 msgid ""
 "This means that from 160 GB or greater available space, the installer will "
 "create three partitions:"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:170
+#: en/doPartitionDisks.xml:175
 msgid "50 GB for <filename>/</filename>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:174
+#: en/doPartitionDisks.xml:179
 msgid "4 GB for <filename>swap</filename>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:178
+#: en/doPartitionDisks.xml:183
 msgid "and the remainder for <filename>/home</filename>"
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:183
+#: en/doPartitionDisks.xml:188
 msgid ""
 "If you are using a UEFI system, the ESP (EFI System Partition) will be "
 "automatically detected - or created if it does not exist yet - and mounted "
@@ -1432,7 +1448,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:189
+#: en/doPartitionDisks.xml:194
 msgid ""
 "If you are using a Legacy (also known as BIOS) system with a GPT partitioned "
 "disk, you need to create a BIOS boot partition if it doesn't already exist. "
@@ -1443,19 +1459,25 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:196
+#: en/doPartitionDisks.xml:201
 msgid "See <xref linkend=\"diskdrake\"/> for information on how to proceed."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:211
+#: en/doPartitionDisks.xml:216
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4.png"
-"\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks4.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks4.png\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
+"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:217
+#: en/doPartitionDisks.xml:226
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
 "previous standard of 512. Due to lack of available hardware, the "
@@ -1464,7 +1486,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:222
+#: en/doPartitionDisks.xml:231
 msgid ""
 "Some SSD devices now use an erase block size over 1 MB. If you have such a "
 "device we suggest that you partition the drive in advance, using an "
@@ -1473,17 +1495,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:229
+#: en/doPartitionDisks.xml:238
 msgid "<emphasis>Align to</emphasis> = MiB"
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:233
+#: en/doPartitionDisks.xml:242
 msgid "<emphasis>Free space preceding (MiB)</emphasis> = 2"
 msgstr ""
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:237
+#: en/doPartitionDisks.xml:246
 msgid ""
 "Also make sure all partitions are created using an even number of megabytes."
 msgstr ""
@@ -1654,12 +1676,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/firewall.xml:7
+#: en/firewall.xml:16
 msgid "Firewall"
 msgstr "Firewall"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:10
+#: en/firewall.xml:19
 msgid ""
 "This section allows you to configure some simple firewall rules: they "
 "determine which type of message from the Internet will be accepted by the "
@@ -1667,8 +1689,17 @@ msgid ""
 "system to be accessible from the Internet."
 msgstr ""
 
+#. type: Content of: <section><mediaobject>
+#: en/firewall.xml:26
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-firewall.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+
 #. type: Content of: <section><para>
-#: en/firewall.xml:16
+#: en/firewall.xml:31
 msgid ""
 "In the default setting (no button is checked), no service of the system is "
 "accessible from the network. The <emphasis>Everything (no firewall)</"
@@ -1681,7 +1712,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:25
+#: en/firewall.xml:40
 msgid ""
 "All other options are more or less self-explanatory. As an example, you will "
 "enable the CUPS server if you want printers on your machine to be accessible "
@@ -1689,12 +1720,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:29
+#: en/firewall.xml:44
 msgid "<emphasis role=\"bold\">Advanced</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:31
+#: en/firewall.xml:46
 msgid ""
 "The <emphasis>Advanced</emphasis> option opens a window where you can enable "
 "a series of services by typing a list of <quote>couples</quote> (blank "
@@ -1702,34 +1733,35 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:35
-msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
+#: en/firewall.xml:50
+msgid "<emphasis>&lt;port-number&gt;/&lt;protocol&gt;</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:38
+#: en/firewall.xml:53
 msgid ""
-"- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
-"the service you want to enable (e.g. 873 for the RSYNC service) as defined "
-"in <emphasis>RFC-433</emphasis>;"
+"- <emphasis>&lt;port-number&gt;</emphasis> is the value of the port assigned "
+"to the service you want to enable (e.g. 873 for the RSYNC service) as "
+"defined in <emphasis>RFC-433</emphasis>;"
 msgstr ""
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:42
+#: en/firewall.xml:57
 msgid ""
-"- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
-"<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
+"- <emphasis>&lt;protocol&gt;</emphasis> is one of <emphasis>TCP</emphasis> "
+"or <emphasis>UDP</emphasis> - the internet protocol that is used by the "
+"service."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:47
+#: en/firewall.xml:62
 msgid ""
 "For instance, the entry for enabling access to the RSYNC service therefore "
 "is <emphasis>873/tcp</emphasis>."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:50
+#: en/firewall.xml:65
 msgid ""
 "In case a service is implemented to use both protocols, you specify 2 "
 "couples for the same port."
@@ -1797,12 +1829,12 @@ msgid "Graphical Configuration"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:32
+#: en/installer.xml:34
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, inštalátor Mageie"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:35
+#: en/installer.xml:37
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -1813,33 +1845,33 @@ msgstr ""
 "aktualizáciu čo najľahšou ako sa len dá."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:40
+#: en/installer.xml:42
 msgid "The installation steps"
 msgstr "Kroky inštalácie"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:44
+#: en/installer.xml:46
 msgid ""
 "The install process is divided into a number of steps - the status of which "
 "is indicated in a panel to the left of the screen."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:50
+#: en/installer.xml:52
 msgid ""
 "Each step has one or more screens, which may also have <emphasis>Advanced</"
 "emphasis> sections with extra, less commonly required options."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:56
+#: en/installer.xml:58
 msgid ""
 "Most screens have <emphasis>Help</emphasis> buttons for further details "
 "about the particular step."
 msgstr ""
 
 #. type: Content of: <section><section><caution><para>
-#: en/installer.xml:62
+#: en/installer.xml:64
 msgid ""
 "If at some point during the install you decide to abort the installation, it "
 "is possible to reboot, but please think twice before you do this. Once a "
@@ -1849,7 +1881,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><caution><para>
-#: en/installer.xml:68
+#: en/installer.xml:70
 msgid ""
 "If, in spite of this, you are very sure rebooting is what you want, go to a "
 "text terminal by pressing the keys <keycombo> <keycap>Ctrl</keycap> "
@@ -1859,12 +1891,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:86
+#: en/installer.xml:88
 msgid "Installation Welcome Screen"
 msgstr "Uvítacia inštalačná obrazovka"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:88
+#: en/installer.xml:90
 msgid ""
 "The particular screen that you will first see when booting from the "
 "Installation media will depend on whether your computer motherboard is of "
@@ -1872,60 +1904,60 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:92
+#: en/installer.xml:94
 msgid ""
 "The welcome menu screen has various options, however the default option will "
 "start the installer, and is normally all that you will need."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:97
+#: en/installer.xml:99
 msgid "Legacy (BIOS) Systems"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:100
+#: en/installer.xml:102
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome.png\"/> </"
 "imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:111
+#: en/installer.xml:113
 msgid ""
 "Install Mageia to a hard disk. This is the default option, and will "
 "automatically start after a short while unless another option is selected."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:117
+#: en/installer.xml:119
 msgid "<emphasis role=\"bold\">Rescue System</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:119
+#: en/installer.xml:121
 msgid ""
 "This option allows you to either re-install the bootloader for an existing "
 "Mageia installation or you can use it to restore a Windows bootloader."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:132
+#: en/installer.xml:134
 msgid "<emphasis role=\"bold\">F2: Language</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:134
+#: en/installer.xml:136
 msgid "Press F2 for alternative languages."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:140
+#: en/installer.xml:142
 msgid "UEFI Systems"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:142
+#: en/installer.xml:144
 msgid ""
 "From this screen, you can access options by pressing <keycap>e</keycap> to "
 "enter the edit mode. To come back to this screen, press <keycap>Esc</keycap> "
@@ -1933,19 +1965,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:148
+#: en/installer.xml:150
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome2.png\"/> </"
 "imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:157
+#: en/installer.xml:159
 msgid "<emphasis role=\"bold\">Install:</emphasis> Start the Install process"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:162
+#: en/installer.xml:164
 msgid ""
 "<emphasis role=\"bold\">Rescue:</emphasis> This option allows you to either "
 "re-install the bootloader for an existing Mageia installation or you can use "
@@ -1953,31 +1985,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:169
+#: en/installer.xml:171
 msgid ""
 "<emphasis role=\"bold\">F2: Language:</emphasis> Press <keycap>F2</keycap> "
 "for alternative languages."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:174
+#: en/installer.xml:176
 msgid ""
 "If you booted from a USB stick, you will see the above options duplicated, "
 "and in this case, you should use the set that will be suffixed with \"USB\"."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:181
+#: en/installer.xml:183
 msgid "Installation Problems and Possible Solutions"
 msgstr "Problémy pri inštalácií a možné riešenia"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:184
+#: en/installer.xml:186
 msgid "No Graphical Interface"
 msgstr "Žiadne grafické rozhranie"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:188
+#: en/installer.xml:190
 msgid ""
 "After the initial screen you did not progress to the <emphasis>Language "
 "Selection</emphasis> screen. This can happen with some graphic cards and "
@@ -1986,7 +2018,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:195
+#: en/installer.xml:197
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
 "In this case it is worth trying a text-mode installation. To use this press "
@@ -1997,12 +2029,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:208
+#: en/installer.xml:210
 msgid "The Install Freezes"
 msgstr "Inštalácia zamrzne"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:210
+#: en/installer.xml:212
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic hardware "
@@ -2012,12 +2044,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:218
+#: en/installer.xml:220
 msgid "RAM problem"
 msgstr "Problém s RAM"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:220
+#: en/installer.xml:222
 msgid ""
 "This will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
@@ -2027,12 +2059,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:228
+#: en/installer.xml:230
 msgid "Dynamic partitions"
 msgstr "Dynamické partície"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:230
+#: en/installer.xml:232
 msgid ""
 "If you converted your hard disk from <literal>Basic</literal> format to "
 "<literal>Dynamic</literal> format in Microsoft Windows, then it is not "
@@ -3661,73 +3693,106 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:27
+#: en/setupBootloader.xml:32
 msgid "Bootloader"
 msgstr "Zavádzač"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:31
+#: en/setupBootloader.xml:36
+#, fuzzy
+msgid "Available Bootloaders"
+msgstr "Zavádzač"
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:39
 msgid "Grub2"
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><title>
-#: en/setupBootloader.xml:34
-msgid "Grub2 on Legacy MBR/GPT systems"
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:42
+msgid "<emphasis role=\"bold\">Grub2 on Legacy MBR/GPT systems</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:37
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:46
 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:42
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:52
 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:49
-msgid "Grub2-efi on UEFI systems"
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:59
+msgid "<emphasis role=\"bold\">Grub2-efi on UEFI systems</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:52
-msgid "GRUB2-efi will be used exclusively as the bootloader for a UEFI system."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:63
+msgid "GRUB2-efi or rEFInd may be used as the bootloader for a UEFI system."
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:57
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:68
 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:60
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:71
 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 "
-"created by Windows and add grub2-efi to it. If no ESP exists, then one will "
+"created by Windows and add grub2-efi to it.  If no ESP exists, then one will "
 "be created. Although it is possible to have several ESPs, only one is "
 "required, whatever the number of operating systems you have."
 msgstr ""
 
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:82
+msgid "rEFInd"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:85
+msgid "<emphasis role=\"bold\">rEFInd on UEFI systems</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:88
+msgid ""
+"rEFInd has a nice graphical set of options, and can auto-detect installed "
+"EFI bootloaders. See: http://www.rodsbooks.com/refind/"
+msgstr ""
+
+#. type: Content of: <section><section><section><note><para>
+#: en/setupBootloader.xml:95
+msgid ""
+"Please note that in order to be able to use the <literal>rEFInd</literal> "
+"option, an installed EFI System Partition must match your system "
+"architecture: if you have a 32bit EFI System Partition installed on a 64bit "
+"machine for instance, then the rEFInd option will not be displayed/available "
+"to you."
+msgstr ""
+
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:72
+#: en/setupBootloader.xml:106
 msgid "Bootloader Setup"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:76
+#: en/setupBootloader.xml:110
 msgid "Bootloader main options"
 msgstr "Hlavné parametre zavádzača"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:79
+#: en/setupBootloader.xml:113
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader.png\"/> </imageobject> <imageobject condition=\"live"
@@ -3736,47 +3801,70 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:91
+#: en/setupBootloader.xml:125
 msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:93
+#. type: Content of: <section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:129
+msgid ""
+"<guimenuitem>GRUB2</guimenuitem> (with either a graphical or a text menu), "
+"can be chosen for both <literal>Legacy MBR/BIOS</literal> systems and "
+"<literal>UEFI</literal> systems."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:136
 msgid ""
-"This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI "
-"systems will not see this option here."
+"<guimenuitem>rEFInd</guimenuitem> (with a graphical menu)  is an alternative "
+"option solely for use with <literal>UEFI</literal> systems."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:98
+#: en/setupBootloader.xml:144
 msgid "<emphasis role=\"bold\">Boot device</emphasis>"
 msgstr ""
 
+#. type: Content of: <section><section><section><itemizedlist><listitem><warning><para>
+#: en/setupBootloader.xml:147
+#, fuzzy
+msgid "Don't change this unless you really know what you are doing."
+msgstr "Veci meňte len vtedy, keď veľmi dobre viete, čo robíte."
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><note><para>
+#: en/setupBootloader.xml:152
+msgid ""
+"There is no option to write GRUB to the boot sector of a partition (e.g: "
+"<filename>sda1</filename>), as this method is considered unreliable."
+msgstr ""
+
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:100
-msgid "Don't change this unless you really know what you are doing"
+#: en/setupBootloader.xml:157
+msgid ""
+"When using UEFI mode, then the <guilabel>Boot device</guilabel> will be "
+"listed as <guimenuitem>EFI System Partition</guimenuitem>."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:105
+#: en/setupBootloader.xml:163
 msgid ""
 "<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:108
+#: en/setupBootloader.xml:166
 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:113
+#: en/setupBootloader.xml:171
 msgid "<emphasis role=\"bold\">Security</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:115
+#: en/setupBootloader.xml:173
 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 "
@@ -3786,34 +3874,34 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:126
+#: en/setupBootloader.xml:184
 msgid "Choose a password for the bootloader (optional)"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:130
+#: en/setupBootloader.xml:188
 msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:132
+#: en/setupBootloader.xml:190
 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:137 en/setupBootloader.xml:212
+#: en/setupBootloader.xml:195 en/setupBootloader.xml:308
 msgid "<emphasis>Advanced</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:141
+#: en/setupBootloader.xml:199
 msgid "<emphasis>Enable ACPI</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:143
+#: en/setupBootloader.xml:201
 msgid ""
 "ACPI (Advanced Configuration and Power Interface) is a standard for power "
 "management. It can save energy by stopping unused devices. Deselecting it "
@@ -3823,24 +3911,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:152
+#: en/setupBootloader.xml:210
 msgid "<emphasis>Enable SMP</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:154
+#: en/setupBootloader.xml:212
 msgid ""
 "This option enables/disables symmetric multiprocessing for multi-core "
 "processors"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:159
+#: en/setupBootloader.xml:217
 msgid "<emphasis>Enable APIC</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:161
+#: en/setupBootloader.xml:219
 msgid ""
 "Enabling this gives the operating system access to the Advanced Programmable "
 "Interrupt Controller. APIC devices permit more complex priority models, and "
@@ -3848,24 +3936,77 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:168
+#: en/setupBootloader.xml:226
 msgid "<emphasis>Enable Local APIC</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:170
+#: en/setupBootloader.xml:228
 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:177
+#: en/setupBootloader.xml:235
 msgid "Bootloader Configuration"
 msgstr "Nastavenie zavádzača"
 
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:237
+msgid ""
+"If, in the previous section you selected <literal>rEFInd</literal> as the "
+"bootloader to use, you would then be presented with the options shown in the "
+"screenshot directly below. Otherwise, please instead move on to the "
+"subsequent screenshot for your options."
+msgstr ""
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:243
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"rEFIndLoaderConfig.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-rEFIndLoaderConfig.png\"/> </"
+"imageobject>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:253
+#, fuzzy
+msgid "Your rEFInd configuration options:"
+msgstr "Konfigurácia zvuku"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:256
+msgid ""
+"<guimenuitem>Install or update rEFInd in the EFI system partition.</"
+"guimenuitem>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:261
+msgid ""
+"<guimenuitem>Install in EFI/Boot partition (workaround for some BIOS's).</"
+"guimenuitem>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:264
+msgid ""
+"With some BIOS's, the newly written bootloaser for Mageia at end of the "
+"installation will not be recognized. In that case, you can use this option "
+"as a workaround for the issue."
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:270
+msgid ""
+"If you did not select rEFInd as the bootloader to use in the previous "
+"section, then your bootloader configurations are shown below:"
+msgstr ""
+
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:180
+#: en/setupBootloader.xml:275
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -3874,42 +4015,42 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:191
+#: en/setupBootloader.xml:286
 msgid "<emphasis role=\"bold\">Default</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:193
+#: en/setupBootloader.xml:288
 msgid "The operating system to be started up by default."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:197
+#: en/setupBootloader.xml:292
 msgid "<emphasis role=\"bold\">Append</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:199
+#: en/setupBootloader.xml:294
 msgid ""
 "This option lets you pass information to the kernel 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:204
+#: en/setupBootloader.xml:299
 msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:206
+#: en/setupBootloader.xml:301
 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, "
-"then untick the Probe Foreign OS option."
+"then untick the <guimenuitem>Probe Foreign OS</guimenuitem> option."
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:215
+#: en/setupBootloader.xml:311
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader4.png\"/> </imageobject> <imageobject condition=\"live"
@@ -3918,12 +4059,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:226
+#: en/setupBootloader.xml:322
 msgid "<emphasis>Video mode</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:228
+#: en/setupBootloader.xml:324
 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 "
@@ -3931,38 +4072,47 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:234
+#: en/setupBootloader.xml:330
 msgid "<emphasis>Do not touch ESP or MBR</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:236
+#: en/setupBootloader.xml:332
 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 "
-"missing. Click<emphasis> Ok</emphasis> if you are sure you understand the "
-"implications, and wish to proceed."
+"missing. Click <guimenuitem>Ok </guimenuitem>only if you are sure you "
+"understand the implications, and wish to proceed."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><warning><para>
+#: en/setupBootloader.xml:338
+msgid ""
+"Chain-loading via legacy bootloaders (GRUB Legacy and LiLo)  is no longer "
+"supported by Mageia as it is likely to fail when attempting to boot this "
+"resulting installation of Mageia. If you use anything other than GRUB2 or "
+"rEFInd for this purpose, then you do so at your own risk!"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:245
+#: en/setupBootloader.xml:348
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png"
 "\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:253
+#: en/setupBootloader.xml:356
 msgid "Other Options"
 msgstr "Ďalšie voľby"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:256
+#: en/setupBootloader.xml:359
 msgid "Using an existing bootloader"
 msgstr "Použitie už existujúceho zavádzača"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:258
+#: en/setupBootloader.xml:361
 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 "
@@ -3972,12 +4122,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:267
+#: en/setupBootloader.xml:370
 msgid "Installing Without a Bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:269
+#: en/setupBootloader.xml:372
 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 "
diff --git a/docs/docs/stable/installer/sl.po b/docs/docs/stable/installer/sl.po
index f2a07bed..e8fd31ef 100644
--- a/docs/docs/stable/installer/sl.po
+++ b/docs/docs/stable/installer/sl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2019-01-19 21:23+0200\n"
+"POT-Creation-Date: 2019-09-08 15:26+0300\n"
 "PO-Revision-Date: 2019-01-19 19:25+0000\n"
 "Last-Translator: Filip Komar <filip.komar@guest.arnes.si>\n"
 "Language-Team: Slovenian (http://www.transifex.com/MageiaLinux/mageia/"
@@ -151,7 +151,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/addUser.xml:3
+#: en/addUser.xml:9
 msgid "User Management"
 msgstr ""
 
@@ -161,13 +161,16 @@ msgstr ""
 #. 2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
 #.   Also changed 'Advanced User Management' to 'User Management (advanced)'.
 #. 2018/02/24 apb: Changed list style.
+#. 2019/08/10 apb: Added missing 'condition' profile for live-user1.png.
+#. 2019/08/11 apb: [1] Reword 1.1 (including Note) [2] Reword 1.2 Password text.
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:12
+#: en/addUser.xml:28
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
-"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
-"\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata format="
-"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-setRootPassword.png\" format=\"PNG\" revision=\"1\" xml:id="
+"\"setRootPassword-im1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-user1.png\" format=\"PNG\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
 "\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -175,36 +178,41 @@ msgstr ""
 "\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:21
+#: en/addUser.xml:40
 msgid "Set Administrator (root)  Password:"
 msgstr "Nastavite geslo skrbnika (uporabnika root):"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:24
+#: en/addUser.xml:44
 msgid ""
 "It is advisable for all Mageia installations to set a <literal>superuser</"
 "literal> (Administrator) password, usually called the <emphasis>root </"
-"emphasis>password in Linux. As you type a password into the top box a shield "
-"will change from red-to-yellow-to-green depending on the strength of the "
-"password. A green shield shows you are using a strong password. You need to "
-"repeat the same password in the box underneath, to check that the first "
-"entry was not mistyped."
+"emphasis>password in Linux. You need to repeat the same password in the box "
+"underneath, to check that the first entry was not mistyped."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:32
+#: en/addUser.xml:51
+msgid ""
+"As you type a password into the top box a shield will change from red-to-"
+"yellow-to-green depending on the strength of the password. A green shield "
+"shows you are using a strong password."
+msgstr ""
+
+#. type: Content of: <section><section><note><para>
+#: en/addUser.xml:55
 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:39
+#: en/addUser.xml:63
 msgid "Enter a user"
 msgstr "Dodajte uporabnika"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:41
+#: en/addUser.xml:66
 msgid ""
 "Add a User here. A regular user has fewer privileges than the "
 "<literal>superuser</literal> (root), but enough to use the Internet, office "
@@ -213,39 +221,39 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:47
+#: en/addUser.xml:73
 msgid "<emphasis role=\"bold\">Icon</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:48
+#: en/addUser.xml:75
 msgid "Click on this button if you want to change the user's icon"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:52
+#: en/addUser.xml:80
 msgid "<emphasis role=\"bold\">Real Name</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:53
+#: en/addUser.xml:82
 msgid "Insert the user's real name into this text box"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:56
+#: en/addUser.xml:86
 msgid "<emphasis role=\"bold\">Login Name</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:57
+#: en/addUser.xml:88
 msgid ""
 "Enter the user login name or let DrakX use a version of the user's real "
 "name. <emphasis role=\"bold\">The login name is case-sensitive.</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><caution><simpara>
-#: en/addUser.xml:61
+#: en/addUser.xml:93
 msgid ""
 "The login entered here should be different to any login currently in use for "
 "your <filename>/home</filename> directory. Some user parameters will be "
@@ -254,34 +262,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:65 en/setupBootloader.xml:124
+#: en/addUser.xml:102 en/setupBootloader.xml:182
 msgid "<emphasis role=\"bold\">Password</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:66
-msgid ""
-"Type in the user password. There is a shield at the end of the text box that "
-"indicates the strength of the password. (See also <xref linkend="
-"\"givePassword\"/>)"
+#: en/addUser.xml:104
+msgid "Type in the user password (remembering the advice in the Note above)."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:68
+#: en/addUser.xml:107
 msgid ""
 "<emphasis role=\"bold\">Password (again):</emphasis> Retype the user "
 "password. DrakX will check that you have not mistyped the password."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:74
+#: en/addUser.xml:114
 msgid ""
 "Any users added while installing Mageia, will have a home directory that is "
 "both read and write protected (umask=0027)"
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:76
+#: en/addUser.xml:117
 msgid ""
 "You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
@@ -292,24 +297,24 @@ msgstr ""
 "uporabnikov</emphasis>."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:79
+#: en/addUser.xml:121
 msgid "The access permissions can also be changed after the install."
 msgstr "Dovoljenje dostopa lahko spremenite tudi po namestitvi"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:85
+#: en/addUser.xml:128
 msgid "User Management (advanced)"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:87
+#: en/addUser.xml:131
 msgid ""
 "The <emphasis>Advanced</emphasis> option allows you to edit further settings "
 "for the user you are adding."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:91
+#: en/addUser.xml:136
 msgid ""
 "<emphasis>Shell</emphasis>: This drop-down list allows you to change the "
 "shell available to any user you added in the previous screen. Options are "
@@ -317,7 +322,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:143
 msgid ""
 "<emphasis>User ID</emphasis>: Here you can set the user ID for any user you "
 "added in the previous screen. If you are unsure what the purpose of this is, "
@@ -325,7 +330,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:102
+#: en/addUser.xml:149
 msgid ""
 "<emphasis>Group ID</emphasis>: This lets you set the group ID.  Again, if "
 "unsure, leave it blank."
@@ -445,24 +450,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:23
+#: en/bootLive.xml:10
 msgid "Boot Mageia as Live system"
 msgstr "Zaženi Magejo kot živ sistem"
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:28
+#: en/bootLive.xml:14
 msgid "Booting the medium"
 msgstr "Zagon medija"
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:31
+#: en/bootLive.xml:16
 msgid ""
 "You can boot directly from a Live DVD or USB. Usually, you just need to plug "
 "the USB device in or place the DVD in the drive and restart the computer."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:35
+#: en/bootLive.xml:19
 msgid ""
 "If the computer does not automatically boot from the USB or DVD you may need "
 "to reconfigure your BIOS Boot Disk priority. Alternatively, you might try "
@@ -471,7 +476,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><tip><para>
-#: en/bootLive.xml:41
+#: en/bootLive.xml:24
 msgid ""
 "To access the BIOS or boot menu when the computer is starting, you can try "
 "pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or <keycap>Esc</"
@@ -481,7 +486,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/bootLive.xml:50
+#: en/bootLive.xml:32
 msgid ""
 "The actual screen that you will first see when booting from the Live media "
 "will depend on whether your computer motherboard is of the Legacy (BIOS) or "
@@ -489,91 +494,93 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:58
+#: en/bootLive.xml:39
 msgid "In BIOS/CSM/Legacy mode"
 msgstr "V načinu BIOS/CSM/Legacy"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:62
+#: en/bootLive.xml:42
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"../live-bootCSM.png\" align=\"center\"/> "
+"</imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:67
+#: en/bootLive.xml:46
 msgid "First screen while booting in BIOS mode"
 msgstr "Prvi zaslon med zagonom v načinu BIOS"
 
 #. type: Content of: <section><section><section><itemizedlist><title>
-#: en/bootLive.xml:72 en/bootLive.xml:144 en/installer.xml:106
-#: en/installer.xml:154
+#: en/bootLive.xml:50 en/bootLive.xml:104 en/installer.xml:108
+#: en/installer.xml:156
 msgid "Menu"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:75 en/bootLive.xml:147
+#: en/bootLive.xml:52 en/bootLive.xml:106
 msgid "<emphasis role=\"bold\">Boot Mageia</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:77
+#: en/bootLive.xml:53
 msgid ""
 "This option will boot the Mageia Live system from the connected DVD/USB "
 "media (expect a very slow system compared to an installed OS)."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:81
+#: en/bootLive.xml:56
 msgid "Once the boot is done, you can proceed to the installation."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:86 en/bootLive.xml:102
+#: en/bootLive.xml:60 en/bootLive.xml:72
 msgid ""
 "<emphasis role=\"bold\">+ use non-free video drivers (slower to boot)</"
 "emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:89
+#: en/bootLive.xml:62
 msgid "Boot the Mageia Live system using non-free video drivers"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:96 en/bootLive.xml:155 en/installer.xml:109
+#: en/bootLive.xml:68 en/bootLive.xml:112 en/installer.xml:111
 msgid "<emphasis role=\"bold\">Install Mageia</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:98 en/bootLive.xml:157
+#: en/bootLive.xml:69 en/bootLive.xml:113
 msgid "This option will install Mageia to a hard disk."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:105
+#: en/bootLive.xml:74
 msgid "Install Mageia using non-free video drivers"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:111 en/installer.xml:125
+#: en/bootLive.xml:79 en/installer.xml:127
 msgid "<emphasis role=\"bold\">Memory Test</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:113 en/installer.xml:127
+#: en/bootLive.xml:80 en/installer.xml:129
 msgid ""
 "Test the installed RAM by performing multiple read and write operations. "
 "Reboot to end the test."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:118 en/bootLive.xml:161
+#: en/bootLive.xml:84 en/bootLive.xml:116
 msgid "<emphasis role=\"bold\"> F2 Language</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:120 en/bootLive.xml:163
+#: en/bootLive.xml:85 en/bootLive.xml:117
 msgid ""
 "Press <keycap>F2</keycap> to have the installer use a specific language "
 "during the installation. Use the arrow keys to select the language then "
@@ -581,24 +588,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:129
+#: en/bootLive.xml:93
 msgid "In UEFI mode"
 msgstr "V načinu UEFI"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:133
+#: en/bootLive.xml:96
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:139
+#: en/bootLive.xml:100
 msgid "First screen while booting in UEFI mode"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:149
+#: en/bootLive.xml:107
 msgid ""
 "This option will boot the Mageia Live system from the connected DVD/USB "
 "media (expect a very slow system compared to an installed OS).  Once the "
@@ -606,7 +616,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/bootLive.xml:170
+#: en/bootLive.xml:123
 msgid ""
 "If you booted from a USB stick, you will see the above menu options "
 "duplicated, and in this case, you should choose from the menu pair that will "
@@ -830,12 +840,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:24
+#: en/configureX_card_list.xml:27
 msgid "Choose an X Server (Configure your Graphic Card)"
 msgstr "Izberite strežnik X ()nastavite grafično kartico"
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_card_list.xml:29
+#: en/configureX_card_list.xml:32
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_card_list."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_card_list-im1\"/> </"
@@ -843,36 +853,36 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:35
+#: en/configureX_card_list.xml:38
 msgid ""
 "DrakX has a very comprehensive database of video cards and will usually "
 "correctly identify your video device."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:38
+#: en/configureX_card_list.xml:41
 msgid ""
 "If the installer has not correctly detected your graphic card and you know "
 "which one you have, you can select it from the tree by:"
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_card_list.xml:41 en/configureX_monitor.xml:74
+#: en/configureX_card_list.xml:44 en/configureX_monitor.xml:78
 msgid "Vendor"
 msgstr "Proizvajalec"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:45
+#: en/configureX_card_list.xml:48
 msgid "then the make of your card"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:49
+#: en/configureX_card_list.xml:52
 msgid "and the model of card"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:53
+#: en/configureX_card_list.xml:56
 msgid ""
 "If you cannot find your card in the vendor lists (because it's not yet in "
 "the database or it's an older card) you may find a suitable driver in the "
@@ -883,14 +893,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><caution><para>
-#: en/configureX_card_list.xml:61
+#: en/configureX_card_list.xml:64
 msgid ""
 "Be aware that if you select an incompatible driver you may only have access "
 "to the <emphasis>Command Line Interface</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:65
+#: en/configureX_card_list.xml:68
 msgid ""
 "Some video card manufacturers provide proprietary drivers for Linux which "
 "may only be available in the <emphasis>Nonfree</emphasis> repository and in "
@@ -901,17 +911,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:11
-msgid "Graphic Card and Monitor Configuration"
+#: en/configureX_chooser.xml:23
+#, fuzzy
+msgid "Graphics Card and Monitor Configuration"
 msgstr "Nastavitev grafične kartice in monitorja"
 
-#.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
-#. 2018/02/15 apb: Some text and typography.
-#. 2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.
-#. 2018/02/23 apb: Typo.
-#. 2019/01/06 apb: Slight reword, split 1st para in two.
 #. type: Content of: <section><mediaobject>
-#: en/configureX_chooser.xml:26
+#: en/configureX_chooser.xml:28
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_chooser."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_chooser-im1\"/> </"
@@ -919,7 +925,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:32
+#: en/configureX_chooser.xml:34
 msgid ""
 "No matter which graphical environment (also known as desktop environment) "
 "you chose for this install of Mageia, they are all based on a graphical user "
@@ -930,31 +936,32 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:39
+#: en/configureX_chooser.xml:41
 msgid ""
 "Choose the appropriate settings manually if you think the details are "
 "incorrect, or if none are shown."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:44
-msgid "<emphasis role=\"bold\">Graphic Card</emphasis>"
-msgstr ""
+#: en/configureX_chooser.xml:46
+#, fuzzy
+msgid "<emphasis role=\"bold\">Graphics Card</emphasis>"
+msgstr "<emphasis role=\"bold\">Grafično okolje</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:47
+#: en/configureX_chooser.xml:49
 msgid ""
 "If you need to, you can select a specific card from this expandable list. "
 "See <xref linkend=\"configureX_card_list\"/>."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:52
+#: en/configureX_chooser.xml:54
 msgid "<emphasis role=\"bold\">Monitor</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:55
+#: en/configureX_chooser.xml:57
 msgid ""
 "You can choose Plug 'n Play, if applicable, or choose your monitor from the "
 "<emphasis>Vendor</emphasis> or <emphasis>Generic</emphasis> lists. Choose "
@@ -964,22 +971,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:63
+#: en/configureX_chooser.xml:65
 msgid "<emphasis role=\"bold\">Resolution</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:66
+#: en/configureX_chooser.xml:68
 msgid "The resolution and color depth of your monitor can be set here."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:71
+#: en/configureX_chooser.xml:73
 msgid "<emphasis role=\"bold\">Test</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:74
+#: en/configureX_chooser.xml:76
 msgid ""
 "The test button does not always appear during install. If the option is "
 "there, and you test your settings, you should be asked to confirm that your "
@@ -991,17 +998,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:85
+#: en/configureX_chooser.xml:87
 msgid "<emphasis role=\"bold\">Options</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:88
+#: en/configureX_chooser.xml:90
 msgid "Here you can choose to enable or disable various options."
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_chooser.xml:93
+#: en/configureX_chooser.xml:95
 msgid ""
 "There is a risk of damaging a monitor if you choose refresh rates that are "
 "outside the frequency range of that monitor. This applies to older CRT "
@@ -1010,19 +1017,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_monitor.xml:22
+#: en/configureX_monitor.xml:26
 msgid "Choosing your Monitor"
 msgstr "Izberite vaš zaslon"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:25
+#: en/configureX_monitor.xml:29
 msgid ""
 "DrakX has a very comprehensive database of monitors and will usually "
 "correctly identify yours."
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:30
+#: en/configureX_monitor.xml:34
 msgid ""
 "<emphasis role=\"bold\">Selecting a monitor with different characteristics "
 "could damage your monitor or video hardware. Please don't try something "
@@ -1031,7 +1038,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:38
+#: en/configureX_monitor.xml:42
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
@@ -1042,12 +1049,12 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:46
+#: en/configureX_monitor.xml:50
 msgid "Custom"
 msgstr "Po meri"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:49
+#: en/configureX_monitor.xml:53
 msgid ""
 "This option allows you to set two critical parameters: the vertical refresh "
 "rate and the horizontal sync rate. Vertical refresh determines how often the "
@@ -1056,7 +1063,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:55
+#: en/configureX_monitor.xml:59
 msgid ""
 "It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor "
 "type with a sync range that is beyond the capabilities of your monitor: you "
@@ -1065,56 +1072,56 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:64
+#: en/configureX_monitor.xml:68
 msgid "Plug'n Play"
 msgstr "Plug'n Play"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:67
+#: en/configureX_monitor.xml:71
 msgid ""
 "This is the default option and automatically tries to determine the monitor "
 "type from the monitor database."
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:77
+#: en/configureX_monitor.xml:81
 msgid ""
 "If the installer has not correctly detected your monitor and you know which "
-"one you have, you can select it from the tree by selecting:"
+"one you have, you can choose it from the options by selecting:"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:86
+#: en/configureX_monitor.xml:90
 msgid "Manufacturer"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:90
+#: en/configureX_monitor.xml:94
 msgid "Monitor model"
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:96
+#: en/configureX_monitor.xml:100
 msgid "Generic"
 msgstr "Splošno"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:99
+#: en/configureX_monitor.xml:103
 msgid ""
-"Selecting this group will list nearly 30 display configurations such as "
-"1024x768 @ 60Hz and includes flat-panel displays as used in laptops. This is "
-"often a good monitor selection group if you need to use the VESA card driver "
-"when your video hardware cannot be determined automatically.  Once again it "
-"may be wise to be conservative in your selections."
+"Selecting this group will list approximately 30 display configurations such "
+"as 1024x768 @ 60Hz and includes flat-panel displays as used in laptops.  "
+"This is often a good monitor selection group if you need to use the VESA "
+"card driver when your video hardware cannot be determined automatically. "
+"Once again, it may be wise to be conservative in your selections."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:22
+#: en/diskdrake.xml:24
 msgid "Custom Disk Partitioning with DiskDrake"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:27
+#: en/diskdrake.xml:29
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-diskdrake.png\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1122,7 +1129,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:38
+#: en/diskdrake.xml:40
 msgid ""
 "Modify the layout of your disk(s) here. You can remove or create partitions, "
 "change the filesystem or size of a partition and even view their details "
@@ -1130,15 +1137,15 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:47
 msgid ""
 "There is a tab at the top for every detected hard disk (or other storage "
-"device, like a USB key). In the screenshot above there are two available "
-"devices: <filename>sda </filename>and <filename>sdb</filename>."
+"device, like a USB key), for example: <filename>sda</filename>, "
+"<filename>sdb</filename>, <filename>sdc</filename> etc."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:52
+#: en/diskdrake.xml:54
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it. "
@@ -1147,21 +1154,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:60
+#: en/diskdrake.xml:62
 msgid ""
 "Continue until you have adjusted everything to your satisfaction, then click "
 "<emphasis>Done</emphasis> when you're ready."
 msgstr ""
 
 #. type: Content of: <section><warning><orderedlist><listitem><para>
-#: en/diskdrake.xml:69
+#: en/diskdrake.xml:71
 msgid ""
 "Take care with the <emphasis>Clear all</emphasis> option, use it only if you "
 "are sure you want to wipe all partitions on the selected storage device."
 msgstr ""
 
 #. type: Content of: <section><warning><orderedlist><listitem><para>
-#: en/diskdrake.xml:75
+#: en/diskdrake.xml:77
 msgid ""
 "If you wish to use encryption on your <filename>/</filename> partition you "
 "must ensure that you have a separate <filename>/boot</filename> partition. "
@@ -1170,7 +1177,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/diskdrake.xml:87
+#: en/diskdrake.xml:89
 msgid ""
 "If you are installing Mageia on a UEFI system, check that an ESP (EFI System "
 "Partition) is present and correctly mounted on <filename>/boot/EFI</"
@@ -1178,19 +1185,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/diskdrake.xml:93
+#: en/diskdrake.xml:95
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
 "partition is present and of the correct type. See Figure 2 below."
 msgstr ""
 
 #. type: Content of: <section><figure><title>
-#: en/diskdrake.xml:101
+#: en/diskdrake.xml:103
 msgid "EFI System Partition"
 msgstr "sistemski razdelek EFI"
 
 #. type: Content of: <section><figure><mediaobject>
-#: en/diskdrake.xml:104
+#: en/diskdrake.xml:106
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-diskdrake2.png\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1198,17 +1205,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><figure>
-#: en/diskdrake.xml:103 en/diskdrake.xml:117
+#: en/diskdrake.xml:105 en/diskdrake.xml:119
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><figure><title>
-#: en/diskdrake.xml:115
+#: en/diskdrake.xml:117
 msgid "BIOS boot partition"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:118 en/doPartitionDisks.xml:201
+#: en/diskdrake.xml:120 en/doPartitionDisks.xml:206
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1231,26 +1238,26 @@ msgid "Partitioning"
 msgstr "Razdelitev diska"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:31
 msgid "Suggested Partitioning"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:34
 msgid ""
 "In this screen you can see the content of your hard drive(s) along with the "
 "DrakX partitioning proposals for where to install Mageia."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:34
+#: en/doPartitionDisks.xml:38
 msgid ""
 "The actual options available from those shown below will vary according to "
 "the layout and content of your particular hard drive(s)."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:39
+#: en/doPartitionDisks.xml:43
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1259,112 +1266,117 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><title>
-#: en/doPartitionDisks.xml:49
+#: en/doPartitionDisks.xml:53
 msgid "Main Options"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:56
 msgid "<emphasis role=\"bold\">Use Existing Partitions</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:59
 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><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:61
+#: en/doPartitionDisks.xml:65
 msgid "<emphasis role=\"bold\">Use Free Space</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:68
 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><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:70
+#: en/doPartitionDisks.xml:74
 msgid ""
 "<emphasis role=\"bold\">Use Free Space on a Windows Partition</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:73
+#: en/doPartitionDisks.xml:77
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it. 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 important files!"
+"installation but see the warning below."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para><mediaobject>
+#: en/doPartitionDisks.xml:87
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:79
+#: en/doPartitionDisks.xml:82
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
 "light blue and the proposed Mageia partition in dark blue with their "
 "intended sizes just underneath. You have the option to modify these sizes by "
 "clicking and dragging the gap between both partitions.  See the following "
-"screenshot:"
+"screenshot:<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><warning><para>
+#: en/doPartitionDisks.xml:97
+msgid ""
+"This involves shrinking the size of the Windows partition, and therefore is "
+"a risky operation, so you should make sure you have backed up all important "
+"files before proceeding."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><important><para>
+#: en/doPartitionDisks.xml:103
+msgid ""
+"The partition must be \"clean\", meaning that Windows must have closed down "
+"correctly the last time it was used. It must also have been defragmented, "
+"although this is not a guarantee that all files in the partition have been "
+"moved out of the area that is about to be used for Mageia."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:87
+#: en/doPartitionDisks.xml:112
 msgid "<emphasis role=\"bold\">Erase and use Entire Disk</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:90
+#: en/doPartitionDisks.xml:115
 msgid "This option will allocate the entire drive for Mageia"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:119
 msgid ""
 "This will erase ALL data on the selected hard drive. Take care! 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 this option."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><important><para>
-#: en/doPartitionDisks.xml:101
-msgid ""
-"Note that this involves shrinking the size of the Windows partition. The "
-"partition must be \"clean\", meaning that Windows must have closed down "
-"correctly the last time it was used. It must also have been defragmented, "
-"although this is not a guarantee that all files in the partition have been "
-"moved out of the area that is about to be used. It is highly recommended to "
-"back up your personal files."
-msgstr ""
-
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:112
+#: en/doPartitionDisks.xml:127
 msgid "<emphasis role=\"bold\">Custom Disk Partitioning</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:115
+#: en/doPartitionDisks.xml:130
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
 msgstr ""
 "S tem imate popoln nadzor nad namestitvijo na (enem ali več) vaših diskov."
 
-#. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:122
-msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
-msgstr ""
-
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:131
+#: en/doPartitionDisks.xml:136
 msgid ""
 "If you are not using the <emphasis>Custom disk partitioning</emphasis> "
 "option, then the installer will allocate the available space according to "
@@ -1372,14 +1384,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:137
+#: en/doPartitionDisks.xml:142
 msgid ""
 "If the total available space is less than 50 GB, then only one partition is "
 "created. This will be the <filename>/</filename> (root)  partition."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:143
+#: en/doPartitionDisks.xml:148
 msgid ""
 "If the total available space is greater than 50 GB, then three partitions "
 "are created"
@@ -1388,46 +1400,46 @@ msgstr ""
 "trije razdelki"
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:148
+#: en/doPartitionDisks.xml:153
 msgid ""
 "6/19 of the total available place is allocated to <filename>/</filename> "
 "with a maximum of 50 GB"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:153
+#: en/doPartitionDisks.xml:158
 msgid "1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:158
+#: en/doPartitionDisks.xml:163
 msgid "the rest (at least 12/19) is allocated to <filename>/home</filename>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:165
+#: en/doPartitionDisks.xml:170
 msgid ""
 "This means that from 160 GB or greater available space, the installer will "
 "create three partitions:"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:170
+#: en/doPartitionDisks.xml:175
 msgid "50 GB for <filename>/</filename>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:174
+#: en/doPartitionDisks.xml:179
 msgid "4 GB for <filename>swap</filename>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:178
+#: en/doPartitionDisks.xml:183
 msgid "and the remainder for <filename>/home</filename>"
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:183
+#: en/doPartitionDisks.xml:188
 msgid ""
 "If you are using a UEFI system, the ESP (EFI System Partition) will be "
 "automatically detected - or created if it does not exist yet - and mounted "
@@ -1437,7 +1449,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:189
+#: en/doPartitionDisks.xml:194
 msgid ""
 "If you are using a Legacy (also known as BIOS) system with a GPT partitioned "
 "disk, you need to create a BIOS boot partition if it doesn't already exist. "
@@ -1448,19 +1460,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:196
+#: en/doPartitionDisks.xml:201
 msgid "See <xref linkend=\"diskdrake\"/> for information on how to proceed."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:211
+#: en/doPartitionDisks.xml:216
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4.png"
-"\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks4.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks4.png\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:217
+#: en/doPartitionDisks.xml:226
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
 "previous standard of 512. Due to lack of available hardware, the "
@@ -1469,7 +1488,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:222
+#: en/doPartitionDisks.xml:231
 msgid ""
 "Some SSD devices now use an erase block size over 1 MB. If you have such a "
 "device we suggest that you partition the drive in advance, using an "
@@ -1478,17 +1497,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:229
+#: en/doPartitionDisks.xml:238
 msgid "<emphasis>Align to</emphasis> = MiB"
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:233
+#: en/doPartitionDisks.xml:242
 msgid "<emphasis>Free space preceding (MiB)</emphasis> = 2"
 msgstr ""
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:237
+#: en/doPartitionDisks.xml:246
 msgid ""
 "Also make sure all partitions are created using an even number of megabytes."
 msgstr ""
@@ -1659,12 +1678,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/firewall.xml:7
+#: en/firewall.xml:16
 msgid "Firewall"
 msgstr "Požarni zid"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:10
+#: en/firewall.xml:19
 msgid ""
 "This section allows you to configure some simple firewall rules: they "
 "determine which type of message from the Internet will be accepted by the "
@@ -1672,8 +1691,17 @@ msgid ""
 "system to be accessible from the Internet."
 msgstr ""
 
+#. type: Content of: <section><mediaobject>
+#: en/firewall.xml:26
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-firewall.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+
 #. type: Content of: <section><para>
-#: en/firewall.xml:16
+#: en/firewall.xml:31
 msgid ""
 "In the default setting (no button is checked), no service of the system is "
 "accessible from the network. The <emphasis>Everything (no firewall)</"
@@ -1686,7 +1714,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:25
+#: en/firewall.xml:40
 msgid ""
 "All other options are more or less self-explanatory. As an example, you will "
 "enable the CUPS server if you want printers on your machine to be accessible "
@@ -1694,12 +1722,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:29
+#: en/firewall.xml:44
 msgid "<emphasis role=\"bold\">Advanced</emphasis>"
 msgstr "<emphasis role=\"bold\">Napredno</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:31
+#: en/firewall.xml:46
 msgid ""
 "The <emphasis>Advanced</emphasis> option opens a window where you can enable "
 "a series of services by typing a list of <quote>couples</quote> (blank "
@@ -1707,34 +1735,36 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:35
-msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
+#: en/firewall.xml:50
+#, fuzzy
+msgid "<emphasis>&lt;port-number&gt;/&lt;protocol&gt;</emphasis>"
 msgstr "<emphasis>&lt;številka-vrat>/&lt;protokol></emphasis>"
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:38
+#: en/firewall.xml:53
 msgid ""
-"- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
-"the service you want to enable (e.g. 873 for the RSYNC service) as defined "
-"in <emphasis>RFC-433</emphasis>;"
+"- <emphasis>&lt;port-number&gt;</emphasis> is the value of the port assigned "
+"to the service you want to enable (e.g. 873 for the RSYNC service) as "
+"defined in <emphasis>RFC-433</emphasis>;"
 msgstr ""
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:42
+#: en/firewall.xml:57
 msgid ""
-"- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
-"<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
+"- <emphasis>&lt;protocol&gt;</emphasis> is one of <emphasis>TCP</emphasis> "
+"or <emphasis>UDP</emphasis> - the internet protocol that is used by the "
+"service."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:47
+#: en/firewall.xml:62
 msgid ""
 "For instance, the entry for enabling access to the RSYNC service therefore "
 "is <emphasis>873/tcp</emphasis>."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:50
+#: en/firewall.xml:65
 msgid ""
 "In case a service is implemented to use both protocols, you specify 2 "
 "couples for the same port."
@@ -1802,12 +1832,12 @@ msgid "Graphical Configuration"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:32
+#: en/installer.xml:34
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, namestitveni program Mageje"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:35
+#: en/installer.xml:37
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -1815,33 +1845,33 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:40
+#: en/installer.xml:42
 msgid "The installation steps"
 msgstr "Namestitveni koraki"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:44
+#: en/installer.xml:46
 msgid ""
 "The install process is divided into a number of steps - the status of which "
 "is indicated in a panel to the left of the screen."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:50
+#: en/installer.xml:52
 msgid ""
 "Each step has one or more screens, which may also have <emphasis>Advanced</"
 "emphasis> sections with extra, less commonly required options."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:56
+#: en/installer.xml:58
 msgid ""
 "Most screens have <emphasis>Help</emphasis> buttons for further details "
 "about the particular step."
 msgstr ""
 
 #. type: Content of: <section><section><caution><para>
-#: en/installer.xml:62
+#: en/installer.xml:64
 msgid ""
 "If at some point during the install you decide to abort the installation, it "
 "is possible to reboot, but please think twice before you do this. Once a "
@@ -1851,7 +1881,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><caution><para>
-#: en/installer.xml:68
+#: en/installer.xml:70
 msgid ""
 "If, in spite of this, you are very sure rebooting is what you want, go to a "
 "text terminal by pressing the keys <keycombo> <keycap>Ctrl</keycap> "
@@ -1861,12 +1891,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:86
+#: en/installer.xml:88
 msgid "Installation Welcome Screen"
 msgstr "Prikaz dobrodošlice namestitve"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:88
+#: en/installer.xml:90
 msgid ""
 "The particular screen that you will first see when booting from the "
 "Installation media will depend on whether your computer motherboard is of "
@@ -1874,60 +1904,60 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:92
+#: en/installer.xml:94
 msgid ""
 "The welcome menu screen has various options, however the default option will "
 "start the installer, and is normally all that you will need."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:97
+#: en/installer.xml:99
 msgid "Legacy (BIOS) Systems"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:100
+#: en/installer.xml:102
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome.png\"/> </"
 "imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:111
+#: en/installer.xml:113
 msgid ""
 "Install Mageia to a hard disk. This is the default option, and will "
 "automatically start after a short while unless another option is selected."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:117
+#: en/installer.xml:119
 msgid "<emphasis role=\"bold\">Rescue System</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:119
+#: en/installer.xml:121
 msgid ""
 "This option allows you to either re-install the bootloader for an existing "
 "Mageia installation or you can use it to restore a Windows bootloader."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:132
+#: en/installer.xml:134
 msgid "<emphasis role=\"bold\">F2: Language</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:134
+#: en/installer.xml:136
 msgid "Press F2 for alternative languages."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:140
+#: en/installer.xml:142
 msgid "UEFI Systems"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:142
+#: en/installer.xml:144
 msgid ""
 "From this screen, you can access options by pressing <keycap>e</keycap> to "
 "enter the edit mode. To come back to this screen, press <keycap>Esc</keycap> "
@@ -1935,19 +1965,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:148
+#: en/installer.xml:150
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome2.png\"/> </"
 "imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:157
+#: en/installer.xml:159
 msgid "<emphasis role=\"bold\">Install:</emphasis> Start the Install process"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:162
+#: en/installer.xml:164
 msgid ""
 "<emphasis role=\"bold\">Rescue:</emphasis> This option allows you to either "
 "re-install the bootloader for an existing Mageia installation or you can use "
@@ -1955,31 +1985,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:169
+#: en/installer.xml:171
 msgid ""
 "<emphasis role=\"bold\">F2: Language:</emphasis> Press <keycap>F2</keycap> "
 "for alternative languages."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:174
+#: en/installer.xml:176
 msgid ""
 "If you booted from a USB stick, you will see the above options duplicated, "
 "and in this case, you should use the set that will be suffixed with \"USB\"."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:181
+#: en/installer.xml:183
 msgid "Installation Problems and Possible Solutions"
 msgstr "Težave z namestitvijo in možne rešitve"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:184
+#: en/installer.xml:186
 msgid "No Graphical Interface"
 msgstr "Brez grafičnega vmesnika"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:188
+#: en/installer.xml:190
 msgid ""
 "After the initial screen you did not progress to the <emphasis>Language "
 "Selection</emphasis> screen. This can happen with some graphic cards and "
@@ -1988,7 +2018,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:195
+#: en/installer.xml:197
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
 "In this case it is worth trying a text-mode installation. To use this press "
@@ -1999,12 +2029,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:208
+#: en/installer.xml:210
 msgid "The Install Freezes"
 msgstr "Namestitev zamrzne"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:210
+#: en/installer.xml:212
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic hardware "
@@ -2014,12 +2044,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:218
+#: en/installer.xml:220
 msgid "RAM problem"
 msgstr "Težave s spominom RAM"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:220
+#: en/installer.xml:222
 msgid ""
 "This will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
@@ -2029,12 +2059,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:228
+#: en/installer.xml:230
 msgid "Dynamic partitions"
 msgstr "Dinamični razdelki"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:230
+#: en/installer.xml:232
 msgid ""
 "If you converted your hard disk from <literal>Basic</literal> format to "
 "<literal>Dynamic</literal> format in Microsoft Windows, then it is not "
@@ -3657,73 +3687,109 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:27
+#: en/setupBootloader.xml:32
 msgid "Bootloader"
 msgstr "Zagonski nalagalnik"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:31
+#: en/setupBootloader.xml:36
+#, fuzzy
+msgid "Available Bootloaders"
+msgstr "Zagonski nalagalnik"
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:39
 msgid "Grub2"
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><title>
-#: en/setupBootloader.xml:34
-msgid "Grub2 on Legacy MBR/GPT systems"
-msgstr ""
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:42
+#, fuzzy
+msgid "<emphasis role=\"bold\">Grub2 on Legacy MBR/GPT systems</emphasis>"
+msgstr "<emphasis role=\"bold\">Napredno</emphasis>"
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:37
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:46
 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:42
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:52
 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:49
-msgid "Grub2-efi on UEFI systems"
-msgstr "Grub2-efi na sistemu UEFI."
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:59
+#, fuzzy
+msgid "<emphasis role=\"bold\">Grub2-efi on UEFI systems</emphasis>"
+msgstr "<emphasis role=\"bold\">Delovna postaja</emphasis>"
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:52
-msgid "GRUB2-efi will be used exclusively as the bootloader for a UEFI system."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:63
+msgid "GRUB2-efi or rEFInd may be used as the bootloader for a UEFI system."
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:57
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:68
 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:60
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:71
 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 "
-"created by Windows and add grub2-efi to it. If no ESP exists, then one will "
+"created by Windows and add grub2-efi to it.  If no ESP exists, then one will "
 "be created. Although it is possible to have several ESPs, only one is "
 "required, whatever the number of operating systems you have."
 msgstr ""
 
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:82
+msgid "rEFInd"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:85
+#, fuzzy
+msgid "<emphasis role=\"bold\">rEFInd on UEFI systems</emphasis>"
+msgstr "<emphasis role=\"bold\">Napredno</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:88
+msgid ""
+"rEFInd has a nice graphical set of options, and can auto-detect installed "
+"EFI bootloaders. See: http://www.rodsbooks.com/refind/"
+msgstr ""
+
+#. type: Content of: <section><section><section><note><para>
+#: en/setupBootloader.xml:95
+msgid ""
+"Please note that in order to be able to use the <literal>rEFInd</literal> "
+"option, an installed EFI System Partition must match your system "
+"architecture: if you have a 32bit EFI System Partition installed on a 64bit "
+"machine for instance, then the rEFInd option will not be displayed/available "
+"to you."
+msgstr ""
+
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:72
+#: en/setupBootloader.xml:106
 msgid "Bootloader Setup"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:76
+#: en/setupBootloader.xml:110
 msgid "Bootloader main options"
 msgstr "Glavne možnosti zagonskega nalagalnika"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:79
+#: en/setupBootloader.xml:113
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader.png\"/> </imageobject> <imageobject condition=\"live"
@@ -3732,47 +3798,69 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:91
+#: en/setupBootloader.xml:125
 msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:93
+#. type: Content of: <section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:129
+msgid ""
+"<guimenuitem>GRUB2</guimenuitem> (with either a graphical or a text menu), "
+"can be chosen for both <literal>Legacy MBR/BIOS</literal> systems and "
+"<literal>UEFI</literal> systems."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:136
 msgid ""
-"This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI "
-"systems will not see this option here."
+"<guimenuitem>rEFInd</guimenuitem> (with a graphical menu)  is an alternative "
+"option solely for use with <literal>UEFI</literal> systems."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:98
+#: en/setupBootloader.xml:144
 msgid "<emphasis role=\"bold\">Boot device</emphasis>"
 msgstr ""
 
+#. type: Content of: <section><section><section><itemizedlist><listitem><warning><para>
+#: en/setupBootloader.xml:147
+msgid "Don't change this unless you really know what you are doing."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><note><para>
+#: en/setupBootloader.xml:152
+msgid ""
+"There is no option to write GRUB to the boot sector of a partition (e.g: "
+"<filename>sda1</filename>), as this method is considered unreliable."
+msgstr ""
+
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:100
-msgid "Don't change this unless you really know what you are doing"
+#: en/setupBootloader.xml:157
+msgid ""
+"When using UEFI mode, then the <guilabel>Boot device</guilabel> will be "
+"listed as <guimenuitem>EFI System Partition</guimenuitem>."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:105
+#: en/setupBootloader.xml:163
 msgid ""
 "<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:108
+#: en/setupBootloader.xml:166
 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:113
+#: en/setupBootloader.xml:171
 msgid "<emphasis role=\"bold\">Security</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:115
+#: en/setupBootloader.xml:173
 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 "
@@ -3782,34 +3870,34 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:126
+#: en/setupBootloader.xml:184
 msgid "Choose a password for the bootloader (optional)"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:130
+#: en/setupBootloader.xml:188
 msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:132
+#: en/setupBootloader.xml:190
 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:137 en/setupBootloader.xml:212
+#: en/setupBootloader.xml:195 en/setupBootloader.xml:308
 msgid "<emphasis>Advanced</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:141
+#: en/setupBootloader.xml:199
 msgid "<emphasis>Enable ACPI</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:143
+#: en/setupBootloader.xml:201
 msgid ""
 "ACPI (Advanced Configuration and Power Interface) is a standard for power "
 "management. It can save energy by stopping unused devices. Deselecting it "
@@ -3819,24 +3907,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:152
+#: en/setupBootloader.xml:210
 msgid "<emphasis>Enable SMP</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:154
+#: en/setupBootloader.xml:212
 msgid ""
 "This option enables/disables symmetric multiprocessing for multi-core "
 "processors"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:159
+#: en/setupBootloader.xml:217
 msgid "<emphasis>Enable APIC</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:161
+#: en/setupBootloader.xml:219
 msgid ""
 "Enabling this gives the operating system access to the Advanced Programmable "
 "Interrupt Controller. APIC devices permit more complex priority models, and "
@@ -3844,24 +3932,82 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:168
+#: en/setupBootloader.xml:226
 msgid "<emphasis>Enable Local APIC</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:170
+#: en/setupBootloader.xml:228
 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:177
+#: en/setupBootloader.xml:235
 msgid "Bootloader Configuration"
 msgstr "Nastavitev zagonskega nalagalnika"
 
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:237
+msgid ""
+"If, in the previous section you selected <literal>rEFInd</literal> as the "
+"bootloader to use, you would then be presented with the options shown in the "
+"screenshot directly below. Otherwise, please instead move on to the "
+"subsequent screenshot for your options."
+msgstr ""
+
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:180
+#: en/setupBootloader.xml:243
+#, fuzzy
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"rEFIndLoaderConfig.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-rEFIndLoaderConfig.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:253
+#, fuzzy
+msgid "Your rEFInd configuration options:"
+msgstr "Nastavitve zvoka"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:256
+msgid ""
+"<guimenuitem>Install or update rEFInd in the EFI system partition.</"
+"guimenuitem>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:261
+msgid ""
+"<guimenuitem>Install in EFI/Boot partition (workaround for some BIOS's).</"
+"guimenuitem>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:264
+msgid ""
+"With some BIOS's, the newly written bootloaser for Mageia at end of the "
+"installation will not be recognized. In that case, you can use this option "
+"as a workaround for the issue."
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:270
+msgid ""
+"If you did not select rEFInd as the bootloader to use in the previous "
+"section, then your bootloader configurations are shown below:"
+msgstr ""
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:275
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -3870,42 +4016,42 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:191
+#: en/setupBootloader.xml:286
 msgid "<emphasis role=\"bold\">Default</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:193
+#: en/setupBootloader.xml:288
 msgid "The operating system to be started up by default."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:197
+#: en/setupBootloader.xml:292
 msgid "<emphasis role=\"bold\">Append</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:199
+#: en/setupBootloader.xml:294
 msgid ""
 "This option lets you pass information to the kernel 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:204
+#: en/setupBootloader.xml:299
 msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:206
+#: en/setupBootloader.xml:301
 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, "
-"then untick the Probe Foreign OS option."
+"then untick the <guimenuitem>Probe Foreign OS</guimenuitem> option."
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:215
+#: en/setupBootloader.xml:311
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader4.png\"/> </imageobject> <imageobject condition=\"live"
@@ -3914,12 +4060,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:226
+#: en/setupBootloader.xml:322
 msgid "<emphasis>Video mode</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:228
+#: en/setupBootloader.xml:324
 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 "
@@ -3927,38 +4073,47 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:234
+#: en/setupBootloader.xml:330
 msgid "<emphasis>Do not touch ESP or MBR</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:236
+#: en/setupBootloader.xml:332
 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 "
-"missing. Click<emphasis> Ok</emphasis> if you are sure you understand the "
-"implications, and wish to proceed."
+"missing. Click <guimenuitem>Ok </guimenuitem>only if you are sure you "
+"understand the implications, and wish to proceed."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><warning><para>
+#: en/setupBootloader.xml:338
+msgid ""
+"Chain-loading via legacy bootloaders (GRUB Legacy and LiLo)  is no longer "
+"supported by Mageia as it is likely to fail when attempting to boot this "
+"resulting installation of Mageia. If you use anything other than GRUB2 or "
+"rEFInd for this purpose, then you do so at your own risk!"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:245
+#: en/setupBootloader.xml:348
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png"
 "\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:253
+#: en/setupBootloader.xml:356
 msgid "Other Options"
 msgstr "Druge možnosti"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:256
+#: en/setupBootloader.xml:359
 msgid "Using an existing bootloader"
 msgstr "Uporaba obstoječega zagonskega nalagalnika"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:258
+#: en/setupBootloader.xml:361
 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 "
@@ -3968,12 +4123,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:267
+#: en/setupBootloader.xml:370
 msgid "Installing Without a Bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:269
+#: en/setupBootloader.xml:372
 msgid ""
 "While you can opt to install Mageia without a bootloader (see section 2.1 "
 "Advanced), this is not recommended unless you absolutely know what you are "
@@ -4308,3 +4463,6 @@ msgid ""
 "take a little while to complete. When it is finishing you will briefly get a "
 "blank screen - this is normal."
 msgstr ""
+
+#~ msgid "Grub2-efi on UEFI systems"
+#~ msgstr "Grub2-efi na sistemu UEFI."
diff --git a/docs/docs/stable/installer/sq.po b/docs/docs/stable/installer/sq.po
index fdc181e1..f94ba117 100644
--- a/docs/docs/stable/installer/sq.po
+++ b/docs/docs/stable/installer/sq.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2019-01-19 21:23+0200\n"
+"POT-Creation-Date: 2019-09-08 15:26+0300\n"
 "PO-Revision-Date: 2019-05-11 20:56+0000\n"
 "Last-Translator: Ardit Dani <ardit.dani@gmail.com>\n"
 "Language-Team: Albanian (http://www.transifex.com/MageiaLinux/mageia/"
@@ -174,7 +174,7 @@ msgstr ""
 "bit."
 
 #. type: Content of: <section><info><title>
-#: en/addUser.xml:3
+#: en/addUser.xml:9
 msgid "User Management"
 msgstr "Administrim Përdorues"
 
@@ -184,13 +184,16 @@ msgstr "Administrim Përdorues"
 #. 2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
 #.   Also changed 'Advanced User Management' to 'User Management (advanced)'.
 #. 2018/02/24 apb: Changed list style.
+#. 2019/08/10 apb: Added missing 'condition' profile for live-user1.png.
+#. 2019/08/11 apb: [1] Reword 1.1 (including Note) [2] Reword 1.2 Password text.
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:12
+#: en/addUser.xml:28
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
-"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
-"\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata format="
-"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-setRootPassword.png\" format=\"PNG\" revision=\"1\" xml:id="
+"\"setRootPassword-im1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-user1.png\" format=\"PNG\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
 "\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -198,20 +201,18 @@ msgstr ""
 "\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:21
+#: en/addUser.xml:40
 msgid "Set Administrator (root)  Password:"
 msgstr "Vendos Fjalëkalim administratori (root):"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:24
+#: en/addUser.xml:44
+#, fuzzy
 msgid ""
 "It is advisable for all Mageia installations to set a <literal>superuser</"
 "literal> (Administrator) password, usually called the <emphasis>root </"
-"emphasis>password in Linux. As you type a password into the top box a shield "
-"will change from red-to-yellow-to-green depending on the strength of the "
-"password. A green shield shows you are using a strong password. You need to "
-"repeat the same password in the box underneath, to check that the first "
-"entry was not mistyped."
+"emphasis>password in Linux. You need to repeat the same password in the box "
+"underneath, to check that the first entry was not mistyped."
 msgstr ""
 "Është e këshillueshme që të gjitha instalimet Mageia të vendosin një "
 "fjalëkalim për <literal>superuser</literal> (Administrator), zakonisht quhet "
@@ -223,7 +224,15 @@ msgstr ""
 "parë nuk është gabuar."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:32
+#: en/addUser.xml:51
+msgid ""
+"As you type a password into the top box a shield will change from red-to-"
+"yellow-to-green depending on the strength of the password. A green shield "
+"shows you are using a strong password."
+msgstr ""
+
+#. type: Content of: <section><section><note><para>
+#: en/addUser.xml:55
 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."
@@ -233,12 +242,12 @@ msgstr ""
 "tjerë në një fjalëkalim."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:39
+#: en/addUser.xml:63
 msgid "Enter a user"
 msgstr "Fut një përdorues"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:41
+#: en/addUser.xml:66
 msgid ""
 "Add a User here. A regular user has fewer privileges than the "
 "<literal>superuser</literal> (root), but enough to use the Internet, office "
@@ -251,33 +260,33 @@ msgstr ""
 "mesatar mund të përdorë në një kompjuter."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:47
+#: en/addUser.xml:73
 msgid "<emphasis role=\"bold\">Icon</emphasis>"
 msgstr "<emphasis role=\"bold\">Ikonë</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:48
+#: en/addUser.xml:75
 msgid "Click on this button if you want to change the user's icon"
 msgstr ""
 "Klikoni mbi këtë buton nëse dëshironi të ndryshoni ikonën e përdoruesit"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:52
+#: en/addUser.xml:80
 msgid "<emphasis role=\"bold\">Real Name</emphasis>"
 msgstr "<emphasis role=\"bold\">Emri Vërtetë</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:53
+#: en/addUser.xml:82
 msgid "Insert the user's real name into this text box"
 msgstr "Futni emrin e vërtetë të përdoruesit në këtë kuti teksti"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:56
+#: en/addUser.xml:86
 msgid "<emphasis role=\"bold\">Login Name</emphasis>"
 msgstr "<emphasis role=\"bold\">Emër Hyrës</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:57
+#: en/addUser.xml:88
 msgid ""
 "Enter the user login name or let DrakX use a version of the user's real "
 "name. <emphasis role=\"bold\">The login name is case-sensitive.</emphasis>"
@@ -287,7 +296,7 @@ msgstr ""
 "ndjeshëm.</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><caution><simpara>
-#: en/addUser.xml:61
+#: en/addUser.xml:93
 msgid ""
 "The login entered here should be different to any login currently in use for "
 "your <filename>/home</filename> directory. Some user parameters will be "
@@ -301,23 +310,17 @@ msgstr ""
 "Kmail ..."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:65 en/setupBootloader.xml:124
+#: en/addUser.xml:102 en/setupBootloader.xml:182
 msgid "<emphasis role=\"bold\">Password</emphasis>"
 msgstr "<emphasis role=\"bold\">Fjalëkalimi</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:66
-msgid ""
-"Type in the user password. There is a shield at the end of the text box that "
-"indicates the strength of the password. (See also <xref linkend="
-"\"givePassword\"/>)"
+#: en/addUser.xml:104
+msgid "Type in the user password (remembering the advice in the Note above)."
 msgstr ""
-"Shkruani fjalëkalimin e përdoruesit. Ekziston një mburojë në fund të kutisë "
-"së tekstit që tregon fuqinë e fjalëkalimit. (Shih gjithashtu <xref linkend="
-"\"givePassword\"/>)"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:68
+#: en/addUser.xml:107
 msgid ""
 "<emphasis role=\"bold\">Password (again):</emphasis> Retype the user "
 "password. DrakX will check that you have not mistyped the password."
@@ -327,7 +330,7 @@ msgstr ""
 "fjalëkalimin."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:74
+#: en/addUser.xml:114
 msgid ""
 "Any users added while installing Mageia, will have a home directory that is "
 "both read and write protected (umask=0027)"
@@ -336,7 +339,7 @@ msgstr ""
 "që lexohet dhe shkruhet në mënyrë të mbrojtur (umask=0027)"
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:76
+#: en/addUser.xml:117
 msgid ""
 "You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
@@ -347,17 +350,17 @@ msgstr ""
 "<emphasis>Menaxhimi Përdoruesit</emphasis>."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:79
+#: en/addUser.xml:121
 msgid "The access permissions can also be changed after the install."
 msgstr "Lejet hyrëse gjithashtu mund të ndryshohet pas instalimit."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:85
+#: en/addUser.xml:128
 msgid "User Management (advanced)"
 msgstr "Administrim Përdoruesit (përparuar)"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:87
+#: en/addUser.xml:131
 msgid ""
 "The <emphasis>Advanced</emphasis> option allows you to edit further settings "
 "for the user you are adding."
@@ -366,7 +369,7 @@ msgstr ""
 "mëtejshme për përdoruesin që po shtoni."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:91
+#: en/addUser.xml:136
 msgid ""
 "<emphasis>Shell</emphasis>: This drop-down list allows you to change the "
 "shell available to any user you added in the previous screen. Options are "
@@ -378,7 +381,7 @@ msgstr ""
 "<literal>Sh</literal>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:143
 msgid ""
 "<emphasis>User ID</emphasis>: Here you can set the user ID for any user you "
 "added in the previous screen. If you are unsure what the purpose of this is, "
@@ -389,7 +392,7 @@ msgstr ""
 "se cili është qëllimi i kësaj, atëherë lini atë bosh."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:102
+#: en/addUser.xml:149
 msgid ""
 "<emphasis>Group ID</emphasis>: This lets you set the group ID.  Again, if "
 "unsure, leave it blank."
@@ -547,17 +550,17 @@ msgstr ""
 "sinkronizimin automatik të kohës dhe të specifikoni një server NTP."
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:23
+#: en/bootLive.xml:10
 msgid "Boot Mageia as Live system"
 msgstr "Ndez Mageia si Sistem Live"
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:28
+#: en/bootLive.xml:14
 msgid "Booting the medium"
 msgstr "Ndezje një medium"
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:31
+#: en/bootLive.xml:16
 msgid ""
 "You can boot directly from a Live DVD or USB. Usually, you just need to plug "
 "the USB device in or place the DVD in the drive and restart the computer."
@@ -566,7 +569,7 @@ msgstr ""
 "futni pajisjen USB ose vendosni DVD-në në makinë dhe rinisni kompjuterin."
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:35
+#: en/bootLive.xml:19
 msgid ""
 "If the computer does not automatically boot from the USB or DVD you may need "
 "to reconfigure your BIOS Boot Disk priority. Alternatively, you might try "
@@ -579,7 +582,7 @@ msgstr ""
 "nga e cila do të nisë kompjuteri."
 
 #. type: Content of: <section><section><tip><para>
-#: en/bootLive.xml:41
+#: en/bootLive.xml:24
 msgid ""
 "To access the BIOS or boot menu when the computer is starting, you can try "
 "pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or <keycap>Esc</"
@@ -595,7 +598,7 @@ msgstr ""
 "alternativave të mundshme."
 
 #. type: Content of: <section><section><note><para>
-#: en/bootLive.xml:50
+#: en/bootLive.xml:32
 msgid ""
 "The actual screen that you will first see when booting from the Live media "
 "will depend on whether your computer motherboard is of the Legacy (BIOS) or "
@@ -606,37 +609,38 @@ msgstr ""
 "ose lloji UEFI."
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:58
+#: en/bootLive.xml:39
 msgid "In BIOS/CSM/Legacy mode"
 msgstr "Në BIOS/CSM/Legacy mode"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:62
+#: en/bootLive.xml:42
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"../live-bootCSM.png\" align=\"center\"/> "
+"</imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> </"
+"<imageobject> <imagedata fileref=\"dx2-summaryTop.png\" align=\"center\"/> </"
 "imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:67
+#: en/bootLive.xml:46
 msgid "First screen while booting in BIOS mode"
 msgstr "Ekrani fillestarë gjatë ndezjes në mënyrë të BIOS"
 
 #. type: Content of: <section><section><section><itemizedlist><title>
-#: en/bootLive.xml:72 en/bootLive.xml:144 en/installer.xml:106
-#: en/installer.xml:154
+#: en/bootLive.xml:50 en/bootLive.xml:104 en/installer.xml:108
+#: en/installer.xml:156
 msgid "Menu"
 msgstr "Menu"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:75 en/bootLive.xml:147
+#: en/bootLive.xml:52 en/bootLive.xml:106
 msgid "<emphasis role=\"bold\">Boot Mageia</emphasis>"
 msgstr "<emphasis role=\"bold\">Ndez Mageia</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:77
+#: en/bootLive.xml:53
 msgid ""
 "This option will boot the Mageia Live system from the connected DVD/USB "
 "media (expect a very slow system compared to an installed OS)."
@@ -645,12 +649,12 @@ msgstr ""
 "(prisni një sistem shumë të ngadaltë në krahasim me një SO të instaluar)."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:81
+#: en/bootLive.xml:56
 msgid "Once the boot is done, you can proceed to the installation."
 msgstr "Pasi të kryhet ndezja, mund të vazhdoni me instalimin."
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:86 en/bootLive.xml:102
+#: en/bootLive.xml:60 en/bootLive.xml:72
 msgid ""
 "<emphasis role=\"bold\">+ use non-free video drivers (slower to boot)</"
 "emphasis>"
@@ -659,32 +663,32 @@ msgstr ""
 "ndezje)</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:89
+#: en/bootLive.xml:62
 msgid "Boot the Mageia Live system using non-free video drivers"
 msgstr "Ndez sistemin Mageia Live duke përdorur drejtues jo-video të lirë"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:96 en/bootLive.xml:155 en/installer.xml:109
+#: en/bootLive.xml:68 en/bootLive.xml:112 en/installer.xml:111
 msgid "<emphasis role=\"bold\">Install Mageia</emphasis>"
 msgstr "<emphasis role=\"bold\">Instalo Mageia</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:98 en/bootLive.xml:157
+#: en/bootLive.xml:69 en/bootLive.xml:113
 msgid "This option will install Mageia to a hard disk."
 msgstr "Ky opsion do ta instalojë Mageia në një disk."
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:105
+#: en/bootLive.xml:74
 msgid "Install Mageia using non-free video drivers"
 msgstr "Instaloni Mageia duke përdorur drejtues jo-falas videoje"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:111 en/installer.xml:125
+#: en/bootLive.xml:79 en/installer.xml:127
 msgid "<emphasis role=\"bold\">Memory Test</emphasis>"
 msgstr "<emphasis role=\"bold\">Memory Test</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:113 en/installer.xml:127
+#: en/bootLive.xml:80 en/installer.xml:129
 msgid ""
 "Test the installed RAM by performing multiple read and write operations. "
 "Reboot to end the test."
@@ -693,12 +697,12 @@ msgstr ""
 "shkrimi. Rifillo për t'i dhënë fund provës."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:118 en/bootLive.xml:161
+#: en/bootLive.xml:84 en/bootLive.xml:116
 msgid "<emphasis role=\"bold\"> F2 Language</emphasis>"
 msgstr "<emphasis role=\"bold\"> F2 Gjuhë</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:120 en/bootLive.xml:163
+#: en/bootLive.xml:85 en/bootLive.xml:117
 msgid ""
 "Press <keycap>F2</keycap> to have the installer use a specific language "
 "during the installation. Use the arrow keys to select the language then "
@@ -709,26 +713,27 @@ msgstr ""
 "pas shtypni <keycap>Enter</keycap>."
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:129
+#: en/bootLive.xml:93
 msgid "In UEFI mode"
 msgstr "Në mënyrë UEFI"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:133
+#: en/bootLive.xml:96
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:139
+#: en/bootLive.xml:100
 msgid "First screen while booting in UEFI mode"
 msgstr "Ekrani fillestarë gjatë ndezjes në mënyrë të UEFI"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:149
+#: en/bootLive.xml:107
 msgid ""
 "This option will boot the Mageia Live system from the connected DVD/USB "
 "media (expect a very slow system compared to an installed OS).  Once the "
@@ -739,7 +744,7 @@ msgstr ""
 "Pasi të kryhet ndezja, mund të vazhdoni me instalimin"
 
 #. type: Content of: <section><section><note><para>
-#: en/bootLive.xml:170
+#: en/bootLive.xml:123
 msgid ""
 "If you booted from a USB stick, you will see the above menu options "
 "duplicated, and in this case, you should choose from the menu pair that will "
@@ -1011,12 +1016,12 @@ msgstr ""
 "se janë të vendosur të gjithë në kohë lokale, ose të gjithë në UTC/GMT."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:24
+#: en/configureX_card_list.xml:27
 msgid "Choose an X Server (Configure your Graphic Card)"
 msgstr "Zgjidhni një X Server (Konfiguro Kartën tuaj Grafike)"
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_card_list.xml:29
+#: en/configureX_card_list.xml:32
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_card_list."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_card_list-im1\"/> </"
@@ -1027,7 +1032,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:35
+#: en/configureX_card_list.xml:38
 msgid ""
 "DrakX has a very comprehensive database of video cards and will usually "
 "correctly identify your video device."
@@ -1036,7 +1041,7 @@ msgstr ""
 "do të identifikojë saktë pajisjen video tuaj."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:38
+#: en/configureX_card_list.xml:41
 msgid ""
 "If the installer has not correctly detected your graphic card and you know "
 "which one you have, you can select it from the tree by:"
@@ -1045,22 +1050,22 @@ msgstr ""
 "cilën keni, ju mund të zgjidhni atë nga pema nga:"
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_card_list.xml:41 en/configureX_monitor.xml:74
+#: en/configureX_card_list.xml:44 en/configureX_monitor.xml:78
 msgid "Vendor"
 msgstr "Shitës"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:45
+#: en/configureX_card_list.xml:48
 msgid "then the make of your card"
 msgstr "pastaj modeli kartës tuaj"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:49
+#: en/configureX_card_list.xml:52
 msgid "and the model of card"
 msgstr "dhe modeli i kartelës"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:53
+#: en/configureX_card_list.xml:56
 msgid ""
 "If you cannot find your card in the vendor lists (because it's not yet in "
 "the database or it's an older card) you may find a suitable driver in the "
@@ -1077,7 +1082,7 @@ msgstr ""
 "tënde, mund të përdorësh drejtuesin VESA që siguron aftësi bazë."
 
 #. type: Content of: <section><caution><para>
-#: en/configureX_card_list.xml:61
+#: en/configureX_card_list.xml:64
 msgid ""
 "Be aware that if you select an incompatible driver you may only have access "
 "to the <emphasis>Command Line Interface</emphasis>"
@@ -1086,7 +1091,7 @@ msgstr ""
 "të keni qasje vetëm në <emphasis>Command Line Interface</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:65
+#: en/configureX_card_list.xml:68
 msgid ""
 "Some video card manufacturers provide proprietary drivers for Linux which "
 "may only be available in the <emphasis>Nonfree</emphasis> repository and in "
@@ -1103,17 +1108,13 @@ msgstr ""
 "këtë pas rihapjes tuaj të parë."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:11
-msgid "Graphic Card and Monitor Configuration"
+#: en/configureX_chooser.xml:23
+#, fuzzy
+msgid "Graphics Card and Monitor Configuration"
 msgstr "Karta Grafike dhe Konfigurimi Monitorit"
 
-#.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
-#. 2018/02/15 apb: Some text and typography.
-#. 2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.
-#. 2018/02/23 apb: Typo.
-#. 2019/01/06 apb: Slight reword, split 1st para in two.
 #. type: Content of: <section><mediaobject>
-#: en/configureX_chooser.xml:26
+#: en/configureX_chooser.xml:28
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_chooser."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_chooser-im1\"/> </"
@@ -1124,7 +1125,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:32
+#: en/configureX_chooser.xml:34
 msgid ""
 "No matter which graphical environment (also known as desktop environment) "
 "you chose for this install of Mageia, they are all based on a graphical user "
@@ -1141,7 +1142,7 @@ msgstr ""
 "vijim <quote>X</quote> cilësimet duhet të jenë të sakta."
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:39
+#: en/configureX_chooser.xml:41
 msgid ""
 "Choose the appropriate settings manually if you think the details are "
 "incorrect, or if none are shown."
@@ -1150,12 +1151,13 @@ msgstr ""
 "pasakta, ose nëse asnjë nuk është treguar."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:44
-msgid "<emphasis role=\"bold\">Graphic Card</emphasis>"
+#: en/configureX_chooser.xml:46
+#, fuzzy
+msgid "<emphasis role=\"bold\">Graphics Card</emphasis>"
 msgstr "<emphasis role=\"bold\">Kartë Grafike</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:47
+#: en/configureX_chooser.xml:49
 msgid ""
 "If you need to, you can select a specific card from this expandable list. "
 "See <xref linkend=\"configureX_card_list\"/>."
@@ -1164,12 +1166,12 @@ msgstr ""
 "zgjeruar. Shiko <xref linkend=\"configureX_card_list\"/>."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:52
+#: en/configureX_chooser.xml:54
 msgid "<emphasis role=\"bold\">Monitor</emphasis>"
 msgstr "<emphasis role=\"bold\">Monitor</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:55
+#: en/configureX_chooser.xml:57
 msgid ""
 "You can choose Plug 'n Play, if applicable, or choose your monitor from the "
 "<emphasis>Vendor</emphasis> or <emphasis>Generic</emphasis> lists. Choose "
@@ -1184,23 +1186,23 @@ msgstr ""
 "vertikale të monitoruesit tuaj. Shiko <xref linkend=\"configureX_monitor\"/>."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:63
+#: en/configureX_chooser.xml:65
 msgid "<emphasis role=\"bold\">Resolution</emphasis>"
 msgstr "<emphasis role=\"bold\">Rezolucion</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:66
+#: en/configureX_chooser.xml:68
 msgid "The resolution and color depth of your monitor can be set here."
 msgstr ""
 "Rezolucioni dhe thellësia e ngjyrës së monitorit tuaj mund të vendosen këtu."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:71
+#: en/configureX_chooser.xml:73
 msgid "<emphasis role=\"bold\">Test</emphasis>"
 msgstr "<emphasis role=\"bold\">Test</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:74
+#: en/configureX_chooser.xml:76
 msgid ""
 "The test button does not always appear during install. If the option is "
 "there, and you test your settings, you should be asked to confirm that your "
@@ -1220,19 +1222,19 @@ msgstr ""
 "cilësimet tuaja të jenë në anën e sigurt."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:85
+#: en/configureX_chooser.xml:87
 msgid "<emphasis role=\"bold\">Options</emphasis>"
 msgstr "<emphasis role=\"bold\">Alternativa</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:88
+#: en/configureX_chooser.xml:90
 msgid "Here you can choose to enable or disable various options."
 msgstr ""
 "Këtu mund të zgjidhni të aktivizoni ose të çaktivizoni alternativa të "
 "ndryshme."
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_chooser.xml:93
+#: en/configureX_chooser.xml:95
 msgid ""
 "There is a risk of damaging a monitor if you choose refresh rates that are "
 "outside the frequency range of that monitor. This applies to older CRT "
@@ -1245,12 +1247,12 @@ msgstr ""
 "pambështetur dhe normalisht do të hyjnë në modalitetin e gatishmërisë."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_monitor.xml:22
+#: en/configureX_monitor.xml:26
 msgid "Choosing your Monitor"
 msgstr "Zgjidhni Monitorin tuaj"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:25
+#: en/configureX_monitor.xml:29
 msgid ""
 "DrakX has a very comprehensive database of monitors and will usually "
 "correctly identify yours."
@@ -1259,7 +1261,7 @@ msgstr ""
 "të identifikojë saktë tuajat."
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:30
+#: en/configureX_monitor.xml:34
 msgid ""
 "<emphasis role=\"bold\">Selecting a monitor with different characteristics "
 "could damage your monitor or video hardware. Please don't try something "
@@ -1272,7 +1274,7 @@ msgstr ""
 "dyshim, duhet të konsultoheni me dokumentacionin tuaj të ekranit."
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:38
+#: en/configureX_monitor.xml:42
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
@@ -1283,12 +1285,12 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:46
+#: en/configureX_monitor.xml:50
 msgid "Custom"
 msgstr "Personalizim"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:49
+#: en/configureX_monitor.xml:53
 msgid ""
 "This option allows you to set two critical parameters: the vertical refresh "
 "rate and the horizontal sync rate. Vertical refresh determines how often the "
@@ -1301,7 +1303,7 @@ msgstr ""
 "horizontal është shkalla në të cilën shfaqen linjat e skanimit."
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:55
+#: en/configureX_monitor.xml:59
 msgid ""
 "It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor "
 "type with a sync range that is beyond the capabilities of your monitor: you "
@@ -1315,12 +1317,12 @@ msgstr ""
 "monitorit."
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:64
+#: en/configureX_monitor.xml:68
 msgid "Plug'n Play"
 msgstr "Plug'n Dëgjues"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:67
+#: en/configureX_monitor.xml:71
 msgid ""
 "This is the default option and automatically tries to determine the monitor "
 "type from the monitor database."
@@ -1329,37 +1331,39 @@ msgstr ""
 "përcaktojë llojin e ekranit nga baza e të dhënave të ekraneve."
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:77
+#: en/configureX_monitor.xml:81
+#, fuzzy
 msgid ""
 "If the installer has not correctly detected your monitor and you know which "
-"one you have, you can select it from the tree by selecting:"
+"one you have, you can choose it from the options by selecting:"
 msgstr ""
 "Nëse instaluesi nuk e ka zbuluar saktësisht monitoruar tuaj dhe ju e dini "
 "cilin ju keni, ju mund të zgjidhni atë nga pema duke përzgjedhur:"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:86
+#: en/configureX_monitor.xml:90
 msgid "Manufacturer"
 msgstr "Prodhues"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:90
+#: en/configureX_monitor.xml:94
 msgid "Monitor model"
 msgstr "Model Ekrani"
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:96
+#: en/configureX_monitor.xml:100
 msgid "Generic"
 msgstr "Përgjithshëm"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:99
+#: en/configureX_monitor.xml:103
+#, fuzzy
 msgid ""
-"Selecting this group will list nearly 30 display configurations such as "
-"1024x768 @ 60Hz and includes flat-panel displays as used in laptops. This is "
-"often a good monitor selection group if you need to use the VESA card driver "
-"when your video hardware cannot be determined automatically.  Once again it "
-"may be wise to be conservative in your selections."
+"Selecting this group will list approximately 30 display configurations such "
+"as 1024x768 @ 60Hz and includes flat-panel displays as used in laptops.  "
+"This is often a good monitor selection group if you need to use the VESA "
+"card driver when your video hardware cannot be determined automatically. "
+"Once again, it may be wise to be conservative in your selections."
 msgstr ""
 "Përzgjedhja e këtij grupi do të listojë afro 30 konfigurime të ekranit si "
 "1024x768 @ 60Hz dhe përfshin ekranet e paneleve të sheshta siç përdoren në "
@@ -1369,12 +1373,12 @@ msgstr ""
 "jeni konservatore në zgjedhjet tuaja."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:22
+#: en/diskdrake.xml:24
 msgid "Custom Disk Partitioning with DiskDrake"
 msgstr "Personalizo Ndarjen e Diskut me DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:27
+#: en/diskdrake.xml:29
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-diskdrake.png\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1385,7 +1389,7 @@ msgstr ""
 "<imagedata align=\"center\" fileref=\"live-diskdrake.png\"/> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:38
+#: en/diskdrake.xml:40
 msgid ""
 "Modify the layout of your disk(s) here. You can remove or create partitions, "
 "change the filesystem or size of a partition and even view their details "
@@ -1396,18 +1400,19 @@ msgstr ""
 "detajet e tyre para se të filloni."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:47
+#, fuzzy
 msgid ""
 "There is a tab at the top for every detected hard disk (or other storage "
-"device, like a USB key). In the screenshot above there are two available "
-"devices: <filename>sda </filename>and <filename>sdb</filename>."
+"device, like a USB key), for example: <filename>sda</filename>, "
+"<filename>sdb</filename>, <filename>sdc</filename> etc."
 msgstr ""
 "Ekziston një skedë në krye për çdo disku të zbuluar (ose pajisje tjetër "
 "ruajtëse, si një çelës USB). Në pamjen më lart ekzistojnë dy pajisje të "
 "disponueshme: <filename>sda </filename>dhe <filename>sdb</filename>."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:52
+#: en/diskdrake.xml:54
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it. "
@@ -1420,7 +1425,7 @@ msgstr ""
 "të tilla si emërtimi (emri) i një ndarje ose zgjedhja e një lloj ndarjeje."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:60
+#: en/diskdrake.xml:62
 msgid ""
 "Continue until you have adjusted everything to your satisfaction, then click "
 "<emphasis>Done</emphasis> when you're ready."
@@ -1429,7 +1434,7 @@ msgstr ""
 "klikoni <emphasis>Kryer</emphasis> kur të jeni gati."
 
 #. type: Content of: <section><warning><orderedlist><listitem><para>
-#: en/diskdrake.xml:69
+#: en/diskdrake.xml:71
 msgid ""
 "Take care with the <emphasis>Clear all</emphasis> option, use it only if you "
 "are sure you want to wipe all partitions on the selected storage device."
@@ -1439,7 +1444,7 @@ msgstr ""
 "pajisjen e përzgjedhur të ruajtjes."
 
 #. type: Content of: <section><warning><orderedlist><listitem><para>
-#: en/diskdrake.xml:75
+#: en/diskdrake.xml:77
 msgid ""
 "If you wish to use encryption on your <filename>/</filename> partition you "
 "must ensure that you have a separate <filename>/boot</filename> partition. "
@@ -1452,7 +1457,7 @@ msgstr ""
 "duhet të vendoset, përndryshe sistemi juaj do të jetë i pandezshëm."
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/diskdrake.xml:87
+#: en/diskdrake.xml:89
 msgid ""
 "If you are installing Mageia on a UEFI system, check that an ESP (EFI System "
 "Partition) is present and correctly mounted on <filename>/boot/EFI</"
@@ -1463,7 +1468,7 @@ msgstr ""
 "<filename>/boot/EFI</filename>. Shihni Figurën 1 më poshtë."
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/diskdrake.xml:93
+#: en/diskdrake.xml:95
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
 "partition is present and of the correct type. See Figure 2 below."
@@ -1473,12 +1478,12 @@ msgstr ""
 "poshtë."
 
 #. type: Content of: <section><figure><title>
-#: en/diskdrake.xml:101
+#: en/diskdrake.xml:103
 msgid "EFI System Partition"
 msgstr "Ndarja Sistemit EFI"
 
 #. type: Content of: <section><figure><mediaobject>
-#: en/diskdrake.xml:104
+#: en/diskdrake.xml:106
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-diskdrake2.png\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1489,17 +1494,17 @@ msgstr ""
 "<imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/> </imageobject>"
 
 #. type: Content of: <section><figure>
-#: en/diskdrake.xml:103 en/diskdrake.xml:117
+#: en/diskdrake.xml:105 en/diskdrake.xml:119
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><figure><title>
-#: en/diskdrake.xml:115
+#: en/diskdrake.xml:117
 msgid "BIOS boot partition"
 msgstr "BIOS ndez ndarjen"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:118 en/doPartitionDisks.xml:201
+#: en/diskdrake.xml:120 en/doPartitionDisks.xml:206
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1522,12 +1527,12 @@ msgid "Partitioning"
 msgstr "Ndarje"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:31
 msgid "Suggested Partitioning"
 msgstr "Ndarja Sugjeruar"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:34
 msgid ""
 "In this screen you can see the content of your hard drive(s) along with the "
 "DrakX partitioning proposals for where to install Mageia."
@@ -1536,7 +1541,7 @@ msgstr ""
 "propozimet e ndarjes DrakX për ku të instaloni Mageia."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:34
+#: en/doPartitionDisks.xml:38
 msgid ""
 "The actual options available from those shown below will vary according to "
 "the layout and content of your particular hard drive(s)."
@@ -1545,7 +1550,7 @@ msgstr ""
 "ndryshojnë sipas paraqitjes dhe përmbajtjes së diskut(s) tuaj të veçantë."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:39
+#: en/doPartitionDisks.xml:43
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1558,17 +1563,17 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><itemizedlist><title>
-#: en/doPartitionDisks.xml:49
+#: en/doPartitionDisks.xml:53
 msgid "Main Options"
 msgstr "Alternativat Kryesore"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:56
 msgid "<emphasis role=\"bold\">Use Existing Partitions</emphasis>"
 msgstr "<emphasis role=\"bold\">Përdorni Ndarjet Ekzistuese</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:59
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1577,12 +1582,12 @@ msgstr ""
 "përputhje janë gjetur dhe mund të përdoren për instalimin."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:61
+#: en/doPartitionDisks.xml:65
 msgid "<emphasis role=\"bold\">Use Free Space</emphasis>"
 msgstr "<emphasis role=\"bold\">Përdor Hapësirën e Lirë</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:68
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1591,7 +1596,7 @@ msgstr ""
 "të përdorë atë për instalimin tuaj të ri Mageia."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:70
+#: en/doPartitionDisks.xml:74
 msgid ""
 "<emphasis role=\"bold\">Use Free Space on a Windows Partition</emphasis>"
 msgstr ""
@@ -1599,12 +1604,12 @@ msgstr ""
 "emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:73
+#: en/doPartitionDisks.xml:77
+#, fuzzy
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it. 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 important files!"
+"installation but see the warning below."
 msgstr ""
 "Nëse keni hapësirë të papërdorur në një ndarje ekzistuese të Windows-it, "
 "instaluesi mund të ofrojë ta përdorni atë. Kjo mund të jetë një mënyrë e "
@@ -1612,32 +1617,70 @@ msgstr ""
 "një operacion i rrezikshëm kështu që duhet të siguroheni që keni kopjuar të "
 "gjitha skedarët e rëndësishme!"
 
+#. type: Content of: <section><itemizedlist><listitem><para><mediaobject>
+#: en/doPartitionDisks.xml:87
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:79
+#: en/doPartitionDisks.xml:82
+#, fuzzy
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
 "light blue and the proposed Mageia partition in dark blue with their "
 "intended sizes just underneath. You have the option to modify these sizes by "
 "clicking and dragging the gap between both partitions.  See the following "
-"screenshot:"
+"screenshot:<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr ""
 "Me këtë alternativë, instaluesi shfaq ndarjen e mbetur të Windows në dritën "
 "blu dhe ndarjen e propozuar Mageia në blu të errët me madhësinë e synuar "
 "vetëm nën. Ju keni mundësi të modifikoni këto madhësi duke klikuar dhe "
 "zvarritur hendekun midis të dy ndarjeve. Shikoni fotografinë në vijim:"
 
+#. type: Content of: <section><itemizedlist><listitem><warning><para>
+#: en/doPartitionDisks.xml:97
+msgid ""
+"This involves shrinking the size of the Windows partition, and therefore is "
+"a risky operation, so you should make sure you have backed up all important "
+"files before proceeding."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><important><para>
+#: en/doPartitionDisks.xml:103
+#, fuzzy
+msgid ""
+"The partition must be \"clean\", meaning that Windows must have closed down "
+"correctly the last time it was used. It must also have been defragmented, "
+"although this is not a guarantee that all files in the partition have been "
+"moved out of the area that is about to be used for Mageia."
+msgstr ""
+"Vini re se kjo përfshin pakësimin madhësinë e ndarjes Windows. Ndarja duhet "
+"të jetë \"e pastër\", që do të thotë që Windows duhet të jenë mbyllur në "
+"mënyrë korrekte herën e fundit që është përdorur. Ajo duhet të ketë qenë de-"
+"fragmentuar, edhe pse kjo nuk është një garanci që të gjitha dosjet në "
+"ndarje janë zhvendosur nga zona që është gati për t'u përdorur. Është shumë "
+"e rekomanduar për të ruajtur dosjet tuaja personale rezervë."
+
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:87
+#: en/doPartitionDisks.xml:112
 msgid "<emphasis role=\"bold\">Erase and use Entire Disk</emphasis>"
 msgstr "<emphasis role=\"bold\">Fshirja dhe përdorni Gjithë Diskun</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:90
+#: en/doPartitionDisks.xml:115
 msgid "This option will allocate the entire drive for Mageia"
 msgstr "Kjo alternativë do të ndajë të gjithë diskun për Mageia"
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:119
 msgid ""
 "This will erase ALL data on the selected hard drive. Take care! If you "
 "intend to use part of the disk for something else, or you already have data "
@@ -1648,30 +1691,13 @@ msgstr ""
 "keni të dhëna në diskun dhe nuk jeni të përgatitur për ta humbur, atëherë "
 "mos e përdorni këtë alternativë."
 
-#. type: Content of: <section><itemizedlist><listitem><important><para>
-#: en/doPartitionDisks.xml:101
-msgid ""
-"Note that this involves shrinking the size of the Windows partition. The "
-"partition must be \"clean\", meaning that Windows must have closed down "
-"correctly the last time it was used. It must also have been defragmented, "
-"although this is not a guarantee that all files in the partition have been "
-"moved out of the area that is about to be used. It is highly recommended to "
-"back up your personal files."
-msgstr ""
-"Vini re se kjo përfshin pakësimin madhësinë e ndarjes Windows. Ndarja duhet "
-"të jetë \"e pastër\", që do të thotë që Windows duhet të jenë mbyllur në "
-"mënyrë korrekte herën e fundit që është përdorur. Ajo duhet të ketë qenë de-"
-"fragmentuar, edhe pse kjo nuk është një garanci që të gjitha dosjet në "
-"ndarje janë zhvendosur nga zona që është gati për t'u përdorur. Është shumë "
-"e rekomanduar për të ruajtur dosjet tuaja personale rezervë."
-
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:112
+#: en/doPartitionDisks.xml:127
 msgid "<emphasis role=\"bold\">Custom Disk Partitioning</emphasis>"
 msgstr "<emphasis role=\"bold\">Modifiko Ndarjet Diskut</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:115
+#: en/doPartitionDisks.xml:130
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1679,21 +1705,8 @@ msgstr ""
 "Kjo ju jep kontroll të plotë mbi vendosjen e instalimit në hard-disqet(s) "
 "tuaja."
 
-#. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:122
-msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
-
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:131
+#: en/doPartitionDisks.xml:136
 msgid ""
 "If you are not using the <emphasis>Custom disk partitioning</emphasis> "
 "option, then the installer will allocate the available space according to "
@@ -1704,7 +1717,7 @@ msgstr ""
 "rregullave të mëposhtme:"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:137
+#: en/doPartitionDisks.xml:142
 msgid ""
 "If the total available space is less than 50 GB, then only one partition is "
 "created. This will be the <filename>/</filename> (root)  partition."
@@ -1714,7 +1727,7 @@ msgstr ""
 "filename> (root)."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:143
+#: en/doPartitionDisks.xml:148
 msgid ""
 "If the total available space is greater than 50 GB, then three partitions "
 "are created"
@@ -1723,7 +1736,7 @@ msgstr ""
 "atëherë krijohen tre ndarje"
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:148
+#: en/doPartitionDisks.xml:153
 msgid ""
 "6/19 of the total available place is allocated to <filename>/</filename> "
 "with a maximum of 50 GB"
@@ -1732,19 +1745,19 @@ msgstr ""
 "maksimum prej 50 GB"
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:153
+#: en/doPartitionDisks.xml:158
 msgid "1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB"
 msgstr ""
 "1/19 është caktuar për <filename>swap</filename> me një maksimum prej 4 GB"
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:158
+#: en/doPartitionDisks.xml:163
 msgid "the rest (at least 12/19) is allocated to <filename>/home</filename>"
 msgstr ""
 "pjesa tjetër (së paku 12/19) është caktuar për <filename>/home</filename>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:165
+#: en/doPartitionDisks.xml:170
 msgid ""
 "This means that from 160 GB or greater available space, the installer will "
 "create three partitions:"
@@ -1753,22 +1766,22 @@ msgstr ""
 "instaluesi do të krijojë tre ndarje:"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:170
+#: en/doPartitionDisks.xml:175
 msgid "50 GB for <filename>/</filename>"
 msgstr "50 GB për <filename>/</filename>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:174
+#: en/doPartitionDisks.xml:179
 msgid "4 GB for <filename>swap</filename>"
 msgstr "4 GB për <filename>swap</filename>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:178
+#: en/doPartitionDisks.xml:183
 msgid "and the remainder for <filename>/home</filename>"
 msgstr "dhe pjesa tjetër për <filename>/home</filename>"
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:183
+#: en/doPartitionDisks.xml:188
 msgid ""
 "If you are using a UEFI system, the ESP (EFI System Partition) will be "
 "automatically detected - or created if it does not exist yet - and mounted "
@@ -1783,7 +1796,7 @@ msgstr ""
 "është bërë saktë."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:189
+#: en/doPartitionDisks.xml:194
 msgid ""
 "If you are using a Legacy (also known as BIOS) system with a GPT partitioned "
 "disk, you need to create a BIOS boot partition if it doesn't already exist. "
@@ -1800,22 +1813,27 @@ msgstr ""
 "quote> për llojin e skedarëve të sistemit."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:196
+#: en/doPartitionDisks.xml:201
 msgid "See <xref linkend=\"diskdrake\"/> for information on how to proceed."
 msgstr ""
 "Vështro <xref linkend=\"diskdrake\"/> për informacion se si të vazhdohet."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:211
+#: en/doPartitionDisks.xml:216
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4.png"
-"\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks4.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks4.png\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4.png"
-"\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:217
+#: en/doPartitionDisks.xml:226
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
 "previous standard of 512. Due to lack of available hardware, the "
@@ -1828,7 +1846,7 @@ msgstr ""
 "disk të tillë."
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:222
+#: en/doPartitionDisks.xml:231
 msgid ""
 "Some SSD devices now use an erase block size over 1 MB. If you have such a "
 "device we suggest that you partition the drive in advance, using an "
@@ -1841,17 +1859,17 @@ msgstr ""
 "cilësimet e mëposhtme:"
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:229
+#: en/doPartitionDisks.xml:238
 msgid "<emphasis>Align to</emphasis> = MiB"
 msgstr "<emphasis>Radhit në</emphasis> = MiB"
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:233
+#: en/doPartitionDisks.xml:242
 msgid "<emphasis>Free space preceding (MiB)</emphasis> = 2"
 msgstr "<emphasis>Hapësira e lirë para (MiB)</emphasis> = 2"
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:237
+#: en/doPartitionDisks.xml:246
 msgid ""
 "Also make sure all partitions are created using an even number of megabytes."
 msgstr ""
@@ -2037,12 +2055,12 @@ msgstr ""
 "link> nëse keni ndonjë pyetje ose dëshironi të kontribuoni në Mageia"
 
 #. type: Content of: <section><info><title>
-#: en/firewall.xml:7
+#: en/firewall.xml:16
 msgid "Firewall"
 msgstr "Mur i Zjarrt"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:10
+#: en/firewall.xml:19
 msgid ""
 "This section allows you to configure some simple firewall rules: they "
 "determine which type of message from the Internet will be accepted by the "
@@ -2054,8 +2072,18 @@ msgstr ""
 "i synuar. Kjo, nga ana tjetër, lejon që shërbimet përkatëse në sistem të "
 "jenë të arritshme nga interneti."
 
+#. type: Content of: <section><mediaobject>
+#: en/firewall.xml:26
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-firewall.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome.png\"/> </"
+"imageobject>"
+
 #. type: Content of: <section><para>
-#: en/firewall.xml:16
+#: en/firewall.xml:31
 msgid ""
 "In the default setting (no button is checked), no service of the system is "
 "accessible from the network. The <emphasis>Everything (no firewall)</"
@@ -2076,7 +2104,7 @@ msgstr ""
 "gjithë grupeve të rregullave të firewall për qëllime provash dhe debugging."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:25
+#: en/firewall.xml:40
 msgid ""
 "All other options are more or less self-explanatory. As an example, you will "
 "enable the CUPS server if you want printers on your machine to be accessible "
@@ -2087,12 +2115,12 @@ msgstr ""
 "kompjuterin tuaj të jenë të arritshëm nga rrjeti."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:29
+#: en/firewall.xml:44
 msgid "<emphasis role=\"bold\">Advanced</emphasis>"
 msgstr "<emphasis role=\"bold\">Përparuar</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:31
+#: en/firewall.xml:46
 msgid ""
 "The <emphasis>Advanced</emphasis> option opens a window where you can enable "
 "a series of services by typing a list of <quote>couples</quote> (blank "
@@ -2103,33 +2131,37 @@ msgstr ""
 "(ndarëse bosh)"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:35
-msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
+#: en/firewall.xml:50
+#, fuzzy
+msgid "<emphasis>&lt;port-number&gt;/&lt;protocol&gt;</emphasis>"
 msgstr "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:38
+#: en/firewall.xml:53
+#, fuzzy
 msgid ""
-"- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
-"the service you want to enable (e.g. 873 for the RSYNC service) as defined "
-"in <emphasis>RFC-433</emphasis>;"
+"- <emphasis>&lt;port-number&gt;</emphasis> is the value of the port assigned "
+"to the service you want to enable (e.g. 873 for the RSYNC service) as "
+"defined in <emphasis>RFC-433</emphasis>;"
 msgstr ""
 "- <emphasis>&lt;port-number></emphasis> është vlera e portit të caktuar për "
 "shërbimin që dëshironi të mundësoni (p.sh. 873 për shërbimin RSYNC) siç "
 "përcaktohet në <emphasis>RFC-433</emphasis>;"
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:42
+#: en/firewall.xml:57
+#, fuzzy
 msgid ""
-"- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
-"<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
+"- <emphasis>&lt;protocol&gt;</emphasis> is one of <emphasis>TCP</emphasis> "
+"or <emphasis>UDP</emphasis> - the internet protocol that is used by the "
+"service."
 msgstr ""
 "- <emphasis>&lt;protocol></emphasis> është një nga protokollet e internetit "
 "që përdoren nga shërbimi  <emphasis>TCP</emphasis> ose <emphasis>UDP</"
 "emphasis>."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:47
+#: en/firewall.xml:62
 msgid ""
 "For instance, the entry for enabling access to the RSYNC service therefore "
 "is <emphasis>873/tcp</emphasis>."
@@ -2138,7 +2170,7 @@ msgstr ""
 "<emphasis>873/tcp</emphasis>."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:50
+#: en/firewall.xml:65
 msgid ""
 "In case a service is implemented to use both protocols, you specify 2 "
 "couples for the same port."
@@ -2224,12 +2256,12 @@ msgid "Graphical Configuration"
 msgstr "Konfigurimi Grafik"
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:32
+#: en/installer.xml:34
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, instaluesi Mageia"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:35
+#: en/installer.xml:37
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -2240,12 +2272,12 @@ msgstr ""
 "më lehtë të jetë e mundur."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:40
+#: en/installer.xml:42
 msgid "The installation steps"
 msgstr "Hapat e instalimit"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:44
+#: en/installer.xml:46
 msgid ""
 "The install process is divided into a number of steps - the status of which "
 "is indicated in a panel to the left of the screen."
@@ -2254,7 +2286,7 @@ msgstr ""
 "tregohet në një panel në të majtë të ekranit."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:50
+#: en/installer.xml:52
 msgid ""
 "Each step has one or more screens, which may also have <emphasis>Advanced</"
 "emphasis> sections with extra, less commonly required options."
@@ -2264,7 +2296,7 @@ msgstr ""
 "zakonshme."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:56
+#: en/installer.xml:58
 msgid ""
 "Most screens have <emphasis>Help</emphasis> buttons for further details "
 "about the particular step."
@@ -2273,7 +2305,7 @@ msgstr ""
 "mëtejshme rreth hapa të veçantë."
 
 #. type: Content of: <section><section><caution><para>
-#: en/installer.xml:62
+#: en/installer.xml:64
 msgid ""
 "If at some point during the install you decide to abort the installation, it "
 "is possible to reboot, but please think twice before you do this. Once a "
@@ -2288,7 +2320,7 @@ msgstr ""
 "rifreskimi i tij mund t'ju lë shumë mirë me një sistem të papërdorshëm."
 
 #. type: Content of: <section><section><caution><para>
-#: en/installer.xml:68
+#: en/installer.xml:70
 msgid ""
 "If, in spite of this, you are very sure rebooting is what you want, go to a "
 "text terminal by pressing the keys <keycombo> <keycap>Ctrl</keycap> "
@@ -2303,12 +2335,12 @@ msgstr ""
 "keycap> <keycap>Delete</keycap> </keycombo> njëkohësisht për të rifilluar."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:86
+#: en/installer.xml:88
 msgid "Installation Welcome Screen"
 msgstr "Pamja Fillestare Instalimit"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:88
+#: en/installer.xml:90
 msgid ""
 "The particular screen that you will first see when booting from the "
 "Installation media will depend on whether your computer motherboard is of "
@@ -2319,7 +2351,7 @@ msgstr ""
 "UEFI."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:92
+#: en/installer.xml:94
 msgid ""
 "The welcome menu screen has various options, however the default option will "
 "start the installer, and is normally all that you will need."
@@ -2329,12 +2361,12 @@ msgstr ""
 "gjithçka që ju nevojitet."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:97
+#: en/installer.xml:99
 msgid "Legacy (BIOS) Systems"
 msgstr "Sistemi Legacy (BIOS)"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:100
+#: en/installer.xml:102
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome.png\"/> </"
 "imageobject>"
@@ -2343,7 +2375,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:111
+#: en/installer.xml:113
 msgid ""
 "Install Mageia to a hard disk. This is the default option, and will "
 "automatically start after a short while unless another option is selected."
@@ -2353,12 +2385,12 @@ msgstr ""
 "një alternativë tjetër."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:117
+#: en/installer.xml:119
 msgid "<emphasis role=\"bold\">Rescue System</emphasis>"
 msgstr "<emphasis role=\"bold\">Shpëtim Sistemi</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:119
+#: en/installer.xml:121
 msgid ""
 "This option allows you to either re-install the bootloader for an existing "
 "Mageia installation or you can use it to restore a Windows bootloader."
@@ -2367,22 +2399,22 @@ msgstr ""
 "ekzistues Mageia ose të përdorni për të rivendosur një bootloader të Windows."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:132
+#: en/installer.xml:134
 msgid "<emphasis role=\"bold\">F2: Language</emphasis>"
 msgstr "<emphasis role=\"bold\"> F2: Gjuhë</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:134
+#: en/installer.xml:136
 msgid "Press F2 for alternative languages."
 msgstr "Shtypni F2 për gjuhët alternative."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:140
+#: en/installer.xml:142
 msgid "UEFI Systems"
 msgstr "Sistemi UEFI"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:142
+#: en/installer.xml:144
 msgid ""
 "From this screen, you can access options by pressing <keycap>e</keycap> to "
 "enter the edit mode. To come back to this screen, press <keycap>Esc</keycap> "
@@ -2394,7 +2426,7 @@ msgstr ""
 "keycap> për të ruajtur dhe dalë."
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:148
+#: en/installer.xml:150
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome2.png\"/> </"
 "imageobject>"
@@ -2403,13 +2435,13 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:157
+#: en/installer.xml:159
 msgid "<emphasis role=\"bold\">Install:</emphasis> Start the Install process"
 msgstr ""
 "<emphasis role=\"bold\">Instalo:</emphasis> Fillo procesin e Instalimit"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:162
+#: en/installer.xml:164
 msgid ""
 "<emphasis role=\"bold\">Rescue:</emphasis> This option allows you to either "
 "re-install the bootloader for an existing Mageia installation or you can use "
@@ -2420,7 +2452,7 @@ msgstr ""
 "të rivendosur një bootloader të Windows."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:169
+#: en/installer.xml:171
 msgid ""
 "<emphasis role=\"bold\">F2: Language:</emphasis> Press <keycap>F2</keycap> "
 "for alternative languages."
@@ -2429,7 +2461,7 @@ msgstr ""
 "për gjuhë alternative."
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:174
+#: en/installer.xml:176
 msgid ""
 "If you booted from a USB stick, you will see the above options duplicated, "
 "and in this case, you should use the set that will be suffixed with \"USB\"."
@@ -2439,17 +2471,17 @@ msgstr ""
 "\"USB\"."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:181
+#: en/installer.xml:183
 msgid "Installation Problems and Possible Solutions"
 msgstr "Problemet e Instalimit dhe Zgjidhje e Mundshme"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:184
+#: en/installer.xml:186
 msgid "No Graphical Interface"
 msgstr "Nuk ka Ndërfaqe Grafike"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:188
+#: en/installer.xml:190
 msgid ""
 "After the initial screen you did not progress to the <emphasis>Language "
 "Selection</emphasis> screen. This can happen with some graphic cards and "
@@ -2462,7 +2494,7 @@ msgstr ""
 "command> në ekran."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:195
+#: en/installer.xml:197
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
 "In this case it is worth trying a text-mode installation. To use this press "
@@ -2479,12 +2511,12 @@ msgstr ""
 "dhe shtyp <keycap>ENTER</keycap> për të vazhduar me instalimin në tekst-mode."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:208
+#: en/installer.xml:210
 msgid "The Install Freezes"
 msgstr "Instaluesi Ngrin"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:210
+#: en/installer.xml:212
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic hardware "
@@ -2499,12 +2531,12 @@ msgstr ""
 "parametra të tjerë sipas nevojës."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:218
+#: en/installer.xml:220
 msgid "RAM problem"
 msgstr "Probleme RAM"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:220
+#: en/installer.xml:222
 msgid ""
 "This will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
@@ -2519,12 +2551,12 @@ msgstr ""
 "RAM. p.sh. <literal>mem=256M</literal> do të specifikonte 256MB RAM."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:228
+#: en/installer.xml:230
 msgid "Dynamic partitions"
 msgstr "Ndarjet dinamike"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:230
+#: en/installer.xml:232
 msgid ""
 "If you converted your hard disk from <literal>Basic</literal> format to "
 "<literal>Dynamic</literal> format in Microsoft Windows, then it is not "
@@ -4533,22 +4565,29 @@ msgstr ""
 "Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link>"
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:27
+#: en/setupBootloader.xml:32
 msgid "Bootloader"
 msgstr "Bootloader"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:31
+#: en/setupBootloader.xml:36
+#, fuzzy
+msgid "Available Bootloaders"
+msgstr "Bootloader"
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:39
 msgid "Grub2"
 msgstr "Grub2"
 
-#. type: Content of: <section><section><itemizedlist><title>
-#: en/setupBootloader.xml:34
-msgid "Grub2 on Legacy MBR/GPT systems"
-msgstr "Grub2 në sisteme Legacy MBR/GPT"
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:42
+#, fuzzy
+msgid "<emphasis role=\"bold\">Grub2 on Legacy MBR/GPT systems</emphasis>"
+msgstr "<emphasis role=\"bold\">Shpëtim Sistemi</emphasis>"
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:37
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:46
 msgid ""
 "GRUB2 (with or without graphical menu) will be used exclusively as the "
 "bootloader for a Legacy/MBR or Legacy/GPT system."
@@ -4556,8 +4595,8 @@ msgstr ""
 "GRUB2 (me ose pa menu grafike) do të përdoren ekskluzivisht si bootloader "
 "për një Sistem Legacy/MBR ose Legacy/GPT."
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:42
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:52
 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."
@@ -4565,19 +4604,21 @@ msgstr ""
 "Si parazgjedhje, një bootloader i ri do të shkruhet në MBR (Master Boot "
 "Record) të diskuit të parë ose në ndarjen e BIOS boot."
 
-#. type: Content of: <section><section><itemizedlist><title>
-#: en/setupBootloader.xml:49
-msgid "Grub2-efi on UEFI systems"
-msgstr "Grub2-efi në sisteme UEFI"
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:59
+#, fuzzy
+msgid "<emphasis role=\"bold\">Grub2-efi on UEFI systems</emphasis>"
+msgstr "<emphasis role=\"bold\">Shpëtim Sistemi</emphasis>"
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:52
-msgid "GRUB2-efi will be used exclusively as the bootloader for a UEFI system."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:63
+#, fuzzy
+msgid "GRUB2-efi or rEFInd may be used as the bootloader for a UEFI system."
 msgstr ""
 "GRUB2-efi do të përdoren ekskluzivisht si bootloader për një sistem UEFI."
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:57
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:68
 msgid ""
 "By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI "
 "System Partition)."
@@ -4585,12 +4626,13 @@ msgstr ""
 "Si parazgjedhje, një bootloader i ri (Grub2-efi) do të shkruhet në ESP "
 "(Ndarjen e Sistemit EFI)."
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:60
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:71
+#, fuzzy
 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 "
-"created by Windows and add grub2-efi to it. If no ESP exists, then one will "
+"created by Windows and add grub2-efi to it.  If no ESP exists, then one will "
 "be created. Although it is possible to have several ESPs, only one is "
 "required, whatever the number of operating systems you have."
 msgstr ""
@@ -4600,18 +4642,46 @@ msgstr ""
 "atëherë do të krijohet një. Megjithëse është e mundur që të ketë disa ESP, "
 "kërkohet vetëm një, pavarësisht nga numri i sistemeve operative që keni."
 
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:82
+msgid "rEFInd"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:85
+#, fuzzy
+msgid "<emphasis role=\"bold\">rEFInd on UEFI systems</emphasis>"
+msgstr "<emphasis role=\"bold\">Ikonë</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:88
+msgid ""
+"rEFInd has a nice graphical set of options, and can auto-detect installed "
+"EFI bootloaders. See: http://www.rodsbooks.com/refind/"
+msgstr ""
+
+#. type: Content of: <section><section><section><note><para>
+#: en/setupBootloader.xml:95
+msgid ""
+"Please note that in order to be able to use the <literal>rEFInd</literal> "
+"option, an installed EFI System Partition must match your system "
+"architecture: if you have a 32bit EFI System Partition installed on a 64bit "
+"machine for instance, then the rEFInd option will not be displayed/available "
+"to you."
+msgstr ""
+
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:72
+#: en/setupBootloader.xml:106
 msgid "Bootloader Setup"
 msgstr "Konfiguro Bootloader"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:76
+#: en/setupBootloader.xml:110
 msgid "Bootloader main options"
 msgstr "Opsionet kryesore të programit Bootloader"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:79
+#: en/setupBootloader.xml:113
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader.png\"/> </imageobject> <imageobject condition=\"live"
@@ -4624,31 +4694,52 @@ msgstr ""
 "im1\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:91
+#: en/setupBootloader.xml:125
 msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
 msgstr "<emphasis role=\"bold\">Bootloader për përdorim</emphasis>"
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:93
+#. type: Content of: <section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:129
+msgid ""
+"<guimenuitem>GRUB2</guimenuitem> (with either a graphical or a text menu), "
+"can be chosen for both <literal>Legacy MBR/BIOS</literal> systems and "
+"<literal>UEFI</literal> systems."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:136
 msgid ""
-"This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI "
-"systems will not see this option here."
+"<guimenuitem>rEFInd</guimenuitem> (with a graphical menu)  is an alternative "
+"option solely for use with <literal>UEFI</literal> systems."
 msgstr ""
-"Kjo veçori është në dispozicion vetëm për sistemet MBR/BIOS Legacy. "
-"Përdoruesit e sistemeve UEFI nuk do ta shohin këtë alternativë këtu."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:98
+#: en/setupBootloader.xml:144
 msgid "<emphasis role=\"bold\">Boot device</emphasis>"
 msgstr "<emphasis role=\"bold\">Boot pajisje</emphasis>"
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:100
-msgid "Don't change this unless you really know what you are doing"
+#. type: Content of: <section><section><section><itemizedlist><listitem><warning><para>
+#: en/setupBootloader.xml:147
+#, fuzzy
+msgid "Don't change this unless you really know what you are doing."
 msgstr "Mos e ndryshoni këtë nëse nuk e dini vërtet atë që po bëni"
 
+#. type: Content of: <section><section><section><itemizedlist><listitem><note><para>
+#: en/setupBootloader.xml:152
+msgid ""
+"There is no option to write GRUB to the boot sector of a partition (e.g: "
+"<filename>sda1</filename>), as this method is considered unreliable."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:157
+msgid ""
+"When using UEFI mode, then the <guilabel>Boot device</guilabel> will be "
+"listed as <guimenuitem>EFI System Partition</guimenuitem>."
+msgstr ""
+
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:105
+#: en/setupBootloader.xml:163
 msgid ""
 "<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
 msgstr ""
@@ -4656,7 +4747,7 @@ msgstr ""
 "emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:108
+#: en/setupBootloader.xml:166
 msgid ""
 "This text box lets you set a delay, in seconds, before the default operating "
 "system is started up."
@@ -4665,12 +4756,12 @@ msgstr ""
 "të sistemit operativ të parazgjedhur."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:113
+#: en/setupBootloader.xml:171
 msgid "<emphasis role=\"bold\">Security</emphasis>"
 msgstr "<emphasis role=\"bold\">Siguri</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:115
+#: en/setupBootloader.xml:173
 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 "
@@ -4685,17 +4776,17 @@ msgstr ""
 "është <literal>root</literal> dhe fjalëkalimi është ai i zgjedhur më pas."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:126
+#: en/setupBootloader.xml:184
 msgid "Choose a password for the bootloader (optional)"
 msgstr "Zgjidhni një fjalëkalim për bootloader (opsional)"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:130
+#: en/setupBootloader.xml:188
 msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
 msgstr "<emphasis role=\"bold\">Fjalëkalim (përsëri)</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:132
+#: en/setupBootloader.xml:190
 msgid ""
 "Retype the password and DrakX will check that it matches with the one set "
 "above"
@@ -4704,17 +4795,17 @@ msgstr ""
 "vendosur më sipër"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:137 en/setupBootloader.xml:212
+#: en/setupBootloader.xml:195 en/setupBootloader.xml:308
 msgid "<emphasis>Advanced</emphasis>"
 msgstr "<emphasis>Përparuar</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:141
+#: en/setupBootloader.xml:199
 msgid "<emphasis>Enable ACPI</emphasis>"
 msgstr "<emphasis>Mundëso ACPI</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:143
+#: en/setupBootloader.xml:201
 msgid ""
 "ACPI (Advanced Configuration and Power Interface) is a standard for power "
 "management. It can save energy by stopping unused devices. Deselecting it "
@@ -4730,12 +4821,12 @@ msgstr ""
 "mbylljet e sistemit)."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:152
+#: en/setupBootloader.xml:210
 msgid "<emphasis>Enable SMP</emphasis>"
 msgstr "<emphasis>Mundëso SMP</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:154
+#: en/setupBootloader.xml:212
 msgid ""
 "This option enables/disables symmetric multiprocessing for multi-core "
 "processors"
@@ -4744,12 +4835,12 @@ msgstr ""
 "multi-core"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:159
+#: en/setupBootloader.xml:217
 msgid "<emphasis>Enable APIC</emphasis>"
 msgstr "<emphasis>Mundëso APIC</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:161
+#: en/setupBootloader.xml:219
 msgid ""
 "Enabling this gives the operating system access to the Advanced Programmable "
 "Interrupt Controller. APIC devices permit more complex priority models, and "
@@ -4760,12 +4851,12 @@ msgstr ""
 "më komplekse dhe menaxhimin e avancuar IRQ (Interrupt Request)."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:168
+#: en/setupBootloader.xml:226
 msgid "<emphasis>Enable Local APIC</emphasis>"
 msgstr "<emphasis>Mundëso Lokale APIC</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:170
+#: en/setupBootloader.xml:228
 msgid ""
 "Here you can set Local APIC, which manages all external interrupts for a "
 "specific processor in an SMP system"
@@ -4774,12 +4865,70 @@ msgstr ""
 "jashtme për një procesor të caktuar në një sistem SMP"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:177
+#: en/setupBootloader.xml:235
 msgid "Bootloader Configuration"
 msgstr "Konfigurimi i Ngarkuesit Ndezës"
 
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:237
+msgid ""
+"If, in the previous section you selected <literal>rEFInd</literal> as the "
+"bootloader to use, you would then be presented with the options shown in the "
+"screenshot directly below. Otherwise, please instead move on to the "
+"subsequent screenshot for your options."
+msgstr ""
+
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:180
+#: en/setupBootloader.xml:243
+#, fuzzy
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"rEFIndLoaderConfig.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-rEFIndLoaderConfig.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:253
+#, fuzzy
+msgid "Your rEFInd configuration options:"
+msgstr "Konfigurimi zërit"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:256
+msgid ""
+"<guimenuitem>Install or update rEFInd in the EFI system partition.</"
+"guimenuitem>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:261
+msgid ""
+"<guimenuitem>Install in EFI/Boot partition (workaround for some BIOS's).</"
+"guimenuitem>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:264
+msgid ""
+"With some BIOS's, the newly written bootloaser for Mageia at end of the "
+"installation will not be recognized. In that case, you can use this option "
+"as a workaround for the issue."
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:270
+msgid ""
+"If you did not select rEFInd as the bootloader to use in the previous "
+"section, then your bootloader configurations are shown below:"
+msgstr ""
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:275
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -4792,22 +4941,22 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:191
+#: en/setupBootloader.xml:286
 msgid "<emphasis role=\"bold\">Default</emphasis>"
 msgstr "<emphasis role=\"bold\">Paraygjedhur</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:193
+#: en/setupBootloader.xml:288
 msgid "The operating system to be started up by default."
 msgstr "Sistemi operativ që do të fillojë nga parazgjedhja."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:197
+#: en/setupBootloader.xml:292
 msgid "<emphasis role=\"bold\">Append</emphasis>"
 msgstr "<emphasis role=\"bold\">Shtoj</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:199
+#: en/setupBootloader.xml:294
 msgid ""
 "This option lets you pass information to the kernel or tell the kernel to "
 "give you more information as it boots."
@@ -4816,23 +4965,24 @@ msgstr ""
 "kernelin t'ju japë më shumë informacione gjatë ndezje."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:204
+#: en/setupBootloader.xml:299
 msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
 msgstr "<emphasis role=\"bold\">Provo OS të huaj</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:206
+#: en/setupBootloader.xml:301
+#, fuzzy
 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, "
-"then untick the Probe Foreign OS option."
+"then untick the <guimenuitem>Probe Foreign OS</guimenuitem> option."
 msgstr ""
 "Nëse tashmë keni instaluar sisteme të tjera operative, Mageia përpiqet t'i "
 "shtojë ato te menyja e re boot Mageia. Nëse nuk e doni këtë sjellje, hiqni "
 "menjëherë alternativën e Provo Sistemin e Huaj."
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:215
+#: en/setupBootloader.xml:311
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader4.png\"/> </imageobject> <imageobject condition=\"live"
@@ -4845,12 +4995,12 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:226
+#: en/setupBootloader.xml:322
 msgid "<emphasis>Video mode</emphasis>"
 msgstr "<emphasis>Mënyrë Video</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:228
+#: en/setupBootloader.xml:324
 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 "
@@ -4861,25 +5011,35 @@ msgstr ""
 "të tjera madhësie dhe thellësie të ngjyrave."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:234
+#: en/setupBootloader.xml:330
 msgid "<emphasis>Do not touch ESP or MBR</emphasis>"
 msgstr "<emphasis>Mos prek ESP ose MBR</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:236
+#: en/setupBootloader.xml:332
+#, fuzzy
 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 "
-"missing. Click<emphasis> Ok</emphasis> if you are sure you understand the "
-"implications, and wish to proceed."
+"missing. Click <guimenuitem>Ok </guimenuitem>only if you are sure you "
+"understand the implications, and wish to proceed."
 msgstr ""
 "Zgjidh këtë alternativë nëse nuk doni një Mageia bootable, por do ta "
 "ngarkoni me zinxhirë nga një OS tjetër. Ju do të merrni një paralajmërim se "
 "bootloader mungon. Kliko<emphasis> Dakord</emphasis> nëse jeni të sigurt që "
 "kuptoni implikimet dhe dëshironi të vazhdoni."
 
+#. type: Content of: <section><section><section><itemizedlist><listitem><warning><para>
+#: en/setupBootloader.xml:338
+msgid ""
+"Chain-loading via legacy bootloaders (GRUB Legacy and LiLo)  is no longer "
+"supported by Mageia as it is likely to fail when attempting to boot this "
+"resulting installation of Mageia. If you use anything other than GRUB2 or "
+"rEFInd for this purpose, then you do so at your own risk!"
+msgstr ""
+
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:245
+#: en/setupBootloader.xml:348
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png"
 "\"/> </imageobject>"
@@ -4888,17 +5048,17 @@ msgstr ""
 "\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:253
+#: en/setupBootloader.xml:356
 msgid "Other Options"
 msgstr "Opsione tjera"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:256
+#: en/setupBootloader.xml:359
 msgid "Using an existing bootloader"
 msgstr "Përdorim i një bootloader ekzistues"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:258
+#: en/setupBootloader.xml:361
 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 "
@@ -4914,12 +5074,12 @@ msgstr ""
 "sistemin përkatës operativ."
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:267
+#: en/setupBootloader.xml:370
 msgid "Installing Without a Bootloader"
 msgstr "Instalimi pa një Bootloader"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:269
+#: en/setupBootloader.xml:372
 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 "
@@ -5340,3 +5500,46 @@ msgstr ""
 "Hapi tjetër është kopjimi i skedarëve në disk. Ky proces do vetëm pak kohë "
 "për të përfunduar. Kur të përfundoni do të merrni shkurtimisht një ekran "
 "bosh - kjo është normale."
+
+#~ msgid ""
+#~ "Type in the user password. There is a shield at the end of the text box "
+#~ "that indicates the strength of the password. (See also <xref linkend="
+#~ "\"givePassword\"/>)"
+#~ msgstr ""
+#~ "Shkruani fjalëkalimin e përdoruesit. Ekziston një mburojë në fund të "
+#~ "kutisë së tekstit që tregon fuqinë e fjalëkalimit. (Shih gjithashtu <xref "
+#~ "linkend=\"givePassword\"/>)"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> "
+#~ "</imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> "
+#~ "</imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4."
+#~ "png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4."
+#~ "png\"/> </imageobject>"
+
+#~ msgid "Grub2 on Legacy MBR/GPT systems"
+#~ msgstr "Grub2 në sisteme Legacy MBR/GPT"
+
+#~ msgid "Grub2-efi on UEFI systems"
+#~ msgstr "Grub2-efi në sisteme UEFI"
+
+#~ msgid ""
+#~ "This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI "
+#~ "systems will not see this option here."
+#~ msgstr ""
+#~ "Kjo veçori është në dispozicion vetëm për sistemet MBR/BIOS Legacy. "
+#~ "Përdoruesit e sistemeve UEFI nuk do ta shohin këtë alternativë këtu."
diff --git a/docs/docs/stable/installer/sr.po b/docs/docs/stable/installer/sr.po
index 5911c558..680766f6 100644
--- a/docs/docs/stable/installer/sr.po
+++ b/docs/docs/stable/installer/sr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2019-01-19 21:23+0200\n"
+"POT-Creation-Date: 2019-09-08 15:26+0300\n"
 "PO-Revision-Date: 2019-08-12 12:04+0000\n"
 "Last-Translator: tomaja <toma.jankovic@gmail.com>\n"
 "Language-Team: Serbian (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -171,7 +171,7 @@ msgstr ""
 "ће на њему пронаћи потребне 32-битне пакете."
 
 #. type: Content of: <section><info><title>
-#: en/addUser.xml:3
+#: en/addUser.xml:9
 msgid "User Management"
 msgstr "Управљање Корисницима"
 
@@ -181,13 +181,16 @@ msgstr "Управљање Корисницима"
 #. 2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
 #.   Also changed 'Advanced User Management' to 'User Management (advanced)'.
 #. 2018/02/24 apb: Changed list style.
+#. 2019/08/10 apb: Added missing 'condition' profile for live-user1.png.
+#. 2019/08/11 apb: [1] Reword 1.1 (including Note) [2] Reword 1.2 Password text.
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:12
+#: en/addUser.xml:28
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
-"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
-"\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata format="
-"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-setRootPassword.png\" format=\"PNG\" revision=\"1\" xml:id="
+"\"setRootPassword-im1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-user1.png\" format=\"PNG\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
 "\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -195,20 +198,18 @@ msgstr ""
 "\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:21
+#: en/addUser.xml:40
 msgid "Set Administrator (root)  Password:"
 msgstr "Постави Администраторову (root) Лозинку:"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:24
+#: en/addUser.xml:44
+#, fuzzy
 msgid ""
 "It is advisable for all Mageia installations to set a <literal>superuser</"
 "literal> (Administrator) password, usually called the <emphasis>root </"
-"emphasis>password in Linux. As you type a password into the top box a shield "
-"will change from red-to-yellow-to-green depending on the strength of the "
-"password. A green shield shows you are using a strong password. You need to "
-"repeat the same password in the box underneath, to check that the first "
-"entry was not mistyped."
+"emphasis>password in Linux. You need to repeat the same password in the box "
+"underneath, to check that the first entry was not mistyped."
 msgstr ""
 "Препоручљиво је да се за све Mageia инсталације постави <literal>superuser</"
 "literal> (Администраторска) лозинка, обично под именом <emphasis>root </"
@@ -218,7 +219,15 @@ msgstr ""
 "поновите унос лозинке у пољу испод, да би потврдили да је први унос исправан."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:32
+#: en/addUser.xml:51
+msgid ""
+"As you type a password into the top box a shield will change from red-to-"
+"yellow-to-green depending on the strength of the password. A green shield "
+"shows you are using a strong password."
+msgstr ""
+
+#. type: Content of: <section><section><note><para>
+#: en/addUser.xml:55
 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."
@@ -227,12 +236,12 @@ msgstr ""
 "слова (малих и Великих), бројева и других карактера у лозинки."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:39
+#: en/addUser.xml:63
 msgid "Enter a user"
 msgstr "Унесите корисника"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:41
+#: en/addUser.xml:66
 msgid ""
 "Add a User here. A regular user has fewer privileges than the "
 "<literal>superuser</literal> (root), but enough to use the Internet, office "
@@ -245,32 +254,32 @@ msgstr ""
 "просечан корисник рачунара корисити рачунар."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:47
+#: en/addUser.xml:73
 msgid "<emphasis role=\"bold\">Icon</emphasis>"
 msgstr "<emphasis role=\"bold\">Иконица</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:48
+#: en/addUser.xml:75
 msgid "Click on this button if you want to change the user's icon"
 msgstr "Кликните на овај тастер уколико желите да промените иконицу корисника"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:52
+#: en/addUser.xml:80
 msgid "<emphasis role=\"bold\">Real Name</emphasis>"
 msgstr "<emphasis role=\"bold\">Стварно име</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:53
+#: en/addUser.xml:82
 msgid "Insert the user's real name into this text box"
 msgstr "Унесите стварно име корисника у овo поље за унос текста"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:56
+#: en/addUser.xml:86
 msgid "<emphasis role=\"bold\">Login Name</emphasis>"
 msgstr "<emphasis role=\"bold\">Име за Пријаву</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:57
+#: en/addUser.xml:88
 msgid ""
 "Enter the user login name or let DrakX use a version of the user's real "
 "name. <emphasis role=\"bold\">The login name is case-sensitive.</emphasis>"
@@ -280,7 +289,7 @@ msgstr ""
 "\">Корисничко име разликује велика и мала слова.</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><caution><simpara>
-#: en/addUser.xml:61
+#: en/addUser.xml:93
 msgid ""
 "The login entered here should be different to any login currently in use for "
 "your <filename>/home</filename> directory. Some user parameters will be "
@@ -294,22 +303,17 @@ msgstr ""
 "Кмаилу..."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:65 en/setupBootloader.xml:124
+#: en/addUser.xml:102 en/setupBootloader.xml:182
 msgid "<emphasis role=\"bold\">Password</emphasis>"
 msgstr "<emphasis role=\"bold\">Лозинка</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:66
-msgid ""
-"Type in the user password. There is a shield at the end of the text box that "
-"indicates the strength of the password. (See also <xref linkend="
-"\"givePassword\"/>)"
+#: en/addUser.xml:104
+msgid "Type in the user password (remembering the advice in the Note above)."
 msgstr ""
-"Унесите лозинку корисника. Постоји индикатор на крају поља за унос који "
-"указује на јачину лозинке. (Погледајте и <xref linkend=\"givePassword\"/>)"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:68
+#: en/addUser.xml:107
 msgid ""
 "<emphasis role=\"bold\">Password (again):</emphasis> Retype the user "
 "password. DrakX will check that you have not mistyped the password."
@@ -318,7 +322,7 @@ msgstr ""
 "корисничку лозинку. DrakX ће проверити да ли сте то исправно урадили."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:74
+#: en/addUser.xml:114
 msgid ""
 "Any users added while installing Mageia, will have a home directory that is "
 "both read and write protected (umask=0027)"
@@ -327,7 +331,7 @@ msgstr ""
 "директоријум који је заштићен и за читање и за уписивање (umask=0027)"
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:76
+#: en/addUser.xml:117
 msgid ""
 "You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
@@ -338,17 +342,17 @@ msgstr ""
 "Изаберите <emphasis>Управљање корисницима</emphasis>."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:79
+#: en/addUser.xml:121
 msgid "The access permissions can also be changed after the install."
 msgstr "Дозволе за приступ се такође могу променити након инсталације."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:85
+#: en/addUser.xml:128
 msgid "User Management (advanced)"
 msgstr "Управљање корисницима (напредно)"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:87
+#: en/addUser.xml:131
 msgid ""
 "The <emphasis>Advanced</emphasis> option allows you to edit further settings "
 "for the user you are adding."
@@ -357,7 +361,7 @@ msgstr ""
 "корисника којег додајете."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:91
+#: en/addUser.xml:136
 msgid ""
 "<emphasis>Shell</emphasis>: This drop-down list allows you to change the "
 "shell available to any user you added in the previous screen. Options are "
@@ -369,7 +373,7 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:143
 msgid ""
 "<emphasis>User ID</emphasis>: Here you can set the user ID for any user you "
 "added in the previous screen. If you are unsure what the purpose of this is, "
@@ -380,7 +384,7 @@ msgstr ""
 "сигурни које је сврха овога, оставите га празним."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:102
+#: en/addUser.xml:149
 msgid ""
 "<emphasis>Group ID</emphasis>: This lets you set the group ID.  Again, if "
 "unsure, leave it blank."
@@ -537,17 +541,17 @@ msgstr ""
 "синхронизацију времена и одредити NTP сервер."
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:23
+#: en/bootLive.xml:10
 msgid "Boot Mageia as Live system"
 msgstr "Покрени Mageia као Live систем"
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:28
+#: en/bootLive.xml:14
 msgid "Booting the medium"
 msgstr "Покретање медија"
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:31
+#: en/bootLive.xml:16
 msgid ""
 "You can boot directly from a Live DVD or USB. Usually, you just need to plug "
 "the USB device in or place the DVD in the drive and restart the computer."
@@ -557,7 +561,7 @@ msgstr ""
 "рачунар."
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:35
+#: en/bootLive.xml:19
 msgid ""
 "If the computer does not automatically boot from the USB or DVD you may need "
 "to reconfigure your BIOS Boot Disk priority. Alternatively, you might try "
@@ -571,7 +575,7 @@ msgstr ""
 "систем."
 
 #. type: Content of: <section><section><tip><para>
-#: en/bootLive.xml:41
+#: en/bootLive.xml:24
 msgid ""
 "To access the BIOS or boot menu when the computer is starting, you can try "
 "pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or <keycap>Esc</"
@@ -586,7 +590,7 @@ msgstr ""
 "(углавном уобичајени) тастери су само неке од могућих комбинација."
 
 #. type: Content of: <section><section><note><para>
-#: en/bootLive.xml:50
+#: en/bootLive.xml:32
 msgid ""
 "The actual screen that you will first see when booting from the Live media "
 "will depend on whether your computer motherboard is of the Legacy (BIOS) or "
@@ -597,37 +601,38 @@ msgstr ""
 "UEFI типа."
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:58
+#: en/bootLive.xml:39
 msgid "In BIOS/CSM/Legacy mode"
 msgstr "У BIOS/CSM/Legacy моду"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:62
+#: en/bootLive.xml:42
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"../live-bootCSM.png\" align=\"center\"/> "
+"</imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> </"
+"<imageobject> <imagedata fileref=\"dx2-summaryTop.png\" align=\"center\"/> </"
 "imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:67
+#: en/bootLive.xml:46
 msgid "First screen while booting in BIOS mode"
 msgstr "Први екран при подизању система у BIOS моду"
 
 #. type: Content of: <section><section><section><itemizedlist><title>
-#: en/bootLive.xml:72 en/bootLive.xml:144 en/installer.xml:106
-#: en/installer.xml:154
+#: en/bootLive.xml:50 en/bootLive.xml:104 en/installer.xml:108
+#: en/installer.xml:156
 msgid "Menu"
 msgstr "Мени"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:75 en/bootLive.xml:147
+#: en/bootLive.xml:52 en/bootLive.xml:106
 msgid "<emphasis role=\"bold\">Boot Mageia</emphasis>"
 msgstr "<emphasis role=\"bold\">Покрени Mageia</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:77
+#: en/bootLive.xml:53
 msgid ""
 "This option will boot the Mageia Live system from the connected DVD/USB "
 "media (expect a very slow system compared to an installed OS)."
@@ -636,13 +641,13 @@ msgstr ""
 "(очекујте спорији систем у поређењу са инсталираним OS-ом)."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:81
+#: en/bootLive.xml:56
 msgid "Once the boot is done, you can proceed to the installation."
 msgstr ""
 "Када се подизања система једном заврши, можете наставити са инсталацијом."
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:86 en/bootLive.xml:102
+#: en/bootLive.xml:60 en/bootLive.xml:72
 msgid ""
 "<emphasis role=\"bold\">+ use non-free video drivers (slower to boot)</"
 "emphasis>"
@@ -651,32 +656,32 @@ msgstr ""
 "покретање)</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:89
+#: en/bootLive.xml:62
 msgid "Boot the Mageia Live system using non-free video drivers"
 msgstr "Покреће Mageia Live систем корићењем не-слободних видео драјвера"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:96 en/bootLive.xml:155 en/installer.xml:109
+#: en/bootLive.xml:68 en/bootLive.xml:112 en/installer.xml:111
 msgid "<emphasis role=\"bold\">Install Mageia</emphasis>"
 msgstr "<emphasis role=\"bold\">Инсталирај Mageia</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:98 en/bootLive.xml:157
+#: en/bootLive.xml:69 en/bootLive.xml:113
 msgid "This option will install Mageia to a hard disk."
 msgstr "Ова опција ће инсталирати Mageia на тврди диск."
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:105
+#: en/bootLive.xml:74
 msgid "Install Mageia using non-free video drivers"
 msgstr "Инсталира Mageia коришћењем не-слободних видео драјвера"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:111 en/installer.xml:125
+#: en/bootLive.xml:79 en/installer.xml:127
 msgid "<emphasis role=\"bold\">Memory Test</emphasis>"
 msgstr "<emphasis role=\"bold\">Тестирај меморију</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:113 en/installer.xml:127
+#: en/bootLive.xml:80 en/installer.xml:129
 msgid ""
 "Test the installed RAM by performing multiple read and write operations. "
 "Reboot to end the test."
@@ -685,12 +690,12 @@ msgstr ""
 "уписивања. Рестартујте рачунар да би завршили тестирање."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:118 en/bootLive.xml:161
+#: en/bootLive.xml:84 en/bootLive.xml:116
 msgid "<emphasis role=\"bold\"> F2 Language</emphasis>"
 msgstr "<emphasis role=\"bold\"> F2 Језик</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:120 en/bootLive.xml:163
+#: en/bootLive.xml:85 en/bootLive.xml:117
 msgid ""
 "Press <keycap>F2</keycap> to have the installer use a specific language "
 "during the installation. Use the arrow keys to select the language then "
@@ -701,26 +706,27 @@ msgstr ""
 "притисните <keycap>Ентер</keycap>."
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:129
+#: en/bootLive.xml:93
 msgid "In UEFI mode"
 msgstr "У UEFI моду"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:133
+#: en/bootLive.xml:96
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:139
+#: en/bootLive.xml:100
 msgid "First screen while booting in UEFI mode"
 msgstr "Први екран приликом подизања система у UEFI моду"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:149
+#: en/bootLive.xml:107
 msgid ""
 "This option will boot the Mageia Live system from the connected DVD/USB "
 "media (expect a very slow system compared to an installed OS).  Once the "
@@ -731,7 +737,7 @@ msgstr ""
 "подигне, можете наставити са инсталацијом"
 
 #. type: Content of: <section><section><note><para>
-#: en/bootLive.xml:170
+#: en/bootLive.xml:123
 msgid ""
 "If you booted from a USB stick, you will see the above menu options "
 "duplicated, and in this case, you should choose from the menu pair that will "
@@ -1001,12 +1007,12 @@ msgstr ""
 "побрините се да су сви подешени на локално време, или сви на UTC/GMT."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:24
+#: en/configureX_card_list.xml:27
 msgid "Choose an X Server (Configure your Graphic Card)"
 msgstr "Изаберите X сервер (подесите своју графичку картицу)"
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_card_list.xml:29
+#: en/configureX_card_list.xml:32
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_card_list."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_card_list-im1\"/> </"
@@ -1017,7 +1023,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:35
+#: en/configureX_card_list.xml:38
 msgid ""
 "DrakX has a very comprehensive database of video cards and will usually "
 "correctly identify your video device."
@@ -1026,7 +1032,7 @@ msgstr ""
 "обично исправно детектује ваш видео уређај."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:38
+#: en/configureX_card_list.xml:41
 msgid ""
 "If the installer has not correctly detected your graphic card and you know "
 "which one you have, you can select it from the tree by:"
@@ -1035,22 +1041,22 @@ msgstr ""
 "коју имате, можете је изабрати са листе по:"
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_card_list.xml:41 en/configureX_monitor.xml:74
+#: en/configureX_card_list.xml:44 en/configureX_monitor.xml:78
 msgid "Vendor"
 msgstr "Произвођач"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:45
+#: en/configureX_card_list.xml:48
 msgid "then the make of your card"
 msgstr "затим произвођача своје картице"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:49
+#: en/configureX_card_list.xml:52
 msgid "and the model of card"
 msgstr "а затим модел картице"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:53
+#: en/configureX_card_list.xml:56
 msgid ""
 "If you cannot find your card in the vendor lists (because it's not yet in "
 "the database or it's an older card) you may find a suitable driver in the "
@@ -1067,7 +1073,7 @@ msgstr ""
 "постоји опција да изаберете VESA драјвер који обезбеђује основне могућности."
 
 #. type: Content of: <section><caution><para>
-#: en/configureX_card_list.xml:61
+#: en/configureX_card_list.xml:64
 msgid ""
 "Be aware that if you select an incompatible driver you may only have access "
 "to the <emphasis>Command Line Interface</emphasis>"
@@ -1076,7 +1082,7 @@ msgstr ""
 "само на <emphasis>Интерфејс Командне линије</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:65
+#: en/configureX_card_list.xml:68
 msgid ""
 "Some video card manufacturers provide proprietary drivers for Linux which "
 "may only be available in the <emphasis>Nonfree</emphasis> repository and in "
@@ -1093,17 +1099,13 @@ msgstr ""
 "након првог рестарта система."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:11
-msgid "Graphic Card and Monitor Configuration"
+#: en/configureX_chooser.xml:23
+#, fuzzy
+msgid "Graphics Card and Monitor Configuration"
 msgstr "Подешавање Графичке картице и Монитора"
 
-#.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
-#. 2018/02/15 apb: Some text and typography.
-#. 2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.
-#. 2018/02/23 apb: Typo.
-#. 2019/01/06 apb: Slight reword, split 1st para in two.
 #. type: Content of: <section><mediaobject>
-#: en/configureX_chooser.xml:26
+#: en/configureX_chooser.xml:28
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_chooser."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_chooser-im1\"/> </"
@@ -1114,7 +1116,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:32
+#: en/configureX_chooser.xml:34
 msgid ""
 "No matter which graphical environment (also known as desktop environment) "
 "you chose for this install of Mageia, they are all based on a graphical user "
@@ -1131,7 +1133,7 @@ msgstr ""
 "quote> подешавања морају бити исправна."
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:39
+#: en/configureX_chooser.xml:41
 msgid ""
 "Choose the appropriate settings manually if you think the details are "
 "incorrect, or if none are shown."
@@ -1140,12 +1142,13 @@ msgstr ""
 "погрешни, или уколико се приказује none."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:44
-msgid "<emphasis role=\"bold\">Graphic Card</emphasis>"
+#: en/configureX_chooser.xml:46
+#, fuzzy
+msgid "<emphasis role=\"bold\">Graphics Card</emphasis>"
 msgstr "<emphasis role=\"bold\">Графичка картица</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:47
+#: en/configureX_chooser.xml:49
 msgid ""
 "If you need to, you can select a specific card from this expandable list. "
 "See <xref linkend=\"configureX_card_list\"/>."
@@ -1154,12 +1157,12 @@ msgstr ""
 "Погледајте <xref linkend=\"configureX_card_list\"/>."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:52
+#: en/configureX_chooser.xml:54
 msgid "<emphasis role=\"bold\">Monitor</emphasis>"
 msgstr "<emphasis role=\"bold\">Монитор</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:55
+#: en/configureX_chooser.xml:57
 msgid ""
 "You can choose Plug 'n Play, if applicable, or choose your monitor from the "
 "<emphasis>Vendor</emphasis> or <emphasis>Generic</emphasis> lists. Choose "
@@ -1174,22 +1177,22 @@ msgstr ""
 "Погледајте <xref linkend=\"configureX_monitor\"/>."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:63
+#: en/configureX_chooser.xml:65
 msgid "<emphasis role=\"bold\">Resolution</emphasis>"
 msgstr "<emphasis role=\"bold\">Резолуција</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:66
+#: en/configureX_chooser.xml:68
 msgid "The resolution and color depth of your monitor can be set here."
 msgstr "Резолуција и број боја вашег монитора се може подесити овде."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:71
+#: en/configureX_chooser.xml:73
 msgid "<emphasis role=\"bold\">Test</emphasis>"
 msgstr "<emphasis role=\"bold\">Тест</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:74
+#: en/configureX_chooser.xml:76
 msgid ""
 "The test button does not always appear during install. If the option is "
 "there, and you test your settings, you should be asked to confirm that your "
@@ -1208,17 +1211,17 @@ msgstr ""
 "побрините да ваша подешавања буду на страни сигурности."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:85
+#: en/configureX_chooser.xml:87
 msgid "<emphasis role=\"bold\">Options</emphasis>"
 msgstr "<emphasis role=\"bold\">Опције</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:88
+#: en/configureX_chooser.xml:90
 msgid "Here you can choose to enable or disable various options."
 msgstr "Овде можете иабрати да укључите или искључите различите опције."
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_chooser.xml:93
+#: en/configureX_chooser.xml:95
 msgid ""
 "There is a risk of damaging a monitor if you choose refresh rates that are "
 "outside the frequency range of that monitor. This applies to older CRT "
@@ -1231,12 +1234,12 @@ msgstr ""
 "обично ући у standby мод."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_monitor.xml:22
+#: en/configureX_monitor.xml:26
 msgid "Choosing your Monitor"
 msgstr "Изабарите ваш Монитор"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:25
+#: en/configureX_monitor.xml:29
 msgid ""
 "DrakX has a very comprehensive database of monitors and will usually "
 "correctly identify yours."
@@ -1245,7 +1248,7 @@ msgstr ""
 "детектовати ваш."
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:30
+#: en/configureX_monitor.xml:34
 msgid ""
 "<emphasis role=\"bold\">Selecting a monitor with different characteristics "
 "could damage your monitor or video hardware. Please don't try something "
@@ -1258,7 +1261,7 @@ msgstr ""
 "погледајте документацију вашег монитора."
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:38
+#: en/configureX_monitor.xml:42
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
@@ -1269,12 +1272,12 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:46
+#: en/configureX_monitor.xml:50
 msgid "Custom"
 msgstr "Custom"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:49
+#: en/configureX_monitor.xml:53
 msgid ""
 "This option allows you to set two critical parameters: the vertical refresh "
 "rate and the horizontal sync rate. Vertical refresh determines how often the "
@@ -1287,7 +1290,7 @@ msgstr ""
 "скенирања."
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:55
+#: en/configureX_monitor.xml:59
 msgid ""
 "It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor "
 "type with a sync range that is beyond the capabilities of your monitor: you "
@@ -1299,12 +1302,12 @@ msgstr ""
 "изаберите нижа подешавања и проверите документацију монитора."
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:64
+#: en/configureX_monitor.xml:68
 msgid "Plug'n Play"
 msgstr "Plug'n Play"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:67
+#: en/configureX_monitor.xml:71
 msgid ""
 "This is the default option and automatically tries to determine the monitor "
 "type from the monitor database."
@@ -1313,37 +1316,39 @@ msgstr ""
 "из базе података монитора."
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:77
+#: en/configureX_monitor.xml:81
+#, fuzzy
 msgid ""
 "If the installer has not correctly detected your monitor and you know which "
-"one you have, you can select it from the tree by selecting:"
+"one you have, you can choose it from the options by selecting:"
 msgstr ""
 "Уколико инсталер није исправно детектовао ваш монитор а ви знате који имате, "
 "можете га изабрати са листе бирањем:"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:86
+#: en/configureX_monitor.xml:90
 msgid "Manufacturer"
 msgstr "Произвођача"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:90
+#: en/configureX_monitor.xml:94
 msgid "Monitor model"
 msgstr "Модела Монитора"
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:96
+#: en/configureX_monitor.xml:100
 msgid "Generic"
 msgstr "Генерички"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:99
+#: en/configureX_monitor.xml:103
+#, fuzzy
 msgid ""
-"Selecting this group will list nearly 30 display configurations such as "
-"1024x768 @ 60Hz and includes flat-panel displays as used in laptops. This is "
-"often a good monitor selection group if you need to use the VESA card driver "
-"when your video hardware cannot be determined automatically.  Once again it "
-"may be wise to be conservative in your selections."
+"Selecting this group will list approximately 30 display configurations such "
+"as 1024x768 @ 60Hz and includes flat-panel displays as used in laptops.  "
+"This is often a good monitor selection group if you need to use the VESA "
+"card driver when your video hardware cannot be determined automatically. "
+"Once again, it may be wise to be conservative in your selections."
 msgstr ""
 "Бирањем ове групе ћете добили листу са готово 30 конфигурација екрана као "
 "што је 1024x768 @ 60Hz и која укључује равне екране који се користе на "
@@ -1352,12 +1357,12 @@ msgstr ""
 "Још једном избор нижих параметара би био паметан у овом случају."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:22
+#: en/diskdrake.xml:24
 msgid "Custom Disk Partitioning with DiskDrake"
 msgstr "Партиционисање Диска по избору са DiskDrake-ом"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:27
+#: en/diskdrake.xml:29
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-diskdrake.png\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1368,7 +1373,7 @@ msgstr ""
 "<imagedata align=\"center\" fileref=\"live-diskdrake.png\"/> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:38
+#: en/diskdrake.xml:40
 msgid ""
 "Modify the layout of your disk(s) here. You can remove or create partitions, "
 "change the filesystem or size of a partition and even view their details "
@@ -1379,18 +1384,19 @@ msgstr ""
 "прегледати детаље о њима пре него што почнете."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:47
+#, fuzzy
 msgid ""
 "There is a tab at the top for every detected hard disk (or other storage "
-"device, like a USB key). In the screenshot above there are two available "
-"devices: <filename>sda </filename>and <filename>sdb</filename>."
+"device, like a USB key), for example: <filename>sda</filename>, "
+"<filename>sdb</filename>, <filename>sdc</filename> etc."
 msgstr ""
 "Постоји таб на врху сваког детектованог тврдог диска (или другог уређаја за "
 "смештање података попут USB-a). На снимку екрана изнад постоје два доступна "
 "уређаја: <filename>sda </filename> и <filename>sdb</filename>."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:52
+#: en/diskdrake.xml:54
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it. "
@@ -1403,7 +1409,7 @@ msgstr ""
 "давања ознаке (имена) партиције, или избора типа партиције."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:60
+#: en/diskdrake.xml:62
 msgid ""
 "Continue until you have adjusted everything to your satisfaction, then click "
 "<emphasis>Done</emphasis> when you're ready."
@@ -1412,7 +1418,7 @@ msgstr ""
 "<emphasis>Заврши</emphasis> када будете спремни."
 
 #. type: Content of: <section><warning><orderedlist><listitem><para>
-#: en/diskdrake.xml:69
+#: en/diskdrake.xml:71
 msgid ""
 "Take care with the <emphasis>Clear all</emphasis> option, use it only if you "
 "are sure you want to wipe all partitions on the selected storage device."
@@ -1422,7 +1428,7 @@ msgstr ""
 "уређају за смештање података."
 
 #. type: Content of: <section><warning><orderedlist><listitem><para>
-#: en/diskdrake.xml:75
+#: en/diskdrake.xml:77
 msgid ""
 "If you wish to use encryption on your <filename>/</filename> partition you "
 "must ensure that you have a separate <filename>/boot</filename> partition. "
@@ -1435,7 +1441,7 @@ msgstr ""
 "иначе подизање система неће бити могуће."
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/diskdrake.xml:87
+#: en/diskdrake.xml:89
 msgid ""
 "If you are installing Mageia on a UEFI system, check that an ESP (EFI System "
 "Partition) is present and correctly mounted on <filename>/boot/EFI</"
@@ -1446,7 +1452,7 @@ msgstr ""
 "boot/EFI</filename>. Погледајте Слику 1 доле."
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/diskdrake.xml:93
+#: en/diskdrake.xml:95
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
 "partition is present and of the correct type. See Figure 2 below."
@@ -1455,12 +1461,12 @@ msgstr ""
 "boot партиција присутна и да ли је исправног типа. Погледајте Слику 2 доле."
 
 #. type: Content of: <section><figure><title>
-#: en/diskdrake.xml:101
+#: en/diskdrake.xml:103
 msgid "EFI System Partition"
 msgstr "EFI Системска Партиција"
 
 #. type: Content of: <section><figure><mediaobject>
-#: en/diskdrake.xml:104
+#: en/diskdrake.xml:106
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-diskdrake2.png\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1471,17 +1477,17 @@ msgstr ""
 "<imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/> </imageobject>"
 
 #. type: Content of: <section><figure>
-#: en/diskdrake.xml:103 en/diskdrake.xml:117
+#: en/diskdrake.xml:105 en/diskdrake.xml:119
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><figure><title>
-#: en/diskdrake.xml:115
+#: en/diskdrake.xml:117
 msgid "BIOS boot partition"
 msgstr "BIOS boot партиција"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:118 en/doPartitionDisks.xml:201
+#: en/diskdrake.xml:120 en/doPartitionDisks.xml:206
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1504,12 +1510,12 @@ msgid "Partitioning"
 msgstr "Партиционисање"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:31
 msgid "Suggested Partitioning"
 msgstr "Предложено Партиционисање"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:34
 msgid ""
 "In this screen you can see the content of your hard drive(s) along with the "
 "DrakX partitioning proposals for where to install Mageia."
@@ -1518,7 +1524,7 @@ msgstr ""
 "предлогом DrakX-а за партиционисање и где инсталирати Mageia."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:34
+#: en/doPartitionDisks.xml:38
 msgid ""
 "The actual options available from those shown below will vary according to "
 "the layout and content of your particular hard drive(s)."
@@ -1528,7 +1534,7 @@ msgstr ""
 "диску(овима)."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:39
+#: en/doPartitionDisks.xml:43
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1541,17 +1547,17 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><itemizedlist><title>
-#: en/doPartitionDisks.xml:49
+#: en/doPartitionDisks.xml:53
 msgid "Main Options"
 msgstr "Главне опције"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:56
 msgid "<emphasis role=\"bold\">Use Existing Partitions</emphasis>"
 msgstr "<emphasis role=\"bold\">Користи Постојеће партиције</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:59
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1560,12 +1566,12 @@ msgstr ""
 "компатибилне партиције пронађене и да се могу користити за инсталацију."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:61
+#: en/doPartitionDisks.xml:65
 msgid "<emphasis role=\"bold\">Use Free Space</emphasis>"
 msgstr "<emphasis role=\"bold\">Користи слободан простор</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:68
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1574,7 +1580,7 @@ msgstr ""
 "искористити ову опцију за вашу нову Mageia инсталацију."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:70
+#: en/doPartitionDisks.xml:74
 msgid ""
 "<emphasis role=\"bold\">Use Free Space on a Windows Partition</emphasis>"
 msgstr ""
@@ -1582,26 +1588,40 @@ msgstr ""
 "emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:73
+#: en/doPartitionDisks.xml:77
+#, fuzzy
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it. 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 important files!"
+"installation but see the warning below."
 msgstr ""
 "Уколико имате неискоришћеног простора на постојећој Windows партицији, "
 "инсталер вам може понудити да га искористите. Ово може бити добар начин за "
 "прављење простора за вашу нову Mageia инсталацију, али и рискантна операција "
 "тако би требало да направите резервну копију свих важних фајлова!"
 
+#. type: Content of: <section><itemizedlist><listitem><para><mediaobject>
+#: en/doPartitionDisks.xml:87
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:79
+#: en/doPartitionDisks.xml:82
+#, fuzzy
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
 "light blue and the proposed Mageia partition in dark blue with their "
 "intended sizes just underneath. You have the option to modify these sizes by "
 "clicking and dragging the gap between both partitions.  See the following "
-"screenshot:"
+"screenshot:<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr ""
 "Када користите ову опцију, инсталер приказује преосталу Windows партицију у "
 "светло плавој и предложену Mageia партицију у тамно плавој боји са њиховом "
@@ -1609,18 +1629,42 @@ msgstr ""
 "величине кликом и превлачењем размака између те две партиције. Погледајте "
 "следећи снимак екрана:"
 
+#. type: Content of: <section><itemizedlist><listitem><warning><para>
+#: en/doPartitionDisks.xml:97
+msgid ""
+"This involves shrinking the size of the Windows partition, and therefore is "
+"a risky operation, so you should make sure you have backed up all important "
+"files before proceeding."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><important><para>
+#: en/doPartitionDisks.xml:103
+#, fuzzy
+msgid ""
+"The partition must be \"clean\", meaning that Windows must have closed down "
+"correctly the last time it was used. It must also have been defragmented, "
+"although this is not a guarantee that all files in the partition have been "
+"moved out of the area that is about to be used for Mageia."
+msgstr ""
+"Имајте на уму да ово укључује смањење величине Windows партиције. Партиција "
+"мора бити \"чиста\", што значи да Windows мора бити затворен на исправан "
+"начин када је задњи пут коришћен. Такође би требало да је дефрагмертирана, "
+"иако то није гаранција да ће сви подаци бити премештени на део који ће се "
+"користити. Веома је препоручљиво да се направи резервна копија ваших личних "
+"података."
+
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:87
+#: en/doPartitionDisks.xml:112
 msgid "<emphasis role=\"bold\">Erase and use Entire Disk</emphasis>"
 msgstr "<emphasis role=\"bold\">Обриши и користи Цео диск</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:90
+#: en/doPartitionDisks.xml:115
 msgid "This option will allocate the entire drive for Mageia"
 msgstr "Ова опција ће опредилити цео тврди диск за Mageia"
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:119
 msgid ""
 "This will erase ALL data on the selected hard drive. Take care! If you "
 "intend to use part of the disk for something else, or you already have data "
@@ -1631,30 +1675,13 @@ msgstr ""
 "имате податке на уређају које не желите да изгубите, немојте користити ову "
 "опцију. "
 
-#. type: Content of: <section><itemizedlist><listitem><important><para>
-#: en/doPartitionDisks.xml:101
-msgid ""
-"Note that this involves shrinking the size of the Windows partition. The "
-"partition must be \"clean\", meaning that Windows must have closed down "
-"correctly the last time it was used. It must also have been defragmented, "
-"although this is not a guarantee that all files in the partition have been "
-"moved out of the area that is about to be used. It is highly recommended to "
-"back up your personal files."
-msgstr ""
-"Имајте на уму да ово укључује смањење величине Windows партиције. Партиција "
-"мора бити \"чиста\", што значи да Windows мора бити затворен на исправан "
-"начин када је задњи пут коришћен. Такође би требало да је дефрагмертирана, "
-"иако то није гаранција да ће сви подаци бити премештени на део који ће се "
-"користити. Веома је препоручљиво да се направи резервна копија ваших личних "
-"података."
-
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:112
+#: en/doPartitionDisks.xml:127
 msgid "<emphasis role=\"bold\">Custom Disk Partitioning</emphasis>"
 msgstr "<emphasis role=\"bold\">Прилагођено Партиционисање Диска</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:115
+#: en/doPartitionDisks.xml:130
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1662,21 +1689,8 @@ msgstr ""
 "Ово вам даје потпуну контролу над постављањем инсталације на ваш тврди "
 "диск(ове)."
 
-#. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:122
-msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
-
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:131
+#: en/doPartitionDisks.xml:136
 msgid ""
 "If you are not using the <emphasis>Custom disk partitioning</emphasis> "
 "option, then the installer will allocate the available space according to "
@@ -1687,7 +1701,7 @@ msgstr ""
 "са следећим правилима:"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:137
+#: en/doPartitionDisks.xml:142
 msgid ""
 "If the total available space is less than 50 GB, then only one partition is "
 "created. This will be the <filename>/</filename> (root)  partition."
@@ -1696,7 +1710,7 @@ msgstr ""
 "партиција. Ово ће бити <filename>/</filename> (root)  партиција."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:143
+#: en/doPartitionDisks.xml:148
 msgid ""
 "If the total available space is greater than 50 GB, then three partitions "
 "are created"
@@ -1705,7 +1719,7 @@ msgstr ""
 "партиције"
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:148
+#: en/doPartitionDisks.xml:153
 msgid ""
 "6/19 of the total available place is allocated to <filename>/</filename> "
 "with a maximum of 50 GB"
@@ -1714,17 +1728,17 @@ msgstr ""
 "максимумом од 50 GB"
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:153
+#: en/doPartitionDisks.xml:158
 msgid "1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB"
 msgstr "1/19 је предвиђено за <filename>swap</filename> са максимумом од 4 GB"
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:158
+#: en/doPartitionDisks.xml:163
 msgid "the rest (at least 12/19) is allocated to <filename>/home</filename>"
 msgstr "остатак (најмање 12/19) је предвиђено за <filename>/home</filename>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:165
+#: en/doPartitionDisks.xml:170
 msgid ""
 "This means that from 160 GB or greater available space, the installer will "
 "create three partitions:"
@@ -1733,22 +1747,22 @@ msgstr ""
 "креирати три партиције:"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:170
+#: en/doPartitionDisks.xml:175
 msgid "50 GB for <filename>/</filename>"
 msgstr "50 GB за <filename>/</filename>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:174
+#: en/doPartitionDisks.xml:179
 msgid "4 GB for <filename>swap</filename>"
 msgstr "4 GB за <filename>swap</filename>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:178
+#: en/doPartitionDisks.xml:183
 msgid "and the remainder for <filename>/home</filename>"
 msgstr "а остатак за <filename>/home</filename>"
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:183
+#: en/doPartitionDisks.xml:188
 msgid ""
 "If you are using a UEFI system, the ESP (EFI System Partition) will be "
 "automatically detected - or created if it does not exist yet - and mounted "
@@ -1763,7 +1777,7 @@ msgstr ""
 "треба."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:189
+#: en/doPartitionDisks.xml:194
 msgid ""
 "If you are using a Legacy (also known as BIOS) system with a GPT partitioned "
 "disk, you need to create a BIOS boot partition if it doesn't already exist. "
@@ -1779,22 +1793,27 @@ msgstr ""
 "диска</emphasis><quote>BIOS boot партиција</quote> за тип фајл система."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:196
+#: en/doPartitionDisks.xml:201
 msgid "See <xref linkend=\"diskdrake\"/> for information on how to proceed."
 msgstr ""
 "Погледајте <xref linkend=\"diskdrake\"/> за информацију како наставити даље."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:211
+#: en/doPartitionDisks.xml:216
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4.png"
-"\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks4.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks4.png\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4.png"
-"\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:217
+#: en/doPartitionDisks.xml:226
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
 "previous standard of 512. Due to lack of available hardware, the "
@@ -1806,7 +1825,7 @@ msgstr ""
 "партиционисање који се користи у инсталеру није тестиран са таквим дисковима."
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:222
+#: en/doPartitionDisks.xml:231
 msgid ""
 "Some SSD devices now use an erase block size over 1 MB. If you have such a "
 "device we suggest that you partition the drive in advance, using an "
@@ -1819,17 +1838,17 @@ msgstr ""
 "користите ова подешавања:"
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:229
+#: en/doPartitionDisks.xml:238
 msgid "<emphasis>Align to</emphasis> = MiB"
 msgstr "<emphasis>Поравнај на</emphasis> = MiB"
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:233
+#: en/doPartitionDisks.xml:242
 msgid "<emphasis>Free space preceding (MiB)</emphasis> = 2"
 msgstr "<emphasis>Слободан простор испред (MiB)</emphasis> = 2"
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:237
+#: en/doPartitionDisks.xml:246
 msgid ""
 "Also make sure all partitions are created using an even number of megabytes."
 msgstr ""
@@ -2015,12 +2034,12 @@ msgstr ""
 "Mageia"
 
 #. type: Content of: <section><info><title>
-#: en/firewall.xml:7
+#: en/firewall.xml:16
 msgid "Firewall"
 msgstr "Заштитни зид"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:10
+#: en/firewall.xml:19
 msgid ""
 "This section allows you to configure some simple firewall rules: they "
 "determine which type of message from the Internet will be accepted by the "
@@ -2032,8 +2051,18 @@ msgstr ""
 "система. Ово, са друге стране, омогућава одговарајућим сервисима на систему "
 "да буду доступни са Интернета."
 
+#. type: Content of: <section><mediaobject>
+#: en/firewall.xml:26
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-firewall.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome.png\"/> </"
+"imageobject>"
+
 #. type: Content of: <section><para>
-#: en/firewall.xml:16
+#: en/firewall.xml:31
 msgid ""
 "In the default setting (no button is checked), no service of the system is "
 "accessible from the network. The <emphasis>Everything (no firewall)</"
@@ -2053,7 +2082,7 @@ msgstr ""
 "правила заштитног зида ради тестирања и откривања грешки."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:25
+#: en/firewall.xml:40
 msgid ""
 "All other options are more or less self-explanatory. As an example, you will "
 "enable the CUPS server if you want printers on your machine to be accessible "
@@ -2064,12 +2093,12 @@ msgstr ""
 "преко мреже."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:29
+#: en/firewall.xml:44
 msgid "<emphasis role=\"bold\">Advanced</emphasis>"
 msgstr "<emphasis role=\"bold\">Напредно</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:31
+#: en/firewall.xml:46
 msgid ""
 "The <emphasis>Advanced</emphasis> option opens a window where you can enable "
 "a series of services by typing a list of <quote>couples</quote> (blank "
@@ -2080,32 +2109,36 @@ msgstr ""
 "(одвојене размаком)"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:35
-msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
+#: en/firewall.xml:50
+#, fuzzy
+msgid "<emphasis>&lt;port-number&gt;/&lt;protocol&gt;</emphasis>"
 msgstr "<emphasis>&lt;број-порта>/&lt;протокол></emphasis>"
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:38
+#: en/firewall.xml:53
+#, fuzzy
 msgid ""
-"- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
-"the service you want to enable (e.g. 873 for the RSYNC service) as defined "
-"in <emphasis>RFC-433</emphasis>;"
+"- <emphasis>&lt;port-number&gt;</emphasis> is the value of the port assigned "
+"to the service you want to enable (e.g. 873 for the RSYNC service) as "
+"defined in <emphasis>RFC-433</emphasis>;"
 msgstr ""
 "- <emphasis>&lt;број-порта></emphasis> је вредност порта која се додељује "
 "сервису који желите да укључите (нпр. 873 за RSYNC сервис) како је "
 "дефинисано у <emphasis>RFC-433</emphasis>;"
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:42
+#: en/firewall.xml:57
+#, fuzzy
 msgid ""
-"- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
-"<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
+"- <emphasis>&lt;protocol&gt;</emphasis> is one of <emphasis>TCP</emphasis> "
+"or <emphasis>UDP</emphasis> - the internet protocol that is used by the "
+"service."
 msgstr ""
 "- <emphasis>&lt;протокол></emphasis> је један од <emphasis>TCP</emphasis> "
 "или <emphasis>UDP</emphasis> - интернет протокола који сервис користи."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:47
+#: en/firewall.xml:62
 msgid ""
 "For instance, the entry for enabling access to the RSYNC service therefore "
 "is <emphasis>873/tcp</emphasis>."
@@ -2114,7 +2147,7 @@ msgstr ""
 "tcp</emphasis>."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:50
+#: en/firewall.xml:65
 msgid ""
 "In case a service is implemented to use both protocols, you specify 2 "
 "couples for the same port."
@@ -2202,12 +2235,12 @@ msgid "Graphical Configuration"
 msgstr "Графичка Конфигурација"
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:32
+#: en/installer.xml:34
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, Mageia Инсталер"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:35
+#: en/installer.xml:37
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -2218,12 +2251,12 @@ msgstr ""
 "једноставније."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:40
+#: en/installer.xml:42
 msgid "The installation steps"
 msgstr "Инсталациони кораци"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:44
+#: en/installer.xml:46
 msgid ""
 "The install process is divided into a number of steps - the status of which "
 "is indicated in a panel to the left of the screen."
@@ -2232,7 +2265,7 @@ msgstr ""
 "на панелу лево"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:50
+#: en/installer.xml:52
 msgid ""
 "Each step has one or more screens, which may also have <emphasis>Advanced</"
 "emphasis> sections with extra, less commonly required options."
@@ -2241,7 +2274,7 @@ msgstr ""
 "<emphasis>Напредно</emphasis> са додатним, често мање патребним, опцијама."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:56
+#: en/installer.xml:58
 msgid ""
 "Most screens have <emphasis>Help</emphasis> buttons for further details "
 "about the particular step."
@@ -2250,7 +2283,7 @@ msgstr ""
 "конкретном кораку."
 
 #. type: Content of: <section><section><caution><para>
-#: en/installer.xml:62
+#: en/installer.xml:64
 msgid ""
 "If at some point during the install you decide to abort the installation, it "
 "is possible to reboot, but please think twice before you do this. Once a "
@@ -2265,7 +2298,7 @@ msgstr ""
 "вас остави са неупотребљивим системом."
 
 #. type: Content of: <section><section><caution><para>
-#: en/installer.xml:68
+#: en/installer.xml:70
 msgid ""
 "If, in spite of this, you are very sure rebooting is what you want, go to a "
 "text terminal by pressing the keys <keycombo> <keycap>Ctrl</keycap> "
@@ -2281,12 +2314,12 @@ msgstr ""
 "рестартовали рачунар."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:86
+#: en/installer.xml:88
 msgid "Installation Welcome Screen"
 msgstr "Почетни екран за инсталацију"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:88
+#: en/installer.xml:90
 msgid ""
 "The particular screen that you will first see when booting from the "
 "Installation media will depend on whether your computer motherboard is of "
@@ -2297,7 +2330,7 @@ msgstr ""
 "је старог (BIOS) или UEFI типа."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:92
+#: en/installer.xml:94
 msgid ""
 "The welcome menu screen has various options, however the default option will "
 "start the installer, and is normally all that you will need."
@@ -2306,12 +2339,12 @@ msgstr ""
 "покренути инсталер, и то је обично све што вам је потребно. "
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:97
+#: en/installer.xml:99
 msgid "Legacy (BIOS) Systems"
 msgstr "Стари (BIOS) Системи"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:100
+#: en/installer.xml:102
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome.png\"/> </"
 "imageobject>"
@@ -2320,7 +2353,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:111
+#: en/installer.xml:113
 msgid ""
 "Install Mageia to a hard disk. This is the default option, and will "
 "automatically start after a short while unless another option is selected."
@@ -2329,12 +2362,12 @@ msgstr ""
 "бити покренута након краћег времена осим уколико није изабрана друга опција."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:117
+#: en/installer.xml:119
 msgid "<emphasis role=\"bold\">Rescue System</emphasis>"
 msgstr "<emphasis role=\"bold\">Спашавање Система</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:119
+#: en/installer.xml:121
 msgid ""
 "This option allows you to either re-install the bootloader for an existing "
 "Mageia installation or you can use it to restore a Windows bootloader."
@@ -2343,22 +2376,22 @@ msgstr ""
 "инсталацију или је можете употребити за поново постављање Windows стартера."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:132
+#: en/installer.xml:134
 msgid "<emphasis role=\"bold\">F2: Language</emphasis>"
 msgstr "<emphasis role=\"bold\">F2: Језик</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:134
+#: en/installer.xml:136
 msgid "Press F2 for alternative languages."
 msgstr "Притисните F2 за алтернативне језике."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:140
+#: en/installer.xml:142
 msgid "UEFI Systems"
 msgstr "UEFI Системи"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:142
+#: en/installer.xml:144
 msgid ""
 "From this screen, you can access options by pressing <keycap>e</keycap> to "
 "enter the edit mode. To come back to this screen, press <keycap>Esc</keycap> "
@@ -2370,7 +2403,7 @@ msgstr ""
 "<keycap>F10</keycap> да би сачували измене и изашли."
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:148
+#: en/installer.xml:150
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome2.png\"/> </"
 "imageobject>"
@@ -2379,13 +2412,13 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:157
+#: en/installer.xml:159
 msgid "<emphasis role=\"bold\">Install:</emphasis> Start the Install process"
 msgstr ""
 "<emphasis role=\"bold\">Инсталација:</emphasis> Покреће процес инсталације"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:162
+#: en/installer.xml:164
 msgid ""
 "<emphasis role=\"bold\">Rescue:</emphasis> This option allows you to either "
 "re-install the bootloader for an existing Mageia installation or you can use "
@@ -2396,7 +2429,7 @@ msgstr ""
 "обновите Windows стартер."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:169
+#: en/installer.xml:171
 msgid ""
 "<emphasis role=\"bold\">F2: Language:</emphasis> Press <keycap>F2</keycap> "
 "for alternative languages."
@@ -2405,7 +2438,7 @@ msgstr ""
 "за алтернативне језике."
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:174
+#: en/installer.xml:176
 msgid ""
 "If you booted from a USB stick, you will see the above options duplicated, "
 "and in this case, you should use the set that will be suffixed with \"USB\"."
@@ -2415,17 +2448,17 @@ msgstr ""
 "\". "
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:181
+#: en/installer.xml:183
 msgid "Installation Problems and Possible Solutions"
 msgstr "Проблеми при инсталацији и Могућа решења"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:184
+#: en/installer.xml:186
 msgid "No Graphical Interface"
 msgstr "Нема графичког интерфејса"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:188
+#: en/installer.xml:190
 msgid ""
 "After the initial screen you did not progress to the <emphasis>Language "
 "Selection</emphasis> screen. This can happen with some graphic cards and "
@@ -2438,7 +2471,7 @@ msgstr ""
 "command> при промпту."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:195
+#: en/installer.xml:197
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
 "In this case it is worth trying a text-mode installation. To use this press "
@@ -2456,12 +2489,12 @@ msgstr ""
 "инсталацију у текстуалном моду."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:208
+#: en/installer.xml:210
 msgid "The Install Freezes"
 msgstr "Инсталација се заблокирала"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:210
+#: en/installer.xml:212
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic hardware "
@@ -2476,12 +2509,12 @@ msgstr ""
 "комбиновати са другим параметрима уколико је потребно."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:218
+#: en/installer.xml:220
 msgid "RAM problem"
 msgstr "Проблем са RAM-ом"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:220
+#: en/installer.xml:222
 msgid ""
 "This will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
@@ -2496,12 +2529,12 @@ msgstr ""
 "<literal>mem=256M</literal> ће дефинисати 256MB RAM-а."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:228
+#: en/installer.xml:230
 msgid "Dynamic partitions"
 msgstr "Динамичке партиције"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:230
+#: en/installer.xml:232
 msgid ""
 "If you converted your hard disk from <literal>Basic</literal> format to "
 "<literal>Dynamic</literal> format in Microsoft Windows, then it is not "
@@ -4491,22 +4524,29 @@ msgstr ""
 "link>"
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:27
+#: en/setupBootloader.xml:32
 msgid "Bootloader"
 msgstr "Стартер"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:31
+#: en/setupBootloader.xml:36
+#, fuzzy
+msgid "Available Bootloaders"
+msgstr "Стартер"
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:39
 msgid "Grub2"
 msgstr "Grub2"
 
-#. type: Content of: <section><section><itemizedlist><title>
-#: en/setupBootloader.xml:34
-msgid "Grub2 on Legacy MBR/GPT systems"
-msgstr "Grub2 на старим MBR/GPT системима"
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:42
+#, fuzzy
+msgid "<emphasis role=\"bold\">Grub2 on Legacy MBR/GPT systems</emphasis>"
+msgstr "<emphasis role=\"bold\">Спашавање Система</emphasis>"
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:37
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:46
 msgid ""
 "GRUB2 (with or without graphical menu) will be used exclusively as the "
 "bootloader for a Legacy/MBR or Legacy/GPT system."
@@ -4514,8 +4554,8 @@ msgstr ""
 "GRUB2 (са или без графичког менија) ће бити коришћен као стартер за Старе/"
 "MBR или Старе/GPT системе."
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:42
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:52
 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."
@@ -4523,18 +4563,20 @@ msgstr ""
 "Подразумевано, нови стартер ће бити уписан или у MBR (Master Boot Record) на "
 "вашем првом тврдом диску или на BIOS boot партицију."
 
-#. type: Content of: <section><section><itemizedlist><title>
-#: en/setupBootloader.xml:49
-msgid "Grub2-efi on UEFI systems"
-msgstr "Grub2-efi на UEFI системима"
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:59
+#, fuzzy
+msgid "<emphasis role=\"bold\">Grub2-efi on UEFI systems</emphasis>"
+msgstr "<emphasis role=\"bold\">Спашавање Система</emphasis>"
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:52
-msgid "GRUB2-efi will be used exclusively as the bootloader for a UEFI system."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:63
+#, fuzzy
+msgid "GRUB2-efi or rEFInd may be used as the bootloader for a UEFI system."
 msgstr "GRUB2-efi ће бити коришћен искључиво као стартер на UEFI систему."
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:57
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:68
 msgid ""
 "By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI "
 "System Partition)."
@@ -4542,12 +4584,13 @@ msgstr ""
 "Подразумевано, нови стартер (Grub2-efi) ће бити уписан на ESP (EFI Системску "
 "партицију)."
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:60
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:71
+#, fuzzy
 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 "
-"created by Windows and add grub2-efi to it. If no ESP exists, then one will "
+"created by Windows and add grub2-efi to it.  If no ESP exists, then one will "
 "be created. Although it is possible to have several ESPs, only one is "
 "required, whatever the number of operating systems you have."
 msgstr ""
@@ -4558,18 +4601,46 @@ msgstr ""
 "ESP-а, само једна је потребна, без обзира на број оперативних система које "
 "имате."
 
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:82
+msgid "rEFInd"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:85
+#, fuzzy
+msgid "<emphasis role=\"bold\">rEFInd on UEFI systems</emphasis>"
+msgstr "<emphasis role=\"bold\">Иконица</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:88
+msgid ""
+"rEFInd has a nice graphical set of options, and can auto-detect installed "
+"EFI bootloaders. See: http://www.rodsbooks.com/refind/"
+msgstr ""
+
+#. type: Content of: <section><section><section><note><para>
+#: en/setupBootloader.xml:95
+msgid ""
+"Please note that in order to be able to use the <literal>rEFInd</literal> "
+"option, an installed EFI System Partition must match your system "
+"architecture: if you have a 32bit EFI System Partition installed on a 64bit "
+"machine for instance, then the rEFInd option will not be displayed/available "
+"to you."
+msgstr ""
+
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:72
+#: en/setupBootloader.xml:106
 msgid "Bootloader Setup"
 msgstr "Подешавање Стартера"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:76
+#: en/setupBootloader.xml:110
 msgid "Bootloader main options"
 msgstr "Главне опције стартера"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:79
+#: en/setupBootloader.xml:113
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader.png\"/> </imageobject> <imageobject condition=\"live"
@@ -4582,38 +4653,59 @@ msgstr ""
 "im1\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:91
+#: en/setupBootloader.xml:125
 msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
 msgstr "<emphasis role=\"bold\">Користити Стартер</emphasis>"
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:93
+#. type: Content of: <section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:129
+msgid ""
+"<guimenuitem>GRUB2</guimenuitem> (with either a graphical or a text menu), "
+"can be chosen for both <literal>Legacy MBR/BIOS</literal> systems and "
+"<literal>UEFI</literal> systems."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:136
 msgid ""
-"This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI "
-"systems will not see this option here."
+"<guimenuitem>rEFInd</guimenuitem> (with a graphical menu)  is an alternative "
+"option solely for use with <literal>UEFI</literal> systems."
 msgstr ""
-"Ова опција је доступна само на старим MBR/BIOS системима.  Корисници UEFI "
-"система неће видети ову опцију овде."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:98
+#: en/setupBootloader.xml:144
 msgid "<emphasis role=\"bold\">Boot device</emphasis>"
 msgstr "<emphasis role=\"bold\">Boot уређај</emphasis>"
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:100
-msgid "Don't change this unless you really know what you are doing"
+#. type: Content of: <section><section><section><itemizedlist><listitem><warning><para>
+#: en/setupBootloader.xml:147
+#, fuzzy
+msgid "Don't change this unless you really know what you are doing."
 msgstr "Не мењајте осим уколико заиста нисте сигурни да знате шта радите"
 
+#. type: Content of: <section><section><section><itemizedlist><listitem><note><para>
+#: en/setupBootloader.xml:152
+msgid ""
+"There is no option to write GRUB to the boot sector of a partition (e.g: "
+"<filename>sda1</filename>), as this method is considered unreliable."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:157
+msgid ""
+"When using UEFI mode, then the <guilabel>Boot device</guilabel> will be "
+"listed as <guimenuitem>EFI System Partition</guimenuitem>."
+msgstr ""
+
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:105
+#: en/setupBootloader.xml:163
 msgid ""
 "<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
 msgstr ""
 "<emphasis role=\"bold\">Пауза пре подизања подразумеваног одраза</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:108
+#: en/setupBootloader.xml:166
 msgid ""
 "This text box lets you set a delay, in seconds, before the default operating "
 "system is started up."
@@ -4622,12 +4714,12 @@ msgstr ""
 "покрене подизање оперативног система."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:113
+#: en/setupBootloader.xml:171
 msgid "<emphasis role=\"bold\">Security</emphasis>"
 msgstr "<emphasis role=\"bold\">Сигурност</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:115
+#: en/setupBootloader.xml:173
 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 "
@@ -4642,17 +4734,17 @@ msgstr ""
 "овде одабере."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:126
+#: en/setupBootloader.xml:184
 msgid "Choose a password for the bootloader (optional)"
 msgstr "Изаберите лозинку за стартер (опција)"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:130
+#: en/setupBootloader.xml:188
 msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
 msgstr "<emphasis role=\"bold\">Лозинка (поново)</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:132
+#: en/setupBootloader.xml:190
 msgid ""
 "Retype the password and DrakX will check that it matches with the one set "
 "above"
@@ -4661,17 +4753,17 @@ msgstr ""
 "сте уписали горе"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:137 en/setupBootloader.xml:212
+#: en/setupBootloader.xml:195 en/setupBootloader.xml:308
 msgid "<emphasis>Advanced</emphasis>"
 msgstr "<emphasis>Напредно</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:141
+#: en/setupBootloader.xml:199
 msgid "<emphasis>Enable ACPI</emphasis>"
 msgstr "<emphasis>Омогући ACPI</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:143
+#: en/setupBootloader.xml:201
 msgid ""
 "ACPI (Advanced Configuration and Power Interface) is a standard for power "
 "management. It can save energy by stopping unused devices. Deselecting it "
@@ -4686,12 +4778,12 @@ msgstr ""
 "неке проблеме (на пример непредвиђена рестатовања или блокирања система)."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:152
+#: en/setupBootloader.xml:210
 msgid "<emphasis>Enable SMP</emphasis>"
 msgstr "<emphasis>Омогући SMP</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:154
+#: en/setupBootloader.xml:212
 msgid ""
 "This option enables/disables symmetric multiprocessing for multi-core "
 "processors"
@@ -4700,12 +4792,12 @@ msgstr ""
 "више језгара"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:159
+#: en/setupBootloader.xml:217
 msgid "<emphasis>Enable APIC</emphasis>"
 msgstr "<emphasis>Омогући APIC</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:161
+#: en/setupBootloader.xml:219
 msgid ""
 "Enabling this gives the operating system access to the Advanced Programmable "
 "Interrupt Controller. APIC devices permit more complex priority models, and "
@@ -4716,12 +4808,12 @@ msgstr ""
 "приоритете, и напредно управљање IRQ-има (Interrupt Request)."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:168
+#: en/setupBootloader.xml:226
 msgid "<emphasis>Enable Local APIC</emphasis>"
 msgstr "<emphasis>Омогући Local APIC</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:170
+#: en/setupBootloader.xml:228
 msgid ""
 "Here you can set Local APIC, which manages all external interrupts for a "
 "specific processor in an SMP system"
@@ -4730,12 +4822,70 @@ msgstr ""
 "појединачне просцесоре у SMP систему"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:177
+#: en/setupBootloader.xml:235
 msgid "Bootloader Configuration"
 msgstr "Подешавање Стартера"
 
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:237
+msgid ""
+"If, in the previous section you selected <literal>rEFInd</literal> as the "
+"bootloader to use, you would then be presented with the options shown in the "
+"screenshot directly below. Otherwise, please instead move on to the "
+"subsequent screenshot for your options."
+msgstr ""
+
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:180
+#: en/setupBootloader.xml:243
+#, fuzzy
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"rEFIndLoaderConfig.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-rEFIndLoaderConfig.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:253
+#, fuzzy
+msgid "Your rEFInd configuration options:"
+msgstr "Подешавање звука"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:256
+msgid ""
+"<guimenuitem>Install or update rEFInd in the EFI system partition.</"
+"guimenuitem>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:261
+msgid ""
+"<guimenuitem>Install in EFI/Boot partition (workaround for some BIOS's).</"
+"guimenuitem>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:264
+msgid ""
+"With some BIOS's, the newly written bootloaser for Mageia at end of the "
+"installation will not be recognized. In that case, you can use this option "
+"as a workaround for the issue."
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:270
+msgid ""
+"If you did not select rEFInd as the bootloader to use in the previous "
+"section, then your bootloader configurations are shown below:"
+msgstr ""
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:275
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -4748,22 +4898,22 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:191
+#: en/setupBootloader.xml:286
 msgid "<emphasis role=\"bold\">Default</emphasis>"
 msgstr "<emphasis role=\"bold\">Подразумевано</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:193
+#: en/setupBootloader.xml:288
 msgid "The operating system to be started up by default."
 msgstr "Подразумевани Оперативни систем за покретање"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:197
+#: en/setupBootloader.xml:292
 msgid "<emphasis role=\"bold\">Append</emphasis>"
 msgstr "<emphasis role=\"bold\">Додај</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:199
+#: en/setupBootloader.xml:294
 msgid ""
 "This option lets you pass information to the kernel or tell the kernel to "
 "give you more information as it boots."
@@ -4772,23 +4922,24 @@ msgstr ""
 "кернелу да вам да више информација при покретању система."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:204
+#: en/setupBootloader.xml:299
 msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
 msgstr "<emphasis role=\"bold\">Претражи друге ОС-ове</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:206
+#: en/setupBootloader.xml:301
+#, fuzzy
 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, "
-"then untick the Probe Foreign OS option."
+"then untick the <guimenuitem>Probe Foreign OS</guimenuitem> option."
 msgstr ""
 "Уколико већ имате инсталиран неки други оперативни систем, Mageia ће "
 "покушати да их дода у ваш нови Mageia мени за покретање. Уколико не желите "
 "ово, онда деселектујте ову опцију Претражи друге ОС-ове."
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:215
+#: en/setupBootloader.xml:311
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader4.png\"/> </imageobject> <imageobject condition=\"live"
@@ -4801,12 +4952,12 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:226
+#: en/setupBootloader.xml:322
 msgid "<emphasis>Video mode</emphasis>"
 msgstr "<emphasis>Видео мод</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:228
+#: en/setupBootloader.xml:324
 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 "
@@ -4817,25 +4968,35 @@ msgstr ""
 "боја."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:234
+#: en/setupBootloader.xml:330
 msgid "<emphasis>Do not touch ESP or MBR</emphasis>"
 msgstr "<emphasis>Не дирај ESP или MBR</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:236
+#: en/setupBootloader.xml:332
+#, fuzzy
 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 "
-"missing. Click<emphasis> Ok</emphasis> if you are sure you understand the "
-"implications, and wish to proceed."
+"missing. Click <guimenuitem>Ok </guimenuitem>only if you are sure you "
+"understand the implications, and wish to proceed."
 msgstr ""
 "Изаберите ову опцију уколико не желите бутабилни  Mageia, већ желите да је "
 "радије покрећете из другог оперативног систем. Добићете упозорење да "
 "недостаје стартер. Кликните на <emphasis> У Реду</emphasis> уколико сте "
 "сигурни да сте разумели последице, и желите да наставите."
 
+#. type: Content of: <section><section><section><itemizedlist><listitem><warning><para>
+#: en/setupBootloader.xml:338
+msgid ""
+"Chain-loading via legacy bootloaders (GRUB Legacy and LiLo)  is no longer "
+"supported by Mageia as it is likely to fail when attempting to boot this "
+"resulting installation of Mageia. If you use anything other than GRUB2 or "
+"rEFInd for this purpose, then you do so at your own risk!"
+msgstr ""
+
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:245
+#: en/setupBootloader.xml:348
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png"
 "\"/> </imageobject>"
@@ -4844,17 +5005,17 @@ msgstr ""
 "\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:253
+#: en/setupBootloader.xml:356
 msgid "Other Options"
 msgstr "Остале опције"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:256
+#: en/setupBootloader.xml:359
 msgid "Using an existing bootloader"
 msgstr "Користи постојећи стартер"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:258
+#: en/setupBootloader.xml:361
 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 "
@@ -4869,12 +5030,12 @@ msgstr ""
 "оперативни систем."
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:267
+#: en/setupBootloader.xml:370
 msgid "Installing Without a Bootloader"
 msgstr "Инсталирај без Стартера"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:269
+#: en/setupBootloader.xml:372
 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 "
@@ -5292,3 +5453,45 @@ msgstr ""
 "Следећи корак је копирање фајлова на тврди диск. Овом поступку је потребно "
 "одређено време да би се завршио. На крају ћете на кратко видети празан екран "
 "- ово је нормално."
+
+#~ msgid ""
+#~ "Type in the user password. There is a shield at the end of the text box "
+#~ "that indicates the strength of the password. (See also <xref linkend="
+#~ "\"givePassword\"/>)"
+#~ msgstr ""
+#~ "Унесите лозинку корисника. Постоји индикатор на крају поља за унос који "
+#~ "указује на јачину лозинке. (Погледајте и <xref linkend=\"givePassword\"/>)"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> "
+#~ "</imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> "
+#~ "</imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4."
+#~ "png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4."
+#~ "png\"/> </imageobject>"
+
+#~ msgid "Grub2 on Legacy MBR/GPT systems"
+#~ msgstr "Grub2 на старим MBR/GPT системима"
+
+#~ msgid "Grub2-efi on UEFI systems"
+#~ msgstr "Grub2-efi на UEFI системима"
+
+#~ msgid ""
+#~ "This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI "
+#~ "systems will not see this option here."
+#~ msgstr ""
+#~ "Ова опција је доступна само на старим MBR/BIOS системима.  Корисници UEFI "
+#~ "система неће видети ову опцију овде."
diff --git a/docs/docs/stable/installer/sv.po b/docs/docs/stable/installer/sv.po
index 575a76c9..5c25a326 100644
--- a/docs/docs/stable/installer/sv.po
+++ b/docs/docs/stable/installer/sv.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2019-01-19 21:23+0200\n"
+"POT-Creation-Date: 2019-09-08 15:26+0300\n"
 "PO-Revision-Date: 2019-03-03 04:51+0000\n"
 "Last-Translator: Kristoffer Grundström <hamnisdude@gmail.com>\n"
 "Language-Team: Swedish (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -152,7 +152,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/addUser.xml:3
+#: en/addUser.xml:9
 msgid "User Management"
 msgstr "Användarhantering"
 
@@ -162,13 +162,16 @@ msgstr "Användarhantering"
 #. 2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
 #.   Also changed 'Advanced User Management' to 'User Management (advanced)'.
 #. 2018/02/24 apb: Changed list style.
+#. 2019/08/10 apb: Added missing 'condition' profile for live-user1.png.
+#. 2019/08/11 apb: [1] Reword 1.1 (including Note) [2] Reword 1.2 Password text.
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:12
+#: en/addUser.xml:28
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
-"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
-"\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata format="
-"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-setRootPassword.png\" format=\"PNG\" revision=\"1\" xml:id="
+"\"setRootPassword-im1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-user1.png\" format=\"PNG\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
 "\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -176,36 +179,41 @@ msgstr ""
 "\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:21
+#: en/addUser.xml:40
 msgid "Set Administrator (root)  Password:"
 msgstr "Ställ in ett administratörs  (root) -lösenord:"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:24
+#: en/addUser.xml:44
 msgid ""
 "It is advisable for all Mageia installations to set a <literal>superuser</"
 "literal> (Administrator) password, usually called the <emphasis>root </"
-"emphasis>password in Linux. As you type a password into the top box a shield "
-"will change from red-to-yellow-to-green depending on the strength of the "
-"password. A green shield shows you are using a strong password. You need to "
-"repeat the same password in the box underneath, to check that the first "
-"entry was not mistyped."
+"emphasis>password in Linux. You need to repeat the same password in the box "
+"underneath, to check that the first entry was not mistyped."
+msgstr ""
+
+#. type: Content of: <section><section><note><para>
+#: en/addUser.xml:51
+msgid ""
+"As you type a password into the top box a shield will change from red-to-"
+"yellow-to-green depending on the strength of the password. A green shield "
+"shows you are using a strong password."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:32
+#: en/addUser.xml:55
 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:39
+#: en/addUser.xml:63
 msgid "Enter a user"
 msgstr "Lägg till en användare"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:41
+#: en/addUser.xml:66
 msgid ""
 "Add a User here. A regular user has fewer privileges than the "
 "<literal>superuser</literal> (root), but enough to use the Internet, office "
@@ -214,39 +222,39 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:47
+#: en/addUser.xml:73
 msgid "<emphasis role=\"bold\">Icon</emphasis>"
 msgstr "<emphasis role=\"bold\">Ikon</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:48
+#: en/addUser.xml:75
 msgid "Click on this button if you want to change the user's icon"
 msgstr "Klicka på den här knappen om du vill ändra på användarens ikon"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:52
+#: en/addUser.xml:80
 msgid "<emphasis role=\"bold\">Real Name</emphasis>"
 msgstr "<emphasis role=\"bold\">Fullständigt namn</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:53
+#: en/addUser.xml:82
 msgid "Insert the user's real name into this text box"
 msgstr "Klistra in användarens riktiga namn i den här textrutan"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:56
+#: en/addUser.xml:86
 msgid "<emphasis role=\"bold\">Login Name</emphasis>"
 msgstr "<emphasis role=\"bold\">Inloggningsnamn</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:57
+#: en/addUser.xml:88
 msgid ""
 "Enter the user login name or let DrakX use a version of the user's real "
 "name. <emphasis role=\"bold\">The login name is case-sensitive.</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><caution><simpara>
-#: en/addUser.xml:61
+#: en/addUser.xml:93
 msgid ""
 "The login entered here should be different to any login currently in use for "
 "your <filename>/home</filename> directory. Some user parameters will be "
@@ -255,34 +263,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:65 en/setupBootloader.xml:124
+#: en/addUser.xml:102 en/setupBootloader.xml:182
 msgid "<emphasis role=\"bold\">Password</emphasis>"
 msgstr "<emphasis role=\"bold\">Lösenord</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:66
-msgid ""
-"Type in the user password. There is a shield at the end of the text box that "
-"indicates the strength of the password. (See also <xref linkend="
-"\"givePassword\"/>)"
+#: en/addUser.xml:104
+msgid "Type in the user password (remembering the advice in the Note above)."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:68
+#: en/addUser.xml:107
 msgid ""
 "<emphasis role=\"bold\">Password (again):</emphasis> Retype the user "
 "password. DrakX will check that you have not mistyped the password."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:74
+#: en/addUser.xml:114
 msgid ""
 "Any users added while installing Mageia, will have a home directory that is "
 "both read and write protected (umask=0027)"
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:76
+#: en/addUser.xml:117
 msgid ""
 "You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
@@ -290,24 +295,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:79
+#: en/addUser.xml:121
 msgid "The access permissions can also be changed after the install."
 msgstr "Rättigheterna för åtkomst kan också ändras efter installationen."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:85
+#: en/addUser.xml:128
 msgid "User Management (advanced)"
 msgstr "Användarhantering (avancerad)"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:87
+#: en/addUser.xml:131
 msgid ""
 "The <emphasis>Advanced</emphasis> option allows you to edit further settings "
 "for the user you are adding."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:91
+#: en/addUser.xml:136
 msgid ""
 "<emphasis>Shell</emphasis>: This drop-down list allows you to change the "
 "shell available to any user you added in the previous screen. Options are "
@@ -315,7 +320,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:143
 msgid ""
 "<emphasis>User ID</emphasis>: Here you can set the user ID for any user you "
 "added in the previous screen. If you are unsure what the purpose of this is, "
@@ -323,7 +328,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:102
+#: en/addUser.xml:149
 msgid ""
 "<emphasis>Group ID</emphasis>: This lets you set the group ID.  Again, if "
 "unsure, leave it blank."
@@ -450,24 +455,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:23
+#: en/bootLive.xml:10
 msgid "Boot Mageia as Live system"
 msgstr "Starta Mageia som ett Live-system"
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:28
+#: en/bootLive.xml:14
 msgid "Booting the medium"
 msgstr "Startar upp mediat"
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:31
+#: en/bootLive.xml:16
 msgid ""
 "You can boot directly from a Live DVD or USB. Usually, you just need to plug "
 "the USB device in or place the DVD in the drive and restart the computer."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:35
+#: en/bootLive.xml:19
 msgid ""
 "If the computer does not automatically boot from the USB or DVD you may need "
 "to reconfigure your BIOS Boot Disk priority. Alternatively, you might try "
@@ -476,7 +481,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><tip><para>
-#: en/bootLive.xml:41
+#: en/bootLive.xml:24
 msgid ""
 "To access the BIOS or boot menu when the computer is starting, you can try "
 "pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or <keycap>Esc</"
@@ -486,7 +491,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/bootLive.xml:50
+#: en/bootLive.xml:32
 msgid ""
 "The actual screen that you will first see when booting from the Live media "
 "will depend on whether your computer motherboard is of the Legacy (BIOS) or "
@@ -494,49 +499,50 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:58
+#: en/bootLive.xml:39
 msgid "In BIOS/CSM/Legacy mode"
 msgstr "I BIOS/CSM/Legacy-läge"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:62
+#: en/bootLive.xml:42
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"../live-bootCSM.png\" align=\"center\"/> "
+"</imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> </"
+"<imageobject> <imagedata fileref=\"dx2-summaryTop.png\" align=\"center\"/> </"
 "imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:67
+#: en/bootLive.xml:46
 msgid "First screen while booting in BIOS mode"
 msgstr "Den första skärmen när du startar i BIOS-läge"
 
 #. type: Content of: <section><section><section><itemizedlist><title>
-#: en/bootLive.xml:72 en/bootLive.xml:144 en/installer.xml:106
-#: en/installer.xml:154
+#: en/bootLive.xml:50 en/bootLive.xml:104 en/installer.xml:108
+#: en/installer.xml:156
 msgid "Menu"
 msgstr "Meny"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:75 en/bootLive.xml:147
+#: en/bootLive.xml:52 en/bootLive.xml:106
 msgid "<emphasis role=\"bold\">Boot Mageia</emphasis>"
 msgstr "<emphasis role=\"bold\">Starta Mageia</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:77
+#: en/bootLive.xml:53
 msgid ""
 "This option will boot the Mageia Live system from the connected DVD/USB "
 "media (expect a very slow system compared to an installed OS)."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:81
+#: en/bootLive.xml:56
 msgid "Once the boot is done, you can proceed to the installation."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:86 en/bootLive.xml:102
+#: en/bootLive.xml:60 en/bootLive.xml:72
 msgid ""
 "<emphasis role=\"bold\">+ use non-free video drivers (slower to boot)</"
 "emphasis>"
@@ -545,44 +551,44 @@ msgstr ""
 "långsammare)</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:89
+#: en/bootLive.xml:62
 msgid "Boot the Mageia Live system using non-free video drivers"
 msgstr "Starta Mageia Live-systemet med icke-fria grafik-drivrutiner"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:96 en/bootLive.xml:155 en/installer.xml:109
+#: en/bootLive.xml:68 en/bootLive.xml:112 en/installer.xml:111
 msgid "<emphasis role=\"bold\">Install Mageia</emphasis>"
 msgstr "<emphasis role=\"bold\">Installera Mageia</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:98 en/bootLive.xml:157
+#: en/bootLive.xml:69 en/bootLive.xml:113
 msgid "This option will install Mageia to a hard disk."
 msgstr "Det här alternativet kommer att installera Mageia till en hårddisk."
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:105
+#: en/bootLive.xml:74
 msgid "Install Mageia using non-free video drivers"
 msgstr "Installera Mageia med icke-fria grafik-drivrutiner"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:111 en/installer.xml:125
+#: en/bootLive.xml:79 en/installer.xml:127
 msgid "<emphasis role=\"bold\">Memory Test</emphasis>"
 msgstr "<emphasis role=\"bold\">Minnestest</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:113 en/installer.xml:127
+#: en/bootLive.xml:80 en/installer.xml:129
 msgid ""
 "Test the installed RAM by performing multiple read and write operations. "
 "Reboot to end the test."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:118 en/bootLive.xml:161
+#: en/bootLive.xml:84 en/bootLive.xml:116
 msgid "<emphasis role=\"bold\"> F2 Language</emphasis>"
 msgstr "<emphasis role=\"bold\"> F2 Språk</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:120 en/bootLive.xml:163
+#: en/bootLive.xml:85 en/bootLive.xml:117
 msgid ""
 "Press <keycap>F2</keycap> to have the installer use a specific language "
 "during the installation. Use the arrow keys to select the language then "
@@ -590,26 +596,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:129
+#: en/bootLive.xml:93
 msgid "In UEFI mode"
 msgstr "I UEFI-läge"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:133
+#: en/bootLive.xml:96
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:139
+#: en/bootLive.xml:100
 msgid "First screen while booting in UEFI mode"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:149
+#: en/bootLive.xml:107
 msgid ""
 "This option will boot the Mageia Live system from the connected DVD/USB "
 "media (expect a very slow system compared to an installed OS).  Once the "
@@ -617,7 +624,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/bootLive.xml:170
+#: en/bootLive.xml:123
 msgid ""
 "If you booted from a USB stick, you will see the above menu options "
 "duplicated, and in this case, you should choose from the menu pair that will "
@@ -852,12 +859,12 @@ msgstr ""
 "inställda på lokal tid eller till UTC/GMT."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:24
+#: en/configureX_card_list.xml:27
 msgid "Choose an X Server (Configure your Graphic Card)"
 msgstr "Välj en X-server (konfigurera ditt grafikkort)"
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_card_list.xml:29
+#: en/configureX_card_list.xml:32
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_card_list."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_card_list-im1\"/> </"
@@ -868,7 +875,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:35
+#: en/configureX_card_list.xml:38
 msgid ""
 "DrakX has a very comprehensive database of video cards and will usually "
 "correctly identify your video device."
@@ -877,7 +884,7 @@ msgstr ""
 "oftast ditt nuvarande grafikkort korrekt."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:38
+#: en/configureX_card_list.xml:41
 msgid ""
 "If the installer has not correctly detected your graphic card and you know "
 "which one you have, you can select it from the tree by:"
@@ -886,22 +893,22 @@ msgstr ""
 "vilket du har så kan du välja det från trädet genom:"
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_card_list.xml:41 en/configureX_monitor.xml:74
+#: en/configureX_card_list.xml:44 en/configureX_monitor.xml:78
 msgid "Vendor"
 msgstr "Tillverkare"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:45
+#: en/configureX_card_list.xml:48
 msgid "then the make of your card"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:49
+#: en/configureX_card_list.xml:52
 msgid "and the model of card"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:53
+#: en/configureX_card_list.xml:56
 msgid ""
 "If you cannot find your card in the vendor lists (because it's not yet in "
 "the database or it's an older card) you may find a suitable driver in the "
@@ -912,14 +919,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><caution><para>
-#: en/configureX_card_list.xml:61
+#: en/configureX_card_list.xml:64
 msgid ""
 "Be aware that if you select an incompatible driver you may only have access "
 "to the <emphasis>Command Line Interface</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:65
+#: en/configureX_card_list.xml:68
 msgid ""
 "Some video card manufacturers provide proprietary drivers for Linux which "
 "may only be available in the <emphasis>Nonfree</emphasis> repository and in "
@@ -930,17 +937,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:11
-msgid "Graphic Card and Monitor Configuration"
+#: en/configureX_chooser.xml:23
+#, fuzzy
+msgid "Graphics Card and Monitor Configuration"
 msgstr "Konfigurera grafikkort och bildskärm"
 
-#.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
-#. 2018/02/15 apb: Some text and typography.
-#. 2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.
-#. 2018/02/23 apb: Typo.
-#. 2019/01/06 apb: Slight reword, split 1st para in two.
 #. type: Content of: <section><mediaobject>
-#: en/configureX_chooser.xml:26
+#: en/configureX_chooser.xml:28
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_chooser."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_chooser-im1\"/> </"
@@ -951,7 +954,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:32
+#: en/configureX_chooser.xml:34
 msgid ""
 "No matter which graphical environment (also known as desktop environment) "
 "you chose for this install of Mageia, they are all based on a graphical user "
@@ -962,31 +965,32 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:39
+#: en/configureX_chooser.xml:41
 msgid ""
 "Choose the appropriate settings manually if you think the details are "
 "incorrect, or if none are shown."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:44
-msgid "<emphasis role=\"bold\">Graphic Card</emphasis>"
+#: en/configureX_chooser.xml:46
+#, fuzzy
+msgid "<emphasis role=\"bold\">Graphics Card</emphasis>"
 msgstr "<emphasis role=\"bold\">Grafikkort</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:47
+#: en/configureX_chooser.xml:49
 msgid ""
 "If you need to, you can select a specific card from this expandable list. "
 "See <xref linkend=\"configureX_card_list\"/>."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:52
+#: en/configureX_chooser.xml:54
 msgid "<emphasis role=\"bold\">Monitor</emphasis>"
 msgstr "<emphasis role=\"bold\">Skärm</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:55
+#: en/configureX_chooser.xml:57
 msgid ""
 "You can choose Plug 'n Play, if applicable, or choose your monitor from the "
 "<emphasis>Vendor</emphasis> or <emphasis>Generic</emphasis> lists. Choose "
@@ -996,22 +1000,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:63
+#: en/configureX_chooser.xml:65
 msgid "<emphasis role=\"bold\">Resolution</emphasis>"
 msgstr "<emphasis role=\"bold\">Upplösning</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:66
+#: en/configureX_chooser.xml:68
 msgid "The resolution and color depth of your monitor can be set here."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:71
+#: en/configureX_chooser.xml:73
 msgid "<emphasis role=\"bold\">Test</emphasis>"
 msgstr "<emphasis role=\"bold\">Prova</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:74
+#: en/configureX_chooser.xml:76
 msgid ""
 "The test button does not always appear during install. If the option is "
 "there, and you test your settings, you should be asked to confirm that your "
@@ -1023,17 +1027,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:85
+#: en/configureX_chooser.xml:87
 msgid "<emphasis role=\"bold\">Options</emphasis>"
 msgstr "<emphasis role=\"bold\">Alternativ</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:88
+#: en/configureX_chooser.xml:90
 msgid "Here you can choose to enable or disable various options."
 msgstr "Här kan du välja att aktivera eller inaktivera olika alternativ."
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_chooser.xml:93
+#: en/configureX_chooser.xml:95
 msgid ""
 "There is a risk of damaging a monitor if you choose refresh rates that are "
 "outside the frequency range of that monitor. This applies to older CRT "
@@ -1042,12 +1046,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_monitor.xml:22
+#: en/configureX_monitor.xml:26
 msgid "Choosing your Monitor"
 msgstr "Att välja din bildskärm"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:25
+#: en/configureX_monitor.xml:29
 msgid ""
 "DrakX has a very comprehensive database of monitors and will usually "
 "correctly identify yours."
@@ -1056,7 +1060,7 @@ msgstr ""
 "identifiera ditt nuvarande grafikkort rätt."
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:30
+#: en/configureX_monitor.xml:34
 msgid ""
 "<emphasis role=\"bold\">Selecting a monitor with different characteristics "
 "could damage your monitor or video hardware. Please don't try something "
@@ -1065,7 +1069,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:38
+#: en/configureX_monitor.xml:42
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
@@ -1076,12 +1080,12 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:46
+#: en/configureX_monitor.xml:50
 msgid "Custom"
 msgstr "Anpassad"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:49
+#: en/configureX_monitor.xml:53
 msgid ""
 "This option allows you to set two critical parameters: the vertical refresh "
 "rate and the horizontal sync rate. Vertical refresh determines how often the "
@@ -1090,7 +1094,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:55
+#: en/configureX_monitor.xml:59
 msgid ""
 "It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor "
 "type with a sync range that is beyond the capabilities of your monitor: you "
@@ -1103,58 +1107,59 @@ msgstr ""
 "läs dokumentationen för din bildskärm."
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:64
+#: en/configureX_monitor.xml:68
 msgid "Plug'n Play"
 msgstr "Plug'n Play"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:67
+#: en/configureX_monitor.xml:71
 msgid ""
 "This is the default option and automatically tries to determine the monitor "
 "type from the monitor database."
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:77
+#: en/configureX_monitor.xml:81
+#, fuzzy
 msgid ""
 "If the installer has not correctly detected your monitor and you know which "
-"one you have, you can select it from the tree by selecting:"
+"one you have, you can choose it from the options by selecting:"
 msgstr ""
 "Om installationen inte har upptäckt din bildskärm och du vet vilken du har "
 "så kan du välja den från trädet genom att välja:"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:86
+#: en/configureX_monitor.xml:90
 msgid "Manufacturer"
 msgstr "Tillverkare"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:90
+#: en/configureX_monitor.xml:94
 msgid "Monitor model"
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:96
+#: en/configureX_monitor.xml:100
 msgid "Generic"
 msgstr "Allmänna"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:99
+#: en/configureX_monitor.xml:103
 msgid ""
-"Selecting this group will list nearly 30 display configurations such as "
-"1024x768 @ 60Hz and includes flat-panel displays as used in laptops. This is "
-"often a good monitor selection group if you need to use the VESA card driver "
-"when your video hardware cannot be determined automatically.  Once again it "
-"may be wise to be conservative in your selections."
+"Selecting this group will list approximately 30 display configurations such "
+"as 1024x768 @ 60Hz and includes flat-panel displays as used in laptops.  "
+"This is often a good monitor selection group if you need to use the VESA "
+"card driver when your video hardware cannot be determined automatically. "
+"Once again, it may be wise to be conservative in your selections."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:22
+#: en/diskdrake.xml:24
 msgid "Custom Disk Partitioning with DiskDrake"
 msgstr "Anpassad diskpartitionering med DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:27
+#: en/diskdrake.xml:29
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-diskdrake.png\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1165,7 +1170,7 @@ msgstr ""
 "<imagedata align=\"center\" fileref=\"live-diskdrake.png\"/> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:38
+#: en/diskdrake.xml:40
 msgid ""
 "Modify the layout of your disk(s) here. You can remove or create partitions, "
 "change the filesystem or size of a partition and even view their details "
@@ -1173,15 +1178,15 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:47
 msgid ""
 "There is a tab at the top for every detected hard disk (or other storage "
-"device, like a USB key). In the screenshot above there are two available "
-"devices: <filename>sda </filename>and <filename>sdb</filename>."
+"device, like a USB key), for example: <filename>sda</filename>, "
+"<filename>sdb</filename>, <filename>sdc</filename> etc."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:52
+#: en/diskdrake.xml:54
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it. "
@@ -1190,21 +1195,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:60
+#: en/diskdrake.xml:62
 msgid ""
 "Continue until you have adjusted everything to your satisfaction, then click "
 "<emphasis>Done</emphasis> when you're ready."
 msgstr ""
 
 #. type: Content of: <section><warning><orderedlist><listitem><para>
-#: en/diskdrake.xml:69
+#: en/diskdrake.xml:71
 msgid ""
 "Take care with the <emphasis>Clear all</emphasis> option, use it only if you "
 "are sure you want to wipe all partitions on the selected storage device."
 msgstr ""
 
 #. type: Content of: <section><warning><orderedlist><listitem><para>
-#: en/diskdrake.xml:75
+#: en/diskdrake.xml:77
 msgid ""
 "If you wish to use encryption on your <filename>/</filename> partition you "
 "must ensure that you have a separate <filename>/boot</filename> partition. "
@@ -1213,7 +1218,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/diskdrake.xml:87
+#: en/diskdrake.xml:89
 msgid ""
 "If you are installing Mageia on a UEFI system, check that an ESP (EFI System "
 "Partition) is present and correctly mounted on <filename>/boot/EFI</"
@@ -1221,19 +1226,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/diskdrake.xml:93
+#: en/diskdrake.xml:95
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
 "partition is present and of the correct type. See Figure 2 below."
 msgstr ""
 
 #. type: Content of: <section><figure><title>
-#: en/diskdrake.xml:101
+#: en/diskdrake.xml:103
 msgid "EFI System Partition"
 msgstr "EFI systempartition"
 
 #. type: Content of: <section><figure><mediaobject>
-#: en/diskdrake.xml:104
+#: en/diskdrake.xml:106
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-diskdrake2.png\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1244,17 +1249,17 @@ msgstr ""
 "<imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/> </imageobject>"
 
 #. type: Content of: <section><figure>
-#: en/diskdrake.xml:103 en/diskdrake.xml:117
+#: en/diskdrake.xml:105 en/diskdrake.xml:119
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><figure><title>
-#: en/diskdrake.xml:115
+#: en/diskdrake.xml:117
 msgid "BIOS boot partition"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:118 en/doPartitionDisks.xml:201
+#: en/diskdrake.xml:120 en/doPartitionDisks.xml:206
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1277,26 +1282,26 @@ msgid "Partitioning"
 msgstr "Partitionering"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:31
 msgid "Suggested Partitioning"
 msgstr "Föreslagen partitionering"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:34
 msgid ""
 "In this screen you can see the content of your hard drive(s) along with the "
 "DrakX partitioning proposals for where to install Mageia."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:34
+#: en/doPartitionDisks.xml:38
 msgid ""
 "The actual options available from those shown below will vary according to "
 "the layout and content of your particular hard drive(s)."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:39
+#: en/doPartitionDisks.xml:43
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1305,17 +1310,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><title>
-#: en/doPartitionDisks.xml:49
+#: en/doPartitionDisks.xml:53
 msgid "Main Options"
 msgstr "Huvudsakliga alternativ"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:56
 msgid "<emphasis role=\"bold\">Use Existing Partitions</emphasis>"
 msgstr "<emphasis role=\"bold\">Använd befintliga partitioner</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:59
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1324,12 +1329,12 @@ msgstr ""
 "hittats och kan användas för installation."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:61
+#: en/doPartitionDisks.xml:65
 msgid "<emphasis role=\"bold\">Use Free Space</emphasis>"
 msgstr "<emphasis role=\"bold\">Använd oanvänt utrymme</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:68
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1338,7 +1343,7 @@ msgstr ""
 "använda det för att installera Mageia."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:70
+#: en/doPartitionDisks.xml:74
 msgid ""
 "<emphasis role=\"bold\">Use Free Space on a Windows Partition</emphasis>"
 msgstr ""
@@ -1346,51 +1351,52 @@ msgstr ""
 "emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:73
+#: en/doPartitionDisks.xml:77
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it. 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 important files!"
+"installation but see the warning below."
 msgstr ""
 
+#. type: Content of: <section><itemizedlist><listitem><para><mediaobject>
+#: en/doPartitionDisks.xml:87
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:79
+#: en/doPartitionDisks.xml:82
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
 "light blue and the proposed Mageia partition in dark blue with their "
 "intended sizes just underneath. You have the option to modify these sizes by "
 "clicking and dragging the gap between both partitions.  See the following "
-"screenshot:"
-msgstr ""
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:87
-msgid "<emphasis role=\"bold\">Erase and use Entire Disk</emphasis>"
-msgstr "<emphasis role=\"bold\">Radera och använd hela hårddisken</emphasis>"
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:90
-msgid "This option will allocate the entire drive for Mageia"
+"screenshot:<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:97
 msgid ""
-"This will erase ALL data on the selected hard drive. Take care! 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 this option."
+"This involves shrinking the size of the Windows partition, and therefore is "
+"a risky operation, so you should make sure you have backed up all important "
+"files before proceeding."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><important><para>
-#: en/doPartitionDisks.xml:101
+#: en/doPartitionDisks.xml:103
+#, fuzzy
 msgid ""
-"Note that this involves shrinking the size of the Windows partition. The "
-"partition must be \"clean\", meaning that Windows must have closed down "
+"The partition must be \"clean\", meaning that Windows must have closed down "
 "correctly the last time it was used. It must also have been defragmented, "
 "although this is not a guarantee that all files in the partition have been "
-"moved out of the area that is about to be used. It is highly recommended to "
-"back up your personal files."
+"moved out of the area that is about to be used for Mageia."
 msgstr ""
 "Observera att det innebär att storleken på Windows-partitionen krymps. "
 "Partitionen måste vara \"ren\", dvs. att Windows måste ha stängts av korrekt "
@@ -1400,11 +1406,29 @@ msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/doPartitionDisks.xml:112
+msgid "<emphasis role=\"bold\">Erase and use Entire Disk</emphasis>"
+msgstr "<emphasis role=\"bold\">Radera och använd hela hårddisken</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:115
+msgid "This option will allocate the entire drive for Mageia"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><warning><para>
+#: en/doPartitionDisks.xml:119
+msgid ""
+"This will erase ALL data on the selected hard drive. Take care! 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 this option."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:127
 msgid "<emphasis role=\"bold\">Custom Disk Partitioning</emphasis>"
 msgstr "<emphasis role=\"bold\">Anpassad diskpartitionering</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:115
+#: en/doPartitionDisks.xml:130
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1412,21 +1436,8 @@ msgstr ""
 "Detta ger dig fullständig kontroll över placeringen av installationen på din/"
 "a disk/ar."
 
-#. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:122
-msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
-
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:131
+#: en/doPartitionDisks.xml:136
 msgid ""
 "If you are not using the <emphasis>Custom disk partitioning</emphasis> "
 "option, then the installer will allocate the available space according to "
@@ -1434,60 +1445,60 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:137
+#: en/doPartitionDisks.xml:142
 msgid ""
 "If the total available space is less than 50 GB, then only one partition is "
 "created. This will be the <filename>/</filename> (root)  partition."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:143
+#: en/doPartitionDisks.xml:148
 msgid ""
 "If the total available space is greater than 50 GB, then three partitions "
 "are created"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:148
+#: en/doPartitionDisks.xml:153
 msgid ""
 "6/19 of the total available place is allocated to <filename>/</filename> "
 "with a maximum of 50 GB"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:153
+#: en/doPartitionDisks.xml:158
 msgid "1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:158
+#: en/doPartitionDisks.xml:163
 msgid "the rest (at least 12/19) is allocated to <filename>/home</filename>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:165
+#: en/doPartitionDisks.xml:170
 msgid ""
 "This means that from 160 GB or greater available space, the installer will "
 "create three partitions:"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:170
+#: en/doPartitionDisks.xml:175
 msgid "50 GB for <filename>/</filename>"
 msgstr "50 GB för <filename>/</filename>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:174
+#: en/doPartitionDisks.xml:179
 msgid "4 GB for <filename>swap</filename>"
 msgstr "4 GB för <filename>swap</filename>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:178
+#: en/doPartitionDisks.xml:183
 msgid "and the remainder for <filename>/home</filename>"
 msgstr "och det som återstår till <filename>/home</filename>"
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:183
+#: en/doPartitionDisks.xml:188
 msgid ""
 "If you are using a UEFI system, the ESP (EFI System Partition) will be "
 "automatically detected - or created if it does not exist yet - and mounted "
@@ -1497,7 +1508,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:189
+#: en/doPartitionDisks.xml:194
 msgid ""
 "If you are using a Legacy (also known as BIOS) system with a GPT partitioned "
 "disk, you need to create a BIOS boot partition if it doesn't already exist. "
@@ -1508,21 +1519,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:196
+#: en/doPartitionDisks.xml:201
 msgid "See <xref linkend=\"diskdrake\"/> for information on how to proceed."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:211
+#: en/doPartitionDisks.xml:216
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4.png"
-"\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks4.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks4.png\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4.png"
-"\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:217
+#: en/doPartitionDisks.xml:226
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
 "previous standard of 512. Due to lack of available hardware, the "
@@ -1531,7 +1547,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:222
+#: en/doPartitionDisks.xml:231
 msgid ""
 "Some SSD devices now use an erase block size over 1 MB. If you have such a "
 "device we suggest that you partition the drive in advance, using an "
@@ -1540,17 +1556,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:229
+#: en/doPartitionDisks.xml:238
 msgid "<emphasis>Align to</emphasis> = MiB"
 msgstr "<emphasis>Justera till</emphasis> = MiB"
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:233
+#: en/doPartitionDisks.xml:242
 msgid "<emphasis>Free space preceding (MiB)</emphasis> = 2"
 msgstr ""
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:237
+#: en/doPartitionDisks.xml:246
 msgid ""
 "Also make sure all partitions are created using an even number of megabytes."
 msgstr ""
@@ -1723,12 +1739,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/firewall.xml:7
+#: en/firewall.xml:16
 msgid "Firewall"
 msgstr "Brandvägg"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:10
+#: en/firewall.xml:19
 msgid ""
 "This section allows you to configure some simple firewall rules: they "
 "determine which type of message from the Internet will be accepted by the "
@@ -1736,8 +1752,18 @@ msgid ""
 "system to be accessible from the Internet."
 msgstr ""
 
+#. type: Content of: <section><mediaobject>
+#: en/firewall.xml:26
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-firewall.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome.png\"/> </"
+"imageobject>"
+
 #. type: Content of: <section><para>
-#: en/firewall.xml:16
+#: en/firewall.xml:31
 msgid ""
 "In the default setting (no button is checked), no service of the system is "
 "accessible from the network. The <emphasis>Everything (no firewall)</"
@@ -1750,7 +1776,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:25
+#: en/firewall.xml:40
 msgid ""
 "All other options are more or less self-explanatory. As an example, you will "
 "enable the CUPS server if you want printers on your machine to be accessible "
@@ -1758,12 +1784,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:29
+#: en/firewall.xml:44
 msgid "<emphasis role=\"bold\">Advanced</emphasis>"
 msgstr "<emphasis role=\"bold\">Avancerat</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:31
+#: en/firewall.xml:46
 msgid ""
 "The <emphasis>Advanced</emphasis> option opens a window where you can enable "
 "a series of services by typing a list of <quote>couples</quote> (blank "
@@ -1771,34 +1797,36 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:35
-msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
+#: en/firewall.xml:50
+#, fuzzy
+msgid "<emphasis>&lt;port-number&gt;/&lt;protocol&gt;</emphasis>"
 msgstr "<emphasis>&lt;portnummer>/&lt;protokoll></emphasis>"
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:38
+#: en/firewall.xml:53
 msgid ""
-"- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
-"the service you want to enable (e.g. 873 for the RSYNC service) as defined "
-"in <emphasis>RFC-433</emphasis>;"
+"- <emphasis>&lt;port-number&gt;</emphasis> is the value of the port assigned "
+"to the service you want to enable (e.g. 873 for the RSYNC service) as "
+"defined in <emphasis>RFC-433</emphasis>;"
 msgstr ""
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:42
+#: en/firewall.xml:57
 msgid ""
-"- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
-"<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
+"- <emphasis>&lt;protocol&gt;</emphasis> is one of <emphasis>TCP</emphasis> "
+"or <emphasis>UDP</emphasis> - the internet protocol that is used by the "
+"service."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:47
+#: en/firewall.xml:62
 msgid ""
 "For instance, the entry for enabling access to the RSYNC service therefore "
 "is <emphasis>873/tcp</emphasis>."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:50
+#: en/firewall.xml:65
 msgid ""
 "In case a service is implemented to use both protocols, you specify 2 "
 "couples for the same port."
@@ -1871,12 +1899,12 @@ msgid "Graphical Configuration"
 msgstr "Grafisk konfiguration"
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:32
+#: en/installer.xml:34
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, Mageias installerare"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:35
+#: en/installer.xml:37
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -1887,33 +1915,33 @@ msgstr ""
 "enkel som möjligt."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:40
+#: en/installer.xml:42
 msgid "The installation steps"
 msgstr "Installationsstegen"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:44
+#: en/installer.xml:46
 msgid ""
 "The install process is divided into a number of steps - the status of which "
 "is indicated in a panel to the left of the screen."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:50
+#: en/installer.xml:52
 msgid ""
 "Each step has one or more screens, which may also have <emphasis>Advanced</"
 "emphasis> sections with extra, less commonly required options."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:56
+#: en/installer.xml:58
 msgid ""
 "Most screens have <emphasis>Help</emphasis> buttons for further details "
 "about the particular step."
 msgstr ""
 
 #. type: Content of: <section><section><caution><para>
-#: en/installer.xml:62
+#: en/installer.xml:64
 msgid ""
 "If at some point during the install you decide to abort the installation, it "
 "is possible to reboot, but please think twice before you do this. Once a "
@@ -1923,7 +1951,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><caution><para>
-#: en/installer.xml:68
+#: en/installer.xml:70
 msgid ""
 "If, in spite of this, you are very sure rebooting is what you want, go to a "
 "text terminal by pressing the keys <keycombo> <keycap>Ctrl</keycap> "
@@ -1933,12 +1961,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:86
+#: en/installer.xml:88
 msgid "Installation Welcome Screen"
 msgstr "Välkomstskärm för installationen"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:88
+#: en/installer.xml:90
 msgid ""
 "The particular screen that you will first see when booting from the "
 "Installation media will depend on whether your computer motherboard is of "
@@ -1946,19 +1974,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:92
+#: en/installer.xml:94
 msgid ""
 "The welcome menu screen has various options, however the default option will "
 "start the installer, and is normally all that you will need."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:97
+#: en/installer.xml:99
 msgid "Legacy (BIOS) Systems"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:100
+#: en/installer.xml:102
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome.png\"/> </"
 "imageobject>"
@@ -1967,41 +1995,41 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:111
+#: en/installer.xml:113
 msgid ""
 "Install Mageia to a hard disk. This is the default option, and will "
 "automatically start after a short while unless another option is selected."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:117
+#: en/installer.xml:119
 msgid "<emphasis role=\"bold\">Rescue System</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:119
+#: en/installer.xml:121
 msgid ""
 "This option allows you to either re-install the bootloader for an existing "
 "Mageia installation or you can use it to restore a Windows bootloader."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:132
+#: en/installer.xml:134
 msgid "<emphasis role=\"bold\">F2: Language</emphasis>"
 msgstr "<emphasis role=\"bold\">F2: Språk</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:134
+#: en/installer.xml:136
 msgid "Press F2 for alternative languages."
 msgstr "Tryck F2 för alternativa språk."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:140
+#: en/installer.xml:142
 msgid "UEFI Systems"
 msgstr "UEFI-system"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:142
+#: en/installer.xml:144
 msgid ""
 "From this screen, you can access options by pressing <keycap>e</keycap> to "
 "enter the edit mode. To come back to this screen, press <keycap>Esc</keycap> "
@@ -2009,7 +2037,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:148
+#: en/installer.xml:150
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome2.png\"/> </"
 "imageobject>"
@@ -2018,13 +2046,13 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:157
+#: en/installer.xml:159
 msgid "<emphasis role=\"bold\">Install:</emphasis> Start the Install process"
 msgstr ""
 "<emphasis role=\"bold\">Installera:</emphasis> Påbörja installationsprocessen"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:162
+#: en/installer.xml:164
 msgid ""
 "<emphasis role=\"bold\">Rescue:</emphasis> This option allows you to either "
 "re-install the bootloader for an existing Mageia installation or you can use "
@@ -2032,7 +2060,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:169
+#: en/installer.xml:171
 msgid ""
 "<emphasis role=\"bold\">F2: Language:</emphasis> Press <keycap>F2</keycap> "
 "for alternative languages."
@@ -2041,24 +2069,24 @@ msgstr ""
 "alternativa språk."
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:174
+#: en/installer.xml:176
 msgid ""
 "If you booted from a USB stick, you will see the above options duplicated, "
 "and in this case, you should use the set that will be suffixed with \"USB\"."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:181
+#: en/installer.xml:183
 msgid "Installation Problems and Possible Solutions"
 msgstr "Installationsproblem och möjliga lösningar"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:184
+#: en/installer.xml:186
 msgid "No Graphical Interface"
 msgstr "Inget grafiskt gränssnitt"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:188
+#: en/installer.xml:190
 msgid ""
 "After the initial screen you did not progress to the <emphasis>Language "
 "Selection</emphasis> screen. This can happen with some graphic cards and "
@@ -2067,7 +2095,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:195
+#: en/installer.xml:197
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
 "In this case it is worth trying a text-mode installation. To use this press "
@@ -2078,12 +2106,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:208
+#: en/installer.xml:210
 msgid "The Install Freezes"
 msgstr "Installationen hänger sig"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:210
+#: en/installer.xml:212
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic hardware "
@@ -2093,12 +2121,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:218
+#: en/installer.xml:220
 msgid "RAM problem"
 msgstr "RAM-problem"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:220
+#: en/installer.xml:222
 msgid ""
 "This will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
@@ -2108,12 +2136,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:228
+#: en/installer.xml:230
 msgid "Dynamic partitions"
 msgstr "Dynamiska partitioner"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:230
+#: en/installer.xml:232
 msgid ""
 "If you converted your hard disk from <literal>Basic</literal> format to "
 "<literal>Dynamic</literal> format in Microsoft Windows, then it is not "
@@ -3809,73 +3837,109 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:27
+#: en/setupBootloader.xml:32
 msgid "Bootloader"
 msgstr "Starthanterare"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:31
+#: en/setupBootloader.xml:36
+#, fuzzy
+msgid "Available Bootloaders"
+msgstr "Starthanterare"
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:39
 msgid "Grub2"
 msgstr "Grub2"
 
-#. type: Content of: <section><section><itemizedlist><title>
-#: en/setupBootloader.xml:34
-msgid "Grub2 on Legacy MBR/GPT systems"
-msgstr ""
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:42
+#, fuzzy
+msgid "<emphasis role=\"bold\">Grub2 on Legacy MBR/GPT systems</emphasis>"
+msgstr "<emphasis role=\"bold\">Minnestest</emphasis>"
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:37
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:46
 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:42
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:52
 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:49
-msgid "Grub2-efi on UEFI systems"
-msgstr "Grub2-efi för ett UEFI-system."
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:59
+#, fuzzy
+msgid "<emphasis role=\"bold\">Grub2-efi on UEFI systems</emphasis>"
+msgstr "<emphasis role=\"bold\">Prova</emphasis>"
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:52
-msgid "GRUB2-efi will be used exclusively as the bootloader for a UEFI system."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:63
+msgid "GRUB2-efi or rEFInd may be used as the bootloader for a UEFI system."
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:57
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:68
 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:60
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:71
 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 "
-"created by Windows and add grub2-efi to it. If no ESP exists, then one will "
+"created by Windows and add grub2-efi to it.  If no ESP exists, then one will "
 "be created. Although it is possible to have several ESPs, only one is "
 "required, whatever the number of operating systems you have."
 msgstr ""
 
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:82
+msgid "rEFInd"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:85
+#, fuzzy
+msgid "<emphasis role=\"bold\">rEFInd on UEFI systems</emphasis>"
+msgstr "<emphasis role=\"bold\">Ikon</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:88
+msgid ""
+"rEFInd has a nice graphical set of options, and can auto-detect installed "
+"EFI bootloaders. See: http://www.rodsbooks.com/refind/"
+msgstr ""
+
+#. type: Content of: <section><section><section><note><para>
+#: en/setupBootloader.xml:95
+msgid ""
+"Please note that in order to be able to use the <literal>rEFInd</literal> "
+"option, an installed EFI System Partition must match your system "
+"architecture: if you have a 32bit EFI System Partition installed on a 64bit "
+"machine for instance, then the rEFInd option will not be displayed/available "
+"to you."
+msgstr ""
+
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:72
+#: en/setupBootloader.xml:106
 msgid "Bootloader Setup"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:76
+#: en/setupBootloader.xml:110
 msgid "Bootloader main options"
 msgstr "Huvudalternativ för startshanteraren"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:79
+#: en/setupBootloader.xml:113
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader.png\"/> </imageobject> <imageobject condition=\"live"
@@ -3888,48 +3952,71 @@ msgstr ""
 "im1\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:91
+#: en/setupBootloader.xml:125
 msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
 msgstr "<emphasis role=\"bold\">Uppstartshanterare att använda</emphasis>"
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:93
+#. type: Content of: <section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:129
 msgid ""
-"This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI "
-"systems will not see this option here."
+"<guimenuitem>GRUB2</guimenuitem> (with either a graphical or a text menu), "
+"can be chosen for both <literal>Legacy MBR/BIOS</literal> systems and "
+"<literal>UEFI</literal> systems."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:136
+msgid ""
+"<guimenuitem>rEFInd</guimenuitem> (with a graphical menu)  is an alternative "
+"option solely for use with <literal>UEFI</literal> systems."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:98
+#: en/setupBootloader.xml:144
 msgid "<emphasis role=\"bold\">Boot device</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:100
-msgid "Don't change this unless you really know what you are doing"
+#. type: Content of: <section><section><section><itemizedlist><listitem><warning><para>
+#: en/setupBootloader.xml:147
+#, fuzzy
+msgid "Don't change this unless you really know what you are doing."
 msgstr "Ändra inte på det här om du inte vet vad du gör"
 
+#. type: Content of: <section><section><section><itemizedlist><listitem><note><para>
+#: en/setupBootloader.xml:152
+msgid ""
+"There is no option to write GRUB to the boot sector of a partition (e.g: "
+"<filename>sda1</filename>), as this method is considered unreliable."
+msgstr ""
+
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:105
+#: en/setupBootloader.xml:157
+msgid ""
+"When using UEFI mode, then the <guilabel>Boot device</guilabel> will be "
+"listed as <guimenuitem>EFI System Partition</guimenuitem>."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:163
 msgid ""
 "<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
 msgstr ""
 "<emphasis role=\"bold\">Fördröj innan standard-avbilden startas</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:108
+#: en/setupBootloader.xml:166
 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:113
+#: en/setupBootloader.xml:171
 msgid "<emphasis role=\"bold\">Security</emphasis>"
 msgstr "<emphasis role=\"bold\">Säkerhet</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:115
+#: en/setupBootloader.xml:173
 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 "
@@ -3939,34 +4026,34 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:126
+#: en/setupBootloader.xml:184
 msgid "Choose a password for the bootloader (optional)"
 msgstr "Välj ett lösenord för uppstartshanteraren (valfritt)"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:130
+#: en/setupBootloader.xml:188
 msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
 msgstr "<emphasis role=\"bold\">Lösenordet (igen)</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:132
+#: en/setupBootloader.xml:190
 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:137 en/setupBootloader.xml:212
+#: en/setupBootloader.xml:195 en/setupBootloader.xml:308
 msgid "<emphasis>Advanced</emphasis>"
 msgstr "<emphasis>Avancerad</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:141
+#: en/setupBootloader.xml:199
 msgid "<emphasis>Enable ACPI</emphasis>"
 msgstr "<emphasis>Aktivera ACPI</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:143
+#: en/setupBootloader.xml:201
 msgid ""
 "ACPI (Advanced Configuration and Power Interface) is a standard for power "
 "management. It can save energy by stopping unused devices. Deselecting it "
@@ -3976,24 +4063,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:152
+#: en/setupBootloader.xml:210
 msgid "<emphasis>Enable SMP</emphasis>"
 msgstr "<emphasis>Aktivera SMP</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:154
+#: en/setupBootloader.xml:212
 msgid ""
 "This option enables/disables symmetric multiprocessing for multi-core "
 "processors"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:159
+#: en/setupBootloader.xml:217
 msgid "<emphasis>Enable APIC</emphasis>"
 msgstr "<emphasis>Aktivera APIC</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:161
+#: en/setupBootloader.xml:219
 msgid ""
 "Enabling this gives the operating system access to the Advanced Programmable "
 "Interrupt Controller. APIC devices permit more complex priority models, and "
@@ -4001,24 +4088,82 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:168
+#: en/setupBootloader.xml:226
 msgid "<emphasis>Enable Local APIC</emphasis>"
 msgstr "<emphasis>Aktivera Lokal APIC</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:170
+#: en/setupBootloader.xml:228
 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:177
+#: en/setupBootloader.xml:235
 msgid "Bootloader Configuration"
 msgstr "Konfiguration av starthanterare"
 
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:237
+msgid ""
+"If, in the previous section you selected <literal>rEFInd</literal> as the "
+"bootloader to use, you would then be presented with the options shown in the "
+"screenshot directly below. Otherwise, please instead move on to the "
+"subsequent screenshot for your options."
+msgstr ""
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:243
+#, fuzzy
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"rEFIndLoaderConfig.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-rEFIndLoaderConfig.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:253
+#, fuzzy
+msgid "Your rEFInd configuration options:"
+msgstr "Ljudkonfiguration"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:256
+msgid ""
+"<guimenuitem>Install or update rEFInd in the EFI system partition.</"
+"guimenuitem>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:261
+msgid ""
+"<guimenuitem>Install in EFI/Boot partition (workaround for some BIOS's).</"
+"guimenuitem>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:264
+msgid ""
+"With some BIOS's, the newly written bootloaser for Mageia at end of the "
+"installation will not be recognized. In that case, you can use this option "
+"as a workaround for the issue."
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:270
+msgid ""
+"If you did not select rEFInd as the bootloader to use in the previous "
+"section, then your bootloader configurations are shown below:"
+msgstr ""
+
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:180
+#: en/setupBootloader.xml:275
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -4027,42 +4172,42 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:191
+#: en/setupBootloader.xml:286
 msgid "<emphasis role=\"bold\">Default</emphasis>"
 msgstr "<emphasis role=\"bold\">Standard</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:193
+#: en/setupBootloader.xml:288
 msgid "The operating system to be started up by default."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:197
+#: en/setupBootloader.xml:292
 msgid "<emphasis role=\"bold\">Append</emphasis>"
 msgstr "<emphasis role=\"bold\">Fäst</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:199
+#: en/setupBootloader.xml:294
 msgid ""
 "This option lets you pass information to the kernel 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:204
+#: en/setupBootloader.xml:299
 msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
 msgstr "<emphasis role=\"bold\">Undersök främmande OS</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:206
+#: en/setupBootloader.xml:301
 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, "
-"then untick the Probe Foreign OS option."
+"then untick the <guimenuitem>Probe Foreign OS</guimenuitem> option."
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:215
+#: en/setupBootloader.xml:311
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader4.png\"/> </imageobject> <imageobject condition=\"live"
@@ -4075,12 +4220,12 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:226
+#: en/setupBootloader.xml:322
 msgid "<emphasis>Video mode</emphasis>"
 msgstr "<emphasis>Grafikläge</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:228
+#: en/setupBootloader.xml:324
 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 "
@@ -4088,21 +4233,30 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:234
+#: en/setupBootloader.xml:330
 msgid "<emphasis>Do not touch ESP or MBR</emphasis>"
 msgstr "<emphasis>Rör inte ESP eller MBR</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:236
+#: en/setupBootloader.xml:332
 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 "
-"missing. Click<emphasis> Ok</emphasis> if you are sure you understand the "
-"implications, and wish to proceed."
+"missing. Click <guimenuitem>Ok </guimenuitem>only if you are sure you "
+"understand the implications, and wish to proceed."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><warning><para>
+#: en/setupBootloader.xml:338
+msgid ""
+"Chain-loading via legacy bootloaders (GRUB Legacy and LiLo)  is no longer "
+"supported by Mageia as it is likely to fail when attempting to boot this "
+"resulting installation of Mageia. If you use anything other than GRUB2 or "
+"rEFInd for this purpose, then you do so at your own risk!"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:245
+#: en/setupBootloader.xml:348
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png"
 "\"/> </imageobject>"
@@ -4111,17 +4265,17 @@ msgstr ""
 "\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:253
+#: en/setupBootloader.xml:356
 msgid "Other Options"
 msgstr "Fler alternativ"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:256
+#: en/setupBootloader.xml:359
 msgid "Using an existing bootloader"
 msgstr "Använder en befintlig startshanterare"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:258
+#: en/setupBootloader.xml:361
 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 "
@@ -4131,12 +4285,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:267
+#: en/setupBootloader.xml:370
 msgid "Installing Without a Bootloader"
 msgstr "Installera utan en uppstartshanterare"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:269
+#: en/setupBootloader.xml:372
 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 "
@@ -4481,3 +4635,27 @@ msgid ""
 "take a little while to complete. When it is finishing you will briefly get a "
 "blank screen - this is normal."
 msgstr ""
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> "
+#~ "</imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> "
+#~ "</imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4."
+#~ "png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4."
+#~ "png\"/> </imageobject>"
+
+#~ msgid "Grub2-efi on UEFI systems"
+#~ msgstr "Grub2-efi för ett UEFI-system."
diff --git a/docs/docs/stable/installer/tg.po b/docs/docs/stable/installer/tg.po
index a101428f..cbec27bc 100644
--- a/docs/docs/stable/installer/tg.po
+++ b/docs/docs/stable/installer/tg.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2019-01-19 21:23+0200\n"
+"POT-Creation-Date: 2019-09-08 15:26+0300\n"
 "PO-Revision-Date: 2019-01-19 19:25+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Tajik (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -139,7 +139,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/addUser.xml:3
+#: en/addUser.xml:9
 msgid "User Management"
 msgstr ""
 
@@ -149,46 +149,53 @@ msgstr ""
 #. 2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
 #.   Also changed 'Advanced User Management' to 'User Management (advanced)'.
 #. 2018/02/24 apb: Changed list style.
+#. 2019/08/10 apb: Added missing 'condition' profile for live-user1.png.
+#. 2019/08/11 apb: [1] Reword 1.1 (including Note) [2] Reword 1.2 Password text.
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:12
+#: en/addUser.xml:28
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
-"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
-"\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata format="
-"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-setRootPassword.png\" format=\"PNG\" revision=\"1\" xml:id="
+"\"setRootPassword-im1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-user1.png\" format=\"PNG\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:21
+#: en/addUser.xml:40
 msgid "Set Administrator (root)  Password:"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:24
+#: en/addUser.xml:44
 msgid ""
 "It is advisable for all Mageia installations to set a <literal>superuser</"
 "literal> (Administrator) password, usually called the <emphasis>root </"
-"emphasis>password in Linux. As you type a password into the top box a shield "
-"will change from red-to-yellow-to-green depending on the strength of the "
-"password. A green shield shows you are using a strong password. You need to "
-"repeat the same password in the box underneath, to check that the first "
-"entry was not mistyped."
+"emphasis>password in Linux. You need to repeat the same password in the box "
+"underneath, to check that the first entry was not mistyped."
+msgstr ""
+
+#. type: Content of: <section><section><note><para>
+#: en/addUser.xml:51
+msgid ""
+"As you type a password into the top box a shield will change from red-to-"
+"yellow-to-green depending on the strength of the password. A green shield "
+"shows you are using a strong password."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:32
+#: en/addUser.xml:55
 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:39
+#: en/addUser.xml:63
 msgid "Enter a user"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:41
+#: en/addUser.xml:66
 msgid ""
 "Add a User here. A regular user has fewer privileges than the "
 "<literal>superuser</literal> (root), but enough to use the Internet, office "
@@ -197,39 +204,39 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:47
+#: en/addUser.xml:73
 msgid "<emphasis role=\"bold\">Icon</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:48
+#: en/addUser.xml:75
 msgid "Click on this button if you want to change the user's icon"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:52
+#: en/addUser.xml:80
 msgid "<emphasis role=\"bold\">Real Name</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:53
+#: en/addUser.xml:82
 msgid "Insert the user's real name into this text box"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:56
+#: en/addUser.xml:86
 msgid "<emphasis role=\"bold\">Login Name</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:57
+#: en/addUser.xml:88
 msgid ""
 "Enter the user login name or let DrakX use a version of the user's real "
 "name. <emphasis role=\"bold\">The login name is case-sensitive.</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><caution><simpara>
-#: en/addUser.xml:61
+#: en/addUser.xml:93
 msgid ""
 "The login entered here should be different to any login currently in use for "
 "your <filename>/home</filename> directory. Some user parameters will be "
@@ -238,34 +245,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:65 en/setupBootloader.xml:124
+#: en/addUser.xml:102 en/setupBootloader.xml:182
 msgid "<emphasis role=\"bold\">Password</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:66
-msgid ""
-"Type in the user password. There is a shield at the end of the text box that "
-"indicates the strength of the password. (See also <xref linkend="
-"\"givePassword\"/>)"
+#: en/addUser.xml:104
+msgid "Type in the user password (remembering the advice in the Note above)."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:68
+#: en/addUser.xml:107
 msgid ""
 "<emphasis role=\"bold\">Password (again):</emphasis> Retype the user "
 "password. DrakX will check that you have not mistyped the password."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:74
+#: en/addUser.xml:114
 msgid ""
 "Any users added while installing Mageia, will have a home directory that is "
 "both read and write protected (umask=0027)"
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:76
+#: en/addUser.xml:117
 msgid ""
 "You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
@@ -273,24 +277,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:79
+#: en/addUser.xml:121
 msgid "The access permissions can also be changed after the install."
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:85
+#: en/addUser.xml:128
 msgid "User Management (advanced)"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:87
+#: en/addUser.xml:131
 msgid ""
 "The <emphasis>Advanced</emphasis> option allows you to edit further settings "
 "for the user you are adding."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:91
+#: en/addUser.xml:136
 msgid ""
 "<emphasis>Shell</emphasis>: This drop-down list allows you to change the "
 "shell available to any user you added in the previous screen. Options are "
@@ -298,7 +302,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:143
 msgid ""
 "<emphasis>User ID</emphasis>: Here you can set the user ID for any user you "
 "added in the previous screen. If you are unsure what the purpose of this is, "
@@ -306,7 +310,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:102
+#: en/addUser.xml:149
 msgid ""
 "<emphasis>Group ID</emphasis>: This lets you set the group ID.  Again, if "
 "unsure, leave it blank."
@@ -426,24 +430,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:23
+#: en/bootLive.xml:10
 msgid "Boot Mageia as Live system"
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:28
+#: en/bootLive.xml:14
 msgid "Booting the medium"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:31
+#: en/bootLive.xml:16
 msgid ""
 "You can boot directly from a Live DVD or USB. Usually, you just need to plug "
 "the USB device in or place the DVD in the drive and restart the computer."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:35
+#: en/bootLive.xml:19
 msgid ""
 "If the computer does not automatically boot from the USB or DVD you may need "
 "to reconfigure your BIOS Boot Disk priority. Alternatively, you might try "
@@ -452,7 +456,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><tip><para>
-#: en/bootLive.xml:41
+#: en/bootLive.xml:24
 msgid ""
 "To access the BIOS or boot menu when the computer is starting, you can try "
 "pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or <keycap>Esc</"
@@ -462,7 +466,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/bootLive.xml:50
+#: en/bootLive.xml:32
 msgid ""
 "The actual screen that you will first see when booting from the Live media "
 "will depend on whether your computer motherboard is of the Legacy (BIOS) or "
@@ -470,91 +474,91 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:58
+#: en/bootLive.xml:39
 msgid "In BIOS/CSM/Legacy mode"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:62
+#: en/bootLive.xml:42
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"../live-bootCSM.png\" align=\"center\"/> "
+"</imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:67
+#: en/bootLive.xml:46
 msgid "First screen while booting in BIOS mode"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><title>
-#: en/bootLive.xml:72 en/bootLive.xml:144 en/installer.xml:106
-#: en/installer.xml:154
+#: en/bootLive.xml:50 en/bootLive.xml:104 en/installer.xml:108
+#: en/installer.xml:156
 msgid "Menu"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:75 en/bootLive.xml:147
+#: en/bootLive.xml:52 en/bootLive.xml:106
 msgid "<emphasis role=\"bold\">Boot Mageia</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:77
+#: en/bootLive.xml:53
 msgid ""
 "This option will boot the Mageia Live system from the connected DVD/USB "
 "media (expect a very slow system compared to an installed OS)."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:81
+#: en/bootLive.xml:56
 msgid "Once the boot is done, you can proceed to the installation."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:86 en/bootLive.xml:102
+#: en/bootLive.xml:60 en/bootLive.xml:72
 msgid ""
 "<emphasis role=\"bold\">+ use non-free video drivers (slower to boot)</"
 "emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:89
+#: en/bootLive.xml:62
 msgid "Boot the Mageia Live system using non-free video drivers"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:96 en/bootLive.xml:155 en/installer.xml:109
+#: en/bootLive.xml:68 en/bootLive.xml:112 en/installer.xml:111
 msgid "<emphasis role=\"bold\">Install Mageia</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:98 en/bootLive.xml:157
+#: en/bootLive.xml:69 en/bootLive.xml:113
 msgid "This option will install Mageia to a hard disk."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:105
+#: en/bootLive.xml:74
 msgid "Install Mageia using non-free video drivers"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:111 en/installer.xml:125
+#: en/bootLive.xml:79 en/installer.xml:127
 msgid "<emphasis role=\"bold\">Memory Test</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:113 en/installer.xml:127
+#: en/bootLive.xml:80 en/installer.xml:129
 msgid ""
 "Test the installed RAM by performing multiple read and write operations. "
 "Reboot to end the test."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:118 en/bootLive.xml:161
+#: en/bootLive.xml:84 en/bootLive.xml:116
 msgid "<emphasis role=\"bold\"> F2 Language</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:120 en/bootLive.xml:163
+#: en/bootLive.xml:85 en/bootLive.xml:117
 msgid ""
 "Press <keycap>F2</keycap> to have the installer use a specific language "
 "during the installation. Use the arrow keys to select the language then "
@@ -562,24 +566,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:129
+#: en/bootLive.xml:93
 msgid "In UEFI mode"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:133
+#: en/bootLive.xml:96
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
-"format=\"PNG\" revision=\"1\" 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:139
+#: en/bootLive.xml:100
 msgid "First screen while booting in UEFI mode"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:149
+#: en/bootLive.xml:107
 msgid ""
 "This option will boot the Mageia Live system from the connected DVD/USB "
 "media (expect a very slow system compared to an installed OS).  Once the "
@@ -587,7 +591,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/bootLive.xml:170
+#: en/bootLive.xml:123
 msgid ""
 "If you booted from a USB stick, you will see the above menu options "
 "duplicated, and in this case, you should choose from the menu pair that will "
@@ -802,12 +806,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:24
+#: en/configureX_card_list.xml:27
 msgid "Choose an X Server (Configure your Graphic Card)"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_card_list.xml:29
+#: en/configureX_card_list.xml:32
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_card_list."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_card_list-im1\"/> </"
@@ -815,36 +819,36 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:35
+#: en/configureX_card_list.xml:38
 msgid ""
 "DrakX has a very comprehensive database of video cards and will usually "
 "correctly identify your video device."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:38
+#: en/configureX_card_list.xml:41
 msgid ""
 "If the installer has not correctly detected your graphic card and you know "
 "which one you have, you can select it from the tree by:"
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_card_list.xml:41 en/configureX_monitor.xml:74
+#: en/configureX_card_list.xml:44 en/configureX_monitor.xml:78
 msgid "Vendor"
 msgstr "Баранда"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:45
+#: en/configureX_card_list.xml:48
 msgid "then the make of your card"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:49
+#: en/configureX_card_list.xml:52
 msgid "and the model of card"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:53
+#: en/configureX_card_list.xml:56
 msgid ""
 "If you cannot find your card in the vendor lists (because it's not yet in "
 "the database or it's an older card) you may find a suitable driver in the "
@@ -855,14 +859,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><caution><para>
-#: en/configureX_card_list.xml:61
+#: en/configureX_card_list.xml:64
 msgid ""
 "Be aware that if you select an incompatible driver you may only have access "
 "to the <emphasis>Command Line Interface</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:65
+#: en/configureX_card_list.xml:68
 msgid ""
 "Some video card manufacturers provide proprietary drivers for Linux which "
 "may only be available in the <emphasis>Nonfree</emphasis> repository and in "
@@ -873,17 +877,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:11
-msgid "Graphic Card and Monitor Configuration"
+#: en/configureX_chooser.xml:23
+msgid "Graphics Card and Monitor Configuration"
 msgstr ""
 
-#.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
-#. 2018/02/15 apb: Some text and typography.
-#. 2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.
-#. 2018/02/23 apb: Typo.
-#. 2019/01/06 apb: Slight reword, split 1st para in two.
 #. type: Content of: <section><mediaobject>
-#: en/configureX_chooser.xml:26
+#: en/configureX_chooser.xml:28
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_chooser."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_chooser-im1\"/> </"
@@ -891,7 +890,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:32
+#: en/configureX_chooser.xml:34
 msgid ""
 "No matter which graphical environment (also known as desktop environment) "
 "you chose for this install of Mageia, they are all based on a graphical user "
@@ -902,31 +901,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:39
+#: en/configureX_chooser.xml:41
 msgid ""
 "Choose the appropriate settings manually if you think the details are "
 "incorrect, or if none are shown."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:44
-msgid "<emphasis role=\"bold\">Graphic Card</emphasis>"
+#: en/configureX_chooser.xml:46
+msgid "<emphasis role=\"bold\">Graphics Card</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:47
+#: en/configureX_chooser.xml:49
 msgid ""
 "If you need to, you can select a specific card from this expandable list. "
 "See <xref linkend=\"configureX_card_list\"/>."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:52
+#: en/configureX_chooser.xml:54
 msgid "<emphasis role=\"bold\">Monitor</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:55
+#: en/configureX_chooser.xml:57
 msgid ""
 "You can choose Plug 'n Play, if applicable, or choose your monitor from the "
 "<emphasis>Vendor</emphasis> or <emphasis>Generic</emphasis> lists. Choose "
@@ -936,22 +935,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:63
+#: en/configureX_chooser.xml:65
 msgid "<emphasis role=\"bold\">Resolution</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:66
+#: en/configureX_chooser.xml:68
 msgid "The resolution and color depth of your monitor can be set here."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:71
+#: en/configureX_chooser.xml:73
 msgid "<emphasis role=\"bold\">Test</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:74
+#: en/configureX_chooser.xml:76
 msgid ""
 "The test button does not always appear during install. If the option is "
 "there, and you test your settings, you should be asked to confirm that your "
@@ -963,17 +962,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:85
+#: en/configureX_chooser.xml:87
 msgid "<emphasis role=\"bold\">Options</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:88
+#: en/configureX_chooser.xml:90
 msgid "Here you can choose to enable or disable various options."
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_chooser.xml:93
+#: en/configureX_chooser.xml:95
 msgid ""
 "There is a risk of damaging a monitor if you choose refresh rates that are "
 "outside the frequency range of that monitor. This applies to older CRT "
@@ -982,19 +981,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_monitor.xml:22
+#: en/configureX_monitor.xml:26
 msgid "Choosing your Monitor"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:25
+#: en/configureX_monitor.xml:29
 msgid ""
 "DrakX has a very comprehensive database of monitors and will usually "
 "correctly identify yours."
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:30
+#: en/configureX_monitor.xml:34
 msgid ""
 "<emphasis role=\"bold\">Selecting a monitor with different characteristics "
 "could damage your monitor or video hardware. Please don't try something "
@@ -1003,7 +1002,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:38
+#: en/configureX_monitor.xml:42
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
@@ -1011,12 +1010,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:46
+#: en/configureX_monitor.xml:50
 msgid "Custom"
 msgstr "Интихобӣ"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:49
+#: en/configureX_monitor.xml:53
 msgid ""
 "This option allows you to set two critical parameters: the vertical refresh "
 "rate and the horizontal sync rate. Vertical refresh determines how often the "
@@ -1025,7 +1024,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:55
+#: en/configureX_monitor.xml:59
 msgid ""
 "It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor "
 "type with a sync range that is beyond the capabilities of your monitor: you "
@@ -1034,56 +1033,56 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:64
+#: en/configureX_monitor.xml:68
 msgid "Plug'n Play"
 msgstr "Plug'n Play"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:67
+#: en/configureX_monitor.xml:71
 msgid ""
 "This is the default option and automatically tries to determine the monitor "
 "type from the monitor database."
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:77
+#: en/configureX_monitor.xml:81
 msgid ""
 "If the installer has not correctly detected your monitor and you know which "
-"one you have, you can select it from the tree by selecting:"
+"one you have, you can choose it from the options by selecting:"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:86
+#: en/configureX_monitor.xml:90
 msgid "Manufacturer"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:90
+#: en/configureX_monitor.xml:94
 msgid "Monitor model"
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:96
+#: en/configureX_monitor.xml:100
 msgid "Generic"
 msgstr "Одатӣ"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:99
+#: en/configureX_monitor.xml:103
 msgid ""
-"Selecting this group will list nearly 30 display configurations such as "
-"1024x768 @ 60Hz and includes flat-panel displays as used in laptops. This is "
-"often a good monitor selection group if you need to use the VESA card driver "
-"when your video hardware cannot be determined automatically.  Once again it "
-"may be wise to be conservative in your selections."
+"Selecting this group will list approximately 30 display configurations such "
+"as 1024x768 @ 60Hz and includes flat-panel displays as used in laptops.  "
+"This is often a good monitor selection group if you need to use the VESA "
+"card driver when your video hardware cannot be determined automatically. "
+"Once again, it may be wise to be conservative in your selections."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:22
+#: en/diskdrake.xml:24
 msgid "Custom Disk Partitioning with DiskDrake"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:27
+#: en/diskdrake.xml:29
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-diskdrake.png\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1091,7 +1090,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:38
+#: en/diskdrake.xml:40
 msgid ""
 "Modify the layout of your disk(s) here. You can remove or create partitions, "
 "change the filesystem or size of a partition and even view their details "
@@ -1099,15 +1098,15 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:47
 msgid ""
 "There is a tab at the top for every detected hard disk (or other storage "
-"device, like a USB key). In the screenshot above there are two available "
-"devices: <filename>sda </filename>and <filename>sdb</filename>."
+"device, like a USB key), for example: <filename>sda</filename>, "
+"<filename>sdb</filename>, <filename>sdc</filename> etc."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:52
+#: en/diskdrake.xml:54
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it. "
@@ -1116,21 +1115,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:60
+#: en/diskdrake.xml:62
 msgid ""
 "Continue until you have adjusted everything to your satisfaction, then click "
 "<emphasis>Done</emphasis> when you're ready."
 msgstr ""
 
 #. type: Content of: <section><warning><orderedlist><listitem><para>
-#: en/diskdrake.xml:69
+#: en/diskdrake.xml:71
 msgid ""
 "Take care with the <emphasis>Clear all</emphasis> option, use it only if you "
 "are sure you want to wipe all partitions on the selected storage device."
 msgstr ""
 
 #. type: Content of: <section><warning><orderedlist><listitem><para>
-#: en/diskdrake.xml:75
+#: en/diskdrake.xml:77
 msgid ""
 "If you wish to use encryption on your <filename>/</filename> partition you "
 "must ensure that you have a separate <filename>/boot</filename> partition. "
@@ -1139,7 +1138,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/diskdrake.xml:87
+#: en/diskdrake.xml:89
 msgid ""
 "If you are installing Mageia on a UEFI system, check that an ESP (EFI System "
 "Partition) is present and correctly mounted on <filename>/boot/EFI</"
@@ -1147,19 +1146,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/diskdrake.xml:93
+#: en/diskdrake.xml:95
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
 "partition is present and of the correct type. See Figure 2 below."
 msgstr ""
 
 #. type: Content of: <section><figure><title>
-#: en/diskdrake.xml:101
+#: en/diskdrake.xml:103
 msgid "EFI System Partition"
 msgstr ""
 
 #. type: Content of: <section><figure><mediaobject>
-#: en/diskdrake.xml:104
+#: en/diskdrake.xml:106
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-diskdrake2.png\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1167,17 +1166,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><figure>
-#: en/diskdrake.xml:103 en/diskdrake.xml:117
+#: en/diskdrake.xml:105 en/diskdrake.xml:119
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <section><figure><title>
-#: en/diskdrake.xml:115
+#: en/diskdrake.xml:117
 msgid "BIOS boot partition"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:118 en/doPartitionDisks.xml:201
+#: en/diskdrake.xml:120 en/doPartitionDisks.xml:206
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1196,26 +1195,26 @@ msgid "Partitioning"
 msgstr "Ҷузъбандӣ"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:31
 msgid "Suggested Partitioning"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:34
 msgid ""
 "In this screen you can see the content of your hard drive(s) along with the "
 "DrakX partitioning proposals for where to install Mageia."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:34
+#: en/doPartitionDisks.xml:38
 msgid ""
 "The actual options available from those shown below will vary according to "
 "the layout and content of your particular hard drive(s)."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:39
+#: en/doPartitionDisks.xml:43
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1224,111 +1223,116 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><title>
-#: en/doPartitionDisks.xml:49
+#: en/doPartitionDisks.xml:53
 msgid "Main Options"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:56
 msgid "<emphasis role=\"bold\">Use Existing Partitions</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:59
 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><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:61
+#: en/doPartitionDisks.xml:65
 msgid "<emphasis role=\"bold\">Use Free Space</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:68
 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><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:70
+#: en/doPartitionDisks.xml:74
 msgid ""
 "<emphasis role=\"bold\">Use Free Space on a Windows Partition</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:73
+#: en/doPartitionDisks.xml:77
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it. 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 important files!"
+"installation but see the warning below."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para><mediaobject>
+#: en/doPartitionDisks.xml:87
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:79
+#: en/doPartitionDisks.xml:82
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
 "light blue and the proposed Mageia partition in dark blue with their "
 "intended sizes just underneath. You have the option to modify these sizes by "
 "clicking and dragging the gap between both partitions.  See the following "
-"screenshot:"
+"screenshot:<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><warning><para>
+#: en/doPartitionDisks.xml:97
+msgid ""
+"This involves shrinking the size of the Windows partition, and therefore is "
+"a risky operation, so you should make sure you have backed up all important "
+"files before proceeding."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><important><para>
+#: en/doPartitionDisks.xml:103
+msgid ""
+"The partition must be \"clean\", meaning that Windows must have closed down "
+"correctly the last time it was used. It must also have been defragmented, "
+"although this is not a guarantee that all files in the partition have been "
+"moved out of the area that is about to be used for Mageia."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:87
+#: en/doPartitionDisks.xml:112
 msgid "<emphasis role=\"bold\">Erase and use Entire Disk</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:90
+#: en/doPartitionDisks.xml:115
 msgid "This option will allocate the entire drive for Mageia"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:119
 msgid ""
 "This will erase ALL data on the selected hard drive. Take care! 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 this option."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><important><para>
-#: en/doPartitionDisks.xml:101
-msgid ""
-"Note that this involves shrinking the size of the Windows partition. The "
-"partition must be \"clean\", meaning that Windows must have closed down "
-"correctly the last time it was used. It must also have been defragmented, "
-"although this is not a guarantee that all files in the partition have been "
-"moved out of the area that is about to be used. It is highly recommended to "
-"back up your personal files."
-msgstr ""
-
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:112
+#: en/doPartitionDisks.xml:127
 msgid "<emphasis role=\"bold\">Custom Disk Partitioning</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:115
+#: en/doPartitionDisks.xml:130
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
 msgstr ""
 
-#. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:122
-msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
-msgstr ""
-
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:131
+#: en/doPartitionDisks.xml:136
 msgid ""
 "If you are not using the <emphasis>Custom disk partitioning</emphasis> "
 "option, then the installer will allocate the available space according to "
@@ -1336,60 +1340,60 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:137
+#: en/doPartitionDisks.xml:142
 msgid ""
 "If the total available space is less than 50 GB, then only one partition is "
 "created. This will be the <filename>/</filename> (root)  partition."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:143
+#: en/doPartitionDisks.xml:148
 msgid ""
 "If the total available space is greater than 50 GB, then three partitions "
 "are created"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:148
+#: en/doPartitionDisks.xml:153
 msgid ""
 "6/19 of the total available place is allocated to <filename>/</filename> "
 "with a maximum of 50 GB"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:153
+#: en/doPartitionDisks.xml:158
 msgid "1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:158
+#: en/doPartitionDisks.xml:163
 msgid "the rest (at least 12/19) is allocated to <filename>/home</filename>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:165
+#: en/doPartitionDisks.xml:170
 msgid ""
 "This means that from 160 GB or greater available space, the installer will "
 "create three partitions:"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:170
+#: en/doPartitionDisks.xml:175
 msgid "50 GB for <filename>/</filename>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:174
+#: en/doPartitionDisks.xml:179
 msgid "4 GB for <filename>swap</filename>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:178
+#: en/doPartitionDisks.xml:183
 msgid "and the remainder for <filename>/home</filename>"
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:183
+#: en/doPartitionDisks.xml:188
 msgid ""
 "If you are using a UEFI system, the ESP (EFI System Partition) will be "
 "automatically detected - or created if it does not exist yet - and mounted "
@@ -1399,7 +1403,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:189
+#: en/doPartitionDisks.xml:194
 msgid ""
 "If you are using a Legacy (also known as BIOS) system with a GPT partitioned "
 "disk, you need to create a BIOS boot partition if it doesn't already exist. "
@@ -1410,19 +1414,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:196
+#: en/doPartitionDisks.xml:201
 msgid "See <xref linkend=\"diskdrake\"/> for information on how to proceed."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:211
+#: en/doPartitionDisks.xml:216
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4.png"
-"\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks4.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks4.png\"/> </"
+"imageobject>"
 msgstr ""
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:217
+#: en/doPartitionDisks.xml:226
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
 "previous standard of 512. Due to lack of available hardware, the "
@@ -1431,7 +1437,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:222
+#: en/doPartitionDisks.xml:231
 msgid ""
 "Some SSD devices now use an erase block size over 1 MB. If you have such a "
 "device we suggest that you partition the drive in advance, using an "
@@ -1440,17 +1446,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:229
+#: en/doPartitionDisks.xml:238
 msgid "<emphasis>Align to</emphasis> = MiB"
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:233
+#: en/doPartitionDisks.xml:242
 msgid "<emphasis>Free space preceding (MiB)</emphasis> = 2"
 msgstr ""
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:237
+#: en/doPartitionDisks.xml:246
 msgid ""
 "Also make sure all partitions are created using an even number of megabytes."
 msgstr ""
@@ -1620,12 +1626,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/firewall.xml:7
+#: en/firewall.xml:16
 msgid "Firewall"
 msgstr "Девори оташ"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:10
+#: en/firewall.xml:19
 msgid ""
 "This section allows you to configure some simple firewall rules: they "
 "determine which type of message from the Internet will be accepted by the "
@@ -1633,8 +1639,15 @@ msgid ""
 "system to be accessible from the Internet."
 msgstr ""
 
+#. type: Content of: <section><mediaobject>
+#: en/firewall.xml:26
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-firewall.png\"/> </"
+"imageobject>"
+msgstr ""
+
 #. type: Content of: <section><para>
-#: en/firewall.xml:16
+#: en/firewall.xml:31
 msgid ""
 "In the default setting (no button is checked), no service of the system is "
 "accessible from the network. The <emphasis>Everything (no firewall)</"
@@ -1647,7 +1660,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:25
+#: en/firewall.xml:40
 msgid ""
 "All other options are more or less self-explanatory. As an example, you will "
 "enable the CUPS server if you want printers on your machine to be accessible "
@@ -1655,12 +1668,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:29
+#: en/firewall.xml:44
 msgid "<emphasis role=\"bold\">Advanced</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:31
+#: en/firewall.xml:46
 msgid ""
 "The <emphasis>Advanced</emphasis> option opens a window where you can enable "
 "a series of services by typing a list of <quote>couples</quote> (blank "
@@ -1668,34 +1681,35 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:35
-msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
+#: en/firewall.xml:50
+msgid "<emphasis>&lt;port-number&gt;/&lt;protocol&gt;</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:38
+#: en/firewall.xml:53
 msgid ""
-"- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
-"the service you want to enable (e.g. 873 for the RSYNC service) as defined "
-"in <emphasis>RFC-433</emphasis>;"
+"- <emphasis>&lt;port-number&gt;</emphasis> is the value of the port assigned "
+"to the service you want to enable (e.g. 873 for the RSYNC service) as "
+"defined in <emphasis>RFC-433</emphasis>;"
 msgstr ""
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:42
+#: en/firewall.xml:57
 msgid ""
-"- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
-"<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
+"- <emphasis>&lt;protocol&gt;</emphasis> is one of <emphasis>TCP</emphasis> "
+"or <emphasis>UDP</emphasis> - the internet protocol that is used by the "
+"service."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:47
+#: en/firewall.xml:62
 msgid ""
 "For instance, the entry for enabling access to the RSYNC service therefore "
 "is <emphasis>873/tcp</emphasis>."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:50
+#: en/firewall.xml:65
 msgid ""
 "In case a service is implemented to use both protocols, you specify 2 "
 "couples for the same port."
@@ -1763,12 +1777,12 @@ msgid "Graphical Configuration"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:32
+#: en/installer.xml:34
 msgid "DrakX, the Mageia Installer"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/installer.xml:35
+#: en/installer.xml:37
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -1776,33 +1790,33 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:40
+#: en/installer.xml:42
 msgid "The installation steps"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:44
+#: en/installer.xml:46
 msgid ""
 "The install process is divided into a number of steps - the status of which "
 "is indicated in a panel to the left of the screen."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:50
+#: en/installer.xml:52
 msgid ""
 "Each step has one or more screens, which may also have <emphasis>Advanced</"
 "emphasis> sections with extra, less commonly required options."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:56
+#: en/installer.xml:58
 msgid ""
 "Most screens have <emphasis>Help</emphasis> buttons for further details "
 "about the particular step."
 msgstr ""
 
 #. type: Content of: <section><section><caution><para>
-#: en/installer.xml:62
+#: en/installer.xml:64
 msgid ""
 "If at some point during the install you decide to abort the installation, it "
 "is possible to reboot, but please think twice before you do this. Once a "
@@ -1812,7 +1826,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><caution><para>
-#: en/installer.xml:68
+#: en/installer.xml:70
 msgid ""
 "If, in spite of this, you are very sure rebooting is what you want, go to a "
 "text terminal by pressing the keys <keycombo> <keycap>Ctrl</keycap> "
@@ -1822,12 +1836,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:86
+#: en/installer.xml:88
 msgid "Installation Welcome Screen"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:88
+#: en/installer.xml:90
 msgid ""
 "The particular screen that you will first see when booting from the "
 "Installation media will depend on whether your computer motherboard is of "
@@ -1835,60 +1849,60 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:92
+#: en/installer.xml:94
 msgid ""
 "The welcome menu screen has various options, however the default option will "
 "start the installer, and is normally all that you will need."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:97
+#: en/installer.xml:99
 msgid "Legacy (BIOS) Systems"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:100
+#: en/installer.xml:102
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome.png\"/> </"
 "imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:111
+#: en/installer.xml:113
 msgid ""
 "Install Mageia to a hard disk. This is the default option, and will "
 "automatically start after a short while unless another option is selected."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:117
+#: en/installer.xml:119
 msgid "<emphasis role=\"bold\">Rescue System</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:119
+#: en/installer.xml:121
 msgid ""
 "This option allows you to either re-install the bootloader for an existing "
 "Mageia installation or you can use it to restore a Windows bootloader."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:132
+#: en/installer.xml:134
 msgid "<emphasis role=\"bold\">F2: Language</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:134
+#: en/installer.xml:136
 msgid "Press F2 for alternative languages."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:140
+#: en/installer.xml:142
 msgid "UEFI Systems"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:142
+#: en/installer.xml:144
 msgid ""
 "From this screen, you can access options by pressing <keycap>e</keycap> to "
 "enter the edit mode. To come back to this screen, press <keycap>Esc</keycap> "
@@ -1896,19 +1910,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:148
+#: en/installer.xml:150
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome2.png\"/> </"
 "imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:157
+#: en/installer.xml:159
 msgid "<emphasis role=\"bold\">Install:</emphasis> Start the Install process"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:162
+#: en/installer.xml:164
 msgid ""
 "<emphasis role=\"bold\">Rescue:</emphasis> This option allows you to either "
 "re-install the bootloader for an existing Mageia installation or you can use "
@@ -1916,31 +1930,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:169
+#: en/installer.xml:171
 msgid ""
 "<emphasis role=\"bold\">F2: Language:</emphasis> Press <keycap>F2</keycap> "
 "for alternative languages."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:174
+#: en/installer.xml:176
 msgid ""
 "If you booted from a USB stick, you will see the above options duplicated, "
 "and in this case, you should use the set that will be suffixed with \"USB\"."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:181
+#: en/installer.xml:183
 msgid "Installation Problems and Possible Solutions"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:184
+#: en/installer.xml:186
 msgid "No Graphical Interface"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:188
+#: en/installer.xml:190
 msgid ""
 "After the initial screen you did not progress to the <emphasis>Language "
 "Selection</emphasis> screen. This can happen with some graphic cards and "
@@ -1949,7 +1963,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:195
+#: en/installer.xml:197
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
 "In this case it is worth trying a text-mode installation. To use this press "
@@ -1960,12 +1974,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:208
+#: en/installer.xml:210
 msgid "The Install Freezes"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:210
+#: en/installer.xml:212
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic hardware "
@@ -1975,12 +1989,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:218
+#: en/installer.xml:220
 msgid "RAM problem"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:220
+#: en/installer.xml:222
 msgid ""
 "This will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
@@ -1990,12 +2004,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:228
+#: en/installer.xml:230
 msgid "Dynamic partitions"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:230
+#: en/installer.xml:232
 msgid ""
 "If you converted your hard disk from <literal>Basic</literal> format to "
 "<literal>Dynamic</literal> format in Microsoft Windows, then it is not "
@@ -3579,73 +3593,106 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:27
+#: en/setupBootloader.xml:32
 msgid "Bootloader"
 msgstr "Корандози худборшав"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:31
+#: en/setupBootloader.xml:36
+#, fuzzy
+msgid "Available Bootloaders"
+msgstr "Корандози худборшав"
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:39
 msgid "Grub2"
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><title>
-#: en/setupBootloader.xml:34
-msgid "Grub2 on Legacy MBR/GPT systems"
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:42
+msgid "<emphasis role=\"bold\">Grub2 on Legacy MBR/GPT systems</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:37
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:46
 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:42
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:52
 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:49
-msgid "Grub2-efi on UEFI systems"
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:59
+msgid "<emphasis role=\"bold\">Grub2-efi on UEFI systems</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:52
-msgid "GRUB2-efi will be used exclusively as the bootloader for a UEFI system."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:63
+msgid "GRUB2-efi or rEFInd may be used as the bootloader for a UEFI system."
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:57
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:68
 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:60
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:71
 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 "
-"created by Windows and add grub2-efi to it. If no ESP exists, then one will "
+"created by Windows and add grub2-efi to it.  If no ESP exists, then one will "
 "be created. Although it is possible to have several ESPs, only one is "
 "required, whatever the number of operating systems you have."
 msgstr ""
 
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:82
+msgid "rEFInd"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:85
+msgid "<emphasis role=\"bold\">rEFInd on UEFI systems</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:88
+msgid ""
+"rEFInd has a nice graphical set of options, and can auto-detect installed "
+"EFI bootloaders. See: http://www.rodsbooks.com/refind/"
+msgstr ""
+
+#. type: Content of: <section><section><section><note><para>
+#: en/setupBootloader.xml:95
+msgid ""
+"Please note that in order to be able to use the <literal>rEFInd</literal> "
+"option, an installed EFI System Partition must match your system "
+"architecture: if you have a 32bit EFI System Partition installed on a 64bit "
+"machine for instance, then the rEFInd option will not be displayed/available "
+"to you."
+msgstr ""
+
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:72
+#: en/setupBootloader.xml:106
 msgid "Bootloader Setup"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:76
+#: en/setupBootloader.xml:110
 msgid "Bootloader main options"
 msgstr "Хосиятҳои асосии корандози худборшав"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:79
+#: en/setupBootloader.xml:113
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader.png\"/> </imageobject> <imageobject condition=\"live"
@@ -3654,47 +3701,69 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:91
+#: en/setupBootloader.xml:125
 msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:93
+#. type: Content of: <section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:129
+msgid ""
+"<guimenuitem>GRUB2</guimenuitem> (with either a graphical or a text menu), "
+"can be chosen for both <literal>Legacy MBR/BIOS</literal> systems and "
+"<literal>UEFI</literal> systems."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:136
 msgid ""
-"This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI "
-"systems will not see this option here."
+"<guimenuitem>rEFInd</guimenuitem> (with a graphical menu)  is an alternative "
+"option solely for use with <literal>UEFI</literal> systems."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:98
+#: en/setupBootloader.xml:144
 msgid "<emphasis role=\"bold\">Boot device</emphasis>"
 msgstr ""
 
+#. type: Content of: <section><section><section><itemizedlist><listitem><warning><para>
+#: en/setupBootloader.xml:147
+msgid "Don't change this unless you really know what you are doing."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><note><para>
+#: en/setupBootloader.xml:152
+msgid ""
+"There is no option to write GRUB to the boot sector of a partition (e.g: "
+"<filename>sda1</filename>), as this method is considered unreliable."
+msgstr ""
+
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:100
-msgid "Don't change this unless you really know what you are doing"
+#: en/setupBootloader.xml:157
+msgid ""
+"When using UEFI mode, then the <guilabel>Boot device</guilabel> will be "
+"listed as <guimenuitem>EFI System Partition</guimenuitem>."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:105
+#: en/setupBootloader.xml:163
 msgid ""
 "<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:108
+#: en/setupBootloader.xml:166
 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:113
+#: en/setupBootloader.xml:171
 msgid "<emphasis role=\"bold\">Security</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:115
+#: en/setupBootloader.xml:173
 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 "
@@ -3704,34 +3773,34 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:126
+#: en/setupBootloader.xml:184
 msgid "Choose a password for the bootloader (optional)"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:130
+#: en/setupBootloader.xml:188
 msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:132
+#: en/setupBootloader.xml:190
 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:137 en/setupBootloader.xml:212
+#: en/setupBootloader.xml:195 en/setupBootloader.xml:308
 msgid "<emphasis>Advanced</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:141
+#: en/setupBootloader.xml:199
 msgid "<emphasis>Enable ACPI</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:143
+#: en/setupBootloader.xml:201
 msgid ""
 "ACPI (Advanced Configuration and Power Interface) is a standard for power "
 "management. It can save energy by stopping unused devices. Deselecting it "
@@ -3741,24 +3810,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:152
+#: en/setupBootloader.xml:210
 msgid "<emphasis>Enable SMP</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:154
+#: en/setupBootloader.xml:212
 msgid ""
 "This option enables/disables symmetric multiprocessing for multi-core "
 "processors"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:159
+#: en/setupBootloader.xml:217
 msgid "<emphasis>Enable APIC</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:161
+#: en/setupBootloader.xml:219
 msgid ""
 "Enabling this gives the operating system access to the Advanced Programmable "
 "Interrupt Controller. APIC devices permit more complex priority models, and "
@@ -3766,24 +3835,77 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:168
+#: en/setupBootloader.xml:226
 msgid "<emphasis>Enable Local APIC</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:170
+#: en/setupBootloader.xml:228
 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:177
+#: en/setupBootloader.xml:235
 msgid "Bootloader Configuration"
 msgstr ""
 
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:237
+msgid ""
+"If, in the previous section you selected <literal>rEFInd</literal> as the "
+"bootloader to use, you would then be presented with the options shown in the "
+"screenshot directly below. Otherwise, please instead move on to the "
+"subsequent screenshot for your options."
+msgstr ""
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:243
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"rEFIndLoaderConfig.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-rEFIndLoaderConfig.png\"/> </"
+"imageobject>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:253
+#, fuzzy
+msgid "Your rEFInd configuration options:"
+msgstr "Танзимкунии садо"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:256
+msgid ""
+"<guimenuitem>Install or update rEFInd in the EFI system partition.</"
+"guimenuitem>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:261
+msgid ""
+"<guimenuitem>Install in EFI/Boot partition (workaround for some BIOS's).</"
+"guimenuitem>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:264
+msgid ""
+"With some BIOS's, the newly written bootloaser for Mageia at end of the "
+"installation will not be recognized. In that case, you can use this option "
+"as a workaround for the issue."
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:270
+msgid ""
+"If you did not select rEFInd as the bootloader to use in the previous "
+"section, then your bootloader configurations are shown below:"
+msgstr ""
+
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:180
+#: en/setupBootloader.xml:275
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -3792,42 +3914,42 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:191
+#: en/setupBootloader.xml:286
 msgid "<emphasis role=\"bold\">Default</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:193
+#: en/setupBootloader.xml:288
 msgid "The operating system to be started up by default."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:197
+#: en/setupBootloader.xml:292
 msgid "<emphasis role=\"bold\">Append</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:199
+#: en/setupBootloader.xml:294
 msgid ""
 "This option lets you pass information to the kernel 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:204
+#: en/setupBootloader.xml:299
 msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:206
+#: en/setupBootloader.xml:301
 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, "
-"then untick the Probe Foreign OS option."
+"then untick the <guimenuitem>Probe Foreign OS</guimenuitem> option."
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:215
+#: en/setupBootloader.xml:311
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader4.png\"/> </imageobject> <imageobject condition=\"live"
@@ -3836,12 +3958,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:226
+#: en/setupBootloader.xml:322
 msgid "<emphasis>Video mode</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:228
+#: en/setupBootloader.xml:324
 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 "
@@ -3849,38 +3971,47 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:234
+#: en/setupBootloader.xml:330
 msgid "<emphasis>Do not touch ESP or MBR</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:236
+#: en/setupBootloader.xml:332
 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 "
-"missing. Click<emphasis> Ok</emphasis> if you are sure you understand the "
-"implications, and wish to proceed."
+"missing. Click <guimenuitem>Ok </guimenuitem>only if you are sure you "
+"understand the implications, and wish to proceed."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><warning><para>
+#: en/setupBootloader.xml:338
+msgid ""
+"Chain-loading via legacy bootloaders (GRUB Legacy and LiLo)  is no longer "
+"supported by Mageia as it is likely to fail when attempting to boot this "
+"resulting installation of Mageia. If you use anything other than GRUB2 or "
+"rEFInd for this purpose, then you do so at your own risk!"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:245
+#: en/setupBootloader.xml:348
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png"
 "\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:253
+#: en/setupBootloader.xml:356
 msgid "Other Options"
 msgstr "Имконоти дигар"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:256
+#: en/setupBootloader.xml:359
 msgid "Using an existing bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:258
+#: en/setupBootloader.xml:361
 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 "
@@ -3890,12 +4021,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:267
+#: en/setupBootloader.xml:370
 msgid "Installing Without a Bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:269
+#: en/setupBootloader.xml:372
 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 "
diff --git a/docs/docs/stable/installer/tr.po b/docs/docs/stable/installer/tr.po
index fec24408..1f8bf509 100644
--- a/docs/docs/stable/installer/tr.po
+++ b/docs/docs/stable/installer/tr.po
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2019-01-19 21:23+0200\n"
+"POT-Creation-Date: 2019-09-08 15:26+0300\n"
 "PO-Revision-Date: 2019-06-02 21:37+0000\n"
 "Last-Translator: Cenk Yıldızlı <goncagul@national.shitposting.agency>\n"
 "Language-Team: Turkish (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -165,7 +165,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/addUser.xml:3
+#: en/addUser.xml:9
 msgid "User Management"
 msgstr ""
 
@@ -175,13 +175,16 @@ msgstr ""
 #. 2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
 #.   Also changed 'Advanced User Management' to 'User Management (advanced)'.
 #. 2018/02/24 apb: Changed list style.
+#. 2019/08/10 apb: Added missing 'condition' profile for live-user1.png.
+#. 2019/08/11 apb: [1] Reword 1.1 (including Note) [2] Reword 1.2 Password text.
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:12
+#: en/addUser.xml:28
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
-"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
-"\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata format="
-"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-setRootPassword.png\" format=\"PNG\" revision=\"1\" xml:id="
+"\"setRootPassword-im1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-user1.png\" format=\"PNG\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
 "\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -189,36 +192,41 @@ msgstr ""
 "\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:21
+#: en/addUser.xml:40
 msgid "Set Administrator (root)  Password:"
 msgstr "Yönetici (kök) Parolasını Ayarlayın:"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:24
+#: en/addUser.xml:44
 msgid ""
 "It is advisable for all Mageia installations to set a <literal>superuser</"
 "literal> (Administrator) password, usually called the <emphasis>root </"
-"emphasis>password in Linux. As you type a password into the top box a shield "
-"will change from red-to-yellow-to-green depending on the strength of the "
-"password. A green shield shows you are using a strong password. You need to "
-"repeat the same password in the box underneath, to check that the first "
-"entry was not mistyped."
+"emphasis>password in Linux. You need to repeat the same password in the box "
+"underneath, to check that the first entry was not mistyped."
+msgstr ""
+
+#. type: Content of: <section><section><note><para>
+#: en/addUser.xml:51
+msgid ""
+"As you type a password into the top box a shield will change from red-to-"
+"yellow-to-green depending on the strength of the password. A green shield "
+"shows you are using a strong password."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:32
+#: en/addUser.xml:55
 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:39
+#: en/addUser.xml:63
 msgid "Enter a user"
 msgstr "Bir kullanıcı girin"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:41
+#: en/addUser.xml:66
 msgid ""
 "Add a User here. A regular user has fewer privileges than the "
 "<literal>superuser</literal> (root), but enough to use the Internet, office "
@@ -227,39 +235,39 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:47
+#: en/addUser.xml:73
 msgid "<emphasis role=\"bold\">Icon</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:48
+#: en/addUser.xml:75
 msgid "Click on this button if you want to change the user's icon"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:52
+#: en/addUser.xml:80
 msgid "<emphasis role=\"bold\">Real Name</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:53
+#: en/addUser.xml:82
 msgid "Insert the user's real name into this text box"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:56
+#: en/addUser.xml:86
 msgid "<emphasis role=\"bold\">Login Name</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:57
+#: en/addUser.xml:88
 msgid ""
 "Enter the user login name or let DrakX use a version of the user's real "
 "name. <emphasis role=\"bold\">The login name is case-sensitive.</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><caution><simpara>
-#: en/addUser.xml:61
+#: en/addUser.xml:93
 msgid ""
 "The login entered here should be different to any login currently in use for "
 "your <filename>/home</filename> directory. Some user parameters will be "
@@ -268,34 +276,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:65 en/setupBootloader.xml:124
+#: en/addUser.xml:102 en/setupBootloader.xml:182
 msgid "<emphasis role=\"bold\">Password</emphasis>"
 msgstr "<emphasis role=\"bold\">Şifre</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:66
-msgid ""
-"Type in the user password. There is a shield at the end of the text box that "
-"indicates the strength of the password. (See also <xref linkend="
-"\"givePassword\"/>)"
+#: en/addUser.xml:104
+msgid "Type in the user password (remembering the advice in the Note above)."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:68
+#: en/addUser.xml:107
 msgid ""
 "<emphasis role=\"bold\">Password (again):</emphasis> Retype the user "
 "password. DrakX will check that you have not mistyped the password."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:74
+#: en/addUser.xml:114
 msgid ""
 "Any users added while installing Mageia, will have a home directory that is "
 "both read and write protected (umask=0027)"
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:76
+#: en/addUser.xml:117
 msgid ""
 "You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
@@ -303,24 +308,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:79
+#: en/addUser.xml:121
 msgid "The access permissions can also be changed after the install."
 msgstr "Erişim izinleri kurulumdan sonra da değiştirilebilir."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:85
+#: en/addUser.xml:128
 msgid "User Management (advanced)"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:87
+#: en/addUser.xml:131
 msgid ""
 "The <emphasis>Advanced</emphasis> option allows you to edit further settings "
 "for the user you are adding."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:91
+#: en/addUser.xml:136
 msgid ""
 "<emphasis>Shell</emphasis>: This drop-down list allows you to change the "
 "shell available to any user you added in the previous screen. Options are "
@@ -328,7 +333,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:143
 msgid ""
 "<emphasis>User ID</emphasis>: Here you can set the user ID for any user you "
 "added in the previous screen. If you are unsure what the purpose of this is, "
@@ -336,7 +341,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:102
+#: en/addUser.xml:149
 msgid ""
 "<emphasis>Group ID</emphasis>: This lets you set the group ID.  Again, if "
 "unsure, leave it blank."
@@ -456,24 +461,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:23
+#: en/bootLive.xml:10
 msgid "Boot Mageia as Live system"
 msgstr "Mageia' yı ÇalışanCD Sistemi olarak başlatmak"
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:28
+#: en/bootLive.xml:14
 msgid "Booting the medium"
 msgstr "Kurulum ortamını başlatmak"
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:31
+#: en/bootLive.xml:16
 msgid ""
 "You can boot directly from a Live DVD or USB. Usually, you just need to plug "
 "the USB device in or place the DVD in the drive and restart the computer."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:35
+#: en/bootLive.xml:19
 msgid ""
 "If the computer does not automatically boot from the USB or DVD you may need "
 "to reconfigure your BIOS Boot Disk priority. Alternatively, you might try "
@@ -482,7 +487,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><tip><para>
-#: en/bootLive.xml:41
+#: en/bootLive.xml:24
 msgid ""
 "To access the BIOS or boot menu when the computer is starting, you can try "
 "pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or <keycap>Esc</"
@@ -492,7 +497,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/bootLive.xml:50
+#: en/bootLive.xml:32
 msgid ""
 "The actual screen that you will first see when booting from the Live media "
 "will depend on whether your computer motherboard is of the Legacy (BIOS) or "
@@ -500,91 +505,93 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:58
+#: en/bootLive.xml:39
 msgid "In BIOS/CSM/Legacy mode"
 msgstr "BIOS/CSM/Legacy kipinde"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:62
+#: en/bootLive.xml:42
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"../live-bootCSM.png\" align=\"center\"/> "
+"</imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:67
+#: en/bootLive.xml:46
 msgid "First screen while booting in BIOS mode"
 msgstr "BIOS kipinde önyükleme yapılırken ilk ekran"
 
 #. type: Content of: <section><section><section><itemizedlist><title>
-#: en/bootLive.xml:72 en/bootLive.xml:144 en/installer.xml:106
-#: en/installer.xml:154
+#: en/bootLive.xml:50 en/bootLive.xml:104 en/installer.xml:108
+#: en/installer.xml:156
 msgid "Menu"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:75 en/bootLive.xml:147
+#: en/bootLive.xml:52 en/bootLive.xml:106
 msgid "<emphasis role=\"bold\">Boot Mageia</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:77
+#: en/bootLive.xml:53
 msgid ""
 "This option will boot the Mageia Live system from the connected DVD/USB "
 "media (expect a very slow system compared to an installed OS)."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:81
+#: en/bootLive.xml:56
 msgid "Once the boot is done, you can proceed to the installation."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:86 en/bootLive.xml:102
+#: en/bootLive.xml:60 en/bootLive.xml:72
 msgid ""
 "<emphasis role=\"bold\">+ use non-free video drivers (slower to boot)</"
 "emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:89
+#: en/bootLive.xml:62
 msgid "Boot the Mageia Live system using non-free video drivers"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:96 en/bootLive.xml:155 en/installer.xml:109
+#: en/bootLive.xml:68 en/bootLive.xml:112 en/installer.xml:111
 msgid "<emphasis role=\"bold\">Install Mageia</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:98 en/bootLive.xml:157
+#: en/bootLive.xml:69 en/bootLive.xml:113
 msgid "This option will install Mageia to a hard disk."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:105
+#: en/bootLive.xml:74
 msgid "Install Mageia using non-free video drivers"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:111 en/installer.xml:125
+#: en/bootLive.xml:79 en/installer.xml:127
 msgid "<emphasis role=\"bold\">Memory Test</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:113 en/installer.xml:127
+#: en/bootLive.xml:80 en/installer.xml:129
 msgid ""
 "Test the installed RAM by performing multiple read and write operations. "
 "Reboot to end the test."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:118 en/bootLive.xml:161
+#: en/bootLive.xml:84 en/bootLive.xml:116
 msgid "<emphasis role=\"bold\"> F2 Language</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:120 en/bootLive.xml:163
+#: en/bootLive.xml:85 en/bootLive.xml:117
 msgid ""
 "Press <keycap>F2</keycap> to have the installer use a specific language "
 "during the installation. Use the arrow keys to select the language then "
@@ -592,24 +599,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:129
+#: en/bootLive.xml:93
 msgid "In UEFI mode"
 msgstr "UEFI kipinde"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:133
+#: en/bootLive.xml:96
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:139
+#: en/bootLive.xml:100
 msgid "First screen while booting in UEFI mode"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:149
+#: en/bootLive.xml:107
 msgid ""
 "This option will boot the Mageia Live system from the connected DVD/USB "
 "media (expect a very slow system compared to an installed OS).  Once the "
@@ -617,7 +627,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/bootLive.xml:170
+#: en/bootLive.xml:123
 msgid ""
 "If you booted from a USB stick, you will see the above menu options "
 "duplicated, and in this case, you should choose from the menu pair that will "
@@ -842,12 +852,12 @@ msgstr ""
 "zamana veya tümünün UTC/GMT zamanına ayarlı olduğundan emin olun."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:24
+#: en/configureX_card_list.xml:27
 msgid "Choose an X Server (Configure your Graphic Card)"
 msgstr "Bir X Sunucusu Seçme (Ekran Kartını Yapılandırma)"
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_card_list.xml:29
+#: en/configureX_card_list.xml:32
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_card_list."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_card_list-im1\"/> </"
@@ -855,7 +865,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:35
+#: en/configureX_card_list.xml:38
 msgid ""
 "DrakX has a very comprehensive database of video cards and will usually "
 "correctly identify your video device."
@@ -864,7 +874,7 @@ msgstr ""
 "ekran kartınızı doğru olarak tanımlar."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:38
+#: en/configureX_card_list.xml:41
 msgid ""
 "If the installer has not correctly detected your graphic card and you know "
 "which one you have, you can select it from the tree by:"
@@ -873,22 +883,22 @@ msgstr ""
 "hangisi olduğunu biliyorsanız, kartınızı ağaçtan şuna göre seçebilirsiniz:"
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_card_list.xml:41 en/configureX_monitor.xml:74
+#: en/configureX_card_list.xml:44 en/configureX_monitor.xml:78
 msgid "Vendor"
 msgstr "Üretici"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:45
+#: en/configureX_card_list.xml:48
 msgid "then the make of your card"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:49
+#: en/configureX_card_list.xml:52
 msgid "and the model of card"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:53
+#: en/configureX_card_list.xml:56
 msgid ""
 "If you cannot find your card in the vendor lists (because it's not yet in "
 "the database or it's an older card) you may find a suitable driver in the "
@@ -899,14 +909,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><caution><para>
-#: en/configureX_card_list.xml:61
+#: en/configureX_card_list.xml:64
 msgid ""
 "Be aware that if you select an incompatible driver you may only have access "
 "to the <emphasis>Command Line Interface</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:65
+#: en/configureX_card_list.xml:68
 msgid ""
 "Some video card manufacturers provide proprietary drivers for Linux which "
 "may only be available in the <emphasis>Nonfree</emphasis> repository and in "
@@ -917,17 +927,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:11
-msgid "Graphic Card and Monitor Configuration"
+#: en/configureX_chooser.xml:23
+#, fuzzy
+msgid "Graphics Card and Monitor Configuration"
 msgstr "Ekran Kartı ve Monitör Yapılandırma"
 
-#.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
-#. 2018/02/15 apb: Some text and typography.
-#. 2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.
-#. 2018/02/23 apb: Typo.
-#. 2019/01/06 apb: Slight reword, split 1st para in two.
 #. type: Content of: <section><mediaobject>
-#: en/configureX_chooser.xml:26
+#: en/configureX_chooser.xml:28
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_chooser."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_chooser-im1\"/> </"
@@ -935,7 +941,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:32
+#: en/configureX_chooser.xml:34
 msgid ""
 "No matter which graphical environment (also known as desktop environment) "
 "you chose for this install of Mageia, they are all based on a graphical user "
@@ -946,31 +952,32 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:39
+#: en/configureX_chooser.xml:41
 msgid ""
 "Choose the appropriate settings manually if you think the details are "
 "incorrect, or if none are shown."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:44
-msgid "<emphasis role=\"bold\">Graphic Card</emphasis>"
-msgstr ""
+#: en/configureX_chooser.xml:46
+#, fuzzy
+msgid "<emphasis role=\"bold\">Graphics Card</emphasis>"
+msgstr "<emphasis role=\"bold\">Şifre</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:47
+#: en/configureX_chooser.xml:49
 msgid ""
 "If you need to, you can select a specific card from this expandable list. "
 "See <xref linkend=\"configureX_card_list\"/>."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:52
+#: en/configureX_chooser.xml:54
 msgid "<emphasis role=\"bold\">Monitor</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:55
+#: en/configureX_chooser.xml:57
 msgid ""
 "You can choose Plug 'n Play, if applicable, or choose your monitor from the "
 "<emphasis>Vendor</emphasis> or <emphasis>Generic</emphasis> lists. Choose "
@@ -980,22 +987,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:63
+#: en/configureX_chooser.xml:65
 msgid "<emphasis role=\"bold\">Resolution</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:66
+#: en/configureX_chooser.xml:68
 msgid "The resolution and color depth of your monitor can be set here."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:71
+#: en/configureX_chooser.xml:73
 msgid "<emphasis role=\"bold\">Test</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:74
+#: en/configureX_chooser.xml:76
 msgid ""
 "The test button does not always appear during install. If the option is "
 "there, and you test your settings, you should be asked to confirm that your "
@@ -1007,17 +1014,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:85
+#: en/configureX_chooser.xml:87
 msgid "<emphasis role=\"bold\">Options</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:88
+#: en/configureX_chooser.xml:90
 msgid "Here you can choose to enable or disable various options."
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_chooser.xml:93
+#: en/configureX_chooser.xml:95
 msgid ""
 "There is a risk of damaging a monitor if you choose refresh rates that are "
 "outside the frequency range of that monitor. This applies to older CRT "
@@ -1026,12 +1033,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_monitor.xml:22
+#: en/configureX_monitor.xml:26
 msgid "Choosing your Monitor"
 msgstr "Monitör Seçimi"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:25
+#: en/configureX_monitor.xml:29
 msgid ""
 "DrakX has a very comprehensive database of monitors and will usually "
 "correctly identify yours."
@@ -1040,7 +1047,7 @@ msgstr ""
 "monitörünüzü doğru olarak tanımlar."
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:30
+#: en/configureX_monitor.xml:34
 msgid ""
 "<emphasis role=\"bold\">Selecting a monitor with different characteristics "
 "could damage your monitor or video hardware. Please don't try something "
@@ -1049,7 +1056,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:38
+#: en/configureX_monitor.xml:42
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
@@ -1060,12 +1067,12 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:46
+#: en/configureX_monitor.xml:50
 msgid "Custom"
 msgstr "Özel"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:49
+#: en/configureX_monitor.xml:53
 msgid ""
 "This option allows you to set two critical parameters: the vertical refresh "
 "rate and the horizontal sync rate. Vertical refresh determines how often the "
@@ -1074,7 +1081,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:55
+#: en/configureX_monitor.xml:59
 msgid ""
 "It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor "
 "type with a sync range that is beyond the capabilities of your monitor: you "
@@ -1087,58 +1094,59 @@ msgstr ""
 "monitörünüzün kılavuzuna bakın."
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:64
+#: en/configureX_monitor.xml:68
 msgid "Plug'n Play"
 msgstr "Tak ve Kullan"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:67
+#: en/configureX_monitor.xml:71
 msgid ""
 "This is the default option and automatically tries to determine the monitor "
 "type from the monitor database."
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:77
+#: en/configureX_monitor.xml:81
+#, fuzzy
 msgid ""
 "If the installer has not correctly detected your monitor and you know which "
-"one you have, you can select it from the tree by selecting:"
+"one you have, you can choose it from the options by selecting:"
 msgstr ""
 "Kurulum aracı monitörünüzü doğru olarak algılayamamışsa ve monitörünüzün "
 "hangisi olduğunu biliyorsanız, monitörünüzü ağaçtan şuna göre seçebilirsiniz:"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:86
+#: en/configureX_monitor.xml:90
 msgid "Manufacturer"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:90
+#: en/configureX_monitor.xml:94
 msgid "Monitor model"
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:96
+#: en/configureX_monitor.xml:100
 msgid "Generic"
 msgstr "Genel"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:99
+#: en/configureX_monitor.xml:103
 msgid ""
-"Selecting this group will list nearly 30 display configurations such as "
-"1024x768 @ 60Hz and includes flat-panel displays as used in laptops. This is "
-"often a good monitor selection group if you need to use the VESA card driver "
-"when your video hardware cannot be determined automatically.  Once again it "
-"may be wise to be conservative in your selections."
+"Selecting this group will list approximately 30 display configurations such "
+"as 1024x768 @ 60Hz and includes flat-panel displays as used in laptops.  "
+"This is often a good monitor selection group if you need to use the VESA "
+"card driver when your video hardware cannot be determined automatically. "
+"Once again, it may be wise to be conservative in your selections."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:22
+#: en/diskdrake.xml:24
 msgid "Custom Disk Partitioning with DiskDrake"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:27
+#: en/diskdrake.xml:29
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-diskdrake.png\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1146,7 +1154,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:38
+#: en/diskdrake.xml:40
 msgid ""
 "Modify the layout of your disk(s) here. You can remove or create partitions, "
 "change the filesystem or size of a partition and even view their details "
@@ -1154,15 +1162,15 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:47
 msgid ""
 "There is a tab at the top for every detected hard disk (or other storage "
-"device, like a USB key). In the screenshot above there are two available "
-"devices: <filename>sda </filename>and <filename>sdb</filename>."
+"device, like a USB key), for example: <filename>sda</filename>, "
+"<filename>sdb</filename>, <filename>sdc</filename> etc."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:52
+#: en/diskdrake.xml:54
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it. "
@@ -1171,21 +1179,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:60
+#: en/diskdrake.xml:62
 msgid ""
 "Continue until you have adjusted everything to your satisfaction, then click "
 "<emphasis>Done</emphasis> when you're ready."
 msgstr ""
 
 #. type: Content of: <section><warning><orderedlist><listitem><para>
-#: en/diskdrake.xml:69
+#: en/diskdrake.xml:71
 msgid ""
 "Take care with the <emphasis>Clear all</emphasis> option, use it only if you "
 "are sure you want to wipe all partitions on the selected storage device."
 msgstr ""
 
 #. type: Content of: <section><warning><orderedlist><listitem><para>
-#: en/diskdrake.xml:75
+#: en/diskdrake.xml:77
 msgid ""
 "If you wish to use encryption on your <filename>/</filename> partition you "
 "must ensure that you have a separate <filename>/boot</filename> partition. "
@@ -1194,7 +1202,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/diskdrake.xml:87
+#: en/diskdrake.xml:89
 msgid ""
 "If you are installing Mageia on a UEFI system, check that an ESP (EFI System "
 "Partition) is present and correctly mounted on <filename>/boot/EFI</"
@@ -1202,19 +1210,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/diskdrake.xml:93
+#: en/diskdrake.xml:95
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
 "partition is present and of the correct type. See Figure 2 below."
 msgstr ""
 
 #. type: Content of: <section><figure><title>
-#: en/diskdrake.xml:101
+#: en/diskdrake.xml:103
 msgid "EFI System Partition"
 msgstr "EFI Sistem Bölümü"
 
 #. type: Content of: <section><figure><mediaobject>
-#: en/diskdrake.xml:104
+#: en/diskdrake.xml:106
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-diskdrake2.png\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1222,17 +1230,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><figure>
-#: en/diskdrake.xml:103 en/diskdrake.xml:117
+#: en/diskdrake.xml:105 en/diskdrake.xml:119
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><figure><title>
-#: en/diskdrake.xml:115
+#: en/diskdrake.xml:117
 msgid "BIOS boot partition"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:118 en/doPartitionDisks.xml:201
+#: en/diskdrake.xml:120 en/doPartitionDisks.xml:206
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1255,26 +1263,26 @@ msgid "Partitioning"
 msgstr "Bölümlendirme"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:31
 msgid "Suggested Partitioning"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:34
 msgid ""
 "In this screen you can see the content of your hard drive(s) along with the "
 "DrakX partitioning proposals for where to install Mageia."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:34
+#: en/doPartitionDisks.xml:38
 msgid ""
 "The actual options available from those shown below will vary according to "
 "the layout and content of your particular hard drive(s)."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:39
+#: en/doPartitionDisks.xml:43
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1283,17 +1291,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><title>
-#: en/doPartitionDisks.xml:49
+#: en/doPartitionDisks.xml:53
 msgid "Main Options"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:56
 msgid "<emphasis role=\"bold\">Use Existing Partitions</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:59
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1302,12 +1310,12 @@ msgstr ""
 "bölümleri bulunmuştur ve yükleme için kullanılabilir."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:61
+#: en/doPartitionDisks.xml:65
 msgid "<emphasis role=\"bold\">Use Free Space</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:68
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1316,57 +1324,54 @@ msgstr ""
 "bu seçenek o alanı kullanacaktır."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:70
+#: en/doPartitionDisks.xml:74
 msgid ""
 "<emphasis role=\"bold\">Use Free Space on a Windows Partition</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:73
+#: en/doPartitionDisks.xml:77
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it. 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 important files!"
+"installation but see the warning below."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para><mediaobject>
+#: en/doPartitionDisks.xml:87
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:79
+#: en/doPartitionDisks.xml:82
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
 "light blue and the proposed Mageia partition in dark blue with their "
 "intended sizes just underneath. You have the option to modify these sizes by "
 "clicking and dragging the gap between both partitions.  See the following "
-"screenshot:"
-msgstr ""
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:87
-msgid "<emphasis role=\"bold\">Erase and use Entire Disk</emphasis>"
-msgstr ""
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:90
-msgid "This option will allocate the entire drive for Mageia"
+"screenshot:<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:97
 msgid ""
-"This will erase ALL data on the selected hard drive. Take care! 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 this option."
+"This involves shrinking the size of the Windows partition, and therefore is "
+"a risky operation, so you should make sure you have backed up all important "
+"files before proceeding."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><important><para>
-#: en/doPartitionDisks.xml:101
+#: en/doPartitionDisks.xml:103
+#, fuzzy
 msgid ""
-"Note that this involves shrinking the size of the Windows partition. The "
-"partition must be \"clean\", meaning that Windows must have closed down "
+"The partition must be \"clean\", meaning that Windows must have closed down "
 "correctly the last time it was used. It must also have been defragmented, "
 "although this is not a guarantee that all files in the partition have been "
-"moved out of the area that is about to be used. It is highly recommended to "
-"back up your personal files."
+"moved out of the area that is about to be used for Mageia."
 msgstr ""
 "Bu işlemin Windows bölümünün boyutunu azaltacağını unutmayın. Disk bölümü "
 "\"temiz\" olmalıdır; yani son kullanımında Windows düzgün şekilde kapatılmış "
@@ -1376,28 +1381,37 @@ msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/doPartitionDisks.xml:112
-msgid "<emphasis role=\"bold\">Custom Disk Partitioning</emphasis>"
+msgid "<emphasis role=\"bold\">Erase and use Entire Disk</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/doPartitionDisks.xml:115
+msgid "This option will allocate the entire drive for Mageia"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><warning><para>
+#: en/doPartitionDisks.xml:119
 msgid ""
-"This gives you complete control over the placing of the installation on your "
-"hard drive(s)."
+"This will erase ALL data on the selected hard drive. Take care! 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 this option."
 msgstr ""
-"Bu seçenek, sistemi sabit disklerinize kurarken size tam denetim sağlar.."
 
-#. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:122
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:127
+msgid "<emphasis role=\"bold\">Custom Disk Partitioning</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:130
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
+"This gives you complete control over the placing of the installation on your "
+"hard drive(s)."
 msgstr ""
+"Bu seçenek, sistemi sabit disklerinize kurarken size tam denetim sağlar.."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:131
+#: en/doPartitionDisks.xml:136
 msgid ""
 "If you are not using the <emphasis>Custom disk partitioning</emphasis> "
 "option, then the installer will allocate the available space according to "
@@ -1405,60 +1419,60 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:137
+#: en/doPartitionDisks.xml:142
 msgid ""
 "If the total available space is less than 50 GB, then only one partition is "
 "created. This will be the <filename>/</filename> (root)  partition."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:143
+#: en/doPartitionDisks.xml:148
 msgid ""
 "If the total available space is greater than 50 GB, then three partitions "
 "are created"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:148
+#: en/doPartitionDisks.xml:153
 msgid ""
 "6/19 of the total available place is allocated to <filename>/</filename> "
 "with a maximum of 50 GB"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:153
+#: en/doPartitionDisks.xml:158
 msgid "1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:158
+#: en/doPartitionDisks.xml:163
 msgid "the rest (at least 12/19) is allocated to <filename>/home</filename>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:165
+#: en/doPartitionDisks.xml:170
 msgid ""
 "This means that from 160 GB or greater available space, the installer will "
 "create three partitions:"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:170
+#: en/doPartitionDisks.xml:175
 msgid "50 GB for <filename>/</filename>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:174
+#: en/doPartitionDisks.xml:179
 msgid "4 GB for <filename>swap</filename>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:178
+#: en/doPartitionDisks.xml:183
 msgid "and the remainder for <filename>/home</filename>"
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:183
+#: en/doPartitionDisks.xml:188
 msgid ""
 "If you are using a UEFI system, the ESP (EFI System Partition) will be "
 "automatically detected - or created if it does not exist yet - and mounted "
@@ -1468,7 +1482,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:189
+#: en/doPartitionDisks.xml:194
 msgid ""
 "If you are using a Legacy (also known as BIOS) system with a GPT partitioned "
 "disk, you need to create a BIOS boot partition if it doesn't already exist. "
@@ -1479,19 +1493,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:196
+#: en/doPartitionDisks.xml:201
 msgid "See <xref linkend=\"diskdrake\"/> for information on how to proceed."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:211
+#: en/doPartitionDisks.xml:216
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4.png"
-"\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks4.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks4.png\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:217
+#: en/doPartitionDisks.xml:226
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
 "previous standard of 512. Due to lack of available hardware, the "
@@ -1500,7 +1521,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:222
+#: en/doPartitionDisks.xml:231
 msgid ""
 "Some SSD devices now use an erase block size over 1 MB. If you have such a "
 "device we suggest that you partition the drive in advance, using an "
@@ -1509,17 +1530,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:229
+#: en/doPartitionDisks.xml:238
 msgid "<emphasis>Align to</emphasis> = MiB"
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:233
+#: en/doPartitionDisks.xml:242
 msgid "<emphasis>Free space preceding (MiB)</emphasis> = 2"
 msgstr ""
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:237
+#: en/doPartitionDisks.xml:246
 msgid ""
 "Also make sure all partitions are created using an even number of megabytes."
 msgstr ""
@@ -1697,12 +1718,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/firewall.xml:7
+#: en/firewall.xml:16
 msgid "Firewall"
 msgstr "Güvenlik duvarı"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:10
+#: en/firewall.xml:19
 msgid ""
 "This section allows you to configure some simple firewall rules: they "
 "determine which type of message from the Internet will be accepted by the "
@@ -1710,8 +1731,17 @@ msgid ""
 "system to be accessible from the Internet."
 msgstr ""
 
+#. type: Content of: <section><mediaobject>
+#: en/firewall.xml:26
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-firewall.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+
 #. type: Content of: <section><para>
-#: en/firewall.xml:16
+#: en/firewall.xml:31
 msgid ""
 "In the default setting (no button is checked), no service of the system is "
 "accessible from the network. The <emphasis>Everything (no firewall)</"
@@ -1724,7 +1754,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:25
+#: en/firewall.xml:40
 msgid ""
 "All other options are more or less self-explanatory. As an example, you will "
 "enable the CUPS server if you want printers on your machine to be accessible "
@@ -1732,12 +1762,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:29
+#: en/firewall.xml:44
 msgid "<emphasis role=\"bold\">Advanced</emphasis>"
 msgstr "<emphasis role=\"bold\">Gelişmiş</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:31
+#: en/firewall.xml:46
 msgid ""
 "The <emphasis>Advanced</emphasis> option opens a window where you can enable "
 "a series of services by typing a list of <quote>couples</quote> (blank "
@@ -1745,33 +1775,37 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:35
-msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
+#: en/firewall.xml:50
+#, fuzzy
+msgid "<emphasis>&lt;port-number&gt;/&lt;protocol&gt;</emphasis>"
 msgstr "<emphasis>&lt;port-numarasır>/&lt;protokol></emphasis>"
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:38
+#: en/firewall.xml:53
+#, fuzzy
 msgid ""
-"- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
-"the service you want to enable (e.g. 873 for the RSYNC service) as defined "
-"in <emphasis>RFC-433</emphasis>;"
+"- <emphasis>&lt;port-number&gt;</emphasis> is the value of the port assigned "
+"to the service you want to enable (e.g. 873 for the RSYNC service) as "
+"defined in <emphasis>RFC-433</emphasis>;"
 msgstr ""
 "- <emphasis>&lt;port-numarası></emphasis>, <emphasis>RFC-433</emphasis>'de "
 "tanımlandığı gibi etkinleştirmek istediğiniz hizmete ilişkin port değeridir "
 "(mesela RSYNC hizmeti için 873);"
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:42
+#: en/firewall.xml:57
+#, fuzzy
 msgid ""
-"- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
-"<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
+"- <emphasis>&lt;protocol&gt;</emphasis> is one of <emphasis>TCP</emphasis> "
+"or <emphasis>UDP</emphasis> - the internet protocol that is used by the "
+"service."
 msgstr ""
 "- <emphasis>&lt;protocol></emphasis>, <emphasis>TCP</emphasis> veya "
 "<emphasis>UDP</emphasis> - hizmet tarafından kullanılan internet "
 "protokolüdür."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:47
+#: en/firewall.xml:62
 msgid ""
 "For instance, the entry for enabling access to the RSYNC service therefore "
 "is <emphasis>873/tcp</emphasis>."
@@ -1780,7 +1814,7 @@ msgstr ""
 "<emphasis>873/tcp</emphasis> olur."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:50
+#: en/firewall.xml:65
 msgid ""
 "In case a service is implemented to use both protocols, you specify 2 "
 "couples for the same port."
@@ -1850,12 +1884,12 @@ msgid "Graphical Configuration"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:32
+#: en/installer.xml:34
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, Mageia Kurulum Aracı"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:35
+#: en/installer.xml:37
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -1866,33 +1900,33 @@ msgstr ""
 "yapmanıza yardımcı olmak için tasarlanmıştır."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:40
+#: en/installer.xml:42
 msgid "The installation steps"
 msgstr "Kurulum adımları"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:44
+#: en/installer.xml:46
 msgid ""
 "The install process is divided into a number of steps - the status of which "
 "is indicated in a panel to the left of the screen."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:50
+#: en/installer.xml:52
 msgid ""
 "Each step has one or more screens, which may also have <emphasis>Advanced</"
 "emphasis> sections with extra, less commonly required options."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:56
+#: en/installer.xml:58
 msgid ""
 "Most screens have <emphasis>Help</emphasis> buttons for further details "
 "about the particular step."
 msgstr ""
 
 #. type: Content of: <section><section><caution><para>
-#: en/installer.xml:62
+#: en/installer.xml:64
 msgid ""
 "If at some point during the install you decide to abort the installation, it "
 "is possible to reboot, but please think twice before you do this. Once a "
@@ -1902,7 +1936,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><caution><para>
-#: en/installer.xml:68
+#: en/installer.xml:70
 msgid ""
 "If, in spite of this, you are very sure rebooting is what you want, go to a "
 "text terminal by pressing the keys <keycombo> <keycap>Ctrl</keycap> "
@@ -1912,12 +1946,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:86
+#: en/installer.xml:88
 msgid "Installation Welcome Screen"
 msgstr "Kurulum Karşılama Ekranı"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:88
+#: en/installer.xml:90
 msgid ""
 "The particular screen that you will first see when booting from the "
 "Installation media will depend on whether your computer motherboard is of "
@@ -1925,60 +1959,60 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:92
+#: en/installer.xml:94
 msgid ""
 "The welcome menu screen has various options, however the default option will "
 "start the installer, and is normally all that you will need."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:97
+#: en/installer.xml:99
 msgid "Legacy (BIOS) Systems"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:100
+#: en/installer.xml:102
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome.png\"/> </"
 "imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:111
+#: en/installer.xml:113
 msgid ""
 "Install Mageia to a hard disk. This is the default option, and will "
 "automatically start after a short while unless another option is selected."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:117
+#: en/installer.xml:119
 msgid "<emphasis role=\"bold\">Rescue System</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:119
+#: en/installer.xml:121
 msgid ""
 "This option allows you to either re-install the bootloader for an existing "
 "Mageia installation or you can use it to restore a Windows bootloader."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:132
+#: en/installer.xml:134
 msgid "<emphasis role=\"bold\">F2: Language</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:134
+#: en/installer.xml:136
 msgid "Press F2 for alternative languages."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:140
+#: en/installer.xml:142
 msgid "UEFI Systems"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:142
+#: en/installer.xml:144
 msgid ""
 "From this screen, you can access options by pressing <keycap>e</keycap> to "
 "enter the edit mode. To come back to this screen, press <keycap>Esc</keycap> "
@@ -1986,19 +2020,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:148
+#: en/installer.xml:150
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome2.png\"/> </"
 "imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:157
+#: en/installer.xml:159
 msgid "<emphasis role=\"bold\">Install:</emphasis> Start the Install process"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:162
+#: en/installer.xml:164
 msgid ""
 "<emphasis role=\"bold\">Rescue:</emphasis> This option allows you to either "
 "re-install the bootloader for an existing Mageia installation or you can use "
@@ -2006,31 +2040,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:169
+#: en/installer.xml:171
 msgid ""
 "<emphasis role=\"bold\">F2: Language:</emphasis> Press <keycap>F2</keycap> "
 "for alternative languages."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:174
+#: en/installer.xml:176
 msgid ""
 "If you booted from a USB stick, you will see the above options duplicated, "
 "and in this case, you should use the set that will be suffixed with \"USB\"."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:181
+#: en/installer.xml:183
 msgid "Installation Problems and Possible Solutions"
 msgstr "Kurulum Sorunları ve Muhtemel Çözümleri"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:184
+#: en/installer.xml:186
 msgid "No Graphical Interface"
 msgstr "Grafiksel Arabirim Yok"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:188
+#: en/installer.xml:190
 msgid ""
 "After the initial screen you did not progress to the <emphasis>Language "
 "Selection</emphasis> screen. This can happen with some graphic cards and "
@@ -2039,7 +2073,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:195
+#: en/installer.xml:197
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
 "In this case it is worth trying a text-mode installation. To use this press "
@@ -2050,12 +2084,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:208
+#: en/installer.xml:210
 msgid "The Install Freezes"
 msgstr "Kurulum Donuyor"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:210
+#: en/installer.xml:212
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic hardware "
@@ -2065,12 +2099,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:218
+#: en/installer.xml:220
 msgid "RAM problem"
 msgstr "RAM sorunu"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:220
+#: en/installer.xml:222
 msgid ""
 "This will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
@@ -2080,12 +2114,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:228
+#: en/installer.xml:230
 msgid "Dynamic partitions"
 msgstr "Dinamik bölümler"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:230
+#: en/installer.xml:232
 msgid ""
 "If you converted your hard disk from <literal>Basic</literal> format to "
 "<literal>Dynamic</literal> format in Microsoft Windows, then it is not "
@@ -3725,73 +3759,109 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:27
+#: en/setupBootloader.xml:32
 msgid "Bootloader"
 msgstr "Önyükleyici"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:31
+#: en/setupBootloader.xml:36
+#, fuzzy
+msgid "Available Bootloaders"
+msgstr "Önyükleyici"
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:39
 msgid "Grub2"
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><title>
-#: en/setupBootloader.xml:34
-msgid "Grub2 on Legacy MBR/GPT systems"
-msgstr ""
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:42
+#, fuzzy
+msgid "<emphasis role=\"bold\">Grub2 on Legacy MBR/GPT systems</emphasis>"
+msgstr "<emphasis role=\"bold\">Fare</emphasis>"
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:37
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:46
 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:42
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:52
 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:49
-msgid "Grub2-efi on UEFI systems"
-msgstr "UEFI sistemler üzerinde Grub2-efi"
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:59
+#, fuzzy
+msgid "<emphasis role=\"bold\">Grub2-efi on UEFI systems</emphasis>"
+msgstr "<emphasis role=\"bold\">Fare</emphasis>"
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:52
-msgid "GRUB2-efi will be used exclusively as the bootloader for a UEFI system."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:63
+msgid "GRUB2-efi or rEFInd may be used as the bootloader for a UEFI system."
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:57
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:68
 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:60
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:71
 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 "
-"created by Windows and add grub2-efi to it. If no ESP exists, then one will "
+"created by Windows and add grub2-efi to it.  If no ESP exists, then one will "
 "be created. Although it is possible to have several ESPs, only one is "
 "required, whatever the number of operating systems you have."
 msgstr ""
 
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:82
+msgid "rEFInd"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:85
+#, fuzzy
+msgid "<emphasis role=\"bold\">rEFInd on UEFI systems</emphasis>"
+msgstr "<emphasis role=\"bold\">Fare</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:88
+msgid ""
+"rEFInd has a nice graphical set of options, and can auto-detect installed "
+"EFI bootloaders. See: http://www.rodsbooks.com/refind/"
+msgstr ""
+
+#. type: Content of: <section><section><section><note><para>
+#: en/setupBootloader.xml:95
+msgid ""
+"Please note that in order to be able to use the <literal>rEFInd</literal> "
+"option, an installed EFI System Partition must match your system "
+"architecture: if you have a 32bit EFI System Partition installed on a 64bit "
+"machine for instance, then the rEFInd option will not be displayed/available "
+"to you."
+msgstr ""
+
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:72
+#: en/setupBootloader.xml:106
 msgid "Bootloader Setup"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:76
+#: en/setupBootloader.xml:110
 msgid "Bootloader main options"
 msgstr "Önyükleyici ana seçenekleri"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:79
+#: en/setupBootloader.xml:113
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader.png\"/> </imageobject> <imageobject condition=\"live"
@@ -3800,47 +3870,72 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:91
+#: en/setupBootloader.xml:125
 msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:93
+#. type: Content of: <section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:129
 msgid ""
-"This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI "
-"systems will not see this option here."
+"<guimenuitem>GRUB2</guimenuitem> (with either a graphical or a text menu), "
+"can be chosen for both <literal>Legacy MBR/BIOS</literal> systems and "
+"<literal>UEFI</literal> systems."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:136
+msgid ""
+"<guimenuitem>rEFInd</guimenuitem> (with a graphical menu)  is an alternative "
+"option solely for use with <literal>UEFI</literal> systems."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:98
+#: en/setupBootloader.xml:144
 msgid "<emphasis role=\"bold\">Boot device</emphasis>"
 msgstr ""
 
+#. type: Content of: <section><section><section><itemizedlist><listitem><warning><para>
+#: en/setupBootloader.xml:147
+#, fuzzy
+msgid "Don't change this unless you really know what you are doing."
+msgstr ""
+"Ne yaptığınızı çok ama çok iyi bir şekilde biliyorsanız burada bir şeyleri "
+"değiştirin."
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><note><para>
+#: en/setupBootloader.xml:152
+msgid ""
+"There is no option to write GRUB to the boot sector of a partition (e.g: "
+"<filename>sda1</filename>), as this method is considered unreliable."
+msgstr ""
+
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:100
-msgid "Don't change this unless you really know what you are doing"
+#: en/setupBootloader.xml:157
+msgid ""
+"When using UEFI mode, then the <guilabel>Boot device</guilabel> will be "
+"listed as <guimenuitem>EFI System Partition</guimenuitem>."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:105
+#: en/setupBootloader.xml:163
 msgid ""
 "<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:108
+#: en/setupBootloader.xml:166
 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:113
+#: en/setupBootloader.xml:171
 msgid "<emphasis role=\"bold\">Security</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:115
+#: en/setupBootloader.xml:173
 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 "
@@ -3850,34 +3945,34 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:126
+#: en/setupBootloader.xml:184
 msgid "Choose a password for the bootloader (optional)"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:130
+#: en/setupBootloader.xml:188
 msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:132
+#: en/setupBootloader.xml:190
 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:137 en/setupBootloader.xml:212
+#: en/setupBootloader.xml:195 en/setupBootloader.xml:308
 msgid "<emphasis>Advanced</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:141
+#: en/setupBootloader.xml:199
 msgid "<emphasis>Enable ACPI</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:143
+#: en/setupBootloader.xml:201
 msgid ""
 "ACPI (Advanced Configuration and Power Interface) is a standard for power "
 "management. It can save energy by stopping unused devices. Deselecting it "
@@ -3887,24 +3982,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:152
+#: en/setupBootloader.xml:210
 msgid "<emphasis>Enable SMP</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:154
+#: en/setupBootloader.xml:212
 msgid ""
 "This option enables/disables symmetric multiprocessing for multi-core "
 "processors"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:159
+#: en/setupBootloader.xml:217
 msgid "<emphasis>Enable APIC</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:161
+#: en/setupBootloader.xml:219
 msgid ""
 "Enabling this gives the operating system access to the Advanced Programmable "
 "Interrupt Controller. APIC devices permit more complex priority models, and "
@@ -3912,24 +4007,82 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:168
+#: en/setupBootloader.xml:226
 msgid "<emphasis>Enable Local APIC</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:170
+#: en/setupBootloader.xml:228
 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:177
+#: en/setupBootloader.xml:235
 msgid "Bootloader Configuration"
 msgstr "Önyükleme Yapılandırması"
 
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:237
+msgid ""
+"If, in the previous section you selected <literal>rEFInd</literal> as the "
+"bootloader to use, you would then be presented with the options shown in the "
+"screenshot directly below. Otherwise, please instead move on to the "
+"subsequent screenshot for your options."
+msgstr ""
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:243
+#, fuzzy
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"rEFIndLoaderConfig.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-rEFIndLoaderConfig.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:253
+#, fuzzy
+msgid "Your rEFInd configuration options:"
+msgstr "Ses Yapılandırması"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:256
+msgid ""
+"<guimenuitem>Install or update rEFInd in the EFI system partition.</"
+"guimenuitem>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:261
+msgid ""
+"<guimenuitem>Install in EFI/Boot partition (workaround for some BIOS's).</"
+"guimenuitem>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:264
+msgid ""
+"With some BIOS's, the newly written bootloaser for Mageia at end of the "
+"installation will not be recognized. In that case, you can use this option "
+"as a workaround for the issue."
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:270
+msgid ""
+"If you did not select rEFInd as the bootloader to use in the previous "
+"section, then your bootloader configurations are shown below:"
+msgstr ""
+
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:180
+#: en/setupBootloader.xml:275
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -3938,42 +4091,42 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:191
+#: en/setupBootloader.xml:286
 msgid "<emphasis role=\"bold\">Default</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:193
+#: en/setupBootloader.xml:288
 msgid "The operating system to be started up by default."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:197
+#: en/setupBootloader.xml:292
 msgid "<emphasis role=\"bold\">Append</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:199
+#: en/setupBootloader.xml:294
 msgid ""
 "This option lets you pass information to the kernel 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:204
+#: en/setupBootloader.xml:299
 msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:206
+#: en/setupBootloader.xml:301
 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, "
-"then untick the Probe Foreign OS option."
+"then untick the <guimenuitem>Probe Foreign OS</guimenuitem> option."
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:215
+#: en/setupBootloader.xml:311
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader4.png\"/> </imageobject> <imageobject condition=\"live"
@@ -3982,12 +4135,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:226
+#: en/setupBootloader.xml:322
 msgid "<emphasis>Video mode</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:228
+#: en/setupBootloader.xml:324
 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 "
@@ -3995,38 +4148,47 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:234
+#: en/setupBootloader.xml:330
 msgid "<emphasis>Do not touch ESP or MBR</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:236
+#: en/setupBootloader.xml:332
 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 "
-"missing. Click<emphasis> Ok</emphasis> if you are sure you understand the "
-"implications, and wish to proceed."
+"missing. Click <guimenuitem>Ok </guimenuitem>only if you are sure you "
+"understand the implications, and wish to proceed."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><warning><para>
+#: en/setupBootloader.xml:338
+msgid ""
+"Chain-loading via legacy bootloaders (GRUB Legacy and LiLo)  is no longer "
+"supported by Mageia as it is likely to fail when attempting to boot this "
+"resulting installation of Mageia. If you use anything other than GRUB2 or "
+"rEFInd for this purpose, then you do so at your own risk!"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:245
+#: en/setupBootloader.xml:348
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png"
 "\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:253
+#: en/setupBootloader.xml:356
 msgid "Other Options"
 msgstr "Diğer Seçenekler"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:256
+#: en/setupBootloader.xml:359
 msgid "Using an existing bootloader"
 msgstr "Mevcut bir önyükleyiciyi kullanmak"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:258
+#: en/setupBootloader.xml:361
 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 "
@@ -4036,12 +4198,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:267
+#: en/setupBootloader.xml:370
 msgid "Installing Without a Bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:269
+#: en/setupBootloader.xml:372
 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 "
@@ -4376,3 +4538,6 @@ msgid ""
 "take a little while to complete. When it is finishing you will briefly get a "
 "blank screen - this is normal."
 msgstr ""
+
+#~ msgid "Grub2-efi on UEFI systems"
+#~ msgstr "UEFI sistemler üzerinde Grub2-efi"
diff --git a/docs/docs/stable/installer/uk.po b/docs/docs/stable/installer/uk.po
index 5810f441..fbef8252 100644
--- a/docs/docs/stable/installer/uk.po
+++ b/docs/docs/stable/installer/uk.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2019-01-19 21:23+0200\n"
+"POT-Creation-Date: 2019-09-08 15:26+0300\n"
 "PO-Revision-Date: 2019-06-02 09:37+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/MageiaLinux/mageia/"
@@ -179,7 +179,7 @@ msgstr ""
 "бітові пакунки."
 
 #. type: Content of: <section><info><title>
-#: en/addUser.xml:3
+#: en/addUser.xml:9
 msgid "User Management"
 msgstr "Керування записами користувачів"
 
@@ -189,13 +189,16 @@ msgstr "Керування записами користувачів"
 #. 2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
 #.   Also changed 'Advanced User Management' to 'User Management (advanced)'.
 #. 2018/02/24 apb: Changed list style.
+#. 2019/08/10 apb: Added missing 'condition' profile for live-user1.png.
+#. 2019/08/11 apb: [1] Reword 1.1 (including Note) [2] Reword 1.2 Password text.
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:12
+#: en/addUser.xml:28
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
-"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
-"\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata format="
-"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-setRootPassword.png\" format=\"PNG\" revision=\"1\" xml:id="
+"\"setRootPassword-im1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-user1.png\" format=\"PNG\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
 "\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -203,20 +206,18 @@ msgstr ""
 "\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:21
+#: en/addUser.xml:40
 msgid "Set Administrator (root)  Password:"
 msgstr "Встановлення пароля адміністратора (root):"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:24
+#: en/addUser.xml:44
+#, fuzzy
 msgid ""
 "It is advisable for all Mageia installations to set a <literal>superuser</"
 "literal> (Administrator) password, usually called the <emphasis>root </"
-"emphasis>password in Linux. As you type a password into the top box a shield "
-"will change from red-to-yellow-to-green depending on the strength of the "
-"password. A green shield shows you are using a strong password. You need to "
-"repeat the same password in the box underneath, to check that the first "
-"entry was not mistyped."
+"emphasis>password in Linux. You need to repeat the same password in the box "
+"underneath, to check that the first entry was not mistyped."
 msgstr ""
 "У кожній встановленій системі Mageia варто визначити пароль "
 "<emphasis>суперкористувача</emphasis> або адміністратора. Такий пароль у "
@@ -227,7 +228,15 @@ msgstr ""
 "розташованому нижче, щоб упевнитися, що пароль було вказано без помилок."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:32
+#: en/addUser.xml:51
+msgid ""
+"As you type a password into the top box a shield will change from red-to-"
+"yellow-to-green depending on the strength of the password. A green shield "
+"shows you are using a strong password."
+msgstr ""
+
+#. type: Content of: <section><section><note><para>
+#: en/addUser.xml:55
 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."
@@ -236,12 +245,12 @@ msgstr ""
 "паролі суміш літер (великих і малих), цифр та інших символів."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:39
+#: en/addUser.xml:63
 msgid "Enter a user"
 msgstr "Введіть користувача"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:41
+#: en/addUser.xml:66
 msgid ""
 "Add a User here. A regular user has fewer privileges than the "
 "<literal>superuser</literal> (root), but enough to use the Internet, office "
@@ -254,33 +263,33 @@ msgstr ""
 "яких інших завдань, які виконуються звичайним користувачем за комп’ютером."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:47
+#: en/addUser.xml:73
 msgid "<emphasis role=\"bold\">Icon</emphasis>"
 msgstr "<emphasis role=\"bold\">Піктограма</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:48
+#: en/addUser.xml:75
 msgid "Click on this button if you want to change the user's icon"
 msgstr "За допомогою цієї кнопки можна змінити піктограму користувача"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:52
+#: en/addUser.xml:80
 msgid "<emphasis role=\"bold\">Real Name</emphasis>"
 msgstr "<emphasis role=\"bold\">Справжнє ім’я</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:53
+#: en/addUser.xml:82
 msgid "Insert the user's real name into this text box"
 msgstr ""
 "У цьому полі для введення тексту слід вказати справжнє ім’я користувача"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:56
+#: en/addUser.xml:86
 msgid "<emphasis role=\"bold\">Login Name</emphasis>"
 msgstr "<emphasis role=\"bold\">Реєстраційна назва</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:57
+#: en/addUser.xml:88
 msgid ""
 "Enter the user login name or let DrakX use a version of the user's real "
 "name. <emphasis role=\"bold\">The login name is case-sensitive.</emphasis>"
@@ -289,7 +298,7 @@ msgstr ""
 "використовувати певну версію справжнього імені користувача."
 
 #. type: Content of: <section><section><itemizedlist><listitem><caution><simpara>
-#: en/addUser.xml:61
+#: en/addUser.xml:93
 msgid ""
 "The login entered here should be different to any login currently in use for "
 "your <filename>/home</filename> directory. Some user parameters will be "
@@ -302,23 +311,17 @@ msgstr ""
 "перезапишуть потрібні дані програм, зокрема Firefox, Thunderbird або KMail."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:65 en/setupBootloader.xml:124
+#: en/addUser.xml:102 en/setupBootloader.xml:182
 msgid "<emphasis role=\"bold\">Password</emphasis>"
 msgstr "<emphasis role=\"bold\">Пароль</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:66
-msgid ""
-"Type in the user password. There is a shield at the end of the text box that "
-"indicates the strength of the password. (See also <xref linkend="
-"\"givePassword\"/>)"
+#: en/addUser.xml:104
+msgid "Type in the user password (remembering the advice in the Note above)."
 msgstr ""
-"У цьому полі вам слід вказати пароль користувача. Колір позначки щита поряд "
-"з цим полем відповідає складності пароля (див. також <link linkend="
-"\"givePassword\">надання пароля</link>)"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:68
+#: en/addUser.xml:107
 msgid ""
 "<emphasis role=\"bold\">Password (again):</emphasis> Retype the user "
 "password. DrakX will check that you have not mistyped the password."
@@ -328,7 +331,7 @@ msgstr ""
 "вами повторно пароль з його початковим варіантом."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:74
+#: en/addUser.xml:114
 msgid ""
 "Any users added while installing Mageia, will have a home directory that is "
 "both read and write protected (umask=0027)"
@@ -337,7 +340,7 @@ msgstr ""
 "час встановлення Mageia, буде захищено від читання і запису (umask=0027)"
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:76
+#: en/addUser.xml:117
 msgid ""
 "You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
@@ -349,19 +352,19 @@ msgstr ""
 "користувачами</emphasis>."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:79
+#: en/addUser.xml:121
 msgid "The access permissions can also be changed after the install."
 msgstr ""
 "Права доступу до домашніх каталогів, звичайно ж, можна змінити і після "
 "завершення встановлення системи."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:85
+#: en/addUser.xml:128
 msgid "User Management (advanced)"
 msgstr "Додаткові можливості керування записами користувачів"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:87
+#: en/addUser.xml:131
 msgid ""
 "The <emphasis>Advanced</emphasis> option allows you to edit further settings "
 "for the user you are adding."
@@ -371,7 +374,7 @@ msgstr ""
 "запису, який ви додаєте."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:91
+#: en/addUser.xml:136
 msgid ""
 "<emphasis>Shell</emphasis>: This drop-down list allows you to change the "
 "shell available to any user you added in the previous screen. Options are "
@@ -384,7 +387,7 @@ msgstr ""
 "<literal>Sh</literal>."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:143
 msgid ""
 "<emphasis>User ID</emphasis>: Here you can set the user ID for any user you "
 "added in the previous screen. If you are unsure what the purpose of this is, "
@@ -396,7 +399,7 @@ msgstr ""
 "поле, якщо вам невідомі наслідки ваших дій."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:102
+#: en/addUser.xml:149
 msgid ""
 "<emphasis>Group ID</emphasis>: This lets you set the group ID.  Again, if "
 "unsure, leave it blank."
@@ -554,17 +557,17 @@ msgstr ""
 "автоматичну синхронізацію часу і вказати сервер NTP."
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:23
+#: en/bootLive.xml:10
 msgid "Boot Mageia as Live system"
 msgstr "Завантаження Mageia як портативної системи"
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:28
+#: en/bootLive.xml:14
 msgid "Booting the medium"
 msgstr "Завантаження системи з носія"
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:31
+#: en/bootLive.xml:16
 msgid ""
 "You can boot directly from a Live DVD or USB. Usually, you just need to plug "
 "the USB device in or place the DVD in the drive and restart the computer."
@@ -574,7 +577,7 @@ msgstr ""
 "або вставити DVD до пристрою читання і перезавантажити комп'ютер."
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:35
+#: en/bootLive.xml:19
 msgid ""
 "If the computer does not automatically boot from the USB or DVD you may need "
 "to reconfigure your BIOS Boot Disk priority. Alternatively, you might try "
@@ -587,7 +590,7 @@ msgstr ""
 "вибрати пристрій, з якого завантажуватиме операційну систему ваш комп'ютер."
 
 #. type: Content of: <section><section><tip><para>
-#: en/bootLive.xml:41
+#: en/bootLive.xml:24
 msgid ""
 "To access the BIOS or boot menu when the computer is starting, you can try "
 "pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or <keycap>Esc</"
@@ -603,7 +606,7 @@ msgstr ""
 "ці клавіші (типові) є лише деякими з можливих варіантів."
 
 #. type: Content of: <section><section><note><para>
-#: en/bootLive.xml:50
+#: en/bootLive.xml:32
 msgid ""
 "The actual screen that you will first see when booting from the Live media "
 "will depend on whether your computer motherboard is of the Legacy (BIOS) or "
@@ -614,37 +617,38 @@ msgstr ""
 "застарілої мікропрограми (BIOS) чи UEFI."
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:58
+#: en/bootLive.xml:39
 msgid "In BIOS/CSM/Legacy mode"
 msgstr "У застарілому режимі BIOS/CSM"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:62
+#: en/bootLive.xml:42
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"../live-bootCSM.png\" align=\"center\"/> "
+"</imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> </"
+"<imageobject> <imagedata fileref=\"dx2-summaryTop.png\" align=\"center\"/> </"
 "imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:67
+#: en/bootLive.xml:46
 msgid "First screen while booting in BIOS mode"
 msgstr "Перший екран завантаження у режимі BIOS"
 
 #. type: Content of: <section><section><section><itemizedlist><title>
-#: en/bootLive.xml:72 en/bootLive.xml:144 en/installer.xml:106
-#: en/installer.xml:154
+#: en/bootLive.xml:50 en/bootLive.xml:104 en/installer.xml:108
+#: en/installer.xml:156
 msgid "Menu"
 msgstr "Меню"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:75 en/bootLive.xml:147
+#: en/bootLive.xml:52 en/bootLive.xml:106
 msgid "<emphasis role=\"bold\">Boot Mageia</emphasis>"
 msgstr "<emphasis role=\"bold\">Завантажити Mageia</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:77
+#: en/bootLive.xml:53
 msgid ""
 "This option will boot the Mageia Live system from the connected DVD/USB "
 "media (expect a very slow system compared to an installed OS)."
@@ -654,14 +658,14 @@ msgstr ""
 "порівнювати з часом завантаження встановленої операційної системи)."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:81
+#: en/bootLive.xml:56
 msgid "Once the boot is done, you can proceed to the installation."
 msgstr ""
 "Щойно завантаження системи буде завершено, ви зможете перейти до "
 "встановлення."
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:86 en/bootLive.xml:102
+#: en/bootLive.xml:60 en/bootLive.xml:72
 msgid ""
 "<emphasis role=\"bold\">+ use non-free video drivers (slower to boot)</"
 "emphasis>"
@@ -670,35 +674,35 @@ msgstr ""
 "emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:89
+#: en/bootLive.xml:62
 msgid "Boot the Mageia Live system using non-free video drivers"
 msgstr ""
 "Завантаження Mageia як портативної системи із закритими відеодрайверами"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:96 en/bootLive.xml:155 en/installer.xml:109
+#: en/bootLive.xml:68 en/bootLive.xml:112 en/installer.xml:111
 msgid "<emphasis role=\"bold\">Install Mageia</emphasis>"
 msgstr "<emphasis role=\"bold\">Встановити Mageia</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:98 en/bootLive.xml:157
+#: en/bootLive.xml:69 en/bootLive.xml:113
 msgid "This option will install Mageia to a hard disk."
 msgstr ""
 "Якщо буде вибрано цей пункт, розпочнеться процедура встановлення Mageia на "
 "жорсткий диск."
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:105
+#: en/bootLive.xml:74
 msgid "Install Mageia using non-free video drivers"
 msgstr "Встановити Mageia з використанням закритих відеодрайверів"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:111 en/installer.xml:125
+#: en/bootLive.xml:79 en/installer.xml:127
 msgid "<emphasis role=\"bold\">Memory Test</emphasis>"
 msgstr "<emphasis role=\"bold\">Тестування</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:113 en/installer.xml:127
+#: en/bootLive.xml:80 en/installer.xml:129
 msgid ""
 "Test the installed RAM by performing multiple read and write operations. "
 "Reboot to end the test."
@@ -708,12 +712,12 @@ msgstr ""
 "комп'ютер."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:118 en/bootLive.xml:161
+#: en/bootLive.xml:84 en/bootLive.xml:116
 msgid "<emphasis role=\"bold\"> F2 Language</emphasis>"
 msgstr "<emphasis role=\"bold\">F2 Мова</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:120 en/bootLive.xml:163
+#: en/bootLive.xml:85 en/bootLive.xml:117
 msgid ""
 "Press <keycap>F2</keycap> to have the installer use a specific language "
 "during the installation. Use the arrow keys to select the language then "
@@ -724,26 +728,27 @@ msgstr ""
 "натисніть клавішу <keycap>Enter</keycap>."
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:129
+#: en/bootLive.xml:93
 msgid "In UEFI mode"
 msgstr "У режимі UEFI"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:133
+#: en/bootLive.xml:96
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:139
+#: en/bootLive.xml:100
 msgid "First screen while booting in UEFI mode"
 msgstr "Перший екран завантаження у режимі UEFI"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:149
+#: en/bootLive.xml:107
 msgid ""
 "This option will boot the Mageia Live system from the connected DVD/USB "
 "media (expect a very slow system compared to an installed OS).  Once the "
@@ -755,7 +760,7 @@ msgstr ""
 "завершено, ви зможете продовжити встановлення."
 
 #. type: Content of: <section><section><note><para>
-#: en/bootLive.xml:170
+#: en/bootLive.xml:123
 msgid ""
 "If you booted from a USB stick, you will see the above menu options "
 "duplicated, and in this case, you should choose from the menu pair that will "
@@ -1033,12 +1038,12 @@ msgstr ""
 "Всесвітній час (UTC/GMT)."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:24
+#: en/configureX_card_list.xml:27
 msgid "Choose an X Server (Configure your Graphic Card)"
 msgstr "Вибір графічного сервера (налаштовування вашої графічної картки)"
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_card_list.xml:29
+#: en/configureX_card_list.xml:32
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_card_list."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_card_list-im1\"/> </"
@@ -1049,7 +1054,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:35
+#: en/configureX_card_list.xml:38
 msgid ""
 "DrakX has a very comprehensive database of video cards and will usually "
 "correctly identify your video device."
@@ -1058,7 +1063,7 @@ msgstr ""
 "програма може правильно визначити ваш графічний пристрій."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:38
+#: en/configureX_card_list.xml:41
 msgid ""
 "If the installer has not correctly detected your graphic card and you know "
 "which one you have, you can select it from the tree by:"
@@ -1068,22 +1073,22 @@ msgstr ""
 "ієрархічного списку за такими критеріями:"
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_card_list.xml:41 en/configureX_monitor.xml:74
+#: en/configureX_card_list.xml:44 en/configureX_monitor.xml:78
 msgid "Vendor"
 msgstr "Постачальник"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:45
+#: en/configureX_card_list.xml:48
 msgid "then the make of your card"
 msgstr "назва вашої картки"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:49
+#: en/configureX_card_list.xml:52
 msgid "and the model of card"
 msgstr "модель вашої картки"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:53
+#: en/configureX_card_list.xml:56
 msgid ""
 "If you cannot find your card in the vendor lists (because it's not yet in "
 "the database or it's an older card) you may find a suitable driver in the "
@@ -1101,7 +1106,7 @@ msgstr ""
 "показу відео."
 
 #. type: Content of: <section><caution><para>
-#: en/configureX_card_list.xml:61
+#: en/configureX_card_list.xml:64
 msgid ""
 "Be aware that if you select an incompatible driver you may only have access "
 "to the <emphasis>Command Line Interface</emphasis>"
@@ -1110,7 +1115,7 @@ msgstr ""
 "доступ лише до <emphasis>інтерфейсу командного рядка</emphasis>."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:65
+#: en/configureX_card_list.xml:68
 msgid ""
 "Some video card manufacturers provide proprietary drivers for Linux which "
 "may only be available in the <emphasis>Nonfree</emphasis> repository and in "
@@ -1127,17 +1132,13 @@ msgstr ""
 "зробити після першого перезавантаження."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:11
-msgid "Graphic Card and Monitor Configuration"
+#: en/configureX_chooser.xml:23
+#, fuzzy
+msgid "Graphics Card and Monitor Configuration"
 msgstr "Налаштування графічної картки та монітора"
 
-#.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
-#. 2018/02/15 apb: Some text and typography.
-#. 2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.
-#. 2018/02/23 apb: Typo.
-#. 2019/01/06 apb: Slight reword, split 1st para in two.
 #. type: Content of: <section><mediaobject>
-#: en/configureX_chooser.xml:26
+#: en/configureX_chooser.xml:28
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_chooser."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_chooser-im1\"/> </"
@@ -1148,7 +1149,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:32
+#: en/configureX_chooser.xml:34
 msgid ""
 "No matter which graphical environment (also known as desktop environment) "
 "you chose for this install of Mageia, they are all based on a graphical user "
@@ -1165,7 +1166,7 @@ msgstr ""
 "сервера <acronym>X</acronym> має бути визначено належним чином."
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:39
+#: en/configureX_chooser.xml:41
 msgid ""
 "Choose the appropriate settings manually if you think the details are "
 "incorrect, or if none are shown."
@@ -1174,12 +1175,13 @@ msgstr ""
 "неправильно, або якщо ніяких параметрів не показано."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:44
-msgid "<emphasis role=\"bold\">Graphic Card</emphasis>"
+#: en/configureX_chooser.xml:46
+#, fuzzy
+msgid "<emphasis role=\"bold\">Graphics Card</emphasis>"
 msgstr "<emphasis role=\"bold\">Графічна карта</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:47
+#: en/configureX_chooser.xml:49
 msgid ""
 "If you need to, you can select a specific card from this expandable list. "
 "See <xref linkend=\"configureX_card_list\"/>."
@@ -1188,12 +1190,12 @@ msgstr ""
 "\"configureX_card_list\">Налаштовування карток</link>."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:52
+#: en/configureX_chooser.xml:54
 msgid "<emphasis role=\"bold\">Monitor</emphasis>"
 msgstr "<emphasis role=\"bold\">Монітор</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:55
+#: en/configureX_chooser.xml:57
 msgid ""
 "You can choose Plug 'n Play, if applicable, or choose your monitor from the "
 "<emphasis>Vendor</emphasis> or <emphasis>Generic</emphasis> lists. Choose "
@@ -1209,24 +1211,24 @@ msgstr ""
 "\"configureX_monitor\">Налаштовування монітора</link>."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:63
+#: en/configureX_chooser.xml:65
 msgid "<emphasis role=\"bold\">Resolution</emphasis>"
 msgstr "<emphasis role=\"bold\">Роздільна здатність</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:66
+#: en/configureX_chooser.xml:68
 msgid "The resolution and color depth of your monitor can be set here."
 msgstr ""
 "За допомогою цієї кнопки можна вибрати бажану роздільну здатність та глибину "
 "кольорів на вашому моніторі."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:71
+#: en/configureX_chooser.xml:73
 msgid "<emphasis role=\"bold\">Test</emphasis>"
 msgstr "<emphasis role=\"bold\">Перевірити</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:74
+#: en/configureX_chooser.xml:76
 msgid ""
 "The test button does not always appear during install. If the option is "
 "there, and you test your settings, you should be asked to confirm that your "
@@ -1247,19 +1249,19 @@ msgstr ""
 "були безпечними."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:85
+#: en/configureX_chooser.xml:87
 msgid "<emphasis role=\"bold\">Options</emphasis>"
 msgstr "<emphasis role=\"bold\">Параметри</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:88
+#: en/configureX_chooser.xml:90
 msgid "Here you can choose to enable or disable various options."
 msgstr ""
 "За допомогою цієї кнопки ви можете увімкнути або вимкнути різноманітні "
 "параметри."
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_chooser.xml:93
+#: en/configureX_chooser.xml:95
 msgid ""
 "There is a risk of damaging a monitor if you choose refresh rates that are "
 "outside the frequency range of that monitor. This applies to older CRT "
@@ -1273,12 +1275,12 @@ msgstr ""
 "режим очікування."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_monitor.xml:22
+#: en/configureX_monitor.xml:26
 msgid "Choosing your Monitor"
 msgstr "Вибір монітора"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:25
+#: en/configureX_monitor.xml:29
 msgid ""
 "DrakX has a very comprehensive database of monitors and will usually "
 "correctly identify yours."
@@ -1287,7 +1289,7 @@ msgstr ""
 "правильно визначити ваш монітор."
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:30
+#: en/configureX_monitor.xml:34
 msgid ""
 "<emphasis role=\"bold\">Selecting a monitor with different characteristics "
 "could damage your monitor or video hardware. Please don't try something "
@@ -1300,7 +1302,7 @@ msgstr ""
 "маєте певні сумніви, зверніться до документації з вашого монітора."
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:38
+#: en/configureX_monitor.xml:42
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
@@ -1311,12 +1313,12 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:46
+#: en/configureX_monitor.xml:50
 msgid "Custom"
 msgstr "Спеціальний"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:49
+#: en/configureX_monitor.xml:53
 msgid ""
 "This option allows you to set two critical parameters: the vertical refresh "
 "rate and the horizontal sync rate. Vertical refresh determines how often the "
@@ -1330,7 +1332,7 @@ msgstr ""
 "показано лінії зображення."
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:55
+#: en/configureX_monitor.xml:59
 msgid ""
 "It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor "
 "type with a sync range that is beyond the capabilities of your monitor: you "
@@ -1343,12 +1345,12 @@ msgstr ""
 "документацією до вашого монітора."
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:64
+#: en/configureX_monitor.xml:68
 msgid "Plug'n Play"
 msgstr "Plug'n Play"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:67
+#: en/configureX_monitor.xml:71
 msgid ""
 "This is the default option and automatically tries to determine the monitor "
 "type from the monitor database."
@@ -1357,38 +1359,40 @@ msgstr ""
 "монітора за базою даних моніторів."
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:77
+#: en/configureX_monitor.xml:81
+#, fuzzy
 msgid ""
 "If the installer has not correctly detected your monitor and you know which "
-"one you have, you can select it from the tree by selecting:"
+"one you have, you can choose it from the options by selecting:"
 msgstr ""
 "Якщо засобу встановлення не вдалося належним чином визначити ваш монітор і "
 "вам відома назва цього монітора, ви можете вибрати її пункт з ієрархічного "
 "списку за такими критеріями:"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:86
+#: en/configureX_monitor.xml:90
 msgid "Manufacturer"
 msgstr "Виробник"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:90
+#: en/configureX_monitor.xml:94
 msgid "Monitor model"
 msgstr "Модель монітора"
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:96
+#: en/configureX_monitor.xml:100
 msgid "Generic"
 msgstr "Загальний"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:99
+#: en/configureX_monitor.xml:103
+#, fuzzy
 msgid ""
-"Selecting this group will list nearly 30 display configurations such as "
-"1024x768 @ 60Hz and includes flat-panel displays as used in laptops. This is "
-"often a good monitor selection group if you need to use the VESA card driver "
-"when your video hardware cannot be determined automatically.  Once again it "
-"may be wise to be conservative in your selections."
+"Selecting this group will list approximately 30 display configurations such "
+"as 1024x768 @ 60Hz and includes flat-panel displays as used in laptops.  "
+"This is often a good monitor selection group if you need to use the VESA "
+"card driver when your video hardware cannot be determined automatically. "
+"Once again, it may be wise to be conservative in your selections."
 msgstr ""
 "Якщо ви виберете цю групу, буде відкрито список з близько 30 типових "
 "налаштувань дисплеїв, подібних до 1024x768 @ 60 Гц, до якого включено "
@@ -1398,12 +1402,12 @@ msgstr ""
 "автоматично. Знову ж таки, варто параметри варто вибирати дуже обережно."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:22
+#: en/diskdrake.xml:24
 msgid "Custom Disk Partitioning with DiskDrake"
 msgstr "Нетиповий поділ диска на розділи за допомогою DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:27
+#: en/diskdrake.xml:29
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-diskdrake.png\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1414,7 +1418,7 @@ msgstr ""
 "<imagedata align=\"center\" fileref=\"live-diskdrake.png\"/> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:38
+#: en/diskdrake.xml:40
 msgid ""
 "Modify the layout of your disk(s) here. You can remove or create partitions, "
 "change the filesystem or size of a partition and even view their details "
@@ -1426,11 +1430,12 @@ msgstr ""
 "розділів до внесення змін."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:47
+#, fuzzy
 msgid ""
 "There is a tab at the top for every detected hard disk (or other storage "
-"device, like a USB key). In the screenshot above there are two available "
-"devices: <filename>sda </filename>and <filename>sdb</filename>."
+"device, like a USB key), for example: <filename>sda</filename>, "
+"<filename>sdb</filename>, <filename>sdc</filename> etc."
 msgstr ""
 "Вгорі для кожного виявлено твердотільного диска (або іншого пристрою "
 "зберігання даних, зокрема флешок USB) буде відведено вкладку. На наведеному "
@@ -1438,7 +1443,7 @@ msgstr ""
 "і <filename>sdb</filename>."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:52
+#: en/diskdrake.xml:54
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it. "
@@ -1452,7 +1457,7 @@ msgstr ""
 "додаткових можливостей, зокрема додавання мітки або вибору типу розділу."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:60
+#: en/diskdrake.xml:62
 msgid ""
 "Continue until you have adjusted everything to your satisfaction, then click "
 "<emphasis>Done</emphasis> when you're ready."
@@ -1462,7 +1467,7 @@ msgstr ""
 "коли буде вказано потрібні вам параметри."
 
 #. type: Content of: <section><warning><orderedlist><listitem><para>
-#: en/diskdrake.xml:69
+#: en/diskdrake.xml:71
 msgid ""
 "Take care with the <emphasis>Clear all</emphasis> option, use it only if you "
 "are sure you want to wipe all partitions on the selected storage device."
@@ -1472,7 +1477,7 @@ msgstr ""
 "було вилучено."
 
 #. type: Content of: <section><warning><orderedlist><listitem><para>
-#: en/diskdrake.xml:75
+#: en/diskdrake.xml:77
 msgid ""
 "If you wish to use encryption on your <filename>/</filename> partition you "
 "must ensure that you have a separate <filename>/boot</filename> partition. "
@@ -1485,7 +1490,7 @@ msgstr ""
 "завантаження системи стане неможливим."
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/diskdrake.xml:87
+#: en/diskdrake.xml:89
 msgid ""
 "If you are installing Mageia on a UEFI system, check that an ESP (EFI System "
 "Partition) is present and correctly mounted on <filename>/boot/EFI</"
@@ -1496,7 +1501,7 @@ msgstr ""
 "(див. нижче)."
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/diskdrake.xml:93
+#: en/diskdrake.xml:95
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
 "partition is present and of the correct type. See Figure 2 below."
@@ -1505,12 +1510,12 @@ msgstr ""
 "існує розділ BIOS належного типу. Див. знімок, який наведено нижче."
 
 #. type: Content of: <section><figure><title>
-#: en/diskdrake.xml:101
+#: en/diskdrake.xml:103
 msgid "EFI System Partition"
 msgstr "Системний розділ EFI"
 
 #. type: Content of: <section><figure><mediaobject>
-#: en/diskdrake.xml:104
+#: en/diskdrake.xml:106
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-diskdrake2.png\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1521,17 +1526,17 @@ msgstr ""
 "<imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/> </imageobject>"
 
 #. type: Content of: <section><figure>
-#: en/diskdrake.xml:103 en/diskdrake.xml:117
+#: en/diskdrake.xml:105 en/diskdrake.xml:119
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><figure><title>
-#: en/diskdrake.xml:115
+#: en/diskdrake.xml:117
 msgid "BIOS boot partition"
 msgstr "Завантажувальний розділ BIOS"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:118 en/doPartitionDisks.xml:201
+#: en/diskdrake.xml:120 en/doPartitionDisks.xml:206
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1554,12 +1559,12 @@ msgid "Partitioning"
 msgstr "Розбиття на розділи"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:31
 msgid "Suggested Partitioning"
 msgstr "Пропоноване розбиття на розділи"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:34
 msgid ""
 "In this screen you can see the content of your hard drive(s) along with the "
 "DrakX partitioning proposals for where to install Mageia."
@@ -1569,7 +1574,7 @@ msgstr ""
 "щодо місця встановлення Mageia."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:34
+#: en/doPartitionDisks.xml:38
 msgid ""
 "The actual options available from those shown below will vary according to "
 "the layout and content of your particular hard drive(s)."
@@ -1578,7 +1583,7 @@ msgstr ""
 "комп’ютера та вмісту дисків."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:39
+#: en/doPartitionDisks.xml:43
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1591,17 +1596,17 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><itemizedlist><title>
-#: en/doPartitionDisks.xml:49
+#: en/doPartitionDisks.xml:53
 msgid "Main Options"
 msgstr "Основні параметри"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:56
 msgid "<emphasis role=\"bold\">Use Existing Partitions</emphasis>"
 msgstr "<emphasis role=\"bold\">Користуватися існуючими розділами</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:59
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1610,12 +1615,12 @@ msgstr ""
 "Linux розділи, якими можна скористатися для встановлення системи."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:61
+#: en/doPartitionDisks.xml:65
 msgid "<emphasis role=\"bold\">Use Free Space</emphasis>"
 msgstr "<emphasis role=\"bold\">Використовувати вільний простір</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:68
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1624,7 +1629,7 @@ msgstr ""
 "достатнє для встановлення нової системи Mageia."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:70
+#: en/doPartitionDisks.xml:74
 msgid ""
 "<emphasis role=\"bold\">Use Free Space on a Windows Partition</emphasis>"
 msgstr ""
@@ -1632,12 +1637,12 @@ msgstr ""
 "Windows®</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:73
+#: en/doPartitionDisks.xml:77
+#, fuzzy
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it. 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 important files!"
+"installation but see the warning below."
 msgstr ""
 "Якщо на розділі із Windows є вільне місце, засіб встановлення може "
 "запропонувати скористатися ним. Цей варіант отримання місця для встановлення "
@@ -1645,14 +1650,28 @@ msgstr ""
 "даних, тому вам слід попередньо створити резервні копії важливих для вас "
 "файлів!"
 
+#. type: Content of: <section><itemizedlist><listitem><para><mediaobject>
+#: en/doPartitionDisks.xml:87
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:79
+#: en/doPartitionDisks.xml:82
+#, fuzzy
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
 "light blue and the proposed Mageia partition in dark blue with their "
 "intended sizes just underneath. You have the option to modify these sizes by "
 "clicking and dragging the gap between both partitions.  See the following "
-"screenshot:"
+"screenshot:<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr ""
 "Якщо буде вибрано цей варіант, засіб встановлення покаже решту розділу "
 "Windows блакитним кольором, а майбутній розділ з Mageia — темно-синім. "
@@ -1660,20 +1679,45 @@ msgstr ""
 "перетягуванням риски між ними за допомогою вказівника миші. Див. наведений "
 "нижче знімок екрана."
 
+#. type: Content of: <section><itemizedlist><listitem><warning><para>
+#: en/doPartitionDisks.xml:97
+msgid ""
+"This involves shrinking the size of the Windows partition, and therefore is "
+"a risky operation, so you should make sure you have backed up all important "
+"files before proceeding."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><important><para>
+#: en/doPartitionDisks.xml:103
+#, fuzzy
+msgid ""
+"The partition must be \"clean\", meaning that Windows must have closed down "
+"correctly the last time it was used. It must also have been defragmented, "
+"although this is not a guarantee that all files in the partition have been "
+"moved out of the area that is about to be used for Mageia."
+msgstr ""
+"Зауважте, що розмір розділу Windows буде зменшено. Розділ має бути "
+"«очищено», тобто роботу Windows має бути завершено у штатному режимі під час "
+"останнього сеансу, коли ви користувалися цією операційною системою. Крім "
+"того, розділ має бути дефрагментовано, хоча дефрагментація і не гарантує "
+"повного пересування файлів з місця на диску, яке буде використано для "
+"Mageia. Ми наполегливо рекомендуємо вам створити резервні копії важливих для "
+"вас файлів."
+
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:87
+#: en/doPartitionDisks.xml:112
 msgid "<emphasis role=\"bold\">Erase and use Entire Disk</emphasis>"
 msgstr "<emphasis role=\"bold\">Стерти і використати весь диск</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:90
+#: en/doPartitionDisks.xml:115
 msgid "This option will allocate the entire drive for Mageia"
 msgstr ""
 "У разі використання цього варіанта для встановлення Mageia буде використано "
 "усе місце на диску"
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:119
 msgid ""
 "This will erase ALL data on the selected hard drive. Take care! If you "
 "intend to use part of the disk for something else, or you already have data "
@@ -1683,31 +1727,13 @@ msgstr ""
 "використано для зберігання якихось даних або не диску вже зберігаються якісь "
 "важливі дані, не користуйтеся цим варіантом."
 
-#. type: Content of: <section><itemizedlist><listitem><important><para>
-#: en/doPartitionDisks.xml:101
-msgid ""
-"Note that this involves shrinking the size of the Windows partition. The "
-"partition must be \"clean\", meaning that Windows must have closed down "
-"correctly the last time it was used. It must also have been defragmented, "
-"although this is not a guarantee that all files in the partition have been "
-"moved out of the area that is about to be used. It is highly recommended to "
-"back up your personal files."
-msgstr ""
-"Зауважте, що розмір розділу Windows буде зменшено. Розділ має бути "
-"«очищено», тобто роботу Windows має бути завершено у штатному режимі під час "
-"останнього сеансу, коли ви користувалися цією операційною системою. Крім "
-"того, розділ має бути дефрагментовано, хоча дефрагментація і не гарантує "
-"повного пересування файлів з місця на диску, яке буде використано для "
-"Mageia. Ми наполегливо рекомендуємо вам створити резервні копії важливих для "
-"вас файлів."
-
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:112
+#: en/doPartitionDisks.xml:127
 msgid "<emphasis role=\"bold\">Custom Disk Partitioning</emphasis>"
 msgstr "<emphasis role=\"bold\">Нетиповий поділ диска на розділи</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:115
+#: en/doPartitionDisks.xml:130
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1715,21 +1741,8 @@ msgstr ""
 "За допомогою цього варіанта ви можете отримати цілковитий доступ до "
 "розташування розділів на вашому диску відповідно до ваших уподобань."
 
-#. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:122
-msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
-
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:131
+#: en/doPartitionDisks.xml:136
 msgid ""
 "If you are not using the <emphasis>Custom disk partitioning</emphasis> "
 "option, then the installer will allocate the available space according to "
@@ -1739,7 +1752,7 @@ msgstr ""
 "emphasis>, засіб встановлення розподілить доступне місце за такими правилами:"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:137
+#: en/doPartitionDisks.xml:142
 msgid ""
 "If the total available space is less than 50 GB, then only one partition is "
 "created. This will be the <filename>/</filename> (root)  partition."
@@ -1749,14 +1762,14 @@ msgstr ""
 "створено не буде."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:143
+#: en/doPartitionDisks.xml:148
 msgid ""
 "If the total available space is greater than 50 GB, then three partitions "
 "are created"
 msgstr "Якщо загалом доступного місця понад 50 ГБ, буде створено три розділи"
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:148
+#: en/doPartitionDisks.xml:153
 msgid ""
 "6/19 of the total available place is allocated to <filename>/</filename> "
 "with a maximum of 50 GB"
@@ -1765,20 +1778,20 @@ msgstr ""
 "<filename>/</filename>"
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:153
+#: en/doPartitionDisks.xml:158
 msgid "1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB"
 msgstr ""
 "1/19, але не більше за 4 ГБ, буде віддано розділу резервної пам’яті на диску "
 "(<filename>swap</filename>)"
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:158
+#: en/doPartitionDisks.xml:163
 msgid "the rest (at least 12/19) is allocated to <filename>/home</filename>"
 msgstr ""
 "решту (принаймні 12/19) буде віддано розділу <filename>/home</filename>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:165
+#: en/doPartitionDisks.xml:170
 msgid ""
 "This means that from 160 GB or greater available space, the installer will "
 "create three partitions:"
@@ -1787,22 +1800,22 @@ msgstr ""
 "встановлення буде створено три розділи:"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:170
+#: en/doPartitionDisks.xml:175
 msgid "50 GB for <filename>/</filename>"
 msgstr "50 ГБ для <filename>/</filename>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:174
+#: en/doPartitionDisks.xml:179
 msgid "4 GB for <filename>swap</filename>"
 msgstr "4 ГБ для резервної пам’яті на диску"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:178
+#: en/doPartitionDisks.xml:183
 msgid "and the remainder for <filename>/home</filename>"
 msgstr "Решту місця буде віддано під <filename>/home</filename>"
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:183
+#: en/doPartitionDisks.xml:188
 msgid ""
 "If you are using a UEFI system, the ESP (EFI System Partition) will be "
 "automatically detected - or created if it does not exist yet - and mounted "
@@ -1817,7 +1830,7 @@ msgstr ""
 "належним чином."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:189
+#: en/doPartitionDisks.xml:194
 msgid ""
 "If you are using a Legacy (also known as BIOS) system with a GPT partitioned "
 "disk, you need to create a BIOS boot partition if it doesn't already exist. "
@@ -1835,23 +1848,28 @@ msgstr ""
 "завантаження BIOS»."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:196
+#: en/doPartitionDisks.xml:201
 msgid "See <xref linkend=\"diskdrake\"/> for information on how to proceed."
 msgstr ""
 "Докладніші відомості щодо подальших дій можна знайти у розділі <xref linkend="
 "\"diskdrake\"/>."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:211
+#: en/doPartitionDisks.xml:216
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4.png"
-"\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks4.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks4.png\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4.png"
-"\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:217
+#: en/doPartitionDisks.xml:226
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
 "previous standard of 512. Due to lack of available hardware, the "
@@ -1865,7 +1883,7 @@ msgstr ""
 "виконувалося."
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:222
+#: en/doPartitionDisks.xml:231
 msgid ""
 "Some SSD devices now use an erase block size over 1 MB. If you have such a "
 "device we suggest that you partition the drive in advance, using an "
@@ -1878,17 +1896,17 @@ msgstr ""
 "параметрів:"
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:229
+#: en/doPartitionDisks.xml:238
 msgid "<emphasis>Align to</emphasis> = MiB"
 msgstr "<emphasis>Вирівняти до</emphasis> = МіБ"
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:233
+#: en/doPartitionDisks.xml:242
 msgid "<emphasis>Free space preceding (MiB)</emphasis> = 2"
 msgstr "<emphasis>Вільне місце перед (МіБ)</emphasis> = 2"
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:237
+#: en/doPartitionDisks.xml:246
 msgid ""
 "Also make sure all partitions are created using an even number of megabytes."
 msgstr ""
@@ -2075,12 +2093,12 @@ msgstr ""
 "link>, якщо хочете дізнатися більше про участь у спільноті Mageia"
 
 #. type: Content of: <section><info><title>
-#: en/firewall.xml:7
+#: en/firewall.xml:16
 msgid "Firewall"
 msgstr "Захисний шлюз"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:10
+#: en/firewall.xml:19
 msgid ""
 "This section allows you to configure some simple firewall rules: they "
 "determine which type of message from the Internet will be accepted by the "
@@ -2092,8 +2110,18 @@ msgstr ""
 "яке буде прийнятним для системи призначення. Це, відповідним чином, "
 "уможливить доступ до відповідних служб системи з мережі Інтернет."
 
+#. type: Content of: <section><mediaobject>
+#: en/firewall.xml:26
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-firewall.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome.png\"/> </"
+"imageobject>"
+
 #. type: Content of: <section><para>
-#: en/firewall.xml:16
+#: en/firewall.xml:31
 msgid ""
 "In the default setting (no button is checked), no service of the system is "
 "accessible from the network. The <emphasis>Everything (no firewall)</"
@@ -2114,7 +2142,7 @@ msgstr ""
 "або діагностики."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:25
+#: en/firewall.xml:40
 msgid ""
 "All other options are more or less self-explanatory. As an example, you will "
 "enable the CUPS server if you want printers on your machine to be accessible "
@@ -2125,12 +2153,12 @@ msgstr ""
 "щоб принтери на вашому комп’ютері були доступними з мережі."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:29
+#: en/firewall.xml:44
 msgid "<emphasis role=\"bold\">Advanced</emphasis>"
 msgstr "<emphasis role=\"bold\">Додатково</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:31
+#: en/firewall.xml:46
 msgid ""
 "The <emphasis>Advanced</emphasis> option opens a window where you can enable "
 "a series of services by typing a list of <quote>couples</quote> (blank "
@@ -2143,33 +2171,37 @@ msgstr ""
 "пробілами)."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:35
-msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
+#: en/firewall.xml:50
+#, fuzzy
+msgid "<emphasis>&lt;port-number&gt;/&lt;protocol&gt;</emphasis>"
 msgstr "<emphasis>&lt;номер порту>/&lt;протокол></emphasis>"
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:38
+#: en/firewall.xml:53
+#, fuzzy
 msgid ""
-"- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
-"the service you want to enable (e.g. 873 for the RSYNC service) as defined "
-"in <emphasis>RFC-433</emphasis>;"
+"- <emphasis>&lt;port-number&gt;</emphasis> is the value of the port assigned "
+"to the service you want to enable (e.g. 873 for the RSYNC service) as "
+"defined in <emphasis>RFC-433</emphasis>;"
 msgstr ""
 "- <emphasis>&lt;номер порту></emphasis> — значення номеру порту, пов’язаного "
 "із службою, доступ до якої ви хочете відкрити (наприклад, 873 для служби "
 "RSYNC). Номер визначається за протоколом <emphasis>RFC-433</emphasis>;"
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:42
+#: en/firewall.xml:57
+#, fuzzy
 msgid ""
-"- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
-"<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
+"- <emphasis>&lt;protocol&gt;</emphasis> is one of <emphasis>TCP</emphasis> "
+"or <emphasis>UDP</emphasis> - the internet protocol that is used by the "
+"service."
 msgstr ""
 "- <emphasis>&lt;протокол></emphasis> — одне зі значень, <emphasis>TCP</"
 "emphasis> або <emphasis>UDP</emphasis> — інтернет-протокол, який "
 "використовуватиметься для обміну даними із службою."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:47
+#: en/firewall.xml:62
 msgid ""
 "For instance, the entry for enabling access to the RSYNC service therefore "
 "is <emphasis>873/tcp</emphasis>."
@@ -2178,7 +2210,7 @@ msgstr ""
 "<emphasis>873/tcp</emphasis>."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:50
+#: en/firewall.xml:65
 msgid ""
 "In case a service is implemented to use both protocols, you specify 2 "
 "couples for the same port."
@@ -2266,12 +2298,12 @@ msgid "Graphical Configuration"
 msgstr "Налаштування графіки"
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:32
+#: en/installer.xml:34
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, програма для встановлення Mageia"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:35
+#: en/installer.xml:37
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -2282,12 +2314,12 @@ msgstr ""
 "оновлення системи якомога простішим для вас."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:40
+#: en/installer.xml:42
 msgid "The installation steps"
 msgstr "Кроки встановлення"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:44
+#: en/installer.xml:46
 msgid ""
 "The install process is divided into a number of steps - the status of which "
 "is indicated in a panel to the left of the screen."
@@ -2296,7 +2328,7 @@ msgstr ""
 "показано на лівій бічній панелі екрана."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:50
+#: en/installer.xml:52
 msgid ""
 "Each step has one or more screens, which may also have <emphasis>Advanced</"
 "emphasis> sections with extra, less commonly required options."
@@ -2307,7 +2339,7 @@ msgstr ""
 "часто як основними."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:56
+#: en/installer.xml:58
 msgid ""
 "Most screens have <emphasis>Help</emphasis> buttons for further details "
 "about the particular step."
@@ -2316,7 +2348,7 @@ msgstr ""
 "за допомогою якої можна отримати додаткові пояснення щодо поточного кроку."
 
 #. type: Content of: <section><section><caution><para>
-#: en/installer.xml:62
+#: en/installer.xml:64
 msgid ""
 "If at some point during the install you decide to abort the installation, it "
 "is possible to reboot, but please think twice before you do this. Once a "
@@ -2331,7 +2363,7 @@ msgstr ""
 "до неможливості користування системою."
 
 #. type: Content of: <section><section><caution><para>
-#: en/installer.xml:68
+#: en/installer.xml:70
 msgid ""
 "If, in spite of this, you are very sure rebooting is what you want, go to a "
 "text terminal by pressing the keys <keycombo> <keycap>Ctrl</keycap> "
@@ -2347,12 +2379,12 @@ msgstr ""
 "keycombo> одночасно, щоб перезавантажити комп’ютер."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:86
+#: en/installer.xml:88
 msgid "Installation Welcome Screen"
 msgstr "Вітальне вікно програми для встановлення"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:88
+#: en/installer.xml:90
 msgid ""
 "The particular screen that you will first see when booting from the "
 "Installation media will depend on whether your computer motherboard is of "
@@ -2363,7 +2395,7 @@ msgstr ""
 "застарілої мікропрограми (BIOS) чи UEFI."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:92
+#: en/installer.xml:94
 msgid ""
 "The welcome menu screen has various options, however the default option will "
 "start the installer, and is normally all that you will need."
@@ -2373,12 +2405,12 @@ msgstr ""
 "саме той пункт, який вам потрібен."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:97
+#: en/installer.xml:99
 msgid "Legacy (BIOS) Systems"
 msgstr "Застарілі системи (BIOS)"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:100
+#: en/installer.xml:102
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome.png\"/> </"
 "imageobject>"
@@ -2387,7 +2419,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:111
+#: en/installer.xml:113
 msgid ""
 "Install Mageia to a hard disk. This is the default option, and will "
 "automatically start after a short while unless another option is selected."
@@ -2396,12 +2428,12 @@ msgstr ""
 "протягом певного часу не буде вибрано інший варіант."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:117
+#: en/installer.xml:119
 msgid "<emphasis role=\"bold\">Rescue System</emphasis>"
 msgstr "<emphasis role=\"bold\">Порятунок системи</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:119
+#: en/installer.xml:121
 msgid ""
 "This option allows you to either re-install the bootloader for an existing "
 "Mageia installation or you can use it to restore a Windows bootloader."
@@ -2410,22 +2442,22 @@ msgstr ""
 "встановленої Mageia, або відновити завантажувач Windows."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:132
+#: en/installer.xml:134
 msgid "<emphasis role=\"bold\">F2: Language</emphasis>"
 msgstr "<emphasis role=\"bold\">F2: Мова</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:134
+#: en/installer.xml:136
 msgid "Press F2 for alternative languages."
 msgstr "Натисніть F2, якщо хочете вибрати іншу мову."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:140
+#: en/installer.xml:142
 msgid "UEFI Systems"
 msgstr "Системи UEFI"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:142
+#: en/installer.xml:144
 msgid ""
 "From this screen, you can access options by pressing <keycap>e</keycap> to "
 "enter the edit mode. To come back to this screen, press <keycap>Esc</keycap> "
@@ -2438,7 +2470,7 @@ msgstr ""
 "режиму редагування."
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:148
+#: en/installer.xml:150
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome2.png\"/> </"
 "imageobject>"
@@ -2447,14 +2479,14 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:157
+#: en/installer.xml:159
 msgid "<emphasis role=\"bold\">Install:</emphasis> Start the Install process"
 msgstr ""
 "<emphasis role=\"bold\">Встановити:</emphasis> розпочати процедуру "
 "встановлення"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:162
+#: en/installer.xml:164
 msgid ""
 "<emphasis role=\"bold\">Rescue:</emphasis> This option allows you to either "
 "re-install the bootloader for an existing Mageia installation or you can use "
@@ -2465,7 +2497,7 @@ msgstr ""
 "відновити завантажувач Windows."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:169
+#: en/installer.xml:171
 msgid ""
 "<emphasis role=\"bold\">F2: Language:</emphasis> Press <keycap>F2</keycap> "
 "for alternative languages."
@@ -2474,7 +2506,7 @@ msgstr ""
 "щоб змінити мову."
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:174
+#: en/installer.xml:176
 msgid ""
 "If you booted from a USB stick, you will see the above options duplicated, "
 "and in this case, you should use the set that will be suffixed with \"USB\"."
@@ -2484,17 +2516,17 @@ msgstr ""
 "один із цих рядків."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:181
+#: en/installer.xml:183
 msgid "Installation Problems and Possible Solutions"
 msgstr "Проблеми зі встановленням та можливі шляхи їх вирішення"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:184
+#: en/installer.xml:186
 msgid "No Graphical Interface"
 msgstr "Немає графічного інтерфейсу"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:188
+#: en/installer.xml:190
 msgid ""
 "After the initial screen you did not progress to the <emphasis>Language "
 "Selection</emphasis> screen. This can happen with some graphic cards and "
@@ -2507,7 +2539,7 @@ msgstr ""
 "впишіть <command>vgalo</command> у рядок запиту."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:195
+#: en/installer.xml:197
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
 "In this case it is worth trying a text-mode installation. To use this press "
@@ -2526,12 +2558,12 @@ msgstr ""
 "Встановлення буде продовжено у текстовому режимі."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:208
+#: en/installer.xml:210
 msgid "The Install Freezes"
 msgstr "Встановлення зупиняється"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:210
+#: en/installer.xml:212
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic hardware "
@@ -2547,12 +2579,12 @@ msgstr ""
 "command>. За потреби, цю команду можна поєднати з вищевказаними командами."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:218
+#: en/installer.xml:220
 msgid "RAM problem"
 msgstr "Проблеми з оперативною пам’яттю"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:220
+#: en/installer.xml:222
 msgid ""
 "This will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
@@ -2569,12 +2601,12 @@ msgstr ""
 "оперативної пам’яті."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:228
+#: en/installer.xml:230
 msgid "Dynamic partitions"
 msgstr "Динамічні розділи"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:230
+#: en/installer.xml:232
 msgid ""
 "If you converted your hard disk from <literal>Basic</literal> format to "
 "<literal>Dynamic</literal> format in Microsoft Windows, then it is not "
@@ -4611,22 +4643,29 @@ msgstr ""
 "mageia.org/en/Grub2-efi_and_Mageia</link>"
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:27
+#: en/setupBootloader.xml:32
 msgid "Bootloader"
 msgstr "Завантажувач"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:31
+#: en/setupBootloader.xml:36
+#, fuzzy
+msgid "Available Bootloaders"
+msgstr "Завантажувач"
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:39
 msgid "Grub2"
 msgstr "Grub2"
 
-#. type: Content of: <section><section><itemizedlist><title>
-#: en/setupBootloader.xml:34
-msgid "Grub2 on Legacy MBR/GPT systems"
-msgstr "GRUB2 для застарілих систем із MBR та GPT"
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:42
+#, fuzzy
+msgid "<emphasis role=\"bold\">Grub2 on Legacy MBR/GPT systems</emphasis>"
+msgstr "<emphasis role=\"bold\">Порятунок системи</emphasis>"
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:37
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:46
 msgid ""
 "GRUB2 (with or without graphical menu) will be used exclusively as the "
 "bootloader for a Legacy/MBR or Legacy/GPT system."
@@ -4634,8 +4673,8 @@ msgstr ""
 "GRUB2 (з графічним меню або без нього) буде єдиним варіантом завантажувача "
 "для застарілих систем із MBR або GPT."
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:42
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:52
 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."
@@ -4643,18 +4682,20 @@ msgstr ""
 "Типово, новий завантажувач буде записано до MBR (Master Boot Record) вашого "
 "першого диска, або до завантажувального розділу BIOS."
 
-#. type: Content of: <section><section><itemizedlist><title>
-#: en/setupBootloader.xml:49
-msgid "Grub2-efi on UEFI systems"
-msgstr "GRUB2-efi у системах UEFI"
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:59
+#, fuzzy
+msgid "<emphasis role=\"bold\">Grub2-efi on UEFI systems</emphasis>"
+msgstr "<emphasis role=\"bold\">Порятунок системи</emphasis>"
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:52
-msgid "GRUB2-efi will be used exclusively as the bootloader for a UEFI system."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:63
+#, fuzzy
+msgid "GRUB2-efi or rEFInd may be used as the bootloader for a UEFI system."
 msgstr "Для систем UEFI використовується лише завантажувач GRUB2-efi."
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:57
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:68
 msgid ""
 "By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI "
 "System Partition)."
@@ -4662,12 +4703,13 @@ msgstr ""
 "Типово, новий завантажувач (Grub2-efi) буде записано до ESP (системного "
 "розділу EFI)."
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:60
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:71
+#, fuzzy
 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 "
-"created by Windows and add grub2-efi to it. If no ESP exists, then one will "
+"created by Windows and add grub2-efi to it.  If no ESP exists, then one will "
 "be created. Although it is possible to have several ESPs, only one is "
 "required, whatever the number of operating systems you have."
 msgstr ""
@@ -4678,18 +4720,46 @@ msgstr ""
 "одним таким розділом, оскільки його достатньо для довільної кількості "
 "встановлених вами операційних систем."
 
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:82
+msgid "rEFInd"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:85
+#, fuzzy
+msgid "<emphasis role=\"bold\">rEFInd on UEFI systems</emphasis>"
+msgstr "<emphasis role=\"bold\">Піктограма</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:88
+msgid ""
+"rEFInd has a nice graphical set of options, and can auto-detect installed "
+"EFI bootloaders. See: http://www.rodsbooks.com/refind/"
+msgstr ""
+
+#. type: Content of: <section><section><section><note><para>
+#: en/setupBootloader.xml:95
+msgid ""
+"Please note that in order to be able to use the <literal>rEFInd</literal> "
+"option, an installed EFI System Partition must match your system "
+"architecture: if you have a 32bit EFI System Partition installed on a 64bit "
+"machine for instance, then the rEFInd option will not be displayed/available "
+"to you."
+msgstr ""
+
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:72
+#: en/setupBootloader.xml:106
 msgid "Bootloader Setup"
 msgstr "Налаштовування завантажувача"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:76
+#: en/setupBootloader.xml:110
 msgid "Bootloader main options"
 msgstr "Основні параметри завантажувача"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:79
+#: en/setupBootloader.xml:113
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader.png\"/> </imageobject> <imageobject condition=\"live"
@@ -4702,38 +4772,59 @@ msgstr ""
 "im1\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:91
+#: en/setupBootloader.xml:125
 msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
 msgstr "<emphasis role=\"bold\">Використовувати завантажувач</emphasis>"
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:93
+#. type: Content of: <section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:129
 msgid ""
-"This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI "
-"systems will not see this option here."
+"<guimenuitem>GRUB2</guimenuitem> (with either a graphical or a text menu), "
+"can be chosen for both <literal>Legacy MBR/BIOS</literal> systems and "
+"<literal>UEFI</literal> systems."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:136
+msgid ""
+"<guimenuitem>rEFInd</guimenuitem> (with a graphical menu)  is an alternative "
+"option solely for use with <literal>UEFI</literal> systems."
 msgstr ""
-"Цією можливістю можна скористатися лише на застарілих системах MBR/BIOS. "
-"Користувачі систем UEFI її не побачать."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:98
+#: en/setupBootloader.xml:144
 msgid "<emphasis role=\"bold\">Boot device</emphasis>"
 msgstr "<emphasis role=\"bold\">Пристрій завантаження</emphasis>"
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:100
-msgid "Don't change this unless you really know what you are doing"
+#. type: Content of: <section><section><section><itemizedlist><listitem><warning><para>
+#: en/setupBootloader.xml:147
+#, fuzzy
+msgid "Don't change this unless you really know what you are doing."
 msgstr "Не вносьте змін, якщо не певні щодо їхніх наслідків"
 
+#. type: Content of: <section><section><section><itemizedlist><listitem><note><para>
+#: en/setupBootloader.xml:152
+msgid ""
+"There is no option to write GRUB to the boot sector of a partition (e.g: "
+"<filename>sda1</filename>), as this method is considered unreliable."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:157
+msgid ""
+"When using UEFI mode, then the <guilabel>Boot device</guilabel> will be "
+"listed as <guimenuitem>EFI System Partition</guimenuitem>."
+msgstr ""
+
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:105
+#: en/setupBootloader.xml:163
 msgid ""
 "<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
 msgstr ""
 "<emphasis role=\"bold\">Пауза перед завантаженням основної системи</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:108
+#: en/setupBootloader.xml:166
 msgid ""
 "This text box lets you set a delay, in seconds, before the default operating "
 "system is started up."
@@ -4742,12 +4833,12 @@ msgstr ""
 "завантаженням типової операційної системи."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:113
+#: en/setupBootloader.xml:171
 msgid "<emphasis role=\"bold\">Security</emphasis>"
 msgstr "<emphasis role=\"bold\">Безпека</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:115
+#: en/setupBootloader.xml:173
 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 "
@@ -4762,19 +4853,19 @@ msgstr ""
 "можна буде вибрати на наступному етапі."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:126
+#: en/setupBootloader.xml:184
 msgid "Choose a password for the bootloader (optional)"
 msgstr ""
 "За допомогою цього поля для введення тексту ви можете вказати пароль до "
 "завантажувача (необов'язковий)."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:130
+#: en/setupBootloader.xml:188
 msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
 msgstr "<emphasis role=\"bold\">Пароль (ще раз)</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:132
+#: en/setupBootloader.xml:190
 msgid ""
 "Retype the password and DrakX will check that it matches with the one set "
 "above"
@@ -4783,17 +4874,17 @@ msgstr ""
 "збігається введений вами повторно пароль з його початковим варіантом."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:137 en/setupBootloader.xml:212
+#: en/setupBootloader.xml:195 en/setupBootloader.xml:308
 msgid "<emphasis>Advanced</emphasis>"
 msgstr "<emphasis>Додатково</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:141
+#: en/setupBootloader.xml:199
 msgid "<emphasis>Enable ACPI</emphasis>"
 msgstr "<emphasis>Увімкнути ACPI</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:143
+#: en/setupBootloader.xml:201
 msgid ""
 "ACPI (Advanced Configuration and Power Interface) is a standard for power "
 "management. It can save energy by stopping unused devices. Deselecting it "
@@ -4810,12 +4901,12 @@ msgstr ""
 "перезавантаження системи або «замерзання» системи)."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:152
+#: en/setupBootloader.xml:210
 msgid "<emphasis>Enable SMP</emphasis>"
 msgstr "<emphasis>Увімкнути SMP</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:154
+#: en/setupBootloader.xml:212
 msgid ""
 "This option enables/disables symmetric multiprocessing for multi-core "
 "processors"
@@ -4825,12 +4916,12 @@ msgstr ""
 "багатоядерний процесор."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:159
+#: en/setupBootloader.xml:217
 msgid "<emphasis>Enable APIC</emphasis>"
 msgstr "<emphasis>Увімкнути APIC</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:161
+#: en/setupBootloader.xml:219
 msgid ""
 "Enabling this gives the operating system access to the Advanced Programmable "
 "Interrupt Controller. APIC devices permit more complex priority models, and "
@@ -4843,12 +4934,12 @@ msgstr ""
 "переривань)."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:168
+#: en/setupBootloader.xml:226
 msgid "<emphasis>Enable Local APIC</emphasis>"
 msgstr "<emphasis>Увімкнути локальний APIC</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:170
+#: en/setupBootloader.xml:228
 msgid ""
 "Here you can set Local APIC, which manages all external interrupts for a "
 "specific processor in an SMP system"
@@ -4858,12 +4949,70 @@ msgstr ""
 "багатопроцесорних системах."
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:177
+#: en/setupBootloader.xml:235
 msgid "Bootloader Configuration"
 msgstr "Налаштування завантаження"
 
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:237
+msgid ""
+"If, in the previous section you selected <literal>rEFInd</literal> as the "
+"bootloader to use, you would then be presented with the options shown in the "
+"screenshot directly below. Otherwise, please instead move on to the "
+"subsequent screenshot for your options."
+msgstr ""
+
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:180
+#: en/setupBootloader.xml:243
+#, fuzzy
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"rEFIndLoaderConfig.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-rEFIndLoaderConfig.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:253
+#, fuzzy
+msgid "Your rEFInd configuration options:"
+msgstr "Налаштування звуку"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:256
+msgid ""
+"<guimenuitem>Install or update rEFInd in the EFI system partition.</"
+"guimenuitem>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:261
+msgid ""
+"<guimenuitem>Install in EFI/Boot partition (workaround for some BIOS's).</"
+"guimenuitem>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:264
+msgid ""
+"With some BIOS's, the newly written bootloaser for Mageia at end of the "
+"installation will not be recognized. In that case, you can use this option "
+"as a workaround for the issue."
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:270
+msgid ""
+"If you did not select rEFInd as the bootloader to use in the previous "
+"section, then your bootloader configurations are shown below:"
+msgstr ""
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:275
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -4876,22 +5025,22 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:191
+#: en/setupBootloader.xml:286
 msgid "<emphasis role=\"bold\">Default</emphasis>"
 msgstr "<emphasis role=\"bold\">Типовий</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:193
+#: en/setupBootloader.xml:288
 msgid "The operating system to be started up by default."
 msgstr "Типовий варіант операційної системи для завантаження."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:197
+#: en/setupBootloader.xml:292
 msgid "<emphasis role=\"bold\">Append</emphasis>"
 msgstr "<emphasis role=\"bold\">Приєднати</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:199
+#: en/setupBootloader.xml:294
 msgid ""
 "This option lets you pass information to the kernel or tell the kernel to "
 "give you more information as it boots."
@@ -4901,16 +5050,17 @@ msgstr ""
 "завантаження системи."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:204
+#: en/setupBootloader.xml:299
 msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
 msgstr "<emphasis role=\"bold\">Зондування сторонньої ОС</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:206
+#: en/setupBootloader.xml:301
+#, fuzzy
 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, "
-"then untick the Probe Foreign OS option."
+"then untick the <guimenuitem>Probe Foreign OS</guimenuitem> option."
 msgstr ""
 "Якщо на комп’ютері вже встановлено інші операційні системи, Mageia спробує "
 "додати ці системи до вашого нового меню завантаження Mageia. Якщо вам це не "
@@ -4918,7 +5068,7 @@ msgstr ""
 "emphasis>."
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:215
+#: en/setupBootloader.xml:311
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader4.png\"/> </imageobject> <imageobject condition=\"live"
@@ -4931,12 +5081,12 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:226
+#: en/setupBootloader.xml:322
 msgid "<emphasis>Video mode</emphasis>"
 msgstr "<emphasis>Відеорежим</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:228
+#: en/setupBootloader.xml:324
 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 "
@@ -4948,17 +5098,18 @@ msgstr ""
 "розмірностей і глибини кольорів, якими можна скористатися."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:234
+#: en/setupBootloader.xml:330
 msgid "<emphasis>Do not touch ESP or MBR</emphasis>"
 msgstr "<emphasis>Не чіпати ESP або MBR</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:236
+#: en/setupBootloader.xml:332
+#, fuzzy
 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 "
-"missing. Click<emphasis> Ok</emphasis> if you are sure you understand the "
-"implications, and wish to proceed."
+"missing. Click <guimenuitem>Ok </guimenuitem>only if you are sure you "
+"understand the implications, and wish to proceed."
 msgstr ""
 "Виберіть цей варіант, якщо вам не потрібна окрема завантажувана версія "
 "Mageia, а потрібна лише система, яка використовуватиметься у ланцюговому "
@@ -4966,8 +5117,17 @@ msgstr ""
 "встановлюється завантажувач. Натисніть кнопку <emphasis>Гаразд</emphasis>, "
 "якщо ви впевнені у наслідках і хочете продовжити встановлення."
 
+#. type: Content of: <section><section><section><itemizedlist><listitem><warning><para>
+#: en/setupBootloader.xml:338
+msgid ""
+"Chain-loading via legacy bootloaders (GRUB Legacy and LiLo)  is no longer "
+"supported by Mageia as it is likely to fail when attempting to boot this "
+"resulting installation of Mageia. If you use anything other than GRUB2 or "
+"rEFInd for this purpose, then you do so at your own risk!"
+msgstr ""
+
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:245
+#: en/setupBootloader.xml:348
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png"
 "\"/> </imageobject>"
@@ -4976,17 +5136,17 @@ msgstr ""
 "\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:253
+#: en/setupBootloader.xml:356
 msgid "Other Options"
 msgstr "Інші параметри"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:256
+#: en/setupBootloader.xml:359
 msgid "Using an existing bootloader"
 msgstr "Користування вже встановленим завантажувачем"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:258
+#: en/setupBootloader.xml:361
 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 "
@@ -5002,12 +5162,12 @@ msgstr ""
 "до іншої операційної системи."
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:267
+#: en/setupBootloader.xml:370
 msgid "Installing Without a Bootloader"
 msgstr "Встановлення без завантажувача"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:269
+#: en/setupBootloader.xml:372
 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 "
@@ -5438,3 +5598,46 @@ msgstr ""
 "На наступному кроці відбудеться копіювання файлів на жорсткий диск. Ця "
 "процедура триватиме декілька хвилин. Наприкінці процедури ви певний час "
 "бачитимете порожній екран. Це нормально."
+
+#~ msgid ""
+#~ "Type in the user password. There is a shield at the end of the text box "
+#~ "that indicates the strength of the password. (See also <xref linkend="
+#~ "\"givePassword\"/>)"
+#~ msgstr ""
+#~ "У цьому полі вам слід вказати пароль користувача. Колір позначки щита "
+#~ "поряд з цим полем відповідає складності пароля (див. також <link linkend="
+#~ "\"givePassword\">надання пароля</link>)"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> "
+#~ "</imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> "
+#~ "</imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4."
+#~ "png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4."
+#~ "png\"/> </imageobject>"
+
+#~ msgid "Grub2 on Legacy MBR/GPT systems"
+#~ msgstr "GRUB2 для застарілих систем із MBR та GPT"
+
+#~ msgid "Grub2-efi on UEFI systems"
+#~ msgstr "GRUB2-efi у системах UEFI"
+
+#~ msgid ""
+#~ "This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI "
+#~ "systems will not see this option here."
+#~ msgstr ""
+#~ "Цією можливістю можна скористатися лише на застарілих системах MBR/BIOS. "
+#~ "Користувачі систем UEFI її не побачать."
diff --git a/docs/docs/stable/installer/zh_CN.po b/docs/docs/stable/installer/zh_CN.po
index ceca35a7..c89f8ce9 100644
--- a/docs/docs/stable/installer/zh_CN.po
+++ b/docs/docs/stable/installer/zh_CN.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2019-01-19 21:23+0200\n"
+"POT-Creation-Date: 2019-09-08 15:26+0300\n"
 "PO-Revision-Date: 2019-01-19 19:25+0000\n"
 "Last-Translator: zwpwjwtz <zwpwjwtz@126.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/MageiaLinux/mageia/"
@@ -146,7 +146,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/addUser.xml:3
+#: en/addUser.xml:9
 msgid "User Management"
 msgstr ""
 
@@ -156,13 +156,16 @@ msgstr ""
 #. 2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
 #.   Also changed 'Advanced User Management' to 'User Management (advanced)'.
 #. 2018/02/24 apb: Changed list style.
+#. 2019/08/10 apb: Added missing 'condition' profile for live-user1.png.
+#. 2019/08/11 apb: [1] Reword 1.1 (including Note) [2] Reword 1.2 Password text.
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:12
+#: en/addUser.xml:28
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
-"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
-"\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata format="
-"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-setRootPassword.png\" format=\"PNG\" revision=\"1\" xml:id="
+"\"setRootPassword-im1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-user1.png\" format=\"PNG\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
 "\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -170,36 +173,41 @@ msgstr ""
 "\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:21
+#: en/addUser.xml:40
 msgid "Set Administrator (root)  Password:"
 msgstr "设置管理员（root 账户）密码："
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:24
+#: en/addUser.xml:44
 msgid ""
 "It is advisable for all Mageia installations to set a <literal>superuser</"
 "literal> (Administrator) password, usually called the <emphasis>root </"
-"emphasis>password in Linux. As you type a password into the top box a shield "
-"will change from red-to-yellow-to-green depending on the strength of the "
-"password. A green shield shows you are using a strong password. You need to "
-"repeat the same password in the box underneath, to check that the first "
-"entry was not mistyped."
+"emphasis>password in Linux. You need to repeat the same password in the box "
+"underneath, to check that the first entry was not mistyped."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:32
+#: en/addUser.xml:51
+msgid ""
+"As you type a password into the top box a shield will change from red-to-"
+"yellow-to-green depending on the strength of the password. A green shield "
+"shows you are using a strong password."
+msgstr ""
+
+#. type: Content of: <section><section><note><para>
+#: en/addUser.xml:55
 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:39
+#: en/addUser.xml:63
 msgid "Enter a user"
 msgstr "输入用户名"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:41
+#: en/addUser.xml:66
 msgid ""
 "Add a User here. A regular user has fewer privileges than the "
 "<literal>superuser</literal> (root), but enough to use the Internet, office "
@@ -208,39 +216,39 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:47
+#: en/addUser.xml:73
 msgid "<emphasis role=\"bold\">Icon</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:48
+#: en/addUser.xml:75
 msgid "Click on this button if you want to change the user's icon"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:52
+#: en/addUser.xml:80
 msgid "<emphasis role=\"bold\">Real Name</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:53
+#: en/addUser.xml:82
 msgid "Insert the user's real name into this text box"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:56
+#: en/addUser.xml:86
 msgid "<emphasis role=\"bold\">Login Name</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:57
+#: en/addUser.xml:88
 msgid ""
 "Enter the user login name or let DrakX use a version of the user's real "
 "name. <emphasis role=\"bold\">The login name is case-sensitive.</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><caution><simpara>
-#: en/addUser.xml:61
+#: en/addUser.xml:93
 msgid ""
 "The login entered here should be different to any login currently in use for "
 "your <filename>/home</filename> directory. Some user parameters will be "
@@ -249,34 +257,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:65 en/setupBootloader.xml:124
+#: en/addUser.xml:102 en/setupBootloader.xml:182
 msgid "<emphasis role=\"bold\">Password</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:66
-msgid ""
-"Type in the user password. There is a shield at the end of the text box that "
-"indicates the strength of the password. (See also <xref linkend="
-"\"givePassword\"/>)"
+#: en/addUser.xml:104
+msgid "Type in the user password (remembering the advice in the Note above)."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:68
+#: en/addUser.xml:107
 msgid ""
 "<emphasis role=\"bold\">Password (again):</emphasis> Retype the user "
 "password. DrakX will check that you have not mistyped the password."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:74
+#: en/addUser.xml:114
 msgid ""
 "Any users added while installing Mageia, will have a home directory that is "
 "both read and write protected (umask=0027)"
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:76
+#: en/addUser.xml:117
 msgid ""
 "You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
@@ -284,24 +289,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:79
+#: en/addUser.xml:121
 msgid "The access permissions can also be changed after the install."
 msgstr "也可以在安装完成后改变访问权限。"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:85
+#: en/addUser.xml:128
 msgid "User Management (advanced)"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:87
+#: en/addUser.xml:131
 msgid ""
 "The <emphasis>Advanced</emphasis> option allows you to edit further settings "
 "for the user you are adding."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:91
+#: en/addUser.xml:136
 msgid ""
 "<emphasis>Shell</emphasis>: This drop-down list allows you to change the "
 "shell available to any user you added in the previous screen. Options are "
@@ -309,7 +314,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:143
 msgid ""
 "<emphasis>User ID</emphasis>: Here you can set the user ID for any user you "
 "added in the previous screen. If you are unsure what the purpose of this is, "
@@ -317,7 +322,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:102
+#: en/addUser.xml:149
 msgid ""
 "<emphasis>Group ID</emphasis>: This lets you set the group ID.  Again, if "
 "unsure, leave it blank."
@@ -437,24 +442,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:23
+#: en/bootLive.xml:10
 msgid "Boot Mageia as Live system"
 msgstr "引导 Mageia Live 系统"
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:28
+#: en/bootLive.xml:14
 msgid "Booting the medium"
 msgstr "引导媒体"
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:31
+#: en/bootLive.xml:16
 msgid ""
 "You can boot directly from a Live DVD or USB. Usually, you just need to plug "
 "the USB device in or place the DVD in the drive and restart the computer."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:35
+#: en/bootLive.xml:19
 msgid ""
 "If the computer does not automatically boot from the USB or DVD you may need "
 "to reconfigure your BIOS Boot Disk priority. Alternatively, you might try "
@@ -463,7 +468,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><tip><para>
-#: en/bootLive.xml:41
+#: en/bootLive.xml:24
 msgid ""
 "To access the BIOS or boot menu when the computer is starting, you can try "
 "pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or <keycap>Esc</"
@@ -473,7 +478,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/bootLive.xml:50
+#: en/bootLive.xml:32
 msgid ""
 "The actual screen that you will first see when booting from the Live media "
 "will depend on whether your computer motherboard is of the Legacy (BIOS) or "
@@ -481,91 +486,93 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:58
+#: en/bootLive.xml:39
 msgid "In BIOS/CSM/Legacy mode"
 msgstr "在 BIOS/CSM/Legacy 模式下"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:62
+#: en/bootLive.xml:42
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"../live-bootCSM.png\" align=\"center\"/> "
+"</imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:67
+#: en/bootLive.xml:46
 msgid "First screen while booting in BIOS mode"
 msgstr "在 BIOS 模式下引导时的第一个画面"
 
 #. type: Content of: <section><section><section><itemizedlist><title>
-#: en/bootLive.xml:72 en/bootLive.xml:144 en/installer.xml:106
-#: en/installer.xml:154
+#: en/bootLive.xml:50 en/bootLive.xml:104 en/installer.xml:108
+#: en/installer.xml:156
 msgid "Menu"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:75 en/bootLive.xml:147
+#: en/bootLive.xml:52 en/bootLive.xml:106
 msgid "<emphasis role=\"bold\">Boot Mageia</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:77
+#: en/bootLive.xml:53
 msgid ""
 "This option will boot the Mageia Live system from the connected DVD/USB "
 "media (expect a very slow system compared to an installed OS)."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:81
+#: en/bootLive.xml:56
 msgid "Once the boot is done, you can proceed to the installation."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:86 en/bootLive.xml:102
+#: en/bootLive.xml:60 en/bootLive.xml:72
 msgid ""
 "<emphasis role=\"bold\">+ use non-free video drivers (slower to boot)</"
 "emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:89
+#: en/bootLive.xml:62
 msgid "Boot the Mageia Live system using non-free video drivers"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:96 en/bootLive.xml:155 en/installer.xml:109
+#: en/bootLive.xml:68 en/bootLive.xml:112 en/installer.xml:111
 msgid "<emphasis role=\"bold\">Install Mageia</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:98 en/bootLive.xml:157
+#: en/bootLive.xml:69 en/bootLive.xml:113
 msgid "This option will install Mageia to a hard disk."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:105
+#: en/bootLive.xml:74
 msgid "Install Mageia using non-free video drivers"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:111 en/installer.xml:125
+#: en/bootLive.xml:79 en/installer.xml:127
 msgid "<emphasis role=\"bold\">Memory Test</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:113 en/installer.xml:127
+#: en/bootLive.xml:80 en/installer.xml:129
 msgid ""
 "Test the installed RAM by performing multiple read and write operations. "
 "Reboot to end the test."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:118 en/bootLive.xml:161
+#: en/bootLive.xml:84 en/bootLive.xml:116
 msgid "<emphasis role=\"bold\"> F2 Language</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:120 en/bootLive.xml:163
+#: en/bootLive.xml:85 en/bootLive.xml:117
 msgid ""
 "Press <keycap>F2</keycap> to have the installer use a specific language "
 "during the installation. Use the arrow keys to select the language then "
@@ -573,24 +580,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:129
+#: en/bootLive.xml:93
 msgid "In UEFI mode"
 msgstr "在 UEFI 模式下"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:133
+#: en/bootLive.xml:96
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:139
+#: en/bootLive.xml:100
 msgid "First screen while booting in UEFI mode"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:149
+#: en/bootLive.xml:107
 msgid ""
 "This option will boot the Mageia Live system from the connected DVD/USB "
 "media (expect a very slow system compared to an installed OS).  Once the "
@@ -598,7 +608,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/bootLive.xml:170
+#: en/bootLive.xml:123
 msgid ""
 "If you booted from a USB stick, you will see the above menu options "
 "duplicated, and in this case, you should choose from the menu pair that will "
@@ -816,12 +826,12 @@ msgstr ""
 "若您安装了多个操作系统，请确保硬件时钟均被设为本地时间，或均为 UTC/GMT。"
 
 #. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:24
+#: en/configureX_card_list.xml:27
 msgid "Choose an X Server (Configure your Graphic Card)"
 msgstr "选择一个X服务器(配置您的显示卡)"
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_card_list.xml:29
+#: en/configureX_card_list.xml:32
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_card_list."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_card_list-im1\"/> </"
@@ -829,36 +839,36 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:35
+#: en/configureX_card_list.xml:38
 msgid ""
 "DrakX has a very comprehensive database of video cards and will usually "
 "correctly identify your video device."
 msgstr "DrakX 有齐全的显卡数据库，一般情况下可以正确识别您的视频设备。"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:38
+#: en/configureX_card_list.xml:41
 msgid ""
 "If the installer has not correctly detected your graphic card and you know "
 "which one you have, you can select it from the tree by:"
 msgstr "若安装程序无法正确检测您的显卡，请在以下列表中选择一个合适的配置："
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_card_list.xml:41 en/configureX_monitor.xml:74
+#: en/configureX_card_list.xml:44 en/configureX_monitor.xml:78
 msgid "Vendor"
 msgstr "厂家"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:45
+#: en/configureX_card_list.xml:48
 msgid "then the make of your card"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:49
+#: en/configureX_card_list.xml:52
 msgid "and the model of card"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:53
+#: en/configureX_card_list.xml:56
 msgid ""
 "If you cannot find your card in the vendor lists (because it's not yet in "
 "the database or it's an older card) you may find a suitable driver in the "
@@ -869,14 +879,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><caution><para>
-#: en/configureX_card_list.xml:61
+#: en/configureX_card_list.xml:64
 msgid ""
 "Be aware that if you select an incompatible driver you may only have access "
 "to the <emphasis>Command Line Interface</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:65
+#: en/configureX_card_list.xml:68
 msgid ""
 "Some video card manufacturers provide proprietary drivers for Linux which "
 "may only be available in the <emphasis>Nonfree</emphasis> repository and in "
@@ -887,17 +897,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:11
-msgid "Graphic Card and Monitor Configuration"
+#: en/configureX_chooser.xml:23
+#, fuzzy
+msgid "Graphics Card and Monitor Configuration"
 msgstr "显示卡和显示器配置"
 
-#.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
-#. 2018/02/15 apb: Some text and typography.
-#. 2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.
-#. 2018/02/23 apb: Typo.
-#. 2019/01/06 apb: Slight reword, split 1st para in two.
 #. type: Content of: <section><mediaobject>
-#: en/configureX_chooser.xml:26
+#: en/configureX_chooser.xml:28
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_chooser."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_chooser-im1\"/> </"
@@ -905,7 +911,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:32
+#: en/configureX_chooser.xml:34
 msgid ""
 "No matter which graphical environment (also known as desktop environment) "
 "you chose for this install of Mageia, they are all based on a graphical user "
@@ -916,31 +922,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:39
+#: en/configureX_chooser.xml:41
 msgid ""
 "Choose the appropriate settings manually if you think the details are "
 "incorrect, or if none are shown."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:44
-msgid "<emphasis role=\"bold\">Graphic Card</emphasis>"
+#: en/configureX_chooser.xml:46
+msgid "<emphasis role=\"bold\">Graphics Card</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:47
+#: en/configureX_chooser.xml:49
 msgid ""
 "If you need to, you can select a specific card from this expandable list. "
 "See <xref linkend=\"configureX_card_list\"/>."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:52
+#: en/configureX_chooser.xml:54
 msgid "<emphasis role=\"bold\">Monitor</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:55
+#: en/configureX_chooser.xml:57
 msgid ""
 "You can choose Plug 'n Play, if applicable, or choose your monitor from the "
 "<emphasis>Vendor</emphasis> or <emphasis>Generic</emphasis> lists. Choose "
@@ -950,22 +956,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:63
+#: en/configureX_chooser.xml:65
 msgid "<emphasis role=\"bold\">Resolution</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:66
+#: en/configureX_chooser.xml:68
 msgid "The resolution and color depth of your monitor can be set here."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:71
+#: en/configureX_chooser.xml:73
 msgid "<emphasis role=\"bold\">Test</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:74
+#: en/configureX_chooser.xml:76
 msgid ""
 "The test button does not always appear during install. If the option is "
 "there, and you test your settings, you should be asked to confirm that your "
@@ -977,17 +983,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:85
+#: en/configureX_chooser.xml:87
 msgid "<emphasis role=\"bold\">Options</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:88
+#: en/configureX_chooser.xml:90
 msgid "Here you can choose to enable or disable various options."
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_chooser.xml:93
+#: en/configureX_chooser.xml:95
 msgid ""
 "There is a risk of damaging a monitor if you choose refresh rates that are "
 "outside the frequency range of that monitor. This applies to older CRT "
@@ -996,19 +1002,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_monitor.xml:22
+#: en/configureX_monitor.xml:26
 msgid "Choosing your Monitor"
 msgstr "选择您的显示器"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:25
+#: en/configureX_monitor.xml:29
 msgid ""
 "DrakX has a very comprehensive database of monitors and will usually "
 "correctly identify yours."
 msgstr "DrakX 有齐全的显卡数据库，一般情况下可以正确识别您的视频设备。"
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:30
+#: en/configureX_monitor.xml:34
 msgid ""
 "<emphasis role=\"bold\">Selecting a monitor with different characteristics "
 "could damage your monitor or video hardware. Please don't try something "
@@ -1017,7 +1023,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:38
+#: en/configureX_monitor.xml:42
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
@@ -1028,12 +1034,12 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:46
+#: en/configureX_monitor.xml:50
 msgid "Custom"
 msgstr "自定义"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:49
+#: en/configureX_monitor.xml:53
 msgid ""
 "This option allows you to set two critical parameters: the vertical refresh "
 "rate and the horizontal sync rate. Vertical refresh determines how often the "
@@ -1042,7 +1048,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:55
+#: en/configureX_monitor.xml:59
 msgid ""
 "It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor "
 "type with a sync range that is beyond the capabilities of your monitor: you "
@@ -1053,56 +1059,57 @@ msgstr ""
 "示器。若仍有疑问，请查询显示器文档。"
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:64
+#: en/configureX_monitor.xml:68
 msgid "Plug'n Play"
 msgstr "即插即用"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:67
+#: en/configureX_monitor.xml:71
 msgid ""
 "This is the default option and automatically tries to determine the monitor "
 "type from the monitor database."
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:77
+#: en/configureX_monitor.xml:81
+#, fuzzy
 msgid ""
 "If the installer has not correctly detected your monitor and you know which "
-"one you have, you can select it from the tree by selecting:"
+"one you have, you can choose it from the options by selecting:"
 msgstr "若安装程序无法正确检测您的显示器，请在以下列表中选择一个合适的配置："
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:86
+#: en/configureX_monitor.xml:90
 msgid "Manufacturer"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:90
+#: en/configureX_monitor.xml:94
 msgid "Monitor model"
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:96
+#: en/configureX_monitor.xml:100
 msgid "Generic"
 msgstr "通用"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:99
+#: en/configureX_monitor.xml:103
 msgid ""
-"Selecting this group will list nearly 30 display configurations such as "
-"1024x768 @ 60Hz and includes flat-panel displays as used in laptops. This is "
-"often a good monitor selection group if you need to use the VESA card driver "
-"when your video hardware cannot be determined automatically.  Once again it "
-"may be wise to be conservative in your selections."
+"Selecting this group will list approximately 30 display configurations such "
+"as 1024x768 @ 60Hz and includes flat-panel displays as used in laptops.  "
+"This is often a good monitor selection group if you need to use the VESA "
+"card driver when your video hardware cannot be determined automatically. "
+"Once again, it may be wise to be conservative in your selections."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:22
+#: en/diskdrake.xml:24
 msgid "Custom Disk Partitioning with DiskDrake"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:27
+#: en/diskdrake.xml:29
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-diskdrake.png\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1110,7 +1117,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:38
+#: en/diskdrake.xml:40
 msgid ""
 "Modify the layout of your disk(s) here. You can remove or create partitions, "
 "change the filesystem or size of a partition and even view their details "
@@ -1118,15 +1125,15 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:47
 msgid ""
 "There is a tab at the top for every detected hard disk (or other storage "
-"device, like a USB key). In the screenshot above there are two available "
-"devices: <filename>sda </filename>and <filename>sdb</filename>."
+"device, like a USB key), for example: <filename>sda</filename>, "
+"<filename>sdb</filename>, <filename>sdc</filename> etc."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:52
+#: en/diskdrake.xml:54
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it. "
@@ -1135,21 +1142,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:60
+#: en/diskdrake.xml:62
 msgid ""
 "Continue until you have adjusted everything to your satisfaction, then click "
 "<emphasis>Done</emphasis> when you're ready."
 msgstr ""
 
 #. type: Content of: <section><warning><orderedlist><listitem><para>
-#: en/diskdrake.xml:69
+#: en/diskdrake.xml:71
 msgid ""
 "Take care with the <emphasis>Clear all</emphasis> option, use it only if you "
 "are sure you want to wipe all partitions on the selected storage device."
 msgstr ""
 
 #. type: Content of: <section><warning><orderedlist><listitem><para>
-#: en/diskdrake.xml:75
+#: en/diskdrake.xml:77
 msgid ""
 "If you wish to use encryption on your <filename>/</filename> partition you "
 "must ensure that you have a separate <filename>/boot</filename> partition. "
@@ -1158,7 +1165,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/diskdrake.xml:87
+#: en/diskdrake.xml:89
 msgid ""
 "If you are installing Mageia on a UEFI system, check that an ESP (EFI System "
 "Partition) is present and correctly mounted on <filename>/boot/EFI</"
@@ -1166,19 +1173,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/diskdrake.xml:93
+#: en/diskdrake.xml:95
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
 "partition is present and of the correct type. See Figure 2 below."
 msgstr ""
 
 #. type: Content of: <section><figure><title>
-#: en/diskdrake.xml:101
+#: en/diskdrake.xml:103
 msgid "EFI System Partition"
 msgstr "EFI 系统分区"
 
 #. type: Content of: <section><figure><mediaobject>
-#: en/diskdrake.xml:104
+#: en/diskdrake.xml:106
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-diskdrake2.png\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1186,17 +1193,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><figure>
-#: en/diskdrake.xml:103 en/diskdrake.xml:117
+#: en/diskdrake.xml:105 en/diskdrake.xml:119
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><figure><title>
-#: en/diskdrake.xml:115
+#: en/diskdrake.xml:117
 msgid "BIOS boot partition"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:118 en/doPartitionDisks.xml:201
+#: en/diskdrake.xml:120 en/doPartitionDisks.xml:206
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1215,26 +1222,26 @@ msgid "Partitioning"
 msgstr "分区"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:31
 msgid "Suggested Partitioning"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:34
 msgid ""
 "In this screen you can see the content of your hard drive(s) along with the "
 "DrakX partitioning proposals for where to install Mageia."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:34
+#: en/doPartitionDisks.xml:38
 msgid ""
 "The actual options available from those shown below will vary according to "
 "the layout and content of your particular hard drive(s)."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:39
+#: en/doPartitionDisks.xml:43
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1243,17 +1250,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><title>
-#: en/doPartitionDisks.xml:49
+#: en/doPartitionDisks.xml:53
 msgid "Main Options"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:56
 msgid "<emphasis role=\"bold\">Use Existing Partitions</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:59
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1262,97 +1269,103 @@ msgstr ""
 "安装。"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:61
+#: en/doPartitionDisks.xml:65
 msgid "<emphasis role=\"bold\">Use Free Space</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:68
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
 msgstr "若硬盘上有未使用的区域，此选项将会把 Mageia 安装到该区域中。"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:70
+#: en/doPartitionDisks.xml:74
 msgid ""
 "<emphasis role=\"bold\">Use Free Space on a Windows Partition</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:73
+#: en/doPartitionDisks.xml:77
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it. 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 important files!"
+"installation but see the warning below."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para><mediaobject>
+#: en/doPartitionDisks.xml:87
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:79
+#: en/doPartitionDisks.xml:82
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
 "light blue and the proposed Mageia partition in dark blue with their "
 "intended sizes just underneath. You have the option to modify these sizes by "
 "clicking and dragging the gap between both partitions.  See the following "
-"screenshot:"
+"screenshot:<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr ""
 
+#. type: Content of: <section><itemizedlist><listitem><warning><para>
+#: en/doPartitionDisks.xml:97
+msgid ""
+"This involves shrinking the size of the Windows partition, and therefore is "
+"a risky operation, so you should make sure you have backed up all important "
+"files before proceeding."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><important><para>
+#: en/doPartitionDisks.xml:103
+#, fuzzy
+msgid ""
+"The partition must be \"clean\", meaning that Windows must have closed down "
+"correctly the last time it was used. It must also have been defragmented, "
+"although this is not a guarantee that all files in the partition have been "
+"moved out of the area that is about to be used for Mageia."
+msgstr ""
+"将会缩小 Windows 分区的大小。该分区必须为“clean”状态，即上一次使用 Windows 时"
+"必须正常地关机或重启。同时，该分区也应当进行碎片整理，即便不能将文件碎片完全"
+"移出待使用区域。我们推荐您对个人文件进行备份后再进行此操作。"
+
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:87
+#: en/doPartitionDisks.xml:112
 msgid "<emphasis role=\"bold\">Erase and use Entire Disk</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:90
+#: en/doPartitionDisks.xml:115
 msgid "This option will allocate the entire drive for Mageia"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:119
 msgid ""
 "This will erase ALL data on the selected hard drive. Take care! 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 this option."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><important><para>
-#: en/doPartitionDisks.xml:101
-msgid ""
-"Note that this involves shrinking the size of the Windows partition. The "
-"partition must be \"clean\", meaning that Windows must have closed down "
-"correctly the last time it was used. It must also have been defragmented, "
-"although this is not a guarantee that all files in the partition have been "
-"moved out of the area that is about to be used. It is highly recommended to "
-"back up your personal files."
-msgstr ""
-"将会缩小 Windows 分区的大小。该分区必须为“clean”状态，即上一次使用 Windows 时"
-"必须正常地关机或重启。同时，该分区也应当进行碎片整理，即便不能将文件碎片完全"
-"移出待使用区域。我们推荐您对个人文件进行备份后再进行此操作。"
-
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:112
+#: en/doPartitionDisks.xml:127
 msgid "<emphasis role=\"bold\">Custom Disk Partitioning</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:115
+#: en/doPartitionDisks.xml:130
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
 msgstr "允许您完全控制系统在硬盘上的安装方式。"
 
-#. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:122
-msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
-msgstr ""
-
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:131
+#: en/doPartitionDisks.xml:136
 msgid ""
 "If you are not using the <emphasis>Custom disk partitioning</emphasis> "
 "option, then the installer will allocate the available space according to "
@@ -1360,60 +1373,60 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:137
+#: en/doPartitionDisks.xml:142
 msgid ""
 "If the total available space is less than 50 GB, then only one partition is "
 "created. This will be the <filename>/</filename> (root)  partition."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:143
+#: en/doPartitionDisks.xml:148
 msgid ""
 "If the total available space is greater than 50 GB, then three partitions "
 "are created"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:148
+#: en/doPartitionDisks.xml:153
 msgid ""
 "6/19 of the total available place is allocated to <filename>/</filename> "
 "with a maximum of 50 GB"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:153
+#: en/doPartitionDisks.xml:158
 msgid "1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:158
+#: en/doPartitionDisks.xml:163
 msgid "the rest (at least 12/19) is allocated to <filename>/home</filename>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:165
+#: en/doPartitionDisks.xml:170
 msgid ""
 "This means that from 160 GB or greater available space, the installer will "
 "create three partitions:"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:170
+#: en/doPartitionDisks.xml:175
 msgid "50 GB for <filename>/</filename>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:174
+#: en/doPartitionDisks.xml:179
 msgid "4 GB for <filename>swap</filename>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:178
+#: en/doPartitionDisks.xml:183
 msgid "and the remainder for <filename>/home</filename>"
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:183
+#: en/doPartitionDisks.xml:188
 msgid ""
 "If you are using a UEFI system, the ESP (EFI System Partition) will be "
 "automatically detected - or created if it does not exist yet - and mounted "
@@ -1423,7 +1436,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:189
+#: en/doPartitionDisks.xml:194
 msgid ""
 "If you are using a Legacy (also known as BIOS) system with a GPT partitioned "
 "disk, you need to create a BIOS boot partition if it doesn't already exist. "
@@ -1434,19 +1447,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:196
+#: en/doPartitionDisks.xml:201
 msgid "See <xref linkend=\"diskdrake\"/> for information on how to proceed."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:211
+#: en/doPartitionDisks.xml:216
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4.png"
-"\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks4.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks4.png\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
+"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
+"\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata format="
+"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:217
+#: en/doPartitionDisks.xml:226
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
 "previous standard of 512. Due to lack of available hardware, the "
@@ -1455,7 +1475,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:222
+#: en/doPartitionDisks.xml:231
 msgid ""
 "Some SSD devices now use an erase block size over 1 MB. If you have such a "
 "device we suggest that you partition the drive in advance, using an "
@@ -1464,17 +1484,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:229
+#: en/doPartitionDisks.xml:238
 msgid "<emphasis>Align to</emphasis> = MiB"
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:233
+#: en/doPartitionDisks.xml:242
 msgid "<emphasis>Free space preceding (MiB)</emphasis> = 2"
 msgstr ""
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:237
+#: en/doPartitionDisks.xml:246
 msgid ""
 "Also make sure all partitions are created using an even number of megabytes."
 msgstr ""
@@ -1642,12 +1662,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/firewall.xml:7
+#: en/firewall.xml:16
 msgid "Firewall"
 msgstr "防火墙"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:10
+#: en/firewall.xml:19
 msgid ""
 "This section allows you to configure some simple firewall rules: they "
 "determine which type of message from the Internet will be accepted by the "
@@ -1655,8 +1675,17 @@ msgid ""
 "system to be accessible from the Internet."
 msgstr ""
 
+#. type: Content of: <section><mediaobject>
+#: en/firewall.xml:26
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-firewall.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+
 #. type: Content of: <section><para>
-#: en/firewall.xml:16
+#: en/firewall.xml:31
 msgid ""
 "In the default setting (no button is checked), no service of the system is "
 "accessible from the network. The <emphasis>Everything (no firewall)</"
@@ -1669,7 +1698,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:25
+#: en/firewall.xml:40
 msgid ""
 "All other options are more or less self-explanatory. As an example, you will "
 "enable the CUPS server if you want printers on your machine to be accessible "
@@ -1677,12 +1706,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:29
+#: en/firewall.xml:44
 msgid "<emphasis role=\"bold\">Advanced</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:31
+#: en/firewall.xml:46
 msgid ""
 "The <emphasis>Advanced</emphasis> option opens a window where you can enable "
 "a series of services by typing a list of <quote>couples</quote> (blank "
@@ -1690,34 +1719,35 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:35
-msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
+#: en/firewall.xml:50
+msgid "<emphasis>&lt;port-number&gt;/&lt;protocol&gt;</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:38
+#: en/firewall.xml:53
 msgid ""
-"- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
-"the service you want to enable (e.g. 873 for the RSYNC service) as defined "
-"in <emphasis>RFC-433</emphasis>;"
+"- <emphasis>&lt;port-number&gt;</emphasis> is the value of the port assigned "
+"to the service you want to enable (e.g. 873 for the RSYNC service) as "
+"defined in <emphasis>RFC-433</emphasis>;"
 msgstr ""
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:42
+#: en/firewall.xml:57
 msgid ""
-"- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
-"<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
+"- <emphasis>&lt;protocol&gt;</emphasis> is one of <emphasis>TCP</emphasis> "
+"or <emphasis>UDP</emphasis> - the internet protocol that is used by the "
+"service."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:47
+#: en/firewall.xml:62
 msgid ""
 "For instance, the entry for enabling access to the RSYNC service therefore "
 "is <emphasis>873/tcp</emphasis>."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:50
+#: en/firewall.xml:65
 msgid ""
 "In case a service is implemented to use both protocols, you specify 2 "
 "couples for the same port."
@@ -1785,12 +1815,12 @@ msgid "Graphical Configuration"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:32
+#: en/installer.xml:34
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX，Mageia 的安装器"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:35
+#: en/installer.xml:37
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -1800,33 +1830,33 @@ msgstr ""
 "级系统。"
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:40
+#: en/installer.xml:42
 msgid "The installation steps"
 msgstr "安装步骤"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:44
+#: en/installer.xml:46
 msgid ""
 "The install process is divided into a number of steps - the status of which "
 "is indicated in a panel to the left of the screen."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:50
+#: en/installer.xml:52
 msgid ""
 "Each step has one or more screens, which may also have <emphasis>Advanced</"
 "emphasis> sections with extra, less commonly required options."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:56
+#: en/installer.xml:58
 msgid ""
 "Most screens have <emphasis>Help</emphasis> buttons for further details "
 "about the particular step."
 msgstr ""
 
 #. type: Content of: <section><section><caution><para>
-#: en/installer.xml:62
+#: en/installer.xml:64
 msgid ""
 "If at some point during the install you decide to abort the installation, it "
 "is possible to reboot, but please think twice before you do this. Once a "
@@ -1836,7 +1866,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><caution><para>
-#: en/installer.xml:68
+#: en/installer.xml:70
 msgid ""
 "If, in spite of this, you are very sure rebooting is what you want, go to a "
 "text terminal by pressing the keys <keycombo> <keycap>Ctrl</keycap> "
@@ -1846,12 +1876,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:86
+#: en/installer.xml:88
 msgid "Installation Welcome Screen"
 msgstr "安装欢迎屏幕"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:88
+#: en/installer.xml:90
 msgid ""
 "The particular screen that you will first see when booting from the "
 "Installation media will depend on whether your computer motherboard is of "
@@ -1859,60 +1889,60 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:92
+#: en/installer.xml:94
 msgid ""
 "The welcome menu screen has various options, however the default option will "
 "start the installer, and is normally all that you will need."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:97
+#: en/installer.xml:99
 msgid "Legacy (BIOS) Systems"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:100
+#: en/installer.xml:102
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome.png\"/> </"
 "imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:111
+#: en/installer.xml:113
 msgid ""
 "Install Mageia to a hard disk. This is the default option, and will "
 "automatically start after a short while unless another option is selected."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:117
+#: en/installer.xml:119
 msgid "<emphasis role=\"bold\">Rescue System</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:119
+#: en/installer.xml:121
 msgid ""
 "This option allows you to either re-install the bootloader for an existing "
 "Mageia installation or you can use it to restore a Windows bootloader."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:132
+#: en/installer.xml:134
 msgid "<emphasis role=\"bold\">F2: Language</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:134
+#: en/installer.xml:136
 msgid "Press F2 for alternative languages."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:140
+#: en/installer.xml:142
 msgid "UEFI Systems"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:142
+#: en/installer.xml:144
 msgid ""
 "From this screen, you can access options by pressing <keycap>e</keycap> to "
 "enter the edit mode. To come back to this screen, press <keycap>Esc</keycap> "
@@ -1920,19 +1950,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:148
+#: en/installer.xml:150
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome2.png\"/> </"
 "imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:157
+#: en/installer.xml:159
 msgid "<emphasis role=\"bold\">Install:</emphasis> Start the Install process"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:162
+#: en/installer.xml:164
 msgid ""
 "<emphasis role=\"bold\">Rescue:</emphasis> This option allows you to either "
 "re-install the bootloader for an existing Mageia installation or you can use "
@@ -1940,31 +1970,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:169
+#: en/installer.xml:171
 msgid ""
 "<emphasis role=\"bold\">F2: Language:</emphasis> Press <keycap>F2</keycap> "
 "for alternative languages."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:174
+#: en/installer.xml:176
 msgid ""
 "If you booted from a USB stick, you will see the above options duplicated, "
 "and in this case, you should use the set that will be suffixed with \"USB\"."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:181
+#: en/installer.xml:183
 msgid "Installation Problems and Possible Solutions"
 msgstr "安装问题和问题解决方案"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:184
+#: en/installer.xml:186
 msgid "No Graphical Interface"
 msgstr "不使用图形界面"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:188
+#: en/installer.xml:190
 msgid ""
 "After the initial screen you did not progress to the <emphasis>Language "
 "Selection</emphasis> screen. This can happen with some graphic cards and "
@@ -1973,7 +2003,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:195
+#: en/installer.xml:197
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
 "In this case it is worth trying a text-mode installation. To use this press "
@@ -1984,12 +2014,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:208
+#: en/installer.xml:210
 msgid "The Install Freezes"
 msgstr "安装停止"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:210
+#: en/installer.xml:212
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic hardware "
@@ -1999,12 +2029,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:218
+#: en/installer.xml:220
 msgid "RAM problem"
 msgstr "内存问题"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:220
+#: en/installer.xml:222
 msgid ""
 "This will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
@@ -2014,12 +2044,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:228
+#: en/installer.xml:230
 msgid "Dynamic partitions"
 msgstr "动态分区"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:230
+#: en/installer.xml:232
 msgid ""
 "If you converted your hard disk from <literal>Basic</literal> format to "
 "<literal>Dynamic</literal> format in Microsoft Windows, then it is not "
@@ -3648,73 +3678,107 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:27
+#: en/setupBootloader.xml:32
 msgid "Bootloader"
 msgstr "引导程序"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:31
+#: en/setupBootloader.xml:36
+#, fuzzy
+msgid "Available Bootloaders"
+msgstr "引导程序"
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:39
 msgid "Grub2"
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><title>
-#: en/setupBootloader.xml:34
-msgid "Grub2 on Legacy MBR/GPT systems"
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:42
+msgid "<emphasis role=\"bold\">Grub2 on Legacy MBR/GPT systems</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:37
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:46
 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:42
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:52
 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:49
-msgid "Grub2-efi on UEFI systems"
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:59
+#, fuzzy
+msgid "<emphasis role=\"bold\">Grub2-efi on UEFI systems</emphasis>"
 msgstr "GRUB2-efi，当使用 UEFI 硬件时"
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:52
-msgid "GRUB2-efi will be used exclusively as the bootloader for a UEFI system."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:63
+msgid "GRUB2-efi or rEFInd may be used as the bootloader for a UEFI system."
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:57
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:68
 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:60
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:71
 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 "
-"created by Windows and add grub2-efi to it. If no ESP exists, then one will "
+"created by Windows and add grub2-efi to it.  If no ESP exists, then one will "
 "be created. Although it is possible to have several ESPs, only one is "
 "required, whatever the number of operating systems you have."
 msgstr ""
 
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:82
+msgid "rEFInd"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:85
+msgid "<emphasis role=\"bold\">rEFInd on UEFI systems</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:88
+msgid ""
+"rEFInd has a nice graphical set of options, and can auto-detect installed "
+"EFI bootloaders. See: http://www.rodsbooks.com/refind/"
+msgstr ""
+
+#. type: Content of: <section><section><section><note><para>
+#: en/setupBootloader.xml:95
+msgid ""
+"Please note that in order to be able to use the <literal>rEFInd</literal> "
+"option, an installed EFI System Partition must match your system "
+"architecture: if you have a 32bit EFI System Partition installed on a 64bit "
+"machine for instance, then the rEFInd option will not be displayed/available "
+"to you."
+msgstr ""
+
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:72
+#: en/setupBootloader.xml:106
 msgid "Bootloader Setup"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:76
+#: en/setupBootloader.xml:110
 msgid "Bootloader main options"
 msgstr "引导程序的主要选项"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:79
+#: en/setupBootloader.xml:113
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader.png\"/> </imageobject> <imageobject condition=\"live"
@@ -3723,47 +3787,70 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:91
+#: en/setupBootloader.xml:125
 msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:93
+#. type: Content of: <section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:129
+msgid ""
+"<guimenuitem>GRUB2</guimenuitem> (with either a graphical or a text menu), "
+"can be chosen for both <literal>Legacy MBR/BIOS</literal> systems and "
+"<literal>UEFI</literal> systems."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:136
 msgid ""
-"This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI "
-"systems will not see this option here."
+"<guimenuitem>rEFInd</guimenuitem> (with a graphical menu)  is an alternative "
+"option solely for use with <literal>UEFI</literal> systems."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:98
+#: en/setupBootloader.xml:144
 msgid "<emphasis role=\"bold\">Boot device</emphasis>"
 msgstr ""
 
+#. type: Content of: <section><section><section><itemizedlist><listitem><warning><para>
+#: en/setupBootloader.xml:147
+#, fuzzy
+msgid "Don't change this unless you really know what you are doing."
+msgstr "只有在您完全了解您的行为的风险后再作出改动。"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><note><para>
+#: en/setupBootloader.xml:152
+msgid ""
+"There is no option to write GRUB to the boot sector of a partition (e.g: "
+"<filename>sda1</filename>), as this method is considered unreliable."
+msgstr ""
+
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:100
-msgid "Don't change this unless you really know what you are doing"
+#: en/setupBootloader.xml:157
+msgid ""
+"When using UEFI mode, then the <guilabel>Boot device</guilabel> will be "
+"listed as <guimenuitem>EFI System Partition</guimenuitem>."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:105
+#: en/setupBootloader.xml:163
 msgid ""
 "<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:108
+#: en/setupBootloader.xml:166
 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:113
+#: en/setupBootloader.xml:171
 msgid "<emphasis role=\"bold\">Security</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:115
+#: en/setupBootloader.xml:173
 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 "
@@ -3773,34 +3860,34 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:126
+#: en/setupBootloader.xml:184
 msgid "Choose a password for the bootloader (optional)"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:130
+#: en/setupBootloader.xml:188
 msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:132
+#: en/setupBootloader.xml:190
 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:137 en/setupBootloader.xml:212
+#: en/setupBootloader.xml:195 en/setupBootloader.xml:308
 msgid "<emphasis>Advanced</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:141
+#: en/setupBootloader.xml:199
 msgid "<emphasis>Enable ACPI</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:143
+#: en/setupBootloader.xml:201
 msgid ""
 "ACPI (Advanced Configuration and Power Interface) is a standard for power "
 "management. It can save energy by stopping unused devices. Deselecting it "
@@ -3810,24 +3897,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:152
+#: en/setupBootloader.xml:210
 msgid "<emphasis>Enable SMP</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:154
+#: en/setupBootloader.xml:212
 msgid ""
 "This option enables/disables symmetric multiprocessing for multi-core "
 "processors"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:159
+#: en/setupBootloader.xml:217
 msgid "<emphasis>Enable APIC</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:161
+#: en/setupBootloader.xml:219
 msgid ""
 "Enabling this gives the operating system access to the Advanced Programmable "
 "Interrupt Controller. APIC devices permit more complex priority models, and "
@@ -3835,24 +3922,82 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:168
+#: en/setupBootloader.xml:226
 msgid "<emphasis>Enable Local APIC</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:170
+#: en/setupBootloader.xml:228
 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:177
+#: en/setupBootloader.xml:235
 msgid "Bootloader Configuration"
 msgstr "引导程序配置"
 
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:237
+msgid ""
+"If, in the previous section you selected <literal>rEFInd</literal> as the "
+"bootloader to use, you would then be presented with the options shown in the "
+"screenshot directly below. Otherwise, please instead move on to the "
+"subsequent screenshot for your options."
+msgstr ""
+
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:180
+#: en/setupBootloader.xml:243
+#, fuzzy
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"rEFIndLoaderConfig.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-rEFIndLoaderConfig.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
+"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
+"\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata format="
+"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:253
+#, fuzzy
+msgid "Your rEFInd configuration options:"
+msgstr "声音配置"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:256
+msgid ""
+"<guimenuitem>Install or update rEFInd in the EFI system partition.</"
+"guimenuitem>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:261
+msgid ""
+"<guimenuitem>Install in EFI/Boot partition (workaround for some BIOS's).</"
+"guimenuitem>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:264
+msgid ""
+"With some BIOS's, the newly written bootloaser for Mageia at end of the "
+"installation will not be recognized. In that case, you can use this option "
+"as a workaround for the issue."
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:270
+msgid ""
+"If you did not select rEFInd as the bootloader to use in the previous "
+"section, then your bootloader configurations are shown below:"
+msgstr ""
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:275
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -3861,42 +4006,42 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:191
+#: en/setupBootloader.xml:286
 msgid "<emphasis role=\"bold\">Default</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:193
+#: en/setupBootloader.xml:288
 msgid "The operating system to be started up by default."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:197
+#: en/setupBootloader.xml:292
 msgid "<emphasis role=\"bold\">Append</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:199
+#: en/setupBootloader.xml:294
 msgid ""
 "This option lets you pass information to the kernel 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:204
+#: en/setupBootloader.xml:299
 msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:206
+#: en/setupBootloader.xml:301
 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, "
-"then untick the Probe Foreign OS option."
+"then untick the <guimenuitem>Probe Foreign OS</guimenuitem> option."
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:215
+#: en/setupBootloader.xml:311
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader4.png\"/> </imageobject> <imageobject condition=\"live"
@@ -3905,12 +4050,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:226
+#: en/setupBootloader.xml:322
 msgid "<emphasis>Video mode</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:228
+#: en/setupBootloader.xml:324
 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 "
@@ -3918,38 +4063,47 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:234
+#: en/setupBootloader.xml:330
 msgid "<emphasis>Do not touch ESP or MBR</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:236
+#: en/setupBootloader.xml:332
 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 "
-"missing. Click<emphasis> Ok</emphasis> if you are sure you understand the "
-"implications, and wish to proceed."
+"missing. Click <guimenuitem>Ok </guimenuitem>only if you are sure you "
+"understand the implications, and wish to proceed."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><warning><para>
+#: en/setupBootloader.xml:338
+msgid ""
+"Chain-loading via legacy bootloaders (GRUB Legacy and LiLo)  is no longer "
+"supported by Mageia as it is likely to fail when attempting to boot this "
+"resulting installation of Mageia. If you use anything other than GRUB2 or "
+"rEFInd for this purpose, then you do so at your own risk!"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:245
+#: en/setupBootloader.xml:348
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png"
 "\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:253
+#: en/setupBootloader.xml:356
 msgid "Other Options"
 msgstr "其他选项"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:256
+#: en/setupBootloader.xml:359
 msgid "Using an existing bootloader"
 msgstr "使用现存的引导器"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:258
+#: en/setupBootloader.xml:361
 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 "
@@ -3959,12 +4113,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:267
+#: en/setupBootloader.xml:370
 msgid "Installing Without a Bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:269
+#: en/setupBootloader.xml:372
 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 "
diff --git a/docs/docs/stable/installer/zh_TW.po b/docs/docs/stable/installer/zh_TW.po
index a98fdfb3..4c5776cb 100644
--- a/docs/docs/stable/installer/zh_TW.po
+++ b/docs/docs/stable/installer/zh_TW.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2019-01-19 21:23+0200\n"
+"POT-Creation-Date: 2019-09-08 15:26+0300\n"
 "PO-Revision-Date: 2019-01-19 19:25+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/MageiaLinux/mageia/"
@@ -141,7 +141,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/addUser.xml:3
+#: en/addUser.xml:9
 msgid "User Management"
 msgstr ""
 
@@ -151,46 +151,53 @@ msgstr ""
 #. 2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
 #.   Also changed 'Advanced User Management' to 'User Management (advanced)'.
 #. 2018/02/24 apb: Changed list style.
+#. 2019/08/10 apb: Added missing 'condition' profile for live-user1.png.
+#. 2019/08/11 apb: [1] Reword 1.1 (including Note) [2] Reword 1.2 Password text.
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:12
+#: en/addUser.xml:28
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
-"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
-"\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata format="
-"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-setRootPassword.png\" format=\"PNG\" revision=\"1\" xml:id="
+"\"setRootPassword-im1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-user1.png\" format=\"PNG\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:21
+#: en/addUser.xml:40
 msgid "Set Administrator (root)  Password:"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:24
+#: en/addUser.xml:44
 msgid ""
 "It is advisable for all Mageia installations to set a <literal>superuser</"
 "literal> (Administrator) password, usually called the <emphasis>root </"
-"emphasis>password in Linux. As you type a password into the top box a shield "
-"will change from red-to-yellow-to-green depending on the strength of the "
-"password. A green shield shows you are using a strong password. You need to "
-"repeat the same password in the box underneath, to check that the first "
-"entry was not mistyped."
+"emphasis>password in Linux. You need to repeat the same password in the box "
+"underneath, to check that the first entry was not mistyped."
+msgstr ""
+
+#. type: Content of: <section><section><note><para>
+#: en/addUser.xml:51
+msgid ""
+"As you type a password into the top box a shield will change from red-to-"
+"yellow-to-green depending on the strength of the password. A green shield "
+"shows you are using a strong password."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:32
+#: en/addUser.xml:55
 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:39
+#: en/addUser.xml:63
 msgid "Enter a user"
 msgstr "輸入一位使用者"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:41
+#: en/addUser.xml:66
 msgid ""
 "Add a User here. A regular user has fewer privileges than the "
 "<literal>superuser</literal> (root), but enough to use the Internet, office "
@@ -199,39 +206,39 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:47
+#: en/addUser.xml:73
 msgid "<emphasis role=\"bold\">Icon</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:48
+#: en/addUser.xml:75
 msgid "Click on this button if you want to change the user's icon"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:52
+#: en/addUser.xml:80
 msgid "<emphasis role=\"bold\">Real Name</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:53
+#: en/addUser.xml:82
 msgid "Insert the user's real name into this text box"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:56
+#: en/addUser.xml:86
 msgid "<emphasis role=\"bold\">Login Name</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:57
+#: en/addUser.xml:88
 msgid ""
 "Enter the user login name or let DrakX use a version of the user's real "
 "name. <emphasis role=\"bold\">The login name is case-sensitive.</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><caution><simpara>
-#: en/addUser.xml:61
+#: en/addUser.xml:93
 msgid ""
 "The login entered here should be different to any login currently in use for "
 "your <filename>/home</filename> directory. Some user parameters will be "
@@ -240,34 +247,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:65 en/setupBootloader.xml:124
+#: en/addUser.xml:102 en/setupBootloader.xml:182
 msgid "<emphasis role=\"bold\">Password</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:66
-msgid ""
-"Type in the user password. There is a shield at the end of the text box that "
-"indicates the strength of the password. (See also <xref linkend="
-"\"givePassword\"/>)"
+#: en/addUser.xml:104
+msgid "Type in the user password (remembering the advice in the Note above)."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:68
+#: en/addUser.xml:107
 msgid ""
 "<emphasis role=\"bold\">Password (again):</emphasis> Retype the user "
 "password. DrakX will check that you have not mistyped the password."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:74
+#: en/addUser.xml:114
 msgid ""
 "Any users added while installing Mageia, will have a home directory that is "
 "both read and write protected (umask=0027)"
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:76
+#: en/addUser.xml:117
 msgid ""
 "You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
@@ -275,24 +279,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:79
+#: en/addUser.xml:121
 msgid "The access permissions can also be changed after the install."
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:85
+#: en/addUser.xml:128
 msgid "User Management (advanced)"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:87
+#: en/addUser.xml:131
 msgid ""
 "The <emphasis>Advanced</emphasis> option allows you to edit further settings "
 "for the user you are adding."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:91
+#: en/addUser.xml:136
 msgid ""
 "<emphasis>Shell</emphasis>: This drop-down list allows you to change the "
 "shell available to any user you added in the previous screen. Options are "
@@ -300,7 +304,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:143
 msgid ""
 "<emphasis>User ID</emphasis>: Here you can set the user ID for any user you "
 "added in the previous screen. If you are unsure what the purpose of this is, "
@@ -308,7 +312,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:102
+#: en/addUser.xml:149
 msgid ""
 "<emphasis>Group ID</emphasis>: This lets you set the group ID.  Again, if "
 "unsure, leave it blank."
@@ -428,24 +432,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:23
+#: en/bootLive.xml:10
 msgid "Boot Mageia as Live system"
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:28
+#: en/bootLive.xml:14
 msgid "Booting the medium"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:31
+#: en/bootLive.xml:16
 msgid ""
 "You can boot directly from a Live DVD or USB. Usually, you just need to plug "
 "the USB device in or place the DVD in the drive and restart the computer."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:35
+#: en/bootLive.xml:19
 msgid ""
 "If the computer does not automatically boot from the USB or DVD you may need "
 "to reconfigure your BIOS Boot Disk priority. Alternatively, you might try "
@@ -454,7 +458,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><tip><para>
-#: en/bootLive.xml:41
+#: en/bootLive.xml:24
 msgid ""
 "To access the BIOS or boot menu when the computer is starting, you can try "
 "pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or <keycap>Esc</"
@@ -464,7 +468,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/bootLive.xml:50
+#: en/bootLive.xml:32
 msgid ""
 "The actual screen that you will first see when booting from the Live media "
 "will depend on whether your computer motherboard is of the Legacy (BIOS) or "
@@ -472,91 +476,91 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:58
+#: en/bootLive.xml:39
 msgid "In BIOS/CSM/Legacy mode"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:62
+#: en/bootLive.xml:42
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"../live-bootCSM.png\" align=\"center\"/> "
+"</imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:67
+#: en/bootLive.xml:46
 msgid "First screen while booting in BIOS mode"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><title>
-#: en/bootLive.xml:72 en/bootLive.xml:144 en/installer.xml:106
-#: en/installer.xml:154
+#: en/bootLive.xml:50 en/bootLive.xml:104 en/installer.xml:108
+#: en/installer.xml:156
 msgid "Menu"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:75 en/bootLive.xml:147
+#: en/bootLive.xml:52 en/bootLive.xml:106
 msgid "<emphasis role=\"bold\">Boot Mageia</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:77
+#: en/bootLive.xml:53
 msgid ""
 "This option will boot the Mageia Live system from the connected DVD/USB "
 "media (expect a very slow system compared to an installed OS)."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:81
+#: en/bootLive.xml:56
 msgid "Once the boot is done, you can proceed to the installation."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:86 en/bootLive.xml:102
+#: en/bootLive.xml:60 en/bootLive.xml:72
 msgid ""
 "<emphasis role=\"bold\">+ use non-free video drivers (slower to boot)</"
 "emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:89
+#: en/bootLive.xml:62
 msgid "Boot the Mageia Live system using non-free video drivers"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:96 en/bootLive.xml:155 en/installer.xml:109
+#: en/bootLive.xml:68 en/bootLive.xml:112 en/installer.xml:111
 msgid "<emphasis role=\"bold\">Install Mageia</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:98 en/bootLive.xml:157
+#: en/bootLive.xml:69 en/bootLive.xml:113
 msgid "This option will install Mageia to a hard disk."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:105
+#: en/bootLive.xml:74
 msgid "Install Mageia using non-free video drivers"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:111 en/installer.xml:125
+#: en/bootLive.xml:79 en/installer.xml:127
 msgid "<emphasis role=\"bold\">Memory Test</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:113 en/installer.xml:127
+#: en/bootLive.xml:80 en/installer.xml:129
 msgid ""
 "Test the installed RAM by performing multiple read and write operations. "
 "Reboot to end the test."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:118 en/bootLive.xml:161
+#: en/bootLive.xml:84 en/bootLive.xml:116
 msgid "<emphasis role=\"bold\"> F2 Language</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:120 en/bootLive.xml:163
+#: en/bootLive.xml:85 en/bootLive.xml:117
 msgid ""
 "Press <keycap>F2</keycap> to have the installer use a specific language "
 "during the installation. Use the arrow keys to select the language then "
@@ -564,24 +568,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:129
+#: en/bootLive.xml:93
 msgid "In UEFI mode"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:133
+#: en/bootLive.xml:96
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
-"format=\"PNG\" revision=\"1\" 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:139
+#: en/bootLive.xml:100
 msgid "First screen while booting in UEFI mode"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:149
+#: en/bootLive.xml:107
 msgid ""
 "This option will boot the Mageia Live system from the connected DVD/USB "
 "media (expect a very slow system compared to an installed OS).  Once the "
@@ -589,7 +593,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/bootLive.xml:170
+#: en/bootLive.xml:123
 msgid ""
 "If you booted from a USB stick, you will see the above menu options "
 "duplicated, and in this case, you should choose from the menu pair that will "
@@ -804,12 +808,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:24
+#: en/configureX_card_list.xml:27
 msgid "Choose an X Server (Configure your Graphic Card)"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_card_list.xml:29
+#: en/configureX_card_list.xml:32
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_card_list."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_card_list-im1\"/> </"
@@ -817,36 +821,36 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:35
+#: en/configureX_card_list.xml:38
 msgid ""
 "DrakX has a very comprehensive database of video cards and will usually "
 "correctly identify your video device."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:38
+#: en/configureX_card_list.xml:41
 msgid ""
 "If the installer has not correctly detected your graphic card and you know "
 "which one you have, you can select it from the tree by:"
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_card_list.xml:41 en/configureX_monitor.xml:74
+#: en/configureX_card_list.xml:44 en/configureX_monitor.xml:78
 msgid "Vendor"
 msgstr "廠商"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:45
+#: en/configureX_card_list.xml:48
 msgid "then the make of your card"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:49
+#: en/configureX_card_list.xml:52
 msgid "and the model of card"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:53
+#: en/configureX_card_list.xml:56
 msgid ""
 "If you cannot find your card in the vendor lists (because it's not yet in "
 "the database or it's an older card) you may find a suitable driver in the "
@@ -857,14 +861,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><caution><para>
-#: en/configureX_card_list.xml:61
+#: en/configureX_card_list.xml:64
 msgid ""
 "Be aware that if you select an incompatible driver you may only have access "
 "to the <emphasis>Command Line Interface</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:65
+#: en/configureX_card_list.xml:68
 msgid ""
 "Some video card manufacturers provide proprietary drivers for Linux which "
 "may only be available in the <emphasis>Nonfree</emphasis> repository and in "
@@ -875,17 +879,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:11
-msgid "Graphic Card and Monitor Configuration"
+#: en/configureX_chooser.xml:23
+msgid "Graphics Card and Monitor Configuration"
 msgstr ""
 
-#.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
-#. 2018/02/15 apb: Some text and typography.
-#. 2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.
-#. 2018/02/23 apb: Typo.
-#. 2019/01/06 apb: Slight reword, split 1st para in two.
 #. type: Content of: <section><mediaobject>
-#: en/configureX_chooser.xml:26
+#: en/configureX_chooser.xml:28
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_chooser."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_chooser-im1\"/> </"
@@ -893,7 +892,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:32
+#: en/configureX_chooser.xml:34
 msgid ""
 "No matter which graphical environment (also known as desktop environment) "
 "you chose for this install of Mageia, they are all based on a graphical user "
@@ -904,31 +903,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:39
+#: en/configureX_chooser.xml:41
 msgid ""
 "Choose the appropriate settings manually if you think the details are "
 "incorrect, or if none are shown."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:44
-msgid "<emphasis role=\"bold\">Graphic Card</emphasis>"
+#: en/configureX_chooser.xml:46
+msgid "<emphasis role=\"bold\">Graphics Card</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:47
+#: en/configureX_chooser.xml:49
 msgid ""
 "If you need to, you can select a specific card from this expandable list. "
 "See <xref linkend=\"configureX_card_list\"/>."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:52
+#: en/configureX_chooser.xml:54
 msgid "<emphasis role=\"bold\">Monitor</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:55
+#: en/configureX_chooser.xml:57
 msgid ""
 "You can choose Plug 'n Play, if applicable, or choose your monitor from the "
 "<emphasis>Vendor</emphasis> or <emphasis>Generic</emphasis> lists. Choose "
@@ -938,22 +937,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:63
+#: en/configureX_chooser.xml:65
 msgid "<emphasis role=\"bold\">Resolution</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:66
+#: en/configureX_chooser.xml:68
 msgid "The resolution and color depth of your monitor can be set here."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:71
+#: en/configureX_chooser.xml:73
 msgid "<emphasis role=\"bold\">Test</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:74
+#: en/configureX_chooser.xml:76
 msgid ""
 "The test button does not always appear during install. If the option is "
 "there, and you test your settings, you should be asked to confirm that your "
@@ -965,17 +964,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:85
+#: en/configureX_chooser.xml:87
 msgid "<emphasis role=\"bold\">Options</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:88
+#: en/configureX_chooser.xml:90
 msgid "Here you can choose to enable or disable various options."
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_chooser.xml:93
+#: en/configureX_chooser.xml:95
 msgid ""
 "There is a risk of damaging a monitor if you choose refresh rates that are "
 "outside the frequency range of that monitor. This applies to older CRT "
@@ -984,19 +983,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_monitor.xml:22
+#: en/configureX_monitor.xml:26
 msgid "Choosing your Monitor"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:25
+#: en/configureX_monitor.xml:29
 msgid ""
 "DrakX has a very comprehensive database of monitors and will usually "
 "correctly identify yours."
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:30
+#: en/configureX_monitor.xml:34
 msgid ""
 "<emphasis role=\"bold\">Selecting a monitor with different characteristics "
 "could damage your monitor or video hardware. Please don't try something "
@@ -1005,7 +1004,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:38
+#: en/configureX_monitor.xml:42
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
@@ -1013,12 +1012,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:46
+#: en/configureX_monitor.xml:50
 msgid "Custom"
 msgstr "自訂"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:49
+#: en/configureX_monitor.xml:53
 msgid ""
 "This option allows you to set two critical parameters: the vertical refresh "
 "rate and the horizontal sync rate. Vertical refresh determines how often the "
@@ -1027,7 +1026,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:55
+#: en/configureX_monitor.xml:59
 msgid ""
 "It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor "
 "type with a sync range that is beyond the capabilities of your monitor: you "
@@ -1036,56 +1035,56 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:64
+#: en/configureX_monitor.xml:68
 msgid "Plug'n Play"
 msgstr "隨插即用"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:67
+#: en/configureX_monitor.xml:71
 msgid ""
 "This is the default option and automatically tries to determine the monitor "
 "type from the monitor database."
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:77
+#: en/configureX_monitor.xml:81
 msgid ""
 "If the installer has not correctly detected your monitor and you know which "
-"one you have, you can select it from the tree by selecting:"
+"one you have, you can choose it from the options by selecting:"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:86
+#: en/configureX_monitor.xml:90
 msgid "Manufacturer"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:90
+#: en/configureX_monitor.xml:94
 msgid "Monitor model"
 msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><term>
-#: en/configureX_monitor.xml:96
+#: en/configureX_monitor.xml:100
 msgid "Generic"
 msgstr "一般"
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
-#: en/configureX_monitor.xml:99
+#: en/configureX_monitor.xml:103
 msgid ""
-"Selecting this group will list nearly 30 display configurations such as "
-"1024x768 @ 60Hz and includes flat-panel displays as used in laptops. This is "
-"often a good monitor selection group if you need to use the VESA card driver "
-"when your video hardware cannot be determined automatically.  Once again it "
-"may be wise to be conservative in your selections."
+"Selecting this group will list approximately 30 display configurations such "
+"as 1024x768 @ 60Hz and includes flat-panel displays as used in laptops.  "
+"This is often a good monitor selection group if you need to use the VESA "
+"card driver when your video hardware cannot be determined automatically. "
+"Once again, it may be wise to be conservative in your selections."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:22
+#: en/diskdrake.xml:24
 msgid "Custom Disk Partitioning with DiskDrake"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:27
+#: en/diskdrake.xml:29
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-diskdrake.png\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1093,7 +1092,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:38
+#: en/diskdrake.xml:40
 msgid ""
 "Modify the layout of your disk(s) here. You can remove or create partitions, "
 "change the filesystem or size of a partition and even view their details "
@@ -1101,15 +1100,15 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:47
 msgid ""
 "There is a tab at the top for every detected hard disk (or other storage "
-"device, like a USB key). In the screenshot above there are two available "
-"devices: <filename>sda </filename>and <filename>sdb</filename>."
+"device, like a USB key), for example: <filename>sda</filename>, "
+"<filename>sdb</filename>, <filename>sdc</filename> etc."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:52
+#: en/diskdrake.xml:54
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it. "
@@ -1118,21 +1117,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/diskdrake.xml:60
+#: en/diskdrake.xml:62
 msgid ""
 "Continue until you have adjusted everything to your satisfaction, then click "
 "<emphasis>Done</emphasis> when you're ready."
 msgstr ""
 
 #. type: Content of: <section><warning><orderedlist><listitem><para>
-#: en/diskdrake.xml:69
+#: en/diskdrake.xml:71
 msgid ""
 "Take care with the <emphasis>Clear all</emphasis> option, use it only if you "
 "are sure you want to wipe all partitions on the selected storage device."
 msgstr ""
 
 #. type: Content of: <section><warning><orderedlist><listitem><para>
-#: en/diskdrake.xml:75
+#: en/diskdrake.xml:77
 msgid ""
 "If you wish to use encryption on your <filename>/</filename> partition you "
 "must ensure that you have a separate <filename>/boot</filename> partition. "
@@ -1141,7 +1140,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/diskdrake.xml:87
+#: en/diskdrake.xml:89
 msgid ""
 "If you are installing Mageia on a UEFI system, check that an ESP (EFI System "
 "Partition) is present and correctly mounted on <filename>/boot/EFI</"
@@ -1149,19 +1148,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/diskdrake.xml:93
+#: en/diskdrake.xml:95
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
 "partition is present and of the correct type. See Figure 2 below."
 msgstr ""
 
 #. type: Content of: <section><figure><title>
-#: en/diskdrake.xml:101
+#: en/diskdrake.xml:103
 msgid "EFI System Partition"
 msgstr "EFI 系統分割區"
 
 #. type: Content of: <section><figure><mediaobject>
-#: en/diskdrake.xml:104
+#: en/diskdrake.xml:106
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-diskdrake2.png\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1169,17 +1168,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><figure>
-#: en/diskdrake.xml:103 en/diskdrake.xml:117
+#: en/diskdrake.xml:105 en/diskdrake.xml:119
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <section><figure><title>
-#: en/diskdrake.xml:115
+#: en/diskdrake.xml:117
 msgid "BIOS boot partition"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:118 en/doPartitionDisks.xml:201
+#: en/diskdrake.xml:120 en/doPartitionDisks.xml:206
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1198,26 +1197,26 @@ msgid "Partitioning"
 msgstr "分割磁區"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:31
 msgid "Suggested Partitioning"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:34
 msgid ""
 "In this screen you can see the content of your hard drive(s) along with the "
 "DrakX partitioning proposals for where to install Mageia."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:34
+#: en/doPartitionDisks.xml:38
 msgid ""
 "The actual options available from those shown below will vary according to "
 "the layout and content of your particular hard drive(s)."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:39
+#: en/doPartitionDisks.xml:43
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1226,111 +1225,116 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><title>
-#: en/doPartitionDisks.xml:49
+#: en/doPartitionDisks.xml:53
 msgid "Main Options"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:56
 msgid "<emphasis role=\"bold\">Use Existing Partitions</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:59
 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><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:61
+#: en/doPartitionDisks.xml:65
 msgid "<emphasis role=\"bold\">Use Free Space</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:68
 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><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:70
+#: en/doPartitionDisks.xml:74
 msgid ""
 "<emphasis role=\"bold\">Use Free Space on a Windows Partition</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:73
+#: en/doPartitionDisks.xml:77
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it. 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 important files!"
+"installation but see the warning below."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para><mediaobject>
+#: en/doPartitionDisks.xml:87
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:79
+#: en/doPartitionDisks.xml:82
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
 "light blue and the proposed Mageia partition in dark blue with their "
 "intended sizes just underneath. You have the option to modify these sizes by "
 "clicking and dragging the gap between both partitions.  See the following "
-"screenshot:"
+"screenshot:<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><warning><para>
+#: en/doPartitionDisks.xml:97
+msgid ""
+"This involves shrinking the size of the Windows partition, and therefore is "
+"a risky operation, so you should make sure you have backed up all important "
+"files before proceeding."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><important><para>
+#: en/doPartitionDisks.xml:103
+msgid ""
+"The partition must be \"clean\", meaning that Windows must have closed down "
+"correctly the last time it was used. It must also have been defragmented, "
+"although this is not a guarantee that all files in the partition have been "
+"moved out of the area that is about to be used for Mageia."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:87
+#: en/doPartitionDisks.xml:112
 msgid "<emphasis role=\"bold\">Erase and use Entire Disk</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:90
+#: en/doPartitionDisks.xml:115
 msgid "This option will allocate the entire drive for Mageia"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:119
 msgid ""
 "This will erase ALL data on the selected hard drive. Take care! 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 this option."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><important><para>
-#: en/doPartitionDisks.xml:101
-msgid ""
-"Note that this involves shrinking the size of the Windows partition. The "
-"partition must be \"clean\", meaning that Windows must have closed down "
-"correctly the last time it was used. It must also have been defragmented, "
-"although this is not a guarantee that all files in the partition have been "
-"moved out of the area that is about to be used. It is highly recommended to "
-"back up your personal files."
-msgstr ""
-
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:112
+#: en/doPartitionDisks.xml:127
 msgid "<emphasis role=\"bold\">Custom Disk Partitioning</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:115
+#: en/doPartitionDisks.xml:130
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
 msgstr ""
 
-#. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:122
-msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
-"imageobject>"
-msgstr ""
-
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:131
+#: en/doPartitionDisks.xml:136
 msgid ""
 "If you are not using the <emphasis>Custom disk partitioning</emphasis> "
 "option, then the installer will allocate the available space according to "
@@ -1338,60 +1342,60 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:137
+#: en/doPartitionDisks.xml:142
 msgid ""
 "If the total available space is less than 50 GB, then only one partition is "
 "created. This will be the <filename>/</filename> (root)  partition."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:143
+#: en/doPartitionDisks.xml:148
 msgid ""
 "If the total available space is greater than 50 GB, then three partitions "
 "are created"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:148
+#: en/doPartitionDisks.xml:153
 msgid ""
 "6/19 of the total available place is allocated to <filename>/</filename> "
 "with a maximum of 50 GB"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:153
+#: en/doPartitionDisks.xml:158
 msgid "1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:158
+#: en/doPartitionDisks.xml:163
 msgid "the rest (at least 12/19) is allocated to <filename>/home</filename>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:165
+#: en/doPartitionDisks.xml:170
 msgid ""
 "This means that from 160 GB or greater available space, the installer will "
 "create three partitions:"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:170
+#: en/doPartitionDisks.xml:175
 msgid "50 GB for <filename>/</filename>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:174
+#: en/doPartitionDisks.xml:179
 msgid "4 GB for <filename>swap</filename>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:178
+#: en/doPartitionDisks.xml:183
 msgid "and the remainder for <filename>/home</filename>"
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:183
+#: en/doPartitionDisks.xml:188
 msgid ""
 "If you are using a UEFI system, the ESP (EFI System Partition) will be "
 "automatically detected - or created if it does not exist yet - and mounted "
@@ -1401,7 +1405,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:189
+#: en/doPartitionDisks.xml:194
 msgid ""
 "If you are using a Legacy (also known as BIOS) system with a GPT partitioned "
 "disk, you need to create a BIOS boot partition if it doesn't already exist. "
@@ -1412,19 +1416,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:196
+#: en/doPartitionDisks.xml:201
 msgid "See <xref linkend=\"diskdrake\"/> for information on how to proceed."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:211
+#: en/doPartitionDisks.xml:216
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4.png"
-"\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks4.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks4.png\"/> </"
+"imageobject>"
 msgstr ""
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:217
+#: en/doPartitionDisks.xml:226
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
 "previous standard of 512. Due to lack of available hardware, the "
@@ -1433,7 +1439,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:222
+#: en/doPartitionDisks.xml:231
 msgid ""
 "Some SSD devices now use an erase block size over 1 MB. If you have such a "
 "device we suggest that you partition the drive in advance, using an "
@@ -1442,17 +1448,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:229
+#: en/doPartitionDisks.xml:238
 msgid "<emphasis>Align to</emphasis> = MiB"
 msgstr ""
 
 #. type: Content of: <section><important><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:233
+#: en/doPartitionDisks.xml:242
 msgid "<emphasis>Free space preceding (MiB)</emphasis> = 2"
 msgstr ""
 
 #. type: Content of: <section><important><para>
-#: en/doPartitionDisks.xml:237
+#: en/doPartitionDisks.xml:246
 msgid ""
 "Also make sure all partitions are created using an even number of megabytes."
 msgstr ""
@@ -1609,12 +1615,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/firewall.xml:7
+#: en/firewall.xml:16
 msgid "Firewall"
 msgstr "防火牆"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:10
+#: en/firewall.xml:19
 msgid ""
 "This section allows you to configure some simple firewall rules: they "
 "determine which type of message from the Internet will be accepted by the "
@@ -1622,8 +1628,15 @@ msgid ""
 "system to be accessible from the Internet."
 msgstr ""
 
+#. type: Content of: <section><mediaobject>
+#: en/firewall.xml:26
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-firewall.png\"/> </"
+"imageobject>"
+msgstr ""
+
 #. type: Content of: <section><para>
-#: en/firewall.xml:16
+#: en/firewall.xml:31
 msgid ""
 "In the default setting (no button is checked), no service of the system is "
 "accessible from the network. The <emphasis>Everything (no firewall)</"
@@ -1636,7 +1649,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:25
+#: en/firewall.xml:40
 msgid ""
 "All other options are more or less self-explanatory. As an example, you will "
 "enable the CUPS server if you want printers on your machine to be accessible "
@@ -1644,12 +1657,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:29
+#: en/firewall.xml:44
 msgid "<emphasis role=\"bold\">Advanced</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:31
+#: en/firewall.xml:46
 msgid ""
 "The <emphasis>Advanced</emphasis> option opens a window where you can enable "
 "a series of services by typing a list of <quote>couples</quote> (blank "
@@ -1657,34 +1670,35 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:35
-msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
+#: en/firewall.xml:50
+msgid "<emphasis>&lt;port-number&gt;/&lt;protocol&gt;</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:38
+#: en/firewall.xml:53
 msgid ""
-"- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
-"the service you want to enable (e.g. 873 for the RSYNC service) as defined "
-"in <emphasis>RFC-433</emphasis>;"
+"- <emphasis>&lt;port-number&gt;</emphasis> is the value of the port assigned "
+"to the service you want to enable (e.g. 873 for the RSYNC service) as "
+"defined in <emphasis>RFC-433</emphasis>;"
 msgstr ""
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:42
+#: en/firewall.xml:57
 msgid ""
-"- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
-"<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
+"- <emphasis>&lt;protocol&gt;</emphasis> is one of <emphasis>TCP</emphasis> "
+"or <emphasis>UDP</emphasis> - the internet protocol that is used by the "
+"service."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:47
+#: en/firewall.xml:62
 msgid ""
 "For instance, the entry for enabling access to the RSYNC service therefore "
 "is <emphasis>873/tcp</emphasis>."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:50
+#: en/firewall.xml:65
 msgid ""
 "In case a service is implemented to use both protocols, you specify 2 "
 "couples for the same port."
@@ -1752,12 +1766,12 @@ msgid "Graphical Configuration"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:32
+#: en/installer.xml:34
 msgid "DrakX, the Mageia Installer"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/installer.xml:35
+#: en/installer.xml:37
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -1765,33 +1779,33 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:40
+#: en/installer.xml:42
 msgid "The installation steps"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:44
+#: en/installer.xml:46
 msgid ""
 "The install process is divided into a number of steps - the status of which "
 "is indicated in a panel to the left of the screen."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:50
+#: en/installer.xml:52
 msgid ""
 "Each step has one or more screens, which may also have <emphasis>Advanced</"
 "emphasis> sections with extra, less commonly required options."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:56
+#: en/installer.xml:58
 msgid ""
 "Most screens have <emphasis>Help</emphasis> buttons for further details "
 "about the particular step."
 msgstr ""
 
 #. type: Content of: <section><section><caution><para>
-#: en/installer.xml:62
+#: en/installer.xml:64
 msgid ""
 "If at some point during the install you decide to abort the installation, it "
 "is possible to reboot, but please think twice before you do this. Once a "
@@ -1801,7 +1815,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><caution><para>
-#: en/installer.xml:68
+#: en/installer.xml:70
 msgid ""
 "If, in spite of this, you are very sure rebooting is what you want, go to a "
 "text terminal by pressing the keys <keycombo> <keycap>Ctrl</keycap> "
@@ -1811,12 +1825,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:86
+#: en/installer.xml:88
 msgid "Installation Welcome Screen"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:88
+#: en/installer.xml:90
 msgid ""
 "The particular screen that you will first see when booting from the "
 "Installation media will depend on whether your computer motherboard is of "
@@ -1824,60 +1838,60 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:92
+#: en/installer.xml:94
 msgid ""
 "The welcome menu screen has various options, however the default option will "
 "start the installer, and is normally all that you will need."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:97
+#: en/installer.xml:99
 msgid "Legacy (BIOS) Systems"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:100
+#: en/installer.xml:102
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome.png\"/> </"
 "imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:111
+#: en/installer.xml:113
 msgid ""
 "Install Mageia to a hard disk. This is the default option, and will "
 "automatically start after a short while unless another option is selected."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:117
+#: en/installer.xml:119
 msgid "<emphasis role=\"bold\">Rescue System</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:119
+#: en/installer.xml:121
 msgid ""
 "This option allows you to either re-install the bootloader for an existing "
 "Mageia installation or you can use it to restore a Windows bootloader."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:132
+#: en/installer.xml:134
 msgid "<emphasis role=\"bold\">F2: Language</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:134
+#: en/installer.xml:136
 msgid "Press F2 for alternative languages."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:140
+#: en/installer.xml:142
 msgid "UEFI Systems"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:142
+#: en/installer.xml:144
 msgid ""
 "From this screen, you can access options by pressing <keycap>e</keycap> to "
 "enter the edit mode. To come back to this screen, press <keycap>Esc</keycap> "
@@ -1885,19 +1899,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:148
+#: en/installer.xml:150
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome2.png\"/> </"
 "imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:157
+#: en/installer.xml:159
 msgid "<emphasis role=\"bold\">Install:</emphasis> Start the Install process"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:162
+#: en/installer.xml:164
 msgid ""
 "<emphasis role=\"bold\">Rescue:</emphasis> This option allows you to either "
 "re-install the bootloader for an existing Mageia installation or you can use "
@@ -1905,31 +1919,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:169
+#: en/installer.xml:171
 msgid ""
 "<emphasis role=\"bold\">F2: Language:</emphasis> Press <keycap>F2</keycap> "
 "for alternative languages."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:174
+#: en/installer.xml:176
 msgid ""
 "If you booted from a USB stick, you will see the above options duplicated, "
 "and in this case, you should use the set that will be suffixed with \"USB\"."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:181
+#: en/installer.xml:183
 msgid "Installation Problems and Possible Solutions"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:184
+#: en/installer.xml:186
 msgid "No Graphical Interface"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:188
+#: en/installer.xml:190
 msgid ""
 "After the initial screen you did not progress to the <emphasis>Language "
 "Selection</emphasis> screen. This can happen with some graphic cards and "
@@ -1938,7 +1952,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:195
+#: en/installer.xml:197
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
 "In this case it is worth trying a text-mode installation. To use this press "
@@ -1949,12 +1963,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:208
+#: en/installer.xml:210
 msgid "The Install Freezes"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:210
+#: en/installer.xml:212
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic hardware "
@@ -1964,12 +1978,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:218
+#: en/installer.xml:220
 msgid "RAM problem"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:220
+#: en/installer.xml:222
 msgid ""
 "This will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
@@ -1979,12 +1993,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:228
+#: en/installer.xml:230
 msgid "Dynamic partitions"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:230
+#: en/installer.xml:232
 msgid ""
 "If you converted your hard disk from <literal>Basic</literal> format to "
 "<literal>Dynamic</literal> format in Microsoft Windows, then it is not "
@@ -3568,73 +3582,106 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:27
+#: en/setupBootloader.xml:32
 msgid "Bootloader"
 msgstr "開機載入器"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:31
+#: en/setupBootloader.xml:36
+#, fuzzy
+msgid "Available Bootloaders"
+msgstr "開機載入器"
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:39
 msgid "Grub2"
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><title>
-#: en/setupBootloader.xml:34
-msgid "Grub2 on Legacy MBR/GPT systems"
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:42
+msgid "<emphasis role=\"bold\">Grub2 on Legacy MBR/GPT systems</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:37
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:46
 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:42
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:52
 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:49
-msgid "Grub2-efi on UEFI systems"
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:59
+msgid "<emphasis role=\"bold\">Grub2-efi on UEFI systems</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:52
-msgid "GRUB2-efi will be used exclusively as the bootloader for a UEFI system."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:63
+msgid "GRUB2-efi or rEFInd may be used as the bootloader for a UEFI system."
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:57
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:68
 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:60
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:71
 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 "
-"created by Windows and add grub2-efi to it. If no ESP exists, then one will "
+"created by Windows and add grub2-efi to it.  If no ESP exists, then one will "
 "be created. Although it is possible to have several ESPs, only one is "
 "required, whatever the number of operating systems you have."
 msgstr ""
 
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:82
+msgid "rEFInd"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:85
+msgid "<emphasis role=\"bold\">rEFInd on UEFI systems</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:88
+msgid ""
+"rEFInd has a nice graphical set of options, and can auto-detect installed "
+"EFI bootloaders. See: http://www.rodsbooks.com/refind/"
+msgstr ""
+
+#. type: Content of: <section><section><section><note><para>
+#: en/setupBootloader.xml:95
+msgid ""
+"Please note that in order to be able to use the <literal>rEFInd</literal> "
+"option, an installed EFI System Partition must match your system "
+"architecture: if you have a 32bit EFI System Partition installed on a 64bit "
+"machine for instance, then the rEFInd option will not be displayed/available "
+"to you."
+msgstr ""
+
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:72
+#: en/setupBootloader.xml:106
 msgid "Bootloader Setup"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:76
+#: en/setupBootloader.xml:110
 msgid "Bootloader main options"
 msgstr "開機載入程式主要選項"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:79
+#: en/setupBootloader.xml:113
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader.png\"/> </imageobject> <imageobject condition=\"live"
@@ -3643,47 +3690,69 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:91
+#: en/setupBootloader.xml:125
 msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:93
+#. type: Content of: <section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:129
+msgid ""
+"<guimenuitem>GRUB2</guimenuitem> (with either a graphical or a text menu), "
+"can be chosen for both <literal>Legacy MBR/BIOS</literal> systems and "
+"<literal>UEFI</literal> systems."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:136
 msgid ""
-"This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI "
-"systems will not see this option here."
+"<guimenuitem>rEFInd</guimenuitem> (with a graphical menu)  is an alternative "
+"option solely for use with <literal>UEFI</literal> systems."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:98
+#: en/setupBootloader.xml:144
 msgid "<emphasis role=\"bold\">Boot device</emphasis>"
 msgstr ""
 
+#. type: Content of: <section><section><section><itemizedlist><listitem><warning><para>
+#: en/setupBootloader.xml:147
+msgid "Don't change this unless you really know what you are doing."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><note><para>
+#: en/setupBootloader.xml:152
+msgid ""
+"There is no option to write GRUB to the boot sector of a partition (e.g: "
+"<filename>sda1</filename>), as this method is considered unreliable."
+msgstr ""
+
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:100
-msgid "Don't change this unless you really know what you are doing"
+#: en/setupBootloader.xml:157
+msgid ""
+"When using UEFI mode, then the <guilabel>Boot device</guilabel> will be "
+"listed as <guimenuitem>EFI System Partition</guimenuitem>."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:105
+#: en/setupBootloader.xml:163
 msgid ""
 "<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:108
+#: en/setupBootloader.xml:166
 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:113
+#: en/setupBootloader.xml:171
 msgid "<emphasis role=\"bold\">Security</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:115
+#: en/setupBootloader.xml:173
 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 "
@@ -3693,34 +3762,34 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:126
+#: en/setupBootloader.xml:184
 msgid "Choose a password for the bootloader (optional)"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:130
+#: en/setupBootloader.xml:188
 msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:132
+#: en/setupBootloader.xml:190
 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:137 en/setupBootloader.xml:212
+#: en/setupBootloader.xml:195 en/setupBootloader.xml:308
 msgid "<emphasis>Advanced</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:141
+#: en/setupBootloader.xml:199
 msgid "<emphasis>Enable ACPI</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:143
+#: en/setupBootloader.xml:201
 msgid ""
 "ACPI (Advanced Configuration and Power Interface) is a standard for power "
 "management. It can save energy by stopping unused devices. Deselecting it "
@@ -3730,24 +3799,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:152
+#: en/setupBootloader.xml:210
 msgid "<emphasis>Enable SMP</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:154
+#: en/setupBootloader.xml:212
 msgid ""
 "This option enables/disables symmetric multiprocessing for multi-core "
 "processors"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:159
+#: en/setupBootloader.xml:217
 msgid "<emphasis>Enable APIC</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:161
+#: en/setupBootloader.xml:219
 msgid ""
 "Enabling this gives the operating system access to the Advanced Programmable "
 "Interrupt Controller. APIC devices permit more complex priority models, and "
@@ -3755,24 +3824,77 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:168
+#: en/setupBootloader.xml:226
 msgid "<emphasis>Enable Local APIC</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:170
+#: en/setupBootloader.xml:228
 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:177
+#: en/setupBootloader.xml:235
 msgid "Bootloader Configuration"
 msgstr "開機載入程式組態設定"
 
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:237
+msgid ""
+"If, in the previous section you selected <literal>rEFInd</literal> as the "
+"bootloader to use, you would then be presented with the options shown in the "
+"screenshot directly below. Otherwise, please instead move on to the "
+"subsequent screenshot for your options."
+msgstr ""
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:243
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"rEFIndLoaderConfig.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-rEFIndLoaderConfig.png\"/> </"
+"imageobject>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><para>
+#: en/setupBootloader.xml:253
+#, fuzzy
+msgid "Your rEFInd configuration options:"
+msgstr "聲音設定"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:256
+msgid ""
+"<guimenuitem>Install or update rEFInd in the EFI system partition.</"
+"guimenuitem>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:261
+msgid ""
+"<guimenuitem>Install in EFI/Boot partition (workaround for some BIOS's).</"
+"guimenuitem>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:264
+msgid ""
+"With some BIOS's, the newly written bootloaser for Mageia at end of the "
+"installation will not be recognized. In that case, you can use this option "
+"as a workaround for the issue."
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:270
+msgid ""
+"If you did not select rEFInd as the bootloader to use in the previous "
+"section, then your bootloader configurations are shown below:"
+msgstr ""
+
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:180
+#: en/setupBootloader.xml:275
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -3781,42 +3903,42 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:191
+#: en/setupBootloader.xml:286
 msgid "<emphasis role=\"bold\">Default</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:193
+#: en/setupBootloader.xml:288
 msgid "The operating system to be started up by default."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:197
+#: en/setupBootloader.xml:292
 msgid "<emphasis role=\"bold\">Append</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:199
+#: en/setupBootloader.xml:294
 msgid ""
 "This option lets you pass information to the kernel 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:204
+#: en/setupBootloader.xml:299
 msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:206
+#: en/setupBootloader.xml:301
 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, "
-"then untick the Probe Foreign OS option."
+"then untick the <guimenuitem>Probe Foreign OS</guimenuitem> option."
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:215
+#: en/setupBootloader.xml:311
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader4.png\"/> </imageobject> <imageobject condition=\"live"
@@ -3825,12 +3947,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:226
+#: en/setupBootloader.xml:322
 msgid "<emphasis>Video mode</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:228
+#: en/setupBootloader.xml:324
 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 "
@@ -3838,38 +3960,47 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:234
+#: en/setupBootloader.xml:330
 msgid "<emphasis>Do not touch ESP or MBR</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:236
+#: en/setupBootloader.xml:332
 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 "
-"missing. Click<emphasis> Ok</emphasis> if you are sure you understand the "
-"implications, and wish to proceed."
+"missing. Click <guimenuitem>Ok </guimenuitem>only if you are sure you "
+"understand the implications, and wish to proceed."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><warning><para>
+#: en/setupBootloader.xml:338
+msgid ""
+"Chain-loading via legacy bootloaders (GRUB Legacy and LiLo)  is no longer "
+"supported by Mageia as it is likely to fail when attempting to boot this "
+"resulting installation of Mageia. If you use anything other than GRUB2 or "
+"rEFInd for this purpose, then you do so at your own risk!"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:245
+#: en/setupBootloader.xml:348
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png"
 "\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:253
+#: en/setupBootloader.xml:356
 msgid "Other Options"
 msgstr "其他選項"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:256
+#: en/setupBootloader.xml:359
 msgid "Using an existing bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:258
+#: en/setupBootloader.xml:361
 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 "
@@ -3879,12 +4010,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:267
+#: en/setupBootloader.xml:370
 msgid "Installing Without a Bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:269
+#: en/setupBootloader.xml:372
 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 "
diff --git a/docs/docs/stable/mcc-help/en/diskdrake--fileshare.xml b/docs/docs/stable/mcc-help/en/diskdrake--fileshare.xml
index 559dd135..dd1aed32 100644
--- a/docs/docs/stable/mcc-help/en/diskdrake--fileshare.xml
+++ b/docs/docs/stable/mcc-help/en/diskdrake--fileshare.xml
@@ -1,4 +1,13 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:id="diskdrake--fileshare">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:id="diskdrake--fileshare"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  <!--2079.07.07 apb: Corrected syntax for userdrake link. -->
+
   <info>
     <title xml:id="diskdrake--fileshare-ti1">Share your hard disk
     partitions</title>
@@ -8,14 +17,18 @@
 
   <mediaobject>
     <imageobject>
-      <imagedata format="PNG" fileref="diskdrake--fileshare.png" xml:id="diskdrake--fileshare-im1" align="center" revision="1"/>
+      <imagedata align="center" fileref="diskdrake--fileshare.png"
+                 format="PNG" revision="1" xml:id="diskdrake--fileshare-im1"/>
     </imageobject>
   </mediaobject>
 
-  <para>This simple tool<footnote><para>You can start this tool from the command line, by typing <emphasis role="bold">diskdrake --fileshare</emphasis> as root.</para></footnote> allows you, the administrator, to allow users to
-  share parts of their own /home subdirectories with other users of a same
-  local network which may have computers running either Linux or Windows
-  operating system.</para>
+  <para>This simple tool<footnote>
+      <para>You can start this tool from the command line, by typing <emphasis
+      role="bold">diskdrake --fileshare</emphasis> as root.</para>
+    </footnote> allows you, the administrator, to allow users to share parts
+  of their own /home subdirectories with other users of a same local network
+  which may have computers running either Linux or Windows operating
+  system.</para>
 
   <para>It is found in the Mageia Control Center, under the Local Disk tab,
   labelled "Share your hard disk partitions".</para>
@@ -42,9 +55,7 @@
   fileshare group. In the User tab, click on the user to add to the fileshare
   group, then on <guimenuitem>Edit</guimenuitem>, In the Groups tab. Check the
   fileshare group and click on <guibutton>OK</guibutton>. For more information
-  about Userdrake, see <xref linkend="userdrake">this page</xref></para>
-
-  <para/>
+  about Userdrake, see: <xref linkend="userdrake"/></para>
 
   <note>
     <para>When adding a new user to the fileshare group, you have to
@@ -55,5 +66,4 @@
   <para>From now on each user belonging to the fileshare group can select in
   his/her file manager the directories to be shared, although not all file
   managers have this facility.</para>
-
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/mcc-help/en/drakxservices.xml b/docs/docs/stable/mcc-help/en/drakxservices.xml
index 48d782b4..ec0c0b8b 100644
--- a/docs/docs/stable/mcc-help/en/drakxservices.xml
+++ b/docs/docs/stable/mcc-help/en/drakxservices.xml
@@ -1,18 +1,16 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="drakxservices" version="5.0">
+<?xml version='1.0' encoding='UTF-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1998/Math/MathML" version="5.0" xml:id="drakxservices">
   <info>
-    <title xml:id="drakxservices-ti1">Manage system services by enabling or disabling them</title><subtitle>drakxservices</subtitle>
+    <title xml:id="drakxservices-ti1">Manage system services by enabling or disabling them</title>
+    <subtitle>drakxservices</subtitle>
   </info>
-
   <mediaobject>
     <imageobject>
-      <imagedata width="80%" xml:id="drakxservices-im1" revision="1" align="center" format="PNG" fileref="drakxservices.png"/>
+      <imagedata format="PNG" xml:id="drakxservices-im1" fileref="drakxservices.png" align="center" revision="1"/>
     </imageobject>
   </mediaobject>
-
- <para>This page hasn't been written yet for lack of resources. If you think
-  you can write this help, please contact <link ns2:href="https://wiki.mageia.org/en/Documentation_team"> the Doc team.</link> Thanking you in advance.</para>   
-
+  <para>This page hasn't been written yet for lack of resources. If you think
+  you can write this help, please contact <link ns2:href="https://wiki.mageia.org/en/Documentation_team"> the Doc team.</link> Thanking you in advance.</para>
   <para>You can start this tool from the
 	  command line, by typing <emphasis role="bold">drakxservices</emphasis> as
   root.</para>
-</section>
+</section>
\ No newline at end of file