Update translations

1 files changed, 1694 insertions, 1194 deletions

diff --git a/docs/docs/stable/installer/et.po b/docs/docs/stable/installer/et.po
index 00a47b52..54f86108 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: 2017-06-25 20:39+0300\n"
+"POT-Creation-Date: 2018-04-10 17:29+0300\n"
 "PO-Revision-Date: 2017-06-25 20:24+0000\n"
 "Last-Translator: Marek Laane <qiilaq69@gmail.com>\n"
 "Language-Team: Estonian (http://www.transifex.com/MageiaLinux/mageia/"
@@ -29,12 +29,13 @@ msgstr "Litsents ja väljalaskemärkmed"
 
 #. type: Content of: <section><mediaobject>
 #: en/acceptLicense.xml:29
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
-"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
-"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
-"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
-"\"live-license.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"acceptLicense-im1\" fileref=\"dx2-license.png\" align=\"center\" revision="
+"\"4\"/> </imageobject> <imageobject> <imagedata format=\"PNG\" fileref="
+"\"live-license.png\" xml:id=\"acceptLicense-im2\" revision=\"5\" align="
+"\"center\" condition=\"live\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
 "im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
@@ -67,8 +68,9 @@ msgstr ""
 
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:50
+#, fuzzy
 msgid ""
-"To accept, simply select <guilabel>Accept</guilabel> and then click on "
+"To proceed, simply select <guilabel>Accept</guilabel> and then click on "
 "<guibutton>Next</guibutton>."
 msgstr ""
 "Nõustumiseks valige lihtsalt <guilabel>Nõustun</guilabel> ja klõpsake siis "
@@ -90,22 +92,23 @@ msgstr "Väljalaskemärkmed"
 
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:70
+#, fuzzy
 msgid ""
-"Important information are given about this release of <application>Mageia</"
-"application> and are accessible clicking on the <guibutton>Release Notes</"
+"Important information about this release of <application>Mageia</"
+"application> can be viewed by clicking on the <guibutton>Release Notes</"
 "guibutton> button."
 msgstr ""
 "Kui tunnete huvi, mida on <application>Mageia</application> käesolevas "
 "väljalaskes uut, klõpsake nupule <guibutton>Väljalaskemärkmed</guibutton>."
 
 #. type: Attribute 'xml:lang' of: <section>
-#: en/add_supplemental_media.xml:2 en/DrakLive-cover.xml:2 en/DrakLive.xml:1
-#: en/DrakX-cover.xml:2 en/DrakX.xml:1 en/media_selection.xml:1
+#: en/add_supplemental_media.xml:1 en/DrakLive-cover.xml:2 en/DrakLive.xml:1
+#: en/DrakX-cover.xml:1 en/DrakX.xml:1 en/media_selection.xml:1
 msgid "en"
 msgstr "et"
 
 #. type: Content of: <section><info><title>
-#: en/add_supplemental_media.xml:10
+#: en/add_supplemental_media.xml:3
 msgid "Media Selection (Configure Supplemental Installation Media)"
 msgstr "Andmekandjate valik (täiendavate paigaldusandmekandjate seadistamine)"
 
@@ -113,23 +116,25 @@ msgstr "Andmekandjate valik (täiendavate paigaldusandmekandjate seadistamine)"
 #.  marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection 
 #.  marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell 
 #. type: Content of: <section><mediaobject>
-#: en/add_supplemental_media.xml:18
+#: en/add_supplemental_media.xml:14
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
-"add_supplemental_media.png\" format=\"PNG\" revision=\"1\" xml:id=\"dx2-"
-"add_supplemental_media-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-add_supplemental_media."
+"png\" xml:id=\"dx2-add_supplemental_media-im1\" align=\"center\" revision="
+"\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
 "add_supplemental_media.png\" format=\"PNG\" revision=\"1\" xml:id=\"dx2-"
 "add_supplemental_media-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:24
+#: en/add_supplemental_media.xml:19
+#, fuzzy
 msgid ""
-"This screen gives you the list of already recognized repositories. You can "
-"add other sources for packages, like an optical disc or a remote source. The "
-"source selection determines which packages will be available for selection "
-"during the next steps."
+"This screen shows you the list of already recognized repositories. You can "
+"add other sources for packages, like an optical disc or a remote source.  "
+"The source selection determines which packages will be available during the "
+"next steps."
 msgstr ""
 "Siin on näha juba tuvastatud andmekandjad ehk tarkvarahoidlad. Võite lisada "
 "ka teisi allikaid, kust tarkvarapakette hankida, näiteks plaadi pealt või "
@@ -137,23 +142,25 @@ msgstr ""
 "järgmistel etappidel kasutada."
 
 #. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:29
+#: en/add_supplemental_media.xml:24
 msgid "For a network source, there are two steps to follow:"
 msgstr "Võrguallika korral tuleb lisaks ette võtta järgmised sammud:"
 
 #. type: Content of: <section><orderedlist><listitem><para>
-#: en/add_supplemental_media.xml:33
+#: en/add_supplemental_media.xml:28
 msgid "Choosing and activation of the network, if not already up."
 msgstr "Valida ja aktiveerida võrk, kui see veel ei tööta."
 
 #. type: Content of: <section><orderedlist><listitem><para>
-#: en/add_supplemental_media.xml:37
+#: en/add_supplemental_media.xml:32
+#, fuzzy
 msgid ""
 "Selecting a mirror or specifying a URL (very first entry). By selecting a "
 "mirror, you have access to the selection of all repositories managed by "
-"Mageia, like the Nonfree , the Tainted repositories and the Updates. With "
-"the URL, you can designate a specific repository or your own NFS "
-"installation."
+"Mageia, like the <emphasis role=\"bold\">Nonfree</emphasis>, the <emphasis "
+"role=\"bold\">Tainted</emphasis> repositories and the <emphasis role=\"bold"
+"\">Updates</emphasis>. With the URL, you can designate a specific repository "
+"or your own NFS installation."
 msgstr ""
 "Valida peegel või määrata URL (esimene kirje). Peegli valimisel saab "
 "kasutada kõiki Mageia määratud hoidlaid, sealhulgas mittevaba (nonfree) ja "
@@ -161,14 +168,15 @@ msgstr ""
 "määrates saab kasutada mõnda konkreetset hoidlat või omaenda NFS-allikat."
 
 #. type: Content of: <section><note><para>
-#: en/add_supplemental_media.xml:46
+#: en/add_supplemental_media.xml:42
+#, fuzzy
 msgid ""
 "If you are updating a 64 bit installation which may contain some 32 bit "
 "packages, it is advised to use this screen to add an online mirror by "
-"ticking one of the Network protocols here. The 64 bit DVD iso only contains "
-"64 bit and noarch packages, it will not be able to update the 32 bit "
-"packages. However, after adding an online mirror, installer will find the "
-"needed 32 bit packages there."
+"ticking one of the Network protocols here. The 64-bit DVD ISO only contains "
+"64-bit and noarch packages, it will not be able to update the 32-bit "
+"packages. However, after adding an online mirror, the installer will find "
+"the needed 32-bit packages there."
 msgstr ""
 "Kui uuendate 64-bitist paigaldust, milles võib leiduda mõningaid 32-bitiseid "
 "rakendusi, on soovitatav sellel ekraanil lisada võrgupeegel, märkides "
@@ -185,7 +193,7 @@ msgstr "Kasutajate ja administraatori haldamine"
 
 #.  Lebarhon: 20170210 updated for Mageia 6 (umask)
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:7
+#: en/addUser.xml:9
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
 "\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -198,21 +206,21 @@ msgstr ""
 "\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:16
+#: en/addUser.xml:20
 msgid "Set Administrator (root)  Password:"
 msgstr "Administraatori (root) parooli määramine"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:19
+#: en/addUser.xml:24
+#, fuzzy
 msgid ""
 "It is advisable for all <application>Mageia</application> installations to "
-"set a superuser or administrator's password, usually called the "
-"<emphasis>root password</emphasis> in Linux. As you type a password into the "
-"top box the colour of its shield will change from red to yellow to green "
+"set a <emphasis role=\"bold\">superuser</emphasis> (administrator) password, "
+"usually called the <emphasis>root password</emphasis> 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 "
-"just below the first password box, this checks that you have not mistyped "
-"the first password by comparing them."
+"underneath, to check that the first entry was not mistyped."
 msgstr ""
 "Kõigi <application>Mageia</application> paigalduste korral on soovitatav "
 "määrata administraatori parool (Linuxis kasutatakse selle kohta tavaliselt "
@@ -224,9 +232,10 @@ msgstr ""
 "kirjutatud, neid kahte omavahel võrreldes."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:28
+#: en/addUser.xml:34
+#, fuzzy
 msgid ""
-"All passwords are case sensitive, it is best to use a mixture of letters "
+"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 ""
 "Kõik paroolid on tõstutundlikud, see tähendab arvestavad väike- ja "
@@ -234,16 +243,18 @@ msgstr ""
 "väiketähti kui ka numbreid ja muid märke."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:35
+#: en/addUser.xml:42
 msgid "Enter a user"
 msgstr "Kasutaja lisamine"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:37
+#: en/addUser.xml:45
+#, fuzzy
 msgid ""
-"Add a user here. A user has fewer rights than the superuser (root), but "
-"enough to use the internet, office applications or play games and anything "
-"else the average user does with his computer"
+"Add a user here. A regular user has fewer privileges than the <emphasis role="
+"\"bold\">superuser</emphasis> (root), but enough to use the internet, office "
+"applications or play games and anything else the average user might use "
+"their computer for."
 msgstr ""
 "Siin saab lisada kasutaja. Kasutajal on vähem õigusi kui administraatoril "
 "(root), kuid siiski piisavalt internetis liikumiseks, kontoritöörakenduste "
@@ -251,7 +262,7 @@ msgstr ""
 "arvutis teeb"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:40
+#: en/addUser.xml:52
 msgid ""
 "<guibutton>Icon</guibutton>: if you click on this button it will change the "
 "user's icon."
@@ -260,7 +271,7 @@ msgstr ""
 "ikooni."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:43
+#: en/addUser.xml:57
 msgid ""
 "<guilabel>Real Name</guilabel>: Insert the user's real name into this text "
 "box."
@@ -268,10 +279,11 @@ msgstr ""
 "<guilabel>Pärisnimi</guilabel>: siin saab kirja panna kasutaja tegeliku nime."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:46
+#: en/addUser.xml:62
+#, fuzzy
 msgid ""
-"<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
-"drakx use a version of the user's real name. <emphasis>The login name is "
+"<guilabel>Login Name</guilabel>: 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 ""
 "<guilabel>Kasutajatunnus</guilabel>: siin saab kirja panna kasutajanime või "
@@ -279,40 +291,43 @@ msgstr ""
 "<emphasis>Kasutajatunnus on tõstutundlik.</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:50
+#: en/addUser.xml:67
+#, fuzzy
 msgid ""
-"<guilabel>Password</guilabel>: In this text box you should type in the user "
-"password. There is a shield at the end of the text box that indicates the "
-"strength of the password. (See also <xref linkend=\"givePassword\"/>)"
+"<guilabel>Password</guilabel>: 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 ""
 "<guilabel>Parool</guilabel>: siin saab kirja panna kasutaja parooli. "
 "Tekstikasti lõpus on kilp, mis näitab parooli tugevust (vt ka <xref linkend="
 "\"givePassword\"/>)."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:55
+#: en/addUser.xml:73
+#, fuzzy
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the user password into this "
-"text box and drakx will check you have the same password in each of the user "
-"password text boxes."
+"<guilabel>Password (again)</guilabel>: Retype the user password DrakX will "
+"check that you have not mistyped the password."
 msgstr ""
-"<guilabel>Parool (uuesti)</guilabel>: siia tuleb kirjutada teist korda "
-"kasutaja parool ning DrakX kontrollib, kas see on ikka sama, mis kirjutati "
-"ülal asuvasse kasti."
+"<guilabel>Parool (uuesti)</guilabel>: siia tuleb parool teist korda "
+"kirjutada, mille järel Drakx kontrollib, kas see ikka sobib kokku sellega, "
+"mille sisestasid esimesel korral."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:61
+#: en/addUser.xml:79
+#, fuzzy
 msgid ""
-"Any user you add while installing Mageia, will have a both read and write "
-"protected home directory (umask=0027)."
+"Any users you added while installing Mageia, will have a home directory that "
+"is both read and write protected (umask=0027)."
 msgstr ""
 "Kõigi Mageia paigaldamise ajal lisatud kasutajate kodukataloog on nii "
 "lugemis- kui ka kirjutuskaitstud (umask=0027)."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:63
+#: en/addUser.xml:82
+#, fuzzy
 msgid ""
-"You can add all extra needed users in the <emphasis>Configuration - Summary</"
+"You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
 "emphasis>."
 msgstr ""
@@ -321,86 +336,58 @@ msgstr ""
 "haldamine</emphasis>."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:66
+#: en/addUser.xml:86
 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:72
+#: en/addUser.xml:93
 msgid "Advanced User Management"
 msgstr "Põhjalikum kasutajate haldamine"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:74
+#: en/addUser.xml:96
+#, fuzzy
 msgid ""
-"If the <guibutton>advanced</guibutton> button is clicked you are offered a "
-"screen that allows you to edit the settings for the user you are adding."
+"The <guibutton>Advanced</guibutton> option allows you to edit further "
+"settings for the user you are adding."
 msgstr ""
 "Nupule <guibutton>Muud valikud</guibutton> klõpsates ilmub ekraan, kus saab "
 "muuta lisatava kasutaja mõningaid seadistusi."
 
-#. type: Content of: <section><section><para>
-#: en/addUser.xml:77
-msgid "Additionally, you can disable or enable a guest account."
-msgstr " Samuti saab siin lubada või keelata külaliskonto."
-
-#. type: Content of: <section><section><warning><para>
-#: en/addUser.xml:80
-msgid ""
-"Anything a guest with a default <emphasis>rbash</emphasis> guest account "
-"saves to his /home directory will be erased when he logs out.  The guest "
-"should save his important files to a USB key."
-msgstr ""
-"Kõik, mida külaline oma vaikimisi <emphasis>rbash</emphasis> külaliskonto "
-"all /home-kataloogi salvestab, kustutatakse külalise väljalogimisel. Tähtsad "
-"failid peaks külaline salvestama USB-pulgale."
-
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:86
+#: en/addUser.xml:101
+#, fuzzy
 msgid ""
-"<guilabel>Enable guest account</guilabel>: Here you can enable or disable a "
-"guest account. The guest account allows a guest to log into and use the PC, "
-"but he has more restricted access than normal users."
-msgstr ""
-"<guilabel>Külaliskonto (guest) lubamine</guilabel>: siin saab lubada või "
-"keelata külaliskonto. See võimaldab külalisel, kellele pole kasutajat "
-"loodud, sisse logida ja arvutit kasutada, kuid tema õigused on tavalise "
-"kasutajaga võrreldes palju piiratumad."
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:92
-msgid ""
-"<guilabel>Shell</guilabel>: This drop down list allows you to change the "
-"shell used by the user you are adding in the previous screen, options are "
-"Bash, Dash and Sh"
+"<guilabel>Shell</guilabel>: This drop-down list allows you to change the "
+"shell available to any user you added in the previous screen. Options are "
+"<emphasis role=\"bold\">Bash</emphasis>, <emphasis role=\"bold\">Dash</"
+"emphasis> and <emphasis role=\"bold\">Sh</emphasis>"
 msgstr ""
 "<guilabel>Shell</guilabel>: selles rippmenüüs saab muuta shelli, mida "
 "kasutab eelmisel ekraanil lisatud kasutaja. Valikuteks on Bash, Dash ja Sh."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:107
+#, fuzzy
 msgid ""
-"<guilabel>User ID</guilabel>: Here you can set the user ID for the user you "
-"are adding in the previous screen. This is a number.  Leave it blank unless "
-"you know what you are doing."
+"<guilabel>User ID</guilabel>: Here you can set the <emphasis role=\"bold"
+"\">user ID</emphasis> for any user you added in the previous screen. If you "
+"are unsure what the purpose of this is, then leave it blank."
 msgstr ""
 "<guilabel>Kasutaja ID</guilabel>: siin saab määrata eelmisel ekraanil "
 "lisatud kasutaja ID. See on arv. Kui te ei tea, milleks see hea on, ärge "
 "siia midagi kirjutage."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:102
+#: en/addUser.xml:113
 msgid ""
-"<guilabel>Group ID</guilabel>: This lets you set the group ID.  Also a "
-"number, usually the same one as for the user. Leave it blank unless you know "
-"what you are doing."
+"<guilabel>Group ID</guilabel>: This lets you set the <emphasis role=\"bold"
+"\">group ID</emphasis>. Again, if unsure, leave it blank."
 msgstr ""
-"<guilabel>Grupi ID</guilabel>: siin saab määrata grupi ID. See on samuti "
-"arv, tavaliselt sama kasutaja ID-ga. Kui te ei tea, milleks see hea on, ärge "
-"siia midagi kirjutage."
 
 #. type: Content of: <section><info><title>
-#: en/ask_mntpoint_s.xml:11
+#: en/ask_mntpoint_s.xml:3
 msgid "Choose the mount points"
 msgstr "Haakepunktide valimine"
 
@@ -417,13 +404,14 @@ msgstr "Haakepunktide valimine"
 #.  2012-04-19  Language proofreading done 
 #. type: Content of: <section><mediaobject>
 #: en/ask_mntpoint_s.xml:27
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
-"chooseMountpoints.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"chooseMountPoints-im1\"></imagedata> </imageobject> <imageobject "
-"condition='live'> <imagedata revision=\"1\" fileref=\"live-chooseMountpoints."
-"png\" align=\"center\" format=\"PNG\" xml:id=\"live-chooseMountPoints-"
-"im1\"></imagedata> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"chooseMountPoints-im1\" align=\"center\" fileref=\"dx2-chooseMountpoints."
+"png\" revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata format=\"PNG\" fileref=\"live-chooseMountpoints.png\" align="
+"\"center\" xml:id=\"live-chooseMountPoints-im1\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
 "chooseMountpoints.png\" align=\"center\" format=\"PNG\" xml:id="
@@ -433,7 +421,7 @@ msgstr ""
 "im1\"></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:37
+#: en/ask_mntpoint_s.xml:36
 msgid ""
 "Here you see the Linux partitions that have been found on your computer. If "
 "you don't agree with the <application>DrakX</application> suggestions, you "
@@ -444,41 +432,45 @@ msgstr ""
 "muuta."
 
 #. type: Content of: <section><note><para>
-#: en/ask_mntpoint_s.xml:42
+#: en/ask_mntpoint_s.xml:41
+#, fuzzy
 msgid ""
-"If you change anything, make sure you still have a <literal>/</literal> "
-"(root) partition."
+"If you change anything, make sure you still have a <emphasis role=\"bold"
+"\"><literal>/</literal></emphasis> (root) partition."
 msgstr ""
 "Kui te ka midagi muudate, kontrollige alati, et teil jääks alles "
 "juurpartitsioon (<literal>/)</literal>."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:48
+#: en/ask_mntpoint_s.xml:46
+#, fuzzy
 msgid ""
-"Every partition is shown as follows: \"Device\" (\"Capacity\", \"Mount point"
-"\", \"Type\")."
+"Every partition is shown to the left as: <emphasis role=\"bold\">Device "
+"(capacity, mount point, type).</emphasis>"
 msgstr ""
 "Kõiki partitsioone näidatakse kujul \"Seade\" (\"Suurus\", \"Haakepunkt\", "
 "\"Tüüp\")."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:53
+#: en/ask_mntpoint_s.xml:50
 msgid ""
-"\"Device\", is made up of: \"hard drive\", [\"hard drive number\"(letter)], "
-"\"partition number\" (for example, \"sda5\")."
+"<emphasis role=\"bold\">Device</emphasis>, is made up of: <emphasis role="
+"\"bold\">hard drive</emphasis>, [<emphasis role=\"bold\">hard drive name</"
+"emphasis> (letter)], <emphasis role=\"bold\">partition number</emphasis> "
+"(for example, <emphasis role=\"bold\">sda5</emphasis>)."
 msgstr ""
-"\"Seade\" koosneb järgmistest elementidest: \"kõvaketas\", [\"kõvakettanumber"
-"\"(täht)], \"partitsiooninumber\" (näiteks \"sda5\")."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:59
+#: en/ask_mntpoint_s.xml:56
+#, fuzzy
 msgid ""
-"If you have many partitions, you can choose many different mount points from "
-"the drop down menu, such as <literal>/</literal>, <literal>/home</literal> "
-"and <literal>/var</literal>. You can even make your own mount points, for "
-"instance <literal>/video</literal> for a partition where you want to store "
-"your films, or <literal>/cauldron-home</literal> for the <literal>/home</"
-"literal> partition of a cauldron install."
+"If you have several partitions, you can choose various different mount "
+"points from the drop down menu, such as <emphasis role=\"bold\">/</"
+"emphasis>, <emphasis role=\"bold\"><literal>/home</literal></emphasis> and "
+"<emphasis role=\"bold\">/var</emphasis>. You can even make your own mount "
+"points, for instance <emphasis role=\"bold\"><literal>/video</literal></"
+"emphasis> for a partition where you want to store your films, or <emphasis "
+"role=\"bold\">/Data</emphasis> (or some other name) for your data."
 msgstr ""
 "Kui partitsioone on palju, saab neile haakepunkte valida rippmenüüst "
 "(näiteks <literal>/</literal>, <literal>/home</literal> ja <literal>/var)</"
@@ -487,27 +479,29 @@ msgstr ""
 "literal> cauldroni paigalduse <literal>/home</literal>-partitsiooni tarbeks."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:69
+#: en/ask_mntpoint_s.xml:63
+#, fuzzy
 msgid ""
-"For partitions you don't need to have access to, you can leave the mount "
-"point field blank."
+"For any partitions that you don't need to make use of, you can leave the "
+"mount point field blank."
 msgstr ""
 "Partitsioonide puhul, mida teil vaja ei lähe, võib haakepunkti määramata "
 "jätta."
 
 #. type: Content of: <section><warning><para>
-#: en/ask_mntpoint_s.xml:75
+#: en/ask_mntpoint_s.xml:69
+#, fuzzy
 msgid ""
-"Choose <guibutton>Previous</guibutton> if you are not sure what to choose, "
-"and then tick <guilabel>Custom disk partitioning</guilabel>. In the screen "
-"that follows, you can click on a partition to see its type and size."
+"If you are not sure what to choose, click <emphasis role=\"bold\">Previous</"
+"emphasis> to go back and then tick <guilabel>Custom disk partitioning</"
+"guilabel>, where, you can click on a partition to see its type and size."
 msgstr ""
 "Kui te pole kindel, mida valida, klõpsake <guibutton>Tagasi</guibutton> ning "
 "märkige <guilabel>Ketta jagamine oma tahtmist mööda</guilabel>. Ilmuval "
 "ekraanil saab partitsioonile klõpsates näha selle tüüpi ja suurust."
 
 #. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:81
+#: en/ask_mntpoint_s.xml:74
 msgid ""
 "If you are sure the mount points are correct, click on <guibutton>Next</"
 "guibutton>, and choose whether you only want to format the partition(s) "
@@ -769,8 +763,9 @@ msgstr "Töölaua valimine"
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:8
+#, fuzzy
 msgid ""
-"Depending on your selection here, you may be offered further screens to fine "
+"Depending on your selection here, you may be offered further screens to fine-"
 "tune your choice."
 msgstr ""
 "Sõltuvalt siin langetatud valikutest võite näha täiendavaid ekraane, kus "
@@ -778,8 +773,9 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:11
+#, fuzzy
 msgid ""
-"After the selection step(s), you will see a slide show during package "
+"After the selection step(s), you will see a slide-show during package "
 "installation. The slide show can be disabled by pressing the "
 "<guilabel>Details</guilabel> button"
 msgstr ""
@@ -798,14 +794,16 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:21
+#, fuzzy
 msgid ""
-"Choose whether you prefer to use the <application>KDE</application> or "
-"<application>Gnome</application> desktop environment. Both come with a full "
-"set of useful applications and tools. Tick <guilabel>Custom</guilabel> if "
-"you want to use neither or both, or if you want something other than the "
-"default software choices for these desktop environments. The "
-"<application>LXDE</application> desktop is lighter than the previous two, "
-"sporting less eye candy and fewer packages installed by default."
+"Choose whether you prefer to use the <application>KDE</application> "
+"<emphasis role=\"bold\">Plasma </emphasis>or <application>GNOME</"
+"application> desktop environment. Both come with a full set of useful "
+"applications and tools. Tick <guilabel>Custom</guilabel> if you wish to use "
+"neither (or even use both), or if you want to modify the default software "
+"choices for these desktop environments. The <application>LXDE</application> "
+"desktop, for instance, is lighter than the previous two, sporting less eye "
+"candy and fewer packages installed by default."
 msgstr ""
 "Siin saab valida, kas soovite kasutada <application>KDE</application> või "
 "<application>Gnome</application> töökeskkonda. Mõlemad pakuvad rakendusi ja "
@@ -831,8 +829,9 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/choosePackageGroups.xml:14
+#, fuzzy
 msgid ""
-"Packages have been sorted into groups, to make choosing what you need on "
+"Packages are arranged into common groups, to make choosing what you need on "
 "your system a lot easier. The groups are fairly self explanatory, however "
 "more information about the content of each is available in tool-tips which "
 "become visible as the mouse is hovered over them."
@@ -843,61 +842,68 @@ msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:21
-msgid "Workstation."
-msgstr "Tööjaam."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Workstation</emphasis>"
+msgstr "<emphasis role=\"bold\">Partitsiooni suurus:</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:25
-msgid "Server."
-msgstr "Server."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Server</emphasis>"
+msgstr "<emphasis role=\"bold\">Muud valikud</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:29
-msgid "Graphical Environment."
-msgstr "Graafiline keskkond."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Graphical Environment</emphasis>"
+msgstr "<emphasis role=\"bold\">Muud valikud</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:33
+#, fuzzy
 msgid ""
-"Individual Package Selection: You can use this option to manually add or "
-"remove packages."
+"I<emphasis role=\"bold\">Individual Package Selection</emphasis>: you can "
+"use this option to manually add or remove packages"
 msgstr ""
 "Valik paketthaaval: selle valimisel saab pakette käsitsi lisada või "
 "eemaldada."
 
 #. type: Content of: <section><para>
 #: en/choosePackageGroups.xml:38
+#, fuzzy
 msgid ""
-"Read <xref linkend=\"minimal-install\"/> for instructions on how to do a "
+"See <xref linkend=\"minimal-install\"/> for instructions on how to do a "
 "minimal install (without or with X &amp; IceWM)."
 msgstr ""
 "Juhiseid minimaalse paigalduse tegemiseks (nii X'i ja IceWM'iga kui ka ilma "
 "nendeta) annab <xref linkend=\"minimal-install\"/>."
 
 #. type: Content of: <section><info><title>
-#: en/choosePackagesTree.xml:4
+#: en/choosePackagesTree.xml:3
 msgid "Choose Individual Packages"
 msgstr "Üksikpakettide valimine"
 
 #. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
 #. type: Content of: <section><mediaobject>
-#: en/choosePackagesTree.xml:11
+#: en/choosePackagesTree.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackagesTree.png"
+"\" align=\"center\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-choosePackagesTree."
-"png\" format=\"PNG\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
+"\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:17
+#: en/choosePackagesTree.xml:14
+#, fuzzy
 msgid ""
-"Here you can add or remove any extra packages to customise your installation."
+"Here you can add or remove any extra packages to customize your installation."
 msgstr ""
 "Siin saab oma paigaldust kohandada, lisades või eemaldades tarkvarapakette."
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:20
+#: en/choosePackagesTree.xml:17
 msgid ""
 "After having made your choice, you can click on the <guibutton>floppy icon</"
 "guibutton> at the bottom of the page to save your choice of packages (saving "
@@ -912,47 +918,45 @@ msgstr ""
 "paigaldamise ajal sama nuppu ja faili laadides."
 
 #. type: Content of: <section><info><title>
-#: en/configureServices.xml:12
+#: en/configureServices.xml:3
 msgid "Configure your Services"
 msgstr "Teenuste seadistamine"
 
 #.  2012-12-25 marja - moved this section out of misc-params.xml 
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/configureServices.xml:21
+#: en/configureServices.xml:11
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-configureServices.png"
+"\" xml:id=\"configureServices-im1\" align=\"center\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
+"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:27
+#: en/configureServices.xml:16
+#, fuzzy
 msgid ""
-"Here you can set which services should (not) start when you boot your system."
+"Here you can choose which services should start when you boot your system."
 msgstr ""
 "Siin saab määrata, millised teenused käivitada või mitte käivitada koos "
 "süsteemi alglaadimisega."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:30
-msgid ""
-"There are four groups, click on the triangle before a group to expand it and "
-"see all services in it."
+#: en/configureServices.xml:19
+msgid "Click on a triangle to expand a group to all the relevant services."
 msgstr ""
-"Teenustegruppe on neli. Nende ees olevale kolmnurgale klõpsates saab grupi "
-"avada ja uurida selles peituvaid teenuseid."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:34
-msgid "The setting DrakX chose are usually good."
+#: en/configureServices.xml:22
+#, fuzzy
+msgid "The settings DrakX chose are usually good."
 msgstr "Valikud, mille on langetanud DrakX, on tavaliselt mõistlikud ja head."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:37
+#: en/configureServices.xml:25
 msgid ""
 "If you highlight a service, some information about it is shown in the info "
 "box below."
@@ -961,7 +965,7 @@ msgstr ""
 "kohta."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:41
+#: en/configureServices.xml:28
 msgid "Only change things when you know very well what you are doing."
 msgstr ""
 "Muutke siin midagi ainult siis, kui olete kindel, et teate, mida teete."
@@ -975,12 +979,13 @@ msgstr "Ajavööndi seadistamine"
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
 #: en/configureTimezoneUTC.xml:11
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id="
-"\"configureTimezoneUTC-im1\" revision=\"1\" fileref=\"dx2-"
-"configureTimezoneUTC.png\" align=\"center\" format=\"PNG\"/> </imageobject> "
-"<imageobject> <imagedata fileref=\"live-timeZone.png\" condition=\"live\" "
-"format=\"PNG\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"configureTimezoneUTC-im1\" align=\"center\" fileref=\"dx2-"
+"configureTimezoneUTC.png\" revision=\"1\"/> </imageobject> <imageobject> "
+"<imagedata format=\"PNG\" fileref=\"live-timeZone.png\" condition=\"live\"/> "
+"</imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata xml:id="
 "\"configureTimezoneUTC-im1\" revision=\"1\" fileref=\"dx2-"
@@ -990,18 +995,20 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/configureTimezoneUTC.xml:20
+#, fuzzy
 msgid ""
-"Choose your time zone by choosing your country or a city close to you in the "
-"same time zone."
+"Choose your time-zone by choosing your country or a city close to you in the "
+"same time-zone."
 msgstr ""
 "Määrake ajavöönd kindlaks, valides oma riigi või linna, mis asub samas "
 "ajavööndis teie lähedal."
 
 #. type: Content of: <section><para>
 #: en/configureTimezoneUTC.xml:24
+#, fuzzy
 msgid ""
-"In next screen you can choose to set your hardware clock to local time or to "
-"GMT, also known as UTC."
+"In the next screen you can choose to set your hardware clock to local time "
+"or to GMT, also known as UTC."
 msgstr ""
 "Järgmisel ekraanil saab valida, kas riistvaraline kell on seatud kohalikule "
 "ajale või GMT-le ehk maailmaajale (UTC)."
@@ -1016,23 +1023,23 @@ msgstr ""
 "oleksid lültiatud kas kohalikule ajale või siis UTC/GMT-le."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:11
+#: en/configureX_card_list.xml:13
 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:16
+#: en/configureX_card_list.xml:18
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
-"\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" format="
-"\"PNG\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_card_list."
-"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_card_list-im1\"/> </"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_card_list-im1\" "
+"align=\"center\" fileref=\"dx2-configureX_card_list.png\" revision=\"1\"/> </"
 "imageobject>"
+msgstr ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
+"\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:21
+#: en/configureX_card_list.xml:23
 msgid ""
 "DrakX has a very comprehensive database of video cards and will usually "
 "correctly identify your video device."
@@ -1041,7 +1048,7 @@ msgstr ""
 "teie videoseadme korrektselt tuvastada."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:24
+#: en/configureX_card_list.xml:26
 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:"
@@ -1051,100 +1058,97 @@ msgstr ""
 "parameetrite alusel:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:27 en/configureX_monitor.xml:69
+#: en/configureX_card_list.xml:29 en/configureX_monitor.xml:57
 msgid "vendor"
 msgstr "tootja"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:31
+#: en/configureX_card_list.xml:33
 msgid "then the name of your card"
 msgstr "seejärel kaardi nimi"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:35
+#: en/configureX_card_list.xml:37
 msgid "and the type of card"
 msgstr "ja lõpuks kaardi tüüp"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:39
+#: en/configureX_card_list.xml:41
+#, fuzzy
 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 "
-"Xorg category"
-msgstr ""
-"Kui te ei leia oma kaarti tootjate nimekirjast (sest seda pole veel "
-"andmebaasis või on tegu väga vana kaardiga), võib siiski leida sobiva "
-"draiveri Xorg-i kategoorias."
-
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:43
-msgid ""
-"The Xorg listing provides more than 40 generic and open source video card "
-"drivers. If you still can't find a named driver for your card there is the "
-"option of using the vesa driver which provides basic capabilities."
+"<emphasis role=\"bold\">Xorg</emphasis> category, which provides more than "
+"40 generic and open source video card drivers. If you still can't find a "
+"specific driver for your card there is the option of using the <emphasis "
+"role=\"bold\">vesa</emphasis> driver which provides basic capabilities."
 msgstr ""
 "Xorg-i nimekiri pakub üle 40 üldise avatud lähtekoodiga videokaardi "
 "draiveri. Kui te ikkagi ei suuda oma kaardile sobivat draiverit siit leida, "
 "võite valida Vesa draiveri, mis pakub kõige elementaarsemaid võimalusi."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:48
+#: en/configureX_card_list.xml:47
+#, fuzzy
 msgid ""
 "Be aware that if you select an incompatible driver you may only have access "
-"to the Commandline Interface."
+"to the <emphasis role=\"bold\">Command-line</emphasis> Interface."
 msgstr ""
 "Arvestage kindlasti, et kui valite sobimatu draiveri, võite saada kasutada "
 "ainult käsurida."
 
 #. type: Content of: <section><para>
 #: en/configureX_card_list.xml:51
+#, fuzzy
 msgid ""
 "Some video card manufacturers provide proprietary drivers for Linux which "
-"may only be available in the Nonfree repository and in some cases only from "
-"the card manufacturers' websites."
+"may only be available in the <emphasis role=\"bold\">Nonfree</emphasis> "
+"repository and in some cases only from the card manufacturers' websites."
 msgstr ""
 "Mõned videokaartide tootjad pakuvad Linuxile omanduslikke draivereid, mis "
 "võivad olla saadaval ainult Nonfree tarkvarahoidlas, mõnel juhul isegi "
 "kõigest tootja enda veebileheküljel."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:55
+#: en/configureX_card_list.xml:56
+#, fuzzy
 msgid ""
-"The Nonfree repository needs to be explicitly enabled to access them.  If "
-"you didn't select it previously, you should do this after your first reboot."
+"The <emphasis role=\"bold\">Nonfree</emphasis> repository needs to be "
+"explicitly enabled to access them. If you didn't enable it previously, you "
+"should do this after your first reboot."
 msgstr ""
 "Nonfree hoidlad tuleb kasutamiseks spetsiaalselt lubada.  Seda saab teha "
 "pärast arvuti esimest taaskäivitamist."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:4
+#: en/configureX_chooser.xml:3
 msgid "Graphic 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
 #. type: Content of: <section><mediaobject>
-#: en/configureX_chooser.xml:11
+#: en/configureX_chooser.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> </"
-"imagedata> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_chooser."
-"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_chooser-im1\"/> </"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_chooser-im1\" "
+"fileref=\"dx2-configureX_chooser.png\" align=\"center\" 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><para>
-#: en/configureX_chooser.xml:18
+#: en/configureX_chooser.xml:15
+#, fuzzy
 msgid ""
 "No matter which graphical environment (also known as desktop environment) "
 "you chose for this install of <application>Mageia</application>, they are "
 "all based on a graphical user interface system called <acronym>X Window "
 "System</acronym>, or simply <acronym>X</acronym>. So in order for "
-"<acronym>KDE</acronym>, <acronym>Gnome</acronym>, <acronym>LXDE</acronym> or "
-"any other graphical environment to work well, the following <acronym>X</"
-"acronym> settings need to be correct. Choose the correct settings if you can "
-"see that <application>DrakX</application> didn't make a choice, or if you "
-"think the choice is incorrect."
+"<acronym>KDE</acronym> Plasma, <acronym>GNOME</acronym>, <acronym>LXDE</"
+"acronym> or any other graphical environment to work well, the following "
+"<acronym>X</acronym> settings need to be correct. Choose the correct "
+"settings if none are shown, or if you think the details are incorrect."
 msgstr ""
 "Sõltumata sellest, millise graafilise keskkonna ehk töökeskkonna olete "
 "otsustanud oma <application>Mageia</application> paigaldusele valida, "
@@ -1157,7 +1161,7 @@ msgstr ""
 "arvate, et valik ei ole õige."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:31
+#: en/configureX_chooser.xml:27
 msgid ""
 "<emphasis><guibutton>Graphic card</guibutton></emphasis>: Choose your card "
 "from the list if needed."
@@ -1166,13 +1170,14 @@ msgstr ""
 "korral loetelust oma kaart."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:37
+#: en/configureX_chooser.xml:33
+#, fuzzy
 msgid ""
 "<emphasis><guibutton>Monitor</guibutton></emphasis>: You can choose "
-"<guilabel>Plug'n Play</guilabel> when applicable, or choose your monitor "
-"from the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. "
-"Choose <guilabel>Custom</guilabel> if you prefer to manually set the "
-"horizontal and vertical refresh rates of your monitor."
+"<guilabel>Plug'n Play</guilabel> if applicable, or choose your monitor from "
+"the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. Choose "
+"<guilabel>Custom</guilabel> if you prefer to manually set the horizontal and "
+"vertical refresh rates of your monitor."
 msgstr ""
 "<emphasis><guibutton>Monitor</guibutton></emphasis>: valida saab "
 "<guilabel>Plug'n Play</guilabel>, kui see sobib, või siis vajaliku monitori "
@@ -1181,30 +1186,31 @@ msgstr ""
 "paika panna oma monitori realaotus- ja ekraaniuuendussageduse."
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/configureX_chooser.xml:45
+#: en/configureX_chooser.xml:41
 msgid "Incorrect refresh rates may damage your monitor"
 msgstr "Väärad sagedused võivad monitori kahjustada."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:51
+#: en/configureX_chooser.xml:47
+#, fuzzy
 msgid ""
-"<emphasis><guibutton>Resolution</guibutton></emphasis>: Set the desired "
-"resolution and color depth of your monitor here."
+"<emphasis><guibutton>Resolution</guibutton></emphasis>: The resolution and "
+"color depth of your monitor ca be set here."
 msgstr ""
 "<emphasis><guibutton>Ekraanilahutus</guibutton></emphasis>: siin saab "
 "määrata vajaliku monitori ekraanilahutuse ja värvisügavuse."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:56
+#: en/configureX_chooser.xml:52
+#, fuzzy
 msgid ""
 "<emphasis><guibutton>Test</guibutton></emphasis>: The test button does not "
-"always appear during install. If the button is there, you can control your "
-"settings by pressing it. If you see a question asking you whether your "
-"settings are correct, you can answer \"yes\", and the settings will be kept. "
-"If you don't see anything, you'll return to the configuration screen and be "
-"able to reconfigure everything until the test is good. <emphasis>Make sure "
-"your settings are on the safe side if the test button isn't available</"
-"emphasis>"
+"always appear during install. If the option is there, and you test your "
+"settings, you should be ask whether your settings are correct. If you answer "
+"<emphasis role=\"bold\">yes</emphasis>, the settings will be kept. If you "
+"don't see anything, you'll return to the configuration screen and be able to "
+"reconfigure everything until the test result is satisfactory. If the test "
+"option is not available, then make sure your settings are on the safe side."
 msgstr ""
 "<emphasis><guibutton>Test</guibutton></emphasis>: testimisnuppu paigaldamise "
 "ajal alati ei näe. Kui see on näha, siis saab sellele vajutades kontrollida "
@@ -1215,7 +1221,7 @@ msgstr ""
 "kontrollige eriti hoolikalt, et kõik seadistused oleksid korras.</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:67
+#: en/configureX_chooser.xml:63
 msgid ""
 "<emphasis><guibutton>Options</guibutton></emphasis>: Here you can choose to "
 "enable or disable various options."
@@ -1224,12 +1230,12 @@ msgstr ""
 "mitmesuguseid valikuid lubada või keelata."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_monitor.xml:18
+#: en/configureX_monitor.xml:11
 msgid "Choosing your Monitor"
 msgstr "Monitori valimine"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:21
+#: en/configureX_monitor.xml:14
 msgid ""
 "DrakX has a very comprehensive database of monitors and will usually "
 "correctly identify yours."
@@ -1238,12 +1244,13 @@ msgstr ""
 "teie monitori õigesti."
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:26
+#: en/configureX_monitor.xml:19
+#, fuzzy
 msgid ""
-"<emphasis>Selecting a monitor with different characteristics could damage "
-"your monitor or video hardware. Please don't try something without knowing "
-"what you are doing.</emphasis> If in doubt you should consult your monitor "
-"documentation"
+"<emphasis role=\"bold\">Selecting a monitor with different characteristics "
+"could damage your monitor or video hardware. Please don't try something "
+"without knowing what you are doing.</emphasis> If in doubt you should "
+"consult your monitor documentation."
 msgstr ""
 "<emphasis>Teistsuguste parameetritega monitori valimine võib kahjustada "
 "monitori või videoriistvara. Palun ärge proovige lihtsalt huvi pärast "
@@ -1251,23 +1258,23 @@ msgstr ""
 "Kahtluste korral uurige oma monitori dokumentatsiooni."
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:34
+#: en/configureX_monitor.xml:26
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
-"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_monitor-im1\" "
+"fileref=\"dx2-configureX_monitor.png\" align=\"center\" revision=\"1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
-"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:42
+#: en/configureX_monitor.xml:31
 msgid "<emphasis>Custom</emphasis>"
 msgstr "<emphasis>Kohandatud</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:44
+#: en/configureX_monitor.xml:33
 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 "
@@ -1278,7 +1285,7 @@ msgstr ""
 "realaotussageduse ja ekraaniuuendussageduse."
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:49
+#: en/configureX_monitor.xml:38
 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 "
@@ -1291,12 +1298,12 @@ msgstr ""
 "tagasihoidlikum väärtus ja kindlasti uurige monitori dokumentatsiooni."
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:55
+#: en/configureX_monitor.xml:44
 msgid "<emphasis>Plug 'n Play</emphasis>"
 msgstr "<emphasis>Plug'n Play</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:58
+#: en/configureX_monitor.xml:47
 msgid ""
 "This is the default option and tries to determine the monitor type from the "
 "monitor database."
@@ -1305,12 +1312,12 @@ msgstr ""
 "andmebaasi põhjal."
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:63
+#: en/configureX_monitor.xml:51
 msgid "<emphasis>Vendor</emphasis>"
 msgstr "<emphasis>Tootja</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:65
+#: en/configureX_monitor.xml:53
 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:"
@@ -1320,28 +1327,30 @@ msgstr ""
 "parameetrite alusel:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:73
+#: en/configureX_monitor.xml:61
 msgid "the monitor manufacturers name"
 msgstr "monitori nimi"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:77
+#: en/configureX_monitor.xml:65
 msgid "the monitor description"
 msgstr "monitori kirjeldus"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:82
+#: en/configureX_monitor.xml:69
 msgid "<emphasis>Generic</emphasis>"
 msgstr "<emphasis>Tavaline</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:84
+#: en/configureX_monitor.xml:71
+#, fuzzy
 msgid ""
-"selecting this group displays 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 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 <emphasis role="
+"\"bold\">Vesa</emphasis> 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. "
@@ -1350,12 +1359,12 @@ msgstr ""
 "tasub valides olla pigem konservatiivne."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:6
+#: en/diskdrake.xml:7
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Ketta kohandatud partitsioneerimine DiskDrake'i abil"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:10
+#: en/diskdrake.xml:12
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
 "\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1366,12 +1375,14 @@ msgstr ""
 "<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:18
+#: en/diskdrake.xml:22
+#, fuzzy
 msgid ""
-"If you wish to use encryption on your <literal>/</literal> partition you "
-"must ensure that you have a separate <literal>/boot</literal> partition. The "
-"encryption option for the <literal>/boot</literal> partition must NOT be "
-"set, otherwise your system will be unbootable."
+"If you wish to use encryption on your <emphasis role=\"bold\">/</emphasis> "
+"partition you must ensure that you have a separate <emphasis role=\"bold\">/"
+"boot</emphasis> partition. The encryption option for the <emphasis role="
+"\"bold\">/boot</emphasis> partition must NOT be set, otherwise your system "
+"will be unbootable."
 msgstr ""
 "Kui soovite krüptida oma <literal>/</literal> partitsiooni, peab teil "
 "kindlasti olema ka eraldi <literal>/boot</literal> partitsioon. <literal>/"
@@ -1379,43 +1390,44 @@ msgstr ""
 "ole süsteemi võimalik üldse laadida."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:24
+#: en/diskdrake.xml:29
+#, fuzzy
 msgid ""
-"Adjust the layout of your disk(s)  here. You can remove or create "
+"Modify the layout of your disk(s)  here. You can remove or create "
 "partitions, change the filesystem of a partition or change its size and even "
-"view what is in them before you start."
+"view their details before you start."
 msgstr ""
 "Siin saab kohandada ketta või ketaste jagamist: eemaldada või luua "
 "partitsioone, muuta partitsiooni failisüsteemi või suurust ning isegi enne "
 "alustamist näha, mida partitsioon sisaldab."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:28
+#: en/diskdrake.xml:34
 msgid ""
-"There is a tab for every detected hard disk or other storage device, like an "
-"USB key. For example sda, sdb and sdc if there are three of them."
+"There is a tab at the top for every detected hard disk (or other storage "
+"device like a USB key). In the screen-shot above there are two available "
+"devices: <emphasis role=\"bold\">sda </emphasis>and <emphasis role=\"bold"
+"\">sdb</emphasis>."
 msgstr ""
-"Igale leitud kõvakettale või muule salvestusseadmele, näiteks USB-pulgale, "
-"on omaette kaart. Need võivad olla näiteks sda, sdb ja sdc, kui teil juhtub "
-"olema kolm salvestusseadet."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:31
+#: en/diskdrake.xml:39
+#, fuzzy
 msgid ""
-"Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
-"storage device"
+"Take care with the <guibutton>Clear all</guibutton> option, use it only if "
+"you are sure you want to wipe all partitions on the selected storage device."
 msgstr ""
 "Kõigi valitud salvestusseadme partitsioonide kustutamiseks valige "
 "<guibutton>Kustuta kõik</guibutton>."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:33
+#: en/diskdrake.xml:43
+#, fuzzy
 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. "
-"<guibutton>Toggle to expert mode</guibutton> (or <guibutton>Expert mode</"
-"guibutton>) gives some more tools like to add a label or to choose a "
-"partition type."
+"<guibutton>Expert mode</guibutton> provides more options such as a label "
+"(give a name to) a partition, or to choose a partition type."
 msgstr ""
 "Kõigi teiste toimingute jaoks klõpsake kõigepealt vajalikul partitsioonil. "
 "Siis saate seda uurida, valida failisüsteemi või haakepunkti, suurust muuta "
@@ -1424,32 +1436,34 @@ msgstr ""
 "lisamine või partitsiooni tüübi valimine."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:38
-msgid "Continue until you adjusted everything to your wishes."
+#: en/diskdrake.xml:49
+#, fuzzy
+msgid "Continue until you have adjusted everything to your satisfaction."
 msgstr "Jätkake, kuni kõik on nii, nagu soovite."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:40
+#: en/diskdrake.xml:52
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr "Kui kõik on valmis, klõpsake nupule <guibutton>Tehtud</guibutton>."
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:43
+#: en/diskdrake.xml:56
+#, fuzzy
 msgid ""
-"If you are installing Mageia on an UEFI system, check that an ESP (EFI "
-"System Partition) is present and correctly mounted on /boot/EFI (see below)"
+"If you are installing Mageia on a UEFI system, check that an ESP (EFI System "
+"Partition) is present and correctly mounted on /boot/EFI (see below)"
 msgstr ""
 "Kui paigaldate Mageia UEFI süsteemi, kontrollige, kas ESP (EFI süsteemne "
 "partitsioon) on ikka olemas ja korrektselt haagitud asukohta /boot/EFI (vt "
 "tagapool)."
 
 #. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:46
+#: en/diskdrake.xml:61
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
-"\" align=\"center\"/></imageobject><imageobject condition=\"live"
-"\"><imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/></"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
 "\" align=\"center\"/></imageobject><imageobject condition=\"live"
@@ -1457,12 +1471,12 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:46
+#: en/diskdrake.xml:60
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:49
+#: en/diskdrake.xml:72
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
 "partition is present and of the correct type"
@@ -1471,7 +1485,7 @@ msgstr ""
 "tüübiga BIOS-e alglaadimispartitsioon on ikka olemas."
 
 #. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:51
+#: en/diskdrake.xml:76
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1484,32 +1498,34 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:7
+#: en/doPartitionDisks.xml:9
 msgid "Partitioning"
 msgstr "Partitsioneerimine"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:9
+#: en/doPartitionDisks.xml:12
+#, fuzzy
 msgid ""
-"In this screen you can see the content of your hard drive(s) and see the "
-"solutions the DrakX partitioning wizard found for where to install "
-"<application>Mageia</application>."
+"In this screen you can see the content of your hard drive(s) along with the "
+"DrakX partitioning proposals for where to install <application>Mageia</"
+"application>."
 msgstr ""
 "Sellel ekraanil näete oma kõvaketta või -ketaste sisu ning lahendusi, mida "
 "DrakXi partitsioneerimisnõustaja pakub <application>Mageia</application> "
 "paigaldamiseks."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:13
+#: en/doPartitionDisks.xml:16
+#, fuzzy
 msgid ""
-"The options available from the list below will vary depending on your "
-"particular hard drive(s) layout and content."
+"The options available from those shown below will vary according to the "
+"layout and content of your particular hard drive(s)."
 msgstr ""
 "Pakutavad valikud sõltuvad teie kõvaketaste konkreetsest ülesehitusest ja "
 "sisust."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:17
+#: en/doPartitionDisks.xml:21
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -1522,12 +1538,12 @@ msgstr ""
 "\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:24
+#: en/doPartitionDisks.xml:32
 msgid "Use Existing Partitions"
 msgstr "Olemasolevate partitsioonide kasutamine"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:25
+#: en/doPartitionDisks.xml:35
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1536,12 +1552,12 @@ msgstr ""
 "neid võib kasutada paigaldamiseks."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:41
 msgid "Use Free Space"
 msgstr "Vaba ruumi kasutamine"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:43
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1550,12 +1566,12 @@ msgstr ""
 "uuele Mageia paigaldusele."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:29
+#: en/doPartitionDisks.xml:49
 msgid "Use Free Space on a Windows Partition"
 msgstr "Vaba ruumi kasutamine Windowsi partitsioonil"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:52
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
@@ -1564,7 +1580,7 @@ msgstr ""
 "paigaldusprogramm seda kasutada."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:32
+#: en/doPartitionDisks.xml:56
 msgid ""
 "This can be a useful way of making room for your new Mageia installation, "
 "but is a risky operation so you should make sure you have backed up all "
@@ -1575,7 +1591,7 @@ msgstr ""
 "kõigist olulistest failidest varukoopia!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:35
+#: en/doPartitionDisks.xml:61
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1592,12 +1608,14 @@ msgstr ""
 "äärmiselt soovitatav kõik vähegi olulised failid eelnevalt varundada."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:41
+#: en/doPartitionDisks.xml:69
+#, fuzzy
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
-"light blue and the future Mageia partition in dark blue with their intended "
-"sizes just under. You have the possibility to adapt these sizes by clicking "
-"and dragging the gap between both partitions. See the screen-shot below."
+"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 "
+"screen-shot."
 msgstr ""
 "Selle valiku korral näitab paigaldusprogramm alles jäävat Windowsi "
 "partitsiooni helesinisena ja tulevast Mageia partitsiooni tumesinisena ning "
@@ -1606,37 +1624,39 @@ msgstr ""
 "Seda näitab allolev pilt."
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:45
+#: en/doPartitionDisks.xml:76
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
-"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/></imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/> </imageobject>"
 msgstr ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
-"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/></imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
+"\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:45
+#: en/doPartitionDisks.xml:87
 msgid "Erase and use Entire Disk."
 msgstr "Kogu ketta tühjendamine ja kasutamine"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:46
-msgid "This option will use the complete drive for Mageia."
+#: en/doPartitionDisks.xml:90
+#, fuzzy
+msgid "This option will allocate the entire drive for Mageia."
 msgstr "Selle valimisel kasutatakse kogu ketast ainult Mageia jaoks."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:47
+#: en/doPartitionDisks.xml:93
 msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
 msgstr ""
 "Tähelepanu! Sellega kustutatakse valitud kõvakettalt KÕIK andmed. Olge "
 "ettevaatlik!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:48
+#: en/doPartitionDisks.xml:96
 msgid ""
 "If you intend to use part of the disk for something else, or you already "
 "have data on the drive that you are not prepared to lose, then do not use "
@@ -1646,12 +1666,12 @@ msgstr ""
 "kettal andmeid, mida te ei soovi kaotada, ärge seda võimalust valige."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:51
+#: en/doPartitionDisks.xml:103
 msgid "Custom disk partitioning"
 msgstr "Ketta jagamine oma tahtmist mööda"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:106
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1660,66 +1680,80 @@ msgstr ""
 "või -ketastel paigaldatakse."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:112
 msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
 msgstr "<emphasis role=\"bold\">Partitsiooni suurus:</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:56
+#: en/doPartitionDisks.xml:114
 msgid ""
-"The installer will share the available place out according to the following "
-"rules:"
+"If you are not using the <emphasis role=\"bold\">Custom disk partitioning</"
+"emphasis> option, the installer will allocate the available space according "
+"to the following rules:"
 msgstr ""
-"Paigaldusprogramm jagab saadaoleva ruumi ära järgmiste reeglite kohaselt:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:58
+#: en/doPartitionDisks.xml:120
+#, fuzzy
 msgid ""
-"If the total available place is lower than 50 GB, only one partition is "
-"created for /, there is no separate partition for /home."
+"If the total available space is less than 50 GB, then only one partition is "
+"created. This will be the <emphasis role=\"bold\">/</emphasis> (root) "
+"partition."
 msgstr ""
 "Kui kokku on saadaval alla 50 GB, luuakse ainult üks partitsioon / jaoks "
 "ning /home jaoks eraldi partitsiooni ei looda."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:60
+#: en/doPartitionDisks.xml:125
+#, fuzzy
 msgid ""
-"If the total available place is over 50 GB, then three partitions are created"
+"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><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:61
+#: en/doPartitionDisks.xml:130
+#, fuzzy
 msgid ""
-"6/19 of the total available place is allocated to / with a maximum of 50 GB"
+"6/19 of the total available place is allocated to <emphasis role=\"bold\">/</"
+"emphasis> with a maximum of 50 GB"
 msgstr ""
 "6/19 saadaolevast koguruumist eraldatakse / jaoks maksimaalse suurusega 50 GB"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
+#: en/doPartitionDisks.xml:134
 msgid "1/19 is allocated to swap with a maximum of 4 GB"
 msgstr "1/19 eraldatakse saalealaks maksimaalse suurusega 4 GB"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
-msgid "the rest (at least 12/19) is allocated to /home"
+#: en/doPartitionDisks.xml:138
+#, fuzzy
+msgid ""
+"the rest (at least 12/19) is allocated to <emphasis role=\"bold\">/home.</"
+"emphasis>"
 msgstr "ülejäänu (vähemalt 12/19) eraldatakse /home jaoks"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:63
+#: en/doPartitionDisks.xml:144
+#, fuzzy
 msgid ""
-"That means that from 160 GB and over of available place, the installer will "
-"create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
+"That means that from 160 GB or greater available space, the installer will "
+"create three partitions: 50 GB for <emphasis role=\"bold\">/</emphasis>, 4 "
+"GB for <emphasis role=\"bold\">swap</emphasis> and the remainder for "
+"<emphasis role=\"bold\">/home</emphasis>."
 msgstr ""
 "See tähendab, et kui ruumi on 160 GB või rohkem, loob paigaldusprogramm kolm "
 "partitsiooni: 50 GB / jaoks, 4 GB saaleala jaoks ja ülejäänu /home jaoks."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:67
+#: en/doPartitionDisks.xml:150
+#, fuzzy
 msgid ""
-"If you are using an UEFI system, the ESP (EFI System Partition) will be "
-"automatically detected, or created if it does not exist yet, and mounted on /"
-"boot/EFI. The \"Custom disk partitioning\" option is the only one that "
-"allows to check it has been correctly done"
+"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 "
+"on /boot/EFI. The <emphasis role=\"bold\">Custom disk partitioning</"
+"emphasis> option is the only one that allows to check it has been correctly "
+"done"
 msgstr ""
 "Kui kasutate UEFI süsteemi, tuvastatakse automaatselt ESP (EFI süsteemne "
 "partitsioon) või see luuakse, kui seda pole, ja haagitakse asukohas /boot/"
@@ -1727,13 +1761,14 @@ msgstr ""
 "kontrollida, kas seda on õigesti tehtud."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:73
+#: en/doPartitionDisks.xml:158
+#, fuzzy
 msgid ""
-"If you are using a Legacy (as known as CSM or BIOS) system with a GPT disk, "
-"you need to create a Bios boot partition if not already existing. It is an "
-"about 1 MiB partition with no mount point. Choose <xref linkend=\"diskdrake"
-"\"/> to be able to create it with the Installer like any other partition, "
-"just select BIOS boot partition as filesystem type."
+"If you are using a Legacy (CSM or BIOS) system with a GPT disk, you need to "
+"create a BIOS boot partition if not already existing. It is a roughly 1 MiB "
+"partition with no mount point. Choose <xref linkend=\"diskdrake\"/> to be "
+"able to create it with the Installer like any other partition, just select "
+"BIOS boot partition as the filesystem type."
 msgstr ""
 "Kui kasutate pärandsüsteemi (tuntud ka kui CSM või BIOS) GPT-kettaga, tuleb "
 "luua BIOS-e alglaadimispartitsioon, kui seda veel ei ole. See on umbes 1 MiB "
@@ -1742,7 +1777,7 @@ msgstr ""
 "valige failisüsteemiks BIOS boot partition."
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:79
+#: en/doPartitionDisks.xml:165
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1753,7 +1788,7 @@ msgstr ""
 "\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </imageobject>"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:87
+#: en/doPartitionDisks.xml:175
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
 "imageobject>"
@@ -1762,15 +1797,16 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:93
+#: en/doPartitionDisks.xml:182
+#, fuzzy
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
-"previous standard of 512 byte logical sectors. Due to lack of available "
-"hardware, the partitioning tool used in the installer has not been tested "
-"with such a drive. Also some ssd drives now use an erase block size over 1 "
-"MB. We suggest to pre-partition the drive, using an alternative partitioning "
-"tool like gparted, if you own such a device, and to use the following "
-"settings:"
+"previous standard of 512. Due to lack of available hardware, the "
+"partitioning tool used in the installer has not been tested with such a "
+"drive. Also 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 alternative partitioning tool like <emphasis role=\"bold\">gparted</"
+"emphasis>, and to use the following settings:"
 msgstr ""
 "Mõned uuemad kettad kasutavad nüüd 4096-baidiseid loogilisi sektoreid "
 "varasema standardi, 512-baidiste sektorite asemel. Sobiva riistvara "
@@ -1781,19 +1817,22 @@ msgstr ""
 "gparted."
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:100
-msgid "\"Align to\" \"MiB\""
-msgstr "\"Align to\" \"MiB\""
+#: en/doPartitionDisks.xml:189
+#, fuzzy
+msgid "<emphasis role=\"bold\">Align to</emphasis> = MiB"
+msgstr "<emphasis role=\"bold\">Muud valikud</emphasis>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:101
-msgid "\"Free space preceding (MiB)\" \"2\""
-msgstr "\"Free space preceding (MiB)\" \"2\""
+#: en/doPartitionDisks.xml:191
+#, fuzzy
+msgid "<emphasis role=\"bold\">Free space preceding (MiB)</emphasis> = 2"
+msgstr "<emphasis role=\"bold\">Muud valikud</emphasis>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:102
+#: en/doPartitionDisks.xml:194
+#, fuzzy
 msgid ""
-"Also make sure all partitions are created with an even number of megabytes."
+"Also make sure all partitions are created using an even number of megabytes."
 msgstr ""
 "Samuti kontrollige, et kõigi loodud partitsioonide suurus megabaitides oleks "
 "paarisarv."
@@ -1804,7 +1843,7 @@ msgid "Installation from LIVE medium"
 msgstr "Paigaldamine Live-andmekandjalt"
 
 #. type: Content of: <book><info>
-#: en/DrakLive-cover.xml:5 en/DrakX-cover.xml:5
+#: en/DrakLive-cover.xml:5 en/DrakX-cover.xml:4
 msgid "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 msgstr "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 
@@ -1819,18 +1858,18 @@ msgid "Mageia 5"
 msgstr "Mageia 5"
 
 #. type: Content of: <book><info><cover><para>
-#: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:15
+#: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:14
 msgid "The Official Documentation for Mageia"
 msgstr "Mageia ametlik dokumentatsioon"
 
 #. type: Content of: <book><info><cover><mediaobject>
-#: en/DrakLive-cover.xml:17 en/DrakX-cover.xml:17
+#: en/DrakLive-cover.xml:17
 msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:21
+#: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:20
 #: en/DrakX.xml:12
 msgid ""
 "The texts and screenshots in this manual are available under the CC BY-SA "
@@ -1842,7 +1881,7 @@ msgstr ""
 "\">http://creativecommons.org/licenses/by-sa/3.0/</link>."
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:24
+#: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:23
 #: en/DrakX.xml:15
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
@@ -1854,7 +1893,7 @@ msgstr ""
 "neodoc.biz\">NeoDoc</link>."
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:26
+#: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:25
 #: en/DrakX.xml:17
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
@@ -1867,13 +1906,13 @@ msgstr ""
 "\">dokumentatsioonimeeskonnaga</link>."
 
 #. type: Content of: <article><info><cover><para><note>
-#: en/DrakLive-cover.xml:31 en/DrakLive.xml:6 en/DrakX-cover.xml:37
+#: en/DrakLive-cover.xml:31 en/DrakLive.xml:6 en/DrakX-cover.xml:36
 #: en/DrakX.xml:6
 msgid "<note>"
 msgstr "<note>"
 
 #. type: Content of: <article><info><cover><para><note><para>
-#: en/DrakLive-cover.xml:32 en/DrakLive.xml:7 en/DrakX-cover.xml:38
+#: en/DrakLive-cover.xml:32 en/DrakLive.xml:7 en/DrakX-cover.xml:37
 #: en/DrakX.xml:7
 msgid ""
 "No one will see all the installer screens that you see in this manual. Which "
@@ -1885,26 +1924,34 @@ msgstr ""
 "langetatud valikutest."
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:35 en/DrakLive.xml:10 en/DrakX-cover.xml:41
+#: en/DrakLive-cover.xml:35 en/DrakLive.xml:10 en/DrakX-cover.xml:40
 #: en/DrakX.xml:10
 msgid "</note>"
 msgstr "</note>"
 
 #. type: Content of: <article><info><title>
-#: en/DrakX-cover.xml:4 en/DrakX-cover.xml:36 en/DrakX.xml:3
+#: en/DrakX-cover.xml:3 en/DrakX-cover.xml:35 en/DrakX.xml:3
 msgid "Installation with DrakX"
 msgstr "Paigaldamine DrakX'i abil"
 
 #. type: Content of: <book><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:10
+#: en/DrakX-cover.xml:9
 msgid "February 2014"
 msgstr "Veebruar 2014"
 
 #. type: Content of: <book><info><revhistory><revision><revremark>
-#: en/DrakX-cover.xml:11
+#: en/DrakX-cover.xml:10
 msgid "Mageia 4"
 msgstr "Mageia 4"
 
+#. type: Content of: <book><info><cover><mediaobject>
+#: en/DrakX-cover.xml:16
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+
 #. type: Content of: <section><info><title>
 #: en/exitInstall.xml:3
 msgid "Congratulations"
@@ -1912,7 +1959,7 @@ msgstr "Õnnitleme!"
 
 #.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:7
+#: en/exitInstall.xml:9
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
@@ -1921,7 +1968,7 @@ msgstr ""
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:11
+#: en/exitInstall.xml:14
 msgid ""
 "You have finished installing and configuring <application>Mageia</"
 "application> and it is now safe to remove the installation medium and reboot "
@@ -1932,16 +1979,17 @@ msgstr ""
 "taaskäivitada."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:18
+#, fuzzy
 msgid ""
 "After reboot, in the bootloader screen, you can choose between the operating "
-"systems on your computer (if you have more than one)."
+"systems (if there are more than one) on your computer."
 msgstr ""
 "Pärast taaskäivitamist saab alglaaduri ekraanil valida käivitatava "
 "operatsioonisüsteemi, kui teil peaks neid arvutis üle ühe olema."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:17
+#: en/exitInstall.xml:22
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
@@ -1950,12 +1998,12 @@ msgstr ""
 "automaatselt teie uus Mageia."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:20
+#: en/exitInstall.xml:26
 msgid "Enjoy!"
 msgstr "Tundke rõõmu ja nautige!"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:21
+#: en/exitInstall.xml:28
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -1970,11 +2018,12 @@ msgstr "Tulemüür"
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:6
+#, fuzzy
 msgid ""
-"This section allows 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."
+"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."
 msgstr ""
 "Siin saab paika panna mõned lihtsad tulemüüri reeglid, mis määravad kndlaks, "
 "millist laadi teavet internetist sihtsüsteem vastu võtab. See omakorda "
@@ -1982,15 +2031,16 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:12
+#, fuzzy
 msgid ""
-"In the default setting, no button is checked - no service of the system is "
-"accessibly from the network. The \"<emphasis>Everything (no firewall)</"
-"emphasis>\" button has a particular role: it enables access to all services "
-"of the machine - an option that does not make much sense in the context of "
-"the installer since it would create a totally unprotected system.  Its "
-"veritable use is in the context of the Mageia Control Center (which uses the "
-"same GUI layout) for temporarily disabling the entire set of firewall rules "
-"for testing and debugging purposes."
+"In the default setting (no button is checked), no service of the system is "
+"accessible from the network. The <emphasis role=\"bold\">Everything (no "
+"firewall)</emphasis> enables access to all services of the machine - an "
+"option that does not make much sense in the context of the installer since "
+"it would create a totally unprotected system. Its veritable use is in the "
+"context of the Mageia Control Center (which uses the same GUI layout) for "
+"temporarily disabling the entire set of firewall rules for testing and "
+"debugging purposes."
 msgstr ""
 "Vaikimisi ei ole ükski nupp märgitud, mis tähendab, et võrgust ei ole "
 "kättesaadav ükski süsteemi teenus. Nupul <emphasis>Kõik (tulemüür puudub)</"
@@ -2003,10 +2053,11 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:21
+#, fuzzy
 msgid ""
-"All other checkbuttons are more or less self-explanatory. As an example, you "
-"will check the \"CUPS server\" button if you want printers on your machine "
-"to be accessible from the network."
+"All other options are more or less self-explanatory. As an example, you will "
+"enable the <emphasis role=\"bold\">CUPS server</emphasis> if you want "
+"printers on your machine to be accessible from the network."
 msgstr ""
 "Kõigi muude märkekastide juures olev tekst peaks enda eest rääkima. Näiteks "
 "on mõtet märkida \"CUPS-i server\", kui soovite, et masinaga ühendatud "
@@ -2019,12 +2070,11 @@ msgstr "<emphasis role=\"bold\">Muud valikud</emphasis>"
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:27
+#, fuzzy
 msgid ""
-"The set of checkbuttons only comprises the most common services. The "
-"\"Advanced\" button allows to enable messages that correspond to a service "
-"for which no checkbutton exists. The \"<emphasis>Advanced</emphasis>\" "
-"button opens a window where you can enable a series of services by typing a "
-"list of couples (blank separated)"
+"The <emphasis role=\"bold\">Advanced</emphasis> option opens a window where "
+"you can enable a series of services by typing a list of couples (blank "
+"separated)"
 msgstr ""
 "Märkekastid võimaldavad sisse või välja lülitada ainult kõige levinumaid "
 "teenuseid. Nupuga \"Muud valikud\" saab lubada või keelata ka neid "
@@ -2033,12 +2083,12 @@ msgstr ""
 "teenuseid, kui kirjutada need tühikutega eraldatult järgmiselt"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:33
+#: en/firewall.xml:31
 msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
 msgstr "<emphasis>&lt;pordi-number>/&lt;protokoll></emphasis>"
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:36
+#: en/firewall.xml:34
 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 "
@@ -2049,7 +2099,7 @@ msgstr ""
 "<emphasis>RFC-433</emphasis>;"
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:40
+#: en/firewall.xml:38
 msgid ""
 "- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
 "<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
@@ -2058,7 +2108,7 @@ msgstr ""
 "<emphasis>UDP</emphasis> - teenuse kasutatav internetiprotokoll."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:45
+#: en/firewall.xml:43
 msgid ""
 "For instance, the entry for enabling access to the RSYNC service therefore "
 "is <emphasis>873/tcp</emphasis>."
@@ -2067,7 +2117,7 @@ msgstr ""
 "<emphasis>873/tcp</emphasis>."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:48
+#: en/firewall.xml:46
 msgid ""
 "In case a service is implemented to use both protocols, you specify 2 "
 "couples for the same port."
@@ -2076,7 +2126,7 @@ msgstr ""
 "2 määrata."
 
 #. type: Content of: <section><info><title>
-#: en/formatPartitions.xml:4
+#: en/formatPartitions.xml:3
 msgid "Formatting"
 msgstr "Vormindamine"
 
@@ -2085,14 +2135,14 @@ msgstr "Vormindamine"
 #.  marja 2012-04-24 added screenshot 
 #.  marja 2012-04-24 added emphasis tags in formatPartitions-pa1 
 #. type: Content of: <section><mediaobject>
-#: en/formatPartitions.xml:18
+#: en/formatPartitions.xml:15
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
-"formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id="
-"\"formatPartitions-im1\"> </imagedata> </imageobject> <imageobject "
-"condition='live'> <imagedata revision=\"1\" fileref=\"live-formatPartitions."
-"png\" format=\"PNG\" align=\"center\" xml:id=\"live-formatPartitions-im1\"> "
-"</imagedata> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
+"\"dx2-formatPartitions.png\" xml:id=\"formatPartitions-im1\" align=\"center"
+"\" revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata format=\"PNG\" xml:id=\"live-formatPartitions-im1\" align=\"center"
+"\" fileref=\"live-formatPartitions.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
 "formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id="
@@ -2102,23 +2152,24 @@ msgstr ""
 "</imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:30
+#: en/formatPartitions.xml:24
+#, fuzzy
 msgid ""
 "Here you can choose which partition(s) you wish to format. Any data on "
-"partitions <emphasis>not</emphasis> marked for formatting will be saved."
+"partitions <emphasis>not</emphasis> marked for formatting will be preserved."
 msgstr ""
 "Siin saab valida, millised partitsioonid vormindada. Kõik andmed "
 "partitsioonidel, mis <emphasis>ei ole</emphasis> vormindamiseks märgitud, "
 "säilivad."
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:34
+#: en/formatPartitions.xml:28
 msgid "Usually at least the partitions DrakX selected, need to be formatted"
 msgstr ""
 "Üldjuhul on vaja vormindada vähemalt partitsioonid, mille DrakX on valinud."
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:37
+#: en/formatPartitions.xml:31
 msgid ""
 "Click on <guibutton>Advanced</guibutton> to choose partitions you want to "
 "check for so called <emphasis>bad blocks</emphasis>"
@@ -2127,12 +2178,13 @@ msgstr ""
 "millel kontrollitakse niinimetatud <emphasis>riknenud plokke.</emphasis>"
 
 #. type: Content of: <section><tip><para>
-#: en/formatPartitions.xml:42
+#: en/formatPartitions.xml:36
+#, fuzzy
 msgid ""
 "If you're not sure you have made the right choice, you can click on "
 "<guibutton>Previous</guibutton>, again on <guibutton>Previous</guibutton> "
-"and then on <guibutton>Custom</guibutton> to get back to the main screen.  "
-"In that screen you can choose to view what is in your partitions."
+"and then on <guibutton>Custom</guibutton> to get back to the main screen, "
+"where you can choose to view details of your partitions."
 msgstr ""
 "Kui te pole kindel, et olete langetanud õige valiku, klõpsake "
 "<guibutton>Tagasi</guibutton>, veel kord <guibutton>Tagasi</guibutton> ja "
@@ -2140,7 +2192,7 @@ msgstr ""
 "saate uurida, mis partitsioonidel leidub."
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:49
+#: en/formatPartitions.xml:43
 msgid ""
 "When you are confident about the selection, click on <guibutton>Next</"
 "guibutton> to continue."
@@ -2149,12 +2201,12 @@ msgstr ""
 "guibutton>."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:3
+#: en/installer.xml:10
 msgid "DrakX, the Mageia Installer"
 msgstr "Mageia paigaldusprogramm DrakX"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:7
+#: en/installer.xml:13
 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 "
@@ -2165,7 +2217,7 @@ msgstr ""
 "uuendamine oleks kõigile võimalikult lihtne."
 
 #. type: Content of: <section><para>
-#: en/installer.xml:11
+#: en/installer.xml:17
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
@@ -2174,36 +2226,40 @@ msgstr ""
 "paigaldusprogrammi, mida tavaliselt ongi vaja."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:16
+#: en/installer.xml:22
 msgid "Installation Welcome Screen"
 msgstr "Paigaldusprogrammi avaekraan"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:19
+#: en/installer.xml:25
 msgid "Using a Mageia DVD"
 msgstr "Mageia DVD kasutamine"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:21
+#: en/installer.xml:27
+#, fuzzy
 msgid ""
 "Here are the default welcome screens when using a Mageia DVD, The first one "
-"with an UEFI system and the second one with a Legacy system:"
+"is what you will see if you have a UEFI system, the second one is for a "
+"Legacy system:"
 msgstr ""
 "Siin on näha Mageia DVD vaikimisi tervitusekraanid: esimest näeb UEFI "
 "süsteemi, teist pärandsüsteemi korral."
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:26
+#: en/installer.xml:32
 msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:31
+#: en/installer.xml:37
+#, fuzzy
 msgid ""
-"From this screen, you can access to options by pressing the \"e\" letter to "
-"enter the \"edit mode\". To come back to this screen, press either the key "
-"\"esc\" to quit without saving or press the key \"Ctrl\" or \"F10\" to quit "
-"with saving."
+"From this screen, you have access to options by pressing \"<emphasis role="
+"\"bold\">e</emphasis>\" to enter the edit mode. To come back to this screen, "
+"press either <emphasis role=\"bold\">Esc</emphasis> key to quit without "
+"saving or press the key <emphasis role=\"bold\">Ctrl</emphasis> or <emphasis "
+"role=\"bold\">F10</emphasis> to quit with saving."
 msgstr ""
 "Sellel ekraanil pääseb valikute juurde, kui vajutada tähte \"e\", mis avab "
 "redigeerimisrežiimi. Nähtavale ekraanile tagasipääsemiseks vajutage klahvi "
@@ -2211,113 +2267,107 @@ msgstr ""
 "väljuda tehtud valikuid salvestades."
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:37
+#: en/installer.xml:45
 msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:42
-msgid "From this screen, it is possible to set some personal preferences:"
-msgstr "Sellel ekraanil on võimalik määrata mõned isiklikud eelistused:"
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:45
-msgid ""
-"The language (for the installation only, may be different that the chosen "
-"language for the system) by pressing the key F2 (Legacy mode only)"
-msgstr ""
-"Keel (ainult paigaldamiseks, võib erineda süsteemile valitavast keelest) "
-"klahvile F2 vajutades (ainult tavapärases süsteemis)"
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
 #: en/installer.xml:50
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+"From this screen, it is possible to set some preferences (note that the "
+"options <emphasis role=\"bold\">F1</emphasis> to <emphasis role=\"bold\">F6</"
+"emphasis> are available only on Legacy systems):"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
 #: en/installer.xml:55
-msgid "Use the arrow keys to select the language and press the key Enter."
-msgstr "Valige nooleklahvidega liikudes keel ja vajutage klahvile Enter."
+msgid ""
+"Within any of the <emphasis role=\"bold\">F2</emphasis> to <emphasis role="
+"\"bold\">F6</emphasis> options, you can view relevant help by pressing "
+"<emphasis role=\"bold\">F1</emphasis>"
+msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:58
+#: en/installer.xml:63
 msgid ""
-"Here is for example, the French welcome screen when using a Live DVD/CD. "
-"Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
-"guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware Detection "
-"Tool</guilabel>."
+"Press <emphasis role=\"bold\">F2</emphasis> to have the installer use a "
+"specific language for the installation."
 msgstr ""
-"Siin on näiteks LiveDVD/CD eestikeelne tervitusekraan. Pange tähele, et "
-"LiveDVD/CD menüüs ei ole kirjeid, nagu <guilabel>Päästesüsteem</guilabel>, "
-"<guilabel>Mälu testimine</guilabel> ja <guilabel>Riistvara tuvastamise "
-"tööriist</guilabel>."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:65
-msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+#: en/installer.xml:67
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
 #: en/installer.xml:72
-msgid "Change the screen resolution by pressing the F3 key (Legacy mode only)."
+#, fuzzy
+msgid ""
+"Use the arrow keys to select the language then press <emphasis role=\"bold"
+"\">Enter</emphasis>."
+msgstr "Valige nooleklahvidega liikudes keel ja vajutage klahvile Enter."
+
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:77
+#, fuzzy
+msgid ""
+"If needed, change the screen resolution by pressing <emphasis role=\"bold"
+"\">F3</emphasis> (Legacy mode only)."
 msgstr ""
 "Muuta ekraanilahutust klahvile F3 vajutades (ainult tavapärases süsteemis)"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:76
+#: en/installer.xml:81
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:83
+#: en/installer.xml:88
 msgid ""
-"Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
-"emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
-"emphasis> key for the UEFI mode."
+"If you experience problems with the installation, you could try modifying "
+"the default settings using the <emphasis role=\"bold\">F6</emphasis> "
+"<emphasis role=\"bold\">Kernel Options</emphasis> (for UEFI systems press "
+"<emphasis role=\"bold\">e</emphasis> instead)."
 msgstr ""
-"Lisada mõningaid kerneli võtmeid, vajutades klahvile <emphasis role=\"bold"
-"\">F6</emphasis> tavapärase süsteemi ja klahvile <emphasis role=\"bold\">e</"
-"emphasis> UEFI süsteemi korral."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:85
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:96
+#, fuzzy
+msgid "Default: It doesn't alter anything in the default options."
+msgstr "- Vaikimisi, mille korral vaikimisi võtmeid ei muudeta."
+
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:101
 msgid ""
-"If the installation fails, then it may be necessary to try again using one "
-"of the extra options. The menu called by F6 displays a new line called "
-"<guilabel>Boot options</guilabel> and propose four entries:"
+"Safe Settings: Priority is given to the safer options at the price of a "
+"performance detriment."
 msgstr ""
-"Kui paigaldamine ei õnnestu, võib olla vajalik seda uuesti proovida, "
-"kasutades mõnda lisavõtit. Klahviga F6 avatav menüü toob nähtavale tekstirea "
-"<guilabel>Alglaadimise sätted</guilabel> ja pakub nelja valikut:"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:90 en/installer.xml:93
-msgid "- Default, it doesn't alter anything in the default options."
-msgstr "- Vaikimisi, mille korral vaikimisi võtmeid ei muudeta."
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:96
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:106
+#, fuzzy
 msgid ""
-"- No ACPI (Advanced Configuration and Power Interface), power management "
-"isn't taken into account."
+"No ACPI: (Advanced Configuration and Power Interface): Power management "
+"features are not used."
 msgstr "- Ilma ACPI-ta, mille korral toitehalduse valikuid ei arvestata."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:99
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:113
+#, fuzzy
 msgid ""
-"- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
-"about CPU interruptions, select this option if you are asked for."
+"No Local APIC: (Local Advanced Programmable Interrupt Controller): CPU "
+"interrupt. Select this option if you experience system misbehaviour like a "
+"kernel panic in relation to APIC."
 msgstr ""
 "- Ilma kohaliku APIC-ta, mis puudutab CPU katkestusi. Valige see siis, kui "
 "seda nõutakse."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:103
+#: en/installer.xml:120
 msgid ""
 "When you select one of these entries, it modifies the default options "
 "displayed in the <guilabel>Boot Options</guilabel> line."
@@ -2326,55 +2376,52 @@ msgstr ""
 "<guilabel>Alglaadimise sätted</guilabel>."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:108
+#: en/installer.xml:125
+#, fuzzy
 msgid ""
-"In some Mageia releases, it may happen that the entries selected with the "
-"key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
-"however, they are really taken into account."
+"In some Mageia releases, it may happen that the entries selected with "
+"<emphasis role=\"bold\">F6</emphasis> do not appear in the <guilabel>Boot "
+"Options</guilabel> line, despite this, they will in fact be applied."
 msgstr ""
 "Mõne Mageia väljalaske puhul võib juhtuda, et klahviga F6 valitud kirjeid ei "
 "näe real <guilabel>Alglaadimise sätted</guilabel>, aga neid siiski "
 "arvestatakse."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:115
+#: en/installer.xml:132
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:122
-msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
-msgstr ""
-"Lisada veel rohkem kerneli võtmeid klahvile F1 vajutades (ainult tavapärases "
-"süsteemis)"
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:125
+#: en/installer.xml:139
+#, fuzzy
 msgid ""
-"Pressing F1 opens a new window with more available options.  Select one with "
-"the arrow keys and press Enter to have more details or press the Esc key to "
-"go back to the welcome screen."
+"Pressing <emphasis role=\"bold\">F1</emphasis> opens a help window for "
+"various boot options. Select an item with the arrow keys and press <emphasis "
+"role=\"bold\">Enter</emphasis> for more details or press <emphasis role="
+"\"bold\">Esc</emphasis> to go back to the welcome screen."
 msgstr ""
 "Klahvile F1 vajutades ilmub uus aken saadaolevate võtmetega. Valige neist "
 "vajalik nooleklahvidega ja vajutage klahvile Enter üksikasjade nägemiseks "
 "või klahvile Esc tervitusekraani juurde naasmiseks."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:131
+#: en/installer.xml:146
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:136
+#: en/installer.xml:151
+#, fuzzy
 msgid ""
-"The detailed view about the option splash. Press Esc or select "
-"<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
-"These options can by added by hand in the <guilabel>Boot options</guilabel> "
-"line."
+"The detailed view about the splash option. Press <emphasis role=\"bold"
+"\">Esc</emphasis> or select <guilabel>Return to Boot Options</guilabel> to "
+"go back to the options list. These options can be added by hand in the "
+"<guilabel>Boot Options</guilabel> line."
 msgstr ""
 "Siin on näidatud võtme splash üksikasjaliku kirjelduse aken. Vajutage "
 "klahvile Esc või valige <guilabel>Tagasi alglaadimise sätete juurde</"
@@ -2382,19 +2429,22 @@ msgstr ""
 "reale <guilabel>Alglaadimise sätted</guilabel>."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:142
+#: en/installer.xml:158
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:148
-msgid "The help is translated in the chosen language with the F2 key."
+#: en/installer.xml:164
+#, fuzzy
+msgid ""
+"The help is translated in the chosen language with <emphasis role=\"bold"
+"\">F2</emphasis>."
 msgstr "Abi tõlgitakse keelde, mis on valitud klahviga F2."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:152
+#: en/installer.xml:168
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
@@ -2405,81 +2455,48 @@ msgstr ""
 "How_to_set_up_kernel_options\">https://wiki.mageia.org/en/"
 "How_to_set_up_kernel_options</link>"
 
-#. type: Content of: <section><section><section><title>
-#: en/installer.xml:159
-msgid "Using a Wired Network"
-msgstr "Juhtmega võrgu kasutamine"
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:161
-msgid ""
-"Here is the default welcome screen when using a Wired Network-based "
-"Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
-msgstr ""
-"Selline on vaikimisi tervitusekraan juhtmega võrgu põhise paigalduse CD "
-"(netinstall.iso või netinstall-nonfree.iso tõmmis) kasutamisel:"
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:165
-msgid ""
-"It does not allow to change the language, the available options are "
-"described in the screen. For more information about using a Wired Network-"
-"based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/Boot."
-"iso_install\">the Mageia Wiki</link>"
-msgstr ""
-"See ei võimalda muuta keelt ning saadaolevad võtmed on loetletud ekraanil. "
-"Rohkem teavet juhtmega võrgu põhise paigaldamise CD kasutamise kohta leiab "
-"<link ns2:href=\"https://wiki.mageia.org/en/Boot.iso_install\">Mageia "
-"Wikist</link>."
-
-#. type: Content of: <section><section><section><warning><para>
-#: en/installer.xml:171
-msgid "The keyboard layout is the American one."
-msgstr "Klaviatuuripaigutus on Ameerika-pärane."
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:175
-msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
-
 #. type: Content of: <section><section><title>
-#: en/installer.xml:183
+#: en/installer.xml:177
 msgid "The installation steps"
 msgstr "Paigaldamise etapid"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:185
+#: en/installer.xml:179
+#, fuzzy
 msgid ""
-"The install process is divided into a number of steps, which can be followed "
-"on the side panel of the screen."
+"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 ""
 "Paigaldamine on jagatud mitmeks etapiks, mille loetelu näeb ekraani "
 "külgpaneelil."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:188
+#: en/installer.xml:182
+#, fuzzy
 msgid ""
 "Each step has one or more screens which may also have <guibutton>Advanced</"
-"guibutton> buttons with extra, less commonly required, options."
+"guibutton> sections with extra, less commonly required, options."
 msgstr ""
 "Igal etapil kohtate üht või enamat ekraani, millel võib olla ka nupp "
 "<guibutton>Muud valikud</guibutton>, mis avab täiendavad ja harvemini "
 "vajalikud valikud."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:192
+#: en/installer.xml:186
+#, fuzzy
 msgid ""
-"Most screens have <guibutton>Help</guibutton> buttons which give further "
-"explanations about the current step."
+"Most screens have <guibutton>Help</guibutton> buttons for further details "
+"about the particular step."
 msgstr ""
 "Enamikul ekraanidel on nupp <guibutton>Abi</guibutton>, mis selgitab antud "
 "etappi põhjalikumalt."
 
 #. type: Content of: <section><section><note><para>
-#: en/installer.xml:196
+#: en/installer.xml:190
+#, fuzzy
 msgid ""
-"If somewhere during install you decide to stop the installation, it is "
-"possible to reboot, but please think twice before you do this.  Once a "
+"If at some points during the install you decide to stop the installation, it "
+"is possible to reboot, but please think twice before you do this. Once a "
 "partition has been formatted or updates have started to be installed, your "
 "computer is no longer in the same state and rebooting it could very well "
 "leave you with an unusable system. If in spite of this you are very sure "
@@ -2497,17 +2514,17 @@ msgstr ""
 "<guibutton>Alt Ctrl Delete</guibutton>."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:209
+#: en/installer.xml:203
 msgid "Installation Problems and Possible Solutions"
 msgstr "Paigaldamisprobleemid ja nende võimalikud lahendused"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:212
+#: en/installer.xml:206
 msgid "No Graphical Interface"
 msgstr "Graafiline liides puudub"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:216
+#: en/installer.xml:210
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -2518,13 +2535,16 @@ msgstr ""
 "ekraanilahutust, kirjutades käsureale <code>vgalo</code>."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:223
+#: en/installer.xml:217
+#, fuzzy
 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 hit "
-"ESC at the first welcome screen and confirm with ENTER. You will be "
-"presented with a black screen with the word \"boot:\". Type \"text\" and hit "
-"ENTER. Now continue with the installation in text mode."
+"In this case it is worth trying a text mode installation. To use this press "
+"<emphasis role=\"bold\">Esc</emphasis> at the first welcome screen and "
+"confirm with <emphasis role=\"bold\">ENTER</emphasis>. You will be presented "
+"with a black screen with the word \"boot:\". Type \"text\" and press "
+"<emphasis role=\"bold\">ENTER</emphasis> to continue with the installation "
+"in text mode."
 msgstr ""
 "Kui riistvara on väga vana, ei pruugi graafiline paigaldamine üldse võimalik "
 "olla. Sel juhul võib proovida tekstipõhist paigaldamist. Selleks vajutage "
@@ -2533,12 +2553,12 @@ msgstr ""
 "\" ja vajutage ENTER. Nüüd saate jätkata tekstipõhise paigaldamisega."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:234
+#: en/installer.xml:230
 msgid "The Install Freezes"
 msgstr "Paigaldamine hangub"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:236
+#: en/installer.xml:232
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -2553,14 +2573,15 @@ msgstr ""
 "võtmetega."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:244
+#: en/installer.xml:240
 msgid "RAM problem"
 msgstr "RAM-i probleem"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:246
+#: en/installer.xml:242
+#, fuzzy
 msgid ""
-"These will rarely be needed, but in some cases the hardware may report the "
+"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 "
 "<code>mem=xxxM</code> parameter, where xxx is the correct amount of RAM. e."
 "g. <code>mem=256M</code> would specify 256MB of RAM."
@@ -2571,18 +2592,20 @@ msgstr ""
 "<code>mem=256M</code> määrab, et kasutada on 256 MB mälu."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:253
+#: en/installer.xml:249
 msgid "Dynamic partitions"
 msgstr "Dünaamilised partitsioonid"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:255
+#: en/installer.xml:251
+#, fuzzy
 msgid ""
-"If you converted your hard disk from \"basic\" format to \"dynamic\" format "
-"on Microsoft Windows, you must know that it is impossible to install Mageia "
-"on this disc. To go back to a basic disk, see the Microsoft documentation: "
-"<link ns2:href=\"http://msdn.microsoft.com/en-us/library/cc776315.aspx"
-"\">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>."
+"If you converted your hard disk from <emphasis role=\"bold\">basic</"
+"emphasis> format to <emphasis role=\"bold\">dynamic</emphasis> format in "
+"Microsoft Windows, then it is not possible to install Mageia on this disc. "
+"To revert to a basic disk, see the Microsoft documentation: <link ns2:href="
+"\"http://msdn.microsoft.com/en-us/library/cc776315.aspx\">http://msdn."
+"microsoft.com/en-us/library/cc776315.aspx</link>."
 msgstr ""
 "Kui olete valinud oma kõvaketta vorminguks Microsoft Windowsi all \"dynamic"
 "\" tavalise \"basic\" asemel, siis arvestage, et Mageiat ei saa sellisele "
@@ -2601,17 +2624,18 @@ msgstr "Uuendused"
 #.  marja 20120418 removed 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"" from section tag, trying to restore correct html filename
 #.  marja, 2012-04-24 added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/installUpdates.xml:13
+#: en/installUpdates.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></imagedata> </"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-installUpdates.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"installUpdates-im1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-installUpdates.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"installUpdates-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:19
+#: en/installUpdates.xml:20
 msgid ""
 "Since this version of <application>Mageia</application> was released, some "
 "packages will have been updated or improved."
@@ -2620,10 +2644,11 @@ msgstr ""
 "mõningaid pakette uuendatud või parandatud."
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:23
+#: en/installUpdates.xml:24
+#, fuzzy
 msgid ""
-"Choose <guilabel>yes</guilabel> if you wish to download and install them, "
-"select <guilabel>no</guilabel> if you don't want to do this now, or if you "
+"Choose <guilabel>Yes</guilabel> if you wish to download and install them, "
+"select <guilabel>No</guilabel> if you don't want to do this now, or if you "
 "aren't connected to the Internet"
 msgstr ""
 "Valige <guilabel>Jah</guilabel>, kui soovite sellised paketid alla laadida "
@@ -2631,8 +2656,9 @@ msgstr ""
 "kui teil puudub parajasti internetiühendus."
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:28
-msgid "Then press <guibutton>Next</guibutton> to continue"
+#: en/installUpdates.xml:29
+#, fuzzy
+msgid "Press <guibutton>Next</guibutton> to continue"
 msgstr "Seejärel klõpsake jätkamiseks <guibutton>Edasi</guibutton>."
 
 #. type: Content of: <section><info><title>
@@ -2689,18 +2715,18 @@ msgstr "Andmekandjate valik (mittevaba tarkvara)"
 #.  marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell 
 #. marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)
 #. type: Content of: <section><mediaobject>
-#: en/media_selection.xml:12
+#: en/media_selection.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
-"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"media_selection-im1\" align="
+"\"center\" revision=\"1\" fileref=\"dx2-media_selection.png\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
-"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
+"\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/media_selection.xml:18
+#: en/media_selection.xml:20
 msgid ""
 "Here you have the list of available repositories. Not all repositories are "
 "available, according to which media you use for installing. The repositories "
@@ -2713,7 +2739,7 @@ msgstr ""
 "etappidel võimalik paigaldada."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:25
+#: en/media_selection.xml:27
 msgid ""
 "The <emphasis>Core</emphasis> repository cannot be disabled as it contains "
 "the base of the distribution."
@@ -2722,7 +2748,7 @@ msgstr ""
 "see sisaldab distributsiooni põhikomponente."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:30
+#: en/media_selection.xml:32
 msgid ""
 "The <emphasis>Nonfree</emphasis> repository includes packages that are free-"
 "of-charge, i.e. Mageia may redistribute them, but they contain closed-source "
@@ -2737,13 +2763,14 @@ msgstr ""
 "draivereid, mitmesuguste WiFi-kaartide püsivara jms."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:38
+#: en/media_selection.xml:40
+#, fuzzy
 msgid ""
 "The <emphasis>Tainted</emphasis> repository includes packages released under "
 "a free license. The main criteria for placing packages in this repository is "
 "that they may infringe patents and copyright laws in some countries, e.g. "
-"Multimedia codecs needed to play various audio/video files; packages needed "
-"to play commercial video DVD, etc."
+"multimedia codecs needed to play various audio/video files; packages needed "
+"to play commercial video DVD's, etc."
 msgstr ""
 "Hoidla <emphasis>Tainted</emphasis> (piirangutega tarkvara) sisaldab "
 "pakette, mis on avaldatud vaba litsentsi all. Peamine põhjus, miks osa "
@@ -2753,36 +2780,39 @@ msgstr ""
 "multimeediakoodekid, kommerts-video-DVD-de esitamiseks vajalikud paketid jms."
 
 #. type: Content of: <section><info><title>
-#: en/minimal-install.xml:12
+#: en/minimal-install.xml:3
 msgid "Minimal Install"
 msgstr "Minimaalne paigaldus"
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:19
+#: en/minimal-install.xml:11
+#, fuzzy
 msgid ""
 "You can choose a Minimal Installation by de-selecting everything in the "
-"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"></"
-"xref>."
+"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"/>."
 msgstr ""
 "Kui paketigruppide ekraanil jätta kõik valimata, saab kasutada minimaalset "
 "paigaldust, vt. <xref linkend=\"choosePackageGroups\"></xref>."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:22
+#: en/minimal-install.xml:14
+#, fuzzy
 msgid ""
-"If desired, you can additionally tick the \"Individual package selection\" "
-"option in the same screen."
+"If desired, you can additionally tick the <emphasis role=\"bold\">Individual "
+"package selection</emphasis> option in the same screen."
 msgstr ""
 "Soovi korral võite samal ekraanil ära märkida valiku \"Valik paketthaaval\"."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:24
+#: en/minimal-install.xml:17
+#, fuzzy
 msgid ""
 "Minimal Installation is intended for those with specific uses in mind for "
-"their <application>Mageia</application>, such as a server or a specialised "
-"workstation. You will probably use this option combined with the "
-"\"Individual package selection\" option mentioned above, to fine-tune your "
-"installation, see <xref linkend=\"choosePackagesTree\"></xref>."
+"<application>Mageia</application>, such as a server or a specialised "
+"workstation. You will probably use this option combined with the <emphasis "
+"role=\"bold\">Individual package selection</emphasis> option mentioned "
+"above, to fine-tune your installation, see <xref linkend=\"choosePackagesTree"
+"\"/>."
 msgstr ""
 "Minimaalne paigaldus on mõeldud neile, kel mõlgub <application>Mageia</"
 "application> jaoks meeles midagi erilist, näiteks server või spetsiaalne "
@@ -2790,24 +2820,24 @@ msgstr ""
 "valimisega, vt. <xref linkend=\"choosePackagesTree\"></xref>."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:29
+#: en/minimal-install.xml:22
+#, fuzzy
 msgid ""
-"If you choose this installation class, then the related screen will offer "
+"If you choose this installation method, then the relevant screen will offer "
 "you a few useful extras to install, such as documentation and X."
 msgstr ""
 "Kui valite niisuguse paigaldamise, saab järgmisel ekraanil üht-teist "
 "täpsustada, näiteks lasta paigaldada ka dokumentatsioon või X."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:31
+#: en/minimal-install.xml:26
 msgid ""
-"If selected, \"With X\" will also include IceWM as lightweight desktop "
-"environment."
+"If <emphasis role=\"bold\">With X</emphasis> is chosen, then IceWM (a "
+"lightweight desktop environment) will also be included."
 msgstr ""
-"Kui märkida \"X'iga\", paigaldatakse ka kergekaaluline töökeskkond IceWM."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:33
+#: en/minimal-install.xml:29
 msgid ""
 "The basic documentation is provided in the form of man and info pages.  It "
 "contains the man pages from the <link xlink:href=\"http://www.tldp.org/"
@@ -2821,15 +2851,15 @@ msgstr ""
 "gnu.org/software/coreutils/manual/\">GNU coreutils</link> info-lehekülgi."
 
 #. type: Content of: <section><mediaobject>
-#: en/minimal-install.xml:41
+#: en/minimal-install.xml:35
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> "
-"</imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"minimal-install-im1\" align="
+"\"center\" fileref=\"dx2-minimal-install.png\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> "
-"</imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
+"\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><info><title>
 #: en/misc-params.xml:3
@@ -2846,11 +2876,12 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/misc-params.xml:15
+#, fuzzy
 msgid ""
-"DrakX made smart choices for the configuration of your system depending on "
-"the choices you made and on the hardware DrakX detected. You can check the "
-"settings here and change them if you want after pressing "
-"<guibutton>Configure</guibutton>."
+"DrakX presents a proposal for the configuration of your system depending on "
+"the choices you made and on the hardware detected. You can check the "
+"settings here and change them if you want by pressing <guibutton>Configure</"
+"guibutton>."
 msgstr ""
 "DrakX langetab teie süsteemi seadistamisel mõistlikud otsused vastavalt Teie "
 "valikutele ja tuvastatud riistvarale. Siin saab neid seadistusi üle vaadata "
@@ -2858,9 +2889,10 @@ msgstr ""
 
 #. type: Content of: <section><note><para>
 #: en/misc-params.xml:21
+#, fuzzy
 msgid ""
-"As a general rule, default settings are recommended and you can keep them "
-"with 3 exceptions:"
+"As a general rule, it is recommended that you accept the default settings "
+"unless:"
 msgstr ""
 "Rusikareeglina on soovitatav kasutada vaikimisi seadistusi - välja arvatud "
 "kolmel erandjuhul:"
@@ -2877,72 +2909,76 @@ msgstr "vaikeseadistusi on juba proovitud ja need ei andnud soovitud tulemust"
 
 #. type: Content of: <section><note><para><itemizedlist><listitem><para>
 #: en/misc-params.xml:32
-msgid "something else is said in the detailed sections below"
+#, fuzzy
+msgid ""
+"some other factor mentionned in the detailed sections below is an issue."
 msgstr "veel midagi, millest on üksikasjalikumalt juttu allpool"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:39
+#: en/misc-params.xml:40
 msgid "System parameters"
 msgstr "Süsteemi parameetrid"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:44
+#: en/misc-params.xml:45
 msgid "<guilabel>Timezone</guilabel>"
 msgstr "<guilabel>Ajavöönd</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:46
+#: en/misc-params.xml:47
+#, fuzzy
 msgid ""
-"DrakX selected a time zone for you, depending on your preferred language. "
-"You can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/"
-">"
+"DrakX selects a time zone for you, depending on your preferred language. You "
+"can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/>"
 msgstr ""
 "DrakX määrab vastavalt valitud keelele ajavööndi. Soovi korral saab seda "
 "muuta. Vt ka <xref linkend=\"configureTimezoneUTC\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:52
+#: en/misc-params.xml:53
 msgid "<guilabel>Country / Region</guilabel>"
 msgstr "<guilabel>Riik / Piirkond</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:55
+#: en/misc-params.xml:56
+#, fuzzy
 msgid ""
-"If you are not in the selected country, it is very important that you "
-"correct the setting. See <xref linkend=\"selectCountry\"/>"
+"If the selected country is wrong, it is very important that you correct the "
+"setting.  See <xref linkend=\"selectCountry\"/>"
 msgstr ""
 "Kui Te ei viibi valitud riigis, on väga oluline see siin õigeks parandada. "
 "Vt <xref linkend=\"selectCountry\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:61
+#: en/misc-params.xml:62
 msgid "<guilabel>Bootloader</guilabel>"
 msgstr "<guilabel>Alglaadur</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:63
+#: en/misc-params.xml:64
 msgid "DrakX has made good choices for the bootloader setting."
 msgstr "DrakX langetab tavaliselt alglaaduri osas hea ja õige valiku."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:66
-msgid "Do not change anything, unless you know how to configure Grub2"
+#: en/misc-params.xml:67
+#, fuzzy
+msgid "Do not change anything, unless you know how to configure GRUB2"
 msgstr ""
 "Kui Te just väga täpselt ei tea, kuidas Grub2 seadistada, ei tasu siin "
 "midagi muuta."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:69
+#: en/misc-params.xml:70
 msgid "For more information, see <xref linkend=\"setupBootloader\"/>"
 msgstr "Täpsemalt kõneleb sellest <xref linkend=\"setupBootloader\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:74
+#: en/misc-params.xml:75
 msgid "<guilabel>User management</guilabel>"
 msgstr "<guilabel>Kasutajate haldamine</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:77
+#: en/misc-params.xml:78
 msgid ""
 "You can add extra users here. They will each get their own <literal>/home</"
 "literal> directories."
@@ -2951,21 +2987,22 @@ msgstr ""
 "home</literal> kataloogi."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:83
+#: en/misc-params.xml:84
 msgid "<guilabel>Services</guilabel>:"
 msgstr "<guilabel>Teenused</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:85
+#: en/misc-params.xml:86
+#, fuzzy
 msgid ""
-"System services refer to those small programs which run the background "
-"(daemons). This tool allows you to enable or disable certain tasks."
+"System services refer to those small programs which run in the background "
+"(daemons).  This tool allows you to enable or disable certain processes."
 msgstr ""
 "Süsteemi teenused tähendavad väikseid programme, mis töötavad taustal "
 "(deemonid). See tööriist võimaldab teatavaid ülesandeid lubada või keelata."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:89
+#: en/misc-params.xml:90
 msgid ""
 "You should check carefully before changing anything here - a mistake may "
 "prevent your computer from operating correctly."
@@ -2974,31 +3011,32 @@ msgstr ""
 "arvuti enam korralikult töötada."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:93
+#: en/misc-params.xml:94
 msgid "For more information, see <xref linkend=\"configureServices\"/>"
 msgstr "Täpsemalt kõneleb sellest <xref linkend=\"configureServices\"/>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:100
+#: en/misc-params.xml:101
 msgid "Hardware parameters"
 msgstr "Riistvara parameetrid"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:105
+#: en/misc-params.xml:106
 msgid "<guilabel>Keyboard</guilabel>:"
 msgstr "<guilabel>Klaviatuur</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:107
+#: en/misc-params.xml:108
+#, fuzzy
 msgid ""
-"This is where you setup or change your keyboard layout which will depend on "
-"your location, language or type of keyboard."
+"Configure your keyboard layout according to your location, language and type "
+"of keyboard."
 msgstr ""
 "Siin saab määrata või muuta klaviatuuripaigutust, mis sõltub valitud "
 "asukohast, keelest ja klaviatuuritüübist."
 
 #. type: Content of: <section><section><itemizedlist><listitem><note><para>
-#: en/misc-params.xml:112
+#: en/misc-params.xml:113
 msgid ""
 "If you notice a wrong keyboard layout and want to change it, keep in mind "
 "that your passwords are going to change too."
@@ -3007,12 +3045,12 @@ msgstr ""
 "pidage meeles, et muutuvad ka paroolid."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:118
+#: en/misc-params.xml:119
 msgid "<guilabel>Mouse</guilabel>:"
 msgstr "<guilabel>Hiir</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:120
+#: en/misc-params.xml:121
 msgid ""
 "Here you can add or configure other pointing devices, tablets, trackballs "
 "etc."
@@ -3021,38 +3059,39 @@ msgstr ""
 "puuteplaate jms."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:125
+#: en/misc-params.xml:126
 msgid "<guilabel>Sound card</guilabel>:"
 msgstr "<guilabel>Helikaart</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:128
+#: en/misc-params.xml:129
+#, fuzzy
 msgid ""
-"The installer uses the default driver, if there is a default one. The option "
-"to select a different driver is only given when there is more than one "
-"driver for your card, but none of them is the default one."
+"The installer uses the default driver - if there is a default one. The "
+"option to select a different driver is only given when there is more than "
+"one driver for your card, but where none of them is the default one."
 msgstr ""
 "Paigaldusprogramm kasutab vaikimisi draiverit, kui see on olemas. Võimalus "
 "valida teist draiverit antakse ainult siis, kui helikaardile on olemas mitu "
 "draiverit, aga ükski neist ei ole vaikimisi draiver."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:135
+#: en/misc-params.xml:137
 msgid "<guilabel>Graphical interface</guilabel>:"
 msgstr "<guilabel>Graafiline kasutajaliides</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:138
+#: en/misc-params.xml:140
 msgid "This section allows you to configure your graphic card(s) and displays."
 msgstr "Siin saab seadistada graafikakaarte ja monitore."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:141
+#: en/misc-params.xml:143
 msgid "For more information, see <xref linkend=\"configureX_chooser\"/>."
 msgstr "Täpsemalt kõneleb sellest <xref linkend=\"configureX_chooser\"/>."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/misc-params.xml:147
+#: en/misc-params.xml:149
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
 "\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
@@ -3061,20 +3100,21 @@ msgstr ""
 "\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:155
+#: en/misc-params.xml:157
 msgid "Network and Internet parameters"
 msgstr "Võrgu- ja internetiparameetrid"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:161
+#: en/misc-params.xml:163
 msgid "<guilabel>Network</guilabel>:"
 msgstr "<guilabel>Võrk</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:163
+#: en/misc-params.xml:165
+#, fuzzy
 msgid ""
 "You can configure your network here, but for network cards with non-free "
-"drivers it is better to do that after reboot, in the <application>Mageia "
+"drivers it is better to do that after reboot, using the <application>Mageia "
 "Control Center</application>, if you have not yet enabled the Nonfree media "
 "repositories."
 msgstr ""
@@ -3084,21 +3124,22 @@ msgstr ""
 "mittevaba tarkvara hoidlate kasutamist."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:170
+#: en/misc-params.xml:172
+#, fuzzy
 msgid ""
-"When you add a network card, do not forget to set your firewall to watch "
+"When you add a network card, do not forget to set your firewall to monitor "
 "that interface as well."
 msgstr ""
 "Võrgukaardi lisamisel ärge unustage seadistamast tulemüüri, et ka lisatud "
 "kaarti jälgitaks."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:177
+#: en/misc-params.xml:179
 msgid "<guilabel>Proxies</guilabel>:"
 msgstr "<guilabel>Puhverserverid</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:179
+#: en/misc-params.xml:181
 msgid ""
 "A Proxy Server acts as an intermediary between your computer and the wider "
 "internet.  This section allows you to configure your computer to utilize a "
@@ -3108,26 +3149,27 @@ msgstr ""
 "panna arvuti kasutama puhverservereid."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:184
+#: en/misc-params.xml:186
+#, fuzzy
 msgid ""
 "You may need to consult your systems administrator to get the parameters you "
-"need to enter here"
+"need to enter here."
 msgstr ""
 "Vajalike parameetrite täpsustamiseks võib olla vajalik pidada nõu oma "
 "süsteemiadministraatoriga."
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:193
+#: en/misc-params.xml:195
 msgid "Security"
 msgstr "Turvalisus"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:198
+#: en/misc-params.xml:200
 msgid "<guilabel>Security Level</guilabel>:"
 msgstr "<guilabel>Turbetase</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:201
+#: en/misc-params.xml:203
 msgid ""
 "Here you set the Security level for your computer, in most cases the default "
 "setting (Standard) is adequate for general use."
@@ -3136,17 +3178,17 @@ msgstr ""
 "kasutamiseks kõlbama vaikimisi seadistused (valik Standardne)."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:205
+#: en/misc-params.xml:207
 msgid "Check the option which best suits your usage."
 msgstr "Valige tase, mis paistab Teie vajadusi kõige paremini rahuldavat."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:210
+#: en/misc-params.xml:212
 msgid "<guilabel>Firewall</guilabel>:"
 msgstr "<guilabel>Tulemüür</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:212
+#: en/misc-params.xml:214
 msgid ""
 "A firewall is intended to be a barrier between your important data and the "
 "rascals out there on the internet who would compromise or steal it."
@@ -3155,7 +3197,7 @@ msgstr ""
 "röövloomade vahel, kes üritavad neid varastada või rikkuda."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:216
+#: en/misc-params.xml:218
 msgid ""
 "Select the services that you wish to have access to your system. Your "
 "selections will depend on what you use your computer for. For more "
@@ -3166,7 +3208,7 @@ msgstr ""
 "vt <xref linkend=\"firewall\"/>."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:222
+#: en/misc-params.xml:224
 msgid "Bear in mind that allowing everything (no firewall) may be very risky."
 msgstr ""
 "Pange tähele, et kõige lubamine (st tulemüür puudub) võib olla väga ohtlik."
@@ -3235,41 +3277,73 @@ msgstr ""
 "<application>Mageia</application> paigaldusele."
 
 #. type: Content of: <section><info><title>
-#: en/securityLevel.xml:12
+#: en/securityLevel.xml:3
 msgid "Security Level"
 msgstr "Turbetase"
 
 #.  2012-12-25 marja - moved this part out of misc-params.xml" 
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
+#: en/securityLevel.xml:11
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"securityLevel-im1\" align="
+"\"center\" fileref=\"dx2-securityLevel.png\" revision=\"1\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
+"\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:16
+#, fuzzy
+msgid ""
+"<emphasis role=\"bold\">Please choose the desired security level</emphasis>"
+msgstr "<emphasis role=\"bold\">Partitsiooni suurus:</emphasis>"
+
+#. type: Content of: <section><para>
 #: en/securityLevel.xml:19
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> </"
-"imageobject>"
+"<emphasis role=\"bold\">Standard</emphasis> is the default, and recommended "
+"setting for the average user. The <emphasis role=\"bold\">Secure</emphasis> "
+"setting will create a highly protected system - for instance if the system "
+"is to be used as a public server."
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> </"
-"imageobject>"
 
 #. type: Content of: <section><para>
 #: en/securityLevel.xml:24
-msgid "You can adjust your security level here."
-msgstr "Siin saab kohandada oma arvuti turbetaset."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Security Administrator</emphasis>"
+msgstr "<emphasis role=\"bold\">Muud valikud</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:27
+#: en/securityLevel.xml:26
+msgid ""
+"This item allows you to configure an email address to which the system will "
+"send <emphasis>security alert messages</emphasis> when it detects situations "
+"which require notification to a system administrator."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:31
+msgid ""
+"A good, and easy-to-implement, choice is to enter &lt;user>@localhost - "
+"where &lt;user> is the login name of the user to receive these messages."
+msgstr ""
+
+#. type: Content of: <section><note><para>
+#: en/securityLevel.xml:36
 msgid ""
-"Leave the default settings as they are, if you don't know what to choose."
+"The system sends such messages as <emphasis role=\"bold\">Unix Mailspool "
+"messages</emphasis>, not as \"ordinary\" SMTP mail: this user must therefore "
+"be configured for receiving such mail!"
 msgstr ""
-"Kui te ei ole kindel, ärge hakake siin midagi muutma, vaid jätke kehtima "
-"vaikimisi määratu."
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:30
+#: en/securityLevel.xml:41
+#, fuzzy
 msgid ""
 "After install, it will always be possible to adjust your security settings "
-"in the <guilabel>Security</guilabel> part of the Mageia Control Center."
+"in the <guilabel>Security</guilabel> section of the Mageia Control Center."
 msgstr ""
 "Pärast paigaldamist on alati võimalik turvalisusega seotud seadistusi muuta "
 "Mageia juhtimiskeskuse sektsioonis <guilabel>Turvalisus</guilabel>."
@@ -3286,25 +3360,27 @@ msgstr "Sissejuhatus"
 
 #. type: Content of: <section><section><para>
 #: en/SelectAndUseISOs2.xml:10
+#, fuzzy
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
-"which image match your needs."
+"which image best suits your needs."
 msgstr ""
 "Mageiat levitatakse ISO-tõmmiste kaudu. Siin leiab abi valimaks just sellist "
 "tõmmist, mis vastab teie vajadustele."
 
 #. type: Content of: <section><section><para>
 #: en/SelectAndUseISOs2.xml:12
-msgid "There is two families of media:"
+#, fuzzy
+msgid "There are two families of media:"
 msgstr "Andmekandjaid on kaht tüüpi:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:15
+#, fuzzy
 msgid ""
-"Classical installer: After booting the media, it will follow a process "
-"allowing to choose what to install and how to configure your target system. "
-"This give you the maximal flexibility for a customized installation, in "
-"particular to choose which Desktop Environment you will install."
+"Classical installer: Booting with this media provides you with the maximum "
+"flexibility when choosing what to install, and for configuring your system. "
+"In particular, you have a choice of which Desktop environment to install"
 msgstr ""
 "Klassikaline paigaldusandmekandja. Selle käivitamise järel asutakse kohe "
 "paigaldamise juurde ning te saate valida, mida paigaldada ja kuidas süsteemi "
@@ -3313,82 +3389,86 @@ msgstr ""
 "hakata."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:22
+#: en/SelectAndUseISOs2.xml:21
 msgid ""
-"LIVE media: you can boot the media in a real Mageia system without "
-"installing it, to see what you will get after installation.  The "
-"installation process is simpler, but you get lesser choices."
+"LIVE media: This option allows you to try out Mageia without having to "
+"actually install it, or make any changes to your computer.  If the "
+"installation is decided, the process is simpler, but you get fewer choices "
+"than offered by the Classical installer"
 msgstr ""
-"Live-andmekandja: sel juhul saab andmekandja pealt käivitada toimiva Mageia "
-"süsteemi ilma seda paigaldamata, et näiteks näha, mida üldse pakutakse. "
-"Paigaldamine on lihtsam, aga ka valikuid on vähem."
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:28
+#: en/SelectAndUseISOs2.xml:27
 msgid "Details are given in the next sections."
 msgstr "Üksikasjadest kõneldakse järgmistes osades."
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:31
+#: en/SelectAndUseISOs2.xml:30
 msgid "Media"
 msgstr "Andmekandjad"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:33
+#: en/SelectAndUseISOs2.xml:32
 msgid "Definition"
 msgstr "Määratlus"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:34
+#: en/SelectAndUseISOs2.xml:33
+#, fuzzy
 msgid ""
 "Here, a medium (plural: media) is an ISO image file that allows you to "
-"install and/or update Mageia and by extension any physical support the ISO "
-"file is copied to."
+"install and/or update Mageia and by extension any physical support (DVD, USB "
+"stick, ...) the ISO file is copied to."
 msgstr ""
 "Me nimetame siinkohal andmekandjaks ISO-tõmmisefaili, mis võimaldab "
 "paigaldada ja/või uuendada Mageiat, ning ühtlasi ka igasugust füüsilist "
 "seadet, millele ISO-tõmmis on kopeeritud."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:37
+#: en/SelectAndUseISOs2.xml:36
+#, fuzzy
 msgid ""
-"You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
-"\">here</link>."
+"You can find Mageia ISO's <link ns4:href=\"http://www.mageia.org/en/"
+"downloads/\">here</link>."
 msgstr ""
 "ISO-tõmmised leiab <link ns4:href=\"http://www.mageia.org/en/downloads/"
 "\">siit</link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:40
+#: en/SelectAndUseISOs2.xml:39
 msgid "Classical installation media"
 msgstr "Klassikalised paigaldusandmekandjad"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:42 en/SelectAndUseISOs2.xml:73
-#: en/SelectAndUseISOs2.xml:142
+#: en/SelectAndUseISOs2.xml:41 en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:141
 msgid "Common features"
 msgstr "Ühised omadused"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:45
-msgid "These ISOs use the traditional installer called drakx."
+#: en/SelectAndUseISOs2.xml:44
+#, fuzzy
+msgid "These ISOs use the Classical installer called drakx."
 msgstr "Kasutavad traditsioonilist paigaldusprogrammi drakx"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:49
+#: en/SelectAndUseISOs2.xml:47
+#, fuzzy
 msgid ""
-"They are able to make a clean install or an update from previous releases."
+"They are used for performing clean installs or to upgrade a previously "
+"installed version of Mageia."
 msgstr ""
 "Saab teha nii puhta paigalduse kui ka uuendada varasematelt väljalasetelt"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:53 en/SelectAndUseISOs2.xml:84
-#: en/SelectAndUseISOs2.xml:159
-msgid "Different media for 32 or 64 bit architectures."
+#: en/SelectAndUseISOs2.xml:51 en/SelectAndUseISOs2.xml:83
+#: en/SelectAndUseISOs2.xml:158
+#, fuzzy
+msgid "Different media for 32 and 64 bit architectures."
 msgstr "Eri andmekandjad 32- ja 64-bitisele arhitektuurile"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:56
+#: en/SelectAndUseISOs2.xml:54
 msgid ""
 "Some tools are available in the Welcome screen: Rescue System, Memory Test, "
 "Hardware Detection Tool."
@@ -3397,12 +3477,12 @@ msgstr ""
 "riistvara tuvastamise tööriist"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:60
+#: en/SelectAndUseISOs2.xml:58
 msgid "Each DVD contains many available desktop environments and languages."
 msgstr "Iga DVD sisaldab paljusid saadaolevaid töökeskkondi ja keeli"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:64
+#: en/SelectAndUseISOs2.xml:62
 msgid ""
 "You'll be given the choice during the installation to add non free software."
 msgstr ""
@@ -3410,99 +3490,104 @@ msgstr ""
 "mitte"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:69
 msgid "Live media"
 msgstr "Live-andmekandjad"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:76
+#: en/SelectAndUseISOs2.xml:74
+#, fuzzy
 msgid ""
-"Can be used to preview the distribution without installing it on a HDD, and "
-"optionally install Mageia on to your HDD."
+"Can be used to preview the Mageia operating system without having to install "
+"it. Can also be used to install Mageia if you wish."
 msgstr ""
 "Saab tarvitada distributsiooni tundmaõppimiseks ilma seda kohe kõvakettale "
 "paigaldamata, aga soovi korral siiski ka Mageia paigaldamiseks"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:80
+#: en/SelectAndUseISOs2.xml:79
 msgid "Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)."
 msgstr "Iga ISO sisaldab ainult üht töökeskkonda (Plasma, GNOME või Xfce)."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:87
+#: en/SelectAndUseISOs2.xml:86
+#, fuzzy
 msgid ""
 "<emphasis role=\"bold\">Live ISOs can only be used to create clean "
-"installations, they cannot be used to upgrade from previous releases.</"
-"emphasis>"
+"installations, they cannot be used to upgrade previously installed Mageia "
+"releases.</emphasis>"
 msgstr ""
 "<emphasis role=\"bold\">LiveISO-sid saab kasutada ainult puhta paigalduse, "
 "mitte aga uuendamise jaoks varasemalt versioonilt.</emphasis>"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:92
+#: en/SelectAndUseISOs2.xml:91
 msgid "They contain non free software."
 msgstr "Sisaldavad mittevaba tarkvara"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:97
+#: en/SelectAndUseISOs2.xml:96
 msgid "Live DVD Plasma"
 msgstr "Plasma LiveDVD"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:100
+#: en/SelectAndUseISOs2.xml:99
 msgid "Plasma desktop environment only."
 msgstr "Ainult Plasma töökeskkond."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:103 en/SelectAndUseISOs2.xml:117
-#: en/SelectAndUseISOs2.xml:131
-msgid "All languages are present."
+#: en/SelectAndUseISOs2.xml:102 en/SelectAndUseISOs2.xml:116
+#: en/SelectAndUseISOs2.xml:130
+#, fuzzy
+msgid "All available languages are present."
 msgstr "Sisaldab kõiki keeli"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:106
+#: en/SelectAndUseISOs2.xml:105
 msgid "64 bit architecture only."
 msgstr "Ainult 64-bitine arhitektuur"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:111
+#: en/SelectAndUseISOs2.xml:110
 msgid "Live DVD GNOME"
 msgstr "GNOME LiveDVD"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:114
+#: en/SelectAndUseISOs2.xml:113
 msgid "GNOME desktop environment only."
 msgstr "Ainult GNOME töökeskkond"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:120
+#: en/SelectAndUseISOs2.xml:119
 msgid "64 bit architecture only"
 msgstr "Ainult 64-bitine arhitektuur"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:125
+#: en/SelectAndUseISOs2.xml:124
 msgid "Live DVD Xfce"
 msgstr "Xfce LiveDVD"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:128
+#: en/SelectAndUseISOs2.xml:127
 msgid "Xfce desktop environment only."
 msgstr "Ainult Xfce töökeskkond."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:134
+#: en/SelectAndUseISOs2.xml:133
 msgid "32 or 64 bit architectures."
 msgstr "32- või 64-bitine arhitektuur"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:140
-msgid "Boot-only CD media"
-msgstr "CD-d ainult alglaadimiseks"
+#: en/SelectAndUseISOs2.xml:139
+#, fuzzy
+msgid "Net install media"
+msgstr "netinstall.iso"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:145
+#: en/SelectAndUseISOs2.xml:144
+#, fuzzy
 msgid ""
-"Each one is a small image that contains no more than that which is needed to "
+"These are minimal ISO's containing no more than that which is needed to "
 "start the drakx installer and find drakx-installer-stage2 and other packages "
 "that are needed to continue and complete the install. These packages may be "
 "on the PC hard disk, on a local drive, on a local network or on the Internet."
@@ -3513,28 +3598,30 @@ msgstr ""
 "muul kohalikul kettal, kohalikus võrgus või internetis."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:153
+#: en/SelectAndUseISOs2.xml:152
+#, fuzzy
 msgid ""
-"These media are very light (less than 100 MB) and are convenient when "
-"bandwidth is too low to download a full DVD, a PC without a DVD drive or a "
-"PC that can't boot from a USB stick."
+"These media are very light (less than 100 MB) and are convenient if "
+"bandwidth is too low to download a full DVD, or if you have a PC without a "
+"DVD drive or is unable to boot from a USB stick."
 msgstr ""
 "Need andmekandjad on väga väikesed (alla 100 MB) ja abiks siis, kui "
 "internetiühenduse maht on liiga väike terve DVD allalaadimiseks, arvuti on "
 "ilma DVD-seadmeta või ei saa arvutit käivitada USB-pulga pealt."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:162
-msgid "English language only."
+#: en/SelectAndUseISOs2.xml:161
+#, fuzzy
+msgid "First steps are English language only."
 msgstr "Ainult inglise keeles"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:167
+#: en/SelectAndUseISOs2.xml:166
 msgid "netinstall.iso"
 msgstr "netinstall.iso"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:170
+#: en/SelectAndUseISOs2.xml:169
 msgid ""
 "Contains only free software, for those people who prefer not to use non-free "
 "software."
@@ -3568,11 +3655,12 @@ msgstr "Allalaadimine"
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:189
+#, fuzzy
 msgid ""
 "Once you have chosen your ISO file, you can download it using either http or "
-"BitTorrent. In both cases, a window gives you some information, such as the "
-"mirror in use and an opportunity to change if the bandwidth is to low. If "
-"http is chosen, you may also see something like"
+"BitTorrent. In both cases, you are provided with some information, such as "
+"the mirror in use and an option to switch if the bandwidth is too low. If "
+"http is chosen, you will also see something regarding checksums."
 msgstr ""
 "Kui olete sobiva ISO-faili valinud, saab selle alla laadida kas HTTP või "
 "BitTorrenti vahendusel. Mõlemal juhul annab aken mõningat teavet, näiteks "
@@ -3586,10 +3674,11 @@ msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:195
+#, fuzzy
 msgid ""
-"md5sum and sha1sum are tools to check the ISO integrity. Use only one of "
-"them. Keep one of them <link linkend=\"integrity\">for further usage</link>. "
-"Then a window similar to this one appears:"
+"md5sum and sha1sum are tools to check the ISO integrity. Choose one or the "
+"other, and copy the checksum <link linkend=\"integrity\">for later use</"
+"link>. Then a window similar to this one appears:"
 msgstr ""
 "md5sum ja sha1sum on tööriistad ISO terviklikkuse kontrollimiseks. Kasutada "
 "tuleks ainult üht neist. Hoidke üks neist varuks <link linkend=\"integrity"
@@ -3602,8 +3691,8 @@ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:203
-msgid "Check the radio button Save File."
-msgstr "Märkige raadionupp Salvestama."
+msgid "Select the Save File option, then, click OK."
+msgstr ""
 
 #. type: Content of: <section><section><section><title>
 #: en/SelectAndUseISOs2.xml:206
@@ -3611,14 +3700,15 @@ msgid "Checking the integrity of the downloaded media"
 msgstr "Allalaaditud andmekandja terviklikkuse kontrollimine"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:207
+#: en/SelectAndUseISOs2.xml:208
+#, fuzzy
 msgid ""
-"Both checksums are hexadecimal numbers calculated by an algorithm from the "
-"file to be downloaded. When you ask these algorithms to recalculate this "
-"number from your downloaded file, either you have the same number and your "
-"downloaded file is correct, or the number is different and you have a "
-"failure. A failure infers that you should retry the download or attempt a "
-"repair using BitTorrent."
+"The checksums referred to earlier, are digital fingerprints generated by an "
+"algorithm from the file to be downloaded. You may compare the checksum of "
+"your downloaded ISO against that of the original source ISO. If the "
+"checksums do not match, it means that the actual data on the ISO's do not "
+"match, and if it is the case, then you should retry the download or attempt "
+"a repair using BitTorrent."
 msgstr ""
 "Mõlemad kontrollsummad on kuueteistkümnendarvud, mis arvutatakse kindla "
 "algoritmiga allalaaditava faili põhjal. Kui paluda algoritmil arv uuesti "
@@ -3628,68 +3718,83 @@ msgstr ""
 "laadida või püüda see BitTorrenti abil parandada."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:213
-msgid "Open a console, no need to be root, and:"
+#: en/SelectAndUseISOs2.xml:214
+#, fuzzy
+msgid ""
+"To generate the checksum for your downloaded ISO, open a console, (no need "
+"to be root), and:"
 msgstr "Avage konsool (selleks ei pea olema administraator) ja kirjutage:"
 
-#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:214
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:218
+#, fuzzy
 msgid ""
-"- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
-"file.iso</userinput>."
+"To use md5sum, type: <userinput>md5sum path/to/the/image/file.iso</"
+"userinput>."
 msgstr ""
 "- md5sum kasutamiseks: [minukonto@localhost]$ <userinput>md5sum tõmmisefail."
 "iso/asukoht</userinput>."
 
-#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:216
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:222
+#, fuzzy
 msgid ""
-"- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
-"image/file.iso</userinput>."
+"To use sha1sum, type: <userinput>sha1sum path/to/the/image/file.iso</"
+"userinput>"
 msgstr ""
 "- sha1sum kasutamiseks: [minukonto@localhost]$ <userinput>sha1sum "
 "tõmmisefail.iso/asukoht</userinput>."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:218
-msgid ""
-"and compare the obtained number on your computer (you may have to wait for a "
-"while) with the number given by Mageia. Example:"
+#: en/SelectAndUseISOs2.xml:226
+msgid "Example:"
 msgstr ""
-"ja võrrelge arvutis saadud arvu (võimalik, et peate natuke ootama) Mageia "
-"allalaadimissaidil näidatuga:"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:221
+#: en/SelectAndUseISOs2.xml:228
 msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
+#. type: Content of: <section><section><section><para>
+#: en/SelectAndUseISOs2.xml:232
+#, fuzzy
+msgid ""
+"and compare the result (you may have to wait for a while) with the checksum "
+"provided by Mageia."
+msgstr ""
+"ja võrrelge arvutis saadud arvu (võimalik, et peate natuke ootama) Mageia "
+"allalaadimissaidil näidatuga:"
+
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:229
+#: en/SelectAndUseISOs2.xml:237
 msgid "Burn or dump the ISO"
 msgstr "ISO kirjutamine"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:230
+#: en/SelectAndUseISOs2.xml:238
+#, fuzzy
 msgid ""
-"The checked ISO can now be burned to a CD or DVD or dumped to a USB stick. "
-"These operations are not a simple copy and aim to make a bootable medium."
+"The verified ISO can now be burned to a CD/DVD or dumped to a USB stick. "
+"This is not a standard copy operation as a bootable medium will actually be "
+"created."
 msgstr ""
 "Kontrollitud ISO võib nüüd kirjutada CD-le, DVD-le või USB-pulgale. See ei "
 "ole tavaline kopeerimine, vaid eesmärk on luua käivitatav andmekandja."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:234
+#: en/SelectAndUseISOs2.xml:242
 msgid "Burning the ISO to a CD/DVD"
 msgstr "ISO kirjutamine CD-le või DVD-le"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:235
+#: en/SelectAndUseISOs2.xml:243
+#, fuzzy
 msgid ""
-"Use whatever burner you wish but ensure the burning device is set correctly "
-"to <emphasis role=\"bold\">burn an image</emphasis>, burn data or files is "
-"not correct. There is more information in <link ns4:href=\"https://wiki."
-"mageia.org/en/Writing_CD_and_DVD_images\">the Mageia wiki</link>."
+"Whichever software you use, ensure that the option to burn an<emphasis role="
+"\"bold\"> image</emphasis> is used, burn <emphasis role=\"bold\">data</"
+"emphasis> or <emphasis role=\"bold\">files</emphasis> is not correct. Seen "
+"the <link ns4:href=\"https://wiki.mageia.org/en/Writing_CD_and_DVD_images"
+"\">the Mageia wiki</link> for more information."
 msgstr ""
 "Kasutage soovikohast kirjutamisprogrammi, aga kontrollige kindlasti, et "
 "seade oleks määratud <emphasis role=\"bold\">kirjutama tõmmist</emphasis>, "
@@ -3697,12 +3802,12 @@ msgstr ""
 "wiki.mageia.org/en/Writing_CD_and_DVD_images\">Mageia wikist</link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:241
+#: en/SelectAndUseISOs2.xml:248
 msgid "Dump the ISO to a USB stick"
 msgstr "ISO kirjutamine USB-pulgale"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:249
 msgid ""
 "All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick "
 "and then use it to boot and install the system."
@@ -3711,18 +3816,19 @@ msgstr ""
 "pulgale, mis on käivitatav ja mille pealt saab süsteemi paigaldada."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:245
+#: en/SelectAndUseISOs2.xml:252
+#, fuzzy
 msgid ""
 "\"Dumping\" an image onto a flash device destroys any previous file-system "
-"on the device; any other data will be lost and the partition capacity will "
-"be reduced to the image size."
+"on the device; any existing data will be lost and the partition capacity "
+"will be reduced to the image size."
 msgstr ""
 "Tõmmise kirjutamine USB-pulgale hävitab kõik varasemad failisüsteemid "
 "seadmes, kõik andmed lähevad kaotsi ja partitsiooni suurus väheneb tõmmise "
 "suurusele."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:249
+#: en/SelectAndUseISOs2.xml:256
 msgid ""
 "To recover the original capacity, you must redo partitioning and re-format "
 "the USB stick."
@@ -3730,12 +3836,12 @@ msgstr ""
 "Algse mahu taastamiseks tuleb USB-pulk uuesti partitsioneerida ja vormindada."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:252
+#: en/SelectAndUseISOs2.xml:259
 msgid "Using a graphical tool within Mageia"
 msgstr "Graafilise tööriista kasutamine Mageias"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:253
+#: en/SelectAndUseISOs2.xml:260
 msgid ""
 "You can use a graphical tool like <link ns4:href=\"https://wiki.mageia.org/"
 "en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
@@ -3745,73 +3851,72 @@ msgstr ""
 "link>."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:256
+#: en/SelectAndUseISOs2.xml:263
 msgid "Using a graphical tool within Windows"
 msgstr "Graafilise tööriista kasutamine Windowsis"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:257
+#: en/SelectAndUseISOs2.xml:264
 msgid "You could try:"
 msgstr "Võite proovida järgmisi programme:"
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:258
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:267
+#, fuzzy
 msgid ""
-"- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
-"the \"ISO image\" option;"
+"<link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using the "
+"\"ISO image\" option;"
 msgstr ""
 "- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> "
 "valikuga \"ISO image\";"
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:260
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:271
+#, fuzzy
 msgid ""
-"- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
+"<link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
 msgstr ""
 "- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:277
 msgid "Using Command line within a GNU/Linux system"
 msgstr "Käsurea kasutamine GNU/Linuxi süsteemis"
 
 #. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:266
+#: en/SelectAndUseISOs2.xml:279
+#, fuzzy
 msgid ""
-"It is potentially *dangerous* to do this by hand. You risk to overwrite a "
-"disc partition if you get the device-ID wrong."
+"It is potentially *dangerous* to do this by hand. You risk overwriting "
+"potentially valuable existing data if you specify the wrong target device."
 msgstr ""
 "Käsitsi toimetamine on potentsiaalselt *ohtlik*. Kui seadme ID valesti anda, "
 "võib ketta partitsiooni sootuks üle kirjutada."
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:269
-msgid "You can also use the dd tool in a console:"
-msgstr "Samuti võib kasutada konsoolis tööriista dd:"
-
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:272
+#: en/SelectAndUseISOs2.xml:285
 msgid "Open a console"
 msgstr "Avage konsool"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:275
+#: en/SelectAndUseISOs2.xml:288
+#, fuzzy
 msgid ""
-"Become root with the command <userinput>su -</userinput> (don't forget the "
-"final '-' )"
+"Become a root (Administrator) user with the command <userinput>su -</"
+"userinput> (don't forget the final '-' )"
 msgstr ""
 "Võtke administraatori õigused käsuga <userinput>su -</userinput> (ärge "
 "unustage kriipsukest lõpus)"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:278
+#: en/SelectAndUseISOs2.xml:291
 msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:284
+#: en/SelectAndUseISOs2.xml:297
 msgid ""
 "Plug in your USB stick (do not mount it, this also means do not open any "
 "application or file manager that could access or read it)"
@@ -3820,28 +3925,40 @@ msgstr ""
 "rakendust või failihaldurit, mis seda lugeda võiks)"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:289
+#: en/SelectAndUseISOs2.xml:302
 msgid "Enter the command <userinput>fdisk -l</userinput>"
 msgstr "Sisestage käsk <userinput>fdisk -l</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:291
+#: en/SelectAndUseISOs2.xml:304
 msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:295
+#: en/SelectAndUseISOs2.xml:310
+#, fuzzy
 msgid ""
-"Alternatively, you can get the device name with the command <code>dmesg</"
-"code>: at end, you see the device name starting with <emphasis>sd</"
-"emphasis>, and <emphasis>sdd</emphasis> in this case:"
+"Find the device name for your USB stick (by its size), for example <code>/"
+"dev/sdb</code> in the screenshot above, it is an 8GB USB stick."
+msgstr ""
+"Leidke oma USB-pulga seadmenimi (suuruse järgi); näiteks toodud pildil on "
+"selleks <code>/dev/sdb</code>, mis on 8 GB suurune USB-pulk."
+
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:312
+#, fuzzy
+msgid ""
+"Alternatively, you can find the device name with the command <code>dmesg</"
+"code>: towards the end of this example, you can see the device name starting "
+"with <emphasis>sd</emphasis>, and in this case, <emphasis> sdd</emphasis> is "
+"the actual device. You can also see thaat its size is 2GB:"
 msgstr ""
 "Teine võimalus on leida seadme nimi käsuga <code>dmesg</code>: lõpus näeb "
 "seadme nime, mille alguses seisab <emphasis>sd</emphasis>, antud juhul "
 "<emphasis>sdd</emphasis>:"
 
-#. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:299
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para><screen>
+#: en/SelectAndUseISOs2.xml:317
 #, no-wrap
 msgid ""
 "[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3883,46 +4000,55 @@ msgstr ""
 "[72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:319
-msgid ""
-"Find the device name for your USB stick (by its size), for example <code>/"
-"dev/sdb</code> in the screenshot above, it is a 8GB USB stick."
-msgstr ""
-"Leidke oma USB-pulga seadmenimi (suuruse järgi); näiteks toodud pildil on "
-"selleks <code>/dev/sdb</code>, mis on 8 GB suurune USB-pulk."
+#: en/SelectAndUseISOs2.xml:317
+#, fuzzy
+msgid "<placeholder type=\"screen\" id=\"0\"/>"
+msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:324
+#: en/SelectAndUseISOs2.xml:337
+#, fuzzy
 msgid ""
-"Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
-"bs=1M</userinput>"
+"Enter the command: <emphasis role=\"bold\"># <userinput>dd if=path/to/the/"
+"ISO/file of=/dev/sdX bs=1M</userinput></emphasis>"
 msgstr ""
 "Sisestage käsk # <userinput>dd if=ISO-faili/asukoht of=/dev/sdX bs=1M</"
 "userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:326
-msgid "Where X=your device name eg: /dev/sdc"
+#: en/SelectAndUseISOs2.xml:340
+#, fuzzy
+msgid "Where X=your device name eg: /dev/sdd"
 msgstr "kus X on teie seadme nimi, nt: /dev/sdc"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:327
+#: en/SelectAndUseISOs2.xml:341
+#, fuzzy
 msgid ""
-"Example: # <userinput>dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso of=/"
-"dev/sdb bs=1M</userinput>"
+"Example:<emphasis role=\"bold\"> # <userinput>dd if=/home/user/Downloads/"
+"Mageia-6-x86_64-DVD.iso of=/dev/sdd bs=1M</userinput></emphasis>"
 msgstr ""
 "Näide: # <userinput>dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso of=/"
 "dev/sdb bs=1M</userinput>"
 
+#. type: Content of: <section><section><section><section><orderedlist><listitem><tip><para>
+#: en/SelectAndUseISOs2.xml:345
+msgid ""
+"It might helpful to know that <emphasis role=\"bold\">if</emphasis> stands "
+"for <emphasis role=\"bold\">i</emphasis>nput <emphasis role=\"bold\">f</"
+"emphasis>ile and <emphasis role=\"bold\">of</emphasis> stands for <emphasis "
+"role=\"bold\">o</emphasis>utput <emphasis role=\"bold\">f</emphasis>ile"
+msgstr ""
+
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:330
+#: en/SelectAndUseISOs2.xml:349
 msgid "Enter the command: # <userinput>sync</userinput>"
 msgstr "Sisestage käsk: # <userinput>sync</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:333
-msgid "Unplug your USB stick, it is done"
-msgstr "Eemaldage USB-pulk, kõik on valmis"
+#: en/SelectAndUseISOs2.xml:352
+msgid "This is the end of the process, and you may now unplug your USB stick."
+msgstr ""
 
 #. type: Content of: <section><info><title>
 #: en/selectCountry.xml:3
@@ -3952,19 +4078,21 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/selectCountry.xml:19
+#, fuzzy
 msgid ""
 "If your country isn't in the list, click the <guilabel>Other Countries</"
-"guilabel> button and choose your country / region there."
+"guilabel> option and choose your country / region there."
 msgstr ""
 "Kui teie riiki nimekirjas pole, klõpsake nupule <guilabel>Muud valikud</"
 "guilabel> ja valige oma riik / piirkond sealt."
 
 #. type: Content of: <section><note><para>
 #: en/selectCountry.xml:24
+#, fuzzy
 msgid ""
 "If your country is only in the <guilabel>Other Countries</guilabel> list, "
-"after clicking <guibutton>OK</guibutton> it may seem a country from the "
-"first list was chosen. Please ignore this, DrakX will follow your real "
+"after clicking <guibutton>OK</guibutton> it may seem that a country from the "
+"first list was chosen. Please ignore this, as DrakX will apply your actual "
 "choice."
 msgstr ""
 "Kui teie riik esineb ainult <guilabel>muude valikute</guilabel> nimekirjas, "
@@ -3973,18 +4101,19 @@ msgstr ""
 "arvestab teie tegeliku valikuga."
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:32
+#: en/selectCountry.xml:33
 msgid "Input method"
 msgstr "Sisestusmeetod"
 
 #. type: Content of: <section><section><para>
-#: en/selectCountry.xml:35
+#: en/selectCountry.xml:36
+#, fuzzy
 msgid ""
 "In the <guilabel>Other Countries</guilabel> screen you can also select an "
 "input method (at the bottom of the list). Input methods allow users to input "
 "multilingual characters (Chinese, Japanese, Korean, etc). IBus is the "
 "default input method, so users should not need to configure it manually. "
-"Other input methods(SCIM, GCIN, HIME, etc) also provide similar functions "
+"Other input methods (SCIM, GCIN, HIME, etc) also provide similar functions "
 "and can be installed if you added HTTP/FTP media before package selection."
 msgstr ""
 "<guilabel>Muude riikide</guilabel> ekraanil saab ka valida sisestusmeetodi "
@@ -3995,67 +4124,67 @@ msgstr ""
 "neid saab paigaldada, kui lisada enne paketivalikut HTTP või FTP andmekandja."
 
 #. type: Content of: <section><section><note><para>
-#: en/selectCountry.xml:44
+#: en/selectCountry.xml:45
+#, fuzzy
 msgid ""
 "If you missed the input method setup during installation, you can access it "
-"after you boot your installed system via \"Configure your Computer\" -> "
-"\"System\", or by running localedrake as root."
+"after you boot your installed system via <emphasis role=\"bold\">Configure "
+"your Computer</emphasis> -> <emphasis role=\"bold\">System</emphasis>, or by "
+"running localedrake as root."
 msgstr ""
 "Kui jätsite paigaldamise ajal sisestusmeetodi valimata, saab seda teha "
 "pärast paigaldatud süsteemi laadimist, valides \"Arvuti seadistamine\" -> "
 "\"Süsteem\" või käivitades administraatorina localedrake'i."
 
 #. type: Content of: <section><info><title>
-#: en/selectInstallClass.xml:21
+#: en/selectInstallClass.xml:14
 msgid "Install or Upgrade"
 msgstr "Paigaldamine või uuendamine"
 
 #. type: Content of: <section><mediaobject>
-#: en/selectInstallClass.xml:25
+#: en/selectInstallClass.xml:18
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
-"\"center\" format=\"PNG\"></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" align=\"center\" fileref=\"dx2-"
+"selectInstallClass.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
-"\"center\" format=\"PNG\"></imagedata> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:32
+#: en/selectInstallClass.xml:25
 msgid "Install"
 msgstr "Paigaldamine"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:34
+#: en/selectInstallClass.xml:27
 msgid ""
-"Use this option for a fresh <application>Mageia</application> installation."
+"Use this option to perform a fresh installation of <application>Mageia</"
+"application>. This will format the root partition (/), but can preserve a "
+"separated /home partition."
 msgstr ""
-"Selle valimisel saab ette võtta uue <application>Mageia</application> "
-"paigaldamise."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:39
+#: en/selectInstallClass.xml:33
 msgid "Upgrade"
 msgstr "Uuendamine"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:41
+#: en/selectInstallClass.xml:35
 msgid ""
-"If you have one or more <application>Mageia</application> installations on "
-"your system, the installer will allow you to upgrade one of them to the "
-"latest release."
+"This can be used to upgrade an existing installation of <application>Mageia</"
+"application>."
 msgstr ""
-"Kui teie süsteemi on juba varem paigaldatud <application>Mageia</"
-"application>, võimaldab paigaldusprogramm seda uusimale väljalaskele "
-"uuendada."
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/selectInstallClass.xml:45
+#: en/selectInstallClass.xml:39
+#, fuzzy
 msgid ""
 "Only upgrading from a previous Mageia version that was <emphasis>still "
 "supported</emphasis> when this installer's version was released, has been "
-"thoroughly tested. If you want to upgrade a Mageia version that had already "
-"reached its End\tOf Life when this one was released, then it is better to do "
-"a clean install while preserving your <literal>/home</literal> partition."
+"thoroughly tested. If you want to upgrade a Mageia version that has reached "
+"its End Of Life, then it is better to do a clean install instead while "
+"preserving your <literal>/home</literal> partition."
 msgstr ""
 "Põhjalikult testitud on uuendamine ainult selliselt varasemalt Mageia "
 "versioonilt, mis oli <emphasis>veel toetatud</emphasis> ajal, mil ilmus "
@@ -4066,16 +4195,17 @@ msgstr ""
 "literal>-partitsioon)."
 
 #. type: Content of: <section><note><para>
-#: en/selectInstallClass.xml:56
+#: en/selectInstallClass.xml:50
+#, fuzzy
 msgid ""
 "If during install you decide to stop the installation, it is possible to "
 "reboot, but please think twice before you do this. Once a partition has been "
 "formatted or updates have started to be installed, your computer isn't in "
 "the same state anymore and rebooting it could very well leave you with an "
-"unusable system. If in spite of that you are very sure rebooting is what you "
-"want, go to a text terminal by pressing the three keys <guilabel>Alt Ctrl "
-"F2</guilabel> at the same time. After that, press <guilabel>Alt Ctrl Delete</"
-"guilabel> simultaneously to reboot."
+"unusable system. If in spite of that, and only if you are very sure "
+"rebooting is what you want, go to a text terminal by pressing <guilabel>Alt "
+"Ctrl F2</guilabel> simultaneously. After that, press <guilabel>Alt Ctrl "
+"Delete</guilabel> simultaneously to reboot."
 msgstr ""
 "Kui soovite mingil hetkel paigaldamise katkestada, võite ka teha arvutile "
 "taaskäivituse, aga palun mõelge enne seda hoolikalt järele. Kui partitsioon "
@@ -4087,12 +4217,14 @@ msgstr ""
 "<guibutton>Alt Ctrl Delete</guibutton>"
 
 #. type: Content of: <section><tip><para>
-#: en/selectInstallClass.xml:67
+#: en/selectInstallClass.xml:62
+#, fuzzy
 msgid ""
 "If you have discovered that you forgot to select an additional language, you "
-"can return from the \"Install or Upgrade\" screen to the language choice "
-"screen by pressing <guilabel>Alt Ctrl Home</guilabel>. Do <emphasis>not</"
-"emphasis> do this later in the install."
+"can return from the <emphasis role=\"bold\">Install or Upgrade</emphasis> "
+"screen to the language choice screen by pressing <guilabel>Alt Ctrl Home</"
+"guilabel> simultaneously. <emphasis role=\"bold\">Do not</emphasis> do this "
+"later in the install."
 msgstr ""
 "Kui avastate, et olete unustanud mõne keele lisada, saab \"Paigaldamise või "
 "uuendamise\" ekraanilt naasta keelevaliku juurde, vajutades korraga klahve "
@@ -4126,12 +4258,12 @@ msgstr ""
 "Vaikimisi valitu vastab keelele ja ajavööndile, mille varem valisite."
 
 #. type: Content of: <section><info><title>
-#: en/selectKeyboard.xml:14
+#: en/selectKeyboard.xml:7
 msgid "Keyboard"
 msgstr "Klaviatuur"
 
 #. type: Content of: <section><para>
-#: en/selectKeyboard.xml:17
+#: en/selectKeyboard.xml:10
 msgid ""
 "DrakX selects an appropriate keyboard for your language. If no suitable "
 "keyboard is found it will default to a US keyboard layout."
@@ -4140,16 +4272,17 @@ msgstr ""
 "leita, kasutatakse vaikimisi US klaviatuuripaigutust."
 
 #. type: Content of: <section><mediaobject>
-#: en/selectKeyboard.xml:22
+#: en/selectKeyboard.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
-"\" /> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\"/"
+"> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
-"\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+"align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:30
+#: en/selectKeyboard.xml:22
 msgid ""
 "Make sure that the selection is correct or choose another keyboard layout. "
 "If you don't know which layout your keyboard has, look in the specifications "
@@ -4166,22 +4299,24 @@ msgstr ""
 "Keyboard_layout\">en.wikipedia.org/wiki/Keyboard_layout</link>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:40
+#: en/selectKeyboard.xml:31
+#, fuzzy
 msgid ""
 "If your keyboard isn't in the list shown, click on <guibutton>More</"
-"guibutton> to get a full list, and select your keyboard there."
+"guibutton> to get a fuller list, and select your keyboard there."
 msgstr ""
 "Kui teie klaviatuuri nimekirjas ei ole, klõpsake täieliku loetelu nägemiseks "
 "<guibutton>Veel</guibutton> ja valige oma klaviatuur sealt."
 
 #. type: Content of: <section><itemizedlist><listitem><para><warning><para>
-#: en/selectKeyboard.xml:45
+#: en/selectKeyboard.xml:36
+#, fuzzy
 msgid ""
 "After choosing a keyboard from the <guibutton>More</guibutton> dialog, "
 "you'll return to the first keyboard choice dialog and it will seem as though "
-"a keyboard from that screen was chosen. You can safely ignore this anomaly "
-"and continue the installation: Your keyboard is the one you chose from the "
-"full list."
+"a keyboard from that screen was chosen. You can safely ignore this and "
+"continue the installation: the keyboard chosen from the full list will be "
+"applied."
 msgstr ""
 "Olles valinud klaviatuuri pärast nupule <guibutton>Veel</guibutton> "
 "klõpsamist, võite esimese dialoogi juurde naastes näha, nagu oleks valitud "
@@ -4189,23 +4324,24 @@ msgstr ""
 "ikkagi seda, millise klaviatuuri te tegelikult täisnimekirjas olete valinud."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:55
+#: en/selectKeyboard.xml:46
+#, fuzzy
 msgid ""
 "If you choose a keyboard based on non-Latin characters, you will see an "
-"extra dialog screen asking how you would prefer to switch between the Latin "
-"and non-Latin keyboard layouts"
+"extra dialogue screen asking how you would prefer to switch between the "
+"Latin and non-Latin keyboard layouts"
 msgstr ""
 "Kui valite klaviatuuri, mis ei kasuta ladina tähti, näete lisadialoogi, mis "
 "palub määrata, kuidas eelistate lülituda ladina ja mitteladina "
 "klaviatuuripaigutuste vahel."
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:10
+#: en/selectLanguage.xml:15
 msgid "Please choose a language to use"
 msgstr "Kasutatava keele valimine"
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:12
+#: en/selectLanguage.xml:18
 msgid ""
 "Select your preferred language, by first expanding the list for your "
 "continent. <application>Mageia</application> will use this selection during "
@@ -4216,7 +4352,7 @@ msgstr ""
 "paigaldamise ajal kui ka paigaldatud süsteemis."
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:16
+#: en/selectLanguage.xml:23
 msgid ""
 "Select your preferred language.  <application>Mageia</application> will use "
 "this selection during the installation and for your installed system."
@@ -4225,12 +4361,13 @@ msgstr ""
 "valikut nii paigaldamise ajal kui ka paigaldatud süsteemis."
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:19
+#: en/selectLanguage.xml:27
+#, fuzzy
 msgid ""
-"If it is likely that you will require several languages installed on your "
-"system, for yourself or other users, then you should use the "
-"<guibutton>Multiple languages</guibutton> button to add them now. It will be "
-"difficult to add extra language support after installation."
+"If it is likely that you (or others) will require several languages to be "
+"installed on your system, then you should use the <guibutton>Multiple "
+"languages</guibutton> option to add them now. It will be difficult to add "
+"extra language support after installation."
 msgstr ""
 "Kui teie süsteemi tuleks paigaldada mitu keelt kas teie enda või teiste "
 "kasutajate tarbeks, siis tuleks nupule <guibutton>Mitme keele valimine</"
@@ -4238,7 +4375,7 @@ msgstr ""
 "keelte lisamine juba palju keerulisem."
 
 #. type: Content of: <section><mediaobject>
-#: en/selectLanguage.xml:25
+#: en/selectLanguage.xml:33
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
 "\"dx2-selectLanguage.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -4251,17 +4388,18 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/selectLanguage.xml:33
+#: en/selectLanguage.xml:43
+#, fuzzy
 msgid ""
-"Even if you choose more than one language, you must first choose one of them "
-"as your preferred language in the first language screen. It will also be "
-"marked as chosen in the multiple languages screen ."
+"Even if you choose more than one language, you must first choose one as your "
+"preferred language in the first language screen. It will also be marked as "
+"chosen in the multiple languages screen ."
 msgstr ""
 "Isegi kui paigaldate mitu keelt, tuleb üks neist valida esimesel ekraanil "
 "eelistatud keeleks. See keel on märgitud ka mitme keele valimise ekraanil."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:39
+#: en/selectLanguage.xml:50
 msgid ""
 "If your keyboard language is not the same as your preferred language, then "
 "it is advisable to install the language of your keyboard as well."
@@ -4270,23 +4408,24 @@ msgstr ""
 "paigaldada kohe ka klaviatuurile vastav keel."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:44
+#: en/selectLanguage.xml:56
 msgid "Mageia uses UTF-8 (Unicode) support by default."
 msgstr "Mageia toetab vaikimisi UTF-8 (Unicode)."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:45
+#: en/selectLanguage.xml:58
+#, fuzzy
 msgid ""
-"This may be disabled in the \"multiple languages\" screen if you know that "
-"it is inappropriate for your language. Disabling UTF-8 applies to all "
-"installed languages."
+"This may be disabled in the <emphasis role=\"bold\">Multiple languages</"
+"emphasis> screen if you know that it is inappropriate for your language. "
+"Disabling UTF-8 applies to all installed languages."
 msgstr ""
 "Selle võib keelata \"mitme keele valimise\" ekraanil, kui olete kindel, et "
 "see teie keelele kohe üldse ei sobi. UTF-8 keelamine rakendub kõigile "
 "paigaldatavatele keeltele."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:50
+#: en/selectLanguage.xml:64
 msgid ""
 "You can change the language of your system after installation in the Mageia "
 "Control Center -> System -> Manage localization for your system."
@@ -4338,69 +4477,74 @@ msgstr ""
 "et seadistada nuppe, mis peaksid töötama kuue või rohkema nupuga hiirel."
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:6
+#: en/setupBootloaderAddEntry.xml:7
 msgid "Add or Modify a Boot Menu Entry"
 msgstr "Alglaadimismenüü kirje lisamine või muutmine"
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:9
+#: en/setupBootloaderAddEntry.xml:11
+#, fuzzy
 msgid ""
-"To do that you need to manually edit /boot/grub2/custom.cfg or use the "
-"software grub-customizer instead (Available in the Mageia repositories)."
+"To do this you need to manually edit /boot/grub2/custom.cfg or use the "
+"software <emphasis role=\"bold\">grub-customizer</emphasis> tool instead "
+"(available in the Mageia repositories)."
 msgstr ""
 "Selleks tuleb käsitsi muuta faili /boot/grub2/custom.cfg või kasutada "
 "rakendust grub-customizer (selle leiab Mageia tarkvarahoidlast)."
 
 #. type: Content of: <section><note><para>
-#: en/setupBootloaderAddEntry.xml:13
+#: en/setupBootloaderAddEntry.xml:16
+#, fuzzy
 msgid ""
-"For more information, see our wiki: <link ns2:href=\"https://wiki.mageia.org/"
-"en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</"
-"link>"
+"For more information, see: <link ns2:href=\"https://wiki.mageia.org/en/Grub2-"
+"efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link>"
 msgstr ""
 "Täpsemat teavet annab meie wiki: <link ns2:href=\"https://wiki.mageia.org/en/"
 "Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link>"
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:9
+#: en/setupBootloader.xml:7
 msgid "Bootloader main options"
 msgstr "Alglaaduri põhiseadistused"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:13
+#: en/setupBootloader.xml:10
 msgid "Bootloader interface"
 msgstr "Alglaaduri liides"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:15
+#: en/setupBootloader.xml:11
 msgid "By default, Mageia uses exclusively:"
 msgstr "Vaikimisi kasutab Mageia üht kahest võimalusest:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:19
+#: en/setupBootloader.xml:14
+#, fuzzy
 msgid ""
-"Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
+"GRUB2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
 msgstr ""
 "Grub2 (graafilise menüüga või ilma selleta) pärand/MBR või pärand/GPT "
 "süsteemi korral"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:24
-msgid "Grub2-efi for a UEFI system."
+#: en/setupBootloader.xml:18
+#, fuzzy
+msgid "GRUB2-efi for a UEFI system."
 msgstr "Grub2-efi UEFI süsteemi korral"
 
 #. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:29
+#: en/setupBootloader.xml:22
 msgid "The Mageia graphical menus are nice :)"
 msgstr "Mageia graafiline menüü näeb kena välja :)"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:33
-msgid "Grub2 on Legacy/MBR and Legacy/GPT systems"
+#: en/setupBootloader.xml:25
+#, fuzzy
+msgid "GRUB2 on Legacy/MBR and Legacy/GPT systems"
 msgstr "Grub2 pärand/MBR ja pärand/GPT süsteemis"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:36
+#: en/setupBootloader.xml:27
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -4413,29 +4557,34 @@ msgstr ""
 "setupBootloader.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:45 en/setupBootloader.xml:73
+#: en/setupBootloader.xml:34 en/setupBootloader.xml:56
+#, fuzzy
 msgid ""
-"Don't modify the \"Boot Device\" unless you really know what you are doing."
+"Don't modify the <emphasis role=\"bold\">Boot Device</emphasis> unless you "
+"really know what you are doing."
 msgstr ""
 "Ärge muutke \"Alglaadimisseadet\", kui te pole täiesti kindel, et teate, "
 "mida teete."
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:50
-msgid "Grub2-efi on UEFI systems"
+#: en/setupBootloader.xml:38
+#, fuzzy
+msgid "GRUB2-efi on UEFI systems"
 msgstr "Grub2-efi UEFI süsteemis"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:52
+#: en/setupBootloader.xml:39
+#, fuzzy
 msgid ""
-"With an UEFI system, the user interface is slightly different as you cannot "
-"choose between with or without graphical menu"
+"With a UEFI system, the user interface is slightly different as you cannot "
+"choose between the <emphasis role=\"bold\">with</emphasis> or <emphasis role="
+"\"bold\">without graphical menu</emphasis> options."
 msgstr ""
 "UEFI süsteemi korral on kasutajaliides pisut teistsugune, sest te ei saa "
 "valida graafilise menüü kasutamist või kasutamata jätmist."
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:56
+#: en/setupBootloader.xml:42
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -4448,14 +4597,15 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:65
+#: en/setupBootloader.xml:49
+#, fuzzy
 msgid ""
 "If Mageia is the only system installed on your computer, the installer "
-"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
+"created an ESP (EFI System Partition) to house the bootloader (GRUB2-efi). "
 "If there are already UEFI operating systems installed on your computer "
 "(Windows 8 for example), the Mageia installer detects the existing ESP "
-"created by Windows and adds grub2-efi. Although it is possible to have "
-"several ESPs, only one is advised and enough whatever the number of "
+"created by Windows and adds GRUB2-efi. Although it is possible to have "
+"several ESPs, only one is required (and advised), whatever the number of "
 "operating systems you have."
 msgstr ""
 "Kui Mageia on ainuke süsteem, mis on teie arvutisse paigaldatud, loob "
@@ -4467,36 +4617,41 @@ msgstr ""
 "palju on arvutis operatsioonisüsteeme."
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:79
+#: en/setupBootloader.xml:61
 msgid "Using a Mageia bootloader"
 msgstr "Mageia alglaaduri kasutamine"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:81
-msgid "By default, according to your system, Mageia writes a new:"
+#: en/setupBootloader.xml:62
+#, fuzzy
+msgid ""
+"By default, and according to your system, Mageia writes one of the following:"
 msgstr "Vaikimisi kirjutab Mageia sõltuvalt süsteemist uue:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:85
+#: en/setupBootloader.xml:66
+#, fuzzy
 msgid ""
-"GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard "
-"drive or in the BIOS boot partition."
+"a GRUB2 bootloader either into the MBR (Master Boot Record) of your first "
+"hard drive or in the BIOS boot partition."
 msgstr ""
 "Grub2 alglaaduri kas Teie esimese kõvaketta MBR-i (Master Boot Record) või "
 "BIOS-e alglaadepartisioonile"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:90
-msgid "Grub2-efi bootloader into the ESP"
+#: en/setupBootloader.xml:70
+#, fuzzy
+msgid "a GRUB2-efi bootloader into the ESP"
 msgstr "Grub2-efi alglaaduri ESP-le"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:94
+#: en/setupBootloader.xml:73
+#, 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, "
-"click on <guibutton>Next</guibutton> and then uncheck the box "
-"<guilabel>Probe Foreign OS</guilabel>"
+"click on <guibutton>Next</guibutton> and then untick the <emphasis role="
+"\"bold\">Probe Foreign OS </emphasis>option"
 msgstr ""
 "Kui arvutisse peaks olema paigaldatud teisigi operatsioonisüsteeme, püüab "
 "Mageia lisada need oma alglaadimismenüüsse. Kui Te seda ei soovi, klõpsake "
@@ -4504,7 +4659,7 @@ msgstr ""
 "<guilabel>Võõraste operatsioonisüsteemide otsimine</guilabel>"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:100
+#: en/setupBootloader.xml:78
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -4517,18 +4672,19 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:111
+#: en/setupBootloader.xml:87
 msgid "Using an existing bootloader"
 msgstr "Olemasoleva alglaaduri kasutamine"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:113
+#: en/setupBootloader.xml:88
+#, fuzzy
 msgid ""
 "The exact procedure for adding your Mageia system to an existing bootloader "
-"is beyond the scope of this help, however in most cases it will involve "
-"running the relevant bootloader installation program which should detect and "
-"add it automatically. See the documentation for the operating system in "
-"question."
+"is beyond the scope of this documentation, however in most cases it will "
+"involve running the relevant bootloader installation program which should "
+"detect and add it automatically. See the documentation for the operating "
+"system in question."
 msgstr ""
 "Täpne protseduur, kuidas lisada Mageia süsteem olemasolevale alglaadurile, "
 "väljub käesoleva abiteksti raamest, kuid enamasti tähendab see asjakohase "
@@ -4537,16 +4693,17 @@ msgstr ""
 "dokumentatsiooni."
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:121
+#: en/setupBootloader.xml:95
 msgid "Using chain loading"
 msgstr "Ahellaadimise kasutamine"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:123
+#: en/setupBootloader.xml:96
+#, fuzzy
 msgid ""
-"If you don't want a bootable Mageia, but to chain load it from another OS, "
+"If you don't want a bootable Mageia, but to chain-load it from another OS, "
 "click on <guibutton>Next</guibutton>, then on <guibutton>Advanced</"
-"guibutton> and Check the box <guilabel>Do not touch ESP or MBR</guilabel>."
+"guibutton> and tick the box <guilabel>Do not touch ESP or MBR</guilabel>."
 msgstr ""
 "Kui Te ei soovi alglaaditavat Mageiat, vaid tahate seda laadida mõnest "
 "teisest operatsioonisüsteemist, siis klõpsake <guibutton>Järgmine</"
@@ -4554,7 +4711,7 @@ msgstr ""
 "<guilabel>ESP-i ega MBR-i ei puudutata</guilabel>."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:129
+#: en/setupBootloader.xml:101
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -4567,7 +4724,7 @@ msgstr ""
 "\"center\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:138
+#: en/setupBootloader.xml:108
 msgid ""
 "You will get a warning that the bootloader is missing, ignore it by clicking "
 "<guibutton>OK</guibutton>."
@@ -4576,7 +4733,7 @@ msgstr ""
 "<guibutton>Olgu</guibutton>."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:142
+#: en/setupBootloader.xml:111
 msgid ""
 "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
 "imageobject>"
@@ -4585,33 +4742,34 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:149
+#: en/setupBootloader.xml:117
 msgid "Options"
 msgstr "Valikud"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:152
+#: en/setupBootloader.xml:119
 msgid "First page"
 msgstr "Esimene kaart"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:156
+#: en/setupBootloader.xml:120
+#, fuzzy
 msgid ""
-"<guilabel>Delay before booting the default image</guilabel>: This text box "
-"lets you set a delay in seconds before the default operating system is "
-"started up."
+"<guilabel>Delay before booting the default image</guilabel>: This lets you "
+"set a delay in seconds before the default operating system is started up."
 msgstr ""
 "<guilabel>Ooteaeg alglaadimisel</guilabel>: selles kastis saab panna paika, "
 "kui mitu sekundit oodatakse, enne kui käivitatakse vaikimisi "
 "operatsioonisüsteem."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:162
+#: en/setupBootloader.xml:122
+#, fuzzy
 msgid ""
 "<guilabel>Security</guilabel>: This allows you to set a password for the "
-"bootloader. This means a username and password will be asked at the boot "
-"time to select a booting entry or change settings. The username is \"root\" "
-"and the password is the one chosen here after."
+"bootloader. This means a username and password will be required when booting "
+"to select a booting entry or change settings. The username is <emphasis role="
+"\"bold\">root</emphasis> and the password is the one chosen here-after."
 msgstr ""
 "<guilabel>Turvalisus</guilabel>: siin saab määrata alglaaduri parooli. "
 "Sellisel juhul küsitakse alglaadimise ajal kasutajanime ja parooli, kui "
@@ -4619,37 +4777,37 @@ msgstr ""
 "on \"root\", parooli saate siin ise määrata."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:170
-msgid ""
-"<guilabel>Password</guilabel>: This text box is where you actually put the "
-"password"
+#: en/setupBootloader.xml:125
+#, fuzzy
+msgid "<guilabel>Password</guilabel>: Choose a password for the bootloader."
 msgstr ""
 "<guilabel>Parool</guilabel>: selles kastis saab parooli kindlaks määrata."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:175
+#: en/setupBootloader.xml:126
+#, fuzzy
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
-"check that it matches with the one set above."
+"<guilabel>Password (again)</guilabel>: Retype the password and DrakX will "
+"check that it matches with the one above."
 msgstr ""
 "<guilabel>Parool (uuesti)</guilabel>: siia tuleb parool teist korda "
 "kirjutada, mille järel Drakx kontrollib, kas see ikka sobib kokku sellega, "
 "mille sisestasid esimesel korral."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:181 en/setupBootloader.xml:239
+#: en/setupBootloader.xml:127 en/setupBootloader.xml:159
 msgid "<guilabel>Advanced</guilabel>"
 msgstr "<guilabel>Edasijõudnuile</guilabel>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:185
+#: en/setupBootloader.xml:127
+#, fuzzy
 msgid ""
 "<guilabel>Enable ACPI:</guilabel> ACPI (Advanced Configuration and Power "
-"Interface) is a standard for the power management. It can save energy by "
-"stopping unused devices, this was the method used before APM. Unchecking it "
-"could be useful if, for example, your computer does not support ACPI or if "
-"you think the ACPI implementation might cause some problems (for instance "
-"random reboots or system lockups)."
+"Interface) is a standard for power management. It can save energy by "
+"stopping unused devices.  Deselecting it could be useful if, for example, "
+"your computer does not support ACPI or if you think the ACPI implementation "
+"might cause some problems (for instance random reboots or system lockups)."
 msgstr ""
 "<guilabel>ACPI lubamine:</guilabel> ACPI (täiustatud konfiguratsiooni- ja "
 "toiteliides) on toitehalduse standard. See võib säästa energiat, lülitades "
@@ -4659,21 +4817,22 @@ msgstr ""
 "taaskäivitusi või süsteemi hangumisi)."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:195
+#: en/setupBootloader.xml:133
+#, fuzzy
 msgid ""
-"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
+"<guilabel>Enable SMP</guilabel>: This option enables/disables symmetric "
 "multiprocessing for multi core processors."
 msgstr ""
 "<guilabel>SMP lubamine</guilabel>: see valik lülitab sisse või välja "
 "sümmeetrilise mitmiktöötluse mitme tuumaga protsessorite korral."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:201
+#: en/setupBootloader.xml:135
+#, fuzzy
 msgid ""
-"<guilabel>Enable APIC</guilabel>: Enabling or disabling this gives the "
-"operating system access to the Advanced Programmable Interrupt Controller. "
-"APIC devices permit more complex priority models, and Advanced IRQ "
-"(Interrupt Request)  management."
+"<guilabel>Enable APIC</guilabel>: This gives the operating system access to "
+"the Advanced Programmable Interrupt Controller. APIC devices permit more "
+"complex priority models, and Advanced IRQ (Interrupt Request) management."
 msgstr ""
 "<guilabel>APIC lubamine</guilabel>: selle lubamine või keelamine annab "
 "operatsioonisüsteemile või võtab sellelt ligipääsu täiustatud "
@@ -4682,28 +4841,29 @@ msgstr ""
 "(katkestusnõuded) haldamist."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:209
+#: en/setupBootloader.xml:138
+#, fuzzy
 msgid ""
-"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
-"manages all external interrupts for a specific processor in an SMP system."
+"<guilabel>Enable Local APIC</guilabel>: Local APIC manages all external "
+"interrupts for a specific processor in an SMP system."
 msgstr ""
 "<guilabel>Kohaliku APIC lubamine</guilabel>: siin saab lubada või keelata "
 "kohaliku APIC, mis haldab kõiki konkreetse protsessori väliseid katkestusi "
 "SMP-süsteemis."
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:219
+#: en/setupBootloader.xml:143
 msgid "Next page"
 msgstr "Järgmine kaart"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:223
+#: en/setupBootloader.xml:146
 msgid "<guilabel>Default:</guilabel> Operating system started up by default"
 msgstr ""
 "<guilabel>Vaikimisi:</guilabel> vaikimisi käivitatav operatsioonisüsteem."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:228
+#: en/setupBootloader.xml:150
 msgid ""
 "<guilabel>Append:</guilabel> This option lets you pass the kernel "
 "information or tell the kernel to give you more information as it boots."
@@ -4712,7 +4872,7 @@ msgstr ""
 "teavet või lasta kernelil alglaadimise ajal anda rohkem teavet."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:234
+#: en/setupBootloader.xml:155
 msgid ""
 "<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
 "\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
@@ -4722,18 +4882,19 @@ msgstr ""
 "link>."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:241
+#: en/setupBootloader.xml:159
+#, fuzzy
 msgid ""
 "<guilabel>Video mode:</guilabel> This sets the screen size and colour depth "
-"the boot menu will use. If you click the down triangle you will be offered "
-"other size and colour depth options."
+"to be used by the boot menu. If you click the down triangle you will be "
+"offered other size and colour depth options."
 msgstr ""
 "<guilabel>Videorežiim:</guilabel> siin saab määrata ekraani suuruse ja "
 "värvisügavuse, mida alglaadur kasutab. Allapoole kolmnurgale klõpsates saab "
 "vaiida muute suuruse ja värvisügavuse valikute seast."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:248
+#: en/setupBootloader.xml:162
 msgid ""
 "<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
 "linkend=\"setupChainLoading\">Using the chain loading</link>"
@@ -4742,7 +4903,7 @@ msgstr ""
 "osa <link linkend=\"setupChainLoading\">Ahellaadimise kasutamine</link>"
 
 #. type: Content of: <section><info><title>
-#: en/setupSCSI.xml:11
+#: en/setupSCSI.xml:3
 msgid "Setup SCSI"
 msgstr "SCSI seadistamine"
 
@@ -4755,36 +4916,39 @@ msgstr "SCSI seadistamine"
 #.  marja 2012-04-25 replacing John's version 1.6 because that one was based on the
 #.        Mdv doc instead of on our setupSCSI file 
 #. type: Content of: <section><mediaobject>
-#: en/setupSCSI.xml:26
+#: en/setupSCSI.xml:22
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" format="
-"\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-setupSCSI.png\" align="
+"\"center\" xml:id=\"setupSCSI-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-setupSCSI.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"setupSCSI-im1\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:32
+#: en/setupSCSI.xml:27
+#, fuzzy
 msgid ""
-"DrakX usually detects hard disks correctly. With some older SCSI controllers "
-"it may be unable to determine the correct drivers to use and subsequently "
-"fail to recognise the drive."
+"DrakX will normally detect hard disks correctly. However, with some older "
+"SCSI controllers it may be unable to determine the correct drivers to use "
+"and subsequently fail to recognise the drive."
 msgstr ""
 "DrakX tuvastab tavaliselt kõvakettad korrektselt. Mõne vanema SCSI "
 "kontrolleri korral aga ei suudeta korrektselt tuvastada vajalikku draiverit "
 "ja seetõttu ka ketast ära tunda."
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:36
+#: en/setupSCSI.xml:32
+#, fuzzy
 msgid ""
-"If this happens, you will need to manually tell Drakx which SCSI drive(s) "
+"If this happens, you will need to manually tell DrakX which SCSI drive(s) "
 "you have."
 msgstr ""
 "Kui nii peaks juhtuma, tuleb DrakX-ile käsitsi selgeks teha, millised SCSI "
 "seadmed teil on."
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:39
+#: en/setupSCSI.xml:35
 msgid "DrakX should then be able to configure the drive(s) correctly."
 msgstr "Seejärel peaks DrakX olema võimeline kettad korrektselt seadistama."
 
@@ -4805,10 +4969,10 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/soundConfig.xml:14
+#, fuzzy
 msgid ""
 "In this screen the name of the driver that the installer chose for your "
-"sound card is given, which will be the default driver if we have a default "
-"one."
+"sound card is given, which will be the default driver if one exists."
 msgstr ""
 "Siin näeb draiveri nime, mille paigaldusprogramm on välja valinud teie "
 "helikaardile ja millest saab vaikimisi draiver."
@@ -4830,10 +4994,12 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/soundConfig.xml:24
+#, fuzzy
 msgid ""
-"Then, in the draksound or \"Sound Configuration\" tool screen, click on "
-"<guibutton>Advanced</guibutton> and then on <guibutton>Troubleshooting</"
-"guibutton> to find very useful advice about how to solve the problem."
+"Then, in the <emphasis role=\"bold\">draksound</emphasis> or <emphasis role="
+"\"bold\">Sound Configuration</emphasis> tool screen, click on "
+"<guibutton>Troubleshooting</guibutton> to find useful advice about how to "
+"solve the problem."
 msgstr ""
 "Seejärel klõpsake draksoundi ehk \"Heli seadistamise\" tööriistas nupule "
 "<guibutton>Muud valikud</guibutton> ja seejärel nupule <guibutton>Probleemi "
@@ -4841,32 +5007,35 @@ msgstr ""
 "saada."
 
 #. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:31
+#: en/soundConfig.xml:30
 msgid "Advanced"
 msgstr "Muud valikud"
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:34
+#: en/soundConfig.xml:33
+#, fuzzy
 msgid ""
-"Clicking <guibutton>Advanced</guibutton> in this screen, during install, is "
-"useful if there is no default driver and there are several drivers "
-"available, but you think the installer selected the wrong one."
+"Clicking <emphasis role=\"bold\"><guibutton>Advanced</guibutton></emphasis> "
+"in this screen, during install, is useful if there is no default driver and "
+"there are several drivers available, but you think the installer selected "
+"the wrong one."
 msgstr ""
 "Klõpsamisest nupule <guibutton>Muud valikud</guibutton> võib paigaldamise "
 "ajal abi olla, kui vaikimisi draiverit ei ole, küll on aga saada mitu "
 "draiverit ning te arvate, et paigaldusprogramm on valinud neist vale."
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:39
+#: en/soundConfig.xml:38
+#, fuzzy
 msgid ""
-"In that case you can select a different driver after clicking on "
-"<guibutton>Let me pick any driver</guibutton>."
+"In that case you can select a different driver after clicking on <emphasis "
+"role=\"bold\"><guibutton>Let me pick any driver</guibutton></emphasis>."
 msgstr ""
 "Sellisel juhul saate valida mõne muu draiveri, kui klõpsate nupule "
 "<guibutton>Suvalise draiveri valimine</guibutton>."
 
 #. type: Content of: <section><info><title>
-#: en/takeOverHdConfirm.xml:4
+#: en/takeOverHdConfirm.xml:3
 msgid "Confirm hard disk to be formatted"
 msgstr "Kõvaketta vormindamise kinnitamine"
 
@@ -4877,13 +5046,13 @@ msgstr "Kõvaketta vormindamise kinnitamine"
 #.     saw this help screen when I had only one HD 
 #.  2013-05-05 marja added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/takeOverHdConfirm.xml:19
+#: en/takeOverHdConfirm.xml:18
+#, fuzzy
 msgid ""
-"<imageobject condition='live'> <imagedata fileref=\"live-takeOverHdConfirm."
-"png\" format=\"PNG\" align=\"center\" ></imagedata> </imageobject> "
-"<imageobject condition='classical'> <imagedata fileref=\"dx2-"
-"takeOverHdConfirm.png\" format=\"PNG\" align=\"center\" ></imagedata> </"
-"imageobject>"
+"<imageobject condition=\"live\"> <imagedata format=\"PNG\" fileref=\"live-"
+"takeOverHdConfirm.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"classical\"> <imagedata format=\"PNG\" fileref=\"dx2-"
+"takeOverHdConfirm.png\" align=\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='live'> <imagedata fileref=\"live-takeOverHdConfirm."
 "png\" format=\"PNG\" align=\"center\" ></imagedata> </imageobject> "
@@ -4893,17 +5062,20 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/takeOverHdConfirm.xml:27
+#, fuzzy
 msgid ""
-"Click on <guibutton>Previous</guibutton> if you are not sure about your "
+"Click on <guibutton>Previous</guibutton> if you are at all unsure about your "
 "choice."
 msgstr ""
 "Klõpsake <guibutton>Tagasi</guibutton>, kui te ei ole oma valikus kindel."
 
 #. type: Content of: <section><para>
-#: en/takeOverHdConfirm.xml:30
+#: en/takeOverHdConfirm.xml:31
+#, fuzzy
 msgid ""
-"Click on <guibutton>Next</guibutton> if you are sure and want to erase every "
-"partition, every operating system and all data on that hard disk."
+"Click on <guibutton>Next</guibutton> to proceed if you are sure that it is "
+"ok to erase every partition, every operating system and all data that might "
+"be on that hard disk."
 msgstr ""
 "Klõpsake <guibutton>Edasi</guibutton>, kui olete kindel ning soovite "
 "kustutada kõvakettal kõik partitsioonid, kõik operatsioonisüsteemid ja üldse "
@@ -5028,16 +5200,12 @@ msgstr ""
 msgid "Uninstalling Mageia"
 msgstr "Mageia eemaldamine"
 
-#. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:10
-msgid "Howto"
-msgstr "Õpetus"
-
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:12
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:9
+#, fuzzy
 msgid ""
-"If Mageia didn't convince you or you can't install it correctly, in short "
-"you want get rid of it. That is your right and Mageia also gives you the "
+"If Mageia didn't convince you or you can't install it correctly - in short "
+"you want get rid of it - that is your right and Mageia also gives you the "
 "possibility to uninstall. This is not true for every operating system."
 msgstr ""
 "Kui Mageia ei võida teie poolehoidu või paigaldamine ei kulge korralikult, "
@@ -5045,28 +5213,30 @@ msgstr ""
 "operatsioonisüsteemist Mageia arvestab teie sooviga ja võimaldab soovi "
 "korral ka endale täielikult selja keerata."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:17
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:14
+#, fuzzy
 msgid ""
-"After your data backup, reboot your installation Mageia DVD and select "
-"Rescue system, then, Restore Windows boot loader. At the next boot, you will "
-"only have Windows with no option to choose your operating system."
+"After your data backup, reboot your Mageia installation DVD and select "
+"<emphasis role=\"bold\">Rescue system</emphasis>, then, <emphasis role=\"bold"
+"\">Restore Windows boot loader</emphasis>. At the next boot, you will only "
+"have Windows, with no option to choose your operating system."
 msgstr ""
 "Kui olete oma andmed varundanud, taaskäivitage Mageia DVD ja valige "
 "Päästesüsteem ning seejärel käsk Restore Windows boot loader. Järgmisel "
 "arvuti käivitamisel ongi teie käsutuses ainult Windows, mitte enam võimalus "
 "operatsioonisüsteemi valida."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:22
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:19
+#, fuzzy
 msgid ""
-"To recover the space used by Mageia partitions on Windows, click on "
+"In Windows to recover the space used by Mageia partitions: click on "
 "<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
-"> Storage -> Disk Management</code> to access to the partition management. "
-"You will recognize the Mageia partition because they are labeled "
-"<guilabel>Unknown</guilabel>, and also by their size and place in the disk. "
-"Right click on each of these partitions and select <guibutton>Delete</"
-"guibutton>. The space will be freed."
+"> Storage -> Disk Management</code>. You will recognize a Mageia partition "
+"because they are labeled <guilabel>Unknown</guilabel>, and also by their "
+"size and place on the disk. Right click on each of these partitions and "
+"select <guibutton>Delete</guibutton> to free up the space."
 msgstr ""
 "Ruumi tagasisaamiseks Windowsis, mida Mageia oma partitsioonide alla võttis, "
 "valige <code>Start -&gt; Control Panel -&gt; Administrative Tools -&gt; "
@@ -5076,8 +5246,8 @@ msgstr ""
 "Klõpsake mõnele Mageia partitsioonile hiire parema nupuga ja valige "
 "<guibutton>Delete</guibutton>. Ruum vabanebki."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:30
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:27
 msgid ""
 "If you are using Windows XP, you can create a new partition and format it "
 "(FAT32 or NTFS). It will get a partition letter."
@@ -5085,14 +5255,15 @@ msgstr ""
 "Kui teil on XP, saate luua uue partitsiooni ja selle vormindada (kas FAT32 "
 "või NTFS-vormingusse). Uuele partitsioonile antakse oma täht."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:33
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:30
+#, fuzzy
 msgid ""
 "If you have Vista or 7, you have one more possibility, you can extend the "
-"existing partition that is at the left of the freed space.  There are other "
-"partitioning tools that can be used, such as gparted, available for both "
-"windows and linux. As always, when changing partitions, be very careful, and "
-"make sure all important things have been backed up."
+"existing partition that is at the left of the freed space. There are other "
+"partitioning tools that can be used, such as <emphasis role=\"bold"
+"\">gparted</emphasis>, available for both Windows and Linux. As always, when "
+"changing partitions, be very careful to back up anything important to you."
 msgstr ""
 "Vista või 7 korral on veel üks võimalus: saab laiendada olemasolevat "
 "partitsiooni, mis asub vabanenud ruumist vasakul. Leidub ka teisi "
@@ -5146,3 +5317,332 @@ 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 ""
+#~ "<guilabel>Password (again)</guilabel>: Retype the user password into this "
+#~ "text box and drakx will check you have the same password in each of the "
+#~ "user password text boxes."
+#~ msgstr ""
+#~ "<guilabel>Parool (uuesti)</guilabel>: siia tuleb kirjutada teist korda "
+#~ "kasutaja parool ning DrakX kontrollib, kas see on ikka sama, mis "
+#~ "kirjutati ülal asuvasse kasti."
+
+#~ msgid "Additionally, you can disable or enable a guest account."
+#~ msgstr " Samuti saab siin lubada või keelata külaliskonto."
+
+#~ msgid ""
+#~ "Anything a guest with a default <emphasis>rbash</emphasis> guest account "
+#~ "saves to his /home directory will be erased when he logs out.  The guest "
+#~ "should save his important files to a USB key."
+#~ msgstr ""
+#~ "Kõik, mida külaline oma vaikimisi <emphasis>rbash</emphasis> külaliskonto "
+#~ "all /home-kataloogi salvestab, kustutatakse külalise väljalogimisel. "
+#~ "Tähtsad failid peaks külaline salvestama USB-pulgale."
+
+#~ msgid ""
+#~ "<guilabel>Enable guest account</guilabel>: Here you can enable or disable "
+#~ "a guest account. The guest account allows a guest to log into and use the "
+#~ "PC, but he has more restricted access than normal users."
+#~ msgstr ""
+#~ "<guilabel>Külaliskonto (guest) lubamine</guilabel>: siin saab lubada või "
+#~ "keelata külaliskonto. See võimaldab külalisel, kellele pole kasutajat "
+#~ "loodud, sisse logida ja arvutit kasutada, kuid tema õigused on tavalise "
+#~ "kasutajaga võrreldes palju piiratumad."
+
+#~ msgid ""
+#~ "<guilabel>Group ID</guilabel>: This lets you set the group ID.  Also a "
+#~ "number, usually the same one as for the user. Leave it blank unless you "
+#~ "know what you are doing."
+#~ msgstr ""
+#~ "<guilabel>Grupi ID</guilabel>: siin saab määrata grupi ID. See on samuti "
+#~ "arv, tavaliselt sama kasutaja ID-ga. Kui te ei tea, milleks see hea on, "
+#~ "ärge siia midagi kirjutage."
+
+#~ msgid ""
+#~ "\"Device\", is made up of: \"hard drive\", [\"hard drive number"
+#~ "\"(letter)], \"partition number\" (for example, \"sda5\")."
+#~ msgstr ""
+#~ "\"Seade\" koosneb järgmistest elementidest: \"kõvaketas\", "
+#~ "[\"kõvakettanumber\"(täht)], \"partitsiooninumber\" (näiteks \"sda5\")."
+
+#~ msgid "Workstation."
+#~ msgstr "Tööjaam."
+
+#~ msgid "Server."
+#~ msgstr "Server."
+
+#~ msgid "Graphical Environment."
+#~ msgstr "Graafiline keskkond."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
+#~ "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
+#~ "choosePackagesTree.png\" format=\"PNG\" /> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
+#~ "imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "There are four groups, click on the triangle before a group to expand it "
+#~ "and see all services in it."
+#~ msgstr ""
+#~ "Teenustegruppe on neli. Nende ees olevale kolmnurgale klõpsates saab "
+#~ "grupi avada ja uurida selles peituvaid teenuseid."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
+#~ "\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" "
+#~ "format=\"PNG\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
+#~ "configureX_card_list.png\" format=\"PNG\" revision=\"1\" xml:id="
+#~ "\"configureX_card_list-im1\"/> </imageobject>"
+
+#~ 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 "
+#~ "Xorg category"
+#~ msgstr ""
+#~ "Kui te ei leia oma kaarti tootjate nimekirjast (sest seda pole veel "
+#~ "andmebaasis või on tegu väga vana kaardiga), võib siiski leida sobiva "
+#~ "draiveri Xorg-i kategoorias."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> "
+#~ "</imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
+#~ "configureX_chooser.png\" format=\"PNG\" revision=\"1\" xml:id="
+#~ "\"configureX_chooser-im1\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
+#~ "configureX_monitor.png\" format=\"PNG\" revision=\"1\" xml:id="
+#~ "\"configureX_monitor-im1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
+#~ "configureX_monitor.png\" format=\"PNG\" revision=\"1\" xml:id="
+#~ "\"configureX_monitor-im1\"/> </imageobject>"
+
+#~ msgid ""
+#~ "There is a tab for every detected hard disk or other storage device, like "
+#~ "an USB key. For example sda, sdb and sdc if there are three of them."
+#~ msgstr ""
+#~ "Igale leitud kõvakettale või muule salvestusseadmele, näiteks USB-"
+#~ "pulgale, on omaette kaart. Need võivad olla näiteks sda, sdb ja sdc, kui "
+#~ "teil juhtub olema kolm salvestusseadet."
+
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
+#~ "doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
+#~ "condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" "
+#~ "align=\"center\"/></imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
+#~ "doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
+#~ "condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" "
+#~ "align=\"center\"/></imageobject>"
+
+#~ msgid ""
+#~ "The installer will share the available place out according to the "
+#~ "following rules:"
+#~ msgstr ""
+#~ "Paigaldusprogramm jagab saadaoleva ruumi ära järgmiste reeglite kohaselt:"
+
+#~ msgid "\"Align to\" \"MiB\""
+#~ msgstr "\"Align to\" \"MiB\""
+
+#~ msgid "\"Free space preceding (MiB)\" \"2\""
+#~ msgstr "\"Free space preceding (MiB)\" \"2\""
+
+#~ msgid "From this screen, it is possible to set some personal preferences:"
+#~ msgstr "Sellel ekraanil on võimalik määrata mõned isiklikud eelistused:"
+
+#~ msgid ""
+#~ "The language (for the installation only, may be different that the chosen "
+#~ "language for the system) by pressing the key F2 (Legacy mode only)"
+#~ msgstr ""
+#~ "Keel (ainult paigaldamiseks, võib erineda süsteemile valitavast keelest) "
+#~ "klahvile F2 vajutades (ainult tavapärases süsteemis)"
+
+#~ msgid ""
+#~ "Here is for example, the French welcome screen when using a Live DVD/CD. "
+#~ "Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
+#~ "guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware "
+#~ "Detection Tool</guilabel>."
+#~ msgstr ""
+#~ "Siin on näiteks LiveDVD/CD eestikeelne tervitusekraan. Pange tähele, et "
+#~ "LiveDVD/CD menüüs ei ole kirjeid, nagu <guilabel>Päästesüsteem</"
+#~ "guilabel>, <guilabel>Mälu testimine</guilabel> ja <guilabel>Riistvara "
+#~ "tuvastamise tööriist</guilabel>."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
+#~ "emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
+#~ "emphasis> key for the UEFI mode."
+#~ msgstr ""
+#~ "Lisada mõningaid kerneli võtmeid, vajutades klahvile <emphasis role=\"bold"
+#~ "\">F6</emphasis> tavapärase süsteemi ja klahvile <emphasis role=\"bold"
+#~ "\">e</emphasis> UEFI süsteemi korral."
+
+#~ msgid ""
+#~ "If the installation fails, then it may be necessary to try again using "
+#~ "one of the extra options. The menu called by F6 displays a new line "
+#~ "called <guilabel>Boot options</guilabel> and propose four entries:"
+#~ msgstr ""
+#~ "Kui paigaldamine ei õnnestu, võib olla vajalik seda uuesti proovida, "
+#~ "kasutades mõnda lisavõtit. Klahviga F6 avatav menüü toob nähtavale "
+#~ "tekstirea <guilabel>Alglaadimise sätted</guilabel> ja pakub nelja valikut:"
+
+#~ msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
+#~ msgstr ""
+#~ "Lisada veel rohkem kerneli võtmeid klahvile F1 vajutades (ainult "
+#~ "tavapärases süsteemis)"
+
+#~ msgid "Using a Wired Network"
+#~ msgstr "Juhtmega võrgu kasutamine"
+
+#~ msgid ""
+#~ "Here is the default welcome screen when using a Wired Network-based "
+#~ "Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
+#~ msgstr ""
+#~ "Selline on vaikimisi tervitusekraan juhtmega võrgu põhise paigalduse CD "
+#~ "(netinstall.iso või netinstall-nonfree.iso tõmmis) kasutamisel:"
+
+#~ msgid ""
+#~ "It does not allow to change the language, the available options are "
+#~ "described in the screen. For more information about using a Wired Network-"
+#~ "based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/"
+#~ "Boot.iso_install\">the Mageia Wiki</link>"
+#~ msgstr ""
+#~ "See ei võimalda muuta keelt ning saadaolevad võtmed on loetletud "
+#~ "ekraanil. Rohkem teavet juhtmega võrgu põhise paigaldamise CD kasutamise "
+#~ "kohta leiab <link ns2:href=\"https://wiki.mageia.org/en/Boot.iso_install"
+#~ "\">Mageia Wikist</link>."
+
+#~ msgid "The keyboard layout is the American one."
+#~ msgstr "Klaviatuuripaigutus on Ameerika-pärane."
+
+#~ msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png"
+#~ "\" format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-installUpdates.png"
+#~ "\" format=\"PNG\" revision=\"1\" xml:id=\"installUpdates-im1\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection."
+#~ "png\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection."
+#~ "png\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "If selected, \"With X\" will also include IceWM as lightweight desktop "
+#~ "environment."
+#~ msgstr ""
+#~ "Kui märkida \"X'iga\", paigaldatakse ka kergekaaluline töökeskkond IceWM."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png"
+#~ "\" align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png"
+#~ "\" align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></"
+#~ "imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> "
+#~ "</imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> "
+#~ "</imageobject>"
+
+#~ msgid "You can adjust your security level here."
+#~ msgstr "Siin saab kohandada oma arvuti turbetaset."
+
+#~ msgid ""
+#~ "Leave the default settings as they are, if you don't know what to choose."
+#~ msgstr ""
+#~ "Kui te ei ole kindel, ärge hakake siin midagi muutma, vaid jätke kehtima "
+#~ "vaikimisi määratu."
+
+#~ msgid ""
+#~ "LIVE media: you can boot the media in a real Mageia system without "
+#~ "installing it, to see what you will get after installation.  The "
+#~ "installation process is simpler, but you get lesser choices."
+#~ msgstr ""
+#~ "Live-andmekandja: sel juhul saab andmekandja pealt käivitada toimiva "
+#~ "Mageia süsteemi ilma seda paigaldamata, et näiteks näha, mida üldse "
+#~ "pakutakse. Paigaldamine on lihtsam, aga ka valikuid on vähem."
+
+#~ msgid "Boot-only CD media"
+#~ msgstr "CD-d ainult alglaadimiseks"
+
+#~ msgid "Check the radio button Save File."
+#~ msgstr "Märkige raadionupp Salvestama."
+
+#~ msgid "You can also use the dd tool in a console:"
+#~ msgstr "Samuti võib kasutada konsoolis tööriista dd:"
+
+#~ msgid "Unplug your USB stick, it is done"
+#~ msgstr "Eemaldage USB-pulk, kõik on valmis"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
+#~ "\"center\" format=\"PNG\"></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
+#~ "\"center\" format=\"PNG\"></imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "Use this option for a fresh <application>Mageia</application> "
+#~ "installation."
+#~ msgstr ""
+#~ "Selle valimisel saab ette võtta uue <application>Mageia</application> "
+#~ "paigaldamise."
+
+#~ msgid ""
+#~ "If you have one or more <application>Mageia</application> installations "
+#~ "on your system, the installer will allow you to upgrade one of them to "
+#~ "the latest release."
+#~ msgstr ""
+#~ "Kui teie süsteemi on juba varem paigaldatud <application>Mageia</"
+#~ "application>, võimaldab paigaldusprogramm seda uusimale väljalaskele "
+#~ "uuendada."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" "
+#~ "format=\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-setupSCSI.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"setupSCSI-im1\"/> </imageobject>"
+
+#~ msgid "Howto"
+#~ msgstr "Õpetus"