Sync Installer docs with Calenco

1 files changed, 548 insertions, 345 deletions

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."