Update Installer translations

1 files changed, 3183 insertions, 2214 deletions

diff --git a/docs/docs/stable/installer/sk.po b/docs/docs/stable/installer/sk.po
index a9075f59..6ea23649 100644
--- a/docs/docs/stable/installer/sk.po
+++ b/docs/docs/stable/installer/sk.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2018-04-19 16:32+0300\n"
+"POT-Creation-Date: 2019-01-06 12:43+0200\n"
 "PO-Revision-Date: 2016-07-17 11:59+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
@@ -21,12 +21,12 @@ msgstr ""
 "X-Generator: Lokalize 1.5\n"
 
 #. type: Content of: <section><info><title>
-#: en/acceptLicense.xml:25
+#: en/acceptLicense.xml:31
 msgid "License and Release Notes"
 msgstr "Licencia a poznámky k vydaniu"
 
 #. type: Content of: <section><mediaobject>
-#: en/acceptLicense.xml:29
+#: en/acceptLicense.xml:35
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
@@ -42,82 +42,88 @@ msgstr ""
 "\"live-license.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/acceptLicense.xml:40
+#: en/acceptLicense.xml:46
 msgid "License Agreement"
 msgstr "Licenčné ujednanie"
 
-#. type: Content of: <section><section><para>
-#: en/acceptLicense.xml:43
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/acceptLicense.xml:51
+#, fuzzy
 msgid ""
-"Before installing <application>Mageia</application>, please read the license "
-"terms and conditions carefully."
+"Before installing Mageia, please read the license terms and conditions "
+"carefully."
 msgstr ""
 "Pred inštaláciou <application>Mageie</application>, si starostlivo "
 "prečítajte licenčné podmienky a ustanovenia."
 
-#. type: Content of: <section><section><para>
-#: en/acceptLicense.xml:46
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/acceptLicense.xml:56
+#, fuzzy
 msgid ""
-"These terms and conditions apply to the entire <application>Mageia</"
-"application> distribution and must be accepted before you can continue."
+"These terms and conditions apply to the entire Mageia distribution and must "
+"be accepted before you can continue."
 msgstr ""
 "Tieto podmienky a ujednania sa vzťahujú na celú distribúciu "
 "<application>Mageia</application>, skôr než budete pokračovať, musia byť "
 "prijaté."
 
-#. type: Content of: <section><section><para>
-#: en/acceptLicense.xml:50
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/acceptLicense.xml:61
 #, fuzzy
 msgid ""
-"To proceed, simply select <guilabel>Accept</guilabel> and then click on "
-"<guibutton>Next</guibutton>."
+"To proceed, simply select <emphasis>Accept</emphasis> and then click on "
+"<emphasis>Next</emphasis>"
 msgstr ""
 "Ak ich chcete prijať, jednoducho vyberte <guilabel>Prijať</guilabel> a potom "
 "kliknite na <guibutton>Ďalšie</guibutton>."
 
 #. type: Content of: <section><section><para>
-#: en/acceptLicense.xml:53
+#: en/acceptLicense.xml:66
+#, fuzzy
 msgid ""
-"If you decide not to accept these conditions, then we thank you for looking. "
-"Clicking <guibutton>Quit</guibutton> will reboot your computer."
+"If you decide not to accept these conditions, then we thank you for your "
+"interest in Mageia. Clicking <emphasis>Quit</emphasis> will reboot your "
+"computer."
 msgstr ""
 "Ak sa rozhodnete neprijať tieto podmienky, potom vám ďakujeme za "
 "nahliadnutie. Kliknutím na <guibutton>Ukončiť</guibutton> sa reštartuje "
 "počítač."
 
 #. type: Content of: <section><section><info><title>
-#: en/acceptLicense.xml:63
+#: en/acceptLicense.xml:76
 msgid "Release Notes"
 msgstr "Poznámky k vydaniu"
 
 #. type: Content of: <section><section><para>
-#: en/acceptLicense.xml:70
+#: en/acceptLicense.xml:83
 #, fuzzy
 msgid ""
-"Important information about this release of <application>Mageia</"
-"application> can be viewed by clicking on the <guibutton>Release Notes</"
-"guibutton> button."
+"Important information about this particular Mageia release can be viewed by "
+"clicking on the <emphasis>Release Notes</emphasis> button."
 msgstr ""
 "Sú k dispozícii dôležité informácie o tomto vydaní <application>Mageia</"
 "application> a sú dostupné kliknutím na tlačidlo <guibutton>Poznámky k "
 "vydaniu</guibutton>."
 
 #. type: Attribute 'xml:lang' of: <section>
-#: 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
+#: en/add_supplemental_media.xml:1 en/DrakLive-cover.xml:2 en/DrakLive.xml:2
+#: en/DrakX-cover.xml:3 en/DrakX.xml:3 en/media_selection.xml:2
 msgid "en"
 msgstr "sk"
 
 #. type: Content of: <section><info><title>
 #: en/add_supplemental_media.xml:3
-msgid "Media Selection (Configure Supplemental Installation Media)"
+#, fuzzy
+msgid "Supplemental Installation Media"
 msgstr "Výber zdroja (Nastavenie doplnkových inštalačných zdrojov)"
 
 #.  papoteur 2013-04-13  - created 
 #.  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 
+#. 2018/02/10 apb: Text and typgraphy.
+#. 2018/02/16 apb: Update dx2-add_supplemental_media.png to Mga6
 #. type: Content of: <section><mediaobject>
-#: en/add_supplemental_media.xml:14
+#: en/add_supplemental_media.xml:18
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-add_supplemental_media."
@@ -129,13 +135,13 @@ msgstr ""
 "add_supplemental_media-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:19
+#: en/add_supplemental_media.xml:23
 #, fuzzy
 msgid ""
-"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.  "
+"This screen shows you the list of already recognised 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."
+"subsequent steps."
 msgstr ""
 "Táto obrazovka vám dáva zoznam juž rozpoznaných úložísk. Môžete pridať "
 "ďalšie zdroje balíčkov, ako je optický disk alebo vzdialené zdroje. Výber "
@@ -143,25 +149,25 @@ msgstr ""
 "nasledujúcich krokov."
 
 #. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:24
+#: en/add_supplemental_media.xml:28
 msgid "For a network source, there are two steps to follow:"
 msgstr "Pre sieťové zdroje, sú potrebné dva nasledujúce kroky:"
 
 #. type: Content of: <section><orderedlist><listitem><para>
-#: en/add_supplemental_media.xml:28
-msgid "Choosing and activation of the network, if not already up."
+#: en/add_supplemental_media.xml:32
+#, fuzzy
+msgid "Choosing and activating the network, if not already up."
 msgstr "Výber a aktivácia siete, ak nie je už spustená."
 
 #. type: Content of: <section><orderedlist><listitem><para>
-#: en/add_supplemental_media.xml:32
+#: en/add_supplemental_media.xml:36
 #, 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 <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."
+"Mageia, like the <emphasis>Nonfree</emphasis>, the <emphasis>Tainted</"
+"emphasis> repositories and the <emphasis>Updates</emphasis>. With the URL, "
+"you can designate a specific repository or your own NFS installation."
 msgstr ""
 "Vybrať zrkadlový server alebo zadať URL adresu (prvý vstup). Výberom "
 "niektorého zo zrkadlových serverov budete mať prístup k ponukám všetkých "
@@ -170,15 +176,15 @@ msgstr ""
 "inštaláciu."
 
 #. type: Content of: <section><note><para>
-#: en/add_supplemental_media.xml:42
+#: en/add_supplemental_media.xml:46
 #, fuzzy
 msgid ""
-"If you are updating a 64 bit installation which may contain some 32 bit "
+"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, the installer will find "
-"the needed 32-bit packages there."
+"selecting one of the Network protocols here. The 64-bit DVD ISO only "
+"contains 64-bit and <emphasis>noarch</emphasis> 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 ""
 "Ak aktualizujete 64 bitovú inštaláciu, ktorá môže obsahovať niektoré 32 "
 "bitové balíčky, vtedy sa odporúča použiť túto obrazovku pre pridanie "
@@ -188,19 +194,25 @@ msgstr ""
 "zrkadlového servera, inštalátor tam nájde potrebné 32 bitové balíčky."
 
 #. type: Content of: <section><info><title>
-#: en/addUser.xml:3
-msgid "User and Superuser Management"
-msgstr "Spravovanie používateľa a superpoužívateľa"
+#: en/addUser.xml:9
+#, fuzzy
+msgid "User Management"
+msgstr "Rozšírená správa používateľov"
 
 #.  Lebarhon: 20170210 updated for Mageia 6 (umask)
+#. 2018/02/12 apb: Text and Typography.
+#. 2018/02/19 apb: Update dx2-setRootPassword.png to Mga6.
+#. 2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
+#.   Also changed 'Advanced User Management' to 'User Management (advanced)'.
+#. 2018/02/24 apb: Changed list style.
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:9
+#: en/addUser.xml:24
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
-"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
-"\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata format="
-"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-setRootPassword.png\" format=\"PNG\" revision=\"1\" xml:id="
+"\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata fileref="
+"\"live-user1.png\" format=\"PNG\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata revision=\"1\" align="
 "\"center\" xml:id=\"setRootPassword-im1\" fileref=\"dx2-setRootPassword.png"
@@ -208,21 +220,21 @@ msgstr ""
 "fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:20
+#: en/addUser.xml:36
 msgid "Set Administrator (root)  Password:"
 msgstr "Nastavenie správcovho (rootovho) hesla:"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:24
+#: en/addUser.xml:40
 #, fuzzy
 msgid ""
-"It is advisable for all <application>Mageia</application> installations to "
-"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 "
-"underneath, to check that the first entry was not mistyped."
+"It is advisable for all Mageia installations to set a <literal>superuser</"
+"literal> (Administrator) password, usually called the <emphasis>root </"
+"emphasis>password in Linux. As you type a password into the top box a shield "
+"will change from red-to-yellow-to-green depending on the strength of the "
+"password. A green shield shows you are using a strong password. You need to "
+"repeat the same password in the box underneath, to check that the first "
+"entry was not mistyped."
 msgstr ""
 "Pre všetky inštalácie <application>Mageie</application> sa odporúča nastaviť "
 "superužívateľovo alebo správcovo heslo, ktoré sa v Linuxe zvyčajne nazýva aj "
@@ -234,28 +246,28 @@ msgstr ""
 "prvom políčku."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:34
+#: en/addUser.xml:49
 #, 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 ""
 "Všetky heslá sú citlivé na veľkosti písmen; najlepšie je použiť v hesle "
 "kombináciu písmen (veľkých a malých), čísel a ostatných znakov."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:42
+#: en/addUser.xml:57
 msgid "Enter a user"
 msgstr "Pridať používateľa"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:45
+#: en/addUser.xml:60
 #, fuzzy
 msgid ""
-"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."
+"Add a User here. A regular user has fewer privileges than the "
+"<literal>superuser</literal> (root), but enough to use the Internet, office "
+"applications or play games and anything else the average user might use a "
+"computer for."
 msgstr ""
 "Tu pridajte používateľa. Používateľ má menej oprávnení než superpoužívateľ "
 "(root), ale dostatok pre surfovanie po internete, používanie kancelárskych "
@@ -263,71 +275,92 @@ msgstr ""
 "so svojím počítačom."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:52
-msgid ""
-"<guibutton>Icon</guibutton>: if you click on this button it will change the "
-"user's icon."
+#: en/addUser.xml:67
+#, fuzzy
+msgid "<emphasis role=\"bold\">Icon</emphasis>"
+msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/addUser.xml:69
+#, fuzzy
+msgid "Click on this button if you want to change the user's icon"
 msgstr ""
 "<guibutton>Ikona</guibutton>: ak kliknete na toto tlačidlo, zmení sa ikona "
 "používateľa."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:57
-msgid ""
-"<guilabel>Real Name</guilabel>: Insert the user's real name into this text "
-"box."
+#: en/addUser.xml:74
+#, fuzzy
+msgid "<emphasis role=\"bold\">Real Name</emphasis>"
+msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/addUser.xml:76
+#, fuzzy
+msgid "Insert the user's real name into this text box"
 msgstr ""
 "<guilabel>Reálne meno</guilabel>: Do tohto textového políčka vložte reálne "
 "používateľovo meno."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:62
+#: en/addUser.xml:80
+#, fuzzy
+msgid "<emphasis role=\"bold\">Login Name</emphasis>"
+msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/addUser.xml:82
 #, fuzzy
 msgid ""
-"<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>"
+"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>Prihlasovacie meno</guilabel>: Sem môžete zadať používateľovo "
 "prihlasovacie meno alebo to prenecháte inštalačnému programu drakx, aby "
 "použil verziu používateľovho reálneho mena. <emphasis>Prihlasovacie meno je "
 "citlivé na veľkosť písmen.</emphasis>"
 
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/addUser.xml:88 en/setupBootloader.xml:87
+#, fuzzy
+msgid "<emphasis role=\"bold\">Password</emphasis>"
+msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
+
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:67
+#: en/addUser.xml:90
 #, fuzzy
 msgid ""
-"<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\"/>)"
+"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>Heslo</guilabel>: Do tohto textového poľa by ste mali napísať "
 "používateľské heslo. Na konci textového políčka je štít, ktorý naznačuje "
 "silu heslu. (Pozrite aj <xref linkend=\"givePassword\"/>)"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:73
+#: en/addUser.xml:94
 #, fuzzy
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the user password DrakX will "
-"check that you have not mistyped the password."
+"<emphasis role=\"bold\">Password (again):</emphasis> Retype the user "
+"password. DrakX will check that you have not mistyped the password."
 msgstr ""
 "<guilabel>Heslo (znova)</guilabel>: Znova zadajte do tohto textového poľa "
 "heslo používateľa a drakx skontroluje, či máte rovnaké heslo v každom z "
 "textových políčok pre používateľské heslo."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:79
+#: en/addUser.xml:101
 #, fuzzy
 msgid ""
-"Any users you added while installing Mageia, will have a home directory that "
-"is both read and write protected (umask=0027)."
+"Any users added while installing Mageia, will have a home directory that is "
+"both read and write protected (umask=0027)"
 msgstr ""
 "Každý používateľ, ktorého pridáte počas inštalácie Mageia, bude mať svetom "
 "čitateľný domovský adresár (ale ochránený proti zápisu)."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:82
+#: en/addUser.xml:104
 #, fuzzy
 msgid ""
 "You can add any extra needed users in the <emphasis>Configuration - Summary</"
@@ -340,60 +373,60 @@ msgstr ""
 "používateľov</emphasis>."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:86
+#: en/addUser.xml:108
 msgid "The access permissions can also be changed after the install."
 msgstr "Prístupové oprávnenia možno meniť aj po inštalácii."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:93
-msgid "Advanced User Management"
+#: en/addUser.xml:115
+#, fuzzy
+msgid "User Management (advanced)"
 msgstr "Rozšírená správa používateľov"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:96
+#: en/addUser.xml:118
 #, fuzzy
 msgid ""
-"The <guibutton>Advanced</guibutton> option allows you to edit further "
-"settings for the user you are adding."
+"The <emphasis>Advanced</emphasis> option allows you to edit further settings "
+"for the user you are adding."
 msgstr ""
 "Ak kliknete na tlačidlo <guibutton>pokročilé</guibutton>, bude vám ponúknutá "
 "obrazovka, ktorá vám dovoľuje upravovať nastavenia pre používateľa, ktorého "
 "pridávate."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:101
+#: en/addUser.xml:123
 #, fuzzy
 msgid ""
-"<guilabel>Shell</guilabel>: This drop-down list allows you to change the "
+"<emphasis>Shell</emphasis>: This drop-down list allows you to change the "
 "shell available to any user you added in the previous screen. Options are "
-"<emphasis role=\"bold\">Bash</emphasis>, <emphasis role=\"bold\">Dash</"
-"emphasis> and <emphasis role=\"bold\">Sh</emphasis>"
+"<literal>Bash</literal>, <literal>Dash</literal> and <literal>Sh</literal>"
 msgstr ""
 "<guilabel>Ulita</guilabel>: Tento rozbaľovací zoznam vám umožňuje zmeniť "
 "ulitu (shell, prekladač príkazov) použitú používateľom, ktorého pridávate na "
 "predošlej obrazovke, možnosťami sú Bash, Dash a Sh."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:107
+#: en/addUser.xml:130
 #, fuzzy
 msgid ""
-"<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."
+"<emphasis>User ID</emphasis>: Here you can set the user ID for any user you "
+"added in the previous screen. If you are unsure what the purpose of this is, "
+"then leave it blank."
 msgstr ""
 "<guilabel>ID používateľa</guilabel>: Tu môžete nastaviť používateľovo ID pre "
 "používateľa, ktorého pridávate na predošlej obrazovke. Je to číslo. "
 "Ponechajte ho prázdne, pokiaľ neviete, čo robíte."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:113
+#: en/addUser.xml:136
 msgid ""
-"<guilabel>Group ID</guilabel>: This lets you set the <emphasis role=\"bold"
-"\">group ID</emphasis>. Again, if unsure, leave it blank."
+"<emphasis>Group ID</emphasis>: This lets you set the group ID.  Again, if "
+"unsure, leave it blank."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/ask_mntpoint_s.xml:3
+#: en/ask_mntpoint_s.xml:10
 msgid "Choose the mount points"
 msgstr "Zvoľte body pripojenia"
 
@@ -408,16 +441,17 @@ msgstr "Zvoľte body pripojenia"
 #.        write "it's type". And you're right about the redundant part, too, I removed it
 #.  And JohnR says the Americans are WRONG! :-)) 
 #.  2012-04-19  Language proofreading done 
+#. 2018/02/12 apb: Text and typography.
+#. 2019/01/04 apb: Typo & minor reword on custom mount-points.
 #. type: Content of: <section><mediaobject>
-#: en/ask_mntpoint_s.xml:27
+#: en/ask_mntpoint_s.xml:38
 #, fuzzy
 msgid ""
-"<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>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-chooseMountpoints.png\" format=\"PNG\" revision=\"1\" xml:id="
+"\"chooseMountPoints-im1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-chooseMountpoints.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"live-chooseMountPoints-im1\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
 "chooseMountpoints.png\" align=\"center\" format=\"PNG\" xml:id="
@@ -427,56 +461,37 @@ msgstr ""
 "im1\"></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:36
+#: en/ask_mntpoint_s.xml:49
+#, fuzzy
 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 "
-"can change the mount points."
+"you don't agree with the DrakX suggestions, you can change the mount points "
+"yourself."
 msgstr ""
 "Tu vidíte Linuxové partície, ktoré boli nájdené na vašom počítači. Ak "
 "nesúhlasíte s návrhom <application>DrakX</application>u, môžete prípojné "
 "body zmeniť."
 
-#. type: Content of: <section><note><para>
-#: en/ask_mntpoint_s.xml:41
-#, fuzzy
-msgid ""
-"If you change anything, make sure you still have a <emphasis role=\"bold"
-"\"><literal>/</literal></emphasis> (root) partition."
-msgstr ""
-"Ak zmeníte čokoľvek, uistite sa, že stále ešte máte <literal>/</literal> "
-"(koreňovú) partíciu."
-
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:46
-#, fuzzy
+#: en/ask_mntpoint_s.xml:55
 msgid ""
-"Every partition is shown to the left as: <emphasis role=\"bold\">Device "
-"(capacity, mount point, type).</emphasis>"
-msgstr ""
-"Každá partícia je ukázaná nasledovne: \"Zariadenie\" (\"Kapacita\", "
-"\"Prípojný bod\", \"Typ\")."
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:50
-msgid ""
-"<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>)."
+"To the left of the drop-down menus is a list of available partitions. For "
+"example: <filename>sda</filename> is a hard drive - and <filename>5</"
+"filename> is a <emphasis>partition number</emphasis>, followed by "
+"the<emphasis> (capacity, mount point, filesystem type)</emphasis> of the "
+"partition."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:56
+#: en/ask_mntpoint_s.xml:63
 #, fuzzy
 msgid ""
-"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."
+"If you have several partitions, you can choose various different "
+"<emphasis>mount points</emphasis> from the drop down menu, such as "
+"<filename>/</filename>, <filename>/home</filename> and <filename>/var</"
+"filename>. You can even make your own mount points, for instance <filename>/"
+"video</filename> for a partition where you want to store your films, or "
+"perhaps <filename>/Data</filename> for all your data files."
 msgstr ""
 "Ak máte mnohé partície, môžete si vybrať mnoho rôznych prípojných bodov z "
 "rozbaľovacej ponuky, aké sú <literal>/</literal>, <literal>/home</literal> a "
@@ -486,7 +501,7 @@ msgstr ""
 "inštalácie kotla."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:63
+#: en/ask_mntpoint_s.xml:73
 #, fuzzy
 msgid ""
 "For any partitions that you don't need to make use of, you can leave the "
@@ -496,12 +511,22 @@ msgstr ""
 "políčko prípojného bodu."
 
 #. type: Content of: <section><warning><para>
-#: en/ask_mntpoint_s.xml:69
+#: en/ask_mntpoint_s.xml:79
 #, fuzzy
 msgid ""
-"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."
+"If you make any changes here, ensure you still have a <filename>/</filename> "
+"(root) partition."
+msgstr ""
+"Ak zmeníte čokoľvek, uistite sa, že stále ešte máte <literal>/</literal> "
+"(koreňovú) partíciu."
+
+#. type: Content of: <section><tip><para>
+#: en/ask_mntpoint_s.xml:84
+#, fuzzy
+msgid ""
+"If you are not sure what to choose, click <emphasis>Previous</emphasis> to "
+"go back and then tick <emphasis>Custom disk partitioning</emphasis>, where "
+"you can click on a partition to see its type and size."
 msgstr ""
 "Vyberte <guibutton>Predošlé</guibutton>, ak si nie ste istí, čo si máte "
 "zvoliť a potom zaškrtnite <guilabel>Vlastné rozdelenie disku</guilabel>. V "
@@ -509,188 +534,237 @@ msgstr ""
 "typ a veľkosť."
 
 #. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:74
+#: en/ask_mntpoint_s.xml:90
+#, fuzzy
 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) "
-"DrakX suggests, or more."
+"If you are sure the mount points are correct, click on <emphasis>Next</"
+"emphasis>, and choose whether you only want to format the partition "
+"suggested by DrakX, or more."
 msgstr ""
 "Ak ste si istí, že prípojné body sú správne, kliknite na <guibutton>Ďalej</"
 "guibutton> a vyberte si, či chcete naformátovať len tú partíciu (resp. "
 "partície), ktoré DrakX navrhuje, alebo i ďalšie."
 
 #. type: Content of: <section><info><title>
-#: en/bestTime.xml:10
-msgid "Clock settings"
+#: en/bestTime.xml:5
+#, fuzzy
+msgid "Clock Settings"
 msgstr "Nastavenie času"
 
 #. type: Content of: <section><mediaobject>
-#: en/bestTime.xml:14
+#: en/bestTime.xml:8
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bestTime.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"bestTime-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" align=\"center\" fileref=\"live-"
+"bestTime.png\" revision=\"1\" xml:id=\"bestTime-im1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"live-bestTime.png\" "
 "format=\"PNG\" revision=\"1\" xml:id=\"bestTime-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/bestTime.xml:20
+#: en/bestTime.xml:12
+#, fuzzy
 msgid ""
-"In this step, you have to select on which time your internal clock is set, "
-"either local time or UTC time."
+"Here, you can select whether your computer internal clock is set to local "
+"time or UTC time."
 msgstr ""
 "V tomto kroku si máte vybrať, na ktorý čas sú nastavené vaše interné hodiny, "
 "buď miestny čas alebo UTC čas."
 
 #. type: Content of: <section><para>
-#: en/bestTime.xml:23
-msgid "In advanced tab, you will find more options about clock settings."
-msgstr "Na karte pokročilé nájdete viac možností pre nastavenie času."
+#: en/bestTime.xml:14
+msgid ""
+"In the <emphasis>Advanced</emphasis> tab, you can enable automatic time "
+"synchronization and specify an NTP server."
+msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:1
+#: en/bootLive.xml:6
 msgid "Boot Mageia as Live system"
 msgstr "Zaviesť Mageiu ako Živý systém"
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:1
+#: en/bootLive.xml:10
 msgid "Booting the medium"
 msgstr "Zavedenie z dátového nosiča"
 
-#. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:1
-msgid "From a disc"
-msgstr "Z disku"
-
-#. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:1
-msgid ""
-"You can boot directly from the media you used to burn your image (CD-ROM, "
-"DVD-ROM...). You usually just need to insert it in your CD/DVD drive for the "
-"bootloader to launch the installation automatically after rebooting the "
-"computer. If that does not happen you may need to reconfigure your BIOS or "
-"press one key that will offer you to choose the peripheral from which the "
-"computer will boot."
-msgstr ""
-"Systém môžete zaviesť z nosiča, na ktorý ste napálili váš obrazový súbor "
-"(CDčko, DVDčko...). Zvyčajne ho stačí len vložiť do vašej CD/DVD mechaniky, "
-"aby zavádzač spustil inštaláciu automaticky po reštarte počítača. Ak sa to "
-"nestane, možno potrebujete prekonfigurovať váš BIOS alebo stlačiť jednu "
-"klávesu, ktorá vám ponúkne vybrať si zariadenie, z ktorého sa počítač "
-"zavedie."
+#. type: Content of: <section><section><para>
+#: en/bootLive.xml:12
+msgid ""
+"You can boot directly from a Live DVD or USB. Usually, you just need to plug "
+"the USB device in or place the DVD in the drive and restart the computer."
+msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:6
+#. type: Content of: <section><section><para>
+#: en/bootLive.xml:15
 msgid ""
-"According to which hardware you have, and how it is configured, you get "
-"either one or another of the two screens below."
+"If the computer does not automatically boot from the USB or DVD you may need "
+"to reconfigure your BIOS Boot Disk priority. Alternatively, you might try "
+"accessing the boot device menu to select a device from which the computer "
+"will boot."
 msgstr ""
-"Podľa toho ktorý máte hardvér a ako je nakonfigurovaný, objaví sa buď jedna "
-"alebo druhá z dvoch nižšie uvedených obrazoviek."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:7
-msgid "From a USB device"
-msgstr "Z USB zariadenia"
+#. type: Content of: <section><section><tip><para>
+#: en/bootLive.xml:20
+msgid ""
+"To access the BIOS or boot menu when the computer is starting, you can try "
+"pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or <keycap>Esc</"
+"keycap> for the BIOS, or <keycap>Esc</keycap>, <keycap>F8</keycap>, "
+"<keycap>F10</keycap> or <keycap>F11</keycap> for the boot device menu. These "
+"(fairly common) keys are just a selection of possible options though."
+msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:7
+#. type: Content of: <section><section><note><para>
+#: en/bootLive.xml:28
 msgid ""
-"You can boot from the USB device on which you dumped your image ISO. "
-"According to your BIOS settings, the computer boots perhaps directly on the "
-"USB device already plugged in a port. If that does not happen you may need "
-"to reconfigure your BIOS or press one key that will offer you to choose the "
-"peripheral from which the computer will boot."
+"The actual screen that you will first see when booting from the Live media "
+"will depend on whether your computer motherboard is of the Legacy (BIOS) or "
+"UEFI type."
 msgstr ""
-"Počítač môžete naštartovať z USB zariadenia, na ktorom je zaznamenaný váš "
-"ISO obraz. Vzhľadom na nastavenia vášho BIOSu sa počítač možno už zavádza "
-"priamo z USB zariadenia zastrčeného v porte počítača. Ak sa tak nedeje, "
-"možno potrebujete prekonfigurovať váš BIOS alebo stlačiť jednu klávesu, "
-"ktorá vám ponúkne vybrať si periférium, z ktorého sa naštartuje počítač."
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:12
+#: en/bootLive.xml:35
 msgid "In BIOS/CSM/Legacy mode"
 msgstr "V zastaralom BIOS/CSM režime"
 
+#. type: Content of: <section><section><itemizedlist><title>
+#: en/bootLive.xml:38
+msgid "Main Menu"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:40 en/bootLive.xml:152
+#, fuzzy
+msgid "<emphasis role=\"bold\">Boot Mageia</emphasis>"
+msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:41
+msgid ""
+"This option will boot the Mageia Live system from the connected DVD/USB "
+"media (expect a very slow system compared to an installed OS)."
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:42
+#, fuzzy
+msgid "Once the boot is done, you can proceed to the installation."
+msgstr ""
+"Nastavenia konfigurácie, ktoré ste tu urobili, sa zachovajú pre inštaláciu."
+
+#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/bootLive.xml:45 en/bootLive.xml:57
+#, fuzzy
+msgid ""
+"<emphasis role=\"bold\">+ use non-free video drivers (slower to boot)</"
+"emphasis>"
+msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/bootLive.xml:47
+msgid "Boot the Mageia Live system using non-free video drivers"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:53 en/bootLive.xml:156 en/installer.xml:65
+#, fuzzy
+msgid "<emphasis role=\"bold\">Install Mageia</emphasis>"
+msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:54 en/bootLive.xml:157
+#, fuzzy
+msgid "This option will install Mageia to a hard disk."
+msgstr ""
+"Nainštalovať Mageiu: Táto voľba priamo nainštaluje Mageiu na pevný disk."
+
+#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/bootLive.xml:59
+msgid "Install Mageia using non-free video drivers"
+msgstr ""
+
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:12
-msgid "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
+#: en/bootLive.xml:65
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-bootCSM.png\" align=\"center\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:12
+#: en/bootLive.xml:69
 msgid "First screen while booting in BIOS mode"
 msgstr "Prvá obrazovka počas spúšťania v BIOSovom režime"
 
-#. type: Content of: <section><section><para>
-#: en/bootLive.xml:12
-msgid "In the middle menu, you have the choice between three actions:"
-msgstr "V prostrednej ponuke, máte voľbu medzi tromi akciami:"
+#. type: Content of: <section><section><itemizedlist><title>
+#: en/bootLive.xml:73
+msgid "Function Keys"
+msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:13
-msgid ""
-"Boot Mageia: That means Mageia 5 will start from the connected media (CD/DVD "
-"or USB stick) without writing anything on the disk, so expect a very slow "
-"system. Once the boot is done, you can proceed to the installation on a hard "
-"disk."
-msgstr ""
-"Zaviesť Mageiu: Toto znamená že Mageia 5 sa spustí z pripojeného nosiča (CD/"
-"DVD alebo USB kľúča) bez akéhokoľvek zapisovania na disk, takže očakávajte "
-"veľmi pomalý systém. Keď sa zavádzanie dokončí, môžete prikročiť i ku "
-"inštalácií na pevný disk."
+#: en/bootLive.xml:75
+#, fuzzy
+msgid "<keycap>F1</keycap> <emphasis role=\"bold\">Help</emphasis>"
+msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:16
+#: en/bootLive.xml:76
 msgid ""
-"Install Mageia: This choice will directly install Mageia on a hard disk."
+"Within any of the <keycap>F2</keycap> to <keycap>F6</keycap> options, you "
+"can view relevant help by pressing <keycap>F1</keycap>."
 msgstr ""
-"Nainštalovať Mageiu: Táto voľba priamo nainštaluje Mageiu na pevný disk."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:17
+#: en/bootLive.xml:81
+#, fuzzy
+msgid "<keycap>F2</keycap> <emphasis role=\"bold\">Language</emphasis>"
+msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:82
 msgid ""
-"Boot from hard disk: This choice allows to boot from hard disk, as usual, "
-"when no media (CD/DVD or USB stick) is connected. (not working with Mageia "
-"5)."
+"Press <keycap>F2</keycap> to have the installer use a specific language "
+"during the installation. Use the arrow keys to select the language then "
+"press <keycap>Enter</keycap>."
 msgstr ""
-"Spustiť z pevného disku: Táto voľba dovoľuje zaviesť systém z pevného disku, "
-"tak ako zvyčajne, keď žiadne médium (CD/DVD alebo USB kľúč) nie je "
-"pripojené. (nepracuje sa s Mageiou 5)."
 
-#. type: Content of: <section><section><para>
-#: en/bootLive.xml:19
-msgid "In the bottom menu, are the Boot Options:"
-msgstr "V spodnej ponuke sú Možnosti Zavedenia systému:"
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:87
+#, fuzzy
+msgid "<keycap>F3</keycap> <emphasis role=\"bold\">Video Mode</emphasis>"
+msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:19
+#: en/bootLive.xml:89
+#, fuzzy
 msgid ""
-"F1 - Help. Explain the options \"splash\", \"apm\", \"acpi\" and \"Ide\""
+"If needed, change the screen resolution by pressing <keycap>F3</keycap>. "
+"Options are: 640x480, 800x600, 1024x768."
 msgstr ""
-"F1 - Pomoc. Vysvetľuje možnosti \"splash\", \"apm\", \"acpi\" a \"Ide\""
+"Zmeňte rozlíšenie obrazovky stlačením klávesy F3 (len v obstarožnom režime)."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:20
-msgid "F2 - Language. Choose the display language of the screens."
-msgstr "F2 - Jazyk. Vyberte si pre zobrazenie jazyka obrazoviek."
+#: en/bootLive.xml:93
+#, fuzzy
+msgid "<keycap>F4</keycap> <emphasis role=\"bold\">Source</emphasis>"
+msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:21
-msgid "F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728"
+#: en/bootLive.xml:94
+msgid ""
+"Normally, the installation is performed from the inserted installation "
+"medium. Here, you may select other sources, like FTP or NFS servers."
 msgstr ""
-"F3 - Rozlíšenie obrazovky. Voľba medzi textom, 640x400, 800x600, 1024x728"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:22
+#: en/bootLive.xml:95
+#, fuzzy
 msgid ""
-"F4 - CD-Rom. CD-Rom or Other. Normally, the installation is performed from "
-"the inserted installation medium. Here, select other sources, like FTP or "
-"NFS servers. If the installation is carried out in a network with an SLP "
-"server, select one of the installation sources available on the server with "
-"this option."
+"If the installation is carried out in a network with an SLP server, then "
+"select one of the installation sources available on the server with this "
+"option."
 msgstr ""
 "F4 - CD-Rom. CD-Rom alebo Ďalšie. Normálne sa inštalácia vykoná z vloženého "
 "inštalačného média. Tu si vyberáte iné zdroje, akými sú FTP alebo NFS "
@@ -698,124 +772,172 @@ msgstr ""
 "možnosti si vyberte jeden z inštalačných zdrojov dostupných na serveri."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:26
+#: en/bootLive.xml:98
+#, fuzzy
+msgid "<keycap>F5</keycap> <emphasis role=\"bold\">Driver</emphasis>"
+msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:99
 msgid ""
-"F5 - Driver. Yes or No. The system is aware about the presence of an "
-"optional disk with a driver update and will require its insertion during "
-"installation process."
+"If you have a driver update that you wish to use, select this option and "
+"then answer <emphasis>Yes</emphasis>. You will be prompted to insert the "
+"update disc at the appropriate time."
 msgstr ""
-"F5 - Ovládač. Áno alebo Nie. Systém je upovedomený o prítomnosti voliteľného "
-"disku s aktualizáciou ovládača a bude požadovať jeho vloženie počas procesu "
-"inštalácie."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:28
+#: en/bootLive.xml:104
+#, fuzzy
+msgid "<keycap>F6</keycap> <emphasis role=\"bold\">Kernel Options</emphasis>"
+msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:106
 msgid ""
-"F6 - Kernel options. This is a way to specify options according to your "
-"hardware and the drivers to use."
+"If you experience problems with the installation, you could try modifying "
+"the default settings using the <emphasis>Kernel Option</emphasis> menu:"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/bootLive.xml:111
+#, fuzzy
+msgid ""
+"<emphasis role=\"bold\">Default:</emphasis> splash quiet noiswmd resume "
+"audit=0"
+msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/bootLive.xml:114
+msgid ""
+"<emphasis role=\"bold\">Safe Settings:</emphasis> <literal>apm=off acpi=off "
+"mce=off barrier=off ide=nodma idewait=50 i8042.nomux psmouse.proto=bare "
+"irqpoll pci=nommconf</literal>"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/bootLive.xml:120
+#, fuzzy
+msgid ""
+"<emphasis role=\"bold\">No ACPI:</emphasis> (Advanced Configuration and "
+"Power Interface): Power management features are not used."
+msgstr ""
+"- Žiadne ACPI (Pokročilé rozhrania konfigurácie a napájania), spravovanie "
+"napájania nie je brané do úvahy."
+
+#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/bootLive.xml:125
+#, fuzzy
+msgid ""
+"<emphasis role=\"bold\">No Local APIC:</emphasis> (Local Advanced "
+"Programmable Interrupt Controller): CPU interrupt. Select this option if you "
+"experience system misbehaviour like a kernel panic in relation to APIC."
+msgstr ""
+"- Žiaden lokálny APIC (lokálny pokročilý programovateľný ovládač prerušení), "
+"jedná sa o prerušenia CPU, vyberte túto možnosť, ak ste k tomu vyzvaní."
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:131
+msgid ""
+"If you open any of the above <keycap>F6</keycap> menu items, and then click "
+"on <keycap>F1</keycap>, an info window will open to show more details for "
+"that particular item:"
 msgstr ""
-"F6 - Voľby jadra. Toto je cesta pre zadanie volieb vzťahujúcich sa k vášmu "
-"hardvéru a ovládačom, ktoré sa použijú."
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:29
+#: en/bootLive.xml:139
 msgid "In UEFI mode"
 msgstr "V UEFI režime"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:29
+#: en/bootLive.xml:142
+#, fuzzy
 msgid ""
-"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
-"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"live-bootUEFI.png\" align="
+"\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
 "align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:29
-msgid "First screen while booting on UEFI system from disk"
-msgstr "Prvá obrazovka počas štartu na UEFI systémoch z disku"
+#: en/bootLive.xml:146
+#, fuzzy
+msgid "First screen while booting in UEFI mode"
+msgstr "Prvá obrazovka počas spúšťania v BIOSovom režime"
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:29
-msgid ""
-"You have only the choice to run Mageia in Live mode (first choice)  or to "
-"process the installation (second choice)."
+#: en/bootLive.xml:149
+msgid "In UEFI mode, you have just the two menu options to choose from:"
 msgstr ""
-"Tu máte len možnosť spustiť Mageiu v Živom režime (prvá voľba) alebo spustiť "
-"inštaláciu (druhá voľba)."
 
-#. type: Content of: <section><section><para>
-#: en/bootLive.xml:30
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:153
+#, fuzzy
 msgid ""
-"If you booted from a USB stick, you get two supplemental lines which are a "
-"duplicata of the previous lines suffixed with \"USB\". You have to choose "
-"them."
+"This option will boot the Mageia Live system from the connected Dvd/USB "
+"media (expect a very slow system compared to an installed OS). Once the boot "
+"is done, you can proceed to the installation"
 msgstr ""
-"Ak ste naštartovali počítač z USB kľúča, dostanete dva doplňujúce riadky, "
-"ktoré sú duplikáty predošlých riadkov zakončené so skratkou \"USB\". Máte "
-"ich na výber."
+"Zaviesť Mageiu: Toto znamená že Mageia 5 sa spustí z pripojeného nosiča (CD/"
+"DVD alebo USB kľúča) bez akéhokoľvek zapisovania na disk, takže očakávajte "
+"veľmi pomalý systém. Keď sa zavádzanie dokončí, môžete prikročiť i ku "
+"inštalácií na pevný disk."
 
-#. type: Content of: <section><section><para>
-#: en/bootLive.xml:32
+#. type: Content of: <section><section><note><para>
+#: en/bootLive.xml:161
 msgid ""
-"In each case, the first steps will be the same to choose language, timezone "
-"and keyboard, then the processes differ, with <link linkend=\"testing"
-"\">additional steps in Live mode</link>."
+"If you booted from a USB stick, you will see the above menu options "
+"duplicated, and in this case, you should choose from the menu pair that will "
+"be suffixed with \"USB\"."
 msgstr ""
-"V každom prípade budú prvé kroky rovnaké - vybrať si jazyk, časovú zónu a "
-"klávesnicu; potom sa postupy odlišujú v <link linkend=\"testing"
-"\">dodatočných krokoch v Živom režime</link>."
 
 #. type: Content of: <section><info><title>
-#: en/chooseDesktop.xml:3
+#: en/chooseDesktop.xml:16
 msgid "Desktop Selection"
 msgstr "Výber pracovného prostredia"
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:8
-#, fuzzy
-msgid ""
-"Depending on your selection here, you may be offered further screens to fine-"
-"tune your choice."
+#: en/chooseDesktop.xml:23
+msgid "Some choices made here will open other screens with related options."
 msgstr ""
-"V závislosti na tomto vašom výbere, vám môžu byť ponúknuté ďalšie obrazovky "
-"k jemnému doladeniu vášho výberu."
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:11
+#: en/chooseDesktop.xml:26
 #, fuzzy
 msgid ""
-"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"
+"After the selection step(s), you will see a slideshow during the "
+"installation of required packages. The slideshow can be disabled by pressing "
+"the <emphasis>Details</emphasis> button."
 msgstr ""
 "Po kroku (resp. krokoch) výberu uvidíte pohyblivú prehliadku počas počas "
 "inštalácie balíčkov. Prehliadka môže byť vypnutá stlačením tlačidla "
 "<guilabel>Detaily</guilabel>."
 
 #. type: Content of: <section><mediaobject>
-#: en/chooseDesktop.xml:16
+#: en/chooseDesktop.xml:31
 #, fuzzy
 msgid ""
-"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
-"align=\"center\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-chooseDesktop.png\" "
+"format=\"PNG\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
-"</imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
+"\"/> </imageobject>"
 
-#. type: Content of: <section><para>
-#: en/chooseDesktop.xml:21
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/chooseDesktop.xml:38
+msgid ""
+"Choose whether you prefer to use the KDE Plasma or GNOME desktop "
+"environment. Both come with a full set of useful applications and tools."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/chooseDesktop.xml:44
 #, fuzzy
 msgid ""
-"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."
+"Select <emphasis>Custom</emphasis> if you do not wish to use either (or, "
+"actually use both) of these, or if you want to modify the default software "
+"choices for these desktop environments. The LXDE desktop, for instance, is "
+"lighter than the previous two, sporting less eye candy and having fewer "
+"packages installed by default."
 msgstr ""
 "Vyberte si, či chcete používať prostredie obrazovky <application>KDE</"
 "application> alebo <application>Gnome</application>. Obe prostredia sú "
@@ -832,8 +954,9 @@ msgid "Package Group Selection"
 msgstr "Výber skupín balíkov"
 
 #. Lebarhon 20170209 Updated SC
+#. 2018/02/25 apb: add xreflabel to this section.
 #. type: Content of: <section><mediaobject>
-#: en/choosePackageGroups.xml:9
+#: en/choosePackageGroups.xml:11
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
@@ -843,7 +966,7 @@ msgstr ""
 "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:14
+#: en/choosePackageGroups.xml:16
 #, fuzzy
 msgid ""
 "Packages are arranged into common groups, to make choosing what you need on "
@@ -857,25 +980,25 @@ msgstr ""
 "zájsť s myšou nad názov skupiny."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:21
+#: en/choosePackageGroups.xml:23
 #, fuzzy
 msgid "<emphasis role=\"bold\">Workstation</emphasis>"
 msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:25
+#: en/choosePackageGroups.xml:27
 #, fuzzy
 msgid "<emphasis role=\"bold\">Server</emphasis>"
 msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:29
+#: en/choosePackageGroups.xml:31
 #, fuzzy
 msgid "<emphasis role=\"bold\">Graphical Environment</emphasis>"
 msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:33
+#: en/choosePackageGroups.xml:35
 #, fuzzy
 msgid ""
 "<emphasis role=\"bold\">Individual Package Selection</emphasis>: you can use "
@@ -885,7 +1008,7 @@ msgstr ""
 "alebo odobranie balíčkov."
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:38
+#: en/choosePackageGroups.xml:40
 #, fuzzy
 msgid ""
 "See <xref linkend=\"minimal-install\"/> for instructions on how to do a "
@@ -900,8 +1023,10 @@ msgid "Choose Individual Packages"
 msgstr "Výber jednotlivých balíčkov"
 
 #. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
+#. 2018/02/15 apb: Text and typography.
+#. 2018/02/25 apb: add xreflabel to this section.
 #. type: Content of: <section><mediaobject>
-#: en/choosePackagesTree.xml:9
+#: en/choosePackagesTree.xml:13
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackagesTree.png"
@@ -911,7 +1036,7 @@ msgstr ""
 "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:14
+#: en/choosePackagesTree.xml:18
 #, fuzzy
 msgid ""
 "Here you can add or remove any extra packages to customize your installation."
@@ -920,13 +1045,14 @@ msgstr ""
 "inštalácie."
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:17
+#: en/choosePackagesTree.xml:21
+#, fuzzy
 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 "
-"to a USB key works, too). You can then use this file to install the same "
-"packages on another system, by pressing the same button during install and "
-"choosing to load it."
+"After having made your choice, you can click on the <emphasis>floppy</"
+"emphasis> icon at the bottom of the page to save your choice of packages "
+"(saving to a USB key works, too). You can then use this file to install the "
+"same packages on another system, by pressing the same button during install "
+"and choosing to load it."
 msgstr ""
 "Po učinení vášho výberu, môžete kliknúť na <guibutton>ikonu diskety</"
 "guibutton> naspodku stránky pre uloženie vášho výberu balíčkov (funguje i "
@@ -941,8 +1067,10 @@ msgstr "Nastavenie služieb"
 
 #.  2012-12-25 marja - moved this section out of misc-params.xml 
 #.  2013-05-05 marja - added screenshot 
+#.  2018/02/16 apb: Minor text adjustment.
+#. 2018/02/25 apb: a) add xreflabel for this section. b) Added some bullets to the text.
 #. type: Content of: <section><mediaobject>
-#: en/configureServices.xml:11
+#: en/configureServices.xml:15
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-configureServices.png"
@@ -953,26 +1081,22 @@ msgstr ""
 "format=\"PNG\" xml:id=\"soundConfig-im1\" /> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:16
+#: en/configureServices.xml:20
 #, fuzzy
 msgid ""
 "Here you can choose which services should start when you boot your system."
 msgstr ""
 "Tu si môžete nastaviť, ktoré služby (ne)spúšťať pri zavádzaní vášho systému."
 
-#. type: Content of: <section><para>
-#: en/configureServices.xml:19
-msgid "Click on a triangle to expand a group to all the relevant services."
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureServices.xml:25
+msgid ""
+"Click on a triangle to expand a group to all the relevant services. The "
+"settings DrakX chose are usually good."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/configureServices.xml:22
-#, fuzzy
-msgid "The settings DrakX chose are usually good."
-msgstr "Nastavenia ktoré DrakX vybral si zvyčajne dobré."
-
-#. type: Content of: <section><para>
-#: en/configureServices.xml:25
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureServices.xml:31
 msgid ""
 "If you highlight a service, some information about it is shown in the info "
 "box below."
@@ -981,7 +1105,7 @@ msgstr ""
 "nižšie."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:28
+#: en/configureServices.xml:37
 msgid "Only change things when you know very well what you are doing."
 msgstr "Veci meňte len vtedy, keď veľmi dobre viete, čo robíte."
 
@@ -992,15 +1116,17 @@ msgstr "Nastavenie časového pásma"
 
 #.  2012-12-25 marja - moved this part out of misc-params.xml 
 #.  2013-05-05 marja - added screenshot 
+#. 2018/02/13 apb: Minor text adjustment.
+#. 2018/02/25 apb: Added xreflabel to this section.
 #. type: Content of: <section><mediaobject>
-#: en/configureTimezoneUTC.xml:11
+#: en/configureTimezoneUTC.xml:15
 #, fuzzy
 msgid ""
 "<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>"
+"configureTimezoneUTC.png\" revision=\"1\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata format=\"png\" fileref=\"live-timeZone.png\" "
+"align=\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata xml:id="
 "\"configureTimezoneUTC-im1\" revision=\"1\" fileref=\"dx2-"
@@ -1008,18 +1134,18 @@ msgstr ""
 "<imageobject> <imagedata fileref=\"live-timeZone.png\" condition=\"live\" "
 "format=\"PNG\"/> </imageobject>"
 
-#. type: Content of: <section><para>
-#: en/configureTimezoneUTC.xml:20
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureTimezoneUTC.xml:26
 #, fuzzy
 msgid ""
-"Choose your time-zone by choosing your country or a city close to you in the "
-"same time-zone."
+"Choose your timezone by choosing your country, or a city close to you in the "
+"same timezone."
 msgstr ""
 "Vyberte si časové pásmo výberom vašej zeme alebo mesta blízko vás v rovnakom "
 "časovom pásme."
 
 #. type: Content of: <section><para>
-#: en/configureTimezoneUTC.xml:24
+#: en/configureTimezoneUTC.xml:32
 #, fuzzy
 msgid ""
 "In the next screen you can choose to set your hardware clock to local time "
@@ -1029,7 +1155,7 @@ msgstr ""
 "miestny čas alebo na GMT, známy aj ako UTC."
 
 #. type: Content of: <section><note><para>
-#: en/configureTimezoneUTC.xml:29
+#: en/configureTimezoneUTC.xml:37
 msgid ""
 "If you have more than one operating system on your computer, make sure they "
 "are all set to local time, or all to UTC/GMT."
@@ -1038,24 +1164,24 @@ msgstr ""
 "všetky nastavené na miestny čas, alebo všetky na UTC/GMT."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:13
+#: en/configureX_card_list.xml:24
 msgid "Choose an X Server (Configure your Graphic Card)"
 msgstr "Výber X Servera (Konfigurácia vašej grafickej karty)"
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_card_list.xml:18
+#: en/configureX_card_list.xml:29
 #, fuzzy
 msgid ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_card_list-im1\" "
-"align=\"center\" fileref=\"dx2-configureX_card_list.png\" revision=\"1\"/> </"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_card_list."
+"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_card_list-im1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
-"\"1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
+"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:23
+#: en/configureX_card_list.xml:35
 msgid ""
 "DrakX has a very comprehensive database of video cards and will usually "
 "correctly identify your video device."
@@ -1064,7 +1190,7 @@ msgstr ""
 "identifikuje video zariadenie."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:26
+#: en/configureX_card_list.xml:38
 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:"
@@ -1072,99 +1198,96 @@ msgstr ""
 "Ak vaša grafická karta nie je správne rozpoznaná inštalačným programom a vy "
 "viete, akú máte kartu, môžete ju vybrať zo stromu:"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:29 en/configureX_monitor.xml:57
-msgid "vendor"
+#. type: Content of: <section><variablelist><varlistentry><term>
+#: en/configureX_card_list.xml:41 en/configureX_monitor.xml:74
+#, fuzzy
+msgid "Vendor"
 msgstr "dodávateľ"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:33
-msgid "then the name of your card"
+#: en/configureX_card_list.xml:45
+#, fuzzy
+msgid "then the make of your card"
 msgstr "potom názov vašej karty"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:37
-msgid "and the type of card"
+#: en/configureX_card_list.xml:49
+#, fuzzy
+msgid "and the model of card"
 msgstr "a typ vašej karty"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:41
+#: en/configureX_card_list.xml:53
 #, 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 "
-"<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."
+"<emphasis>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 VESA driver which provides "
+"basic capabilities."
 msgstr ""
 "Zoznam Xorg poskytuje viac než 40 všeobecných a open source ovládačov "
 "grafických kariet. Ak stále nemôžete nájsť názov ovládača pre kartu, "
 "existuje možnosť použitia VESA ovládača, ktorý poskytuje základné možnosti."
 
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:47
+#. type: Content of: <section><caution><para>
+#: en/configureX_card_list.xml:61
 #, fuzzy
 msgid ""
 "Be aware that if you select an incompatible driver you may only have access "
-"to the <emphasis role=\"bold\">Command-line</emphasis> Interface."
+"to the <emphasis>Command Line Interface</emphasis>"
 msgstr ""
 "Pamätajte, že ak vyberiete nekompatibilný ovládač, môžete mať prístup iba k "
 "rozhraniu príkazového riadka."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:51
+#: en/configureX_card_list.xml:65
 #, fuzzy
 msgid ""
 "Some video card manufacturers provide proprietary drivers for Linux which "
-"may only be available in the <emphasis role=\"bold\">Nonfree</emphasis> "
-"repository and in some cases only from the card manufacturers' websites."
+"may only be available in the <emphasis>Nonfree</emphasis> repository and in "
+"some cases only from the card manufacturers' websites. The "
+"<emphasis>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 ""
 "Niektorí výrobcovia grafických kariet poskytujú proprietárne ovládače pre "
 "Linux, ktoré môžu byť k dispozícii v nonfree úložisku a v niektorých "
 "prípadoch len z webových stránok výrobcu karty."
 
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:56
-#, fuzzy
-msgid ""
-"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 ""
-"Prístup k Nonfree úložisku musí byť výslovne povolený pre ich sprístupnenie. "
-"Ak tomu tak nie je, najskôr ho povoľte. Toto by ste mali urobiť po prvom "
-"reštarte."
-
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:3
+#: en/configureX_chooser.xml:11
 msgid "Graphic Card and Monitor Configuration"
 msgstr "Nastavenie grafickej karty a monitoru"
 
 #.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
+#. 2018/02/15 apb: Some text and typography.
+#. 2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.
+#. 2018/02/23 apb: Typo.
 #. type: Content of: <section><mediaobject>
-#: en/configureX_chooser.xml:10
+#: en/configureX_chooser.xml:24
 #, fuzzy
 msgid ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_chooser-im1\" "
-"fileref=\"dx2-configureX_chooser.png\" align=\"center\" revision=\"1\"/> </"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_chooser."
+"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_chooser-im1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
-"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
+"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:15
+#: en/configureX_chooser.xml:30
 #, 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> 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."
+"you chose for this install of Mageia, they are all based on a graphical user "
+"interface system called <literal>X Window System</literal>, or simply "
+"<quote>X</quote>. So in order for KDE Plasma, GNOME, LXDE or any other "
+"graphical environment to work well, the following <quote>X</quote> settings "
+"need to be correct. Choose the appropriate settings - if none are shown, or "
+"if you think the details are incorrect."
 msgstr ""
 "Bez ohľadu na to, ktoré grafické prostredie (známe aj ako prostredie "
 "pracovnej plochy) ste si vybrali pre túto inštaláciu <application>Mageia</"
@@ -1178,23 +1301,33 @@ msgstr ""
 "myslíte, že voľba je nekorektná."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:27
+#: en/configureX_chooser.xml:41
+#, fuzzy
+msgid "<emphasis role=\"bold\">Graphic Card</emphasis>"
+msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_chooser.xml:44
 msgid ""
-"<emphasis><guibutton>Graphic card</guibutton></emphasis>: Choose your card "
-"from the list if needed."
+"If you need to, you can select a specific card from this expandable list. "
+"See <xref linkend=\"configureX_card_list\"/>."
 msgstr ""
-"<emphasis><guibutton>Grafická karta</guibutton></emphasis>: Vyberte zo "
-"zoznamu vašu kartu, ak je to treba."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:33
+#: en/configureX_chooser.xml:49
+#, fuzzy
+msgid "<emphasis role=\"bold\">Monitor</emphasis>"
+msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_chooser.xml:52
 #, fuzzy
 msgid ""
-"<emphasis><guibutton>Monitor</guibutton></emphasis>: You can choose "
-"<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."
+"You can choose Plug'n Play, if applicable, or choose your monitor from the "
+"<emphasis>Vendor</emphasis> or <emphasis>Generic</emphasis> list. Choose "
+"<emphasis>Custom</emphasis> if you prefer to manually set the horizontal and "
+"vertical refresh rates of your monitor. See <xref linkend="
+"\"configureX_monitor\"/>."
 msgstr ""
 "<emphasis><guibutton>Monitor</guibutton></emphasis>: Máte na výber možnosť "
 "<guilabel>Plug'n Play</guilabel> ak je použiteľná, alebo si vybrať váš "
@@ -1203,32 +1336,37 @@ msgstr ""
 "guilabel>, ak uprednostňujete ručné nastavenie horizontálnej a vertikálnej "
 "obnovovacej frekvencie vášho monitora."
 
-#. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/configureX_chooser.xml:41
-msgid "Incorrect refresh rates may damage your monitor"
-msgstr "Nesprávne obnovovacie frekvencie môžu zničiť váš monitor"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_chooser.xml:60
+#, fuzzy
+msgid "<emphasis role=\"bold\">Resolution</emphasis>"
+msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:47
+#: en/configureX_chooser.xml:63
 #, fuzzy
-msgid ""
-"<emphasis><guibutton>Resolution</guibutton></emphasis>: The resolution and "
-"color depth of your monitor can be set here."
+msgid "The resolution and color depth of your monitor can be set here"
 msgstr ""
 "<emphasis><guibutton>Rozlíšenie</guibutton></emphasis>: Tu nastavte "
 "požadované rozlíšenie a farebnú hĺbku vášho monitora."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:52
+#: en/configureX_chooser.xml:68
+#, fuzzy
+msgid "<emphasis role=\"bold\">Test</emphasis>"
+msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_chooser.xml:71
 #, fuzzy
 msgid ""
-"<emphasis><guibutton>Test</guibutton></emphasis>: The test button does not "
-"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."
+"The test button does not always appear during install. If the option is "
+"there, and you test your settings, you should be asked whether your settings "
+"are correct. If you answer <emphasis>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>: Nie vždy sa testovacie "
 "tlačidlo objaví počas inštalácie. Ak tu je toto tlačidlo, môžete upraviť "
@@ -1240,21 +1378,35 @@ msgstr ""
 "dispozícii.</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:63
-msgid ""
-"<emphasis><guibutton>Options</guibutton></emphasis>: Here you can choose to "
-"enable or disable various options."
+#: en/configureX_chooser.xml:81
+#, fuzzy
+msgid "<emphasis role=\"bold\">Options</emphasis>"
+msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_chooser.xml:84
+#, fuzzy
+msgid "Here you can choose to enable or disable various options"
 msgstr ""
 "<emphasis><guibutton>Možnosti</guibutton></emphasis>: Tu si môžete vybrať, "
 "či povoliť alebo zakázať rôzne možnosti."
 
+#. type: Content of: <section><warning><para>
+#: en/configureX_chooser.xml:89
+msgid ""
+"There is a risk of damaging a monitor if you choose refresh rates that are "
+"outside the frequency range of that monitor. This applies to older CRT "
+"displays: modern monitors will reject an unsupported frequency and normally "
+"enter standby mode."
+msgstr ""
+
 #. type: Content of: <section><info><title>
-#: en/configureX_monitor.xml:11
+#: en/configureX_monitor.xml:22
 msgid "Choosing your Monitor"
 msgstr "Výber vášho monitoru"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:14
+#: en/configureX_monitor.xml:25
 msgid ""
 "DrakX has a very comprehensive database of monitors and will usually "
 "correctly identify yours."
@@ -1263,7 +1415,7 @@ msgstr ""
 "ten váš."
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:19
+#: en/configureX_monitor.xml:30
 #, fuzzy
 msgid ""
 "<emphasis role=\"bold\">Selecting a monitor with different characteristics "
@@ -1277,25 +1429,26 @@ msgstr ""
 "vášmu monitoru."
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:26
-#, fuzzy
+#: en/configureX_monitor.xml:38
 msgid ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_monitor-im1\" "
-"fileref=\"dx2-configureX_monitor.png\" align=\"center\" revision=\"1\"/> </"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
+"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
-"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
+"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:31
-msgid "<emphasis>Custom</emphasis>"
-msgstr "<emphasis>Vlastné</emphasis>"
+#. type: Content of: <section><variablelist><varlistentry><term>
+#: en/configureX_monitor.xml:46
+msgid "Custom"
+msgstr "Vlastný výber"
 
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:33
+#. type: Content of: <section><variablelist><varlistentry><listitem><para>
+#: en/configureX_monitor.xml:49
+#, fuzzy
 msgid ""
-"This option allows you to set two critical parameters, the vertical refresh "
+"This option allows you to set two critical parameters: the vertical refresh "
 "rate and the horizontal sync rate. Vertical refresh determines how often the "
 "screen is refreshed and horizontal sync is the rate at which scan lines are "
 "displayed."
@@ -1305,8 +1458,8 @@ msgstr ""
 "obnovovanie určuje, ako často je obrazovka obnovovaná a horizontálna "
 "synchronizácie je rýchlosť, ktorou sú zobrazované skenované riadky."
 
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:38
+#. type: Content of: <section><variablelist><varlistentry><listitem><para>
+#: en/configureX_monitor.xml:55
 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 "
@@ -1318,27 +1471,23 @@ msgstr ""
 "ste tým poškodiť svoj monitor. Ak ste v pochybnostiach, vyberte si "
 "konzervatívne nastavenie a preverte ho v dokumentácii k vášmu monitoru."
 
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:44
-msgid "<emphasis>Plug 'n Play</emphasis>"
-msgstr "<emphasis>Plug 'n Play</emphasis>"
+#. type: Content of: <section><variablelist><varlistentry><term>
+#: en/configureX_monitor.xml:64
+msgid "Plug'n Play"
+msgstr ""
 
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:47
+#. type: Content of: <section><variablelist><varlistentry><listitem><para>
+#: en/configureX_monitor.xml:67
+#, fuzzy
 msgid ""
-"This is the default option and tries to determine the monitor type from the "
-"monitor database."
+"This is the default option and automatically tries to determine the monitor "
+"type from the monitor database."
 msgstr ""
 "Toto je predvolená možnosť, ktorá vyskúša určiť typ monitora z databázy "
 "monitorov."
 
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:51
-msgid "<emphasis>Vendor</emphasis>"
-msgstr "<emphasis>Dodávateľ</emphasis>"
-
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:53
+#. type: Content of: <section><variablelist><varlistentry><listitem><para>
+#: en/configureX_monitor.xml:77
 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:"
@@ -1346,31 +1495,30 @@ msgstr ""
 "Ak inštalátor korektne nerozpoznal váš monitor a vy viete, ktorý máte, "
 "môžete si ho zvoliť zo stromu pomocou výberu:"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:61
-msgid "the monitor manufacturers name"
-msgstr "mena výrobcu monitora"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_monitor.xml:86
+msgid "Manufacturer"
+msgstr ""
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:65
-msgid "the monitor description"
-msgstr "popisu monitora"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_monitor.xml:90
+msgid "Monitor model"
+msgstr ""
 
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:69
-msgid "<emphasis>Generic</emphasis>"
-msgstr "<emphasis>Všeobecný</emphasis>"
+#. type: Content of: <section><variablelist><varlistentry><term>
+#: en/configureX_monitor.xml:96
+msgid "Generic"
+msgstr ""
 
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:71
+#. type: Content of: <section><variablelist><varlistentry><listitem><para>
+#: en/configureX_monitor.xml:99
 #, fuzzy
 msgid ""
-"selecting this group will list nearly 30 display configurations such as "
-"1024x768 @ 60Hz and includes flat panel displays as used in laptops. This is "
-"often a good monitor selection group if you need to use the <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."
+"Selecting this group will list nearly 30 display configurations such as "
+"1024x768 @ 60Hz and includes flat-panel displays as used in laptops. This is "
+"often a good monitor selection group if you need to use the VESA card driver "
+"when your video hardware cannot be determined automatically.  Once again it "
+"may be wise to be conservative in your selections."
 msgstr ""
 "výber tejto skupiny zobrazí približne 30 konfigurácií obrazovky, ako sú "
 "1024x768 @ 60Hz zahŕňajúc i ploché panelové obrazovky, aké sú používané v "
@@ -1380,132 +1528,142 @@ msgstr ""
 "vašom výbere."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:7
-msgid "Custom disk partitioning with DiskDrake"
+#: en/diskdrake.xml:22
+#, fuzzy
+msgid "Custom Disk Partitioning with DiskDrake"
 msgstr "Vlastné rozdelenie disku pomocou DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:12
+#: en/diskdrake.xml:27
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
-"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-diskdrake.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-diskdrake.png\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
 "align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
-#. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:22
-#, fuzzy
-msgid ""
-"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 ""
-"Ak si prajete použiť šifrovanie na vašej <literal>/</literal> partícii, "
-"musíte sa uistiť, že máte odčlenenú <literal>/boot</literal> partíciu. "
-"Možnosť zašifrovania NESMIE byť nastavená pre zavádzaciu <literal>/boot</"
-"literal> partíciu, inak váš systém nebude možné zaviesť."
-
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:29
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/diskdrake.xml:38
 #, fuzzy
 msgid ""
-"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 their details before you start."
+"Modify the layout of your disk(s) here. You can remove or create partitions, "
+"change the filesystem or size of a partition and even view their details "
+"before you start."
 msgstr ""
 "Tu upravíte rozloženie vášho disku (diskov). Môžete odstraňovať alebo "
 "vytvárať partície, meniť súborový systém partície, alebo meniť jej veľkosť a "
 "dokonca si prezrieť, čo je v nich, predtým ako začnete."
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:34
-msgid ""
-"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 ""
-
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:39
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/diskdrake.xml:45
 #, fuzzy
 msgid ""
-"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."
+"There is a tab at the top for every detected hard disk (or other storage "
+"device, like a USB key). In the screenshot above there are two available "
+"devices: <filename>sda </filename>and <filename>sdb</filename>."
 msgstr ""
-"Stlačte <guibutton>Vyčistiť všetko</guibutton> pre zmazanie všetkých "
-"partícií na vybranom úložnom zariadení."
+"Je tam karta pre každý nájdený pevný disk alebo iné úložné zariadenie, ako "
+"je USB kľúč. Napríklad sda, sdb a sdc, ak sú pripojené tri kusy."
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:43
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/diskdrake.xml:52
 #, 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>Expert mode</guibutton> provides more options such as a label "
-"(give a name to) a partition, or to choose a partition type."
+"<emphasis>Expert mode</emphasis> provides more options such as to label "
+"(name) a partition, or to choose a partition type."
 msgstr ""
 "Pre všetky ostatné akcie: kliknite najprv na požadovanú partíciu. Potom si "
 "ju prezrite, alebo si vyberte súborový systém a prípojný bod, zmeňte je "
 "veľkosť alebo ju prečistite."
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:49
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/diskdrake.xml:60
 #, fuzzy
-msgid "Continue until you have adjusted everything to your satisfaction."
+msgid ""
+"Continue until you have adjusted everything to your satisfaction, then click "
+"<emphasis>Done</emphasis> when you're ready."
 msgstr "Pokračujte dokým ste nenastavili všetko podľa vášho priania."
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:52
-msgid "Click <guibutton>Done</guibutton> when you're ready."
+#. type: Content of: <section><warning><orderedlist><listitem><para>
+#: en/diskdrake.xml:69
+#, fuzzy
+msgid ""
+"Take care with the <emphasis>Clear all</emphasis> option, use it only if you "
+"are sure you want to wipe all partitions on the selected storage device."
 msgstr ""
-"Kliknite na tlačidlo <guibutton>Hotovo</guibutton>, keď ste nachystaní."
+"Stlačte <guibutton>Vyčistiť všetko</guibutton> pre zmazanie všetkých "
+"partícií na vybranom úložnom zariadení."
 
-#. type: Content of: <section><note><para>
-#: en/diskdrake.xml:56
+#. type: Content of: <section><warning><orderedlist><listitem><para>
+#: en/diskdrake.xml:75
+#, fuzzy
+msgid ""
+"If you wish to use encryption on your <filename>/</filename> partition you "
+"must ensure that you have a separate <filename>/boot</filename> partition. "
+"The encryption option for the <filename>/boot</filename> partition must NOT "
+"be set, otherwise your system will be unbootable."
+msgstr ""
+"Ak si prajete použiť šifrovanie na vašej <literal>/</literal> partícii, "
+"musíte sa uistiť, že máte odčlenenú <literal>/boot</literal> partíciu. "
+"Možnosť zašifrovania NESMIE byť nastavená pre zavádzaciu <literal>/boot</"
+"literal> partíciu, inak váš systém nebude možné zaviesť."
+
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/diskdrake.xml:87
 #, fuzzy
 msgid ""
 "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)"
+"Partition) is present and correctly mounted on <filename>/boot/EFI</"
+"filename>. See Figure 1 below."
+msgstr ""
+"Ak inštalujete Mageiu na UEFI systém, skontrolujte, či ESP (EFI Systémová "
+"Partícia) je prítomná a správne pripojená na /boot/EFI (viď vyššie)"
+
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/diskdrake.xml:93
+#, fuzzy
+msgid ""
+"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
+"partition is present and of the correct type. See Figure 2 below."
 msgstr ""
 "Ak inštalujete Mageiu na UEFI systém, skontrolujte, či ESP (EFI Systémová "
 "Partícia) je prítomná a správne pripojená na /boot/EFI (viď vyššie)"
 
-#. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:61
+#. type: Content of: <section><figure><title>
+#: en/diskdrake.xml:101
+#, fuzzy
+msgid "EFI System Partition"
+msgstr "Použiť existujúce partície"
+
+#. type: Content of: <section><figure><mediaobject>
+#: en/diskdrake.xml:104
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
-"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-diskdrake2.png\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
 "align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
-#. type: Content of: <section><note><para>
-#: en/diskdrake.xml:60
+#. type: Content of: <section><figure>
+#: en/diskdrake.xml:103 en/diskdrake.xml:117
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
-#. type: Content of: <section><note><para>
-#: en/diskdrake.xml:72
-#, fuzzy
-msgid ""
-"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
-"partition is present and of the correct type"
+#. type: Content of: <section><figure><title>
+#: en/diskdrake.xml:115
+msgid "BIOS boot partition"
 msgstr ""
-"Ak inštalujete Mageiu na UEFI systém, skontrolujte, či ESP (EFI Systémová "
-"Partícia) je prítomná a správne pripojená na /boot/EFI (viď vyššie)"
 
-#. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:76
+#. type: Content of: <section><mediaobject>
+#: en/diskdrake.xml:118 en/doPartitionDisks.xml:200
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -1518,52 +1676,59 @@ msgstr ""
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:9
-msgid "Partitioning"
+#: en/doPartitionDisks.xml:25
+#, fuzzy
+msgid "Suggested Partitioning"
 msgstr "Rozdelenie diskov"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:12
+#: en/doPartitionDisks.xml:28
 #, fuzzy
 msgid ""
 "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>."
+"DrakX partitioning proposals for where to install Mageia."
 msgstr ""
 "V tejto obrazovke môžete vidieť obsah vášho pevného disku (diskov) a vidieť "
 "nájdené riešenia DrakXovho sprievodcu rozdeľovaním disku navrhujúce, kam "
 "nainštalovať <application>Mageiu</application>."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:16
+#: en/doPartitionDisks.xml:32
 #, fuzzy
 msgid ""
-"The options available from those shown below will vary according to the "
-"layout and content of your particular hard drive(s)."
+"The actual options available from those shown below will vary according to "
+"the layout and content of your particular hard drive(s)."
 msgstr ""
 "Možnosti dostupné z nižšie uvedeného zoznamu sa budú líšiť v závislosti na "
 "rozložení a obsahu vášho konkrétneho pevného disku."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:21
+#: en/doPartitionDisks.xml:37
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
-"\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks.png\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
 "align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:32
-msgid "Use Existing Partitions"
-msgstr "Použiť existujúce partície"
+#. type: Content of: <section><itemizedlist><title>
+#: en/doPartitionDisks.xml:47
+#, fuzzy
+msgid "Main Options"
+msgstr "Dynamické partície"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:35
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:50
+#, fuzzy
+msgid "<emphasis role=\"bold\">Use Existing Partitions</emphasis>"
+msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:53
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1571,13 +1736,14 @@ msgstr ""
 "Ak je dostupná táto možnosť, potom boli nájdené jestvujúce s Linuxom "
 "kompatibilné partície a môžu byť použité pre inštaláciu."
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:41
-msgid "Use Free Space"
-msgstr "Použiť voľné miesto"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:59
+#, fuzzy
+msgid "<emphasis role=\"bold\">Use Free Space</emphasis>"
+msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:43
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:62
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1585,56 +1751,35 @@ msgstr ""
 "Ak máte nevyužité miesto na vašom pevnom disku, potom ho táto možnosť "
 "využije pre vašu novú inštaláciu Mageie."
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:49
-msgid "Use Free Space on a Windows Partition"
-msgstr "Použiť voľné miesto na Windowsovej partícii"
-
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:68
+#, fuzzy
 msgid ""
-"If you have unused space on an existing Windows partition, the installer may "
-"offer to use it."
-msgstr ""
-"Ak máte nevyužité miesto na existujúcej Windowsovej partícii, inštalátor "
-"môže ponúknuť jeho použitie."
+"<emphasis role=\"bold\">Use Free Space on a Windows Partition</emphasis>"
+msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:56
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:71
+#, fuzzy
 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 "
-"important files!"
+"If you have unused space on an existing Windows partition, the installer may "
+"offer to use it. This can be a useful way of making room for your new Mageia "
+"installation, but is a risky operation so you should make sure you have "
+"backed up all important files!"
 msgstr ""
 "Toto môže byť užitočná cesta vytvorenia priestoru pre vašu novú inštaláciu "
 "Mageie, ale je to riziková operácia, takže by ste sa mali uistiť, že máte "
 "zazálohované všetky dôležité súbory!"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: 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 "
-"correctly the last time it was used. It must also have been defragmented, "
-"although this is not a guarantee that all files in the partition have been "
-"moved out of the area that is about to be used. It is highly recommended to "
-"back up your personal files."
-msgstr ""
-"Pamätajte, že toto znamená zmenšenie veľkosti Windowsovej partície. Partícia "
-"musí byť \"čistá\", to znamená že Windows museli byť korektne vypnuté, keď "
-"boli naposledy použité. Tiež musela byť defragmentovaná, hoci toto nie je "
-"zárukou, že všetky súbory na partícii boli presunuté z oblasti, ktorá má byť "
-"použitá. Vysoko sa odporúča zazálohovať si vaše osobné súbory."
-
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:69
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:77
 #, fuzzy
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
 "light blue and the proposed Mageia partition in dark blue with their "
 "intended sizes just underneath. You have the option to modify these sizes by "
-"clicking and dragging the gap between both partitions. See the following "
-"screen-shot."
+"clicking and dragging the gap between both partitions.  See the following "
+"screenshot:"
 msgstr ""
 "U tejto možnosti, inštalátor zobrazí zostávajúcu Windowsovú partíciu vo "
 "svetlomodrej a budúcu partíciu Mageie v tmavomodrej farbe spolu s ich "
@@ -1642,55 +1787,53 @@ msgstr ""
 "kliknutím a presunutím medzery medzi oboma partíciami. Viď snímku obrazovky "
 "nižšie."
 
-#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:76
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:85
 #, fuzzy
-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-diskdrake.png\" "
-"align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
-"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
-
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:87
-msgid "Erase and use Entire Disk."
-msgstr "Vymazať a použiť Celý Disk."
+msgid "<emphasis role=\"bold\">Erase and use Entire Disk</emphasis>"
+msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:90
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:88
 #, fuzzy
-msgid "This option will allocate the entire drive for Mageia."
+msgid "This option will allocate the entire drive for Mageia"
 msgstr "Táto možnosť použije celé diskové zariadenie pre Mageiu."
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:93
-msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
-msgstr ""
-"Upozornenie! Toto vymaže VŠETKY dáta na vybranom pevnom disku. Teda buďte "
-"opatrní!"
-
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:96
+#. type: Content of: <section><itemizedlist><listitem><warning><para>
+#: en/doPartitionDisks.xml:92
+#, fuzzy
 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 "
-"this option."
+"This will erase ALL data on the selected hard drive. Take care! If you "
+"intend to use part of the disk for something else, or you already have data "
+"on the drive that you are not prepared to lose, then do not use this option."
 msgstr ""
 "Ak zamýšľate použiť čas disku pre niečo iné, alebo už máte dáta na onom "
 "disku, ktoré nie ste pripravení stratiť, potom nepoužívajte túto voľbu."
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:103
+#. type: Content of: <section><itemizedlist><listitem><important><para>
+#: en/doPartitionDisks.xml:99
+msgid ""
+"Note that this involves shrinking the size of the Windows partition. The "
+"partition must be \"clean\", meaning that Windows must have closed down "
+"correctly the last time it was used. It must also have been defragmented, "
+"although this is not a guarantee that all files in the partition have been "
+"moved out of the area that is about to be used. It is highly recommended to "
+"back up your personal files."
+msgstr ""
+"Pamätajte, že toto znamená zmenšenie veľkosti Windowsovej partície. Partícia "
+"musí byť \"čistá\", to znamená že Windows museli byť korektne vypnuté, keď "
+"boli naposledy použité. Tiež musela byť defragmentovaná, hoci toto nie je "
+"zárukou, že všetky súbory na partícii boli presunuté z oblasti, ktorá má byť "
+"použitá. Vysoko sa odporúča zazálohovať si vaše osobné súbory."
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:110
 #, fuzzy
-msgid "Custom disk partitioning"
-msgstr "Vlastné rozdelenie disku pomocou DiskDrake"
+msgid "<emphasis role=\"bold\">Custom Disk Partitioning</emphasis>"
+msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:106
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:113
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1698,33 +1841,39 @@ msgstr ""
 "Toto vám dáva úplnú kontrolu nad umiestnením inštalácie na vašom pevnom "
 "disku (resp. diskoch)."
 
-#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:112
+#. type: Content of: <section><mediaobject>
+#: en/doPartitionDisks.xml:120
 #, fuzzy
-msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
-msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
+"align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
+"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:114
+#: en/doPartitionDisks.xml:129
 msgid ""
-"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:"
+"If you are not using the <emphasis>Custom disk partitioning</emphasis> "
+"option, then the installer will allocate the available space according to "
+"the following rules:"
 msgstr ""
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:120
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:135
 #, fuzzy
 msgid ""
 "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."
+"created. This will be the <filename>/</filename> (root)  partition."
 msgstr ""
 "Ak je celkové dostupné miesto menšie než 50 GB, bude vytvorená len jedna "
 "partícia pre /, nebude tu žiadna samostatná partícia pre /home."
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:125
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:141
 #, fuzzy
 msgid ""
 "If the total available space is greater than 50 GB, then three partitions "
@@ -1732,49 +1881,60 @@ msgid ""
 msgstr ""
 "Ak je celkové dostupné miesto nad 50 GB, potom sa vytvoria tri partície"
 
-#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:130
+#. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:146
 #, fuzzy
 msgid ""
-"6/19 of the total available place is allocated to <emphasis role=\"bold\">/</"
-"emphasis> with a maximum of 50 GB"
+"6/19 of the total available place is allocated to <filename>/</filename> "
+"with a maximum of 50 GB"
 msgstr ""
 "6/19 z celkového dostupného miesta je pridelených pre / ,nanajvýš však 50 GB"
 
-#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:134
-msgid "1/19 is allocated to swap with a maximum of 4 GB"
+#. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:151
+#, fuzzy
+msgid "1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB"
 msgstr "1/19 je pridelená pre swap , nanajvýš však 4 GB"
 
-#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:138
+#. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:156
 #, fuzzy
 msgid ""
-"the rest (at least 12/19) is allocated to <emphasis role=\"bold\">/home.</"
-"emphasis>"
+"the rest (at least 12/19) is allocated to <emphasis>/</"
+"emphasis><filename>home</filename><emphasis role=\"bold\">.</emphasis>"
 msgstr "zvyšok (prinajmenšom 12/19) je pridelený pre /home"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:144
-#, fuzzy
+#: en/doPartitionDisks.xml:164
 msgid ""
-"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>."
+"This means that from 160 GB or greater available space, the installer will "
+"create three partitions:"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:169
+msgid "50 GB for <filename>/</filename>"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:173
+msgid "4 GB for <filename>swap</filename>"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:177
+msgid "and the remainder for <filename>/home</filename>."
 msgstr ""
-"To znamená, že v prípade 160 GB a viac dostupného miesta, inštalátor vytvorí "
-"tri partície: 50 GB pre /, 4 GB pre swap a zvyšok pre adresár /home."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:150
+#: en/doPartitionDisks.xml:182
 #, fuzzy
 msgid ""
 "If you are using a UEFI system, the ESP (EFI System Partition) will be "
-"automatically detected - or created if it does not exist yet, and mounted "
-"on /boot/EFI. The <emphasis role=\"bold\">Custom disk partitioning</"
+"automatically detected - or created if it does not exist yet - and mounted "
+"on <filename>/boot/EFI</filename>. The <emphasis>Custom disk partitioning</"
 "emphasis> option is the only one that allows to check it has been correctly "
-"done"
+"done."
 msgstr ""
 "Ak používate UEFI systém, ESP (EFI Systémová Partícia) bude automaticky "
 "rozpoznaná, alebo vytvorená, ak ešte neexistuje, a pripojená na /boot/EFI. "
@@ -1782,48 +1942,39 @@ msgstr ""
 "bolo správne vykonané"
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:158
+#: en/doPartitionDisks.xml:188
 msgid ""
-"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."
+"If you are using a Legacy (also known as BIOS) system with a GPT partitioned "
+"disk, you need to create a BIOS boot partition if it doesn't already exist. "
+"It should be about 1 MiB with no mount point. It can be created with the "
+"Installer, under <emphasis>Custom disk partitioning</emphasis>, like any "
+"other partition. Be sure to select <quote>BIOS boot partition</quote> for "
+"filesystem type."
 msgstr ""
 
-#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:165
-#, fuzzy
-msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </imageobject>"
+#. type: Content of: <section><note><para>
+#: en/doPartitionDisks.xml:195
+msgid "See <xref linkend=\"diskdrake\"/> for information on how to proceed."
 msgstr ""
-"<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
-"align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
-"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
-#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:175
+#. type: Content of: <section><mediaobject>
+#: en/doPartitionDisks.xml:210
 #, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4.png"
+"\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
+"\"/> </imageobject>"
 
-#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:182
+#. type: Content of: <section><important><para>
+#: en/doPartitionDisks.xml:216
 #, fuzzy
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
 "previous standard of 512. Due to lack of available hardware, the "
 "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:"
+"drive."
 msgstr ""
 "Niektoré novšie mechaniky teraz používajú 4096 bajtové logické sektory, "
 "namiesto predošlého štandardu 512 bajtových logických sektorov. Kvôli "
@@ -1834,20 +1985,38 @@ msgstr ""
 "nástrojov akým je gparted, ak vlastníte také zariadenie, a použiť nasledovné "
 "nastavenia:"
 
-#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:189
+#. type: Content of: <section><important><para>
+#: en/doPartitionDisks.xml:221
 #, fuzzy
-msgid "<emphasis role=\"bold\">Align to</emphasis> = MiB"
+msgid ""
+"Some SSD devices now use an erase block size over 1 MB. If you have such a "
+"device we suggest that you partition the drive in advance, using an "
+"alternative partitioning tool like gparted, and to use the following "
+"settings:"
+msgstr ""
+"Niektoré novšie mechaniky teraz používajú 4096 bajtové logické sektory, "
+"namiesto predošlého štandardu 512 bajtových logických sektorov. Kvôli "
+"nedostupnosti dostupného hardvéru, nástroj na delenie disku použitý v "
+"inštalátori nebol testovaný s takou mechanikou. Taktiež niektoré ssd "
+"mechaniky dnes používajú veľkosť vymazávacieho bloku nad 1 MB. Navrhujeme "
+"vopred rozdeliť mechaniku, s použitím alternatívnych partíciovacích "
+"nástrojov akým je gparted, ak vlastníte také zariadenie, a použiť nasledovné "
+"nastavenia:"
+
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:228
+#, fuzzy
+msgid "<emphasis>Align to</emphasis> = MiB"
 msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
 
-#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:191
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:232
 #, fuzzy
-msgid "<emphasis role=\"bold\">Free space preceding (MiB)</emphasis> = 2"
+msgid "<emphasis>Free space preceding (MiB)</emphasis> = 2"
 msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
 
-#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:194
+#. type: Content of: <section><important><para>
+#: en/doPartitionDisks.xml:236
 #, fuzzy
 msgid ""
 "Also make sure all partitions are created using an even number of megabytes."
@@ -1856,39 +2025,41 @@ msgstr ""
 "megabajtom."
 
 #. type: Content of: <article><info><title>
-#: en/DrakLive-cover.xml:4 en/DrakLive-cover.xml:30 en/DrakLive.xml:3
+#: en/DrakLive-cover.xml:15 en/DrakLive-cover.xml:54 en/DrakLive.xml:16
 msgid "Installation from LIVE medium"
 msgstr "Inštalácia zo ŽIVÉHO dátového nosiča"
 
 #. type: Content of: <book><info>
-#: en/DrakLive-cover.xml:5 en/DrakX-cover.xml:4
+#: en/DrakLive-cover.xml:17 en/DrakX-cover.xml:14
 msgid "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 msgstr "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 
 #. type: Content of: <book><info><revhistory><revision><date>
-#: en/DrakLive-cover.xml:10
-msgid "January 2015"
-msgstr "Január 2015"
+#: en/DrakLive-cover.xml:23
+msgid "March 2016"
+msgstr ""
 
 #. type: Content of: <book><info><revhistory><revision><revremark>
-#: en/DrakLive-cover.xml:11
+#: en/DrakLive-cover.xml:25
 msgid "Mageia 5"
 msgstr "Mageia 5"
 
 #. type: Content of: <book><info><cover><para>
-#: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:14
+#: en/DrakLive-cover.xml:30 en/DrakX-cover.xml:27
 msgid "The Official Documentation for Mageia"
 msgstr "Oficiálna dokumentácia pre Mageiu"
 
 #. type: Content of: <book><info><cover><mediaobject>
-#: en/DrakLive-cover.xml:17
-msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+#: en/DrakLive-cover.xml:33 en/DrakX-cover.xml:30
+#, fuzzy
+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:20
-#: en/DrakX.xml:12
+#: en/DrakLive-cover.xml:38 en/DrakLive.xml:25 en/DrakX-cover.xml:35
+#: en/DrakX.xml:44
 msgid ""
 "The texts and screenshots in this manual are available under the CC BY-SA "
 "3.0 license <link ns6:href=\"http://creativecommons.org/licenses/by-sa/3.0/"
@@ -1899,8 +2070,8 @@ msgstr ""
 "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:23
-#: en/DrakX.xml:15
+#: en/DrakLive-cover.xml:42 en/DrakLive.xml:29 en/DrakX-cover.xml:39
+#: en/DrakX.xml:48
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
 "calenco.com\">Calenco CMS</link> developed by <link ns6:href=\"http://www."
@@ -1911,8 +2082,7 @@ msgstr ""
 "\">NeoDoc</link>om."
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:25
-#: en/DrakX.xml:17
+#: en/DrakLive-cover.xml:46 en/DrakX-cover.xml:43 en/DrakX.xml:52
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
 "href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation Team</"
@@ -1922,15 +2092,15 @@ msgstr ""
 "href=\"https://wiki.mageia.org/en/Documentation_team\">Dokumentačný tím</"
 "link>, ak by ste chceli pomôcť vylepšiť tento manuál."
 
-#. type: Content of: <article><info><cover><para><note>
-#: en/DrakLive-cover.xml:31 en/DrakLive.xml:6 en/DrakX-cover.xml:36
-#: en/DrakX.xml:6
+#. type: Content of: <section><itemizedlist><listitem><para><note>
+#: en/DrakLive-cover.xml:56 en/DrakLive.xml:19 en/DrakX-cover.xml:64
+#: en/DrakX.xml:38 en/selectKeyboard.xml:49
 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:37
-#: en/DrakX.xml:7
+#: en/DrakLive-cover.xml:57 en/DrakLive.xml:20 en/DrakX-cover.xml:65
+#: en/DrakX.xml:39
 msgid ""
 "No one will see all the installer screens that you see in this manual. Which "
 "screens you will see, depends on your hardware and the choices you make "
@@ -1940,43 +2110,49 @@ msgstr ""
 "tomto manuáli. Ktorú obrazovku uvidíte, záleží na vašom hardvéri a na "
 "voľbách, ktoré spravíte počas inštalácie."
 
-#. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:35 en/DrakLive.xml:10 en/DrakX-cover.xml:40
-#: en/DrakX.xml:10
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/DrakLive-cover.xml:60 en/DrakLive.xml:23 en/DrakX-cover.xml:68
+#: en/DrakX.xml:42 en/selectKeyboard.xml:56
 msgid "</note>"
 msgstr "</note>"
 
+#. type: Content of: <article><info><cover><para>
+#: en/DrakLive.xml:33
+#, fuzzy
+msgid ""
+"It was written by volunteers in their free time. Please contact the <link "
+"ns6:href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation "
+"Team</link>, if you would like to help improve this manual."
+msgstr ""
+"Bol napísaný dobrovoľníkmi v ich voľnom čase. Skontaktujte prosím <link ns6:"
+"href=\"https://wiki.mageia.org/en/Documentation_team\">Dokumentačný tím</"
+"link>, ak by ste chceli pomôcť vylepšiť tento manuál."
+
 #. type: Content of: <article><info><title>
-#: en/DrakX-cover.xml:3 en/DrakX-cover.xml:35 en/DrakX.xml:3
+#: en/DrakX-cover.xml:12 en/DrakX-cover.xml:61 en/DrakX.xml:35
 msgid "Installation with DrakX"
 msgstr "Inštalácia s DrakX"
 
 #. type: Content of: <book><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:9
+#: en/DrakX-cover.xml:20
 msgid "February 2014"
 msgstr "Február 2014"
 
 #. type: Content of: <book><info><revhistory><revision><revremark>
-#: en/DrakX-cover.xml:10
+#: en/DrakX-cover.xml:22
 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"
 msgstr "Gratulujeme"
 
 #.  Lebarhon 20170209 updated SC
+#. 2018/02/12 apb: Text and typography.
+#. 2018/02/25 apb: Added clickable link to mageia.org
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:9
+#: en/exitInstall.xml:13
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
@@ -1987,27 +2163,27 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:18
+#, fuzzy
 msgid ""
-"You have finished installing and configuring <application>Mageia</"
-"application> and it is now safe to remove the installation medium and reboot "
-"your computer."
+"You have finished installing and configuring Mageia and it is now safe to "
+"remove the installation medium and reboot your computer."
 msgstr ""
 "Dokončili ste inštaláciu a konfiguráciu <application>Mageie</application> a "
 "teraz je bezpečné vybrať inštalačné médium a reštartovať váš počítač."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:18
+#: en/exitInstall.xml:22
 #, fuzzy
 msgid ""
-"After reboot, in the bootloader screen, you can choose between the operating "
-"systems (if there are more than one) on your computer."
+"After rebooting, you can use the bootloader screen to choose which operating "
+"system to start (if there are more than one on your computer)."
 msgstr ""
 "Po reštarte, na obrazovke zavádzača, si môžete vybrať spomedzi operačných "
 "systémov vo vašom počítači (ak ich máte viac než jeden)."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:22
+#: en/exitInstall.xml:26
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
@@ -2016,26 +2192,27 @@ msgstr ""
 "vybraná a spustená vaša nainštalovaná Mageia."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:26
+#: en/exitInstall.xml:30
 msgid "Enjoy!"
 msgstr "Nech sa vám páči!"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:28
+#: en/exitInstall.xml:32
+#, fuzzy
 msgid ""
-"Visit www.mageia.org if you have any questions or want to contribute to "
-"Mageia"
+"Visit <link ns4:href=\"http://www.mageia.org/en/\">www.mageia.org/en/</link> "
+"if you have any questions or want to contribute to Mageia"
 msgstr ""
 "Navštívte www.mageia.org ak máte nejaké otázky alebo ak chcete prispieť k "
 "Mageii"
 
 #. type: Content of: <section><info><title>
-#: en/firewall.xml:3
+#: en/firewall.xml:7
 msgid "Firewall"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:6
+#: en/firewall.xml:10
 msgid ""
 "This section allows you to configure some simple firewall rules: they "
 "determine which type of message from the Internet will be accepted by the "
@@ -2044,48 +2221,48 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:12
+#: en/firewall.xml:16
 msgid ""
 "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."
+"accessible from the network. The <emphasis>Everything (no firewall)</"
+"emphasis> option 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 ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:21
+#: en/firewall.xml:25
 msgid ""
 "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."
+"enable the CUPS server if you want printers on your machine to be accessible "
+"from the network."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:25
+#: en/firewall.xml:29
 #, fuzzy
 msgid "<emphasis role=\"bold\">Advanced</emphasis>"
 msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:27
+#: en/firewall.xml:31
 msgid ""
-"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 "
+"The <emphasis>Advanced</emphasis> option opens a window where you can enable "
+"a series of services by typing a list of <quote>couples</quote> (blank "
 "separated)"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:31
+#: en/firewall.xml:35
 #, fuzzy
 msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
 msgstr "<emphasis>Všeobecný</emphasis>"
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:34
+#: en/firewall.xml:38
 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 "
@@ -2093,28 +2270,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:38
+#: en/firewall.xml:42
 msgid ""
 "- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
 "<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:43
+#: en/firewall.xml:47
 msgid ""
 "For instance, the entry for enabling access to the RSYNC service therefore "
 "is <emphasis>873/tcp</emphasis>."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:46
+#: en/firewall.xml:50
 msgid ""
 "In case a service is implemented to use both protocols, you specify 2 "
 "couples for the same port."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/formatPartitions.xml:3
+#: en/formatPartitions.xml:10
 msgid "Formatting"
 msgstr "Formátovanie"
 
@@ -2122,25 +2299,26 @@ msgstr "Formátovanie"
 #.  NEEDS TO BE REVIEWED! 
 #.  marja 2012-04-24 added screenshot 
 #.  marja 2012-04-24 added emphasis tags in formatPartitions-pa1 
+#. 2018/02/10 apb: Text and typography.
 #. type: Content of: <section><mediaobject>
-#: en/formatPartitions.xml:15
+#: en/formatPartitions.xml:24
 #, fuzzy
 msgid ""
-"<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>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-formatPartitions.png\" format=\"PNG\" revision=\"1\" xml:id="
+"\"formatPartitions-im1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-formatPartitions.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"live-formatPartitions-im1\"/> </imageobject>"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
-"\"bootloaderConfiguration-im1\" fileref=\"dx2-bootloaderConfiguration.png\" "
-"align=\"center\" revision=\"1\"/> </imageobject> <imageobject condition="
-"\"live\"> <imagedata format=\"PNG\" xml:id=\"bootloaderConfiguration-im1\" "
-"fileref=\"live-bootloaderConfiguration.png\" align=\"center\" revision=\"1\"/"
-"> </imageobject>"
+"<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>"
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:24
+#: en/formatPartitions.xml:35
 #, fuzzy
 msgid ""
 "Here you can choose which partition(s) you wish to format. Any data on "
@@ -2151,29 +2329,32 @@ msgstr ""
 "pre naformátovanie budú ušetrené."
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:28
-msgid "Usually at least the partitions DrakX selected, need to be formatted"
+#: en/formatPartitions.xml:39
+#, fuzzy
+msgid ""
+"Usually, at least the partitions that DrakX selected need to be formatted."
 msgstr ""
 "Zvyčajne prinajmenšom partície, ktoré DrakX vybral, potrebujú byť "
 "naformátované."
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:31
+#: en/formatPartitions.xml:42
+#, fuzzy
 msgid ""
-"Click on <guibutton>Advanced</guibutton> to choose partitions you want to "
-"check for so called <emphasis>bad blocks</emphasis>"
+"Click on <emphasis>Advanced</emphasis> to choose the partitions you want to "
+"check for so-called <emphasis>bad blocks</emphasis>"
 msgstr ""
 "Kliknite na <guibutton>Pokročilé</guibutton> pre výber partícií, ktoré "
 "chcete skontrolovať na takzvané <emphasis>chybné bloky</emphasis>"
 
 #. type: Content of: <section><tip><para>
-#: en/formatPartitions.xml:36
+#: en/formatPartitions.xml:47
 #, 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, "
-"where you can choose to view details of your partitions."
+"<emphasis>Previous</emphasis>, again on <emphasis>Previous</emphasis> and "
+"then on <emphasis>Custom</emphasis> to get back to the main screen, where "
+"you can choose to view details of your partitions."
 msgstr ""
 "Ak si nie ste istí, či ste vykonali správnu voľbu, môžete kliknúť na "
 "tlačidlo <guibutton>Predošlé</guibutton>, opäť na <guibutton>Predošlé</"
@@ -2182,21 +2363,22 @@ msgstr ""
 "na vašich partíciach."
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:43
+#: en/formatPartitions.xml:54
+#, fuzzy
 msgid ""
-"When you are confident about the selection, click on <guibutton>Next</"
-"guibutton> to continue."
+"When you are confident about the selections, click on <emphasis>Next</"
+"emphasis> to continue."
 msgstr ""
 "Ak ste spokojný s výberom, kliknite na <guibutton>Ďalej</guibutton> pre "
 "pokračovanie."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:10
+#: en/installer.xml:14
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, inštalátor Mageie"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:13
+#: en/installer.xml:16
 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 "
@@ -2206,348 +2388,244 @@ msgstr ""
 "inštalátor je navrhnutý, aby vám pomohol učiniť vašu inštaláciu alebo "
 "aktualizáciu čo najľahšou ako sa len dá."
 
-#. type: Content of: <section><para>
-#: 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."
-msgstr ""
-"Počiatočná ponuková obrazovka má rôzne možnosti, každopádne predvolená "
-"spustí inštalátor, ktorý bude zvyčajne všetko, čo potrebujete."
-
 #. type: Content of: <section><section><title>
-#: en/installer.xml:22
-msgid "Installation Welcome Screen"
-msgstr "Uvítacia inštalačná obrazovka"
-
-#. type: Content of: <section><section><section><title>
-#: en/installer.xml:25
-#, fuzzy
-msgid "Using a Mageia DVD"
-msgstr "Použitie zavádzača Mageie"
+#: en/installer.xml:20
+msgid "The installation steps"
+msgstr "Kroky inštalácie"
 
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:27
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/installer.xml:23
 #, fuzzy
 msgid ""
-"Here are the default welcome screens when using a Mageia DVD, The first one "
-"is what you will see if you have a UEFI system, the second one is for a "
-"Legacy system:"
+"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 ""
-"Tu sú predvolené uvítacie obrazovky, pri používaní DVD Mageia. Prvá je s "
-"obstarožným systémom a druhá s UEFI systémom:"
+"Proces inštalácie je rozdelený do viacerých krokov, ktoré je možno sledovať "
+"na bočnom paneli obrazovky."
 
-#. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:32
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/installer.xml:28
 #, fuzzy
-msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:37
 msgid ""
-"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."
+"Each step has one or more screens, which may also have <emphasis>Advanced</"
+"emphasis> sections with extra, less commonly required options."
 msgstr ""
+"Každý krok má jednu alebo viacero obrazoviek, ktoré tiež môžu mať "
+"<guibutton>Pokročilé</guibutton> tlačidlá so zvyčajne menej žiadanými extra "
+"možnosťami."
 
-#. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:45
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/installer.xml:33
 #, fuzzy
-msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:50
 msgid ""
-"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):"
+"Most screens have <emphasis>Help</emphasis> buttons for further details "
+"about the particular step."
 msgstr ""
+"Väčšina obrazoviek má tlačidlá <guibutton>Pomoc</guibutton>, ktoré dávajú "
+"bližšie vysvetlenia o aktuálnom kroku."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:55
+#. type: Content of: <section><section><caution><para>
+#: en/installer.xml:38
+#, fuzzy
 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>"
+"If at some point during the install you decide to abort the installation, it "
+"is possible to reboot, but please think twice before you do this. Once a "
+"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."
 msgstr ""
+"Ak sa niekde počas inštalácie rozhodnete ukončiť inštaláciu, je možný "
+"reštart, ale prosím premyslite si to dvakrát, skôr než toto spravíte. Keď "
+"raz už bola partícia naformátovaná alebo sa začali inštalovať aktualizácie, "
+"váš počítač už viac nie je v tom istom stave a jeho reštart by vás mohol "
+"celkom poľahky zanechať s nepoužiteľným systémom. Ak napriek tomuto ste si "
+"veľmi istí, že chcete reštartovať, choďte do textového terminálu súčasným "
+"stlačením troch kláves <guibutton>Alt Ctrl F2</guibutton>. Potom stlačte "
+"súčasne <guibutton>Alt Ctrl Delete</guibutton> pre reštart."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:63
+#. type: Content of: <section><section><caution><para>
+#: en/installer.xml:43
 msgid ""
-"Press <emphasis role=\"bold\">F2</emphasis> to have the installer use a "
-"specific language for the installation."
+"If, in spite of this, you are very sure rebooting is what you want, go to a "
+"text terminal by pressing the keys <keycombo><keycap>Ctrl</"
+"keycap><keycap>Alt</keycap><keycap>F2</keycap></keycombo> together. After "
+"that, press <keycombo><keycap>Ctrl</keycap><keycap>Alt</"
+"keycap><keycap>Delete</keycap></keycombo> together to reboot."
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:67
-#, fuzzy
+#. type: Content of: <section><section><title>
+#: en/installer.xml:48
+msgid "Installation Welcome Screen"
+msgstr "Uvítacia inštalačná obrazovka"
+
+#. type: Content of: <section><section><para>
+#: en/installer.xml:49
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+"The particular screen that you will first see when booting from the "
+"Installation media will depend on whether your computer motherboard is of "
+"the Legacy (BIOS) or UEFI type."
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/> "
-"</imageobject>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:72
+#. type: Content of: <section><section><para>
+#: en/installer.xml:52
 #, fuzzy
 msgid ""
-"Use the arrow keys to select the language then press <emphasis role=\"bold"
-"\">Enter</emphasis>."
-msgstr "Použite šípkové klávesy pre výber jazyka a stlačte klávesu Enter."
+"The welcome menu screen has various options, however the default option will "
+"start the installer, and is normally all that you will need."
+msgstr ""
+"Počiatočná ponuková obrazovka má rôzne možnosti, každopádne predvolená "
+"spustí inštalátor, ktorý bude zvyčajne všetko, čo potrebujete."
 
-#. 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)."
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:56
+msgid "Legacy (BIOS) Systems"
 msgstr ""
-"Zmeňte rozlíšenie obrazovky stlačením klávesy F3 (len v obstarožnom režime)."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:81
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:58
 #, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/> </"
+"<imageobject> <imagedata fileref=\"dx-welcome.png\" align=\"center\"/> </"
 "imageobject>"
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:88
-msgid ""
-"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 ""
+"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+"imageobject>"
 
-#. 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 "- Predvolené, táto nemení nič v predvolených možnostiach."
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/installer.xml:101
-#, fuzzy
-msgid ""
-"Safe Settings: Priority is given to the safer options at the price of a "
-"performance detriment."
+#. type: Content of: <section><section><section><itemizedlist><title>
+#: en/installer.xml:63
+msgid "Menu"
 msgstr ""
-"- Bezpečné nastavenia, priorita je daná k bezpečnejším možnostiam na úkor "
-"výkonnosti."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/installer.xml:106
-#, fuzzy
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:66
 msgid ""
-"No ACPI: (Advanced Configuration and Power Interface): Power management "
-"features are not used."
+"Install Mageia to a hard disk. This is the default option, and will "
+"automatically start after a short while unless another option is selected."
 msgstr ""
-"- Žiadne ACPI (Pokročilé rozhrania konfigurácie a napájania), spravovanie "
-"napájania nie je brané do úvahy."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/installer.xml:113
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:69
 #, fuzzy
-msgid ""
-"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 ""
-"- Žiaden lokálny APIC (lokálny pokročilý programovateľný ovládač prerušení), "
-"jedná sa o prerušenia CPU, vyberte túto možnosť, ak ste k tomu vyzvaní."
+msgid "<emphasis role=\"bold\">Rescue System</emphasis>"
+msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:120
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:70
 msgid ""
-"When you select one of these entries, it modifies the default options "
-"displayed in the <guilabel>Boot Options</guilabel> line."
+"This option allows you to either re-install the bootloader for an existing "
+"Mageia installation or you can use it to restore a Windows bootloader."
 msgstr ""
-"Keď si vyberiete jednu z týchto položiek, ona modifikuje predvolené možnosti "
-"zobrazené v riadku <guilabel>Možnosti zavádzania systému</guilabel>."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:125
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:75
 #, fuzzy
-msgid ""
-"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 ""
-"V niektorých vydaniach Mageie sa môže stať, že sa položky vybrané s klávesou "
-"F6 neobjavujú v riadku <guilabel>Možností zavádzania o.s.</guilabel>, avšak "
-"v skutočnosti sú brané do úvahy."
+msgid "<emphasis role=\"bold\">Memory Test</emphasis>"
+msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:132
-#, fuzzy
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:76
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+"Test the installed RAM by performing multiple read and write operations. "
+"Reboot to end the test."
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> </"
-"imageobject>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:139
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:80
 #, fuzzy
-msgid ""
-"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 ""
-"Stlačenie F1 otvára nové okno s ďalšími dostupnými možnosťami. Vyberte jednu "
-"so šípkovými klávesami a stlačte Enter pre obdržanie viacej detailov alebo "
-"stlačte klávesu Esc pre pre návrat na uvítaciu obrazovku."
+msgid "<emphasis role=\"bold\">F2: Language</emphasis>"
+msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:146
-#, fuzzy
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:81
+msgid "Press F2 for alternative languages."
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
-"</imageobject>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:151
-#, fuzzy
-msgid ""
-"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."
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:86
+msgid "UEFI Systems"
 msgstr ""
-"Podrobný prehľad o rozsahu možností. Stlačte Esc alebo zvoľte "
-"<guilabel>Návrat ku Zavádzacím Možnostiam</guilabel> pre návrat späť k "
-"zoznamu možností. Tieto možnosti môžu byť pridané ručne v riadku "
-"<guilabel>Možnosti zavedenia</guilabel>."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:158
-#, fuzzy
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:87
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+"From this screen, you can access options by pressing <keycap>e</keycap> to "
+"enter the edit mode. To come back to this screen, press <keycap>Esc</keycap> "
+"to quit without saving or press <keycap>F10</keycap> to save and quit."
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcomeHelp2.png\"/> "
-"</imageobject>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:164
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:92
 #, fuzzy
 msgid ""
-"The help is translated in the chosen language with <emphasis role=\"bold"
-"\">F2</emphasis>."
-msgstr "Nápoveda je preložená vo zvolenom jazyku s klávesou F2."
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: 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"
-"\">https://wiki.mageia.org/en/How_to_set_up_kernel_options</link>"
+"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+"imageobject>"
 msgstr ""
-"Pre viacej informácií o možnostiach kernelu na obstarožných a UEFI "
-"systémoch, pozrite: <link ns2:href=\"https://wiki.mageia.org/en/"
-"How_to_set_up_kernel_options\">https://wiki.mageia.org/en/"
-"How_to_set_up_kernel_options</link>"
-
-#. type: Content of: <section><section><title>
-#: en/installer.xml:177
-msgid "The installation steps"
-msgstr "Kroky inštalácie"
+"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/installer.xml:179
-#, fuzzy
-msgid ""
-"The install process is divided into a number of steps, the status of which "
-"is indicated in a panel to the left of the screen."
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:96
+msgid "In UEFI mode you have only two menu options to choose from:"
 msgstr ""
-"Proces inštalácie je rozdelený do viacerých krokov, ktoré je možno sledovať "
-"na bočnom paneli obrazovky."
 
-#. type: Content of: <section><section><para>
-#: en/installer.xml:182
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:99
 #, fuzzy
-msgid ""
-"Each step has one or more screens which may also have <guibutton>Advanced</"
-"guibutton> sections with extra, less commonly required, options."
-msgstr ""
-"Každý krok má jednu alebo viacero obrazoviek, ktoré tiež môžu mať "
-"<guibutton>Pokročilé</guibutton> tlačidlá so zvyčajne menej žiadanými extra "
-"možnosťami."
+msgid "<emphasis role=\"bold\">Install:</emphasis> Start the Install process"
+msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
 
-#. type: Content of: <section><section><para>
-#: en/installer.xml:186
-#, fuzzy
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:103
 msgid ""
-"Most screens have <guibutton>Help</guibutton> buttons for further details "
-"about the particular step."
+"<emphasis role=\"bold\">Rescue:</emphasis> This option allows you to either "
+"re-install the bootloader for an existing Mageia installation or you can use "
+"it to restore a Windows bootloader."
 msgstr ""
-"Väčšina obrazoviek má tlačidlá <guibutton>Pomoc</guibutton>, ktoré dávajú "
-"bližšie vysvetlenia o aktuálnom kroku."
 
-#. type: Content of: <section><section><note><para>
-#: en/installer.xml:190
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:109
 #, fuzzy
 msgid ""
-"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 "
-"rebooting is what you want, go to a text terminal by pressing the three keys "
-"<guibutton>Alt Ctrl F2</guibutton> at the same time. After that, press "
-"<guibutton>Alt Ctrl Delete</guibutton> simultaneously to reboot."
+"If you booted from a USB stick, you will see the above options duplicated, "
+"and in this case, you should use the set that will be suffixed with \"USB\"."
 msgstr ""
-"Ak sa niekde počas inštalácie rozhodnete ukončiť inštaláciu, je možný "
-"reštart, ale prosím premyslite si to dvakrát, skôr než toto spravíte. Keď "
-"raz už bola partícia naformátovaná alebo sa začali inštalovať aktualizácie, "
-"váš počítač už viac nie je v tom istom stave a jeho reštart by vás mohol "
-"celkom poľahky zanechať s nepoužiteľným systémom. Ak napriek tomuto ste si "
-"veľmi istí, že chcete reštartovať, choďte do textového terminálu súčasným "
-"stlačením troch kláves <guibutton>Alt Ctrl F2</guibutton>. Potom stlačte "
-"súčasne <guibutton>Alt Ctrl Delete</guibutton> pre reštart."
+"Ak ste naštartovali počítač z USB kľúča, dostanete dva doplňujúce riadky, "
+"ktoré sú duplikáty predošlých riadkov zakončené so skratkou \"USB\". Máte "
+"ich na výber."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:203
+#: en/installer.xml:115
 msgid "Installation Problems and Possible Solutions"
 msgstr "Problémy pri inštalácií a možné riešenia"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:206
+#: en/installer.xml:117
 msgid "No Graphical Interface"
 msgstr "Žiadne grafické rozhranie"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:210
+#: en/installer.xml:120
+#, fuzzy
 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 "
-"resolution by typing <code>vgalo</code> at the prompt."
+"After the initial screen you did not progress to the <emphasis>Language "
+"Selection</emphasis> screen. This can happen with some graphic cards and "
+"older systems. Try using low resolution by typing <command>vgalo</command> "
+"at the prompt."
 msgstr ""
 "Po počiatočnej obrazovke vám nenabehla obrazovka výberu jazyka. Toto sa môže "
 "stať s niektorými grafickými kartami a staršími systémami. Skúste použiť "
 "nízke rozlíšenie obrazovky napísaním <code>vgalo</code> v príkazovom riadku."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:217
+#: en/installer.xml:126
 #, 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 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."
+"In this case it is worth trying a text-mode installation. To use this press "
+"<keycap>Esc</keycap> at the <emphasis>Welcome</emphasis> screen and confirm "
+"with <keycap>ENTER</keycap>. You will be presented with a black screen with "
+"a <prompt>boot:</prompt> prompt. Type <command>text</command> and press "
+"<keycap>ENTER</keycap> to continue with the installation in text mode."
 msgstr ""
 "Ak je hardvér veľmi starý, grafická inštalácia nemusí byť možná. V tomto "
 "prípade sa oplatí vyskúšať inštaláciu v textovom režime. Pre jej použitie "
@@ -2556,18 +2634,19 @@ msgstr ""
 "ENTER. Teraz pokračujte s inštaláciou v textovom režime."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:230
+#: en/installer.xml:138
 msgid "The Install Freezes"
 msgstr "Inštalácia zamrzne"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:232
+#: en/installer.xml:139
+#, fuzzy
 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 "
-"hardware may be bypassed and dealt with later. To try this, type "
-"<code>noauto</code> at the prompt. This option may also be combined with "
-"other options as necessary."
+"problem with hardware detection. In this case the automatic hardware "
+"detection may be bypassed and dealt with later. To try this, type "
+"<command>noauto</command> at the prompt. This option may also be combined "
+"with other parameters as necessary."
 msgstr ""
 "Ak sa zdá, že systém mrzne počas inštalácie, môže to byť problém s detekciou "
 "hardvéru. V tomto prípade môže byť obídená automatická detekcia hardvéru a "
@@ -2576,18 +2655,19 @@ msgstr ""
 "možnosťami, ak je treba."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:240
+#: en/installer.xml:146
 msgid "RAM problem"
 msgstr "Problém s RAM"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:242
+#: en/installer.xml:147
 #, fuzzy
 msgid ""
 "This will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
-"<code>mem=xxxM</code> parameter, where xxx is the correct amount of RAM. e."
-"g. <code>mem=256M</code> would specify 256MB of RAM."
+"<literal>mem=<replaceable>xxx</replaceable>M</literal> parameter, where "
+"<replaceable>xxx</replaceable> is the correct amount of RAM. e.g. "
+"<literal>mem=256M</literal> would specify 256MB of RAM."
 msgstr ""
 "Toto bude zriedkavo potrebné, ale v niektorých prípadoch môže hardvér "
 "nesprávne ohlásiť dostupnú RAM pamäť. Aby ste ju zadali ručne, môžete použiť "
@@ -2595,20 +2675,20 @@ msgstr ""
 "napr. <code>mem=256M</code> by znamenala 256MB RAM."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:249
+#: en/installer.xml:154
 msgid "Dynamic partitions"
 msgstr "Dynamické partície"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:251
+#: en/installer.xml:155
 #, fuzzy
 msgid ""
-"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>."
+"If you converted your hard disk from <literal>Basic</literal> format to "
+"<literal>Dynamic</literal> format in Microsoft Windows, then it is not "
+"possible to install Mageia on this disc. To revert to a <literal>Basic</"
+"literal> 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 ""
 "Ak ste konvertovali váš pevný disk zo \"základného\" formátu na \"dynamický"
 "\" formát v systéme Microsoft Windows, musíte vedieť, že je nemožné "
@@ -2618,19 +2698,15 @@ msgstr ""
 "cc776315.aspx</link>."
 
 #. type: Content of: <section><info><title>
-#: en/installUpdates.xml:3
+#: en/installUpdates.xml:16
 msgid "Updates"
 msgstr "Aktualizácie"
 
-#.  Made by marja on 2012 03 30 
-#.  NEEDS TO BE REVIEWED! 
-#.  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:15
+#: en/installUpdates.xml:20
 #, fuzzy
 msgid ""
-"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-installUpdates.png\" "
+"<imageobject> <imagedata format=\"png\" fileref=\"dx2-installUpdates.png\" "
 "align=\"center\" revision=\"1\" xml:id=\"installUpdates-im1\"/> </"
 "imageobject>"
 msgstr ""
@@ -2639,62 +2715,74 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:20
+#: en/installUpdates.xml:25
+#, fuzzy
 msgid ""
-"Since this version of <application>Mageia</application> was released, some "
-"packages will have been updated or improved."
+"Since this version of Mageia was released, some packages will have been "
+"updated or improved."
 msgstr ""
 "Odkedy bola uvoľnená táto verzia o.s. <application>Mageia</application>, "
 "niektoré balíčky boli aktualizované alebo vylepšené."
 
-#. type: Content of: <section><para>
-#: en/installUpdates.xml:24
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installUpdates.xml:30
+msgid ""
+"Select <emphasis>Yes</emphasis> if you wish to download and install them"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installUpdates.xml:35
 #, 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 "
+"Select <emphasis>No</emphasis> if you don't want to do this now, or if you "
 "aren't connected to the Internet"
 msgstr ""
 "Vyberte si <guilabel>áno</guilabel>, ak si ich prajete stiahnuť a "
 "nainštalovať, vyberte <guilabel>nie</guilabel>, ak to teraz nechcete urobiť, "
 "alebo ak nie ste pripojení k internetu."
 
-#. type: Content of: <section><para>
-#: en/installUpdates.xml:29
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installUpdates.xml:40
 #, fuzzy
-msgid "Press <guibutton>Next</guibutton> to continue"
+msgid "Press <emphasis>Next</emphasis> to continue"
 msgstr "Potom stlačte <guibutton>Ďalej</guibutton> pre pokračovanie"
 
 #. type: Content of: <section><info><title>
-#: en/login.xml:1
-msgid "Login screen"
+#: en/login.xml:4
+#, fuzzy
+msgid "Login Screen"
 msgstr "Prihlasovacia obrazovka"
 
 #. type: Content of: <section><mediaobject>
-#: en/login.xml:1
+#: en/login.xml:7
+#, fuzzy
 msgid ""
-"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
-"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
 "login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><mediaobject><caption><para>
-#: en/login.xml:1
-msgid "KDM login screen"
+#: en/login.xml:11
+#, fuzzy
+msgid "SDDM login screen"
 msgstr "KDM prihlasovacia obrazovka"
 
 #. type: Content of: <section><para>
-#: en/login.xml:1
-msgid "Finally, you will come to the login screen."
+#: en/login.xml:14
+#, fuzzy
+msgid "Finally, you will come to the desktop login screen."
 msgstr "Nakoniec sa dostanete ku prihlasovacej obrazovke"
 
 #. type: Content of: <section><para>
-#: en/login.xml:1
+#: en/login.xml:15
+#, fuzzy
 msgid ""
 "Enter your user name and user password, and in a few seconds you will find "
-"yourself with a loaded KDE or GNOME desktop, depending on which live medium "
-"you used. You can now start using your Mageia installation."
+"yourself with a loaded KDE Plasma or GNOME desktop, depending on which live "
+"medium you used. You can now start using and enjoying your Mageia "
+"installation."
 msgstr ""
 "Vložte vaše používateľské meno a používateľské heslo a za pár sekúnd sa "
 "ocitnete na načítanej KDE alebo GNOME pracovnej ploche, podľa toho ktorý "
@@ -2702,37 +2790,38 @@ msgstr ""
 "Mageie."
 
 #. type: Content of: <section><para>
-#: en/login.xml:3
+#: en/login.xml:16
+#, fuzzy
 msgid ""
-"You can find another part of our documentation in <link linkend=\"https://"
-"wiki.mageia.org/en/Category:Documentation\">the Mageia wiki</link>."
+"You can find further documentation in <link xmlns:ns0=\"http://www.w3."
+"org/1999/xlink\" ns0:href=\"../../installer/\">the Mageia wiki</link>."
 msgstr ""
 "Ďalšiu časť našej dokumentácie môžete nájsť na <link linkend=\"https://wiki."
 "mageia.org/en/Category:Documentation\">Mageia wiki</link>."
 
 #. type: Content of: <section><info><title>
-#: en/media_selection.xml:3
-msgid "Media Selection (Nonfree)"
-msgstr "Výber nosiča (Nonfree)"
+#: en/media_selection.xml:10
+msgid "Nonfree Media"
+msgstr ""
 
 #.  papoteur 2013-04-11  - created 
 #.  marja 2013-04-16 added screenshot + made title longer (because it was the same as for add_supplemental_media)
 #.  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)
+#. 2019.01.05 apb: Changed Ati to AMD in Nonfree para.
 #. type: Content of: <section><mediaobject>
-#: en/media_selection.xml:15
-#, fuzzy
+#: en/media_selection.xml:24
 msgid ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"media_selection-im1\" align="
-"\"center\" revision=\"1\" fileref=\"dx2-media_selection.png\"/> </"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
+"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
-"\"1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
+"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><para>
-#: en/media_selection.xml:20
+#: en/media_selection.xml:30
 msgid ""
 "Here you have the list of available repositories. Not all repositories are "
 "available, according to which media you use for installing. The repositories "
@@ -2744,7 +2833,7 @@ msgstr ""
 "ktoré balíčky budú dostupné na výber počas ďalších krokov."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:27
+#: en/media_selection.xml:37
 msgid ""
 "The <emphasis>Core</emphasis> repository cannot be disabled as it contains "
 "the base of the distribution."
@@ -2753,12 +2842,13 @@ msgstr ""
 "obsahuje základ distribúcie."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:32
+#: en/media_selection.xml:42
+#, fuzzy
 msgid ""
 "The <emphasis>Nonfree</emphasis> repository includes packages that are free-"
 "of-charge, i.e. Mageia may redistribute them, but they contain closed-source "
 "software (hence the name - Nonfree). For example this repository includes "
-"nVidia and ATI graphics card proprietary drivers, firmware for various WiFi "
+"nVidia and AMD graphics card proprietary drivers, firmware for various WiFi "
 "cards, etc."
 msgstr ""
 "Repozitár pre <emphasis>Nonfree</emphasis> softvér obsahuje balíčky, ktoré "
@@ -2768,7 +2858,7 @@ msgstr ""
 "ovládače pre grafické karty nVidia a ATI, firmvér pre rôzne WiFi karty, atď."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:40
+#: en/media_selection.xml:50
 #, fuzzy
 msgid ""
 "The <emphasis>Tainted</emphasis> repository includes packages released under "
@@ -2790,35 +2880,14 @@ msgid "Minimal Install"
 msgstr "Minimálna inštalácia"
 
 #. type: Content of: <section><para>
-#: 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\"/>."
-msgstr ""
-"Môžete si zvoliť Minimálnu inštaláciu odznačením všetkého na obrazovke "
-"Výberu Skupín Balíčkov, viď <xref linkend=\"choosePackageGroups\"></xref>."
-
-#. type: Content of: <section><para>
-#: en/minimal-install.xml:14
-#, fuzzy
-msgid ""
-"If desired, you can additionally tick the <emphasis role=\"bold\">Individual "
-"package selection</emphasis> option in the same screen."
-msgstr ""
-"Ak je žiadaná, môžete dodatočne zaškrtnúť možnosť pre \"individuálny výber "
-"balíčkov\" na rovnakej obrazovke."
-
-#. type: Content of: <section><para>
 #: en/minimal-install.xml:17
 #, fuzzy
 msgid ""
 "Minimal Installation is intended for those with specific uses in mind for "
-"<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"
-"\"/>."
+"Mageia, such as a server or a specialised workstation. You will probably use "
+"this option combined with the <emphasis>Individual package selection</"
+"emphasis> option to fine-tune your installation. See <xref linkend="
+"\"choosePackagesTree\"/>."
 msgstr ""
 "Minimálna inštalácia je zamýšľaná pre tých, čo zamýšľajú špecifické využitie "
 "svojej <application>Mageie</application>, akým je server alebo "
@@ -2827,32 +2896,55 @@ msgstr ""
 "pre doladenie vašej inštalácie, viď <xref linkend=\"choosePackagesTree\"></"
 "xref>."
 
-#. type: Content of: <section><para>
-#: en/minimal-install.xml:22
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/minimal-install.xml:24
 #, fuzzy
 msgid ""
-"If you choose this installation method, then the relevant screen will offer "
-"you a few useful extras to install, such as documentation and X."
+"You can choose a <emphasis>Minimal Installation</emphasis> by de-selecting "
+"everything in the <emphasis>Package Group Selection</emphasis> screen, see "
+"<xref linkend=\"choosePackageGroups\"/>."
+msgstr ""
+"Môžete si zvoliť Minimálnu inštaláciu odznačením všetkého na obrazovke "
+"Výberu Skupín Balíčkov, viď <xref linkend=\"choosePackageGroups\"></xref>."
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/minimal-install.xml:28
+#, fuzzy
+msgid ""
+"If desired, you can additionally tick the <emphasis>Individual package "
+"selection</emphasis> option in the same screen."
+msgstr ""
+"Ak je žiadaná, môžete dodatočne zaškrtnúť možnosť pre \"individuálny výber "
+"balíčkov\" na rovnakej obrazovke."
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/minimal-install.xml:33
+#, fuzzy
+msgid ""
+"If you choose this installation method, then the relevant screen (see "
+"screenshot below) will offer you a few useful extras to install, such as "
+"documentation and <quote>X</quote>."
 msgstr ""
 "Ak ste si zvolili túto inštalačnú triedu, potom vám príslušná obrazovka "
 "ponúkne nemnoho užitočných extra vecí na nainštalovanie, akými sú "
 "dokumentácia a X server."
 
-#. type: Content of: <section><para>
-#: en/minimal-install.xml:26
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/minimal-install.xml:37
 msgid ""
-"If <emphasis role=\"bold\">With X</emphasis> is chosen, then IceWM (a "
+"If the <emphasis>With X</emphasis> option is selected, then IceWM (a "
 "lightweight desktop environment) will also be included."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:29
+#: en/minimal-install.xml:42
+#, fuzzy
 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/"
-"manpages/man.html\">Linux Documentation Project</link> and the <link xlink:"
-"href=\"http://www.gnu.org/software/coreutils/manual/\">GNU coreutils</link> "
-"info pages."
+"The basic documentation is provided in the form of <quote>man</quote> and "
+"<quote>info</quote> pages. It contains the man pages from the <link xlink:"
+"href=\"http://www.tldp.org/manpages/man.html\">Linux Documentation Project</"
+"link> and the <link xlink:href=\"http://www.gnu.org/software/coreutils/"
+"manual/\">GNU coreutils</link> info pages."
 msgstr ""
 "Základná dokumentácia je poskytnutá vo forme man a informačných stránkach. "
 "Obsahuje man stránky z <link xlink:href=\"http://www.tldp.org/manpages/man."
@@ -2861,7 +2953,7 @@ msgstr ""
 "jadrových utilitách</link>."
 
 #. type: Content of: <section><mediaobject>
-#: en/minimal-install.xml:35
+#: en/minimal-install.xml:48
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"minimal-install-im1\" align="
@@ -2874,25 +2966,32 @@ msgstr ""
 
 #. type: Content of: <section><info><title>
 #: en/misc-params.xml:3
-msgid "Summary of miscellaneous parameters"
-msgstr "Súhrn o rozličných parametroch"
+#, fuzzy
+msgid "Configuration Summary"
+msgstr "Konfigurácia zvuku"
 
 #.  Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC
+#. 2018/02/09 apb: Changed title to Configuration Summary (as agreed). Also, text and typography.
+#. 2018/02/22 apb: Changed list styles.
+#. 2018/02/23 apb: Updated dx2-summaryBottom.png
+#. 2018/02/24 apb: Changed list style
+#. 2018/02/24 apb: Centre-align dx2-summaryTop.png
 #. type: Content of: <section><mediaobject>
-#: en/misc-params.xml:10
+#: en/misc-params.xml:19
 #, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-summaryTop.png\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-summaryTop.png\" align=\"center\"/> </"
+"imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/misc-params.xml:15
+#: en/misc-params.xml:24
 #, fuzzy
 msgid ""
 "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>."
+"settings here and change them if you want by pressing <emphasis>Configure</"
+"emphasis>."
 msgstr ""
 "DrakX spravil chytré voľby pre konfiguráciu vášho systému závisiace na "
 "voľbách, ktoré ste spravili a na hardvéri, ktoré DrakX zistil. Nastavenia "
@@ -2900,43 +2999,43 @@ msgstr ""
 "<guibutton>Konfigurovať</guibutton>."
 
 #. type: Content of: <section><note><para>
-#: en/misc-params.xml:21
+#: en/misc-params.xml:30
 msgid ""
 "As a general rule, it is recommended that you accept the default settings "
 "unless:"
 msgstr ""
 
 #. type: Content of: <section><note><para><itemizedlist><listitem><para>
-#: en/misc-params.xml:24
+#: en/misc-params.xml:33
 msgid "there are known issues with a default setting"
 msgstr ""
 
 #. type: Content of: <section><note><para><itemizedlist><listitem><para>
-#: en/misc-params.xml:28
+#: en/misc-params.xml:37
 msgid "the default setting has already been tried and it fails"
 msgstr ""
 
 #. type: Content of: <section><note><para><itemizedlist><listitem><para>
-#: en/misc-params.xml:32
-msgid ""
-"some other factor mentionned in the detailed sections below is an issue."
+#: en/misc-params.xml:41
+msgid "some other factor mentioned in the detailed sections below is an issue"
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:40
+#: en/misc-params.xml:49
 msgid "System parameters"
 msgstr "Parametre systému"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:45
-msgid "<guilabel>Timezone</guilabel>"
-msgstr "<guilabel>Časové pásmo</guilabel>"
+#: en/misc-params.xml:54
+#, fuzzy
+msgid "<emphasis role=\"bold\">Timezone</emphasis>"
+msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:47
+#: en/misc-params.xml:56
 #, fuzzy
 msgid ""
-"DrakX selects a time zone for you, depending on your preferred language. You "
+"DrakX selects a timezone for you, depending on your preferred language. You "
 "can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/>"
 msgstr ""
 "DrakX pre vás vybral časové pásmo, vzhľadom k vášmu obľúbenému jazyku. "
@@ -2944,12 +3043,13 @@ msgstr ""
 "\"configureTimezoneUTC\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:53
-msgid "<guilabel>Country / Region</guilabel>"
-msgstr "<guilabel>Krajina / Región</guilabel>"
+#: en/misc-params.xml:62
+#, fuzzy
+msgid "<emphasis role=\"bold\">Country / Region</emphasis>"
+msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:56
+#: en/misc-params.xml:64
 #, fuzzy
 msgid ""
 "If the selected country is wrong, it is very important that you correct the "
@@ -2959,47 +3059,49 @@ msgstr ""
 "nastavenie. Pozrite <xref linkend=\"selectCountry\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:62
-msgid "<guilabel>Bootloader</guilabel>"
-msgstr "<guilabel>Zavádzač</guilabel>"
+#: en/misc-params.xml:70
+#, fuzzy
+msgid "<emphasis role=\"bold\">Bootloader</emphasis>"
+msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:64
-msgid "DrakX has made good choices for the bootloader setting."
+#: en/misc-params.xml:72
+#, fuzzy
+msgid "DrakX proposal for the bootloader setting"
 msgstr "DrakX spravil dobré výbery pre nastavenie zavádzača systému."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:67
+#: en/misc-params.xml:75
 #, fuzzy
-msgid "Do not change anything, unless you know how to configure GRUB2"
+msgid ""
+"Do not change anything, unless you know how to configure GRUB2. For more "
+"information, see <xref linkend=\"setupBootloader\"/>"
 msgstr "Nič na tom nemeňte, ak neviete, ako konfigurovať Grub a/alebo Lilo."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:70
-msgid "For more information, see <xref linkend=\"setupBootloader\"/>"
-msgstr "Pre viac informácií, viď <xref linkend=\"setupBootloader\"/>"
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:75
-msgid "<guilabel>User management</guilabel>"
-msgstr "<guilabel>Správa používateľov</guilabel>"
+#: en/misc-params.xml:83
+#, fuzzy
+msgid "<emphasis role=\"bold\">User management</emphasis>"
+msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:78
+#: en/misc-params.xml:85
+#, fuzzy
 msgid ""
-"You can add extra users here. They will each get their own <literal>/home</"
-"literal> directories."
+"You can add extra users here. They will each be allocated their own "
+"<filename>/home</filename> directories."
 msgstr ""
 "Tu môžete pridať extra používateľov. Každý z nich obdrží svoj vlastný "
 "<literal>/home</literal> t. j. domáce adresáre."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:84
-msgid "<guilabel>Services</guilabel>:"
-msgstr "<guilabel>Služby</guilabel>:"
+#: en/misc-params.xml:91
+#, fuzzy
+msgid "<emphasis role=\"bold\">Services</emphasis>"
+msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:86
+#: en/misc-params.xml:93
 #, fuzzy
 msgid ""
 "System services refer to those small programs which run in the background "
@@ -3010,31 +3112,29 @@ msgstr ""
 "umožňuje povoliť alebo zakázať určité úlohy."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:90
+#: en/misc-params.xml:97
+#, fuzzy
 msgid ""
 "You should check carefully before changing anything here - a mistake may "
-"prevent your computer from operating correctly."
+"prevent your computer from operating correctly. For more information, see "
+"<xref linkend=\"configureServices\"/>"
 msgstr ""
 "Tu by ste mali škrtať opatrne, skôr než tu čokoľvek zmeníte - omyl môže "
 "zabrániť správnemu behu vášho počítača."
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:94
-msgid "For more information, see <xref linkend=\"configureServices\"/>"
-msgstr "Pre viac informácií, viď <xref linkend=\"configureServices\"/>"
-
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:101
+#: en/misc-params.xml:106
 msgid "Hardware parameters"
 msgstr "Hardvérové parametre"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:106
-msgid "<guilabel>Keyboard</guilabel>:"
-msgstr "<guilabel>Klávesnica</guilabel>:"
+#: en/misc-params.xml:111
+#, fuzzy
+msgid "<emphasis role=\"bold\">Keyboard</emphasis>"
+msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:108
+#: en/misc-params.xml:113
 #, fuzzy
 msgid ""
 "Configure your keyboard layout according to your location, language and type "
@@ -3044,19 +3144,20 @@ msgstr ""
 "záležať na vašej polohe, jazyku alebo type klávesnice."
 
 #. type: Content of: <section><section><itemizedlist><listitem><note><para>
-#: en/misc-params.xml:113
+#: en/misc-params.xml:118
 msgid ""
 "If you notice a wrong keyboard layout and want to change it, keep in mind "
 "that your passwords are going to change too."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:119
-msgid "<guilabel>Mouse</guilabel>:"
-msgstr "<guilabel>Myš</guilabel>:"
+#: en/misc-params.xml:124
+#, fuzzy
+msgid "<emphasis role=\"bold\">Mouse</emphasis>"
+msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:121
+#: en/misc-params.xml:126
 msgid ""
 "Here you can add or configure other pointing devices, tablets, trackballs "
 "etc."
@@ -3065,41 +3166,43 @@ msgstr ""
 "trackbally atď."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:126
-msgid "<guilabel>Sound card</guilabel>:"
-msgstr "<guilabel>Zvuková karta</guilabel>:"
+#: en/misc-params.xml:131
+#, fuzzy
+msgid "<emphasis role=\"bold\">Sound card</emphasis>"
+msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:129
-#, fuzzy
+#: en/misc-params.xml:133
+msgid "The installer will use the default driver if one is available."
+msgstr ""
+
+#. type: Content of: <section><section><para>
+#: en/misc-params.xml:136 en/soundConfig.xml:46
 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 where none of them is the default one."
+"If there is no actual default driver for your sound card, there may be other "
+"possible alternative drivers available to choose from. If this is the case, "
+"but you think the installer has not made the most appropriate choice, you "
+"can click on <emphasis>Advanced</emphasis> to manually specify a driver."
 msgstr ""
-"Inštalátor používa predvolený ovládač, ak predvolený jestvuje. Možnosť "
-"výberu odlišného ovládača je daná len vtedy, keď jestvuje viac než jeden "
-"ovládač pre vašu kartu, ale žiaden z nich nie je predvolený."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:137
-msgid "<guilabel>Graphical interface</guilabel>:"
-msgstr "<guilabel>Grafické rozhranie</guilabel>:"
+#: en/misc-params.xml:144
+#, fuzzy
+msgid "<emphasis role=\"bold\">Graphical interface</emphasis>"
+msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:140
-msgid "This section allows you to configure your graphic card(s) and displays."
+#: en/misc-params.xml:146
+#, fuzzy
+msgid ""
+"This section allows you to configure your graphics card(s) and displays. For "
+"more information, see <xref linkend=\"configureX_chooser\"/>"
 msgstr ""
 "Táto sekcia vám dovoľuje konfigurovať vašu grafickú kartu (resp. karty) a "
 "obrazovky."
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:143
-msgid "For more information, see <xref linkend=\"configureX_chooser\"/>."
-msgstr "Pre viac informácií, viď <xref linkend=\"configureX_chooser\"/>."
-
 #. type: Content of: <section><section><mediaobject>
-#: en/misc-params.xml:149
+#: en/misc-params.xml:155
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
@@ -3110,22 +3213,23 @@ msgstr ""
 "\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:157
+#: en/misc-params.xml:163
 msgid "Network and Internet parameters"
 msgstr "Nastavenia siete a internetu"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:163
-msgid "<guilabel>Network</guilabel>:"
-msgstr "<guilabel>Sieť</guilabel>:"
+#: en/misc-params.xml:169
+#, fuzzy
+msgid "<emphasis role=\"bold\">Network</emphasis>"
+msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:165
+#: en/misc-params.xml:171
 #, fuzzy
 msgid ""
 "You can configure your network here, but for network cards with non-free "
-"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 "
+"drivers it is better to do that after reboot, using the Mageia Control "
+"Center, if you have not yet enabled the <emphasis>Nonfree</emphasis> media "
 "repositories."
 msgstr ""
 "Tu môžete konfigurovať vašu sieť, ale pre sieťové karty s neslobodnými "
@@ -3133,7 +3237,7 @@ msgstr ""
 "Mageia</application>, ak ste ešte nepovolili repozitáre Neslobodných nosičov."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:172
+#: en/misc-params.xml:178
 #, fuzzy
 msgid ""
 "When you add a network card, do not forget to set your firewall to monitor "
@@ -3143,15 +3247,17 @@ msgstr ""
 "sledovanie onoho rozhrania."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:179
-msgid "<guilabel>Proxies</guilabel>:"
-msgstr "<guilabel>Proxy servery</guilabel>:"
+#: en/misc-params.xml:185
+#, fuzzy
+msgid "<emphasis role=\"bold\">Proxies</emphasis>"
+msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:181
+#: en/misc-params.xml:187
+#, fuzzy
 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 "
+"Internet.  This section allows you to configure your computer to utilize a "
 "proxy service."
 msgstr ""
 "A Proxy Server slúži ako sprostredkovateľ medzi vaším počítačom a širším "
@@ -3159,68 +3265,73 @@ msgstr ""
 "niektorej proxy služby."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:186
+#: en/misc-params.xml:192
 #, fuzzy
 msgid ""
-"You may need to consult your systems administrator to get the parameters you "
-"need to enter here."
+"You may need to consult your systems administrator to obtain the parameters "
+"you need to enter here."
 msgstr ""
 "Možno sa budete potrebovať poradiť s vaším systémovým správcom pre získanie "
 "parametrov, ktoré sem potrebujete zadať"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:195
+#: en/misc-params.xml:201
 msgid "Security"
 msgstr "Bezpečnosť"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:200
-msgid "<guilabel>Security Level</guilabel>:"
-msgstr "<guilabel>Úroveň bezpečnosti</guilabel>:"
+#: en/misc-params.xml:206
+#, fuzzy
+msgid "<emphasis role=\"bold\">Security Level</emphasis>"
+msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:203
+#: en/misc-params.xml:208
+#, fuzzy
 msgid ""
-"Here you set the Security level for your computer, in most cases the default "
-"setting (Standard) is adequate for general use."
+"The Security level for your computer, in most cases the default setting "
+"(Standard)  is adequate for general use. Select the option which best suits "
+"your usage."
 msgstr ""
 "Tu nastavujete Úroveň bezpečnosti pre váš počítač, vo väčšine prípadov "
 "predvolené nastavenie (Štandardná) je adekvátna pre bežné použitie."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:207
-msgid "Check the option which best suits your usage."
-msgstr "Zaškrtnite voľbu, ktorá sa najlepšie hodí k vášmu používaniu."
+#: en/misc-params.xml:215
+#, fuzzy
+msgid "<emphasis role=\"bold\">Firewall</emphasis>"
+msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:212
-msgid "<guilabel>Firewall</guilabel>:"
-msgstr "<guilabel>Firewall</guilabel>:"
+#: en/misc-params.xml:217
+msgid ""
+"The firewall allows you to manage which network connections are allowed on "
+"your computer. The safe and secure default is to allow ZERO inbound "
+"connections. This does not stop you connecting outbound and using your "
+"computer normally."
+msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:214
+#: en/misc-params.xml:223
 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."
+"Please be aware that the Internet is a high risk network where there are "
+"continuous attempts to probe and attack systems. Even seemingly <quote>safe</"
+"quote> connections such as ICMP (for ping) have been used as covert data "
+"channels for exfiltrating data by malicious persons."
 msgstr ""
-"Firewall, slovenský ohnivá stena, má slúžiť ako bariéra medzi vašimi "
-"dôležitými dátami a ničomníkmi vonku na internete, ktorí by ich chceli "
-"rozširovať alebo ukradnúť."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:218
+#: en/misc-params.xml:229
 #, fuzzy
-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 "
-"information, see <xref linkend=\"firewall\"/>."
-msgstr ""
-"Vyberte si služby, ktoré si prajete aby mali prístup k vášmu systému. Vaše "
-"výbery budú záležať na tom, k čomu používate váš počítač."
+msgid "For more information, see <xref linkend=\"firewall\"/>."
+msgstr "Pre viac informácií, viď <xref linkend=\"configureX_chooser\"/>."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:224
-msgid "Bear in mind that allowing everything (no firewall) may be very risky."
+#: en/misc-params.xml:232
+#, fuzzy
+msgid ""
+"Bear in mind that allowing <emphasis>everything</emphasis> (no firewall) may "
+"be very risky."
 msgstr ""
 "Majte na pamäti, že dovolenie všetkého (žiaden firewall) môže byť veľmi "
 "riskantné."
@@ -3231,33 +3342,45 @@ msgid "Reboot"
 msgstr "Reštart"
 
 #. type: Content of: <section><para>
-#: en/reboot.xml:6
+#: en/reboot.xml:7
 #, fuzzy
 msgid ""
 "Once the bootloader has been installed, you will be prompted to halt your "
-"computer, remove the live CD and restart the computer, click on <emphasis "
-"role=\"bold\"><guibutton>Finish</guibutton></emphasis> and act as "
-"asked<emphasis role=\"bold\"> in this order!</emphasis>"
+"computer, remove the live DVD/USB stick and restart the computer."
 msgstr ""
 "Keď bol zavádzač nainštalovaný, budete vyzvaní pozastaviť váš počítača, "
 "odstrániť živé CD a reštartovať počítač. Keď reštartujete, uvidíte "
 "následnosť ukazovateľov priebehu sťahovania. Tieto naznačujú, že softvérové "
 "médiá sú sťahované (viď Správu softvéru)."
 
+#. type: Content of: <section><important><simpara>
+#: en/reboot.xml:9
+msgid ""
+"Ensure that you follow these shut-down and restart instruction steps in the "
+"<emphasis role=\"bold\">same</emphasis> order."
+msgstr ""
+
 #. type: Content of: <section><mediaobject>
-#: en/reboot.xml:11
+#: en/reboot.xml:12
 #, fuzzy
-msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot2.png\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
-#. type: Content of: <section><para>
-#: en/reboot.xml:15
+#. type: Content of: <section><simpara>
+#: en/reboot.xml:16
+msgid "When you are ready, press <emphasis>Finish</emphasis>."
+msgstr ""
+
+#. type: Content of: <section><simpara>
+#: en/reboot.xml:17
 #, fuzzy
 msgid ""
 "When you restart, you will see a succession of download progress bars. These "
-"indicate that the software media lists are being downloaded (see Software "
-"management)."
+"indicate that the software media lists are being downloaded (see "
+"<emphasis>Software Management</emphasis>)."
 msgstr ""
 "Keď bol zavádzač nainštalovaný, budete vyzvaní pozastaviť váš počítača, "
 "odstrániť živé CD a reštartovať počítač. Keď reštartujete, uvidíte "
@@ -3265,7 +3388,7 @@ msgstr ""
 "médiá sú sťahované (viď Správu softvéru)."
 
 #. type: Content of: <section><mediaobject>
-#: en/reboot.xml:17
+#: en/reboot.xml:19
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
@@ -3295,47 +3418,52 @@ msgstr ""
 "učinilo miesto pre inštaláciu <application>Mageie</application>."
 
 #. type: Content of: <section><info><title>
-#: en/securityLevel.xml:3
+#: en/securityLevel.xml:10
 msgid "Security Level"
 msgstr "Úroveň bezpečnosti"
 
 #.  2012-12-25 marja - moved this part out of misc-params.xml" 
 #.  2013-05-05 marja - added screenshot 
+#. 2018/02/12 apb: Minor wording.
 #. type: Content of: <section><mediaobject>
-#: en/securityLevel.xml:11
+#: en/securityLevel.xml:20
 #, fuzzy
 msgid ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"securityLevel-im1\" align="
-"\"center\" fileref=\"dx2-securityLevel.png\" revision=\"1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-securityLevel.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"securityLevel-im1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
-"\"1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-bestTime.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"bestTime-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:16
+#: en/securityLevel.xml:26
 #, fuzzy
 msgid ""
 "<emphasis role=\"bold\">Please choose the desired security level</emphasis>"
 msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:19
+#: en/securityLevel.xml:29
 msgid ""
-"<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."
+"<emphasis>Standard</emphasis> is the default, and recommended setting for "
+"the average user."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:24
+#: en/securityLevel.xml:32
+msgid ""
+"<emphasis>Secure</emphasis> will create a highly protected system - for "
+"instance if the system is to be used as a public server."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:36
 #, fuzzy
 msgid "<emphasis role=\"bold\">Security Administrator</emphasis>"
 msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:26
+#: en/securityLevel.xml:38
 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 "
@@ -3343,14 +3471,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:31
+#: en/securityLevel.xml:43
 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."
+"A good, and easy-to-implement, choice is to enter &lt;user&gt;@localhost - "
+"where &lt;user&gt; is the login name of the user to receive these messages."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/securityLevel.xml:36
+#: en/securityLevel.xml:48
 msgid ""
 "The system sends such messages as <emphasis role=\"bold\">Unix Mailspool "
 "messages</emphasis>, not as \"ordinary\" SMTP mail: this user must therefore "
@@ -3358,27 +3486,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:41
+#: en/securityLevel.xml:53
 #, fuzzy
 msgid ""
-"After install, it will always be possible to adjust your security settings "
-"in the <guilabel>Security</guilabel> section of the Mageia Control Center."
+"It will always be possible to adjust your security settings post-install in "
+"the <emphasis>Security</emphasis> section of the Mageia Control Center."
 msgstr ""
 "Aj po inštalácii bude vždy možné upraviť vaše bezpečnostné nastavenia v "
 "časti <guilabel>Bezpečnosť</guilabel> Ovládacieho Centra Mageie."
 
 #. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:6
+#: en/SelectAndUseISOs2.xml:15
 msgid "Select and use ISOs"
 msgstr "Vyberte a používajte ISO"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:9
+#: en/SelectAndUseISOs2.xml:18
 msgid "Introduction"
 msgstr "Úvod"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:10
+#: en/SelectAndUseISOs2.xml:19
 #, fuzzy
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
@@ -3388,18 +3516,19 @@ msgstr ""
 "ktorý obraz vyhovuje vašim potrebám."
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:12
+#: en/SelectAndUseISOs2.xml:21
 #, fuzzy
-msgid "There are two families of media:"
+msgid "There are three types of installation media:"
 msgstr "Sú tu dve rodiny nosičov:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:15
+#: en/SelectAndUseISOs2.xml:24
 #, fuzzy
 msgid ""
-"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"
+"<emphasis role=\"bold\">Classical installer:</emphasis> 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 ""
 "Klasický inštalátor: Po zavedení z nosiča, bude nasledovať postup dovoľujúci "
 "výber toho, čo chcete nainštalovať a ako nakonfigurovať váš cieľový systém. "
@@ -3407,43 +3536,91 @@ msgstr ""
 "možnosti výberu, ktoré Prostredie Pracovnej Plochy si nainštalujete."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:21
+#: en/SelectAndUseISOs2.xml:31
+msgid ""
+"<emphasis role=\"bold\">LIVE media:</emphasis> This option allows you to try "
+"out Mageia without having to actually install it, or make any changes to "
+"your computer. However, the Live media also includes an Installer, which can "
+"be started when booting the media, or after booting into the Live operating "
+"system itself."
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><note><para>
+#: en/SelectAndUseISOs2.xml:37
+msgid ""
+"The Live Installer is simpler compared to the Classical Installer - but you "
+"have fewer configuration options."
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><important><para>
+#: en/SelectAndUseISOs2.xml:41
+#, fuzzy
+msgid ""
+"Live ISOs can only be used to create <quote>clean</quote> installations, "
+"they cannot be used to upgrade previously installed Mageia releases."
+msgstr ""
+"<emphasis role=\"bold\">Živé ISO súbory môžu byť použití len na vytvorenie "
+"čistých inštalácií, nemôžu byť použité na aktualizáciu z predošlých vydaní.</"
+"emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:47
+#, fuzzy
+msgid ""
+"<emphasis role=\"bold\">Net Install</emphasis>: These are minimal ISO's "
+"containing no more than that which is needed to start the DrakX installer "
+"and find <literal>DrakX-installer-stage2</literal> 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."
+msgstr ""
+"Každý jeden je malý obraz, ktorý neobsahuje viac než to, čo je treba pre "
+"naštartovanie drakx inštalátora a nájdenie drakx-inštalátora-časti2 a "
+"ďalších balíčkov, ktoré sú potrebné pre pokračovanie a dokončenie "
+"inštalácie. Tieto balíčky môžu byť na pevnom disku V PC, na lokálnom disku, "
+"na lokálnej sieti alebo na internete."
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:53
+#, fuzzy
 msgid ""
-"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"
+"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 ""
+"Tieto nosiče sú veľmi ľahké (menšie než 100 MB) a sú vhodné, keď prenosové "
+"pásmo príliš malé pre stiahnutie plného DVD, keď PC nemá DVD mechaniku alebo "
+"keď PC nedokáže naštartovať z USB kľúča."
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:27
-msgid "Details are given in the next sections."
+#: en/SelectAndUseISOs2.xml:58
+#, fuzzy
+msgid "More details are given in the next sections."
 msgstr "Podrobnosti sú uvedené v ďalších častiach."
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:30
+#: en/SelectAndUseISOs2.xml:61
 msgid "Media"
 msgstr "Dátové nosiče"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:32
+#: en/SelectAndUseISOs2.xml:63
 msgid "Definition"
 msgstr "Definícia"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:33
+#: en/SelectAndUseISOs2.xml:64
 #, 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 (DVD, USB "
-"stick, ...) the ISO file is copied to."
+"install and/or update Mageia and, by extension, any physical medium (DVD, "
+"USB stick, ...) the ISO file is copied to."
 msgstr ""
 "Tu je médiom (nosičom) obrazový súbor ISO, ktorý vám umožňuje inštalovať a/"
 "alebo aktualizovať Mageiu a pri rozšírení akúkoľvek fyzickú podporu, na "
 "ktorú je ISO súbor skopírovaný."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:36
+#: en/SelectAndUseISOs2.xml:67
 #, fuzzy
 msgid ""
 "You can find Mageia ISO's <link ns4:href=\"http://www.mageia.org/en/"
@@ -3453,292 +3630,275 @@ msgstr ""
 "link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:39
+#: en/SelectAndUseISOs2.xml:70
 msgid "Classical installation media"
 msgstr "Klasické inštalačné nosiče"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:41 en/SelectAndUseISOs2.xml:71
-#: en/SelectAndUseISOs2.xml:141
+#: en/SelectAndUseISOs2.xml:72 en/SelectAndUseISOs2.xml:104
+#: en/SelectAndUseISOs2.xml:171
 msgid "Common features"
 msgstr "Bežné vlastnosti"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:44
+#: en/SelectAndUseISOs2.xml:75
 #, fuzzy
-msgid "These ISOs use the Classical installer called drakx."
+msgid "These ISOs use the Classical installer called DrakX"
 msgstr "Tieto ISO súbory používajú tradičný inštalátor nazvaný drakx."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:47
+#: en/SelectAndUseISOs2.xml:78
 #, fuzzy
 msgid ""
 "They are used for performing clean installs or to upgrade a previously "
-"installed version of Mageia."
+"installed version of Mageia"
 msgstr ""
 "Dokážu spraviť čistú inštaláciu alebo aktualizovať z predošlých vydaní."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:51 en/SelectAndUseISOs2.xml:83
-#: en/SelectAndUseISOs2.xml:158
+#: en/SelectAndUseISOs2.xml:82 en/SelectAndUseISOs2.xml:118
+#: en/SelectAndUseISOs2.xml:174
 #, fuzzy
-msgid "Different media for 32 and 64 bit architectures."
+msgid "Different media for 32 and 64-bit architectures"
 msgstr "Rôzne nosiče pre 32 alebo 64 bitové architektúry."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:54
+#: en/SelectAndUseISOs2.xml:85
+#, fuzzy
 msgid ""
-"Some tools are available in the Welcome screen: Rescue System, Memory Test, "
-"Hardware Detection Tool."
+"Some tools are available in the Installer <quote>Welcome</quote> screen: "
+"<emphasis>Rescue System, Memory Test, </emphasis>and <emphasis>Hardware "
+"Detection Tool</emphasis>"
 msgstr ""
 "Niektoré nástroje sú dostupné na Uvítacej obrazovke: Záchranný systém, "
 "Pamäťový test, Nástroj na detekciu hardvéru."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:58
-msgid "Each DVD contains many available desktop environments and languages."
+#: en/SelectAndUseISOs2.xml:91
+#, fuzzy
+msgid "Each DVD contains many available desktop environments and languages"
 msgstr ""
 "Každé DVD obsahuje mnohé dostupné prostredia pracovnej plochy a jazyky."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:62
+#: en/SelectAndUseISOs2.xml:95
+#, fuzzy
 msgid ""
-"You'll be given the choice during the installation to add non free software."
+"You'll be given the choice during the installation to add non-free software"
 msgstr "Počas inštalácie vám bude daná voľba pridať si neslobodný softvér."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:69
+#: en/SelectAndUseISOs2.xml:102
 msgid "Live media"
 msgstr "Živé nosiče"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:74
+#: en/SelectAndUseISOs2.xml:107
 #, fuzzy
 msgid ""
 "Can be used to preview the Mageia operating system without having to install "
-"it. Can also be used to install Mageia if you wish."
+"it"
 msgstr ""
 "Môžu byť použité na obhliadku distribúcie bez jej nainštalovania na pevný "
 "disk i na voliteľné nainštalovanie Mageie na váš pevný disk."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:79
-#, fuzzy
-msgid "Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)."
+#: en/SelectAndUseISOs2.xml:111
+msgid "The Live media also includes an Installer."
 msgstr ""
-"Každé ISO obsahuje len jedno prostredie pracovnej plochy (KDE alebo GNOME)."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:86
+#: en/SelectAndUseISOs2.xml:114
 #, fuzzy
-msgid ""
-"<emphasis role=\"bold\">Live ISOs can only be used to create clean "
-"installations, they cannot be used to upgrade previously installed Mageia "
-"releases.</emphasis>"
+msgid "Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)"
 msgstr ""
-"<emphasis role=\"bold\">Živé ISO súbory môžu byť použití len na vytvorenie "
-"čistých inštalácií, nemôžu byť použité na aktualizáciu z predošlých vydaní.</"
-"emphasis>"
+"Každé ISO obsahuje len jedno prostredie pracovnej plochy (KDE alebo GNOME)."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:91
-msgid "They contain non free software."
+#: en/SelectAndUseISOs2.xml:121
+#, fuzzy
+msgid "They contain non-free software"
 msgstr "Obsahujú neslobodný softvér."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:96
+#: en/SelectAndUseISOs2.xml:126
 #, fuzzy
 msgid "Live DVD Plasma"
 msgstr "Živé DVD KDE"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:99
+#: en/SelectAndUseISOs2.xml:129
 #, fuzzy
-msgid "Plasma desktop environment only."
+msgid "Plasma desktop environment only"
 msgstr "iba KDE prostredie pracovnej plochy."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:102 en/SelectAndUseISOs2.xml:116
-#: en/SelectAndUseISOs2.xml:130
+#: en/SelectAndUseISOs2.xml:132 en/SelectAndUseISOs2.xml:146
+#: en/SelectAndUseISOs2.xml:160
 #, fuzzy
-msgid "All available languages are present."
+msgid "All available languages are present"
 msgstr "Všetky jazyky sú prítomné."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:105
-msgid "64 bit architecture only."
-msgstr ""
+#: en/SelectAndUseISOs2.xml:135 en/SelectAndUseISOs2.xml:149
+#, fuzzy
+msgid "64-bit architecture only"
+msgstr "Rôzne nosiče pre 32 alebo 64 bitové architektúry."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:110
+#: en/SelectAndUseISOs2.xml:140
 msgid "Live DVD GNOME"
 msgstr "Živé DVD GNOME"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:113
-msgid "GNOME desktop environment only."
+#: en/SelectAndUseISOs2.xml:143
+#, fuzzy
+msgid "GNOME desktop environment only"
 msgstr "ibe GNOME prostredie pracovnej plochy."
 
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:119
-msgid "64 bit architecture only"
-msgstr ""
-
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:124
+#: en/SelectAndUseISOs2.xml:154
 #, fuzzy
 msgid "Live DVD Xfce"
 msgstr "Živé DVD KDE"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:127
+#: en/SelectAndUseISOs2.xml:157
 #, fuzzy
-msgid "Xfce desktop environment only."
+msgid "Xfce desktop environment only"
 msgstr "iba KDE prostredie pracovnej plochy."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:133
+#: en/SelectAndUseISOs2.xml:163
 #, fuzzy
-msgid "32 or 64 bit architectures."
+msgid "32 or 64-bit architectures"
 msgstr "Rôzne nosiče pre 32 alebo 64 bitové architektúry."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:139
+#: en/SelectAndUseISOs2.xml:169
 #, fuzzy
 msgid "Net install media"
 msgstr "Spustiť inštaláciu"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:144
+#: en/SelectAndUseISOs2.xml:177
 #, fuzzy
-msgid ""
-"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."
-msgstr ""
-"Každý jeden je malý obraz, ktorý neobsahuje viac než to, čo je treba pre "
-"naštartovanie drakx inštalátora a nájdenie drakx-inštalátora-časti2 a "
-"ďalších balíčkov, ktoré sú potrebné pre pokračovanie a dokončenie "
-"inštalácie. Tieto balíčky môžu byť na pevnom disku V PC, na lokálnom disku, "
-"na lokálnej sieti alebo na internete."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:152
-#, fuzzy
-msgid ""
-"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 ""
-"Tieto nosiče sú veľmi ľahké (menšie než 100 MB) a sú vhodné, keď prenosové "
-"pásmo príliš malé pre stiahnutie plného DVD, keď PC nemá DVD mechaniku alebo "
-"keď PC nedokáže naštartovať z USB kľúča."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:161
-#, fuzzy
-msgid "First steps are English language only."
+msgid "First steps are English language only"
 msgstr "iba anglický jazyk."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:166
+#: en/SelectAndUseISOs2.xml:182
 #, fuzzy
 msgid "netinstall.iso"
 msgstr "Spustiť inštaláciu"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:169
+#: en/SelectAndUseISOs2.xml:185
 #, fuzzy
 msgid ""
-"Contains only free software, for those people who prefer not to use non-free "
-"software."
+"Contains only free software, for those who prefer to not use non-free "
+"software"
 msgstr ""
 "Obsahuje len slobodný softvér, pre tých ľudí, ktorí odmietajú používať "
 "neslobodný softvér."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:175
+#: en/SelectAndUseISOs2.xml:191
 #, fuzzy
 msgid "netinstall-nonfree.iso"
 msgstr "boot-nonfree.iso"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:178
+#: en/SelectAndUseISOs2.xml:194
+#, fuzzy
 msgid ""
-"Contains non-free software (mostly drivers, codecs...) for people who need "
-"it."
+"Contains non-free software (mostly drivers, codecs...) for those who need it"
 msgstr ""
 "Obsahuje neslobodný softvér (zväčša ovládače, kodeky...) pre ľudí, ktorí ich "
 "potrebujú."
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:186
+#: en/SelectAndUseISOs2.xml:202
 msgid "Downloading and Checking Media"
 msgstr "Sťahovanie a skontrolovanie nosiča"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:188
+#: en/SelectAndUseISOs2.xml:204
 msgid "Downloading"
 msgstr "Sťahovanie"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:189
+#: en/SelectAndUseISOs2.xml:205
 #, fuzzy
 msgid ""
 "Once you have chosen your ISO file, you can download it using either http or "
 "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."
+"the mirror in use and an option to switch to an alternative if the bandwidth "
+"is too low."
 msgstr ""
 "Ak ste si už vybrali váš ISO súbor, môžete ho stiahnuť pomocou buď http "
 "alebo BitTorrentu. V oboch prípadoch vám okno podáva pár informácií, ako sú "
 "použitý zrkadlový server a možnosť zmeny, ak je prenosová rýchlosť príliš "
 "nízka. Ak je vybrané http, môžete uvidieť i čosi takéto"
 
-#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:191
-msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><para>
+#: en/SelectAndUseISOs2.xml:209
+msgid ""
+"If http is chosen you will also see some information regarding checksums."
+msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:195
+#: en/SelectAndUseISOs2.xml:212
+msgid ""
+"<literal>md5sum</literal>, <literal>sha1sum</literal> and "
+"<literal>sha512sum</literal> (the most secure) are tools to check the ISO "
+"integrity. Copy one of the checksums (string of alphanumeric characters) for "
+"use in the next section."
+msgstr ""
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/SelectAndUseISOs2.xml:217
 #, fuzzy
 msgid ""
-"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:"
+"<imageobject> <imagedata align=\"center\" fileref=\"Checking.png\"/> </"
+"imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><section><para>
+#: en/SelectAndUseISOs2.xml:222
+msgid "In the meantime, a window to download the actual ISO will open:"
 msgstr ""
-"md5sum a sha1sum sú nástroje pre skontrolovanie neporušenosti ISO súboru. "
-"Jeden z nich si ponechajte <link linkend=\"integrity\">pre budúce použitie</"
-"link>. Potom sa objaví toto okno:"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:199
-msgid "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+#: en/SelectAndUseISOs2.xml:225
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"Download.png\"/> </"
+"imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:203
-msgid "Select the Save File option, then, click OK."
+#: en/SelectAndUseISOs2.xml:229
+msgid ""
+"Click on <emphasis>Save File</emphasis>, then click <emphasis>OK</emphasis>."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:206
+#: en/SelectAndUseISOs2.xml:233
 #, fuzzy
 msgid "Checking the integrity of the downloaded media"
 msgstr "Kontrolovanie neporušenosti stiahnutého nosiča"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:208
+#: en/SelectAndUseISOs2.xml:235
 #, fuzzy
 msgid ""
 "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."
+"match, and if that is the case, then you should retry the download or "
+"attempt a repair using BitTorrent."
 msgstr ""
 "Obe kontrolné súčty sú hexadecimálne čísla vypočítané algoritmom zo súboru, "
 "ktorý má byť stiahnutý. Keď požiadate tieto algoritmy na znovuprepočítanie "
@@ -3748,7 +3908,7 @@ msgstr ""
 "znova."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:214
+#: en/SelectAndUseISOs2.xml:241
 #, fuzzy
 msgid ""
 "To generate the checksum for your downloaded ISO, open a console, (no need "
@@ -3756,76 +3916,87 @@ msgid ""
 msgstr "Otvorte konzolu, netreba byť rootom, a:"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:218
+#: en/SelectAndUseISOs2.xml:245
 #, fuzzy
 msgid ""
-"To use md5sum, type: <userinput>md5sum path/to/the/image/file.iso</"
-"userinput>."
+"To use the md5sum, type: <command>md5sum path/to/the/image/file.iso</command>"
 msgstr ""
 "- pre použitie md5sum, napíšte: [sam@localhost]$ <userinput>md5sum cesta/ku/"
 "obrazovemu/suboru.iso</userinput>."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:222
+#: en/SelectAndUseISOs2.xml:249
 #, fuzzy
 msgid ""
-"To use sha1sum, type: <userinput>sha1sum path/to/the/image/file.iso</"
-"userinput>"
+"To use the sha1sum, type: <command>sha1sum path/to/the/image/file.iso</"
+"command>"
+msgstr ""
+"- pre použitie sha1sum, napíšte: [sam@localhost]$ <userinput>sha1sum cesta/"
+"ku/obrazovemu/suboru.iso</userinput>."
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:254
+#, fuzzy
+msgid ""
+"To use the sha512sum, type: <command>sha512sum path/to/the/image/file.iso</"
+"command>"
 msgstr ""
 "- pre použitie sha1sum, napíšte: [sam@localhost]$ <userinput>sha1sum cesta/"
 "ku/obrazovemu/suboru.iso</userinput>."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:226
+#: en/SelectAndUseISOs2.xml:258
 msgid "Example:"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:228
-msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
+#: en/SelectAndUseISOs2.xml:260
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"Md5sum.png\"/> </"
+"imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:232
+#: en/SelectAndUseISOs2.xml:265
 #, fuzzy
 msgid ""
-"and compare the result (you may have to wait for a while) with the checksum "
-"provided by Mageia."
+"then compare the result (you may have to wait for a while) with the ISO "
+"checksum provided by Mageia."
 msgstr ""
 "a porovnajte získané číslo z vášho počítača (možno naň budete musieť chvíľku "
 "počkať) s číslom daným Mageiou. Napríklad:"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:237
+#: en/SelectAndUseISOs2.xml:270
 msgid "Burn or dump the ISO"
 msgstr "Vypálenie alebo vpísanie ISO súboru"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:238
+#: en/SelectAndUseISOs2.xml:271
 #, fuzzy
 msgid ""
-"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."
+"The verified ISO can now be burned to a CD/DVD or <quote>dumped</quote> to a "
+"USB stick. This is not a standard copy operation, as a bootable medium will "
+"actually be created."
 msgstr ""
 "Skontrolované ISO môže byť teraz napálené na CD alebo DVD alebo vpísané na "
 "USB kľúč. Tieto operácie nie sú obyčajným kopírovaním a cielia k vytvoreniu "
 "zavediteľného nosiča."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:275
 msgid "Burning the ISO to a CD/DVD"
 msgstr "Napálenie ISO súboru na CD/DVD"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:243
+#: en/SelectAndUseISOs2.xml:276
 #, fuzzy
 msgid ""
-"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. See "
-"<link ns4:href=\"https://wiki.mageia.org/en/Writing_CD_and_DVD_images\">the "
-"Mageia wiki</link> for more information."
+"Whichever software you use, ensure that the option to burn an<emphasis> "
+"image</emphasis> is used. Burn <emphasis>data</emphasis> or <emphasis>files</"
+"emphasis> is NOT correct. See the <link ns4:href=\"https://wiki.mageia.org/"
+"en/Writing_CD_and_DVD_images\">the Mageia wiki</link> for more information."
 msgstr ""
 "Použite ktorýkoľvek napaľovací program, ktorý si prajete, ale uistite sa, že "
 "napaľovacie zariadenie je správne nastavené na <emphasis role=\"bold"
@@ -3834,47 +4005,54 @@ msgstr ""
 "Writing_CD_and_DVD_images\">Mageia wiki</link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:248
+#: en/SelectAndUseISOs2.xml:282
 msgid "Dump the ISO to a USB stick"
 msgstr "Vpísať ISO na USB kľúčenku"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:249
+#: en/SelectAndUseISOs2.xml:283
+#, fuzzy
 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."
+"All Mageia ISOs are hybrids, which means you can dump them to a USB stick "
+"and then use that to boot and install the system."
 msgstr ""
 "Všetky ISO súbory Mageie sú hybridy, čo znamená, že ich môžete 'vpísať' na "
 "USB kľúč a potom ho použiť na zavedenie a inštaláciu systému."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:252
+#: en/SelectAndUseISOs2.xml:286
 #, fuzzy
 msgid ""
-"\"Dumping\" an image onto a flash device destroys any previous file-system "
-"on the device; any existing data will be lost and the partition capacity "
-"will be reduced to the image size."
+"Dumping an image onto a flash device destroys any previous file-system on "
+"the device and all existing data will be lost."
 msgstr ""
 "\"vpísanie\" obrazu na flashové zariadenie zničí akýkoľvek predošlý súborový "
 "systém na zariadení; každé ostatné dáta budú stratené a kapacita partície "
 "bude zmenšená na veľkosť obrazu."
 
-#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:256
+#. type: Content of: <section><section><section><note><para>
+#: en/SelectAndUseISOs2.xml:290
 msgid ""
-"To recover the original capacity, you must redo partitioning and re-format "
-"the USB stick."
+"Also, the only partition on the flash device will then just be the Mageia "
+"ISO partition."
+msgstr ""
+
+#. type: Content of: <section><section><section><note><para>
+#: en/SelectAndUseISOs2.xml:292
+msgid ""
+"So, if an ISO of about 4GB is written to an 8GB USB stick, the stick will "
+"then only show up as 4GB. This is because the remaining 4GB is no longer "
+"formatted - hence not currently available for use. To recover the original "
+"capacity, you must reformat and repartition the USB stick."
 msgstr ""
-"Pre obnovu pôvodnej kapacity, musíte znovu prerobiť partíciu USB kľúča a "
-"naformátovať ho."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:259
+#: en/SelectAndUseISOs2.xml:299
 msgid "Using a graphical tool within Mageia"
 msgstr "Použitím grafického nástroja v Mageii"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:260
+#: en/SelectAndUseISOs2.xml:300
 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>"
@@ -3883,27 +4061,27 @@ msgstr ""
 "org/en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:263
+#: en/SelectAndUseISOs2.xml:303
 msgid "Using a graphical tool within Windows"
 msgstr "Použitím grafického nástroja vo Windows"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:304
 msgid "You could try:"
 msgstr "Môžete vyskúšať:"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:267
+#: en/SelectAndUseISOs2.xml:307
 #, fuzzy
 msgid ""
 "<link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using the "
-"\"ISO image\" option;"
+"\"ISO image\" option"
 msgstr ""
 "- <link ns4:href=\"http://rufus.akeo.ie/?locale=sk_SK\">Rufus</link> "
 "použijúc možnosť \"ISO obraz\";"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:271
+#: en/SelectAndUseISOs2.xml:311
 #, fuzzy
 msgid ""
 "<link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
@@ -3913,12 +4091,13 @@ msgstr ""
 "Disk Imager</link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:277
-msgid "Using Command line within a GNU/Linux system"
+#: en/SelectAndUseISOs2.xml:317
+#, fuzzy
+msgid "Using the Command line within a GNU/Linux system"
 msgstr "Použijúc Príkazový riadok v systéme GNU/Linux"
 
 #. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:279
+#: en/SelectAndUseISOs2.xml:319
 #, fuzzy
 msgid ""
 "It is potentially *dangerous* to do this by hand. You risk overwriting "
@@ -3928,70 +4107,82 @@ msgstr ""
 "diskovú partíciu, zadáte nesprávne ID zariadenia."
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:325
 msgid "Open a console"
 msgstr "Otvorte konzolu"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:288
+#: en/SelectAndUseISOs2.xml:328
 #, fuzzy
 msgid ""
-"Become a root (Administrator) user with the command <userinput>su -</"
-"userinput> (don't forget the final '-' )"
+"Become a <emphasis>root</emphasis> (Administrator) user with the command "
+"<command>su -</command> (don't forget the <command>-</command> )"
 msgstr ""
 "Staňte sa rootom použitím príkazu <userinput>su -</userinput> (nezabudnite "
 "na koncovú pomlčku '-')"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:291
-msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
+#: en/SelectAndUseISOs2.xml:332
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"Root.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
+"\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:297
+#: en/SelectAndUseISOs2.xml:338
+#, fuzzy
 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)"
+"Plug in your USB stick - but do not mount it (this also means do not open "
+"any application or file manager that could access or read it)"
 msgstr ""
 "Vsuňte váš USB kľúč (nepripájajte ho mountom, čo tiež znamená, neotvárajte "
 "žiadnu aplikáciu alebo správcu súborov, ktorý by ho mohol sprístupniť alebo "
 "z neho čítať)"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:302
-msgid "Enter the command <userinput>fdisk -l</userinput>"
+#: en/SelectAndUseISOs2.xml:343
+#, fuzzy
+msgid "Enter the command <command>fdisk -l</command>"
 msgstr "Vložte príkaz <userinput>fdisk -l</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:304
-msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
+#: en/SelectAndUseISOs2.xml:345
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"Fdisk.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
+"\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:310
+#: en/SelectAndUseISOs2.xml:351
 #, fuzzy
 msgid ""
-"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."
+"Find the device name for your USB stick (by its size), for example "
+"<filename>/dev/sdb</filename> in the screenshot above, is an 8GB USB stick."
 msgstr ""
 "Nájdite meno zariadenia pre vašu USB kľúč (podľa jeho veľkosti), napríklad "
 "<code>/dev/sdb</code> na obrázku vyššie, je to 8GB USB kľúč."
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:312
+#: en/SelectAndUseISOs2.xml:354
 #, 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 that its size is 2GB:"
+"Alternatively, you can find the device name with the command <command>dmesg</"
+"command>. Towards the end of the following example, you can see the device "
+"name starting with <filename>sd</filename>, and in this case, <filename>sdd</"
+"filename> is the actual device. You can also see that its size is 2GB:"
 msgstr ""
 "Prípadne môžete získať meno zariadenia s príkazom <code>dmesg</code>: na "
 "konci, vidíte meno zariadenia začínajúce so <emphasis>sd</emphasis>, a "
 "<emphasis>sdd</emphasis> v tomto prípade:"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para><screen>
-#: en/SelectAndUseISOs2.xml:317
+#: en/SelectAndUseISOs2.xml:360
 #, no-wrap
 msgid ""
 "[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -4033,53 +4224,57 @@ 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:317
+#: en/SelectAndUseISOs2.xml:360
 #, fuzzy
 msgid "<placeholder type=\"screen\" id=\"0\"/>"
 msgstr "<placeholder type=\"info\" id=\"0\"/>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:337
+#: en/SelectAndUseISOs2.xml:380
 #, fuzzy
 msgid ""
-"Enter the command: <emphasis role=\"bold\"># <userinput>dd if=path/to/the/"
-"ISO/file of=/dev/sdX bs=1M</userinput></emphasis>"
+"Enter the command: <command>dd if=path/to/the/ISO/file of=/dev/"
+"sd<replaceable>X</replaceable> bs=1M</command>"
 msgstr ""
 "Vložte príkaz: # <userinput>dd if=cesta/ku/ISO/suboru of=/dev/sdX bs=1M</"
 "userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:340
+#: en/SelectAndUseISOs2.xml:382
 #, fuzzy
-msgid "Where X=your device name eg: /dev/sdd"
+msgid ""
+"Where <replaceable>X</replaceable>=your device name eg: <filename>/dev/sdd</"
+"filename>"
 msgstr "kde X=názov vášho zariadenia, napr. /dev/sdc"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:341
+#: en/SelectAndUseISOs2.xml:384
 #, fuzzy
 msgid ""
-"Example:<emphasis role=\"bold\"> # <userinput>dd if=/home/user/Downloads/"
-"Mageia-6-x86_64-DVD.iso of=/dev/sdd bs=1M</userinput></emphasis>"
+"Example:<literal> dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso of=/dev/"
+"sdd bs=1M</literal>"
 msgstr ""
 "Príklad: # <userinput>dd if=/home/pouzivatel/Stiahnute/Mageia-4-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
+#: en/SelectAndUseISOs2.xml:388
 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"
+"It might be 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:349
-msgid "Enter the command: # <userinput>sync</userinput>"
+#: en/SelectAndUseISOs2.xml:392
+#, fuzzy
+msgid "Enter the command: <command>sync</command>"
 msgstr "Vložte príkaz: # <userinput>sync</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:352
+#: en/SelectAndUseISOs2.xml:395
 msgid "This is the end of the process, and you may now unplug your USB stick."
 msgstr ""
 
@@ -4089,8 +4284,10 @@ msgid "Select your Country / Region"
 msgstr "Vyberte si vašu Krajinu / Región"
 
 #.  Lebarhon 2016 12 16 updated for Mageia 6
+#. 2018/02/13 apb: Minor wording + typography.
+#. 2018/02/25 apb: a) add xreflabel to this section. b) make some text bulleted.
 #. type: Content of: <section><mediaobject>
-#: en/selectCountry.xml:9
+#: en/selectCountry.xml:13
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
@@ -4100,51 +4297,50 @@ msgstr ""
 "im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
 "\"1\"/> </imageobject>"
 
-#. type: Content of: <section><para>
-#: en/selectCountry.xml:14
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectCountry.xml:20
 #, fuzzy
 msgid ""
-"Select your country or region.  This is important for all kinds of settings, "
+"Select your country or region. This is important for all kinds of settings, "
 "like the currency and wireless regulatory domain. Setting the wrong country "
-"can lead to not being able to use a Wireless network."
+"can lead to being unable to use a Wireless network."
 msgstr ""
 "Vyberte vašu krajinu alebo región. Toto je dôležité pre všetky druhy "
 "nastavení, ako sú mena a bezdrôtová regulačná doména. Nastavenie nesprávnej "
 "krajiny môže viesť ku neschopnosti používania bezdrôtovej siete."
 
-#. type: Content of: <section><para>
-#: en/selectCountry.xml:19
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectCountry.xml:27
 #, fuzzy
 msgid ""
-"If your country isn't in the list, click the <guilabel>Other Countries</"
-"guilabel> option and choose your country / region there."
+"If your country isn't in the list, click the <emphasis>Other Countries</"
+"emphasis> option and choose your country / region there."
 msgstr ""
 "Ak vaša krajina nie je v zozname, kliknite na tlačidlo <guilabel>Ostatné "
 "krajiny</guilabel> a tam si vyberte vašu krajinu / región."
 
 #. type: Content of: <section><note><para>
-#: en/selectCountry.xml:24
+#: en/selectCountry.xml:34
 #, fuzzy
 msgid ""
-"If your country is only in the <guilabel>Other Countries</guilabel> list, "
-"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."
+"If your country is only in the <emphasis>Other Countries</emphasis> list, "
+"after clicking <emphasis>OK</emphasis> it may seem that a country from the "
+"main list was chosen. Despite this, DrakX will actually apply your choice."
 msgstr ""
 "Ak je vaša krajina len v zozname <guilabel>Ostatných krajín</guilabel>, po "
 "kliknutí na <guibutton>OK</guibutton> sa môže zdať, že bola vybraná krajina "
 "zo zoznamu. Toto prosím ignorujte, DrakX bude nasledovať vašu reálnu voľbu."
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:33
+#: en/selectCountry.xml:42
 msgid "Input method"
 msgstr "Vstupná metóda"
 
 #. type: Content of: <section><section><para>
-#: en/selectCountry.xml:36
+#: en/selectCountry.xml:45
 #, fuzzy
 msgid ""
-"In the <guilabel>Other Countries</guilabel> screen you can also select an "
+"In the <emphasis>Other Countries</emphasis> 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. "
@@ -4162,67 +4358,73 @@ msgstr ""
 "FTP nosič pred výberom balíkov."
 
 #. type: Content of: <section><section><note><para>
-#: en/selectCountry.xml:45
+#: en/selectCountry.xml:54
 #, fuzzy
 msgid ""
 "If you missed the input method setup during installation, you can access it "
-"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."
+"post-install via <menuchoice> <guimenu>Configure your Computer</guimenu> "
+"<guimenuitem>System</guimenuitem> </menuchoice>, or by running "
+"<command>localedrake</command> as <emphasis>root</emphasis>."
 msgstr ""
 "Ak ste počas inštalácie vynechali nastavenie vstupnej metódy, môžete ju "
 "sprístupniť po reštarte vášho nainštalovaného systému cez \"Konfigurovať váš "
 "Počítač\" -&gt; \"Systém\", alebo spustením localedrake ako root správca."
 
 #. type: Content of: <section><info><title>
-#: en/selectInstallClass.xml:14
+#: en/selectInstallClass.xml:29
 msgid "Install or Upgrade"
 msgstr "Inštalovanie alebo Aktualizovanie"
 
 #. type: Content of: <section><mediaobject>
-#: en/selectInstallClass.xml:18
+#: en/selectInstallClass.xml:33
 #, fuzzy
 msgid ""
-"<imageobject> <imagedata format=\"PNG\" align=\"center\" fileref=\"dx2-"
-"selectInstallClass.png\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectInstallClass."
+"png\" format=\"PNG\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
 "\" /> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:25
-msgid "Install"
-msgstr "Inštalovanie"
+#: en/selectInstallClass.xml:41
+#, fuzzy
+msgid "<emphasis role=\"bold\">Install</emphasis>"
+msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:27
+#: en/selectInstallClass.xml:43
 msgid ""
-"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."
+"Use this option to perform a fresh installation of Mageia. This will format "
+"the <literal>root</literal> partition (<filename>/</filename>), but can "
+"preserve a pre-existing <filename>/home</filename> partition (a dedicated /"
+"home partition, rather than being incorporated within the root (/) partition "
+"itself)."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:33
-msgid "Upgrade"
-msgstr "Aktualizovanie"
+#: en/selectInstallClass.xml:50
+#, fuzzy
+msgid "<emphasis role=\"bold\">Upgrade</emphasis>"
+msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:35
-msgid ""
-"This can be used to upgrade an existing installation of <application>Mageia</"
-"application>."
+#: en/selectInstallClass.xml:52
+#, fuzzy
+msgid "Use this option to upgrade an existing installation of Mageia."
 msgstr ""
+"Použite túto možnosť pre čerstvú inštaláciu <application>Mageie</"
+"application>."
 
-#. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/selectInstallClass.xml:39
+#. type: Content of: <section><important><para>
+#: en/selectInstallClass.xml:58
 #, fuzzy
 msgid ""
 "Only upgrading from a previous Mageia version that was <emphasis>still "
-"supported</emphasis> when this installer's version was released, has been "
+"supported</emphasis> when this Installer's version was released, has been "
 "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."
+"its <quote>End Of Life</quote> then it is better to do a <quote>clean</"
+"quote> install instead, while preserving your <filename>/home</filename> "
+"partition."
 msgstr ""
 "Iba aktualizovanie z predošlej verzie Mageie, ktorá bola <emphasis>ešte "
 "podporovaná</emphasis> keď bola vydaná verzia tohto inštalátora, bolo "
@@ -4231,37 +4433,15 @@ msgstr ""
 "čistú inštaláciu, pričom si ponecháte vašu domovskú <literal>/home</literal> "
 "partíciu."
 
-#. type: Content of: <section><note><para>
-#: 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, 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 ""
-"Ak sa počas inštalácie rozhodnete zastaviť inštaláciu, je možné reštartovať "
-"počítač, ale skôr než toto urobíte, si to prosím dôkladne zvážte. Keď raz "
-"bola partícia naformátovaná alebo sa začali inštalovať aktualizácie, váš "
-"počítač už viac nie je v rovnakom stave a jeho reštartovanie by vás mohlo "
-"veľmi ľahko ponechať s nepoužiteľným systémom. Ak napriek tomu ste si veľmi "
-"istí, že reštartovanie je to, čo chcete, choďte do textového terminálu "
-"súčasným stlačením troch klávesov <guilabel>Alt Ctrl F2</guilabel>. Potom "
-"stlačte súčasne <guilabel>Alt Ctrl Delete</guilabel> pre reštart."
-
 #. type: Content of: <section><tip><para>
-#: en/selectInstallClass.xml:62
+#: en/selectInstallClass.xml:67
 #, fuzzy
 msgid ""
 "If you have discovered that you forgot to select an additional language, you "
-"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."
+"can return from the <emphasis>Install or Upgrade</emphasis> screen to the "
+"language choice screen by pressing <keycombo> <keycap>Ctrl</keycap> "
+"<keycap>Alt</keycap> <keycap>Home</keycap> </keycombo>. Do<emphasis role="
+"\"bold\"> NOT</emphasis> do this later in the install."
 msgstr ""
 "Ak ste objavili, že ste zabudli vybrať nejaký doplnkový jazyk, môžete sa "
 "vrátiť z obrazovky \"Inštalácie a Aktualizácie\" ku výberu jazyka súčasným "
@@ -4269,39 +4449,41 @@ msgstr ""
 "<emphasis>nerobte</emphasis> neskôr počas inštalácie."
 
 #. type: Content of: <section><info><title>
-#: en/selectKeyboardLive.xml:3
-msgid "Select keyboard"
+#: en/selectKeyboardLive.xml:14
+#, fuzzy
+msgid "Select Keyboard"
 msgstr "Vyberte si klávesnicu"
 
 #. type: Content of: <section><mediaobject>
-#: en/selectKeyboardLive.xml:7
+#: en/selectKeyboardLive.xml:18
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata xml:id=\"selectKeyboardLive-im1\" revision=\"1\" "
-"align=\"center\" format=\"PNG\" fileref=\"live-selectKeyboard.png\"/> </"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-selectKeyboard.png"
+"\" format=\"PNG\" revision=\"1\" xml:id=\"selectKeyboardLive-im1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata xml:id=\"selectKeyboardLive-im1\" revision=\"1\" "
-"align=\"center\" format=\"PNG\" fileref=\"live-selectKeyboard.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-unused.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"unused-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/selectKeyboardLive.xml:12
+#: en/selectKeyboardLive.xml:24
+msgid "Here you can set the keyboard layout you wish to use with Mageia​​."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/selectKeyboardLive.xml:27
 msgid ""
-"You will be required to set the keyboard layout you wish to use in Mageia​​. "
-"The default one is selected according to your language and timezone "
-"previously selected."
+"A suggested keyboard layout (highlighted), has been chosen for you based "
+"upon your previously selected language and timezone choices."
 msgstr ""
-"Budete si musieť vybrať rozloženie klávesnice, ktoré si prajete používať v "
-"Mageii. Predvolená je vybraná primerane k vášmu jazyku a predošlej vybranej "
-"časovej oblasti."
 
 #. type: Content of: <section><info><title>
-#: en/selectKeyboard.xml:7
+#: en/selectKeyboard.xml:20
 msgid "Keyboard"
 msgstr "Klávesnica"
 
 #. type: Content of: <section><para>
-#: en/selectKeyboard.xml:10
+#: en/selectKeyboard.xml:23
 msgid ""
 "DrakX selects an appropriate keyboard for your language. If no suitable "
 "keyboard is found it will default to a US keyboard layout."
@@ -4310,17 +4492,17 @@ msgstr ""
 "vhodná klávesnica, bude predvolené rozloženie kláves americkej klávesnice."
 
 #. type: Content of: <section><mediaobject>
-#: en/selectKeyboard.xml:15
+#: en/selectKeyboard.xml:28
 #, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\"/"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png\"/"
 "> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
-"imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
+"\"/> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:22
+#: en/selectKeyboard.xml:35
 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 "
@@ -4338,25 +4520,25 @@ msgstr ""
 "link>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:31
+#: en/selectKeyboard.xml:45
 #, fuzzy
 msgid ""
-"If your keyboard isn't in the list shown, click on <guibutton>More</"
-"guibutton> to get a fuller list, and select your keyboard there."
+"If your keyboard isn't in the list shown, click on <emphasis>More</emphasis> "
+"to get a fuller list, and select your keyboard there."
 msgstr ""
 "Ak vaša klávesnica nie je ukázaná v zozname, kliknite na tlačidlo "
 "<guibutton>Ďalšie</guibutton> pre získanie plného zoznamu, a tam si vyberte "
 "vašu klávesnicu."
 
-#. type: Content of: <section><itemizedlist><listitem><para><warning><para>
-#: en/selectKeyboard.xml:36
+#. type: Content of: <section><itemizedlist><listitem><para><note><para>
+#: en/selectKeyboard.xml:50
 #, 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 and "
-"continue the installation: the keyboard chosen from the full list will be "
-"applied."
+"After choosing a keyboard from the <emphasis>More</emphasis> dialogue, "
+"you'll return to the first keyboard choice dialogue and it will seem as "
+"though 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 ""
 "Po vybratí klávesnice z dialógu <guibutton>Ďalšie</guibutton> sa vrátite ku "
 "prvému dialógu pre výber klávesnica a bude sa zdať, akoby bola zvolená "
@@ -4365,7 +4547,7 @@ msgstr ""
 "plného zoznamu."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:46
+#: en/selectKeyboard.xml:60
 #, fuzzy
 msgid ""
 "If you choose a keyboard based on non-Latin characters, you will see an "
@@ -4377,39 +4559,40 @@ msgstr ""
 "a nelatinským rozložením klávesnice."
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:15
+#: en/selectLanguage.xml:34
 msgid "Please choose a language to use"
 msgstr "Prosím, zvoľte jazyk, ktorý chcete používať"
 
-#. type: Content of: <section><para>
-#: en/selectLanguage.xml:18
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectLanguage.xml:39
+#, fuzzy
 msgid ""
 "Select your preferred language, by first expanding the list for your "
-"continent. <application>Mageia</application> will use this selection during "
-"the installation and for your installed system."
+"continent. Mageia will use this selection during the installation and for "
+"your installed system."
 msgstr ""
 "Vyberte si váš obľúbený jazyk, tým že najprv rozbalíte zoznam pre váš "
 "svetadiel. <application>Mageia</application> použije tento výber počas "
 "inštalácie a pre váš inštalovaný systém."
 
-#. type: Content of: <section><para>
-#: en/selectLanguage.xml:23
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectLanguage.xml:45
 #, fuzzy
 msgid ""
-"Select your preferred language.  <application>Mageia</application> will use "
-"this selection during the installation and for your installed system."
+"Select your preferred language. Mageia will use this selection during the "
+"installation and for your installed system."
 msgstr ""
 "Vyberte si váš obľúbený jazyk, tým že najprv rozbalíte zoznam pre váš "
 "svetadiel. <application>Mageia</application> použije tento výber počas "
 "inštalácie a pre váš inštalovaný systém."
 
-#. type: Content of: <section><para>
-#: en/selectLanguage.xml:27
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectLanguage.xml:50
 #, fuzzy
 msgid ""
 "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 "
+"installed on your system, then you should use the <emphasis>Multiple "
+"languages</emphasis> option to add them now. It will be difficult to add "
 "extra language support after installation."
 msgstr ""
 "Je možné, že budete potrebovať mať nainštalovaných viacero jazykov na vašom "
@@ -4418,68 +4601,68 @@ msgstr ""
 "náročné pridať extra jazykovú podporu po inštalácií."
 
 #. type: Content of: <section><mediaobject>
-#: en/selectLanguage.xml:33
+#: en/selectLanguage.xml:58
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
-"\"dx2-selectLanguage.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata align=\"center\" fileref=\"live-language.png"
+"\" format=\"PNG\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
 "condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><warning><para>
-#: en/selectLanguage.xml:43
+#. type: Content of: <section><important><para>
+#: en/selectLanguage.xml:68
 #, fuzzy
 msgid ""
 "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."
+"preferred language from the main list of languages. It will also be marked "
+"as chosen in the <emphasis>Multiple languages</emphasis> screen."
 msgstr ""
 "Ak ste si hoci aj zvolili viac než jeden jazyk, musíte si najprv vybrať "
 "jeden z nich ako vás prednostný jazyk na prvej jazykovej obrazovke. Ten bude "
 "tiež označený ako vybraný na obrazovke viacerých jazykov."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:50
+#: en/selectLanguage.xml:76
+#, fuzzy
 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."
+"it is advisable to install the required language for your keyboard as well"
 msgstr ""
 "Ak jazyk vašej klávesnice nie je ten istý ako váš prednostný jazyk, potom sa "
 "odporúča nainštalovať takisto jazyk vašej klávesnice."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:56
-msgid "Mageia uses UTF-8 (Unicode) support by default."
-msgstr "Mageia používa predvolene UTF-8 (Unicode) podporu."
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:58
+#: en/selectLanguage.xml:82
 #, fuzzy
 msgid ""
-"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."
+"Mageia uses UTF-8 (Unicode) support by default. This may be disabled in the "
+"<emphasis>Multiple languages</emphasis> screen if you know that it is "
+"inappropriate for your language. Disabling UTF-8 applies to all installed "
+"languages."
 msgstr ""
 "Táto môže byť vypnutá na obrazovke \"viaceré jazyky\", ak viete, že je "
 "nevhodná pre váš jazyk. Zakázanie UTF-8 sa použije pre všetky nainštalované "
 "jazyky."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:64
+#: en/selectLanguage.xml:89
+#, fuzzy
 msgid ""
-"You can change the language of your system after installation in the Mageia "
-"Control Center -> System -> Manage localization for your system."
+"You can change the language for your system post-installation in the "
+"<menuchoice> <guimenu>Mageia Control Center</guimenu> <guimenuitem>System</"
+"guimenuitem> <guimenuitem>localization for your system</guimenuitem> </"
+"menuchoice>."
 msgstr ""
 "Jazyk vášho systému po inštalácii môžete zmeniť v ponuke Mageia Ovládacie "
 "Centrum -> Systém -> Spravovať lokalizáciu pre váš systém."
 
 #. type: Content of: <section><info><title>
-#: en/selectMouse.xml:4
+#: en/selectMouse.xml:10
 msgid "Select mouse"
 msgstr "Výber myši"
 
@@ -4487,17 +4670,19 @@ msgstr "Výber myši"
 #.  NEEDS TO BE REVIEWED! 
 #.  adding some "real" text now that we know the page shows up in the right place
 #.  marja 2012-04-24 adding screenshot 
+#. 2018/02/15 apb: Text and typography.
 #. type: Content of: <section><mediaobject>
-#: en/selectMouse.xml:16
+#: en/selectMouse.xml:24
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-selectMouse.png\" align=\"center\" "
-"format=\"PNG\" > </imagedata> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectMouse.png\" "
+"format=\"PNG\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-selectMouse.png\" align=\"center\" "
-"format=\"PNG\" > </imagedata> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
+"\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/selectMouse.xml:23
+#: en/selectMouse.xml:29
 msgid ""
 "If you are not happy with how your mouse responds, you can select a "
 "different one here."
@@ -4505,26 +4690,29 @@ msgstr ""
 "Ak nie ste spokojní s odozvou vašej myši, tu si môžete vybrať odlišnú myš."
 
 #. type: Content of: <section><para>
-#: en/selectMouse.xml:25
+#: en/selectMouse.xml:32
+#, fuzzy
 msgid ""
-"Usually, <guilabel>Universal</guilabel> - <guilabel>Any PS/2 and USB mice</"
-"guilabel> is a good choice."
+"Usually, <menuchoice> <guimenu>Universal</guimenu> <guimenuitem>Any PS/2 and "
+"USB mice</guimenuitem> </menuchoice> is a good choice."
 msgstr ""
 "Zvyčajne je <guilabel>Univerzálna</guilabel> - <guilabel>Hocaká PS/2</"
 "guilabel> a <guilabel>USB myš</guilabel> je dobrou voľbou."
 
 #. type: Content of: <section><para>
-#: en/selectMouse.xml:27
+#: en/selectMouse.xml:38
+#, fuzzy
 msgid ""
-"Select <guilabel>Universal</guilabel> - <guilabel>Force evdev</guilabel> to "
-"configure the buttons that do not work on a mouse with six or more buttons."
+"Select <menuchoice> <guimenu>Universal</guimenu> <guimenuitem>Force edev</"
+"guimenuitem> </menuchoice> to configure the buttons that do not work on a "
+"mouse with six or more buttons."
 msgstr ""
 "Vyberte <guilabel>Univerzálna</guilabel> - <guilabel>Vynútiť evdev</"
 "guilabel> pre nakonfigurovanie tlačidiel, ktoré nefungujú na myši majúcej "
 "šesť alebo viac tlačidiel."
 
-#. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:7
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloaderAddEntry.xml:7 en/setupBootloader.xml:206
 msgid "Add or Modify a Boot Menu Entry"
 msgstr "Pridanie alebo úprava položiek Ponuky na zavedenie systému"
 
@@ -4549,109 +4737,62 @@ msgstr ""
 "How_to_set_up_kernel_options</link>"
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:7
-msgid "Bootloader main options"
-msgstr "Hlavné parametre zavádzača"
-
-#. type: Content of: <section><section><title>
 #: en/setupBootloader.xml:10
 #, fuzzy
-msgid "Bootloader interface"
+msgid "Bootloader"
 msgstr "Hlavné parametre zavádzača"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:11
-msgid "By default, Mageia uses exclusively:"
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:13
+msgid "Grub2"
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:14
-msgid ""
-"GRUB2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
+#. type: Content of: <section><section><itemizedlist><title>
+#: en/setupBootloader.xml:15
+msgid "Grub2 on Legacy MBR/GPT systems"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:18
-#, fuzzy
-msgid "GRUB2-efi for a UEFI system."
-msgstr "So systémom UEFI"
-
-#. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:22
-#, fuzzy
-msgid "The Mageia graphical menus are nice :)"
-msgstr "Grafické ponuky Mageie sú pekné:"
-
-#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:25
-msgid "GRUB2 on Legacy/MBR and Legacy/GPT systems"
-msgstr ""
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:27
-#, fuzzy
+#: en/setupBootloader.xml:17
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
-"setupBootloader.png\"/> </imageobject>"
+"GRUB2 (with or without graphical menu) will be used exclusively as the "
+"bootloader for a Legacy/MBR or Legacy/GPT system."
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
-"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
-"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
-"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
-"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:34 en/setupBootloader.xml:56
-#, fuzzy
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:21
 msgid ""
-"Don't modify the <emphasis role=\"bold\">Boot Device</emphasis> unless you "
-"really know what you are doing."
+"By default, a new bootloader will be written into either the MBR (Master "
+"Boot Record) of your first hard drive or in the BIOS boot partition."
 msgstr ""
-"Neupravujte \"Zavádzacie Zariadenie\" pokiaľ naozaj neviete, čo robíte."
 
-#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:38
+#. type: Content of: <section><section><itemizedlist><title>
+#: en/setupBootloader.xml:27
 #, fuzzy
-msgid "GRUB2-efi on UEFI systems"
+msgid "Grub2-efi on UEFI systems"
 msgstr "So systémom UEFI"
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:39
-#, fuzzy
-msgid ""
-"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."
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:29
+msgid "GRUB2-efi will be used exclusively as the bootloader for a UEFI system."
 msgstr ""
-"So systémom UEFI je používateľské rozhranie trochu odlišné, keďže si "
-"nemôžete zvoliť zavádzač systému, keďže je dostupný len Grub2-efi."
 
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:42
-#, fuzzy
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:33
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
-"imageobject>"
+"By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI "
+"System Partition)."
 msgstr ""
-"<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
-"align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
-"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:49
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:35
 #, fuzzy
 msgid ""
-"If Mageia is the only system installed on your computer, the installer "
-"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 required (and advised), whatever the number of "
-"operating systems you have."
+"If there are already UEFI-based operating systems installed on your computer "
+"(Windows 8 for example), the Mageia installer will detect the existing ESP "
+"created by Windows and add grub2-efi to it. If no ESP exists, then one will "
+"be created. Although it is possible to have several ESPs, only one is "
+"required, whatever the number of operating systems you have."
 msgstr ""
 "Ak je Mageia prvým systémom nainštalovaným na váš počítač, inštalátor "
 "vytvoril ESP (EFI Systémovú Partíciu) pre zapísanie zavádzača (Grub2-efi). "
@@ -4661,236 +4802,341 @@ msgstr ""
 "odporúča sa a stačí len jedna, bez ohľadu na počet operačných systémov, "
 "ktoré máte v počítači."
 
-#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:61
-msgid "Using a Mageia bootloader"
-msgstr "Použitie zavádzača Mageie"
+#. type: Content of: <section><section><info><title>
+#: en/setupBootloader.xml:46
+#, fuzzy
+msgid "Bootloader Setup"
+msgstr "Hlavné parametre zavádzača"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:62
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:49
+msgid "Bootloader main options"
+msgstr "Hlavné parametre zavádzača"
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:51
+#, fuzzy
 msgid ""
-"By default, and according to your system, Mageia writes one of the following:"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-setupBootloader.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata fileref=\"live-setupBootloader.png\" xml:id=\"setupBootloader-"
+"im1\"/> </imageobject>"
 msgstr ""
+"<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
+"align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
+"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:66
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:62
+#, fuzzy
+msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
+msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:63
 msgid ""
-"a GRUB2 bootloader either into the MBR (Master Boot Record) of your first "
-"hard drive or in the BIOS boot partition."
+"This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI "
+"systems will not see this option here."
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:70
-msgid "a GRUB2-efi bootloader into the ESP"
-msgstr ""
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:67
+#, fuzzy
+msgid "<emphasis role=\"bold\">Boot device</emphasis>"
+msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:73
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:68
+#, fuzzy
+msgid "Don't change this unless you really know what you are doing"
+msgstr "Veci meňte len vtedy, keď veľmi dobre viete, čo robíte."
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:72
+#, 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 untick the <emphasis role="
-"\"bold\">Probe Foreign OS</emphasis> option."
+"<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
+msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:74
+msgid ""
+"This text box lets you set a delay, in seconds, before the default operating "
+"system is started up."
 msgstr ""
 
-#. type: Content of: <section><section><mediaobject>
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
 #: en/setupBootloader.xml:78
 #, fuzzy
+msgid "<emphasis role=\"bold\">Security</emphasis>"
+msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:79
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata fileref=\"live-setupBootloader3.png\" align=\"center\"/> </"
-"imageobject>"
+"This allows you to set a password for the bootloader. This means a username "
+"and password will be required when booting in order to select a booting "
+"entry or change settings. This is optional, and most people are not likely "
+"to have a need for it. The username is <literal>root</literal> and the "
+"password is the one chosen hereafter."
 msgstr ""
-"<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
-"align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
-"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
-#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:87
-msgid "Using an existing bootloader"
-msgstr "Použitie už existujúceho zavádzača"
-
-#. type: Content of: <section><section><para>
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
 #: en/setupBootloader.xml:88
-#, fuzzy
-msgid ""
-"The exact procedure for adding your Mageia system to an existing bootloader "
-"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."
+msgid "Choose a password for the bootloader (optional)"
 msgstr ""
-"Presná procedúra pre pridanie vášho systému Mageia ku existujúcemu zavádzaču "
-"presahuje oblasť tejto nápovedy, avšak vo väčšine prípadov bude zahŕňať "
-"spustenie príslušného programu na inštaláciu zavádzača, ktorý by ho mal "
-"detekovať a pridať automaticky. Pozrite si dokumentáciu pre otázny operačný "
-"systém."
 
-#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:95
-msgid "Using chain loading"
-msgstr ""
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:91
+#, fuzzy
+msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
+msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:96
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:92
+#, fuzzy
 msgid ""
-"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 tick the box <guilabel>Do not touch ESP or MBR</guilabel>."
+"Retype the password and DrakX will check that it matches with the one set "
+"above"
 msgstr ""
+"<guilabel>Heslo (znova)</guilabel>: Znova zadajte do tohto textového poľa "
+"heslo používateľa a drakx skontroluje, či máte rovnaké heslo v každom z "
+"textových políčok pre používateľské heslo."
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:101
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:96 en/setupBootloader.xml:154
 #, fuzzy
+msgid "<emphasis>Advanced</emphasis>"
+msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:99
+#, fuzzy
+msgid "<emphasis>Enable ACPI</emphasis>"
+msgstr "<emphasis>Všeobecný</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:100
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-setupBootloader4.png\" align="
-"\"center\"/> </imageobject>"
+"ACPI (Advanced Configuration and Power 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 ""
-"<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
-"align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
-"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
-#. type: Content of: <section><section><para>
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
 #: en/setupBootloader.xml:108
+#, fuzzy
+msgid "<emphasis>Enable SMP</emphasis>"
+msgstr "<emphasis>Všeobecný</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:109
 msgid ""
-"You will get a warning that the bootloader is missing, ignore it by clicking "
-"<guibutton>OK</guibutton>."
+"This option enables/disables symmetric multiprocessing for multi-core "
+"processors"
 msgstr ""
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:111
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:113
 #, fuzzy
+msgid "<emphasis>Enable APIC</emphasis>"
+msgstr "<emphasis>Všeobecný</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:114
 msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
-"imageobject>"
+"Enabling 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 ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
 
-#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:117
-msgid "Options"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:120
+#, fuzzy
+msgid "<emphasis>Enable Local APIC</emphasis>"
+msgstr "<emphasis>Všeobecný</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:121
+msgid ""
+"Here you can set Local APIC, which manages all external interrupts for a "
+"specific processor in an SMP system"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:119
-msgid "First page"
-msgstr ""
+#: en/setupBootloader.xml:127
+#, fuzzy
+msgid "Bootloader Configuration"
+msgstr "Konfigurácia zvuku"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:120
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:129
+#, fuzzy
 msgid ""
-"<guilabel>Delay before booting the default image</guilabel>: This lets you "
-"set a delay in seconds before the default operating system is started up."
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-setupBootloader3.png\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
+"align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
+"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:122
-msgid ""
-"<guilabel>Security</guilabel>: This allows you to set a password for the "
-"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 ""
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:139
+#, fuzzy
+msgid "<emphasis role=\"bold\">Default</emphasis>"
+msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:125
-msgid "<guilabel>Password</guilabel>: Choose a password for the bootloader."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:140
+msgid "The operating system to started up by default"
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:126
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:143
 #, fuzzy
+msgid "<emphasis role=\"bold\">Append</emphasis>"
+msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:144
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the password and DrakX will "
-"check that it matches with the one above."
+"This option lets you pass information to the kernel or tell the kernel to "
+"give you more information as it boots"
 msgstr ""
-"<guilabel>Heslo (znova)</guilabel>: Znova zadajte do tohto textového poľa "
-"heslo používateľa a drakx skontroluje, či máte rovnaké heslo v každom z "
-"textových políčok pre používateľské heslo."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:127 en/setupBootloader.xml:159
+#: en/setupBootloader.xml:148
 #, fuzzy
-msgid "<guilabel>Advanced</guilabel>"
-msgstr "<guilabel>Služby</guilabel>:"
+msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
+msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:127
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:149
 msgid ""
-"<guilabel>Enable ACPI:</guilabel> ACPI (Advanced Configuration and Power "
-"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)."
+"If you already have other operating systems installed, Mageia attempts to "
+"add them to your new Mageia boot menu. If you don't want this behaviour, "
+"then untick the Probe Foreign OS option."
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:133
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:156
+#, fuzzy
 msgid ""
-"<guilabel>Enable SMP</guilabel>: This option enables/disables symmetric "
-"multiprocessing for multi core processors."
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-setupBootloader4.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-setupBootloader4.png\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
+"align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
+"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:135
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:166
+#, fuzzy
+msgid "<emphasis>Video mode</emphasis>"
+msgstr "<emphasis>Dodávateľ</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:167
 msgid ""
-"<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."
+"This sets the screen size and colour depth to be used by the boot menu. If "
+"you click the down-triangle you will be offered other size and colour depth "
+"options."
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:138
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:172
+#, fuzzy
+msgid "<emphasis>Do not touch ESP or MBR</emphasis>"
+msgstr "<emphasis>Dodávateľ</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:173
 msgid ""
-"<guilabel>Enable Local APIC</guilabel>: Local APIC manages all external "
-"interrupts for a specific processor in an SMP system."
+"Select this option if you don't want a bootable Mageia, but would rather "
+"chain-load it from another OS. You will get a warning that the bootloader is "
+"missing. Click<emphasis> Ok</emphasis> if you are sure you understand the "
+"implications, and wish to proceed."
 msgstr ""
 
-#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:143
-msgid "Next page"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:181
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align=\"center"
+"\"/> </imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:146
-msgid "<guilabel>Default:</guilabel> Operating system started up by default"
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:188
+msgid "Other Options"
 msgstr ""
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:150
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:190
+msgid "Using an existing bootloader"
+msgstr "Použitie už existujúceho zavádzača"
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:191
+#, fuzzy
 msgid ""
-"<guilabel>Append:</guilabel> This option lets you pass the kernel "
-"information or tell the kernel to give you more information as it boots."
+"The exact procedure for adding Mageia to an existing bootloader is beyond "
+"the scope of this documentation. However in most cases it will involve "
+"running the relevant bootloader installation program, which should detect "
+"Mageia and automatically add an entry for it in the bootloader menu. See the "
+"documentation for the relevant operating system."
 msgstr ""
+"Presná procedúra pre pridanie vášho systému Mageia ku existujúcemu zavádzaču "
+"presahuje oblasť tejto nápovedy, avšak vo väčšine prípadov bude zahŕňať "
+"spustenie príslušného programu na inštaláciu zavádzača, ktorý by ho mal "
+"detekovať a pridať automaticky. Pozrite si dokumentáciu pre otázny operačný "
+"systém."
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:155
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:199
+#, fuzzy
+msgid "Installing Without a Bootloader"
+msgstr "Použitie zavádzača Mageie"
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:200
 msgid ""
-"<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
-"\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
+"While you can opt to install Mageia without a bootloader (see section 2.1 "
+"Advanced), this is not recommended unless you absolutely know what you are "
+"doing, as without some form of bootloader your operating system will be "
+"unable to start."
 msgstr ""
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:159
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:207
 msgid ""
-"<guilabel>Video mode:</guilabel> This sets the screen size and colour depth "
-"to be used by the boot menu. If you click the down triangle you will be "
-"offered other size and colour depth options."
+"To do this you need to manually edit <filename>/boot/grub2/custom.cfg</"
+"filename> or use the software <application>grub-customizer</application> "
+"tool instead (available in the Mageia repositories)."
 msgstr ""
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:162
+#. type: Content of: <section><section><section><note><para>
+#: en/setupBootloader.xml:212
+#, fuzzy
 msgid ""
-"<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
-"linkend=\"setupChainLoading\">Using the chain loading</link>"
+"For more information, see: <link ns4:href=\"https://wiki.mageia.org/en/Grub2-"
+"efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link>"
 msgstr ""
+"Pre viacej informácií o možnostiach kernelu na obstarožných a UEFI "
+"systémoch, pozrite: <link ns2:href=\"https://wiki.mageia.org/en/"
+"How_to_set_up_kernel_options\">https://wiki.mageia.org/en/"
+"How_to_set_up_kernel_options</link>"
 
 #. type: Content of: <section><info><title>
-#: en/setupSCSI.xml:3
+#: en/setupSCSI.xml:10
 msgid "Setup SCSI"
 msgstr "Nastavenie SCSI"
 
@@ -4902,18 +5148,20 @@ msgstr "Nastavenie SCSI"
 #.  marja 2012-04-24 added screenshot 
 #.  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 
+#. 2018/02/15 apb: Text and typography.
+#. 2018/0217 apb: Merge 2nd/3rd paras and reword.
 #. type: Content of: <section><mediaobject>
-#: en/setupSCSI.xml:22
+#: en/setupSCSI.xml:33
 #, fuzzy
 msgid ""
-"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-setupSCSI.png\" align="
-"\"center\" xml:id=\"setupSCSI-im1\" revision=\"1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-setupSCSI.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"setupSCSI-im1\"/> </imageobject>"
 msgstr ""
-"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
-"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-unused.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"unused-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:27
+#: en/setupSCSI.xml:39
 #, fuzzy
 msgid ""
 "DrakX will normally detect hard disks correctly. However, with some older "
@@ -4925,109 +5173,60 @@ msgstr ""
 "následne zlyháva rozpoznanie zariadenia."
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:32
+#: en/setupSCSI.xml:44
 #, fuzzy
 msgid ""
-"If this happens, you will need to manually tell DrakX which SCSI drive(s) "
-"you have."
+"If your device is not recognised, you will need to manually tell DrakX which "
+"SCSI drive(s) you have. DrakX should then be able to configure the drive(s) "
+"correctly."
 msgstr ""
 "Ak sa toto stane, budete potrebovať manuálne zadať DrakXu, ktoré SCSI "
 "zariadenie (alebo zariadenia) máte."
 
-#. type: Content of: <section><para>
-#: en/setupSCSI.xml:35
-msgid "DrakX should then be able to configure the drive(s) correctly."
-msgstr ""
-"DrakX by potom mal byť schopný nakonfigurovať ono zariadenie (alebo "
-"zariadenia) korektne."
-
 #. type: Content of: <section><info><title>
-#: en/soundConfig.xml:3
+#: en/soundConfig.xml:10
 msgid "Sound Configuration"
 msgstr "Konfigurácia zvuku"
 
 #.  Lebarhon 20170209 updated SC
+#. 2018/02/13 apb: Text and typography.
+#. 2018/02/17 apb: Centre-align PNG
 #. type: Content of: <section><mediaobject>
-#: en/soundConfig.xml:9
+#: en/soundConfig.xml:20
 #, fuzzy
 msgid ""
-"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
-"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-soundConfig.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"soundConfig-im1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-soundConfig.png\" revision=\"1\" "
-"format=\"PNG\" xml:id=\"soundConfig-im1\" /> </imageobject>"
-
-#. 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 one exists."
-msgstr ""
-"Na tejto obrazovke je udaný názov ovládača, ktorý zvolil inštalátor pre vašu "
-"zvukovú kartu, ktorý bude predvolený ovládač, pokiaľ máte niektorý "
-"predvolený."
+"<imageobject> <imagedata align=\"center\" fileref=\"live-unused.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"unused-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:18
+#: en/soundConfig.xml:26
 msgid ""
-"The default driver should work without problems. However, if after install "
-"you do encounter problems, then run <command>draksound</command> or start "
-"this tool via MCC (Mageia Control Center), by choosing the "
-"<guilabel>Hardware</guilabel> tab and clicking on <guilabel>Sound "
-"Configuration</guilabel> at the top right of the screen."
+"This screen shows the details of the sound card driver chosen for you by the "
+"installer, and this driver should work without problems."
 msgstr ""
-"Predvolený ovládač by mal pracovať bez problémov. Avšak, ak po inštalácií sa "
-"stretávate s problémami, potom spustite príkaz <command>draksound</command> "
-"alebo spustite tento nástroj cez ponuku MCC (Ovládacie Centrum Mageia), "
-"zvolením panela <guilabel>Hardvér</guilabel> a kliknutím na "
-"<guilabel>Konfigurácia zvuku</guilabel> v hornej pravej časti obrazovky."
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:24
-#, fuzzy
+#: en/soundConfig.xml:29
 msgid ""
-"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."
+"However, if you encounter any issues post-install, then run "
+"<command>draksound</command> or start this tool via <menuchoice> "
+"<guimenu>Mageia Control Center</guimenu> <guimenuitem>Hardware</guimenuitem> "
+"<guimenuitem>Sound Configuration</guimenuitem> </menuchoice>. Then, in the "
+"<literal>draksound</literal> or <emphasis>Sound Configuration</emphasis> "
+"screen, click on <emphasis>Troubleshooting</emphasis> to find useful advice "
+"about how to solve the problem."
 msgstr ""
-"Potom na obrazovke draksound alebo nástroja na \"Konfiguráciu zvuku\", "
-"kliknite na <guibutton>Rozšírené</guibutton> a potom na <guibutton>Riešenie "
-"problémov</guibutton>, aby ste našli veľmi užitočnú radu o tom, ako vyriešiť "
-"problém."
 
 #. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:30
+#: en/soundConfig.xml:43
 msgid "Advanced"
 msgstr "Rozšírené"
 
-#. type: Content of: <section><section><para>
-#: en/soundConfig.xml:33
-#, fuzzy
-msgid ""
-"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 ""
-"Kliknutie na <guibutton>Rozšírené</guibutton> na tejto obrazovke, počas "
-"inštalácie, je užitočné vtedy, ak tu nie je žiaden predvolený ovládač a sú "
-"tu dostupné viaceré ovládače, ale vy si myslíte, že inštalátor vybral "
-"nesprávny ovládač."
-
-#. type: Content of: <section><section><para>
-#: en/soundConfig.xml:38
-#, fuzzy
-msgid ""
-"In that case you can select a different driver after clicking on <emphasis "
-"role=\"bold\"><guibutton>Let me pick any driver</guibutton></emphasis>."
-msgstr ""
-"V tom prípade môžete zvoliť odlišný ovládač po kliknutí na <guibutton>Nechať "
-"mi vybrať iný ovládač</guibutton>."
-
 #. type: Content of: <section><info><title>
-#: en/takeOverHdConfirm.xml:3
+#: en/takeOverHdConfirm.xml:10
 msgid "Confirm hard disk to be formatted"
 msgstr "Potvrdenie naformátovania pevného disku"
 
@@ -5037,77 +5236,77 @@ msgstr "Potvrdenie naformátovania pevného disku"
 #.     hard disk." with "if you are not sure about your choice", because I'm sure I
 #.     saw this help screen when I had only one HD 
 #.  2013-05-05 marja added screenshot 
+#. 2018/02/15 apb: Text and typography
+#. 2018/02/20 apb: Change the 2 paras to itemized listitems.
 #. type: Content of: <section><mediaobject>
-#: en/takeOverHdConfirm.xml:18
+#: en/takeOverHdConfirm.xml:29
 #, fuzzy
 msgid ""
-"<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>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-takeOverHdConfirm.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata align=\"center\" fileref=\"live-"
+"takeOverHdConfirm.png\" format=\"PNG\"/> </imageobject>"
 msgstr ""
-"<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='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
+"align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
+"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
-#. type: Content of: <section><para>
-#: en/takeOverHdConfirm.xml:27
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/takeOverHdConfirm.xml:42
 #, fuzzy
 msgid ""
-"Click on <guibutton>Previous</guibutton> if you are at all unsure about your "
+"Click on <emphasis>Previous</emphasis> if you are at all unsure about your "
 "choice."
 msgstr ""
 "Kliknite na <guibutton>Predošlé</guibutton> ak si nie ste istí vašou voľbou."
 
-#. type: Content of: <section><para>
-#: en/takeOverHdConfirm.xml:31
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/takeOverHdConfirm.xml:48
 #, fuzzy
 msgid ""
-"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."
+"Click on <emphasis>Next</emphasis> to proceed if you are sure that it is OK "
+"to erase <emphasis role=\"bold\">every</emphasis> partition, <emphasis role="
+"\"bold\">every</emphasis> operating system and <emphasis role=\"bold\">all "
+"data</emphasis> that might be on that hard disk."
 msgstr ""
 "Kliknite na <guibutton>Ďalej</guibutton> ak ste si istí a chcete zmazať "
 "každú partíciu, každý operačný systém a všetky údaje na onom pevnom disku."
 
 #. type: Content of: <section><info><title>
-#: en/testing.xml:9
+#: en/testing.xml:3
 msgid "Testing Mageia as Live system"
 msgstr "Vyskúšanie Mageie ako Živého systému"
 
 #. type: Content of: <section><section><info><title>
-#: en/testing.xml:14
+#: en/testing.xml:8
 msgid "Live mode"
 msgstr "Živý režim"
 
+#. type: Content of: <section><section><para>
+#: en/testing.xml:11
+msgid ""
+"This is the screen you will see if you selected the <emphasis role=\"bold"
+"\">Boot Mageia </emphasis>option from the Live media menu."
+msgstr ""
+
 #. type: Content of: <section><section><mediaobject>
-#: en/testing.xml:18
+#: en/testing.xml:14
 msgid "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/testing.xml:23
-msgid ""
-"You get this screen if you selected \"Boot Mageia\". If not, you get the "
-"\"<link linkend=\"doPartitionDisks\">Partitioning</link> step\""
-msgstr ""
-"Túto obrazovku dostanete, ak ste si vybrali \"Zaviesť Mageiu\". Ak nie, tak "
-"dostanete krok \"<link linkend=\"doPartitionDisks\">Rozdelenie disku</link>\""
-
 #. type: Content of: <section><section><section><info><title>
-#: en/testing.xml:28
+#: en/testing.xml:21
 msgid "Testing hardware"
 msgstr "Testovanie hardvéru"
 
 #. type: Content of: <section><section><section><para>
-#: en/testing.xml:31
+#: en/testing.xml:24
+#, fuzzy
 msgid ""
-"One of the Live mode goals is to test if the hardware is correctly managed "
-"by Mageia. You can check if all devices have a driver in the Hardware "
-"section of the Mageia Control Center. You can test the most current devices:"
+"One of the aims of using the Live mode is to test that your hardware is "
+"correctly managed by Mageia. You can check if all devices have a driver in "
+"the Hardware section of the Mageia Control Center:"
 msgstr ""
 "Jeden z cieľov Živého režimu je otestovať, či je hardvér správne spravovaný "
 "Mageiou. Môžete skontrolovať, či všetky zariadenia majú svoj ovládač v "
@@ -5115,84 +5314,91 @@ msgstr ""
 "aktuálnych zariadení:"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:38
+#: en/testing.xml:31
 msgid "network interface: configure it with net_applet"
 msgstr "sieťové rozhranie: nakonfigurujte ho s net_applet"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:42
-msgid "graphical card: if you see the previous screen, it's already OK."
+#: en/testing.xml:35
+#, fuzzy
+msgid "graphics card: if you see the previous screen, it's already OK."
 msgstr "grafická karta: ak ste už videli predošlú obrazovku, tak je už OK."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:47
+#: en/testing.xml:40
 msgid "webcam:"
 msgstr "webová kamera:"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:51
+#: en/testing.xml:44
 msgid "sound: a jingle has already been played"
 msgstr "zvuk: znelka už bola zahratá"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:55
-msgid "printer: configure it and print a test page"
+#: en/testing.xml:48
+#, fuzzy
+msgid "printer: configure your printer/s and print a test page"
 msgstr "tlačiareň: nakonfigurujte ju a vytlačte skúšobnú stránku"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:59
+#: en/testing.xml:52
 msgid "scanner: scan a document from ..."
 msgstr "skener: odskenujte dokument z ..."
 
 #. type: Content of: <section><section><section><para>
-#: en/testing.xml:63
+#: en/testing.xml:56
+#, fuzzy
 msgid ""
-"If all is OK for you, you can process to the installation. If not, you can "
-"leave with the quit button."
+"If everything is satisfactory, you can proceed with the installation. If "
+"not, you can use the <emphasis>Quit</emphasis> button to exit."
 msgstr ""
 "Ak je to všetko pre vás OK, môžete vykonať inštaláciu. Ak nie, môžete odísť "
 "s tlačítkom skončiť."
 
-#. type: Content of: <section><section><section><remark>
-#: en/testing.xml:66
-msgid "The configuration settings you made here are kept for the installation."
+#. type: Content of: <section><section><section><note><para>
+#: en/testing.xml:61
+#, fuzzy
+msgid ""
+"The configuration settings you apply here are carried over if you decide to "
+"proceed with the installation."
 msgstr ""
 "Nastavenia konfigurácie, ktoré ste tu urobili, sa zachovajú pre inštaláciu."
 
 #. type: Content of: <section><section><section><info><title>
-#: en/testing.xml:72
+#: en/testing.xml:68
 msgid "Launch installation"
 msgstr "Spustiť inštaláciu"
 
-#. type: Content of: <section><section><section><mediaobject>
-#: en/testing.xml:76
-msgid ""
-"<imageobject> <imagedata fileref=\"live-liveMode-install.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"live-liveMode-install.png\"/> </"
-"imageobject>"
-
 #. type: Content of: <section><section><section><para>
-#: en/testing.xml:81
+#: en/testing.xml:71
+#, fuzzy
 msgid ""
-"To launch the installation of Mageia LiveCD or Live DVD to the hard disc or "
-"SSD drive, simply click on the icon \"Install on Hard Disk\". You will get "
-"this screen, and then the \"<link linkend=\"doPartitionDisks\">Partitioning</"
-"link> step\" as for the direct installation."
+"To launch the installation of the Live DVD to a hard disk or SSD drive, "
+"simply click the <emphasis>Install on Hard Disk</emphasis> icon on the Live "
+"desktop. You will then see this screen, followed by the <link linkend="
+"\"doPartitionDisks\">Partitioning</link> step."
 msgstr ""
 "Pre spustenie inštalácie z Mageia LiveCD alebo Live DVD na pevný disk alebo "
 "SSD mechaniku, jednoducho kliknite na ikonu \"Inštalovať na pevný disk\". "
 "Obdržíte túto obrazovku a potom krok pre \"<link linkend=\"doPartitionDisks"
 "\">Rozdelenie disku</link>\" ako u priamej inštalácie."
 
+#. type: Content of: <section><section><section><mediaobject>
+#: en/testing.xml:77
+msgid ""
+"<imageobject> <imagedata fileref=\"live-liveMode-install.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode-install.png\"/> </"
+"imageobject>"
+
 #. type: Content of: <section><info><title>
-#: en/uninstall-Mageia.xml:3
+#: en/uninstall-Mageia.xml:10
 msgid "Uninstalling Mageia"
 msgstr "Odinštalovanie Mageie"
 
 #. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:9
+#: en/uninstall-Mageia.xml:18
 #, fuzzy
 msgid ""
 "If Mageia didn't convince you or you can't install it correctly - in short "
@@ -5204,13 +5410,13 @@ msgstr ""
 "odinštalovania. Toto neplatí u každého operačného systému."
 
 #. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:14
+#: en/uninstall-Mageia.xml:23
 #, fuzzy
 msgid ""
-"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."
+"After backing up your data, reboot your Mageia installation DVD and select "
+"<emphasis>Rescue system</emphasis>, then <emphasis>Restore Windows boot "
+"loader</emphasis>. At the next boot, you will only have Windows, with no "
+"option to choose your Mageia operating system."
 msgstr ""
 "Po zazálohovaní si vašich dát, reštartujte počítač s vaším inštalačným DVD "
 "Mageie a vyberte Záchranný systém, potom, Obnoviť Windowsový zavádzač. Pri "
@@ -5218,15 +5424,18 @@ msgstr ""
 "systému."
 
 #. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:19
+#: en/uninstall-Mageia.xml:28
 #, fuzzy
 msgid ""
-"In Windows to recover the space used by Mageia partitions: click on "
-"<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
-"> 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."
+"In Windows, to recover the space used by Mageia partitions: click on "
+"<menuchoice> <guimenu>Start</guimenu> <guimenuitem>Control Panel</"
+"guimenuitem> <guimenuitem>Administrative Tools</guimenuitem> "
+"<guimenuitem>Computer Management</guimenuitem> <guimenuitem>Storage</"
+"guimenuitem> <guimenuitem>Disk Management</guimenuitem> </menuchoice>. You "
+"will recognise a Mageia partition because they are labeled <literal>Unknown</"
+"literal>, and also by their size and place on the disk. Right-click on each "
+"of these partitions and select <emphasis>Delete</emphasis> to free up the "
+"space."
 msgstr ""
 "Pre obnovu miesta použitého partíciami čiže diskovými oddielmi Mageie vo "
 "Windows, kliknite na <code>Štart -> Ovládacie panely -> Nástroje na správu -"
@@ -5237,16 +5446,17 @@ msgstr ""
 "<guibutton>Zmazať</guibutton>. Priestor bude uvoľnený."
 
 #. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:27
+#: en/uninstall-Mageia.xml:46
+#, fuzzy
 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."
+"(FAT32 or NTFS). It will then get a partition letter."
 msgstr ""
 "Ak používate Windows XP, môžete vytvoriť novú partíciu a naformátovať ju "
 "(FAT32 alebo NTFS). Bude jej priradené písmeno partície."
 
 #. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:30
+#: en/uninstall-Mageia.xml:49
 #, fuzzy
 msgid ""
 "If you have Vista or 7, you have one more possibility, you can extend the "
@@ -5262,34 +5472,50 @@ msgstr ""
 "sa, že všetky dôležité veci boli zazálohované."
 
 #. type: Content of: <section><info><title>
-#: en/unused.xml:9
+#: en/unused.xml:3
 msgid "Keep or delete unused material"
 msgstr "Ponechať alebo zmazať nepoužitý materiál"
 
+#. 2018/03/03 apb: Adjusted text and updated SC's to Mga6.
 #. type: Content of: <section><mediaobject>
-#: en/unused.xml:13
+#: en/unused.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-unused.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"unused-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"unused-im1\" fileref=\"live-"
+"unused.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-unused.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"unused-im1\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><para>
-#: en/unused.xml:19
+#: en/unused.xml:14
+#, fuzzy
 msgid ""
 "In this step, the installer looks for unused locales packages and unused "
-"hardware packages. Then it proposes you to delete them. It is a good idea to "
-"accept, except if you prepare an installation which has to run on different "
-"hardware."
+"hardware packages and you are then given an opportunity to delete them."
 msgstr ""
 "V tomto kroku inštalátor hľadá nevyužité jazykové balíčky a nevyužité "
 "hardvérové balíčky. Potom vám navrhne ich vymazanie. Je dobrá myšlienka "
 "prijať to, okrem prípadu, že pripravujete inštaláciu, ktorá má bežať na "
 "odlišnom hardvéri."
 
+#. type: Content of: <section><para>
+#: en/unused.xml:18
+msgid ""
+"If you do not foresee a case where your installation may need to run on "
+"different hardware, or that you might need additional localization files "
+"then you might wish to accept this proposal."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/unused.xml:22
+msgid ""
+"Clicking <emphasis>Advanced</emphasis> will list the unused hardware and "
+"localization files that will be removed if you proceed."
+msgstr ""
+
 #. type: Content of: <section><mediaobject>
-#: en/unused.xml:25
+#: en/unused.xml:26
 msgid ""
 "<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
 "> </imageobject>"
@@ -5298,14 +5524,814 @@ msgstr ""
 "> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/unused.xml:30
+#: en/unused.xml:31
+#, fuzzy
 msgid ""
-"The next step is the copying of files on hard disk. This takes some minutes. "
-"At the end, you get a blank screen for some time, it's normal."
+"The next step is the copying of files to hard disk. This process should just "
+"take a little while to complete. When it is finising you will briefly get a "
+"blank screen - this is normal."
 msgstr ""
 "Ďalším krokom je kopírovanie súborov na pevný disk. Toto zaberie niekoľko "
 "minút. Na konci dostanete na určitý čas prázdnu obrazovku, to je normálne."
 
+#~ msgid "User and Superuser Management"
+#~ msgstr "Spravovanie používateľa a superpoužívateľa"
+
+#, fuzzy
+#~ msgid ""
+#~ "Every partition is shown to the left as: <emphasis role=\"bold\">Device "
+#~ "(capacity, mount point, type).</emphasis>"
+#~ msgstr ""
+#~ "Každá partícia je ukázaná nasledovne: \"Zariadenie\" (\"Kapacita\", "
+#~ "\"Prípojný bod\", \"Typ\")."
+
+#~ msgid "In advanced tab, you will find more options about clock settings."
+#~ msgstr "Na karte pokročilé nájdete viac možností pre nastavenie času."
+
+#~ msgid "From a disc"
+#~ msgstr "Z disku"
+
+#~ msgid ""
+#~ "You can boot directly from the media you used to burn your image (CD-ROM, "
+#~ "DVD-ROM...). You usually just need to insert it in your CD/DVD drive for "
+#~ "the bootloader to launch the installation automatically after rebooting "
+#~ "the computer. If that does not happen you may need to reconfigure your "
+#~ "BIOS or press one key that will offer you to choose the peripheral from "
+#~ "which the computer will boot."
+#~ msgstr ""
+#~ "Systém môžete zaviesť z nosiča, na ktorý ste napálili váš obrazový súbor "
+#~ "(CDčko, DVDčko...). Zvyčajne ho stačí len vložiť do vašej CD/DVD "
+#~ "mechaniky, aby zavádzač spustil inštaláciu automaticky po reštarte "
+#~ "počítača. Ak sa to nestane, možno potrebujete prekonfigurovať váš BIOS "
+#~ "alebo stlačiť jednu klávesu, ktorá vám ponúkne vybrať si zariadenie, z "
+#~ "ktorého sa počítač zavedie."
+
+#~ msgid ""
+#~ "According to which hardware you have, and how it is configured, you get "
+#~ "either one or another of the two screens below."
+#~ msgstr ""
+#~ "Podľa toho ktorý máte hardvér a ako je nakonfigurovaný, objaví sa buď "
+#~ "jedna alebo druhá z dvoch nižšie uvedených obrazoviek."
+
+#~ msgid "From a USB device"
+#~ msgstr "Z USB zariadenia"
+
+#~ msgid ""
+#~ "You can boot from the USB device on which you dumped your image ISO. "
+#~ "According to your BIOS settings, the computer boots perhaps directly on "
+#~ "the USB device already plugged in a port. If that does not happen you may "
+#~ "need to reconfigure your BIOS or press one key that will offer you to "
+#~ "choose the peripheral from which the computer will boot."
+#~ msgstr ""
+#~ "Počítač môžete naštartovať z USB zariadenia, na ktorom je zaznamenaný váš "
+#~ "ISO obraz. Vzhľadom na nastavenia vášho BIOSu sa počítač možno už zavádza "
+#~ "priamo z USB zariadenia zastrčeného v porte počítača. Ak sa tak nedeje, "
+#~ "možno potrebujete prekonfigurovať váš BIOS alebo stlačiť jednu klávesu, "
+#~ "ktorá vám ponúkne vybrať si periférium, z ktorého sa naštartuje počítač."
+
+#~ msgid ""
+#~ "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
+#~ msgstr ""
+#~ "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
+
+#~ msgid "In the middle menu, you have the choice between three actions:"
+#~ msgstr "V prostrednej ponuke, máte voľbu medzi tromi akciami:"
+
+#~ msgid ""
+#~ "Boot from hard disk: This choice allows to boot from hard disk, as usual, "
+#~ "when no media (CD/DVD or USB stick) is connected. (not working with "
+#~ "Mageia 5)."
+#~ msgstr ""
+#~ "Spustiť z pevného disku: Táto voľba dovoľuje zaviesť systém z pevného "
+#~ "disku, tak ako zvyčajne, keď žiadne médium (CD/DVD alebo USB kľúč) nie je "
+#~ "pripojené. (nepracuje sa s Mageiou 5)."
+
+#~ msgid "In the bottom menu, are the Boot Options:"
+#~ msgstr "V spodnej ponuke sú Možnosti Zavedenia systému:"
+
+#~ msgid ""
+#~ "F1 - Help. Explain the options \"splash\", \"apm\", \"acpi\" and \"Ide\""
+#~ msgstr ""
+#~ "F1 - Pomoc. Vysvetľuje možnosti \"splash\", \"apm\", \"acpi\" a \"Ide\""
+
+#~ msgid "F2 - Language. Choose the display language of the screens."
+#~ msgstr "F2 - Jazyk. Vyberte si pre zobrazenie jazyka obrazoviek."
+
+#~ msgid ""
+#~ "F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728"
+#~ msgstr ""
+#~ "F3 - Rozlíšenie obrazovky. Voľba medzi textom, 640x400, 800x600, 1024x728"
+
+#~ msgid ""
+#~ "F5 - Driver. Yes or No. The system is aware about the presence of an "
+#~ "optional disk with a driver update and will require its insertion during "
+#~ "installation process."
+#~ msgstr ""
+#~ "F5 - Ovládač. Áno alebo Nie. Systém je upovedomený o prítomnosti "
+#~ "voliteľného disku s aktualizáciou ovládača a bude požadovať jeho vloženie "
+#~ "počas procesu inštalácie."
+
+#~ msgid ""
+#~ "F6 - Kernel options. This is a way to specify options according to your "
+#~ "hardware and the drivers to use."
+#~ msgstr ""
+#~ "F6 - Voľby jadra. Toto je cesta pre zadanie volieb vzťahujúcich sa k "
+#~ "vášmu hardvéru a ovládačom, ktoré sa použijú."
+
+#~ msgid "First screen while booting on UEFI system from disk"
+#~ msgstr "Prvá obrazovka počas štartu na UEFI systémoch z disku"
+
+#~ msgid ""
+#~ "You have only the choice to run Mageia in Live mode (first choice)  or to "
+#~ "process the installation (second choice)."
+#~ msgstr ""
+#~ "Tu máte len možnosť spustiť Mageiu v Živom režime (prvá voľba) alebo "
+#~ "spustiť inštaláciu (druhá voľba)."
+
+#~ msgid ""
+#~ "In each case, the first steps will be the same to choose language, "
+#~ "timezone and keyboard, then the processes differ, with <link linkend="
+#~ "\"testing\">additional steps in Live mode</link>."
+#~ msgstr ""
+#~ "V každom prípade budú prvé kroky rovnaké - vybrať si jazyk, časovú zónu a "
+#~ "klávesnicu; potom sa postupy odlišujú v <link linkend=\"testing"
+#~ "\">dodatočných krokoch v Živom režime</link>."
+
+#, fuzzy
+#~ msgid ""
+#~ "Depending on your selection here, you may be offered further screens to "
+#~ "fine-tune your choice."
+#~ msgstr ""
+#~ "V závislosti na tomto vašom výbere, vám môžu byť ponúknuté ďalšie "
+#~ "obrazovky k jemnému doladeniu vášho výberu."
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+#~ "align=\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/"
+#~ "> </imageobject>"
+
+#, fuzzy
+#~ msgid "The settings DrakX chose are usually good."
+#~ msgstr "Nastavenia ktoré DrakX vybral si zvyčajne dobré."
+
+#, fuzzy
+#~ msgid ""
+#~ "<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=\"setupBootloaderAddEntry-"
+#~ "im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" "
+#~ "revision=\"1\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "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 ""
+#~ "Prístup k Nonfree úložisku musí byť výslovne povolený pre ich "
+#~ "sprístupnenie. Ak tomu tak nie je, najskôr ho povoľte. Toto by ste mali "
+#~ "urobiť po prvom reštarte."
+
+#, fuzzy
+#~ msgid ""
+#~ "<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=\"login-im1\" fileref="
+#~ "\"live-login.png\" align=\"center\" revision=\"1\"/></imageobject>"
+
+#~ msgid ""
+#~ "<emphasis><guibutton>Graphic card</guibutton></emphasis>: Choose your "
+#~ "card from the list if needed."
+#~ msgstr ""
+#~ "<emphasis><guibutton>Grafická karta</guibutton></emphasis>: Vyberte zo "
+#~ "zoznamu vašu kartu, ak je to treba."
+
+#~ msgid "Incorrect refresh rates may damage your monitor"
+#~ msgstr "Nesprávne obnovovacie frekvencie môžu zničiť váš monitor"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_monitor-im1\" "
+#~ "fileref=\"dx2-configureX_monitor.png\" align=\"center\" revision=\"1\"/> "
+#~ "</imageobject>"
+#~ msgstr ""
+#~ "<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref="
+#~ "\"live-login.png\" align=\"center\" revision=\"1\"/></imageobject>"
+
+#~ msgid "<emphasis>Custom</emphasis>"
+#~ msgstr "<emphasis>Vlastné</emphasis>"
+
+#~ msgid "<emphasis>Plug 'n Play</emphasis>"
+#~ msgstr "<emphasis>Plug 'n Play</emphasis>"
+
+#~ msgid "the monitor manufacturers name"
+#~ msgstr "mena výrobcu monitora"
+
+#~ msgid "the monitor description"
+#~ msgstr "popisu monitora"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake."
+#~ "png\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png"
+#~ "\" align=\"center\"/> </imageobject> <imageobject condition='live' > "
+#~ "<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </"
+#~ "imageobject>"
+
+#~ msgid "Click <guibutton>Done</guibutton> when you're ready."
+#~ msgstr ""
+#~ "Kliknite na tlačidlo <guibutton>Hotovo</guibutton>, keď ste nachystaní."
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" "
+#~ "align=\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png"
+#~ "\" align=\"center\"/> </imageobject> <imageobject condition='live' > "
+#~ "<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </"
+#~ "imageobject>"
+
+#~ msgid "Use Free Space"
+#~ msgstr "Použiť voľné miesto"
+
+#~ msgid "Use Free Space on a Windows Partition"
+#~ msgstr "Použiť voľné miesto na Windowsovej partícii"
+
+#~ msgid ""
+#~ "If you have unused space on an existing Windows partition, the installer "
+#~ "may offer to use it."
+#~ msgstr ""
+#~ "Ak máte nevyužité miesto na existujúcej Windowsovej partícii, inštalátor "
+#~ "môže ponúknuť jeho použitie."
+
+#, fuzzy
+#~ 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-diskdrake.png"
+#~ "\" align=\"center\"/> </imageobject> <imageobject condition='live' > "
+#~ "<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </"
+#~ "imageobject>"
+
+#~ msgid "Erase and use Entire Disk."
+#~ msgstr "Vymazať a použiť Celý Disk."
+
+#~ msgid ""
+#~ "Note! This will erase ALL data on the selected hard drive. Take care!"
+#~ msgstr ""
+#~ "Upozornenie! Toto vymaže VŠETKY dáta na vybranom pevnom disku. Teda buďte "
+#~ "opatrní!"
+
+#, fuzzy
+#~ msgid "Custom disk partitioning"
+#~ msgstr "Vlastné rozdelenie disku pomocou DiskDrake"
+
+#, fuzzy
+#~ msgid ""
+#~ "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 ""
+#~ "To znamená, že v prípade 160 GB a viac dostupného miesta, inštalátor "
+#~ "vytvorí tri partície: 50 GB pre /, 4 GB pre swap a zvyšok pre adresár /"
+#~ "home."
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+#~ "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition="
+#~ "\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png"
+#~ "\" align=\"center\"/> </imageobject> <imageobject condition='live' > "
+#~ "<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid "January 2015"
+#~ msgstr "Január 2015"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<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 format=\"PNG\" xml:id="
+#~ "\"bootloaderConfiguration-im1\" fileref=\"dx2-bootloaderConfiguration.png"
+#~ "\" align=\"center\" revision=\"1\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata format=\"PNG\" xml:id="
+#~ "\"bootloaderConfiguration-im1\" fileref=\"live-bootloaderConfiguration.png"
+#~ "\" align=\"center\" revision=\"1\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid "Using a Mageia DVD"
+#~ msgstr "Použitie zavádzača Mageie"
+
+#, fuzzy
+#~ msgid ""
+#~ "Here are the default welcome screens when using a Mageia DVD, The first "
+#~ "one is what you will see if you have a UEFI system, the second one is for "
+#~ "a Legacy system:"
+#~ msgstr ""
+#~ "Tu sú predvolené uvítacie obrazovky, pri používaní DVD Mageia. Prvá je s "
+#~ "obstarožným systémom a druhá s UEFI systémom:"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
+#~ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
+#~ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/"
+#~ "> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "Use the arrow keys to select the language then press <emphasis role=\"bold"
+#~ "\">Enter</emphasis>."
+#~ msgstr "Použite šípkové klávesy pre výber jazyka a stlačte klávesu Enter."
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/"
+#~ "> </imageobject>"
+
+#, fuzzy
+#~ msgid "Default: It doesn't alter anything in the default options."
+#~ msgstr "- Predvolené, táto nemení nič v predvolených možnostiach."
+
+#, fuzzy
+#~ msgid ""
+#~ "Safe Settings: Priority is given to the safer options at the price of a "
+#~ "performance detriment."
+#~ msgstr ""
+#~ "- Bezpečné nastavenia, priorita je daná k bezpečnejším možnostiam na úkor "
+#~ "výkonnosti."
+
+#~ msgid ""
+#~ "When you select one of these entries, it modifies the default options "
+#~ "displayed in the <guilabel>Boot Options</guilabel> line."
+#~ msgstr ""
+#~ "Keď si vyberiete jednu z týchto položiek, ona modifikuje predvolené "
+#~ "možnosti zobrazené v riadku <guilabel>Možnosti zavádzania systému</"
+#~ "guilabel>."
+
+#, fuzzy
+#~ msgid ""
+#~ "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 ""
+#~ "V niektorých vydaniach Mageie sa môže stať, že sa položky vybrané s "
+#~ "klávesou F6 neobjavujú v riadku <guilabel>Možností zavádzania o.s.</"
+#~ "guilabel>, avšak v skutočnosti sú brané do úvahy."
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/"
+#~ "> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "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 ""
+#~ "Stlačenie F1 otvára nové okno s ďalšími dostupnými možnosťami. Vyberte "
+#~ "jednu so šípkovými klávesami a stlačte Enter pre obdržanie viacej "
+#~ "detailov alebo stlačte klávesu Esc pre pre návrat na uvítaciu obrazovku."
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/"
+#~ "> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "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 ""
+#~ "Podrobný prehľad o rozsahu možností. Stlačte Esc alebo zvoľte "
+#~ "<guilabel>Návrat ku Zavádzacím Možnostiam</guilabel> pre návrat späť k "
+#~ "zoznamu možností. Tieto možnosti môžu byť pridané ručne v riadku "
+#~ "<guilabel>Možnosti zavedenia</guilabel>."
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcomeHelp2.png\"/"
+#~ "> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "The help is translated in the chosen language with <emphasis role=\"bold"
+#~ "\">F2</emphasis>."
+#~ msgstr "Nápoveda je preložená vo zvolenom jazyku s klávesou F2."
+
+#~ 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\">https://wiki.mageia.org/en/"
+#~ "How_to_set_up_kernel_options</link>"
+#~ msgstr ""
+#~ "Pre viacej informácií o možnostiach kernelu na obstarožných a UEFI "
+#~ "systémoch, pozrite: <link ns2:href=\"https://wiki.mageia.org/en/"
+#~ "How_to_set_up_kernel_options\">https://wiki.mageia.org/en/"
+#~ "How_to_set_up_kernel_options</link>"
+
+#~ msgid "Media Selection (Nonfree)"
+#~ msgstr "Výber nosiča (Nonfree)"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata format=\"PNG\" xml:id=\"media_selection-im1\" "
+#~ "align=\"center\" revision=\"1\" fileref=\"dx2-media_selection.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+#~ "im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" "
+#~ "revision=\"1\"/> </imageobject>"
+
+#~ msgid "Summary of miscellaneous parameters"
+#~ msgstr "Súhrn o rozličných parametroch"
+
+#~ msgid "<guilabel>Timezone</guilabel>"
+#~ msgstr "<guilabel>Časové pásmo</guilabel>"
+
+#~ msgid "<guilabel>Country / Region</guilabel>"
+#~ msgstr "<guilabel>Krajina / Región</guilabel>"
+
+#~ msgid "<guilabel>Bootloader</guilabel>"
+#~ msgstr "<guilabel>Zavádzač</guilabel>"
+
+#~ msgid "For more information, see <xref linkend=\"setupBootloader\"/>"
+#~ msgstr "Pre viac informácií, viď <xref linkend=\"setupBootloader\"/>"
+
+#~ msgid "<guilabel>User management</guilabel>"
+#~ msgstr "<guilabel>Správa používateľov</guilabel>"
+
+#~ msgid "<guilabel>Services</guilabel>:"
+#~ msgstr "<guilabel>Služby</guilabel>:"
+
+#~ msgid "For more information, see <xref linkend=\"configureServices\"/>"
+#~ msgstr "Pre viac informácií, viď <xref linkend=\"configureServices\"/>"
+
+#~ msgid "<guilabel>Keyboard</guilabel>:"
+#~ msgstr "<guilabel>Klávesnica</guilabel>:"
+
+#~ msgid "<guilabel>Mouse</guilabel>:"
+#~ msgstr "<guilabel>Myš</guilabel>:"
+
+#~ msgid "<guilabel>Sound card</guilabel>:"
+#~ msgstr "<guilabel>Zvuková karta</guilabel>:"
+
+#, 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 where none of them is the default one."
+#~ msgstr ""
+#~ "Inštalátor používa predvolený ovládač, ak predvolený jestvuje. Možnosť "
+#~ "výberu odlišného ovládača je daná len vtedy, keď jestvuje viac než jeden "
+#~ "ovládač pre vašu kartu, ale žiaden z nich nie je predvolený."
+
+#~ msgid "<guilabel>Graphical interface</guilabel>:"
+#~ msgstr "<guilabel>Grafické rozhranie</guilabel>:"
+
+#~ msgid "<guilabel>Network</guilabel>:"
+#~ msgstr "<guilabel>Sieť</guilabel>:"
+
+#~ msgid "<guilabel>Proxies</guilabel>:"
+#~ msgstr "<guilabel>Proxy servery</guilabel>:"
+
+#~ msgid "<guilabel>Security Level</guilabel>:"
+#~ msgstr "<guilabel>Úroveň bezpečnosti</guilabel>:"
+
+#~ msgid "Check the option which best suits your usage."
+#~ msgstr "Zaškrtnite voľbu, ktorá sa najlepšie hodí k vášmu používaniu."
+
+#~ msgid "<guilabel>Firewall</guilabel>:"
+#~ msgstr "<guilabel>Firewall</guilabel>:"
+
+#~ 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."
+#~ msgstr ""
+#~ "Firewall, slovenský ohnivá stena, má slúžiť ako bariéra medzi vašimi "
+#~ "dôležitými dátami a ničomníkmi vonku na internete, ktorí by ich chceli "
+#~ "rozširovať alebo ukradnúť."
+
+#, fuzzy
+#~ 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 "
+#~ "information, see <xref linkend=\"firewall\"/>."
+#~ msgstr ""
+#~ "Vyberte si služby, ktoré si prajete aby mali prístup k vášmu systému. "
+#~ "Vaše výbery budú záležať na tom, k čomu používate váš počítač."
+
+#, 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=\"setupBootloaderAddEntry-"
+#~ "im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" "
+#~ "revision=\"1\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "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 a sha1sum sú nástroje pre skontrolovanie neporušenosti ISO súboru. "
+#~ "Jeden z nich si ponechajte <link linkend=\"integrity\">pre budúce "
+#~ "použitie</link>. Potom sa objaví toto okno:"
+
+#~ msgid ""
+#~ "To recover the original capacity, you must redo partitioning and re-"
+#~ "format the USB stick."
+#~ msgstr ""
+#~ "Pre obnovu pôvodnej kapacity, musíte znovu prerobiť partíciu USB kľúča a "
+#~ "naformátovať ho."
+
+#~ msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
+#~ msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
+
+#~ msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
+#~ msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
+
+#~ msgid "Install"
+#~ msgstr "Inštalovanie"
+
+#~ msgid "Upgrade"
+#~ msgstr "Aktualizovanie"
+
+#, 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, 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 ""
+#~ "Ak sa počas inštalácie rozhodnete zastaviť inštaláciu, je možné "
+#~ "reštartovať počítač, ale skôr než toto urobíte, si to prosím dôkladne "
+#~ "zvážte. Keď raz bola partícia naformátovaná alebo sa začali inštalovať "
+#~ "aktualizácie, váš počítač už viac nie je v rovnakom stave a jeho "
+#~ "reštartovanie by vás mohlo veľmi ľahko ponechať s nepoužiteľným systémom. "
+#~ "Ak napriek tomu ste si veľmi istí, že reštartovanie je to, čo chcete, "
+#~ "choďte do textového terminálu súčasným stlačením troch klávesov "
+#~ "<guilabel>Alt Ctrl F2</guilabel>. Potom stlačte súčasne <guilabel>Alt "
+#~ "Ctrl Delete</guilabel> pre reštart."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata xml:id=\"selectKeyboardLive-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"live-selectKeyboard.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata xml:id=\"selectKeyboardLive-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"live-selectKeyboard.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "You will be required to set the keyboard layout you wish to use in Mageia​​"
+#~ ". The default one is selected according to your language and timezone "
+#~ "previously selected."
+#~ msgstr ""
+#~ "Budete si musieť vybrať rozloženie klávesnice, ktoré si prajete používať "
+#~ "v Mageii. Predvolená je vybraná primerane k vášmu jazyku a predošlej "
+#~ "vybranej časovej oblasti."
+
+#~ msgid "Mageia uses UTF-8 (Unicode) support by default."
+#~ msgstr "Mageia používa predvolene UTF-8 (Unicode) podporu."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-selectMouse.png\" align=\"center\" "
+#~ "format=\"PNG\" > </imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-selectMouse.png\" align=\"center\" "
+#~ "format=\"PNG\" > </imagedata> </imageobject>"
+
+#, fuzzy
+#~ msgid "GRUB2-efi for a UEFI system."
+#~ msgstr "So systémom UEFI"
+
+#, fuzzy
+#~ msgid "The Mageia graphical menus are nice :)"
+#~ msgstr "Grafické ponuky Mageie sú pekné:"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata xml:id=\"setupBootloader-im1\" fileref="
+#~ "\"live-setupBootloader.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
+#~ "im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+#~ "revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" "
+#~ "revision=\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "Don't modify the <emphasis role=\"bold\">Boot Device</emphasis> unless "
+#~ "you really know what you are doing."
+#~ msgstr ""
+#~ "Neupravujte \"Zavádzacie Zariadenie\" pokiaľ naozaj neviete, čo robíte."
+
+#, fuzzy
+#~ msgid ""
+#~ "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 ""
+#~ "So systémom UEFI je používateľské rozhranie trochu odlišné, keďže si "
+#~ "nemôžete zvoliť zavádzač systému, keďže je dostupný len Grub2-efi."
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png"
+#~ "\" align=\"center\"/> </imageobject> <imageobject condition='live' > "
+#~ "<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-setupBootloader4.png\" "
+#~ "align=\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png"
+#~ "\" align=\"center\"/> </imageobject> <imageobject condition='live' > "
+#~ "<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid "<guilabel>Advanced</guilabel>"
+#~ msgstr "<guilabel>Služby</guilabel>:"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-setupSCSI.png\" "
+#~ "align=\"center\" xml:id=\"setupSCSI-im1\" revision=\"1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+#~ "align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
+
+#~ msgid "DrakX should then be able to configure the drive(s) correctly."
+#~ msgstr ""
+#~ "DrakX by potom mal byť schopný nakonfigurovať ono zariadenie (alebo "
+#~ "zariadenia) korektne."
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" "
+#~ "xml:id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-soundConfig.png\" revision=\"1\" "
+#~ "format=\"PNG\" xml:id=\"soundConfig-im1\" /> </imageobject>"
+
+#, 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 one exists."
+#~ msgstr ""
+#~ "Na tejto obrazovke je udaný názov ovládača, ktorý zvolil inštalátor pre "
+#~ "vašu zvukovú kartu, ktorý bude predvolený ovládač, pokiaľ máte niektorý "
+#~ "predvolený."
+
+#~ msgid ""
+#~ "The default driver should work without problems. However, if after "
+#~ "install you do encounter problems, then run <command>draksound</command> "
+#~ "or start this tool via MCC (Mageia Control Center), by choosing the "
+#~ "<guilabel>Hardware</guilabel> tab and clicking on <guilabel>Sound "
+#~ "Configuration</guilabel> at the top right of the screen."
+#~ msgstr ""
+#~ "Predvolený ovládač by mal pracovať bez problémov. Avšak, ak po inštalácií "
+#~ "sa stretávate s problémami, potom spustite príkaz <command>draksound</"
+#~ "command> alebo spustite tento nástroj cez ponuku MCC (Ovládacie Centrum "
+#~ "Mageia), zvolením panela <guilabel>Hardvér</guilabel> a kliknutím na "
+#~ "<guilabel>Konfigurácia zvuku</guilabel> v hornej pravej časti obrazovky."
+
+#, fuzzy
+#~ msgid ""
+#~ "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 ""
+#~ "Potom na obrazovke draksound alebo nástroja na \"Konfiguráciu zvuku\", "
+#~ "kliknite na <guibutton>Rozšírené</guibutton> a potom na "
+#~ "<guibutton>Riešenie problémov</guibutton>, aby ste našli veľmi užitočnú "
+#~ "radu o tom, ako vyriešiť problém."
+
+#, fuzzy
+#~ msgid ""
+#~ "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 ""
+#~ "Kliknutie na <guibutton>Rozšírené</guibutton> na tejto obrazovke, počas "
+#~ "inštalácie, je užitočné vtedy, ak tu nie je žiaden predvolený ovládač a "
+#~ "sú tu dostupné viaceré ovládače, ale vy si myslíte, že inštalátor vybral "
+#~ "nesprávny ovládač."
+
+#, fuzzy
+#~ msgid ""
+#~ "In that case you can select a different driver after clicking on "
+#~ "<emphasis role=\"bold\"><guibutton>Let me pick any driver</guibutton></"
+#~ "emphasis>."
+#~ msgstr ""
+#~ "V tom prípade môžete zvoliť odlišný ovládač po kliknutí na "
+#~ "<guibutton>Nechať mi vybrať iný ovládač</guibutton>."
+
+#, fuzzy
+#~ msgid ""
+#~ "<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> <imageobject condition='classical'> <imagedata fileref=\"dx2-"
+#~ "takeOverHdConfirm.png\" format=\"PNG\" align=\"center\" ></imagedata> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "You get this screen if you selected \"Boot Mageia\". If not, you get the "
+#~ "\"<link linkend=\"doPartitionDisks\">Partitioning</link> step\""
+#~ msgstr ""
+#~ "Túto obrazovku dostanete, ak ste si vybrali \"Zaviesť Mageiu\". Ak nie, "
+#~ "tak dostanete krok \"<link linkend=\"doPartitionDisks\">Rozdelenie disku</"
+#~ "link>\""
+
 #~ 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 "
@@ -5412,22 +6438,6 @@ msgstr ""
 #~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> "
 #~ "</imagedata> </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 ""
-#~ "Je tam karta pre každý nájdený pevný disk alebo iné úložné zariadenie, "
-#~ "ako je USB kľúč. Napríklad sda, sdb a sdc, ak sú pripojené tri kusy."
-
 #, fuzzy
 #~ msgid ""
 #~ "<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
@@ -5451,21 +6461,6 @@ msgstr ""
 #~ msgid "\"Free space preceding (MiB)\" \"2\""
 #~ msgstr "\"Uvádzajúce voľné miesto (MiB)\" \"2\""
 
-#~ 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>"
-#~ msgstr ""
-#~ "<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>"
-
 #, fuzzy
 #~ msgid "From this screen, it is possible to set some personal preferences:"
 #~ msgstr ""
@@ -5555,15 +6550,6 @@ msgstr ""
 #~ "imagedata> </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 ""
@@ -5625,13 +6611,6 @@ msgstr ""
 #~ "\"center\" format=\"PNG\"></imagedata> </imageobject>"
 
 #~ msgid ""
-#~ "Use this option for a fresh <application>Mageia</application> "
-#~ "installation."
-#~ msgstr ""
-#~ "Použite túto možnosť pre čerstvú inštaláciu <application>Mageie</"
-#~ "application>."
-
-#~ 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."
@@ -5664,9 +6643,6 @@ msgstr ""
 #~ "<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </"
 #~ "imageobject>"
 
-#~ msgid "Custom"
-#~ msgstr "Vlastný výber"
-
 #~ msgid ""
 #~ "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" "
 #~ "align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </"
@@ -5853,13 +6829,6 @@ msgstr ""
 #~ "\" format=\"PNG\" ></imagedata> </imageobject>"
 
 #~ msgid ""
-#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks."
-#~ "png\"/> </imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks."
-#~ "png\"/> </imageobject>"
-
-#~ msgid ""
 #~ "<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
 #~ "\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
 #~ msgstr ""