32 files changed, 89501 insertions, 63298 deletions

diff --git a/docs/docs/stable/installer/bg.po b/docs/docs/stable/installer/bg.po
index 9dd35c98..98f1c9e6 100644
--- a/docs/docs/stable/installer/bg.po
+++ b/docs/docs/stable/installer/bg.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2018-04-19 16:32+0300\n"
+"POT-Creation-Date: 2019-01-06 12:43+0200\n"
 "PO-Revision-Date: 2018-09-06 14:19+0000\n"
 "Last-Translator: Georgi Georgiev <georgiev_1994@abv.bg>\n"
 "Language-Team: Bulgarian (http://www.transifex.com/MageiaLinux/mageia/"
@@ -20,12 +20,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Content of: <section><info><title>
-#: en/acceptLicense.xml:25
+#: en/acceptLicense.xml:31
 msgid "License and Release Notes"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/acceptLicense.xml:29
+#: en/acceptLicense.xml:35
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
 "\"acceptLicense-im1\" fileref=\"dx2-license.png\" align=\"center\" revision="
@@ -40,67 +40,69 @@ msgstr ""
 "\"center\" condition=\"live\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/acceptLicense.xml:40
+#: en/acceptLicense.xml:46
 msgid "License Agreement"
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/acceptLicense.xml:43
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/acceptLicense.xml:51
 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 ""
 
-#. type: Content of: <section><section><para>
-#: en/acceptLicense.xml:46
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/acceptLicense.xml:56
 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 ""
 
-#. type: Content of: <section><section><para>
-#: en/acceptLicense.xml:50
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/acceptLicense.xml:61
 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 ""
 
 #. type: Content of: <section><section><para>
-#: en/acceptLicense.xml:53
+#: en/acceptLicense.xml:66
 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 ""
 
 #. type: Content of: <section><section><info><title>
-#: en/acceptLicense.xml:63
+#: en/acceptLicense.xml:76
 msgid "Release Notes"
 msgstr "Бележки към версията"
 
 #. type: Content of: <section><section><para>
-#: en/acceptLicense.xml:70
+#: en/acceptLicense.xml:83
 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 ""
 
 #. 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 "bg"
 
 #. type: Content of: <section><info><title>
 #: en/add_supplemental_media.xml:3
-msgid "Media Selection (Configure Supplemental Installation Media)"
+msgid "Supplemental Installation Media"
 msgstr ""
 
 #.  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
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-add_supplemental_media."
 "png\" xml:id=\"dx2-add_supplemental_media-im1\" align=\"center\" revision="
@@ -111,59 +113,64 @@ msgstr ""
 "\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:19
+#: en/add_supplemental_media.xml:23
 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 ""
 
 #. 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 ""
 
 #. 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
+msgid "Choosing and activating the network, if not already up."
 msgstr ""
 
 #. type: Content of: <section><orderedlist><listitem><para>
-#: en/add_supplemental_media.xml:32
+#: en/add_supplemental_media.xml:36
 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 ""
 
 #. type: Content of: <section><note><para>
-#: en/add_supplemental_media.xml:42
+#: en/add_supplemental_media.xml:46
 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/addUser.xml:3
-msgid "User and Superuser Management"
+#: en/addUser.xml:9
+msgid "User Management"
 msgstr ""
 
 #.  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 format=\"PNG\" fileref="
 "\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -171,89 +178,104 @@ msgstr ""
 "\"PNG\" 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 ""
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:24
+#: en/addUser.xml:40
 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 ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:34
+#: en/addUser.xml:49
 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 ""
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:42
+#: en/addUser.xml:57
 msgid "Enter a user"
 msgstr "Въведете потребител"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:45
+#: en/addUser.xml:60
 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 ""
 
 #. 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
+msgid "<emphasis role=\"bold\">Icon</emphasis>"
 msgstr ""
 
 #. 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:69
+msgid "Click on this button if you want to change the user's icon"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/addUser.xml:74
+msgid "<emphasis role=\"bold\">Real Name</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/addUser.xml:76
+msgid "Insert the user's real name into this text box"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/addUser.xml:80
+msgid "<emphasis role=\"bold\">Login Name</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:62
+#: en/addUser.xml:82
 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 ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/addUser.xml:88 en/setupBootloader.xml:87
+msgid "<emphasis role=\"bold\">Password</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:67
+#: en/addUser.xml:90
 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 ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:73
+#: en/addUser.xml:94
 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 ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:79
+#: en/addUser.xml:101
 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 ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:82
+#: en/addUser.xml:104
 msgid ""
 "You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
@@ -261,48 +283,47 @@ msgid ""
 msgstr ""
 
 #. 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 ""
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:93
-msgid "Advanced User Management"
+#: en/addUser.xml:115
+msgid "User Management (advanced)"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:96
+#: en/addUser.xml:118
 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 ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:101
+#: en/addUser.xml:123
 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 ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:107
+#: en/addUser.xml:130
 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 ""
 
 #. 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 "Изберете точките за монтиране"
 
@@ -317,15 +338,17 @@ msgstr "Изберете точките за монтиране"
 #.        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 format=\"PNG\" xml:id="
 "\"chooseMountPoints-im1\" align=\"center\" fileref=\"dx2-chooseMountpoints."
@@ -335,317 +358,415 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:36
+#: en/ask_mntpoint_s.xml:49
 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."
-msgstr ""
-
-#. type: Content of: <section><note><para>
-#: en/ask_mntpoint_s.xml:41
-msgid ""
-"If you change anything, make sure you still have a <emphasis role=\"bold"
-"\"><literal>/</literal></emphasis> (root) partition."
+"you don't agree with the DrakX suggestions, you can change the mount points "
+"yourself."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:46
+#: 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 ""
-
-#. 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
 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 ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:63
+#: en/ask_mntpoint_s.xml:73
 msgid ""
 "For any partitions that you don't need to make use of, you can leave the "
 "mount point field blank."
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/ask_mntpoint_s.xml:69
+#: en/ask_mntpoint_s.xml:79
+msgid ""
+"If you make any changes here, ensure you still have a <filename>/</filename> "
+"(root) partition."
+msgstr ""
+
+#. type: Content of: <section><tip><para>
+#: en/ask_mntpoint_s.xml:84
 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 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 ""
 
 #. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:74
+#: en/ask_mntpoint_s.xml:90
 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/bestTime.xml:10
-msgid "Clock settings"
+#: en/bestTime.xml:5
+msgid "Clock Settings"
 msgstr ""
 
 #. 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
 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 ""
 
 #. type: Content of: <section><para>
-#: en/bestTime.xml:23
-msgid "In advanced tab, you will find more options about clock settings."
+#: 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 ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:1
+#: en/bootLive.xml:10
 msgid "Booting the medium"
 msgstr ""
 
-#. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:1
-msgid "From a disc"
-msgstr ""
-
-#. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:1
+#. type: Content of: <section><section><para>
+#: en/bootLive.xml:12
 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."
+"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 ""
 
-#. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:7
-msgid "From a USB device"
+#. 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 ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:12
+#: en/bootLive.xml:35
 msgid "In BIOS/CSM/Legacy mode"
 msgstr ""
 
+#. 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
+msgid "<emphasis role=\"bold\">Boot Mageia</emphasis>"
+msgstr ""
+
+#. 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
+msgid "Once the boot is done, you can proceed to the installation."
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/bootLive.xml:45 en/bootLive.xml:57
+msgid ""
+"<emphasis role=\"bold\">+ use non-free video drivers (slower to boot)</"
+"emphasis>"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/bootLive.xml: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
+msgid "<emphasis role=\"bold\">Install Mageia</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:54 en/bootLive.xml:157
+msgid "This option will install Mageia to a hard disk."
+msgstr ""
+
+#. 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=\"dx2-selectKeyboard.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 ""
 
-#. type: Content of: <section><section><para>
-#: en/bootLive.xml:12
-msgid "In the middle menu, you have the choice between three actions:"
+#. 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:75
+msgid "<keycap>F1</keycap> <emphasis role=\"bold\">Help</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:13
+#: en/bootLive.xml:76
 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."
+"Within any of the <keycap>F2</keycap> to <keycap>F6</keycap> options, you "
+"can view relevant help by pressing <keycap>F1</keycap>."
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:81
+msgid "<keycap>F2</keycap> <emphasis role=\"bold\">Language</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:16
+#: en/bootLive.xml:82
 msgid ""
-"Install Mageia: This choice will directly install Mageia on a hard disk."
+"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 ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:17
+#: en/bootLive.xml:87
+msgid "<keycap>F3</keycap> <emphasis role=\"bold\">Video Mode</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:89
 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)."
+"If needed, change the screen resolution by pressing <keycap>F3</keycap>. "
+"Options are: 640x480, 800x600, 1024x768."
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/bootLive.xml:19
-msgid "In the bottom menu, are the Boot Options:"
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:93
+msgid "<keycap>F4</keycap> <emphasis role=\"bold\">Source</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:19
+#: en/bootLive.xml:94
 msgid ""
-"F1 - Help. Explain the options \"splash\", \"apm\", \"acpi\" and \"Ide\""
+"Normally, the installation is performed from the inserted installation "
+"medium. Here, you may select other sources, like FTP or NFS servers."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:20
-msgid "F2 - Language. Choose the display language of the screens."
+#: en/bootLive.xml:95
+msgid ""
+"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 ""
 
 #. 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:98
+msgid "<keycap>F5</keycap> <emphasis role=\"bold\">Driver</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:22
+#: en/bootLive.xml:99
 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 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 ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:104
+msgid "<keycap>F6</keycap> <emphasis role=\"bold\">Kernel Options</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:26
+#: en/bootLive.xml:106
 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 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
+msgid ""
+"<emphasis role=\"bold\">Default:</emphasis> splash quiet noiswmd resume "
+"audit=0"
+msgstr ""
+
+#. 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
+msgid ""
+"<emphasis role=\"bold\">No ACPI:</emphasis> (Advanced Configuration and "
+"Power Interface): Power management features are not used."
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/bootLive.xml:125
+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 ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:28
+#: en/bootLive.xml:131
 msgid ""
-"F6 - Kernel options. This is a way to specify options according to your "
-"hardware and the drivers to use."
+"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 ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:29
+#: en/bootLive.xml:139
 msgid "In UEFI mode"
 msgstr ""
 
 #. 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"
+#: en/bootLive.xml:146
+msgid "First screen while booting in UEFI mode"
 msgstr ""
 
 #. 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 ""
 
-#. type: Content of: <section><section><para>
-#: en/bootLive.xml:30
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:153
 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 ""
 
-#. 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/chooseDesktop.xml:3
+#: en/chooseDesktop.xml:16
 msgid "Desktop Selection"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:8
-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 ""
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:11
+#: en/chooseDesktop.xml:26
 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 ""
 
 #. 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 format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
 "align=\"center\"/> </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
 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 ""
 
 #. type: Content of: <section><info><title>
@@ -654,8 +775,9 @@ msgid "Package Group Selection"
 msgstr "Избор на група от пакети"
 
 #. 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
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
 "\" align=\"center\"/> </imageobject>"
@@ -664,7 +786,7 @@ msgstr ""
 "\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:14
+#: en/choosePackageGroups.xml:16
 msgid ""
 "Packages are arranged into common groups, to make choosing what you need on "
 "your system a lot easier. The groups are fairly self explanatory, however "
@@ -673,29 +795,29 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:21
+#: en/choosePackageGroups.xml:23
 msgid "<emphasis role=\"bold\">Workstation</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:25
+#: en/choosePackageGroups.xml:27
 msgid "<emphasis role=\"bold\">Server</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:29
+#: en/choosePackageGroups.xml:31
 msgid "<emphasis role=\"bold\">Graphical Environment</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:33
+#: en/choosePackageGroups.xml:35
 msgid ""
 "<emphasis role=\"bold\">Individual Package Selection</emphasis>: you can use "
 "this option to manually add or remove packages"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:38
+#: en/choosePackageGroups.xml:40
 msgid ""
 "See <xref linkend=\"minimal-install\"/> for instructions on how to do a "
 "minimal install (without or with X &amp; IceWM)."
@@ -707,8 +829,10 @@ msgid "Choose Individual Packages"
 msgstr ""
 
 #. 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
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackagesTree.png"
 "\" align=\"center\"/> </imageobject>"
@@ -717,19 +841,19 @@ msgstr ""
 "\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:14
+#: en/choosePackagesTree.xml:18
 msgid ""
 "Here you can add or remove any extra packages to customize your installation."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:17
+#: en/choosePackagesTree.xml:21
 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 ""
 
 #. type: Content of: <section><info><title>
@@ -739,8 +863,10 @@ msgstr ""
 
 #.  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
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-configureServices.png"
 "\" xml:id=\"configureServices-im1\" align=\"center\" revision=\"1\"/> </"
@@ -751,30 +877,27 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:16
+#: en/configureServices.xml:20
 msgid ""
 "Here you can choose which services should start when you boot your system."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/configureServices.xml:19
-msgid "Click on a triangle to expand a group to all the relevant services."
-msgstr ""
-
-#. type: Content of: <section><para>
-#: en/configureServices.xml:22
-msgid "The settings DrakX chose are usually good."
+#. 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: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."
 msgstr ""
 
 #. 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 ""
 
@@ -785,14 +908,17 @@ msgstr ""
 
 #.  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 format=\"PNG\" xml:id="
 "\"configureTimezoneUTC-im1\" align=\"center\" fileref=\"dx2-"
@@ -800,198 +926,220 @@ msgstr ""
 "<imagedata format=\"PNG\" fileref=\"live-timeZone.png\" condition=\"live\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><para>
-#: en/configureTimezoneUTC.xml:20
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureTimezoneUTC.xml:26
 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 ""
 
 #. type: Content of: <section><para>
-#: en/configureTimezoneUTC.xml:24
+#: en/configureTimezoneUTC.xml:32
 msgid ""
 "In the next screen you can choose to set your hardware clock to local time "
 "or to GMT, also known as UTC."
 msgstr ""
 
 #. 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."
 msgstr ""
 
 #. 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 ""
 
 #. 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=\"configureX_card_list-im1\" "
-"align=\"center\" fileref=\"dx2-configureX_card_list.png\" 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/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."
 msgstr ""
 
 #. 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:"
 msgstr ""
 
-#. 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
+msgid "Vendor"
 msgstr ""
 
 #. 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
+msgid "then the make of your card"
 msgstr ""
 
 #. 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
+msgid "and the model of card"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:41
+#: en/configureX_card_list.xml:53
 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 ""
 
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:47
+#. type: Content of: <section><caution><para>
+#: en/configureX_card_list.xml:61
 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 ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:51
+#: en/configureX_card_list.xml:65
 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."
-msgstr ""
-
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:56
-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."
+"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 ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:3
+#: en/configureX_chooser.xml:11
 msgid "Graphic Card and Monitor Configuration"
 msgstr ""
 
 #.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
+#. 2018/02/15 apb: Some text and typography.
+#. 2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.
+#. 2018/02/23 apb: Typo.
 #. 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=\"configureX_chooser-im1\" "
-"fileref=\"dx2-configureX_chooser.png\" align=\"center\" 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/configureX_chooser.xml:15
+#: en/configureX_chooser.xml:30
 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 ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:27
-msgid ""
-"<emphasis><guibutton>Graphic card</guibutton></emphasis>: Choose your card "
-"from the list if needed."
+#: en/configureX_chooser.xml:41
+msgid "<emphasis role=\"bold\">Graphic Card</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:33
+#: en/configureX_chooser.xml:44
 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."
+"If you need to, you can select a specific card from this expandable list. "
+"See <xref linkend=\"configureX_card_list\"/>."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/configureX_chooser.xml:41
-msgid "Incorrect refresh rates may damage your monitor"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_chooser.xml:49
+msgid "<emphasis role=\"bold\">Monitor</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:47
+#: en/configureX_chooser.xml:52
 msgid ""
-"<emphasis><guibutton>Resolution</guibutton></emphasis>: The resolution and "
-"color depth of your monitor can be set here."
+"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 ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:52
-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."
+#: en/configureX_chooser.xml:60
+msgid "<emphasis role=\"bold\">Resolution</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/configureX_chooser.xml:63
+msgid "The resolution and color depth of your monitor can be set here"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_chooser.xml:68
+msgid "<emphasis role=\"bold\">Test</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_chooser.xml:71
+msgid ""
+"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 ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_chooser.xml:81
+msgid "<emphasis role=\"bold\">Options</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_chooser.xml:84
+msgid "Here you can choose to enable or disable various options"
+msgstr ""
+
+#. type: Content of: <section><warning><para>
+#: en/configureX_chooser.xml:89
 msgid ""
-"<emphasis><guibutton>Options</guibutton></emphasis>: Here you can choose to "
-"enable or disable various options."
+"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 ""
 
 #. 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."
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:19
+#: en/configureX_monitor.xml:30
 msgid ""
 "<emphasis role=\"bold\">Selecting a monitor with different characteristics "
 "could damage your monitor or video hardware. Please don't try something "
@@ -1000,32 +1148,32 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:26
+#: en/configureX_monitor.xml:38
+#, fuzzy
 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=\"configureX_monitor-im1\" "
-"fileref=\"dx2-configureX_monitor.png\" align=\"center\" 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/configureX_monitor.xml:31
-msgid "<emphasis>Custom</emphasis>"
+#. type: Content of: <section><variablelist><varlistentry><term>
+#: en/configureX_monitor.xml:46
+msgid "Custom"
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:33
+#. type: Content of: <section><variablelist><varlistentry><listitem><para>
+#: en/configureX_monitor.xml:49
 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."
 msgstr ""
 
-#. 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 "
@@ -1033,157 +1181,160 @@ msgid ""
 "consult your monitor documentation."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:44
-msgid "<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
 msgid ""
-"This is the default option and tries to determine the monitor type from the "
-"monitor database."
-msgstr ""
-
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:51
-msgid "<emphasis>Vendor</emphasis>"
+"This is the default option and automatically tries to determine the monitor "
+"type from the monitor database."
 msgstr ""
 
-#. 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:"
 msgstr ""
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:61
-msgid "the monitor manufacturers name"
+#. 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"
+#. 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>"
+#. 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
 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:7
-msgid "Custom disk partitioning with DiskDrake"
-msgstr ""
+#: en/diskdrake.xml:22
+#, fuzzy
+msgid "Custom Disk Partitioning with DiskDrake"
+msgstr "Персонализирано разделяне на диска"
 
 #. 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"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
 "\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
+"<imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/> </imageobject>"
 
-#. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:22
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/diskdrake.xml:38
 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."
+"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 ""
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:29
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/diskdrake.xml:45
 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."
+"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 ""
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:34
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/diskdrake.xml:52
 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>."
+"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. "
+"<emphasis>Expert mode</emphasis> provides more options such as to label "
+"(name) a partition, or to choose a partition type."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:39
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/diskdrake.xml:60
 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."
+"Continue until you have adjusted everything to your satisfaction, then click "
+"<emphasis>Done</emphasis> when you're ready."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:43
+#. type: Content of: <section><warning><orderedlist><listitem><para>
+#: en/diskdrake.xml:69
 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."
+"Take care with the <emphasis>Clear all</emphasis> option, use it only if you "
+"are sure you want to wipe all partitions on the selected storage device."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:49
-msgid "Continue until you have adjusted everything to your satisfaction."
+#. type: Content of: <section><warning><orderedlist><listitem><para>
+#: en/diskdrake.xml:75
+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 ""
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:52
-msgid "Click <guibutton>Done</guibutton> when you're ready."
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/diskdrake.xml:87
+msgid ""
+"If you are installing Mageia on a UEFI system, check that an ESP (EFI System "
+"Partition) is present and correctly mounted on <filename>/boot/EFI</"
+"filename>. See Figure 1 below."
 msgstr ""
 
-#. type: Content of: <section><note><para>
-#: en/diskdrake.xml:56
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/diskdrake.xml:93
 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)"
+"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
+"partition is present and of the correct type. See Figure 2 below."
+msgstr ""
+
+#. type: Content of: <section><figure><title>
+#: en/diskdrake.xml:101
+msgid "EFI System Partition"
 msgstr ""
 
-#. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:61
+#. 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-diskdrake2.png"
 "\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/> </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
-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 ""
 
-#. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:76
+#. type: Content of: <section><mediaobject>
+#: en/diskdrake.xml:118 en/doPartitionDisks.xml:200
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1196,308 +1347,317 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:9
-msgid "Partitioning"
+#: en/doPartitionDisks.xml:25
+#, fuzzy
+msgid "Suggested Partitioning"
 msgstr "Управление на дискови дялове"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:12
+#: en/doPartitionDisks.xml:28
 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 ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:16
+#: en/doPartitionDisks.xml:32
 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 ""
 
 #. 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-"
-"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
-"\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:32
-msgid "Use Existing Partitions"
+#. type: Content of: <section><itemizedlist><title>
+#: en/doPartitionDisks.xml:47
+#, fuzzy
+msgid "Main Options"
+msgstr "Опции"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:50
+msgid "<emphasis role=\"bold\">Use Existing Partitions</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:35
+#. 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."
 msgstr ""
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:41
-msgid "Use Free Space"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:59
+msgid "<emphasis role=\"bold\">Use Free Space</emphasis>"
 msgstr ""
 
-#. 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."
 msgstr ""
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:49
-msgid "Use Free Space on a Windows Partition"
-msgstr ""
-
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
-msgid ""
-"If you have unused space on an existing Windows partition, the installer may "
-"offer to use it."
-msgstr ""
-
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:56
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:68
 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!"
+"<emphasis role=\"bold\">Use Free Space on a Windows Partition</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:61
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:71
 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."
+"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 ""
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:69
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:77
 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 ""
 
-#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:76
-msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/> </imageobject>"
-msgstr ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/> </imageobject>"
-
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:87
-msgid "Erase and use Entire Disk."
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:85
+msgid "<emphasis role=\"bold\">Erase and use Entire Disk</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:90
-msgid "This option will allocate the entire drive for Mageia."
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:88
+msgid "This option will allocate the entire drive for Mageia"
 msgstr ""
 
-#. 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!"
+#. type: Content of: <section><itemizedlist><listitem><warning><para>
+#: en/doPartitionDisks.xml:92
+msgid ""
+"This will erase ALL data on the selected hard drive. Take care! If you "
+"intend to use part of the disk for something else, or you already have data "
+"on the drive that you are not prepared to lose, then do not use this option."
 msgstr ""
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:96
+#. type: Content of: <section><itemizedlist><listitem><important><para>
+#: en/doPartitionDisks.xml:99
 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."
+"Note that this involves shrinking the size of the Windows partition. The "
+"partition must be \"clean\", meaning that Windows must have closed down "
+"correctly the last time it was used. It must also have been defragmented, "
+"although this is not a guarantee that all files in the partition have been "
+"moved out of the area that is about to be used. It is highly recommended to "
+"back up your personal files."
 msgstr ""
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:103
-msgid "Custom disk partitioning"
-msgstr "Персонализирано разделяне на диска"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:110
+msgid "<emphasis role=\"bold\">Custom Disk Partitioning</emphasis>"
+msgstr ""
 
-#. 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)."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:112
-msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
+#. type: Content of: <section><mediaobject>
+#: en/doPartitionDisks.xml:120
+#, fuzzy
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"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
 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 ""
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:125
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:141
 msgid ""
 "If the total available space is greater than 50 GB, then three partitions "
 "are created"
 msgstr ""
 
-#. 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
 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 ""
 
-#. 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
+msgid "1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB"
 msgstr ""
 
-#. 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
 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 ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:144
+#: 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 ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:150
+#: en/doPartitionDisks.xml:182
 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 ""
 
 #. 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
-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 align=\"center\" fileref="
-"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </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-doPartitionDisks4.png\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:182
+#. type: Content of: <section><important><para>
+#: en/doPartitionDisks.xml:216
 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 ""
 
-#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:189
-msgid "<emphasis role=\"bold\">Align to</emphasis> = MiB"
+#. type: Content of: <section><important><para>
+#: en/doPartitionDisks.xml:221
+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 ""
 
-#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:191
-msgid "<emphasis role=\"bold\">Free space preceding (MiB)</emphasis> = 2"
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:228
+msgid "<emphasis>Align to</emphasis> = MiB"
 msgstr ""
 
-#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:194
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:232
+msgid "<emphasis>Free space preceding (MiB)</emphasis> = 2"
+msgstr ""
+
+#. type: Content of: <section><important><para>
+#: en/doPartitionDisks.xml:236
 msgid ""
 "Also make sure all partitions are created using an even number of megabytes."
 msgstr ""
 
 #. 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 "Инсталиране от ЖИВ образ"
 
 #. 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 ""
 
 #. type: Content of: <book><info><revhistory><revision><date>
-#: en/DrakLive-cover.xml:10
-msgid "January 2015"
-msgstr "Януари 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 "Официалната документация на Mageia"
 
 #. type: Content of: <book><info><cover><mediaobject>
-#: en/DrakLive-cover.xml:17
-msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+#: en/DrakLive-cover.xml:33 en/DrakX-cover.xml:30
+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/"
@@ -1505,8 +1665,8 @@ msgid ""
 msgstr ""
 
 #. 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."
@@ -1514,65 +1674,67 @@ msgid ""
 msgstr ""
 
 #. 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</"
 "link>, if you would like to help improve this manual."
 msgstr ""
 
-#. 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 "
 "while installing."
 msgstr ""
 
-#. 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
+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 ""
+
 #. 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 "Инсталация с DrakX"
 
 #. type: Content of: <book><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:9
+#: en/DrakX-cover.xml:20
 msgid "February 2014"
 msgstr "Февруари 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
-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 "Поздравления"
 
 #.  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
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
@@ -1581,46 +1743,45 @@ msgstr ""
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:18
 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 ""
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:18
+#: en/exitInstall.xml:22
 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 ""
 
 #. 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."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:26
+#: en/exitInstall.xml:30
 msgid "Enjoy!"
 msgstr "Забавлявайте се!"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:28
+#: en/exitInstall.xml:32
 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 ""
 
 #. 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 "
@@ -1629,46 +1790,46 @@ 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
 msgid "<emphasis role=\"bold\">Advanced</emphasis>"
 msgstr ""
 
 #. 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
 msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
 msgstr ""
 
 #. 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 "
@@ -1676,28 +1837,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 "Форматиране"
 
@@ -1705,392 +1866,332 @@ msgstr "Форматиране"
 #.  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 align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:24
+#: en/formatPartitions.xml:35
 msgid ""
 "Here you can choose which partition(s) you wish to format. Any data on "
 "partitions <emphasis>not</emphasis> marked for formatting will be preserved."
 msgstr ""
 
 #. 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
+msgid ""
+"Usually, at least the partitions that DrakX selected need to be formatted."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:31
+#: en/formatPartitions.xml:42
 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 ""
 
 #. type: Content of: <section><tip><para>
-#: en/formatPartitions.xml:36
+#: en/formatPartitions.xml:47
 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 ""
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:43
+#: en/formatPartitions.xml:54
 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:10
+#: en/installer.xml:14
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, инсталатора на Mageia"
 
 #. 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 "
 "possible."
 msgstr ""
 
-#. 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 ""
-
 #. type: Content of: <section><section><title>
-#: en/installer.xml:22
-msgid "Installation Welcome Screen"
-msgstr ""
-
-#. type: Content of: <section><section><section><title>
-#: en/installer.xml:25
-msgid "Using a Mageia DVD"
-msgstr ""
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:27
-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 ""
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:32
-msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml: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."
+#: en/installer.xml:20
+msgid "The installation steps"
 msgstr ""
 
-#. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:45
-msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:50
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/installer.xml:23
 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):"
+"The install process is divided into a number of steps - the status of which "
+"is indicated in a panel to the left of the screen."
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:55
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/installer.xml:28
 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>"
+"Each step has one or more screens, which may also have <emphasis>Advanced</"
+"emphasis> sections with extra, less commonly required options."
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:63
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/installer.xml:33
 msgid ""
-"Press <emphasis role=\"bold\">F2</emphasis> to have the installer use a "
-"specific language for the installation."
+"Most screens have <emphasis>Help</emphasis> buttons for further details "
+"about the particular step."
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:67
+#. type: Content of: <section><section><caution><para>
+#: en/installer.xml:38
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+"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 ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:72
+#. type: Content of: <section><section><caution><para>
+#: en/installer.xml:43
 msgid ""
-"Use the arrow keys to select the language then press <emphasis role=\"bold"
-"\">Enter</emphasis>."
+"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><para>
-#: en/installer.xml:77
-msgid ""
-"If needed, change the screen resolution by pressing <emphasis role=\"bold"
-"\">F3</emphasis> (Legacy mode only)."
+#. type: Content of: <section><section><title>
+#: en/installer.xml:48
+msgid "Installation Welcome Screen"
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:81
+#. type: Content of: <section><section><para>
+#: en/installer.xml:49
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome5def.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-welcome5def.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:88
+#. type: Content of: <section><section><para>
+#: en/installer.xml:52
 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)."
+"The welcome menu screen has various options, however the default option will "
+"start the installer, and is normally all that you will need."
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/installer.xml:96
-msgid "Default: It doesn't alter anything in the default options."
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:56
+msgid "Legacy (BIOS) Systems"
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/installer.xml:101
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:58
+#, fuzzy
 msgid ""
-"Safe Settings: Priority is given to the safer options at the price of a "
-"performance detriment."
+"<imageobject> <imagedata fileref=\"dx-welcome.png\" align=\"center\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\"/"
+"> </imageobject>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/installer.xml:106
-msgid ""
-"No ACPI: (Advanced Configuration and Power Interface): Power management "
-"features are not used."
+#. type: Content of: <section><section><section><itemizedlist><title>
+#: en/installer.xml:63
+msgid "Menu"
 msgstr ""
 
-#. 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:66
 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."
+"Install Mageia to a hard disk. This is the default option, and will "
+"automatically start after a short while unless another option is selected."
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:120
-msgid ""
-"When you select one of these entries, it modifies the default options "
-"displayed in the <guilabel>Boot Options</guilabel> line."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:69
+msgid "<emphasis role=\"bold\">Rescue System</emphasis>"
 msgstr ""
 
-#. 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:70
 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."
+"This option allows you to either re-install the bootloader for an existing "
+"Mageia installation or you can use it to restore a Windows bootloader."
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:132
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:75
+msgid "<emphasis role=\"bold\">Memory Test</emphasis>"
 msgstr ""
-"<imageobject> <imagedata 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:76
 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."
+"Test the installed RAM by performing multiple read and write operations. "
+"Reboot to end the test."
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:146
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:80
+msgid "<emphasis role=\"bold\">F2: Language</emphasis>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:151
-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><itemizedlist><listitem><para>
+#: en/installer.xml:81
+msgid "Press F2 for alternative languages."
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:158
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:86
+msgid "UEFI Systems"
 msgstr ""
-"<imageobject> <imagedata 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><para>
+#: en/installer.xml:87
 msgid ""
-"The help is translated in the chosen language with <emphasis role=\"bold"
-"\">F2</emphasis>."
+"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 ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:168
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:92
+#, fuzzy
 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 ""
-
-#. type: Content of: <section><section><title>
-#: en/installer.xml:177
-msgid "The installation steps"
+"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\"/"
+"> </imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/installer.xml:179
-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 ""
 
-#. type: Content of: <section><section><para>
-#: en/installer.xml:182
-msgid ""
-"Each step has one or more screens which may also have <guibutton>Advanced</"
-"guibutton> sections with extra, less commonly required, options."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:99
+msgid "<emphasis role=\"bold\">Install:</emphasis> Start the Install process"
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/installer.xml:186
+#. 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 ""
 
-#. type: Content of: <section><section><note><para>
-#: en/installer.xml:190
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:109
 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 ""
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:203
+#: en/installer.xml:115
 msgid "Installation Problems and Possible Solutions"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:206
+#: en/installer.xml:117
 msgid "No Graphical Interface"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:210
+#: en/installer.xml:120
 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 ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:217
+#: en/installer.xml:126
 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 ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:230
+#: en/installer.xml:138
 msgid "The Install Freezes"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:232
+#: en/installer.xml:139
 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 ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:240
+#: en/installer.xml:146
 msgid "RAM problem"
 msgstr "Проблем с RAM паметта"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:242
+#: en/installer.xml:147
 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 ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:249
+#: en/installer.xml:154
 msgid "Dynamic partitions"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:251
+#: en/installer.xml:155
 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/installUpdates.xml:3
+#: en/installUpdates.xml:16
 msgid "Updates"
 msgstr "Обновявания"
 
-#.  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 ""
@@ -2099,86 +2200,94 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:20
+#: en/installUpdates.xml:25
 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 ""
 
-#. type: Content of: <section><para>
-#: en/installUpdates.xml:24
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installUpdates.xml:30
 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>Yes</emphasis> if you wish to download and install them"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installUpdates.xml:35
+msgid ""
+"Select <emphasis>No</emphasis> if you don't want to do this now, or if you "
 "aren't connected to the Internet"
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/installUpdates.xml:29
-msgid "Press <guibutton>Next</guibutton> to continue"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installUpdates.xml:40
+msgid "Press <emphasis>Next</emphasis> to continue"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/login.xml:1
-msgid "Login screen"
+#: en/login.xml:4
+msgid "Login Screen"
 msgstr ""
 
 #. 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
+msgid "SDDM login screen"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/login.xml:1
-msgid "Finally, you will come to the login screen."
+#: en/login.xml:14
+msgid "Finally, you will come to the desktop login screen."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/login.xml:1
+#: en/login.xml:15
 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 ""
 
 #. type: Content of: <section><para>
-#: en/login.xml:3
+#: en/login.xml:16
 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/media_selection.xml:3
-msgid "Media Selection (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
+#: en/media_selection.xml:24
+#, fuzzy
 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=\"media_selection-im1\" align="
-"\"center\" revision=\"1\" fileref=\"dx2-media_selection.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-bestTime.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"bestTime-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 "
@@ -2187,24 +2296,24 @@ msgid ""
 msgstr ""
 
 #. 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."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:32
+#: en/media_selection.xml:42
 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 ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:40
+#: en/media_selection.xml:50
 msgid ""
 "The <emphasis>Tainted</emphasis> repository includes packages released under "
 "a free license. The main criteria for placing packages in this repository is "
@@ -2219,56 +2328,57 @@ msgid "Minimal Install"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:11
+#: en/minimal-install.xml:17
 msgid ""
-"You can choose a Minimal Installation by de-selecting everything in the "
-"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"/>."
+"Minimal Installation is intended for those with specific uses in mind for "
+"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 ""
 
-#. type: Content of: <section><para>
-#: en/minimal-install.xml:14
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/minimal-install.xml:24
 msgid ""
-"If desired, you can additionally tick the <emphasis role=\"bold\">Individual "
-"package selection</emphasis> option in the same screen."
+"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 ""
 
-#. type: Content of: <section><para>
-#: en/minimal-install.xml:17
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/minimal-install.xml:28
 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"
-"\"/>."
+"If desired, you can additionally tick the <emphasis>Individual package "
+"selection</emphasis> option in the same screen."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/minimal-install.xml:22
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/minimal-install.xml:33
 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."
+"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 ""
 
-#. 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
 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 ""
 
 #. type: Content of: <section><mediaobject>
-#: en/minimal-install.xml:35
+#: en/minimal-install.xml:48
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"minimal-install-im1\" align="
 "\"center\" fileref=\"dx2-minimal-install.png\" revision=\"1\"/> </"
@@ -2280,200 +2390,203 @@ msgstr ""
 
 #. type: Content of: <section><info><title>
 #: en/misc-params.xml:3
-msgid "Summary of miscellaneous parameters"
-msgstr ""
+#, fuzzy
+msgid "Configuration Summary"
+msgstr "Конфигуриране на звука"
 
 #.  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=\"dx2-summaryTop.png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/misc-params.xml:15
+#: en/misc-params.xml:24
 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 ""
 
 #. 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 ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:45
-msgid "<guilabel>Timezone</guilabel>"
+#: en/misc-params.xml:54
+msgid "<emphasis role=\"bold\">Timezone</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:47
+#: en/misc-params.xml:56
 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 ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:53
-msgid "<guilabel>Country / Region</guilabel>"
+#: en/misc-params.xml:62
+msgid "<emphasis role=\"bold\">Country / Region</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:56
+#: en/misc-params.xml:64
 msgid ""
 "If the selected country is wrong, it is very important that you correct the "
 "setting.  See <xref linkend=\"selectCountry\"/>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:62
-msgid "<guilabel>Bootloader</guilabel>"
-msgstr ""
-
-#. 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:70
+msgid "<emphasis role=\"bold\">Bootloader</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:67
-msgid "Do not change anything, unless you know how to configure GRUB2"
+#: en/misc-params.xml:72
+msgid "DrakX proposal for the bootloader setting"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:70
-msgid "For more information, see <xref linkend=\"setupBootloader\"/>"
+#: en/misc-params.xml:75
+msgid ""
+"Do not change anything, unless you know how to configure GRUB2. For more "
+"information, see <xref linkend=\"setupBootloader\"/>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:75
-msgid "<guilabel>User management</guilabel>"
+#: en/misc-params.xml:83
+msgid "<emphasis role=\"bold\">User management</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:78
+#: en/misc-params.xml:85
 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 ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:84
-msgid "<guilabel>Services</guilabel>:"
+#: en/misc-params.xml:91
+msgid "<emphasis role=\"bold\">Services</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:86
+#: en/misc-params.xml:93
 msgid ""
 "System services refer to those small programs which run in the background "
 "(daemons).  This tool allows you to enable or disable certain processes."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:90
+#: en/misc-params.xml:97
 msgid ""
 "You should check carefully before changing anything here - a mistake may "
-"prevent your computer from operating correctly."
-msgstr ""
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:94
-msgid "For more information, see <xref linkend=\"configureServices\"/>"
+"prevent your computer from operating correctly. For more information, see "
+"<xref linkend=\"configureServices\"/>"
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:101
+#: en/misc-params.xml:106
 msgid "Hardware parameters"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:106
-msgid "<guilabel>Keyboard</guilabel>:"
+#: en/misc-params.xml:111
+msgid "<emphasis role=\"bold\">Keyboard</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:108
+#: en/misc-params.xml:113
 msgid ""
 "Configure your keyboard layout according to your location, language and type "
 "of keyboard."
 msgstr ""
 
 #. 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>:"
+#: en/misc-params.xml:124
+msgid "<emphasis role=\"bold\">Mouse</emphasis>"
 msgstr ""
 
 #. 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."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:126
-msgid "<guilabel>Sound card</guilabel>:"
+#: en/misc-params.xml:131
+msgid "<emphasis role=\"bold\">Sound card</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:129
-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."
+#: en/misc-params.xml:133
+msgid "The installer will use the default driver if one is available."
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:137
-msgid "<guilabel>Graphical interface</guilabel>:"
+#. type: Content of: <section><section><para>
+#: en/misc-params.xml:136 en/soundConfig.xml:46
+msgid ""
+"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 ""
 
 #. 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:144
+msgid "<emphasis role=\"bold\">Graphical interface</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:143
-msgid "For more information, see <xref linkend=\"configureX_chooser\"/>."
+#: en/misc-params.xml:146
+msgid ""
+"This section allows you to configure your graphics card(s) and displays. For "
+"more information, see <xref linkend=\"configureX_chooser\"/>"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/misc-params.xml:149
+#: en/misc-params.xml:155
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
 "\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
@@ -2482,96 +2595,102 @@ msgstr ""
 "\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"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 ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:163
-msgid "<guilabel>Network</guilabel>:"
+#: en/misc-params.xml:169
+msgid "<emphasis role=\"bold\">Network</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:165
+#: en/misc-params.xml:171
 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 ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:172
+#: en/misc-params.xml:178
 msgid ""
 "When you add a network card, do not forget to set your firewall to monitor "
 "that interface as well."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:179
-msgid "<guilabel>Proxies</guilabel>:"
+#: en/misc-params.xml:185
+msgid "<emphasis role=\"bold\">Proxies</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:181
+#: en/misc-params.xml:187
 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 ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:186
+#: en/misc-params.xml:192
 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 ""
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:195
+#: en/misc-params.xml:201
 msgid "Security"
 msgstr "Сигурност"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:200
-msgid "<guilabel>Security Level</guilabel>:"
-msgstr "<guilabel>Ниво на сигурност</guilabel>:"
+#: en/misc-params.xml:206
+msgid "<emphasis role=\"bold\">Security Level</emphasis>"
+msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:203
+#: en/misc-params.xml:208
 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 ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:207
-msgid "Check the option which best suits your usage."
+#: en/misc-params.xml:215
+msgid "<emphasis role=\"bold\">Firewall</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:212
-msgid "<guilabel>Firewall</guilabel>:"
-msgstr "<guilabel>Защитна стена</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 ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:218
-msgid ""
-"Select the services that you wish to have access to your system. Your "
-"selections will depend on what you use your computer for. For more "
-"information, see <xref linkend=\"firewall\"/>."
+#: en/misc-params.xml:229
+msgid "For more information, see <xref linkend=\"firewall\"/>."
 msgstr ""
 
 #. 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
+msgid ""
+"Bear in mind that allowing <emphasis>everything</emphasis> (no firewall) may "
+"be very risky."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -2580,29 +2699,42 @@ msgid "Reboot"
 msgstr "Рестартиране"
 
 #. type: Content of: <section><para>
-#: en/reboot.xml:6
+#: en/reboot.xml:7
 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 ""
+
+#. 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
-msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
+#: en/reboot.xml:12
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot2.png\"/> </"
+"imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"live-reboot2.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
 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 ""
 
 #. type: Content of: <section><mediaobject>
-#: en/reboot.xml:17
+#: en/reboot.xml:19
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
 "reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
@@ -2626,43 +2758,50 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/securityLevel.xml:3
+#: en/securityLevel.xml:10
 msgid "Security Level"
 msgstr "Ниво на сигурност"
 
 #.  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=\"securityLevel-im1\" align="
-"\"center\" fileref=\"dx2-securityLevel.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
 msgid ""
 "<emphasis role=\"bold\">Please choose the desired security level</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:19
+#: en/securityLevel.xml:29
+msgid ""
+"<emphasis>Standard</emphasis> is the default, and recommended setting for "
+"the average user."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:32
 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>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:24
+#: en/securityLevel.xml:36
 msgid "<emphasis role=\"bold\">Security Administrator</emphasis>"
 msgstr ""
 
 #. 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 "
@@ -2670,14 +2809,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 "
@@ -2685,511 +2824,561 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:41
+#: en/securityLevel.xml:53
 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:6
+#: en/SelectAndUseISOs2.xml:15
 msgid "Select and use ISOs"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:9
+#: en/SelectAndUseISOs2.xml:18
 msgid "Introduction"
 msgstr "Въведение"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:10
+#: en/SelectAndUseISOs2.xml:19
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
 "which image best suits your needs."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:12
-msgid "There are two families of media:"
+#: en/SelectAndUseISOs2.xml:21
+msgid "There are three types of installation media:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:15
+#: en/SelectAndUseISOs2.xml:24
 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 ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:21
+#: en/SelectAndUseISOs2.xml:31
 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"
+"<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
+msgid ""
+"Live ISOs can only be used to create <quote>clean</quote> installations, "
+"they cannot be used to upgrade previously installed Mageia releases."
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:47
+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 ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:53
+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 ""
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:27
-msgid "Details are given in the next sections."
+#: en/SelectAndUseISOs2.xml:58
+msgid "More details are given in the next sections."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:30
+#: en/SelectAndUseISOs2.xml:61
 msgid "Media"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:32
+#: en/SelectAndUseISOs2.xml:63
 msgid "Definition"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:33
+#: en/SelectAndUseISOs2.xml:64
 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 ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:36
+#: en/SelectAndUseISOs2.xml:67
 msgid ""
 "You can find Mageia ISO's <link ns4:href=\"http://www.mageia.org/en/"
 "downloads/\">here</link>."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:39
+#: en/SelectAndUseISOs2.xml:70
 msgid "Classical installation media"
 msgstr ""
 
 #. 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 ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:44
-msgid "These ISOs use the Classical installer called drakx."
+#: en/SelectAndUseISOs2.xml:75
+msgid "These ISOs use the Classical installer called DrakX"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:47
+#: en/SelectAndUseISOs2.xml:78
 msgid ""
 "They are used for performing clean installs or to upgrade a previously "
-"installed version of Mageia."
+"installed version of Mageia"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:51 en/SelectAndUseISOs2.xml:83
-#: en/SelectAndUseISOs2.xml:158
-msgid "Different media for 32 and 64 bit architectures."
+#: en/SelectAndUseISOs2.xml:82 en/SelectAndUseISOs2.xml:118
+#: en/SelectAndUseISOs2.xml:174
+msgid "Different media for 32 and 64-bit architectures"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:54
+#: en/SelectAndUseISOs2.xml:85
 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 ""
 
 #. 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
+msgid "Each DVD contains many available desktop environments and languages"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:62
+#: en/SelectAndUseISOs2.xml:95
 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 ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:69
+#: en/SelectAndUseISOs2.xml:102
 msgid "Live media"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:74
+#: en/SelectAndUseISOs2.xml:107
 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 ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:79
-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 ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:86
-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>"
+#: en/SelectAndUseISOs2.xml:114
+msgid "Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:91
-msgid "They contain non free software."
+#: en/SelectAndUseISOs2.xml:121
+msgid "They contain non-free software"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:96
+#: en/SelectAndUseISOs2.xml:126
 msgid "Live DVD Plasma"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:99
-msgid "Plasma desktop environment only."
+#: en/SelectAndUseISOs2.xml:129
+msgid "Plasma desktop environment only"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:102 en/SelectAndUseISOs2.xml:116
-#: en/SelectAndUseISOs2.xml:130
-msgid "All available languages are present."
+#: en/SelectAndUseISOs2.xml:132 en/SelectAndUseISOs2.xml:146
+#: en/SelectAndUseISOs2.xml:160
+msgid "All available languages are present"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:105
-msgid "64 bit architecture only."
+#: en/SelectAndUseISOs2.xml:135 en/SelectAndUseISOs2.xml:149
+msgid "64-bit architecture only"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:110
+#: en/SelectAndUseISOs2.xml:140
 msgid "Live DVD GNOME"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:113
-msgid "GNOME desktop environment only."
-msgstr ""
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:119
-msgid "64 bit architecture only"
+#: en/SelectAndUseISOs2.xml:143
+msgid "GNOME desktop environment only"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:124
+#: en/SelectAndUseISOs2.xml:154
 msgid "Live DVD Xfce"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:127
-msgid "Xfce desktop environment only."
+#: en/SelectAndUseISOs2.xml:157
+msgid "Xfce desktop environment only"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:133
-msgid "32 or 64 bit architectures."
+#: en/SelectAndUseISOs2.xml:163
+msgid "32 or 64-bit architectures"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:139
+#: en/SelectAndUseISOs2.xml:169
 msgid "Net install media"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:144
-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 ""
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:152
-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 ""
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:161
-msgid "First steps are English language only."
+#: en/SelectAndUseISOs2.xml:177
+msgid "First steps are English language only"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:166
+#: en/SelectAndUseISOs2.xml:182
 msgid "netinstall.iso"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:169
+#: en/SelectAndUseISOs2.xml:185
 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 ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:175
+#: en/SelectAndUseISOs2.xml:191
 msgid "netinstall-nonfree.iso"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:178
+#: en/SelectAndUseISOs2.xml:194
 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 ""
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:186
+#: en/SelectAndUseISOs2.xml:202
 msgid "Downloading and Checking Media"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:188
+#: en/SelectAndUseISOs2.xml:204
 msgid "Downloading"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:189
+#: en/SelectAndUseISOs2.xml:205
 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 ""
+
+#. 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: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:191
-msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
+#: en/SelectAndUseISOs2.xml:217
+#, fuzzy
+msgid ""
+"<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:195
-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:"
+#: en/SelectAndUseISOs2.xml:222
+msgid "In the meantime, a window to download the actual ISO will open:"
 msgstr ""
 
 #. 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
 msgid "Checking the integrity of the downloaded media"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:208
+#: en/SelectAndUseISOs2.xml:235
 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 ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:214
+#: en/SelectAndUseISOs2.xml:241
 msgid ""
 "To generate the checksum for your downloaded ISO, open a console, (no need "
 "to be root), and:"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:218
+#: en/SelectAndUseISOs2.xml:245
 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 ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:222
+#: en/SelectAndUseISOs2.xml:249
 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 ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:254
+msgid ""
+"To use the sha512sum, type: <command>sha512sum path/to/the/image/file.iso</"
+"command>"
 msgstr ""
 
 #. 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
 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 ""
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:237
+#: en/SelectAndUseISOs2.xml:270
 msgid "Burn or dump the ISO"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:238
+#: en/SelectAndUseISOs2.xml:271
 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 ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:275
 msgid "Burning the ISO to a CD/DVD"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:243
+#: en/SelectAndUseISOs2.xml:276
 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 ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:248
+#: en/SelectAndUseISOs2.xml:282
 msgid "Dump the ISO to a USB stick"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:249
+#: en/SelectAndUseISOs2.xml:283
 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 ""
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:252
+#: en/SelectAndUseISOs2.xml:286
 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 ""
 
-#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:256
+#. type: Content of: <section><section><section><note><para>
+#: en/SelectAndUseISOs2.xml:290
+msgid ""
+"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 ""
-"To recover the original capacity, you must redo partitioning and re-format "
-"the USB stick."
+"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 ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:259
+#: en/SelectAndUseISOs2.xml:299
 msgid "Using a graphical tool within Mageia"
 msgstr ""
 
 #. 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>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:263
+#: en/SelectAndUseISOs2.xml:303
 msgid "Using a graphical tool within Windows"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:304
 msgid "You could try:"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:267
+#: en/SelectAndUseISOs2.xml:307
 msgid ""
 "<link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using the "
-"\"ISO image\" option;"
+"\"ISO image\" option"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:271
+#: en/SelectAndUseISOs2.xml:311
 msgid ""
 "<link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:277
-msgid "Using Command line within a GNU/Linux system"
+#: en/SelectAndUseISOs2.xml:317
+msgid "Using the Command line within a GNU/Linux system"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:279
+#: en/SelectAndUseISOs2.xml:319
 msgid ""
 "It is potentially *dangerous* to do this by hand. You risk overwriting "
 "potentially valuable existing data if you specify the wrong target device."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:325
 msgid "Open a console"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:288
+#: en/SelectAndUseISOs2.xml:328
 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 ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:291
-msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
-msgstr ""
+#: en/SelectAndUseISOs2.xml:332
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"Root.png\"/> </"
+"imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:297
+#: en/SelectAndUseISOs2.xml:338
 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 ""
 
 #. 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
+msgid "Enter the command <command>fdisk -l</command>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:304
-msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
+#: en/SelectAndUseISOs2.xml:345
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"Fdisk.png\"/> </"
+"imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:310
+#: en/SelectAndUseISOs2.xml:351
 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 ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:312
+#: en/SelectAndUseISOs2.xml:354
 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 ""
 
 #. 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"
@@ -3213,45 +3402,48 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:317
+#: en/SelectAndUseISOs2.xml:360
 msgid "<placeholder type=\"screen\" id=\"0\"/>"
 msgstr "<placeholder type=\"screen\" id=\"0\"/>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:337
+#: en/SelectAndUseISOs2.xml:380
 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 ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:340
-msgid "Where X=your device name eg: /dev/sdd"
+#: en/SelectAndUseISOs2.xml:382
+msgid ""
+"Where <replaceable>X</replaceable>=your device name eg: <filename>/dev/sdd</"
+"filename>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:341
+#: en/SelectAndUseISOs2.xml:384
 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 ""
 
 #. 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
+msgid "Enter the command: <command>sync</command>"
 msgstr ""
 
 #. 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 ""
 
@@ -3261,8 +3453,10 @@ msgid "Select your Country / Region"
 msgstr ""
 
 #.  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
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
 "\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
@@ -3270,39 +3464,38 @@ msgstr ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
 "\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
 
-#. type: Content of: <section><para>
-#: en/selectCountry.xml:14
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectCountry.xml:20
 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 ""
 
-#. type: Content of: <section><para>
-#: en/selectCountry.xml:19
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectCountry.xml:27
 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 ""
 
 #. type: Content of: <section><note><para>
-#: en/selectCountry.xml:24
+#: en/selectCountry.xml:34
 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 ""
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:33
+#: en/selectCountry.xml:42
 msgid "Input method"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/selectCountry.xml:36
+#: en/selectCountry.xml:45
 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. "
@@ -3311,133 +3504,128 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/selectCountry.xml:45
+#: en/selectCountry.xml:54
 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/selectInstallClass.xml:14
+#: en/selectInstallClass.xml:29
 msgid "Install or Upgrade"
 msgstr ""
 
 #. 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 format=\"PNG\" align=\"center\" fileref=\"dx2-"
 "selectInstallClass.png\"/> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:25
-msgid "Install"
-msgstr "Инсталирай"
+#: en/selectInstallClass.xml:41
+msgid "<emphasis role=\"bold\">Install</emphasis>"
+msgstr ""
 
 #. 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 "Подобри"
+#: en/selectInstallClass.xml:50
+msgid "<emphasis role=\"bold\">Upgrade</emphasis>"
+msgstr ""
 
 #. 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
+msgid "Use this option to upgrade an existing installation of Mageia."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/selectInstallClass.xml:39
+#. type: Content of: <section><important><para>
+#: en/selectInstallClass.xml:58
 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."
-msgstr ""
-
-#. type: Content of: <section><note><para>
-#: en/selectInstallClass.xml:50
-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."
+"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 ""
 
 #. type: Content of: <section><tip><para>
-#: en/selectInstallClass.xml:62
+#: en/selectInstallClass.xml:67
 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/selectKeyboardLive.xml:3
-msgid "Select keyboard"
+#: en/selectKeyboardLive.xml:14
+#, fuzzy
+msgid "Select Keyboard"
 msgstr "Изберете клавиатура"
 
 #. 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:24
+msgid "Here you can set the keyboard layout you wish to use with Mageia​​."
+msgstr ""
 
 #. type: Content of: <section><para>
-#: en/selectKeyboardLive.xml:12
+#: 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/selectKeyboard.xml:7
+#: en/selectKeyboard.xml:20
 msgid "Keyboard"
 msgstr "Клавиатура"
 
 #. 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."
 msgstr ""
 
 #. 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=\"dx2-selectKeyboard.png\" align=\"center\"/"
-"> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" align=\"center\" fileref=\"dx2-"
+"selectInstallClass.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 "
@@ -3448,24 +3636,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:31
+#: en/selectKeyboard.xml:45
 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 ""
 
-#. 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
 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 ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:46
+#: en/selectKeyboard.xml:60
 msgid ""
 "If you choose a keyboard based on non-Latin characters, you will see an "
 "extra dialogue screen asking how you would prefer to switch between the "
@@ -3473,84 +3661,83 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:15
+#: en/selectLanguage.xml:34
 msgid "Please choose a language to use"
 msgstr "Моля, изберете език"
 
-#. type: Content of: <section><para>
-#: en/selectLanguage.xml:18
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectLanguage.xml:39
 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 ""
 
-#. type: Content of: <section><para>
-#: en/selectLanguage.xml:23
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectLanguage.xml:45
 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 ""
 
-#. type: Content of: <section><para>
-#: en/selectLanguage.xml:27
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectLanguage.xml:50
 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 ""
 
 #. 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 format=\"PNG\" fileref="
 "\"dx2-selectLanguage.png\" align=\"center\"/> </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
 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 ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:50
+#: en/selectLanguage.xml:76
 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."
-msgstr ""
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:56
-msgid "Mageia uses UTF-8 (Unicode) support by default."
+"it is advisable to install the required language for your keyboard as well"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:58
+#: en/selectLanguage.xml:82
 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 ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:64
+#: en/selectLanguage.xml:89
 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/selectMouse.xml:4
+#: en/selectMouse.xml:10
 msgid "Select mouse"
 msgstr "Изберете мишка"
 
@@ -3558,38 +3745,41 @@ msgstr "Изберете мишка"
 #.  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 format=\"PNG\" align=\"center\" fileref=\"dx2-"
+"selectInstallClass.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."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/selectMouse.xml:25
+#: en/selectMouse.xml:32
 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 ""
 
 #. type: Content of: <section><para>
-#: en/selectMouse.xml:27
+#: en/selectMouse.xml:38
 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 ""
 
-#. 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 ""
 
@@ -3609,317 +3799,369 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:7
-msgid "Bootloader main options"
+#: en/setupBootloader.xml:10
+#, fuzzy
+msgid "Bootloader"
 msgstr "Опции на програмата за начално зареждане"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:10
-msgid "Bootloader interface"
+#: en/setupBootloader.xml:13
+msgid "Grub2"
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:11
-msgid "By default, Mageia uses exclusively:"
+#. 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:14
+#: en/setupBootloader.xml:17
 msgid ""
-"GRUB2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
+"GRUB2 (with or without graphical menu) will be used exclusively as the "
+"bootloader for a Legacy/MBR or Legacy/GPT system."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:18
-msgid "GRUB2-efi for a UEFI system."
+#: en/setupBootloader.xml:21
+msgid ""
+"By default, a new bootloader will be written into either the MBR (Master "
+"Boot Record) of your first hard drive or in the BIOS boot partition."
 msgstr ""
 
-#. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:22
-msgid "The Mageia graphical menus are nice :)"
+#. type: Content of: <section><section><itemizedlist><title>
+#: en/setupBootloader.xml:27
+msgid "Grub2-efi on UEFI systems"
 msgstr ""
 
-#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:25
-msgid "GRUB2 on Legacy/MBR and Legacy/GPT systems"
+#. 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 ""
 
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:27
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:33
 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>"
+"By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI "
+"System Partition)."
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
-"setupBootloader.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:34 en/setupBootloader.xml:56
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:35
 msgid ""
-"Don't modify the <emphasis role=\"bold\">Boot Device</emphasis> unless you "
-"really know what you are doing."
+"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 ""
 
-#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:38
-msgid "GRUB2-efi on UEFI systems"
-msgstr ""
+#. type: Content of: <section><section><info><title>
+#: en/setupBootloader.xml:46
+#, fuzzy
+msgid "Bootloader Setup"
+msgstr "Опции на програмата за начално зареждане"
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:39
-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 ""
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:49
+msgid "Bootloader main options"
+msgstr "Опции на програмата за начално зареждане"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:42
+#: en/setupBootloader.xml:51
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
-"imageobject>"
+"<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-"
-"setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata fileref=\"live-setupBootloader3.png\" align=\"center\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:49
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:62
+msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:63
 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."
+"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><title>
-#: en/setupBootloader.xml:61
-msgid "Using a Mageia bootloader"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:67
+msgid "<emphasis role=\"bold\">Boot device</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:62
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:68
+msgid "Don't change this unless you really know what you are doing"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:72
 msgid ""
-"By default, and according to your system, Mageia writes one of the following:"
+"<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:66
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:74
 msgid ""
-"a GRUB2 bootloader either into the MBR (Master Boot Record) of your first "
-"hard drive or in the BIOS boot partition."
+"This text box lets you set a delay, in seconds, before the default operating "
+"system is started up."
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:70
-msgid "a GRUB2-efi bootloader into the ESP"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:78
+msgid "<emphasis role=\"bold\">Security</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:73
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:79
 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."
+"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 ""
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:78
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:88
+msgid "Choose a password for the bootloader (optional)"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:91
+msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:92
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata fileref=\"live-setupBootloader3.png\" align=\"center\"/> </"
-"imageobject>"
+"Retype the password and DrakX will check that it matches with the one set "
+"above"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata fileref=\"live-setupBootloader3.png\" align=\"center\"/> </"
-"imageobject>"
 
-#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:87
-msgid "Using an existing bootloader"
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:96 en/setupBootloader.xml:154
+msgid "<emphasis>Advanced</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:88
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:99
+msgid "<emphasis>Enable ACPI</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:100
 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."
+"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 ""
 
-#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:95
-msgid "Using chain loading"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:108
+msgid "<emphasis>Enable SMP</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:96
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:109
 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>."
+"This option enables/disables symmetric multiprocessing for multi-core "
+"processors"
 msgstr ""
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:101
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:113
+msgid "<emphasis>Enable APIC</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:114
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-setupBootloader4.png\" align="
-"\"center\"/> </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 condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-setupBootloader4.png\" align="
-"\"center\"/> </imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:108
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:120
+msgid "<emphasis>Enable Local APIC</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:121
 msgid ""
-"You will get a warning that the bootloader is missing, ignore it by clicking "
-"<guibutton>OK</guibutton>."
+"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><mediaobject>
-#: en/setupBootloader.xml:111
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:127
+#, fuzzy
+msgid "Bootloader Configuration"
+msgstr "Конфигуриране на звука"
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:129
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-setupBootloader3.png\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata fileref=\"live-setupBootloader3.png\" align=\"center\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:117
-msgid "Options"
-msgstr "Опции"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:139
+msgid "<emphasis role=\"bold\">Default</emphasis>"
+msgstr ""
 
-#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:119
-msgid "First page"
-msgstr "Първа страница"
+#. 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:120
-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."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:143
+msgid "<emphasis role=\"bold\">Append</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:122
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:144
 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."
+"This option lets you pass information to the kernel or tell the kernel to "
+"give you more information as it boots"
 msgstr ""
 
-#. type: Content of: <section><section><section><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:148
+msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
 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:149
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the password and DrakX will "
-"check that it matches with the one above."
+"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><mediaobject>
+#: en/setupBootloader.xml:156
+#, fuzzy
+msgid ""
+"<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 align=\"center\" fileref="
+"\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata fileref=\"live-setupBootloader3.png\" align=\"center\"/> </"
+"imageobject>"
+
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:127 en/setupBootloader.xml:159
-msgid "<guilabel>Advanced</guilabel>"
+#: en/setupBootloader.xml:166
+msgid "<emphasis>Video mode</emphasis>"
 msgstr ""
 
-#. 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:167
 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)."
+"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:133
-msgid ""
-"<guilabel>Enable SMP</guilabel>: This option enables/disables symmetric "
-"multiprocessing for multi core processors."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:172
+msgid "<emphasis>Do not touch ESP or MBR</emphasis>"
 msgstr ""
 
-#. 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:173
 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."
+"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><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:138
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:181
+#, fuzzy
 msgid ""
-"<guilabel>Enable Local APIC</guilabel>: Local APIC manages all external "
-"interrupts for a specific processor in an SMP system."
+"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align=\"center"
+"\"/> </imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:143
-msgid "Next page"
-msgstr "Следваща страница"
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:188
+#, fuzzy
+msgid "Other Options"
+msgstr "Опции"
 
-#. 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><section><title>
+#: en/setupBootloader.xml:190
+msgid "Using an existing bootloader"
 msgstr ""
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:150
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:191
 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 ""
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:155
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:199
+msgid "Installing Without a Bootloader"
+msgstr ""
+
+#. 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
 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/setupSCSI.xml:3
+#: en/setupSCSI.xml:10
 msgid "Setup SCSI"
 msgstr "Настройване на SCSI"
 
@@ -3931,17 +4173,20 @@ msgstr "Настройване на 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=\"dx2-setupSCSI.png\" align="
-"\"center\" xml:id=\"setupSCSI-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
 msgid ""
 "DrakX will normally detect hard disks correctly. However, with some older "
 "SCSI controllers it may be unable to determine the correct drivers to use "
@@ -3949,81 +4194,57 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:32
+#: en/setupSCSI.xml:44
 msgid ""
-"If this happens, you will need to manually tell DrakX which SCSI drive(s) "
-"you have."
-msgstr ""
-
-#. type: Content of: <section><para>
-#: en/setupSCSI.xml:35
-msgid "DrakX should then be able to configure the drive(s) correctly."
+"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 ""
 
 #. type: Content of: <section><info><title>
-#: en/soundConfig.xml:3
+#: en/soundConfig.xml:10
 msgid "Sound Configuration"
 msgstr "Конфигуриране на звука"
 
 #.  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>"
-msgstr ""
-"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
-"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
-
-#. type: Content of: <section><para>
-#: en/soundConfig.xml:14
-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."
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-soundConfig.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"soundConfig-im1\"/> </imageobject>"
 msgstr ""
+"<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 ""
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:24
+#: 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 ""
 
 #. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:30
+#: en/soundConfig.xml:43
 msgid "Advanced"
 msgstr "Разширени настройки"
 
-#. type: Content of: <section><section><para>
-#: en/soundConfig.xml:33
-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 ""
-
-#. type: Content of: <section><section><para>
-#: en/soundConfig.xml:38
-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 ""
-
 #. type: Content of: <section><info><title>
-#: en/takeOverHdConfirm.xml:3
+#: en/takeOverHdConfirm.xml:10
 msgid "Confirm hard disk to be formatted"
 msgstr ""
 
@@ -4033,119 +4254,134 @@ msgstr ""
 #.     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 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-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><para>
-#: en/takeOverHdConfirm.xml:27
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/takeOverHdConfirm.xml:42
 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 ""
 
-#. type: Content of: <section><para>
-#: en/takeOverHdConfirm.xml:31
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/takeOverHdConfirm.xml:48
 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/testing.xml:9
+#: en/testing.xml:3
 msgid "Testing Mageia as Live system"
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/testing.xml:14
+#: en/testing.xml:8
 msgid "Live mode"
 msgstr "Жив режим"
 
+#. 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 ""
-
 #. type: Content of: <section><section><section><info><title>
-#: en/testing.xml:28
+#: en/testing.xml:21
 msgid "Testing hardware"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/testing.xml:31
+#: en/testing.xml:24
 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 ""
 
 #. 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 ""
 
 #. 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
+msgid "graphics card: if you see the previous screen, it's already OK."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:47
+#: en/testing.xml:40
 msgid "webcam:"
 msgstr ""
 
 #. 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 ""
 
 #. 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
+msgid "printer: configure your printer/s and print a test page"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:59
+#: en/testing.xml:52
 msgid "scanner: scan a document from ..."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/testing.xml:63
+#: en/testing.xml:56
 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 ""
 
-#. 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
+msgid ""
+"The configuration settings you apply here are carried over if you decide to "
+"proceed with the installation."
 msgstr ""
 
 #. type: Content of: <section><section><section><info><title>
-#: en/testing.xml:72
+#: en/testing.xml:68
 msgid "Launch installation"
 msgstr ""
 
+#. type: Content of: <section><section><section><para>
+#: en/testing.xml:71
+msgid ""
+"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 ""
+
 #. type: Content of: <section><section><section><mediaobject>
-#: en/testing.xml:76
+#: en/testing.xml:77
 msgid ""
 "<imageobject> <imagedata fileref=\"live-liveMode-install.png\"/> </"
 "imageobject>"
@@ -4153,22 +4389,13 @@ msgstr ""
 "<imageobject> <imagedata fileref=\"live-liveMode-install.png\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><section><section><para>
-#: en/testing.xml:81
-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."
-msgstr ""
-
 #. type: Content of: <section><info><title>
-#: en/uninstall-Mageia.xml:3
+#: en/uninstall-Mageia.xml:10
 msgid "Uninstalling Mageia"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:9
+#: en/uninstall-Mageia.xml:18
 msgid ""
 "If Mageia didn't convince you or you can't install it correctly - in short "
 "you want get rid of it - that is your right and Mageia also gives you the "
@@ -4176,34 +4403,37 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:14
+#: en/uninstall-Mageia.xml:23
 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 ""
 
 #. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:19
+#: en/uninstall-Mageia.xml:28
 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 ""
 
 #. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:27
+#: en/uninstall-Mageia.xml:46
 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 ""
 
 #. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:30
+#: en/uninstall-Mageia.xml:49
 msgid ""
 "If you have Vista or 7, you have one more possibility, you can extend the "
 "existing partition that is at the left of the freed space. There are other "
@@ -4213,30 +4443,45 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/unused.xml:9
+#: en/unused.xml:3
 msgid "Keep or delete unused material"
 msgstr ""
 
+#. 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=\"reboot-im1\" fileref=\"live-"
+"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/unused.xml:19
+#: en/unused.xml:14
 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 ""
+
+#. 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>"
@@ -4245,8 +4490,237 @@ msgstr ""
 "> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/unused.xml:30
-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."
-msgstr ""
+#: en/unused.xml:31
+msgid ""
+"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 ""
+
+#~ msgid ""
+#~ "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"../live-bootCSM.png\"/> </imageobject>"
+
+#~ 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=\"configureX_card_list-"
+#~ "im1\" align=\"center\" fileref=\"dx2-configureX_card_list.png\" revision="
+#~ "\"1\"/> </imageobject>"
+
+#~ 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=\"configureX_chooser-im1\" "
+#~ "fileref=\"dx2-configureX_chooser.png\" align=\"center\" revision=\"1\"/> "
+#~ "</imageobject>"
+
+#~ 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=\"configureX_monitor-im1\" "
+#~ "fileref=\"dx2-configureX_monitor.png\" align=\"center\" revision=\"1\"/> "
+#~ "</imageobject>"
+
+#~ 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 ""
+#~ "<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-"
+#~ "doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" "
+#~ "align=\"center\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" "
+#~ "align=\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" "
+#~ "align=\"center\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<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 align=\"center\" fileref="
+#~ "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition="
+#~ "\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid "January 2015"
+#~ msgstr "Януари 2015"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
+
+#~ msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+
+#~ 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=\"media_selection-im1\" "
+#~ "align=\"center\" revision=\"1\" fileref=\"dx2-media_selection.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid "<guilabel>Security Level</guilabel>:"
+#~ msgstr "<guilabel>Ниво на сигурност</guilabel>:"
+
+#~ msgid "<guilabel>Firewall</guilabel>:"
+#~ msgstr "<guilabel>Защитна стена</guilabel>:"
+
+#~ 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=\"securityLevel-im1\" "
+#~ "align=\"center\" fileref=\"dx2-securityLevel.png\" revision=\"1\"/> </"
+#~ "imageobject>"
+
+#~ msgid "Install"
+#~ msgstr "Инсталирай"
+
+#~ msgid "Upgrade"
+#~ msgstr "Подобри"
+
+#~ 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 ""
+#~ "<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>"
+
+#~ 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 fileref=\"dx2-"
+#~ "setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata xml:id=\"setupBootloader-im1\" fileref="
+#~ "\"live-setupBootloader.png\"/> </imageobject>"
+
+#~ 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-"
+#~ "setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#~ 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-"
+#~ "setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-setupBootloader4.png\" "
+#~ "align=\"center\"/> </imageobject>"
+
+#~ msgid "First page"
+#~ msgstr "Първа страница"
+
+#~ msgid "Next page"
+#~ msgstr "Следваща страница"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-setupSCSI.png\" "
+#~ "align=\"center\" xml:id=\"setupSCSI-im1\" revision=\"1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-setupSCSI.png\" "
+#~ "align=\"center\" xml:id=\"setupSCSI-im1\" revision=\"1\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" "
+#~ "xml:id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" "
+#~ "xml:id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
+
+#~ 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 format=\"PNG\" fileref=\"live-"
+#~ "takeOverHdConfirm.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"classical\"> <imagedata format=\"PNG\" fileref=\"dx2-"
+#~ "takeOverHdConfirm.png\" align=\"center\"/> </imageobject>"
diff --git a/docs/docs/stable/installer/ca.po b/docs/docs/stable/installer/ca.po
index 7eb21175..4c2c61a3 100644
--- a/docs/docs/stable/installer/ca.po
+++ b/docs/docs/stable/installer/ca.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2018-04-19 16:32+0300\n"
+"POT-Creation-Date: 2019-01-06 12:43+0200\n"
 "PO-Revision-Date: 2018-10-01 09:54+0000\n"
 "Last-Translator: Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -27,12 +27,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Content of: <section><info><title>
-#: en/acceptLicense.xml:25
+#: en/acceptLicense.xml:31
 msgid "License and Release Notes"
 msgstr "Llicència i notes de la versió"
 
 #. type: Content of: <section><mediaobject>
-#: en/acceptLicense.xml:29
+#: en/acceptLicense.xml:35
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
 "\"acceptLicense-im1\" fileref=\"dx2-license.png\" align=\"center\" revision="
@@ -42,74 +42,80 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/acceptLicense.xml:40
+#: en/acceptLicense.xml:46
 msgid "License Agreement"
 msgstr "Acord de llicència"
 
-#. 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 ""
 "Abans d'instal·lar <application>Mageia</application>, llegiu atentament els "
 "termes i les condicions de la llicència."
 
-#. 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 ""
 "Aquests termes i condicions s'apliquen a la totalitat de la distribució "
 "<application>Mageia</application> i cal acceptar-los abans de continuar."
 
-#. type: Content of: <section><section><para>
-#: en/acceptLicense.xml:50
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/acceptLicense.xml:61
 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 ""
 
 #. 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 ""
 "Si decidiu no acceptar aquestes condicions, us agraïm el vostre interès. "
 "Fent clic a <guibutton>Surt</guibutton> l'ordinador es reiniciarà."
 
 #. type: Content of: <section><section><info><title>
-#: en/acceptLicense.xml:63
+#: en/acceptLicense.xml:76
 msgid "Release Notes"
 msgstr "Notes de la versió"
 
 #. type: Content of: <section><section><para>
-#: en/acceptLicense.xml:70
+#: en/acceptLicense.xml:83
 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 ""
 
 #. 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 "ca"
 
 #. 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 ""
 "Selecció dels mitjans (configura els mitjans d'instal·lació suplementaris)"
 
 #.  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
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-add_supplemental_media."
 "png\" xml:id=\"dx2-add_supplemental_media-im1\" align=\"center\" revision="
@@ -117,59 +123,71 @@ msgid ""
 msgstr ""
 
 #. 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 ""
+"Aquí teniu una llista de tots els dipòsits disponibles. No tots els dipòsits "
+"estan disponibles, depenent del mitjà que feu servir per a la instal·lació. "
+"La selecció dels dipòsits determina quins paquets es proposaran per a "
+"seleccionar durant els següents passos."
 
 #. 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 "Per a un origen en xarxa cal seguir dos passos:"
 
 #. 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 "Tria i activació de la xarxa, si encara no està activa."
 
 #. type: Content of: <section><orderedlist><listitem><para>
-#: en/add_supplemental_media.xml:32
+#: en/add_supplemental_media.xml:36
 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 ""
 
 #. type: Content of: <section><note><para>
-#: en/add_supplemental_media.xml:42
+#: en/add_supplemental_media.xml:46
 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/addUser.xml:3
-msgid "User and Superuser Management"
-msgstr "Gestió d'usuaris i superusuari"
+#: en/addUser.xml:9
+#, fuzzy
+msgid "User Management"
+msgstr "Gestió avançada d'usuaris"
 
 #.  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 format=\"PNG\" fileref="
 "\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -177,91 +195,112 @@ msgstr ""
 "\"PNG\" 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 "Estableix la contrasenya d'administrador (root):"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:24
+#: en/addUser.xml:40
 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 ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:34
+#: en/addUser.xml:49
 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 ""
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:42
+#: en/addUser.xml:57
 msgid "Enter a user"
 msgstr "Introduïu un usuari"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:45
+#: en/addUser.xml:60
 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 ""
 
 #. 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>Proveïdor</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>Icona</guibutton>: si feu clic en aquest botó, canviarà la icona "
 "d'usuari."
 
 #. 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>Genèric</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>Nom real</guilabel>: poseu-hi el nom real de l'usuari."
 
 #. 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>Integració automàtica</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/addUser.xml:82
 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 ""
 
+#. 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>Proveïdor</emphasis>"
+
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:67
+#: en/addUser.xml:90
 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 ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:73
+#: en/addUser.xml:94
 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 ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:79
+#: en/addUser.xml:101
 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 ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:82
+#: en/addUser.xml:104
 msgid ""
 "You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
@@ -269,49 +308,49 @@ msgid ""
 msgstr ""
 
 #. 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 ""
 "Els permisos d'accés també es poden modificar després de la instal·lació."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:93
-msgid "Advanced User Management"
+#: en/addUser.xml:115
+#, fuzzy
+msgid "User Management (advanced)"
 msgstr "Gestió avançada d'usuaris"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:96
+#: en/addUser.xml:118
 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 ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:101
+#: en/addUser.xml:123
 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 ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:107
+#: en/addUser.xml:130
 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 ""
 
 #. 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 "Tria dels punts de muntatge"
 
@@ -326,335 +365,444 @@ msgstr "Tria dels punts de muntatge"
 #.        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 format=\"PNG\" fileref="
+"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
+"\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata format="
+"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><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 ""
 "Aquí podeu veure les particions Linux que s'han trobat a l'ordinador. Si no "
 "esteu d'acord amb els suggeriments de <application>DrakX</application>, "
 "podeu canviar els punts de muntatge."
 
-#. type: Content of: <section><note><para>
-#: en/ask_mntpoint_s.xml:41
-msgid ""
-"If you change anything, make sure you still have a <emphasis role=\"bold"
-"\"><literal>/</literal></emphasis> (root) partition."
-msgstr ""
-
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:46
+#: 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 ""
-
-#. 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
 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 ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:63
+#: en/ask_mntpoint_s.xml:73
 msgid ""
 "For any partitions that you don't need to make use of, you can leave the "
 "mount point field blank."
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/ask_mntpoint_s.xml:69
+#: en/ask_mntpoint_s.xml:79
+msgid ""
+"If you make any changes here, ensure you still have a <filename>/</filename> "
+"(root) partition."
+msgstr ""
+
+#. type: Content of: <section><tip><para>
+#: en/ask_mntpoint_s.xml:84
 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 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 ""
 
 #. 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 ""
 "Si esteu segur que els punts de muntatge són correctes, feu clic a "
 "<guibutton>Següent</guibutton>, i trieu si voleu formatar les particions "
 "suggerides per DrakX, o bé més."
 
 #. type: Content of: <section><info><title>
-#: en/bestTime.xml:10
-msgid "Clock settings"
+#: en/bestTime.xml:5
+#, fuzzy
+msgid "Clock Settings"
 msgstr "Paràmetres del rellotge"
 
 #. 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
 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 ""
 
 #. type: Content of: <section><para>
-#: en/bestTime.xml:23
-msgid "In advanced tab, you will find more options about clock settings."
+#: en/bestTime.xml:14
+msgid ""
+"In the <emphasis>Advanced</emphasis> tab, you can enable automatic time "
+"synchronization and specify an NTP server."
 msgstr ""
-"A la pestanya de paràmetres avançats trobareu més opcions sobre els "
-"paràmetres del rellotge."
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:1
+#: en/bootLive.xml:6
 msgid "Boot Mageia as Live system"
 msgstr "Arrencada de Mageia com a sistema autònom"
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:1
+#: en/bootLive.xml:10
 msgid "Booting the medium"
 msgstr "Arrencada del mitjà"
 
-#. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:1
-msgid "From a disc"
-msgstr "Des d'un disc"
-
-#. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:1
+#. type: Content of: <section><section><para>
+#: en/bootLive.xml:12
 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."
+"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 ""
 
-#. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:7
-msgid "From a USB device"
-msgstr "Des d'un dispositiu USB"
+#. 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 ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:12
+#: en/bootLive.xml:35
 msgid "In BIOS/CSM/Legacy mode"
 msgstr "En mode BIOS/CSM/Legacy"
 
+#. 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>Proveïdor</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
+msgid "Once the boot is done, you can proceed to the installation."
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/bootLive.xml:45 en/bootLive.xml:57
+msgid ""
+"<emphasis role=\"bold\">+ use non-free video drivers (slower to boot)</"
+"emphasis>"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/bootLive.xml: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>Genèric</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:54 en/bootLive.xml:157
+msgid "This option will install Mageia to a hard disk."
+msgstr ""
+
+#. 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>"
 
 #. 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 "La primera pantalla de l'arrencada en mode BIOS"
 
-#. type: Content of: <section><section><para>
-#: en/bootLive.xml:12
-msgid "In the middle menu, you have the choice between three actions:"
+#. 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
+#: en/bootLive.xml:75
+msgid "<keycap>F1</keycap> <emphasis role=\"bold\">Help</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:76
 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."
+"Within any of the <keycap>F2</keycap> to <keycap>F6</keycap> options, you "
+"can view relevant help by pressing <keycap>F1</keycap>."
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:81
+msgid "<keycap>F2</keycap> <emphasis role=\"bold\">Language</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:16
+#: en/bootLive.xml:82
 msgid ""
-"Install Mageia: This choice will directly install Mageia on a hard disk."
+"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 ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:17
+#: en/bootLive.xml:87
+msgid "<keycap>F3</keycap> <emphasis role=\"bold\">Video Mode</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:89
 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)."
+"If needed, change the screen resolution by pressing <keycap>F3</keycap>. "
+"Options are: 640x480, 800x600, 1024x768."
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/bootLive.xml:19
-msgid "In the bottom menu, are the Boot Options:"
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:93
+msgid "<keycap>F4</keycap> <emphasis role=\"bold\">Source</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:19
+#: en/bootLive.xml:94
 msgid ""
-"F1 - Help. Explain the options \"splash\", \"apm\", \"acpi\" and \"Ide\""
+"Normally, the installation is performed from the inserted installation "
+"medium. Here, you may select other sources, like FTP or NFS servers."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:20
-msgid "F2 - Language. Choose the display language of the screens."
+#: en/bootLive.xml:95
+msgid ""
+"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 ""
 
 #. 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:98
+msgid "<keycap>F5</keycap> <emphasis role=\"bold\">Driver</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:22
+#: en/bootLive.xml:99
 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 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 ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:104
+msgid "<keycap>F6</keycap> <emphasis role=\"bold\">Kernel Options</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:26
+#: en/bootLive.xml:106
+msgid ""
+"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
+msgid ""
+"<emphasis role=\"bold\">Default:</emphasis> splash quiet noiswmd resume "
+"audit=0"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/bootLive.xml:114
 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."
+"<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
+msgid ""
+"<emphasis role=\"bold\">No ACPI:</emphasis> (Advanced Configuration and "
+"Power Interface): Power management features are not used."
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/bootLive.xml:125
+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 ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:28
+#: en/bootLive.xml:131
 msgid ""
-"F6 - Kernel options. This is a way to specify options according to your "
-"hardware and the drivers to use."
+"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 ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:29
+#: en/bootLive.xml:139
 msgid "In UEFI mode"
 msgstr "En mode UEFI"
 
 #. 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 "La primera pantalla de l'arrencada en un sistema UEFI des del disc"
+#: en/bootLive.xml:146
+#, fuzzy
+msgid "First screen while booting in UEFI mode"
+msgstr "La primera pantalla de l'arrencada en mode BIOS"
 
 #. 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 ""
 
-#. type: Content of: <section><section><para>
-#: en/bootLive.xml:30
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:153
 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 ""
 
-#. 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/chooseDesktop.xml:3
+#: en/chooseDesktop.xml:16
 msgid "Desktop Selection"
 msgstr "Selecció de l'escriptori"
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:8
-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 ""
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:11
+#: en/chooseDesktop.xml:26
 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 ""
 
 #. 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 align=\"center\" fileref=\"live-bestTime.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"bestTime-im1\"/> </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
 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 ""
 
 #. type: Content of: <section><info><title>
@@ -663,15 +811,16 @@ msgid "Package Group Selection"
 msgstr "Selecció de grups de paquets"
 
 #. 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
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
 "\" align=\"center\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:14
+#: en/choosePackageGroups.xml:16
 msgid ""
 "Packages are arranged into common groups, to make choosing what you need on "
 "your system a lot easier. The groups are fairly self explanatory, however "
@@ -680,29 +829,29 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:21
+#: en/choosePackageGroups.xml:23
 msgid "<emphasis role=\"bold\">Workstation</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:25
+#: en/choosePackageGroups.xml:27
 msgid "<emphasis role=\"bold\">Server</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:29
+#: en/choosePackageGroups.xml:31
 msgid "<emphasis role=\"bold\">Graphical Environment</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:33
+#: en/choosePackageGroups.xml:35
 msgid ""
 "<emphasis role=\"bold\">Individual Package Selection</emphasis>: you can use "
 "this option to manually add or remove packages"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:38
+#: en/choosePackageGroups.xml:40
 msgid ""
 "See <xref linkend=\"minimal-install\"/> for instructions on how to do a "
 "minimal install (without or with X &amp; IceWM)."
@@ -714,27 +863,30 @@ msgid "Choose Individual Packages"
 msgstr "Tria de paquets individuals"
 
 #. 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
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackagesTree.png"
 "\" align=\"center\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:14
+#: en/choosePackagesTree.xml:18
 msgid ""
 "Here you can add or remove any extra packages to customize your installation."
 msgstr ""
 
 #. 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 ""
 "Després de la tria podeu fer clic a la <guibutton>icona del disquet</"
 "guibutton> al capdavall de la pàgina per a desar la selecció de paquets "
@@ -749,8 +901,10 @@ msgstr "Configuració dels serveis"
 
 #.  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
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-configureServices.png"
 "\" xml:id=\"configureServices-im1\" align=\"center\" revision=\"1\"/> </"
@@ -758,23 +912,20 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:16
+#: en/configureServices.xml:20
 msgid ""
 "Here you can choose which services should start when you boot your system."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/configureServices.xml:19
-msgid "Click on a triangle to expand a group to all the relevant services."
-msgstr ""
-
-#. type: Content of: <section><para>
-#: en/configureServices.xml:22
-msgid "The settings DrakX chose are usually good."
+#. 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: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."
@@ -782,7 +933,7 @@ msgstr ""
 "Si realceu un servei, se us en mostrarà informació a la casella inferior."
 
 #. 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 "Canvieu coses només si teniu molt clar què esteu fent."
 
@@ -793,32 +944,39 @@ msgstr "Configuració de la zona horària"
 
 #.  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 format=\"PNG\" fileref="
+"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
+"\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata format="
+"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
 
-#. type: Content of: <section><para>
-#: en/configureTimezoneUTC.xml:20
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureTimezoneUTC.xml:26
 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 ""
 
 #. type: Content of: <section><para>
-#: en/configureTimezoneUTC.xml:24
+#: en/configureTimezoneUTC.xml:32
 msgid ""
 "In the next screen you can choose to set your hardware clock to local time "
 "or to GMT, also known as UTC."
 msgstr ""
 
 #. 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."
@@ -827,20 +985,23 @@ msgstr ""
 "estan configurats a l'hora local, o bé tots a l'hora UTC/GMT."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:13
+#: en/configureX_card_list.xml:24
 msgid "Choose an X Server (Configure your Graphic Card)"
 msgstr "Tria del servidor de les X (configura la targeta gràfica)"
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_card_list.xml: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 align=\"center\" fileref=\"live-bestTime.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"bestTime-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."
@@ -849,7 +1010,7 @@ msgstr ""
 "identifica correctament el dispositiu de vídeo."
 
 #. 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:"
@@ -857,141 +1018,173 @@ msgstr ""
 "Si l'instal·lador no ha detectat correctament la targeta gràfica i sabeu "
 "quina és, seleccioneu-la a l'arbre:"
 
-#. 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 "fabricant"
 
 #. 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 "llavors el nom de la targeta"
 
 #. 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 "i el tipus de targeta"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:41
+#: en/configureX_card_list.xml:53
 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 ""
 
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:47
+#. type: Content of: <section><caution><para>
+#: en/configureX_card_list.xml:61
 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 ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:51
+#: en/configureX_card_list.xml:65
 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."
-msgstr ""
-
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:56
-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."
+"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 ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:3
+#: en/configureX_chooser.xml:11
 msgid "Graphic Card and Monitor Configuration"
 msgstr "Configuració de targeta gràfica i monitor"
 
 #.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
+#. 2018/02/15 apb: Some text and typography.
+#. 2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.
+#. 2018/02/23 apb: Typo.
 #. 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 align=\"center\" fileref=\"live-bestTime.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"bestTime-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:15
+#: en/configureX_chooser.xml:30
 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 ""
 
 #. 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>Genèric</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>Targeta gràfica</guibutton></emphasis>: si cal, trieu "
-"la vostra targeta de la llista."
 
 #. 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>Proveïdor</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_chooser.xml:52
 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 ""
 
-#. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/configureX_chooser.xml:41
-msgid "Incorrect refresh rates may damage your monitor"
-msgstr "Freqüències de refresc incorrectes poden fer malbé el monitor"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_chooser.xml:60
+#, fuzzy
+msgid "<emphasis role=\"bold\">Resolution</emphasis>"
+msgstr "<emphasis>Personalitzat</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:47
-msgid ""
-"<emphasis><guibutton>Resolution</guibutton></emphasis>: The resolution and "
-"color depth of your monitor can be set here."
+#: en/configureX_chooser.xml:63
+msgid "The resolution and color depth of your monitor can be set here"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:52
+#: en/configureX_chooser.xml:68
+#, fuzzy
+msgid "<emphasis role=\"bold\">Test</emphasis>"
+msgstr "<emphasis>Personalitzat</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_chooser.xml:71
 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 ""
 
 #. 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>Personalitzat</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>Opcions</guibutton></emphasis>: aquí podeu triar "
 "activar o desactivar diverses opcions."
 
+#. 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 "Tria del monitor"
 
 #. 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."
@@ -1000,7 +1193,7 @@ msgstr ""
 "identificarà correctament el vostre."
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:19
+#: en/configureX_monitor.xml:30
 msgid ""
 "<emphasis role=\"bold\">Selecting a monitor with different characteristics "
 "could damage your monitor or video hardware. Please don't try something "
@@ -1009,22 +1202,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:26
+#: en/configureX_monitor.xml:38
+#, fuzzy
 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 align=\"center\" fileref=\"live-bestTime.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"bestTime-im1\"/> </imageobject>"
 
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:31
-msgid "<emphasis>Custom</emphasis>"
-msgstr "<emphasis>Personalitzat</emphasis>"
+#. type: Content of: <section><variablelist><varlistentry><term>
+#: en/configureX_monitor.xml:46
+msgid "Custom"
+msgstr ""
 
-#. 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."
@@ -1035,8 +1232,8 @@ msgstr ""
 "la freqüència de sincronisme horitzontal determina a quina freqüència es "
 "mostren les línies."
 
-#. 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 "
@@ -1048,27 +1245,23 @@ msgstr ""
 "monitor: podríeu fer-lo malbé. En cas de dubte, trieu una configuració "
 "conservadora i consulteu la documentació del monitor."
 
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:44
-msgid "<emphasis>Plug 'n Play</emphasis>"
-msgstr "<emphasis>Integració automàtica</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 ""
 "Aquesta és l'opció predeterminada i tracta d'establir el tipus de monitor a "
 "partir de la base de dades."
 
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:51
-msgid "<emphasis>Vendor</emphasis>"
-msgstr "<emphasis>Proveïdor</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:"
@@ -1076,127 +1269,144 @@ msgstr ""
 "Si l'instal·lador no ha detectat correctament el monitor i sabeu quin és, el "
 "podeu seleccionar de l'arbre:"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:61
-msgid "the monitor manufacturers name"
-msgstr "el nom dels fabricants del monitor"
+#. 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 "descripció del monitor"
+#. 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>Genèric</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
 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 ""
 
 #. 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 "Particions personalitzades del disc amb 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 format=\"PNG\" fileref="
+"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
+"\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata format="
+"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
 
-#. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:22
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/diskdrake.xml:38
 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."
+"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 ""
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:29
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/diskdrake.xml:45
 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."
+"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 ""
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:34
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/diskdrake.xml:52
 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>."
+"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. "
+"<emphasis>Expert mode</emphasis> provides more options such as to label "
+"(name) a partition, or to choose a partition type."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:39
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/diskdrake.xml:60
 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."
+"Continue until you have adjusted everything to your satisfaction, then click "
+"<emphasis>Done</emphasis> when you're ready."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:43
+#. type: Content of: <section><warning><orderedlist><listitem><para>
+#: en/diskdrake.xml:69
 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."
+"Take care with the <emphasis>Clear all</emphasis> option, use it only if you "
+"are sure you want to wipe all partitions on the selected storage device."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:49
-msgid "Continue until you have adjusted everything to your satisfaction."
+#. type: Content of: <section><warning><orderedlist><listitem><para>
+#: en/diskdrake.xml:75
+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 ""
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:52
-msgid "Click <guibutton>Done</guibutton> when you're ready."
-msgstr "Feu clic a <guibutton>Fet</guibutton> quan estigueu a punt."
-
-#. type: Content of: <section><note><para>
-#: en/diskdrake.xml:56
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/diskdrake.xml:87
 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 ""
+
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/diskdrake.xml:93
+msgid ""
+"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
+"partition is present and of the correct type. See Figure 2 below."
 msgstr ""
 
-#. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:61
+#. type: Content of: <section><figure><title>
+#: en/diskdrake.xml:101
+#, fuzzy
+msgid "EFI System Partition"
+msgstr "Utilitza les particions existents"
+
+#. 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 format=\"PNG\" fileref="
+"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
+"\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata format="
+"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
 
-#. type: Content of: <section><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
-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 ""
 
-#. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:76
+#. type: Content of: <section><mediaobject>
+#: en/diskdrake.xml:118 en/doPartitionDisks.xml:200
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1205,41 +1415,52 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:9
-msgid "Partitioning"
+#: en/doPartitionDisks.xml:25
+#, fuzzy
+msgid "Suggested Partitioning"
 msgstr "Particions"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:12
+#: en/doPartitionDisks.xml:28
 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 ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:16
+#: en/doPartitionDisks.xml:32
 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 ""
 
 #. 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 format=\"PNG\" fileref="
+"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
+"\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata format="
+"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:32
-msgid "Use Existing Partitions"
-msgstr "Utilitza les particions existents"
+#. type: Content of: <section><itemizedlist><title>
+#: en/doPartitionDisks.xml:47
+#, fuzzy
+msgid "Main Options"
+msgstr "Opcions"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:35
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:50
+msgid "<emphasis role=\"bold\">Use Existing Partitions</emphasis>"
+msgstr ""
+
+#. 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."
@@ -1247,13 +1468,14 @@ msgstr ""
 "Si aquesta opció està disponible, vol dir que s'han trobat particions "
 "compatibles amb Linux i es podrien utilitzar per a la instal·lació."
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:41
-msgid "Use Free Space"
-msgstr "Utilitza l'espai lliure"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:59
+#, fuzzy
+msgid "<emphasis role=\"bold\">Use Free Space</emphasis>"
+msgstr "<emphasis>Genèric</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."
@@ -1261,33 +1483,60 @@ msgstr ""
 "Si teniu espai lliure al disc dur, aquesta opció l'aprofitarà per a la "
 "instal·lació de Mageia."
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:49
-msgid "Use Free Space on a Windows Partition"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:68
+#, fuzzy
+msgid ""
+"<emphasis role=\"bold\">Use Free Space on a Windows Partition</emphasis>"
 msgstr "Utilitza l'espai lliure en una partició Windows"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:71
+#, fuzzy
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
-"offer to use it."
-msgstr ""
-"Si teniu espai lliure en una partició Windows existent, pot ser que "
-"l'instal·lador us proposi utilitzar-la."
-
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:56
-msgid ""
-"This can be a useful way of making room for your new Mageia installation, "
-"but is a risky operation so you should make sure you have backed up all "
-"important files!"
+"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 ""
 "Aquesta és una bona manera de fer lloc per a la nova instal·lació de Mageia, "
 "però és una operació arriscada i per tant hauríeu d'estar segur d'haver fet "
 "una còpia de seguretat dels fitxers importants."
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:61
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:77
+msgid ""
+"With this option, the installer displays the remaining Windows partition in "
+"light blue and the proposed Mageia partition in dark blue with their "
+"intended sizes just underneath. You have the option to modify these sizes by "
+"clicking and dragging the gap between both partitions.  See the following "
+"screenshot:"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:85
+#, fuzzy
+msgid "<emphasis role=\"bold\">Erase and use Entire Disk</emphasis>"
+msgstr "<emphasis>Genèric</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:88
+msgid "This option will allocate the entire drive for Mageia"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><warning><para>
+#: en/doPartitionDisks.xml:92
+#, fuzzy
+msgid ""
+"This will erase ALL data on the selected hard drive. Take care! If you "
+"intend to use part of the disk for something else, or you already have data "
+"on the drive that you are not prepared to lose, then do not use this option."
+msgstr ""
+"Si teniu pensat fer servir part del disc per a alguna altra cosa, o bé ja "
+"teniu dades al disc que no voleu perdre, llavors no feu servir aquesta opció."
+
+#. 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 "
@@ -1304,58 +1553,14 @@ msgstr ""
 "servir. És altament recomanable fer una còpia de seguretat dels fitxers "
 "personals."
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:69
-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."
-msgstr ""
-
-#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:76
-msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/> </imageobject>"
-msgstr ""
-
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:87
-msgid "Erase and use Entire Disk."
-msgstr "Esborra i utilitza el disc sencer."
-
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:90
-msgid "This option will allocate the entire drive for Mageia."
-msgstr ""
-
-#. 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 ""
-"Nota! Això esborrarà TOTES les dades del disc dur seleccionat. Vigileu!"
-
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:96
-msgid ""
-"If you intend to use part of the disk for something else, or you already "
-"have data on the drive that you are not prepared to lose, then do not use "
-"this option."
-msgstr ""
-"Si teniu pensat fer servir part del disc per a alguna altra cosa, o bé ja "
-"teniu dades al disc que no voleu perdre, llavors no feu servir aquesta opció."
-
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:103
-msgid "Custom disk partitioning"
-msgstr "Particions personalitzades de disc"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:110
+#, fuzzy
+msgid "<emphasis role=\"bold\">Custom Disk Partitioning</emphasis>"
+msgstr "<emphasis>Personalitzat</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)."
@@ -1363,159 +1568,187 @@ msgstr ""
 "Aquesta opció us dóna control total sobre la localització de la instal·lació "
 "al(s) disc(s) dur(s)."
 
-#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:112
-msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
+#. type: Content of: <section><mediaobject>
+#: en/doPartitionDisks.xml:120
+#, fuzzy
+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 format=\"PNG\" fileref="
+"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
+"\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata format="
+"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><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
 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 ""
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:125
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:141
 msgid ""
 "If the total available space is greater than 50 GB, then three partitions "
 "are created"
 msgstr ""
 
-#. 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
 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 ""
 
-#. 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
+msgid "1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB"
 msgstr ""
 
-#. 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
 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 ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:144
+#: 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 ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:150
+#: en/doPartitionDisks.xml:182
 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 ""
 
 #. 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
-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 ""
 
-#. 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>"
-msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4.png"
+"\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 
-#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:182
+#. type: Content of: <section><important><para>
+#: en/doPartitionDisks.xml:216
 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 ""
 
-#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:189
-msgid "<emphasis role=\"bold\">Align to</emphasis> = MiB"
+#. type: Content of: <section><important><para>
+#: en/doPartitionDisks.xml:221
+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 ""
 
-#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:191
-msgid "<emphasis role=\"bold\">Free space preceding (MiB)</emphasis> = 2"
-msgstr ""
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:228
+#, fuzzy
+msgid "<emphasis>Align to</emphasis> = MiB"
+msgstr "<emphasis>Personalitzat</emphasis>"
 
-#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:194
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:232
+#, fuzzy
+msgid "<emphasis>Free space preceding (MiB)</emphasis> = 2"
+msgstr "<emphasis>Genèric</emphasis>"
+
+#. type: Content of: <section><important><para>
+#: en/doPartitionDisks.xml:236
 msgid ""
 "Also make sure all partitions are created using an even number of megabytes."
 msgstr ""
 
 #. 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 "Instal·lació des d'un mitjà AUTÒNOM"
 
 #. 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"
+#: 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 "Documentació oficial de Mageia"
 
 #. type: Content of: <book><info><cover><mediaobject>
-#: en/DrakLive-cover.xml:17
-msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
-msgstr ""
+#: en/DrakLive-cover.xml:33 en/DrakX-cover.xml:30
+msgid ""
 "<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+msgstr ""
 
 #. 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/"
@@ -1526,8 +1759,8 @@ msgstr ""
 "licenses/by-sa/3.0/\">http://creativecommons.org/licenses/by-sa/3.0/</link>."
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml: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."
@@ -1538,8 +1771,7 @@ msgstr ""
 "www.neodoc.biz\">NeoDoc</link>."
 
 #. 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</"
@@ -1549,15 +1781,15 @@ msgstr ""
 "millorar-lo, contacteu l'<link ns6:href=\"https://wiki.mageia.org/en/"
 "Documentation_team\">equip de documentació</link>."
 
-#. 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 "
@@ -1567,65 +1799,73 @@ msgstr ""
 "manual. Les imatges que veureu dependran del vostre maquinari i de les "
 "decisions que aneu prenent durant la instal·lació."
 
-#. 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 ""
+"L'han escrit voluntaris durant el seu temps lliure. Si voleu ajudar a "
+"millorar-lo, contacteu l'<link ns6:href=\"https://wiki.mageia.org/en/"
+"Documentation_team\">equip de documentació</link>."
+
 #. 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 "Instal·lació amb DrakX"
 
 #. type: Content of: <book><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:9
+#: en/DrakX-cover.xml:20
 msgid "February 2014"
 msgstr "Febrer del 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
-msgid ""
-"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
-msgstr ""
-
 #. type: Content of: <section><info><title>
 #: en/exitInstall.xml:3
 msgid "Congratulations"
 msgstr "Enhorabona"
 
 #.  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
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 msgstr ""
 
 #. 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 ""
 "Heu acabat d'instal·lar i configurar <application>Mageia</application> i ara "
 "és segur treure el mitjà d'instal·lació i arrencar de nou l'ordinador."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:18
+#: en/exitInstall.xml:22
 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 ""
 
 #. 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."
@@ -1634,25 +1874,26 @@ msgstr ""
 "seleccionarà i iniciarà la vostra instal·lació de Mageia."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:26
+#: en/exitInstall.xml:30
 msgid "Enjoy!"
 msgstr "Gaudiu!"
 
 #. 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 ""
 "Visiteu www.mageia.org si teniu algun dubte o voleu col·laborar amb Mageia."
 
 #. type: Content of: <section><info><title>
-#: en/firewall.xml:3
+#: en/firewall.xml:7
 msgid "Firewall"
 msgstr "Tallafoc"
 
 #. 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 "
@@ -1661,46 +1902,46 @@ 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
 msgid "<emphasis role=\"bold\">Advanced</emphasis>"
 msgstr ""
 
 #. 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
 msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
 msgstr ""
 
 #. 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 "
@@ -1708,28 +1949,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 "Formatació"
 
@@ -1737,63 +1978,73 @@ msgstr "Formatació"
 #.  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\" fileref="
+"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
+"\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata format="
+"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:24
+#: en/formatPartitions.xml:35
 msgid ""
 "Here you can choose which partition(s) you wish to format. Any data on "
 "partitions <emphasis>not</emphasis> marked for formatting will be preserved."
 msgstr ""
 
 #. 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 ""
 "Normalment cal formatar com a mínim les particions seleccionades per DrakX."
 
 #. 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 ""
 "Feu clic a <guibutton>Avançat</guibutton> per a triar les particions on "
 "voleu comprovar si hi ha <emphasis>blocs defectuosos</emphasis>."
 
 #. type: Content of: <section><tip><para>
-#: en/formatPartitions.xml:36
+#: en/formatPartitions.xml:47
 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 ""
 
 #. 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 ""
 "Quan estigueu segur de la selecció feu clic a <guibutton>Següent</guibutton> "
 "per continuar."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:10
+#: en/installer.xml:14
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, l'instal·lador de Mageia"
 
 #. 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 "
@@ -1803,264 +2054,203 @@ msgstr ""
 "l'instal·lador de Mageia està dissenyat per a ajudar-vos a fer la "
 "instal·lació o actualització tan fàcil com sigui possible."
 
-#. 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 ""
-"La pantalla del menú inicial té diverses opcions, però l'opció "
-"predeterminada engegarà l'instal·lador, que normalment és tot el que cal."
-
 #. type: Content of: <section><section><title>
-#: en/installer.xml:22
-msgid "Installation Welcome Screen"
-msgstr "Pantalla de benvinguda de la instal·lació"
-
-#. type: Content of: <section><section><section><title>
-#: en/installer.xml:25
-msgid "Using a Mageia DVD"
-msgstr "Ús d'un DVD de Mageia"
+#: en/installer.xml:20
+msgid "The installation steps"
+msgstr "Passos de la instal·lació"
 
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:27
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/installer.xml:23
 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 ""
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:32
-msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
+"The install process is divided into a number of steps - the status of which "
+"is indicated in a panel to the left of the screen."
 msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:37
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/installer.xml:28
 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."
-msgstr ""
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:45
-msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
+"Each step has one or more screens, which may also have <emphasis>Advanced</"
+"emphasis> sections with extra, less commonly required options."
 msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:50
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/installer.xml:33
 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 ""
 
-#. 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
 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 ""
 
-#. 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
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+#. type: Content of: <section><section><title>
+#: en/installer.xml:48
+msgid "Installation Welcome Screen"
+msgstr "Pantalla de benvinguda de la instal·lació"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:72
+#. type: Content of: <section><section><para>
+#: en/installer.xml:49
 msgid ""
-"Use the arrow keys to select the language then press <emphasis role=\"bold"
-"\">Enter</emphasis>."
+"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 ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:77
+#. type: Content of: <section><section><para>
+#: en/installer.xml:52
+#, fuzzy
 msgid ""
-"If needed, change the screen resolution by pressing <emphasis role=\"bold"
-"\">F3</emphasis> (Legacy mode only)."
+"The welcome menu screen has various options, however the default option will "
+"start the installer, and is normally all that you will need."
 msgstr ""
+"La pantalla del menú inicial té diverses opcions, però l'opció "
+"predeterminada engegarà l'instal·lador, que normalment és tot el que cal."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:81
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:56
+msgid "Legacy (BIOS) Systems"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:88
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:58
+#, fuzzy
 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)."
+"<imageobject> <imagedata fileref=\"dx-welcome.png\" align=\"center\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/installer.xml:96
-msgid "Default: It doesn't alter anything in the default options."
+#. type: Content of: <section><section><section><itemizedlist><title>
+#: en/installer.xml:63
+msgid "Menu"
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/installer.xml:101
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:66
 msgid ""
-"Safe Settings: Priority is given to the safer options at the price of a "
-"performance detriment."
+"Install Mageia to a hard disk. This is the default option, and will "
+"automatically start after a short while unless another option is selected."
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/installer.xml:106
-msgid ""
-"No ACPI: (Advanced Configuration and Power Interface): Power management "
-"features are not used."
-msgstr ""
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:69
+#, fuzzy
+msgid "<emphasis role=\"bold\">Rescue System</emphasis>"
+msgstr "<emphasis>Personalitzat</emphasis>"
 
-#. 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:70
 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."
+"This option allows you to either re-install the bootloader for an existing "
+"Mageia installation or you can use it to restore a Windows bootloader."
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:120
-msgid ""
-"When you select one of these entries, it modifies the default options "
-"displayed in the <guilabel>Boot Options</guilabel> line."
-msgstr ""
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:75
+#, fuzzy
+msgid "<emphasis role=\"bold\">Memory Test</emphasis>"
+msgstr "<emphasis>Proveïdor</emphasis>"
 
-#. 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:76
 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."
+"Test the installed RAM by performing multiple read and write operations. "
+"Reboot to end the test."
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:132
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:80
+#, fuzzy
+msgid "<emphasis role=\"bold\">F2: Language</emphasis>"
+msgstr "<emphasis>Genèric</emphasis>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:139
-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."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:81
+msgid "Press F2 for alternative languages."
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:146
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:86
+msgid "UEFI Systems"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:151
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:87
 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."
+"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 ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:158
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:92
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:164
-msgid ""
-"The help is translated in the chosen language with <emphasis role=\"bold"
-"\">F2</emphasis>."
-msgstr ""
-
-#. 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>"
-msgstr ""
-
-#. type: Content of: <section><section><title>
-#: en/installer.xml:177
-msgid "The installation steps"
-msgstr "Passos de la instal·lació"
-
-#. type: Content of: <section><section><para>
-#: en/installer.xml:179
-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 ""
 
-#. type: Content of: <section><section><para>
-#: en/installer.xml:182
-msgid ""
-"Each step has one or more screens which may also have <guibutton>Advanced</"
-"guibutton> sections with extra, less commonly required, options."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:99
+msgid "<emphasis role=\"bold\">Install:</emphasis> Start the Install process"
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/installer.xml:186
+#. 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 ""
 
-#. type: Content of: <section><section><note><para>
-#: en/installer.xml:190
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:109
 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 ""
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:203
+#: en/installer.xml:115
 msgid "Installation Problems and Possible Solutions"
 msgstr "Problemes en la instal·lació i possibles solucions"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:206
+#: en/installer.xml:117
 msgid "No Graphical Interface"
 msgstr "Sense interfície gràfica"
 
 #. 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 ""
 "Després de la pantalla inicial no arriba a la pàgina de selecció de "
 "l'idioma. Això pot passar amb algunes targetes gràfiques de sistemes antics. "
@@ -2068,30 +2258,30 @@ msgstr ""
 "consola."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:217
+#: en/installer.xml:126
 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 ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:230
+#: en/installer.xml:138
 msgid "The Install Freezes"
 msgstr "La instal·lació es penja"
 
 #. 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 ""
 "Si el sistema sembla que es congela durant la instal·lació, pot ser a causa "
 "d'un problema en la detecció del maquinari. En aquest cas, podeu saltar la "
@@ -2100,134 +2290,148 @@ msgstr ""
 "d'altres."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:240
+#: en/installer.xml:146
 msgid "RAM problem"
 msgstr "Problema en la RAM"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:242
+#: en/installer.xml:147
 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 ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:249
+#: en/installer.xml:154
 msgid "Dynamic partitions"
 msgstr "Particions dinàmiques"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:251
+#: en/installer.xml:155
 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/installUpdates.xml:3
+#: en/installUpdates.xml:16
 msgid "Updates"
 msgstr "Actualitzacions"
 
-#.  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 ""
+"<imageobject> <imagedata align=\"center\" fileref=\"live-bestTime.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"bestTime-im1\"/> </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 ""
 "Des del llançament d'aquesta versió de <application>Mageia</application> "
 "s'han actualitzat o millorat alguns paquets."
 
-#. type: Content of: <section><para>
-#: en/installUpdates.xml:24
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installUpdates.xml:30
 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 "
-"aren't connected to the Internet"
+"Select <emphasis>Yes</emphasis> if you wish to download and install them"
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/installUpdates.xml:29
-msgid "Press <guibutton>Next</guibutton> to continue"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installUpdates.xml:35
+msgid ""
+"Select <emphasis>No</emphasis> if you don't want to do this now, or if you "
+"aren't connected to the Internet"
 msgstr ""
 
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installUpdates.xml:40
+#, fuzzy
+msgid "Press <emphasis>Next</emphasis> to continue"
+msgstr "<emphasis>Personalitzat</emphasis>"
+
 #. type: Content of: <section><info><title>
-#: en/login.xml:1
-msgid "Login screen"
+#: en/login.xml:4
+msgid "Login Screen"
 msgstr ""
 
 #. 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
+msgid "SDDM login screen"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/login.xml:1
-msgid "Finally, you will come to the login screen."
+#: en/login.xml:14
+msgid "Finally, you will come to the desktop login screen."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/login.xml:1
+#: en/login.xml:15
 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 ""
 
 #. 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 ""
 "Els podeu trobar <link linkend=\"https://wiki.mageia.org/en/Category:"
 "Documentation\">aquí</link>."
 
 #. type: Content of: <section><info><title>
-#: en/media_selection.xml:3
-msgid "Media Selection (Nonfree)"
-msgstr "Selecció del mitjà (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
+#: en/media_selection.xml:24
+#, fuzzy
 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 align=\"center\" fileref=\"live-bestTime.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"bestTime-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 "
@@ -2240,7 +2444,7 @@ msgstr ""
 "seleccionar durant els següents passos."
 
 #. 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."
@@ -2249,12 +2453,13 @@ msgstr ""
 "base de la instal·lació."
 
 #. 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 ""
 "El dipòsit <emphasis>Nonfree</emphasis> inclou paquets gratuïts, i per tant "
@@ -2264,7 +2469,7 @@ msgstr ""
 "Fi, etc."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:40
+#: en/media_selection.xml:50
 msgid ""
 "The <emphasis>Tainted</emphasis> repository includes packages released under "
 "a free license. The main criteria for placing packages in this repository is "
@@ -2279,56 +2484,57 @@ msgid "Minimal Install"
 msgstr "Instal·lació mínima"
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:11
+#: en/minimal-install.xml:17
 msgid ""
-"You can choose a Minimal Installation by de-selecting everything in the "
-"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"/>."
+"Minimal Installation is intended for those with specific uses in mind for "
+"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 ""
 
-#. type: Content of: <section><para>
-#: en/minimal-install.xml:14
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/minimal-install.xml:24
 msgid ""
-"If desired, you can additionally tick the <emphasis role=\"bold\">Individual "
-"package selection</emphasis> option in the same screen."
+"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 ""
 
-#. type: Content of: <section><para>
-#: en/minimal-install.xml:17
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/minimal-install.xml:28
 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"
-"\"/>."
+"If desired, you can additionally tick the <emphasis>Individual package "
+"selection</emphasis> option in the same screen."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/minimal-install.xml:22
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/minimal-install.xml:33
 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."
+"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 ""
 
-#. 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
 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 ""
 
 #. type: Content of: <section><mediaobject>
-#: en/minimal-install.xml:35
+#: en/minimal-install.xml:48
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"minimal-install-im1\" align="
 "\"center\" fileref=\"dx2-minimal-install.png\" revision=\"1\"/> </"
@@ -2337,171 +2543,182 @@ msgstr ""
 
 #. type: Content of: <section><info><title>
 #: en/misc-params.xml:3
-msgid "Summary of miscellaneous parameters"
-msgstr "Resum dels paràmetres diversos"
+#, fuzzy
+msgid "Configuration Summary"
+msgstr "Configuració del so"
 
 #.  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=\"dx-welcome6opt.png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/misc-params.xml:15
+#: en/misc-params.xml:24
 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 ""
 
 #. 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 "Paràmetres del sistema"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:45
-msgid "<guilabel>Timezone</guilabel>"
-msgstr "<guilabel>Zona horària</guilabel>"
+#: en/misc-params.xml:54
+#, fuzzy
+msgid "<emphasis role=\"bold\">Timezone</emphasis>"
+msgstr "<emphasis>Genèric</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:47
+#: en/misc-params.xml:56
 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 ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:53
-msgid "<guilabel>Country / Region</guilabel>"
-msgstr "<guilabel>País / Regió</guilabel>"
+#: en/misc-params.xml:62
+#, fuzzy
+msgid "<emphasis role=\"bold\">Country / Region</emphasis>"
+msgstr "<emphasis>Personalitzat</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:56
+#: en/misc-params.xml:64
 msgid ""
 "If the selected country is wrong, it is very important that you correct the "
 "setting.  See <xref linkend=\"selectCountry\"/>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:62
-msgid "<guilabel>Bootloader</guilabel>"
-msgstr "<guilabel>Gestor d'arrencada</guilabel>"
+#: en/misc-params.xml:70
+#, fuzzy
+msgid "<emphasis role=\"bold\">Bootloader</emphasis>"
+msgstr "<emphasis>Proveïdor</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 ""
 "DraxK ha fet una bona tria per a la configuració del gestor d'arrencada."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:67
-msgid "Do not change anything, unless you know how to configure GRUB2"
-msgstr ""
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:70
-msgid "For more information, see <xref linkend=\"setupBootloader\"/>"
+#: en/misc-params.xml:75
+#, fuzzy
+msgid ""
+"Do not change anything, unless you know how to configure GRUB2. For more "
+"information, see <xref linkend=\"setupBootloader\"/>"
 msgstr ""
 "Per obtenir més informació, consulteu <xref linkend=\"setupBootloader\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:75
-msgid "<guilabel>User management</guilabel>"
-msgstr "<guilabel>Gestió d'usuaris</guilabel>"
+#: en/misc-params.xml:83
+#, fuzzy
+msgid "<emphasis role=\"bold\">User management</emphasis>"
+msgstr "<emphasis>Genèric</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 ""
 "Aquí podeu afegir usuaris suplementaris. Cadascun tindrà el seu propi "
 "directori <literal>/home</literal>."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:84
-msgid "<guilabel>Services</guilabel>:"
-msgstr "<guilabel>Serveis</guilabel>:"
+#: en/misc-params.xml:91
+#, fuzzy
+msgid "<emphasis role=\"bold\">Services</emphasis>"
+msgstr "<emphasis>Genèric</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:86
+#: en/misc-params.xml:93
 msgid ""
 "System services refer to those small programs which run in the background "
 "(daemons).  This tool allows you to enable or disable certain processes."
 msgstr ""
 
 #. 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 ""
 "Penseu-vos-ho bé abans de canviar res aquí - una errada podria fer que "
 "l'ordinador no funcionés correctament."
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:94
-msgid "For more information, see <xref linkend=\"configureServices\"/>"
-msgstr ""
-"Per obtenir més informació, consulteu <xref linkend=\"configureServices\"/>"
-
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:101
+#: en/misc-params.xml:106
 msgid "Hardware parameters"
 msgstr "Paràmetres del maquinari"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:106
-msgid "<guilabel>Keyboard</guilabel>:"
-msgstr "<guilabel>Teclat</guilabel>:"
+#: en/misc-params.xml:111
+#, fuzzy
+msgid "<emphasis role=\"bold\">Keyboard</emphasis>"
+msgstr "<emphasis>Proveïdor</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:108
+#: en/misc-params.xml:113
 msgid ""
 "Configure your keyboard layout according to your location, language and type "
 "of keyboard."
 msgstr ""
 
 #. 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>Ratolí</guilabel>:"
+#: en/misc-params.xml:124
+#, fuzzy
+msgid "<emphasis role=\"bold\">Mouse</emphasis>"
+msgstr "<emphasis>Personalitzat</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."
@@ -2510,78 +2727,86 @@ msgstr ""
 "ratolins de bola, etc."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:126
-msgid "<guilabel>Sound card</guilabel>:"
-msgstr "<guilabel>Targeta de so</guilabel>:"
+#: en/misc-params.xml:131
+#, fuzzy
+msgid "<emphasis role=\"bold\">Sound card</emphasis>"
+msgstr "<emphasis>Proveïdor</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:129
+#: 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 ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:137
-msgid "<guilabel>Graphical interface</guilabel>:"
-msgstr "<guilabel>Interfície gràfica</guilabel>:"
+#: en/misc-params.xml:144
+#, fuzzy
+msgid "<emphasis role=\"bold\">Graphical interface</emphasis>"
+msgstr "<emphasis>Genèric</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 ""
 "Aquesta secció us permet configurar la targeta gràfica i les pantalles."
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:143
-msgid "For more information, see <xref linkend=\"configureX_chooser\"/>."
-msgstr ""
-"Per obtenir més informació, consulteu <xref linkend=\"configureX_chooser\"/>."
-
 #. type: Content of: <section><section><mediaobject>
-#: en/misc-params.xml:149
+#: en/misc-params.xml:155
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
 "\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:157
+#: en/misc-params.xml:163
 msgid "Network and Internet parameters"
 msgstr "Paràmetres de xarxa i Internet"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:163
-msgid "<guilabel>Network</guilabel>:"
-msgstr "<guilabel>Xarxa</guilabel>:"
+#: en/misc-params.xml:169
+#, fuzzy
+msgid "<emphasis role=\"bold\">Network</emphasis>"
+msgstr "<emphasis>Proveïdor</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:165
+#: en/misc-params.xml:171
 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 ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:172
+#: en/misc-params.xml:178
 msgid ""
 "When you add a network card, do not forget to set your firewall to monitor "
 "that interface as well."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:179
-msgid "<guilabel>Proxies</guilabel>:"
-msgstr "<guilabel>Servidors intermediaris</guilabel>:"
+#: en/misc-params.xml:185
+#, fuzzy
+msgid "<emphasis role=\"bold\">Proxies</emphasis>"
+msgstr "<emphasis>Proveïdor</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 ""
 "Un servidor intermediari actua entre l'ordinador i internet. Aquesta secció "
@@ -2589,63 +2814,72 @@ msgstr ""
 "intermediari."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:186
+#: en/misc-params.xml:192
 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 ""
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:195
+#: en/misc-params.xml:201
 msgid "Security"
 msgstr "Seguretat"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:200
-msgid "<guilabel>Security Level</guilabel>:"
-msgstr "<guilabel>Nivell de seguretat</guilabel>:"
+#: en/misc-params.xml:206
+#, fuzzy
+msgid "<emphasis role=\"bold\">Security Level</emphasis>"
+msgstr "<emphasis>Genèric</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 ""
 "Aquí podeu establir el nivell de seguretat de l'ordinador. La majoria de "
 "vegades la configuració predeterminada (Estàndard) és adequada per a un ús "
 "general."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:207
-msgid "Check the option which best suits your usage."
-msgstr "Trieu l'opció que millor s'adapta a la vostra utilització."
+#: en/misc-params.xml:215
+#, fuzzy
+msgid "<emphasis role=\"bold\">Firewall</emphasis>"
+msgstr "<emphasis>Proveïdor</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:212
-msgid "<guilabel>Firewall</guilabel>:"
-msgstr "<guilabel>Tallafoc</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 ""
-"Un tallafoc actua de barrera entre les vostres dades importants i els "
-"espavilats que ronden per internet amb intenció de comprometre-les o robar-"
-"les."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:218
-msgid ""
-"Select the services that you wish to have access to your system. Your "
-"selections will depend on what you use your computer for. For more "
-"information, see <xref linkend=\"firewall\"/>."
+#: en/misc-params.xml:229
+#, fuzzy
+msgid "For more information, see <xref linkend=\"firewall\"/>."
 msgstr ""
+"Per obtenir més informació, consulteu <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 ""
 "Tingueu present que el fet de permetre-ho tot (sense tallafoc) pot ser molt "
 "arriscat."
@@ -2656,29 +2890,43 @@ msgid "Reboot"
 msgstr "Reinicia"
 
 #. type: Content of: <section><para>
-#: en/reboot.xml:6
+#: en/reboot.xml:7
 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 ""
+
+#. 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
-msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
+#: en/reboot.xml:12
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot2.png\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject><imagedata fileref=\"../live-bootCSM.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
 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 ""
 
 #. type: Content of: <section><mediaobject>
-#: en/reboot.xml:17
+#: en/reboot.xml:19
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
 "reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
@@ -2705,41 +2953,50 @@ msgstr ""
 "<application>Mageia</application>."
 
 #. type: Content of: <section><info><title>
-#: en/securityLevel.xml:3
+#: en/securityLevel.xml:10
 msgid "Security Level"
 msgstr "Nivell de seguretat"
 
 #.  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 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
 msgid ""
 "<emphasis role=\"bold\">Please choose the desired security level</emphasis>"
 msgstr ""
 
 #. 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
 msgid "<emphasis role=\"bold\">Security Administrator</emphasis>"
 msgstr ""
 
 #. 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 "
@@ -2747,14 +3004,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 "
@@ -2762,521 +3019,583 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:41
+#: en/securityLevel.xml:53
 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:6
+#: en/SelectAndUseISOs2.xml:15
 msgid "Select and use ISOs"
 msgstr "Selecció i utilització de les ISO"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:9
+#: en/SelectAndUseISOs2.xml:18
 msgid "Introduction"
 msgstr "Introducció"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:10
+#: en/SelectAndUseISOs2.xml:19
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
 "which image best suits your needs."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:12
-msgid "There are two families of media:"
+#: en/SelectAndUseISOs2.xml:21
+msgid "There are three types of installation media:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:15
+#: en/SelectAndUseISOs2.xml:24
 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 ""
 
 #. 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 ""
-"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"
+"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
+msgid ""
+"Live ISOs can only be used to create <quote>clean</quote> installations, "
+"they cannot be used to upgrade previously installed Mageia releases."
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:47
+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 ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:53
+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 ""
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:27
-msgid "Details are given in the next sections."
+#: en/SelectAndUseISOs2.xml:58
+msgid "More details are given in the next sections."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:30
+#: en/SelectAndUseISOs2.xml:61
 msgid "Media"
 msgstr "Mitjà"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:32
+#: en/SelectAndUseISOs2.xml:63
 msgid "Definition"
 msgstr "Definició"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:33
+#: en/SelectAndUseISOs2.xml:64
 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 ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:36
+#: en/SelectAndUseISOs2.xml:67
 msgid ""
 "You can find Mageia ISO's <link ns4:href=\"http://www.mageia.org/en/"
 "downloads/\">here</link>."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:39
+#: en/SelectAndUseISOs2.xml:70
 msgid "Classical installation media"
 msgstr "Mitjans d'instal·lació clàssics"
 
 #. 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 "Característiques comunes"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:44
-msgid "These ISOs use the Classical installer called drakx."
+#: en/SelectAndUseISOs2.xml:75
+msgid "These ISOs use the Classical installer called DrakX"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:47
+#: en/SelectAndUseISOs2.xml:78
 msgid ""
 "They are used for performing clean installs or to upgrade a previously "
-"installed version of Mageia."
+"installed version of Mageia"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:51 en/SelectAndUseISOs2.xml:83
-#: en/SelectAndUseISOs2.xml:158
-msgid "Different media for 32 and 64 bit architectures."
-msgstr ""
+#: en/SelectAndUseISOs2.xml:82 en/SelectAndUseISOs2.xml:118
+#: en/SelectAndUseISOs2.xml:174
+#, fuzzy
+msgid "Different media for 32 and 64-bit architectures"
+msgstr "Arquitectures de 32 ó 64 bits."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:54
+#: en/SelectAndUseISOs2.xml:85
 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 ""
 
 #. 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 ""
 "Cada DVD conté diversos entorns d'escriptori disponible i diversos idiomes."
 
 #. 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 ""
 "Durant la instal·lació se us oferirà la possibilitat d'afegir programari de "
 "propietat."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:69
+#: en/SelectAndUseISOs2.xml:102
 msgid "Live media"
 msgstr "Mitjà autònom"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:74
+#: en/SelectAndUseISOs2.xml:107
 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 ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:79
-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 ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:86
-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>"
+#: en/SelectAndUseISOs2.xml:114
+#, fuzzy
+msgid "Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)"
 msgstr ""
+"Cada DVD conté diversos entorns d'escriptori disponible i diversos idiomes."
 
 #. 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 "Contenen programari de propietat."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:96
+#: en/SelectAndUseISOs2.xml:126
 msgid "Live DVD Plasma"
 msgstr "DVD autònom de Plasma"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:99
-msgid "Plasma desktop environment only."
+#: en/SelectAndUseISOs2.xml:129
+#, fuzzy
+msgid "Plasma desktop environment only"
 msgstr "Només entorn d'escriptori Plasma."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:102 en/SelectAndUseISOs2.xml:116
-#: en/SelectAndUseISOs2.xml:130
-msgid "All available languages are present."
+#: en/SelectAndUseISOs2.xml:132 en/SelectAndUseISOs2.xml:146
+#: en/SelectAndUseISOs2.xml:160
+msgid "All available languages are present"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:105
-msgid "64 bit architecture only."
-msgstr "Només l'arquitectura de 64 bits."
+#: en/SelectAndUseISOs2.xml:135 en/SelectAndUseISOs2.xml:149
+#, fuzzy
+msgid "64-bit architecture only"
+msgstr "Només l'arquitectura de 64 bits"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:110
+#: en/SelectAndUseISOs2.xml:140
 msgid "Live DVD GNOME"
 msgstr "DVD autònom de 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 "Només entorn d'escriptori GNOME."
 
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:119
-msgid "64 bit architecture only"
-msgstr "Només l'arquitectura de 64 bits"
-
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:124
+#: en/SelectAndUseISOs2.xml:154
 msgid "Live DVD Xfce"
 msgstr "DVD autònom de Xfce"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:127
-msgid "Xfce desktop environment only."
+#: en/SelectAndUseISOs2.xml:157
+#, fuzzy
+msgid "Xfce desktop environment only"
 msgstr "Només entorn d'escriptori Xfce."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:133
-msgid "32 or 64 bit architectures."
+#: en/SelectAndUseISOs2.xml:163
+#, fuzzy
+msgid "32 or 64-bit architectures"
 msgstr "Arquitectures de 32 ó 64 bits."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:139
+#: en/SelectAndUseISOs2.xml:169
 msgid "Net install media"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:144
-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 ""
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:152
-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 ""
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:161
-msgid "First steps are English language only."
+#: en/SelectAndUseISOs2.xml:177
+msgid "First steps are English language only"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:166
+#: en/SelectAndUseISOs2.xml:182
 msgid "netinstall.iso"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:169
+#: en/SelectAndUseISOs2.xml:185
 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 ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:175
+#: en/SelectAndUseISOs2.xml:191
 msgid "netinstall-nonfree.iso"
 msgstr ""
 
 #. 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 ""
 "Conté programari de propietat (principalment controladors, còdecs...) per a "
 "qui el necessiti."
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:186
+#: en/SelectAndUseISOs2.xml:202
 msgid "Downloading and Checking Media"
 msgstr "Baixada i comprovació del mitjà"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:188
+#: en/SelectAndUseISOs2.xml:204
 msgid "Downloading"
 msgstr "Baixada"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:189
+#: en/SelectAndUseISOs2.xml:205
 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 ""
+
+#. 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: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:191
-msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
+#: en/SelectAndUseISOs2.xml:217
+#, fuzzy
+msgid ""
+"<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:195
-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:"
+#: en/SelectAndUseISOs2.xml:222
+msgid "In the meantime, a window to download the actual ISO will open:"
 msgstr ""
 
 #. 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
 msgid "Checking the integrity of the downloaded media"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:208
+#: en/SelectAndUseISOs2.xml:235
 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 ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:214
+#: en/SelectAndUseISOs2.xml:241
 msgid ""
 "To generate the checksum for your downloaded ISO, open a console, (no need "
 "to be root), and:"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:218
+#: en/SelectAndUseISOs2.xml:245
 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 ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:222
+#: en/SelectAndUseISOs2.xml:249
 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 ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:254
+msgid ""
+"To use the sha512sum, type: <command>sha512sum path/to/the/image/file.iso</"
+"command>"
 msgstr ""
 
 #. 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
 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 ""
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:237
+#: en/SelectAndUseISOs2.xml:270
 msgid "Burn or dump the ISO"
 msgstr "Enregistrament o bolcat de l'ISO"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:238
+#: en/SelectAndUseISOs2.xml:271
 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 ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:275
 msgid "Burning the ISO to a CD/DVD"
 msgstr "Gravació de l'ISO a un CD/DVD"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:243
+#: en/SelectAndUseISOs2.xml:276
 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 ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:248
+#: en/SelectAndUseISOs2.xml:282
 msgid "Dump the ISO to a USB stick"
 msgstr "Bolcat de l'ISO a un llapis de memòria USB"
 
 #. 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 ""
 "Totes les ISO de Mageia són híbrides, que vol dir que les podeu «bolcar» a "
 "un llapis de memòria USB i després fer-lo servir per a arrencar i instal·lar "
 "el sistema."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:252
+#: en/SelectAndUseISOs2.xml:286
 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 ""
 
-#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:256
+#. type: Content of: <section><section><section><note><para>
+#: en/SelectAndUseISOs2.xml:290
+msgid ""
+"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 ""
-"To recover the original capacity, you must redo partitioning and re-format "
-"the USB stick."
+"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 ""
-"Per recuperar la capacitat original, heu de refer les particions i tornar a "
-"formatar la memòria USB."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:259
+#: en/SelectAndUseISOs2.xml:299
 msgid "Using a graphical tool within Mageia"
 msgstr ""
 
 #. 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>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:263
+#: en/SelectAndUseISOs2.xml:303
 msgid "Using a graphical tool within Windows"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:304
 msgid "You could try:"
 msgstr "Podeu provar:"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:267
+#: en/SelectAndUseISOs2.xml:307
 msgid ""
 "<link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using the "
-"\"ISO image\" option;"
+"\"ISO image\" option"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:271
+#: en/SelectAndUseISOs2.xml:311
 msgid ""
 "<link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:277
-msgid "Using Command line within a GNU/Linux system"
+#: en/SelectAndUseISOs2.xml:317
+msgid "Using the Command line within a GNU/Linux system"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:279
+#: en/SelectAndUseISOs2.xml:319
 msgid ""
 "It is potentially *dangerous* to do this by hand. You risk overwriting "
 "potentially valuable existing data if you specify the wrong target device."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:325
 msgid "Open a console"
 msgstr "Obriu una consola"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:288
+#: en/SelectAndUseISOs2.xml:328
 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 ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:291
-msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
+#: en/SelectAndUseISOs2.xml:332
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"Root.png\"/> </"
+"imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:297
+#: en/SelectAndUseISOs2.xml:338
 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 ""
 
 #. 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 "Introduïu l'ordre <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>"
+#: en/SelectAndUseISOs2.xml:345
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"Fdisk.png\"/> </"
+"imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:310
+#: en/SelectAndUseISOs2.xml:351
 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 ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:312
+#: en/SelectAndUseISOs2.xml:354
 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 ""
 
 #. 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"
@@ -3300,45 +3619,49 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:317
+#: en/SelectAndUseISOs2.xml:360
 msgid "<placeholder type=\"screen\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:337
+#: en/SelectAndUseISOs2.xml:380
 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 ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:340
-msgid "Where X=your device name eg: /dev/sdd"
+#: en/SelectAndUseISOs2.xml:382
+msgid ""
+"Where <replaceable>X</replaceable>=your device name eg: <filename>/dev/sdd</"
+"filename>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:341
+#: en/SelectAndUseISOs2.xml:384
 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 ""
 
 #. 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 "Introduïu l'ordre: # <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 ""
 
@@ -3348,46 +3671,47 @@ msgid "Select your Country / Region"
 msgstr "Selecció de país / regió"
 
 #.  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
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
 "\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/selectCountry.xml:14
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectCountry.xml:20
 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 ""
 
-#. type: Content of: <section><para>
-#: en/selectCountry.xml:19
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectCountry.xml:27
 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 ""
 
 #. type: Content of: <section><note><para>
-#: en/selectCountry.xml:24
+#: en/selectCountry.xml:34
 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 ""
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:33
+#: en/selectCountry.xml:42
 msgid "Input method"
 msgstr "Mètode d'entrada"
 
 #. type: Content of: <section><section><para>
-#: en/selectCountry.xml:36
+#: en/selectCountry.xml:45
 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. "
@@ -3396,112 +3720,113 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/selectCountry.xml:45
+#: en/selectCountry.xml:54
 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/selectInstallClass.xml:14
+#: en/selectInstallClass.xml:29
 msgid "Install or Upgrade"
 msgstr "Instal·lació o actualització"
 
 #. 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=\"live-bestTime.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"bestTime-im1\"/> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:25
-msgid "Install"
-msgstr "Instal·la"
+#: en/selectInstallClass.xml:41
+#, fuzzy
+msgid "<emphasis role=\"bold\">Install</emphasis>"
+msgstr "<emphasis>Personalitzat</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 "Actualització"
+#: en/selectInstallClass.xml:50
+#, fuzzy
+msgid "<emphasis role=\"bold\">Upgrade</emphasis>"
+msgstr "<emphasis>Proveïdor</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
+msgid "Use this option to upgrade an existing installation of Mageia."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/selectInstallClass.xml:39
+#. type: Content of: <section><important><para>
+#: en/selectInstallClass.xml:58
 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."
-msgstr ""
-
-#. type: Content of: <section><note><para>
-#: en/selectInstallClass.xml:50
-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."
+"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 ""
 
 #. type: Content of: <section><tip><para>
-#: en/selectInstallClass.xml:62
+#: en/selectInstallClass.xml:67
 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/selectKeyboardLive.xml:3
-msgid "Select keyboard"
-msgstr ""
+#: en/selectKeyboardLive.xml:14
+#, fuzzy
+msgid "Select Keyboard"
+msgstr "Teclat"
 
 #. 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 align=\"center\" fileref=\"live-bestTime.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"bestTime-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 ""
 
 #. type: Content of: <section><info><title>
-#: en/selectKeyboard.xml:7
+#: en/selectKeyboard.xml:20
 msgid "Keyboard"
 msgstr "Teclat"
 
 #. 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."
@@ -3510,14 +3835,16 @@ msgstr ""
 "triarà la disposició de teclat US."
 
 #. 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-welcome5def.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 "
@@ -3535,24 +3862,24 @@ msgstr ""
 "Mapes_de_teclats</link>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:31
+#: en/selectKeyboard.xml:45
 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 ""
 
-#. 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
 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 ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:46
+#: en/selectKeyboard.xml:60
 msgid ""
 "If you choose a keyboard based on non-Latin characters, you will see an "
 "extra dialogue screen asking how you would prefer to switch between the "
@@ -3560,85 +3887,94 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:15
+#: en/selectLanguage.xml:34
 msgid "Please choose a language to use"
 msgstr "Trieu l'idioma que voleu utilitzar"
 
-#. 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 ""
 "Seleccioneu l'idioma preferit, desplegant primer la llista corresponent al "
 "vostre continent. <application>Mageia</application> farà servir aquesta "
 "selecció durant la instal·lació i per al sistema instal·lat."
 
-#. 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 ""
+"Seleccioneu l'idioma preferit, desplegant primer la llista corresponent al "
+"vostre continent. <application>Mageia</application> farà servir aquesta "
+"selecció durant la instal·lació i per al sistema instal·lat."
 
-#. type: Content of: <section><para>
-#: en/selectLanguage.xml:27
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectLanguage.xml:50
 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 ""
 
 #. 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 format=\"PNG\" fileref="
+"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
+"\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata format="
+"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
 
-#. type: Content of: <section><warning><para>
-#: en/selectLanguage.xml:43
+#. type: Content of: <section><important><para>
+#: en/selectLanguage.xml:68
 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 ""
 
 #. 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 ""
 "Si l'idioma del vostre teclat no es correspon amb l'idioma preferit, llavors "
 "és recomanable instal·lar també l'idioma del vostre teclat."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:56
-msgid "Mageia uses UTF-8 (Unicode) support by default."
-msgstr ""
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:58
+#: en/selectLanguage.xml:82
 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 ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:64
+#: en/selectLanguage.xml:89
 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/selectMouse.xml:4
+#: en/selectMouse.xml:10
 msgid "Select mouse"
 msgstr "Selecció del ratolí"
 
@@ -3646,17 +3982,19 @@ msgstr "Selecció del ratolí"
 #.  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>"
 
 #. 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."
@@ -3664,26 +4002,29 @@ msgstr ""
 "Si no us agrada com respon el ratolí, aquí en podeu seleccionar un altre."
 
 #. 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 ""
 "Normalment, <guilabel>Universal</guilabel> - <guilabel>Qualsevol ratolí PS/2 "
 "i USB</guilabel> és la millor tria."
 
 #. 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 ""
 "Seleccioneu <guilabel>Universal</guilabel> - <guilabel>Força evdev</"
 "guilabel> per a configurar els botons que no funcionen en un ratolí de sis "
 "botons o més."
 
-#. 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 "Addició o modificació d'una entrada al menú d'arrencada"
 
@@ -3703,299 +4044,383 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:7
-msgid "Bootloader main options"
+#: en/setupBootloader.xml:10
+#, fuzzy
+msgid "Bootloader"
 msgstr "Opcions principals del menú d'arrencada"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:10
-msgid "Bootloader interface"
+#: en/setupBootloader.xml:13
+msgid "Grub2"
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:11
-msgid "By default, Mageia uses exclusively:"
+#. 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:14
+#: en/setupBootloader.xml:17
 msgid ""
-"GRUB2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
+"GRUB2 (with or without graphical menu) will be used exclusively as the "
+"bootloader for a Legacy/MBR or Legacy/GPT system."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:18
-msgid "GRUB2-efi for a UEFI system."
+#: en/setupBootloader.xml:21
+msgid ""
+"By default, a new bootloader will be written into either the MBR (Master "
+"Boot Record) of your first hard drive or in the BIOS boot partition."
 msgstr ""
 
-#. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:22
-msgid "The Mageia graphical menus are nice :)"
-msgstr "Els menús gràfics de Mageia són bonics :)"
+#. type: Content of: <section><section><itemizedlist><title>
+#: en/setupBootloader.xml:27
+msgid "Grub2-efi on UEFI systems"
+msgstr ""
 
-#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:25
-msgid "GRUB2 on Legacy/MBR and Legacy/GPT systems"
+#. 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 ""
 
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:27
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:33
 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>"
+"By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI "
+"System Partition)."
 msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:34 en/setupBootloader.xml:56
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:35
 msgid ""
-"Don't modify the <emphasis role=\"bold\">Boot Device</emphasis> unless you "
-"really know what you are doing."
+"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 ""
 
-#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:38
-msgid "GRUB2-efi on UEFI systems"
-msgstr ""
+#. type: Content of: <section><section><info><title>
+#: en/setupBootloader.xml:46
+#, fuzzy
+msgid "Bootloader Setup"
+msgstr "Opcions principals del menú d'arrencada"
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:39
-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 ""
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:49
+msgid "Bootloader main options"
+msgstr "Opcions principals del menú d'arrencada"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:42
+#: en/setupBootloader.xml:51
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
-"imageobject>"
+"<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 format=\"PNG\" fileref="
+"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
+"\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata format="
+"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:49
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:62
+#, fuzzy
+msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
+msgstr "<emphasis>Proveïdor</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:63
 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."
+"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><title>
-#: en/setupBootloader.xml:61
-msgid "Using a Mageia bootloader"
-msgstr "Ús del gestor d'arrencada de Mageia"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:67
+#, fuzzy
+msgid "<emphasis role=\"bold\">Boot device</emphasis>"
+msgstr "<emphasis>Genèric</emphasis>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:62
-msgid ""
-"By default, and according to your system, Mageia writes one of the following:"
-msgstr ""
+#. 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 "Canvieu coses només si teniu molt clar què esteu fent."
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:66
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:72
 msgid ""
-"a GRUB2 bootloader either into the MBR (Master Boot Record) of your first "
-"hard drive or in the BIOS boot partition."
+"<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
 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><para>
-#: en/setupBootloader.xml:73
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:74
 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."
+"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>Genèric</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 ""
 
-#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:87
-msgid "Using an existing bootloader"
-msgstr "Ús d'un gestor d'arrencada existent"
-
-#. type: Content of: <section><section><para>
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
 #: en/setupBootloader.xml:88
-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 ""
 
-#. 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>Proveïdor</emphasis>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:96
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:92
 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 ""
 
-#. 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>Proveïdor</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:99
+#, fuzzy
+msgid "<emphasis>Enable ACPI</emphasis>"
+msgstr "<emphasis>Genèric</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 ""
 
-#. type: Content of: <section><section><para>
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
 #: en/setupBootloader.xml:108
-msgid ""
-"You will get a warning that the bootloader is missing, ignore it by clicking "
-"<guibutton>OK</guibutton>."
-msgstr ""
+#, fuzzy
+msgid "<emphasis>Enable SMP</emphasis>"
+msgstr "<emphasis>Genèric</emphasis>"
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:111
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:109
 msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
-"imageobject>"
+"This option enables/disables symmetric multiprocessing for multi-core "
+"processors"
 msgstr ""
 
-#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:117
-msgid "Options"
-msgstr "Opcions"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:113
+#, fuzzy
+msgid "<emphasis>Enable APIC</emphasis>"
+msgstr "<emphasis>Genèric</emphasis>"
 
-#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:119
-msgid "First page"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:114
+msgid ""
+"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 ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
 #: en/setupBootloader.xml:120
-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."
-msgstr ""
+#, fuzzy
+msgid "<emphasis>Enable Local APIC</emphasis>"
+msgstr "<emphasis>Genèric</emphasis>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:122
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:121
 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."
+"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><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:125
-msgid "<guilabel>Password</guilabel>: Choose a password for the bootloader."
-msgstr ""
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:127
+#, fuzzy
+msgid "Bootloader Configuration"
+msgstr "Configuració del so"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:126
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:129
+#, fuzzy
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the password and DrakX will "
-"check that it matches with the one above."
+"<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 format=\"PNG\" fileref="
+"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
+"\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata format="
+"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:139
+#, fuzzy
+msgid "<emphasis role=\"bold\">Default</emphasis>"
+msgstr "<emphasis>Personalitzat</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:127 en/setupBootloader.xml:159
-msgid "<guilabel>Advanced</guilabel>"
+#: en/setupBootloader.xml:140
+msgid "The operating system to started up by default"
 msgstr ""
 
-#. 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:143
+#, fuzzy
+msgid "<emphasis role=\"bold\">Append</emphasis>"
+msgstr "<emphasis>Proveïdor</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:144
 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)."
+"This option lets you pass information to the kernel or tell the kernel to "
+"give you more information as it boots"
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:133
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:148
+#, fuzzy
+msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
+msgstr "<emphasis>Proveïdor</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:149
 msgid ""
-"<guilabel>Enable SMP</guilabel>: This option enables/disables symmetric "
-"multiprocessing for multi core processors."
+"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:135
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:156
+#, fuzzy
 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."
+"<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 format=\"PNG\" fileref="
+"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
+"\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata format="
+"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:166
+#, fuzzy
+msgid "<emphasis>Video mode</emphasis>"
+msgstr "<emphasis>Proveïdor</emphasis>"
 
-#. 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:167
 msgid ""
-"<guilabel>Enable Local APIC</guilabel>: Local APIC manages all external "
-"interrupts for a specific processor in an SMP system."
+"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><title>
-#: en/setupBootloader.xml:143
-msgid "Next page"
-msgstr ""
+#. 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>Proveïdor</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:146
-msgid "<guilabel>Default:</guilabel> Operating system started up by default"
+#: en/setupBootloader.xml:173
+msgid ""
+"Select this option if you don't want a bootable Mageia, but would rather "
+"chain-load it from another OS. You will get a warning that the bootloader is "
+"missing. Click<emphasis> Ok</emphasis> if you are sure you understand the "
+"implications, and wish to proceed."
 msgstr ""
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:150
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:181
+#, 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."
+"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align=\"center"
+"\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:188
+#, fuzzy
+msgid "Other Options"
+msgstr "Opcions"
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:190
+msgid "Using an existing bootloader"
+msgstr "Ús d'un gestor d'arrencada existent"
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:191
+msgid ""
+"The exact procedure for adding Mageia to an existing bootloader is beyond "
+"the scope of this documentation. However in most cases it will involve "
+"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 ""
 
-#. 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 "Ús del gestor d'arrencada de Mageia"
+
+#. 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
 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/setupSCSI.xml:3
+#: en/setupSCSI.xml:10
 msgid "Setup SCSI"
 msgstr "Configuració SCSI"
 
@@ -4007,15 +4432,20 @@ msgstr "Configuració 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 align=\"center\" fileref=\"live-bestTime.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"bestTime-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:27
+#: en/setupSCSI.xml:39
 msgid ""
 "DrakX will normally detect hard disks correctly. However, with some older "
 "SCSI controllers it may be unable to determine the correct drivers to use "
@@ -4023,86 +4453,57 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:32
+#: en/setupSCSI.xml:44
 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 ""
 
-#. type: Content of: <section><para>
-#: en/setupSCSI.xml:35
-msgid "DrakX should then be able to configure the drive(s) correctly."
-msgstr ""
-"Llavors DrakX hauria de ser capaç de configurar els discs correctament."
-
 #. type: Content of: <section><info><title>
-#: en/soundConfig.xml:3
+#: en/soundConfig.xml:10
 msgid "Sound Configuration"
 msgstr "Configuració del so"
 
 #.  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>"
-msgstr ""
-
-#. type: Content of: <section><para>
-#: en/soundConfig.xml:14
-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."
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-soundConfig.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"soundConfig-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/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 ""
-"El controlador predeterminat hauria de funcionar sense problemes. Tot i "
-"això, si després de la instal·lació trobeu algun problema, executeu "
-"<command>draksound</command> o bé inicieu aquesta eina des de l'MCC (centre "
-"de control de Mageia), triant la pestanya <guilabel>Maquinari</guilabel> i "
-"clicant a <guilabel>Configuració del so</guilabel> a la part superior dreta "
-"de la pantalla."
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:24
+#: 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 ""
 
 #. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:30
+#: en/soundConfig.xml:43
 msgid "Advanced"
 msgstr "Avançat"
 
-#. type: Content of: <section><section><para>
-#: en/soundConfig.xml:33
-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 ""
-
-#. type: Content of: <section><section><para>
-#: en/soundConfig.xml:38
-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 ""
-
 #. type: Content of: <section><info><title>
-#: en/takeOverHdConfirm.xml:3
+#: en/takeOverHdConfirm.xml:10
 msgid "Confirm hard disk to be formatted"
 msgstr "Confirmació del disc dur que es formatarà"
 
@@ -4112,141 +4513,150 @@ msgstr "Confirmació del disc dur que es formatarà"
 #.     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=\"classical\"> <imagedata format=\"PNG\" fileref="
+"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
+"\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata format="
+"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
 
-#. type: Content of: <section><para>
-#: en/takeOverHdConfirm.xml:27
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/takeOverHdConfirm.xml:42
 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 ""
 
-#. type: Content of: <section><para>
-#: en/takeOverHdConfirm.xml:31
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/takeOverHdConfirm.xml:48
 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/testing.xml:9
+#: en/testing.xml:3
 msgid "Testing Mageia as Live system"
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/testing.xml:14
+#: en/testing.xml:8
 msgid "Live mode"
 msgstr ""
 
-#. type: Content of: <section><section><mediaobject>
-#: en/testing.xml:18
-msgid "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
-msgstr ""
-
 #. type: Content of: <section><section><para>
-#: en/testing.xml:23
+#: en/testing.xml:11
 msgid ""
-"You get this screen if you selected \"Boot Mageia\". If not, you get the "
-"\"<link linkend=\"doPartitionDisks\">Partitioning</link> step\""
+"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:14
+msgid "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 msgstr ""
-"Us surt aquesta pantalla si heu seleccionat \"Arrenca Mageia\". Si no, us "
-"surt el pas de les <link linkend=\"doPartitionDisks\">particions</link>"
 
 #. type: Content of: <section><section><section><info><title>
-#: en/testing.xml:28
+#: en/testing.xml:21
 msgid "Testing hardware"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/testing.xml:31
+#: en/testing.xml:24
 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 ""
 
 #. 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 ""
 
 #. 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
+msgid "graphics card: if you see the previous screen, it's already OK."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:47
+#: en/testing.xml:40
 msgid "webcam:"
 msgstr ""
 
 #. 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 ""
 
 #. 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
+msgid "printer: configure your printer/s and print a test page"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:59
+#: en/testing.xml:52
 msgid "scanner: scan a document from ..."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/testing.xml:63
+#: en/testing.xml:56
 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 ""
 
-#. 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
+msgid ""
+"The configuration settings you apply here are carried over if you decide to "
+"proceed with the installation."
 msgstr ""
 
 #. type: Content of: <section><section><section><info><title>
-#: en/testing.xml:72
+#: en/testing.xml:68
 msgid "Launch installation"
 msgstr ""
 
-#. type: Content of: <section><section><section><mediaobject>
-#: en/testing.xml:76
-msgid ""
-"<imageobject> <imagedata fileref=\"live-liveMode-install.png\"/> </"
-"imageobject>"
-msgstr ""
-
 #. 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 ""
 "Per llançar el CD o DVD autònom d'instal·lació de Mageia al disc dur o "
 "dispositiu SSD, només heu de clicar a la icona \"Instal·la al disc dur\". Us "
 "sortirà aquesta pantalla i després el pas de les <link linkend="
 "\"doPartitionDisks\">particions</link> per a la instal·lació directa."
 
+#. type: Content of: <section><section><section><mediaobject>
+#: en/testing.xml:77
+msgid ""
+"<imageobject> <imagedata fileref=\"live-liveMode-install.png\"/> </"
+"imageobject>"
+msgstr ""
+
 #. type: Content of: <section><info><title>
-#: en/uninstall-Mageia.xml:3
+#: en/uninstall-Mageia.xml:10
 msgid "Uninstalling Mageia"
 msgstr "Desinstal·lació de Mageia"
 
 #. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:9
+#: en/uninstall-Mageia.xml:18
 msgid ""
 "If Mageia didn't convince you or you can't install it correctly - in short "
 "you want get rid of it - that is your right and Mageia also gives you the "
@@ -4254,34 +4664,37 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:14
+#: en/uninstall-Mageia.xml:23
 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 ""
 
 #. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:19
+#: en/uninstall-Mageia.xml:28
 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 ""
 
 #. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:27
+#: en/uninstall-Mageia.xml:46
 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 ""
 
 #. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:30
+#: en/uninstall-Mageia.xml:49
 msgid ""
 "If you have Vista or 7, you have one more possibility, you can extend the "
 "existing partition that is at the left of the freed space. There are other "
@@ -4291,28 +4704,45 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/unused.xml:9
+#: en/unused.xml:3
 msgid "Keep or delete unused material"
 msgstr ""
 
+#. 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 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
 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 ""
+
+#. 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>"
@@ -4321,8 +4751,189 @@ msgstr ""
 "> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/unused.xml:30
+#: en/unused.xml:31
 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 ""
+
+#~ msgid "User and Superuser Management"
+#~ msgstr "Gestió d'usuaris i superusuari"
+
+#~ msgid "In advanced tab, you will find more options about clock settings."
+#~ msgstr ""
+#~ "A la pestanya de paràmetres avançats trobareu més opcions sobre els "
+#~ "paràmetres del rellotge."
+
+#~ msgid "From a disc"
+#~ msgstr "Des d'un disc"
+
+#~ msgid "From a USB device"
+#~ msgstr "Des d'un dispositiu USB"
+
+#~ msgid "First screen while booting on UEFI system from disk"
+#~ msgstr "La primera pantalla de l'arrencada en un sistema UEFI des del disc"
+
+#~ msgid ""
+#~ "<emphasis><guibutton>Graphic card</guibutton></emphasis>: Choose your "
+#~ "card from the list if needed."
+#~ msgstr ""
+#~ "<emphasis><guibutton>Targeta gràfica</guibutton></emphasis>: si cal, "
+#~ "trieu la vostra targeta de la llista."
+
+#~ msgid "Incorrect refresh rates may damage your monitor"
+#~ msgstr "Freqüències de refresc incorrectes poden fer malbé el monitor"
+
+#~ msgid "the monitor manufacturers name"
+#~ msgstr "el nom dels fabricants del monitor"
+
+#~ msgid "the monitor description"
+#~ msgstr "descripció del monitor"
+
+#~ msgid "Click <guibutton>Done</guibutton> when you're ready."
+#~ msgstr "Feu clic a <guibutton>Fet</guibutton> quan estigueu a punt."
+
+#~ msgid "Use Free Space"
+#~ msgstr "Utilitza l'espai lliure"
+
+#~ msgid ""
+#~ "If you have unused space on an existing Windows partition, the installer "
+#~ "may offer to use it."
+#~ msgstr ""
+#~ "Si teniu espai lliure en una partició Windows existent, pot ser que "
+#~ "l'instal·lador us proposi utilitzar-la."
+
+#~ msgid "Erase and use Entire Disk."
+#~ msgstr "Esborra i utilitza el disc sencer."
+
+#~ msgid ""
+#~ "Note! This will erase ALL data on the selected hard drive. Take care!"
+#~ msgstr ""
+#~ "Nota! Això esborrarà TOTES les dades del disc dur seleccionat. Vigileu!"
+
+#~ msgid "Custom disk partitioning"
+#~ msgstr "Particions personalitzades de disc"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+
+#~ msgid "Using a Mageia DVD"
+#~ msgstr "Ús d'un DVD de Mageia"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+
+#~ msgid "Media Selection (Nonfree)"
+#~ msgstr "Selecció del mitjà (Nonfree)"
+
+#~ msgid "Summary of miscellaneous parameters"
+#~ msgstr "Resum dels paràmetres diversos"
+
+#~ msgid "<guilabel>Timezone</guilabel>"
+#~ msgstr "<guilabel>Zona horària</guilabel>"
+
+#~ msgid "<guilabel>Country / Region</guilabel>"
+#~ msgstr "<guilabel>País / Regió</guilabel>"
+
+#~ msgid "<guilabel>Bootloader</guilabel>"
+#~ msgstr "<guilabel>Gestor d'arrencada</guilabel>"
+
+#~ msgid "<guilabel>User management</guilabel>"
+#~ msgstr "<guilabel>Gestió d'usuaris</guilabel>"
+
+#~ msgid "<guilabel>Services</guilabel>:"
+#~ msgstr "<guilabel>Serveis</guilabel>:"
+
+#~ msgid "For more information, see <xref linkend=\"configureServices\"/>"
+#~ msgstr ""
+#~ "Per obtenir més informació, consulteu <xref linkend=\"configureServices\"/"
+#~ ">"
+
+#~ msgid "<guilabel>Keyboard</guilabel>:"
+#~ msgstr "<guilabel>Teclat</guilabel>:"
+
+#~ msgid "<guilabel>Mouse</guilabel>:"
+#~ msgstr "<guilabel>Ratolí</guilabel>:"
+
+#~ msgid "<guilabel>Sound card</guilabel>:"
+#~ msgstr "<guilabel>Targeta de so</guilabel>:"
+
+#~ msgid "<guilabel>Graphical interface</guilabel>:"
+#~ msgstr "<guilabel>Interfície gràfica</guilabel>:"
+
+#~ msgid "<guilabel>Network</guilabel>:"
+#~ msgstr "<guilabel>Xarxa</guilabel>:"
+
+#~ msgid "<guilabel>Proxies</guilabel>:"
+#~ msgstr "<guilabel>Servidors intermediaris</guilabel>:"
+
+#~ msgid "<guilabel>Security Level</guilabel>:"
+#~ msgstr "<guilabel>Nivell de seguretat</guilabel>:"
+
+#~ msgid "Check the option which best suits your usage."
+#~ msgstr "Trieu l'opció que millor s'adapta a la vostra utilització."
+
+#~ msgid "<guilabel>Firewall</guilabel>:"
+#~ msgstr "<guilabel>Tallafoc</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 ""
+#~ "Un tallafoc actua de barrera entre les vostres dades importants i els "
+#~ "espavilats que ronden per internet amb intenció de comprometre-les o "
+#~ "robar-les."
+
+#~ msgid "64 bit architecture only."
+#~ msgstr "Només l'arquitectura de 64 bits."
+
+#~ msgid ""
+#~ "To recover the original capacity, you must redo partitioning and re-"
+#~ "format the USB stick."
+#~ msgstr ""
+#~ "Per recuperar la capacitat original, heu de refer les particions i tornar "
+#~ "a formatar la memòria USB."
+
+#~ msgid "Install"
+#~ msgstr "Instal·la"
+
+#~ msgid "Upgrade"
+#~ msgstr "Actualització"
+
+#~ msgid "The Mageia graphical menus are nice :)"
+#~ msgstr "Els menús gràfics de Mageia són bonics :)"
+
+#~ msgid "DrakX should then be able to configure the drive(s) correctly."
+#~ msgstr ""
+#~ "Llavors DrakX hauria de ser capaç de configurar els discs correctament."
+
+#~ 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 ""
+#~ "El controlador predeterminat hauria de funcionar sense problemes. Tot i "
+#~ "això, si després de la instal·lació trobeu algun problema, executeu "
+#~ "<command>draksound</command> o bé inicieu aquesta eina des de l'MCC "
+#~ "(centre de control de Mageia), triant la pestanya <guilabel>Maquinari</"
+#~ "guilabel> i clicant a <guilabel>Configuració del so</guilabel> a la part "
+#~ "superior dreta de la pantalla."
+
+#~ msgid ""
+#~ "You get this screen if you selected \"Boot Mageia\". If not, you get the "
+#~ "\"<link linkend=\"doPartitionDisks\">Partitioning</link> step\""
+#~ msgstr ""
+#~ "Us surt aquesta pantalla si heu seleccionat \"Arrenca Mageia\". Si no, us "
+#~ "surt el pas de les <link linkend=\"doPartitionDisks\">particions</link>"
diff --git a/docs/docs/stable/installer/cs.po b/docs/docs/stable/installer/cs.po
index 6fcf0265..4bc64f78 100644
--- a/docs/docs/stable/installer/cs.po
+++ b/docs/docs/stable/installer/cs.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2018-04-19 16:32+0300\n"
+"POT-Creation-Date: 2019-01-06 12:43+0200\n"
 "PO-Revision-Date: 2018-02-04 10:32+0000\n"
 "Last-Translator: fri\n"
 "Language-Team: Czech (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -29,12 +29,12 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #. type: Content of: <section><info><title>
-#: en/acceptLicense.xml:25
+#: en/acceptLicense.xml:31
 msgid "License and Release Notes"
 msgstr "Licence a poznámky k vydání"
 
 #. type: Content of: <section><mediaobject>
-#: en/acceptLicense.xml:29
+#: en/acceptLicense.xml:35
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
@@ -50,82 +50,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í ujednání"
 
-#. 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 ""
 "Před instalací <application>Mageii</application>, si pečlivě přečtěte "
 "licenční podmínky a ustanovení."
 
-#. 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 ""
 "Tyto podmínky a ujednání se vztahují na celou distribuci "
 "<application>Mageia</application>, dříve než budete moci pokračovat, musí "
 "být přijaty."
 
-#. 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 ""
 "Chcete-li je přijmout, jednoduše vyberte <guilabel>Přijmout</guilabel> a "
 "poté klepněte na <guibutton>Další</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 ""
 "Pokud se rozhodnete nepřijmout tyto podmínky, pak vám děkujeme za "
 "nahlédnutí. Klepnutím na <guibutton>Ukončit</guibutton> se restartuje "
 "počítač."
 
 #. type: Content of: <section><section><info><title>
-#: en/acceptLicense.xml:63
+#: en/acceptLicense.xml:76
 msgid "Release Notes"
 msgstr "Poznámky k vydání"
 
 #. 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 ""
 "Jsou dostupné důležité informace o tomto vydání <application>Mageia</"
 "application> a jsou dostupné klepnutím na tlačítko <guibutton>Poznámky k "
 "vydání</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 "cs"
 
 #. 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ýběr zdroje (nastavení doplňkových instalačních zdrojů)"
 
 #.  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."
@@ -137,13 +143,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 ""
 "Tato obrazovka vám dává seznam již rozeznaných úložišť. Můžete přidat další "
 "zdroje balíčků, jako je optický disk nebo vzdálené zdroje. Výběr zdroje "
@@ -151,25 +157,25 @@ msgstr ""
 "balíčků."
 
 #. 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 "Pro síťové zdroje, jsou zapotřebí dva nasáledijící 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ýběr a aktivace sítě, není-li již spuštěna."
 
 #. 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 ""
 "Výbrat zrcadlo nebo zadat adresu URL (první vstup). Výběrem některého ze "
 "zrcadel, budete mít přístup k nabídkám všech úložišť spravovaných Mageia, "
@@ -177,15 +183,15 @@ msgstr ""
 "konkrétní úložiště nebo vlastní instalaci NFS."
 
 #. 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 ""
 "Pokud aktualizujete 64 bitovou instalaci, která může obsahovat některé 32 "
 "bitové balíčky, doporučuje se použít tuto obrazovku pro přidání "
@@ -195,18 +201,25 @@ msgstr ""
 "zrcadlového serveru tam instalátor najde potřebné 32 bitové balíčky."
 
 #. type: Content of: <section><info><title>
-#: en/addUser.xml:3
-msgid "User and Superuser Management"
-msgstr "Správa uživatele  a superuživatele"
+#: en/addUser.xml:9
+#, fuzzy
+msgid "User Management"
+msgstr "Rozšířená správa uživatelů"
 
 #.  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 format=\"PNG\" fileref="
 "\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -214,21 +227,21 @@ msgstr ""
 "\"PNG\" 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 "Nastavení hesla správce (uživatele root):"
 
 #. 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 ""
 "Pro všechny instalace <application>Mageii</application> se doporučuje "
 "nastavit heslo superuživatele anebo správce, které se v Linuxu obyčejně "
@@ -240,98 +253,119 @@ msgstr ""
 "neudělali překlep."
 
 #. 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šechna hesla jsou závislá na velikosti písmen; nejlepší je použít kombinaci "
 "písmen (velkých a malých), čísel a ostatních znaků."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:42
+#: en/addUser.xml:57
 msgid "Enter a user"
 msgstr "Zadejte uživatele"
 
 #. 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 ""
 "Zde přidejte uživatele. Uživatel má méně oprávnění než superuživatel (root), "
 "ale dost na procházení internetu, používání kancelářskych aplikací anebo "
 "hraní her a pro cokoli jiného, co se svým počítačem provádí běžný uživatel."
 
 #. 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\">Pokročilé</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>: Pokud klepnete na toto tlačítko, změní se "
 "ikona uživatele."
 
 #. 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\">Pokročilé</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>Skutečné jméno</guilabel>: Vložte do tohoto textového pole "
 "skutečné jméno uživatele."
 
 #. 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\">Pokročilé</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>Přihlašovací jméno</guilabel>: Zde můžete zadat uživatelské "
 "přihlašovací jméno, nebo nechat instalační program pokusit se použít "
 "skutečné jméno uživatele. <emphasis>Přihlašovací jméno je citlivé na "
 "velikost 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\">Pokročilé</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 tohoto textového pole byste měli napsat heslo "
 "uživatele. Na konci textového políčka je štít, který naznačuje sílu heslu. "
 "(Podívejte se i na <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 (znovu)</guilabel>: Znovu zadejte heslo a drakx zkontroluje, "
 "zda odpovídá heslu zadanému výše."
 
 #. 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 ""
 "Jakýkoliv uživatel přidaný v průběhu instalace Mageii bude mít chráněn "
 "domovský adresář proti čtení a zápisu (umask=0027)"
 
 #. 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</"
@@ -343,60 +377,60 @@ msgstr ""
 "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 "Přístupová oprávnění lze změnit také po instalaci."
 
 #. 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šířená správa uživatelů"
 
 #. 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 ""
 "Pokud klepnete na tlačítko <guibutton>pokročilé</guibutton>, bude vám "
 "nabídnuta obrazovka, která vám dovoluje upravovat nastavení pro uživatele, "
 "kterého přidáváte."
 
 #. 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>Shell</guilabel>: Tento rozbalovací seznam vám umožňuje změnit "
 "shell (překladač příkazů) používaný uživatelem, kterého přidáváte na "
 "předchozí obrazovce, možnostmi jsou 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 uživatele</guilabel>: Zde můžete nastavit uživatelovo ID pro "
 "uživatele, kterého přidáváte na předchozí obrazovce. Je to číslo. Ponechejte "
 "je prázdné, pokud nevíte, co dělá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 "Zvolte si přípojné body"
 
@@ -411,16 +445,17 @@ msgstr "Zvolte si přípojné body"
 #.        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="
@@ -430,56 +465,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 ""
 "Zde vidíte Linuxové oddíly, které byly nalezeny na vašem počítači. Pokud "
 "nesouhlasíte s návrhem <application>DrakX</application>, můžete přípojné "
 "body změnit."
 
-#. 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 ""
-"Máte-li cokoliv ke změně, ujistěte se, že máte stále <literal>/</literal> "
-"kořenový oddíl (root)."
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:46
-#, fuzzy
-msgid ""
-"Every partition is shown to the left as: <emphasis role=\"bold\">Device "
-"(capacity, mount point, type).</emphasis>"
-msgstr ""
-"Každý oddíl je zobrazen takto: \"Zařízení\" (\"Kapacita\", \"Přípojný bod\", "
-"\"Typ\")."
-
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:50
+#: en/ask_mntpoint_s.xml:55
 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 ""
 "Pokud máte hodně oddílů, můžete si vybrat mnoho různých přípojných bodů z "
 "rozbalovací nabídky, jako jsou <literal>/</literal>, <literal>/home</"
@@ -489,7 +505,7 @@ msgstr ""
 "instalace kotle (cauldron)."
 
 #. 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 "
@@ -499,12 +515,22 @@ msgstr ""
 "bod."
 
 #. type: Content of: <section><warning><para>
-#: en/ask_mntpoint_s.xml:69
+#: en/ask_mntpoint_s.xml:79
+#, fuzzy
+msgid ""
+"If you make any changes here, ensure you still have a <filename>/</filename> "
+"(root) partition."
+msgstr ""
+"Máte-li cokoliv ke změně, ujistěte se, že máte stále <literal>/</literal> "
+"kořenový oddíl (root)."
+
+#. type: Content of: <section><tip><para>
+#: en/ask_mntpoint_s.xml:84
 #, 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 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>Předchozí</guibutton>, pokud si nejste jisti tím, co si "
 "máte zvolit, a potom zaškrtněte <guilabel>Vlastní rozdělení disku</"
@@ -512,187 +538,237 @@ msgstr ""
 "viděli jeho typ a velikost."
 
 #. 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 ""
 "Pokud jste si jisti, že přípojné body jsou správně, klepněte na "
 "<guibutton>Další</guibutton> a vyberte si, zda chcete naformátovat jen ten "
 "oddíl (resp. oddíly), které DrakX navrhuje, anebo i další."
 
 #. type: Content of: <section><info><title>
-#: en/bestTime.xml:10
-msgid "Clock settings"
+#: en/bestTime.xml:5
+#, fuzzy
+msgid "Clock Settings"
 msgstr "Nastavení č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 musíte vybrat, na který čas jsou vaše vnitřní hodiny nastaveny "
 "- buď na místní čas nebo na koordinovaný světový čas (UTC)."
 
 #. type: Content of: <section><para>
-#: en/bestTime.xml:23
-msgid "In advanced tab, you will find more options about clock settings."
-msgstr "Na kartě pokročilé najdete víc voleb pro nastavení č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 "Zavést Mageiu jako živý systém"
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:1
+#: en/bootLive.xml:10
 msgid "Booting the medium"
 msgstr "Zavedení z datového nosiče"
 
-#. 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
+#. type: Content of: <section><section><para>
+#: en/bootLive.xml:12
 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."
+"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 ""
-"Systém můžete zavést z nosiče, na který jste vypálili svůj obrazový soubor "
-"(CD, DVD...). Obyčejně jej stačí jen vložit do vaší CD/DVD mechaniky, aby "
-"zavaděč spustil instalaci automaticky po restartu počítače. pokud se to "
-"nestane, možná potřebujete přenastavit BIOS anebo stisknout jednu klávesu, "
-"která vám nabídne vybrat si zařízení, ze kterého se počítač zavede."
 
-#. 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 ""
-"Podle toho, jaké máte vybavení počítače a jak je nastaveno, objeví se buď "
-"jedna anebo druhá ze dvou níže uvedených obrazovek."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:7
-msgid "From a USB device"
-msgstr "Ze zařízení USB"
+#. 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 spustit ze zařízení USB, na kterém je zaznamenán obraz ISO. "
-"Vzhledem k nastavení vašeho BIOSu se počítač možná už zavádí přímo ze "
-"zařízení USB zastrčeného v přípojném místě (portu) počítače. Pokud se tak "
-"neděje, možná potřebujete přenastavit BIOS anebo stisknout jednu klávesu, "
-"která vám nabídne výběr zařízení, z něhož se počítač spustí."
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:12
+#: en/bootLive.xml:35
 msgid "In BIOS/CSM/Legacy mode"
 msgstr "V zastaralém režimu BIOS/CSM"
 
+#. 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\">Měnění velikostí oddílu:</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 ""
+"Nastavení nastavení, která jste tu udělali, jsou zachována pro instalaci."
+
+#. 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\">Měnění velikostí oddílu:</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\">Měnění velikostí oddílu:</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 ""
+"Nainstalovat Mageiu: Tato volba Mageiu přímo nainstaluje 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 format=\"PNG\" fileref=\"dx2-chooseDesktop.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 "První obrazovka během spouštění v režimu BIOS"
 
-#. type: Content of: <section><section><para>
-#: en/bootLive.xml:12
-msgid "In the middle menu, you have the choice between three actions:"
-msgstr "V prostřední nabídce máte volbu mezi třemi činnostmi:"
+#. 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 ""
-"Zavést Mageiu: Toto znamená, že Mageia 5 se spustí z připojeného nosiče (CD/"
-"DVD anebo zařízení USB) bez jakéhokoli zapisování na disk, takže očekávejte "
-"velmi pomalý systém. Jakmile se zavádění dokončí, můžete přikročit i k "
-"instalací na pevný disk."
+#: en/bootLive.xml:75
+#, fuzzy
+msgid "<keycap>F1</keycap> <emphasis role=\"bold\">Help</emphasis>"
+msgstr "<emphasis role=\"bold\">Pokročilé</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 ""
-"Nainstalovat Mageiu: Tato volba Mageiu přímo nainstaluje 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\">Pokročilé</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 ""
-"Spustit z pevného disku: Tato volba dovoluje systém zavést z pevného disku, "
-"tak jako obyčejně, když není připojen žádný datový nosič (CD/DVD anebo "
-"zařízení USB). (nepracuje s Mageiou 5)."
 
-#. type: Content of: <section><section><para>
-#: en/bootLive.xml:19
-msgid "In the bottom menu, are the Boot Options:"
-msgstr "Ve spodní nabídce jsou Volby zavedení 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\">Pokročilé</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 - Nápověda. Vysvětluje volby \"splash\", \"apm\", \"acpi\" a \"Ide\""
+"Změňte rozlišení obrazovky stisknutím klávesy F3 (jen v zastaralém režimu)."
 
 #. 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 pro zobrazení jazyka obrazovek."
+#: en/bootLive.xml:93
+#, fuzzy
+msgid "<keycap>F4</keycap> <emphasis role=\"bold\">Source</emphasis>"
+msgstr "<emphasis role=\"bold\">Pokročilé</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 - Rozlišení obrazovky. Volba mezi textem, 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 anebo Další. Normálně se instalace vykoná z vloženého "
 "instalačního média. Zde si vybíráte jiné zdroje, jakými jsou FTP anebo "
@@ -700,122 +776,172 @@ msgstr ""
 "volbě si vyberte jeden z instalačních zdrojů dostupných na serveru."
 
 #. 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\">Pokročilé</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 - Ovladač. Ano nebo Ne. Systém si je vědom přítomnosti volitelného disku "
-"s aktualizací ovladače a bude požadovat jeho vložení během procesu instalace."
 
 #. 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\">Měnění velikostí oddílu:</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:106
+msgid ""
+"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\">Pokročilé</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/bootLive.xml:114
 msgid ""
-"F6 - Kernel options. This is a way to specify options according to your "
-"hardware and the drivers to use."
+"<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 ""
+"- Žádné ACPI (pokročilé rozhraní nastavení a napájení), správa napájení není "
+"brána 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 ""
+"- Žádný místní APIC (lokální pokročilý programovatelný ovladač přerušení), "
+"jedná se o přerušení CPU, vyberte tuto volbu, pokud jste k tomu vyzváni."
+
+#. 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 - Volby jádra. Toto je cesta pro zadání voleb vztahujících se k vybavení "
-"počítače a ovladačům, které se použijí."
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:29
+#: en/bootLive.xml:139
 msgid "In UEFI mode"
 msgstr "V režimu UEFI"
 
 #. 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 "První obrazovka během spuštění z disku na systémech UEFI"
+#: en/bootLive.xml:146
+#, fuzzy
+msgid "First screen while booting in UEFI mode"
+msgstr "První obrazovka během spouštění v režimu BIOS"
 
 #. 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 ""
-"Zde máte jen možnost spustit Mageiu v Živém režimu (první volba) nebo "
-"spustit instalaci (druhá volba)."
 
-#. 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 ""
-"Pokud jste počítač spustili ze zařízení USB, dostanete dva doplňující řádky, "
-"které jsou duplikáty předchozích řádků zakončených zkratkou \"USB\". Máte je "
-"vybrat."
+"Zavést Mageiu: Toto znamená, že Mageia 5 se spustí z připojeného nosiče (CD/"
+"DVD anebo zařízení USB) bez jakéhokoli zapisování na disk, takže očekávejte "
+"velmi pomalý systém. Jakmile se zavádění dokončí, můžete přikročit i k "
+"instalací 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ždém případě budou první kroky stejné - vybrat si jazyk, časovou zónu a "
-"klávesnici; potom se postupy odlišují v <link linkend=\"testing"
-"\">dodatečných krocích v Živém režimu</link>."
 
 #. type: Content of: <section><info><title>
-#: en/chooseDesktop.xml:3
+#: en/chooseDesktop.xml:16
 msgid "Desktop Selection"
 msgstr "Výběr pracovního prostředí"
 
 #. 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 vašem výběru zde, vám můžou být nabídnuty další obrazovky "
-"pro jemné doladění vaší volby."
 
 #. 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. krocích) výběru uvidíte během instalace balíčků pohyblivou "
 "přehlídku snímků. Přehlídka může být vypnuta stisknutím tlačítka "
 "<guilabel>Podrobnosti</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 format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
 "align=\"center\"/> </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 ""
 "Rozhodněte se, zda chcete používat prostředí <application>KDE</application> "
 "nebo <application>Gnome</application>. Obě prostředí jsou vybavená všemi "
@@ -831,8 +957,9 @@ msgid "Package Group Selection"
 msgstr "Výběr skupiny balíčků"
 
 #. 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
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
 "\" align=\"center\"/> </imageobject>"
@@ -841,7 +968,7 @@ msgstr ""
 "\" align=\"center\"/> </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 "
@@ -855,25 +982,25 @@ msgstr ""
 "myší na název 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\">Měnění velikostí oddílu:</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\">Pokročilé</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\">Pokročilé</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 "
@@ -883,7 +1010,7 @@ msgstr ""
 "nebo odebrání balíčků."
 
 #. 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 "
@@ -898,8 +1025,10 @@ msgid "Choose Individual Packages"
 msgstr "Výběr jednotlivých balíčků"
 
 #. 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"
@@ -909,7 +1038,7 @@ msgstr ""
 "\" align=\"center\"/> </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."
@@ -918,13 +1047,14 @@ msgstr ""
 "instalace."
 
 #. 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činění výběru můžete klepnout na <guibutton>ikonu diskety</guibutton> ve "
 "spodní části stránky pro uložení vašeho výběru balíčků (funguje i uložení na "
@@ -939,8 +1069,10 @@ msgstr "Nastavení služeb"
 
 #.  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"
@@ -951,25 +1083,21 @@ msgstr ""
 "id=\"soundConfig-im1\" revision=\"1\"/> </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 "Zde si můžete nastavit, jaké služby (ne)spouštět při zavádění 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 "Nastavení, která DrakX vybral, jsou obyčejně 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."
@@ -978,7 +1106,7 @@ msgstr ""
 "níže."
 
 #. 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 "Věci měňte jen tehdy, když velmi dobře víte, co děláte."
 
@@ -989,15 +1117,17 @@ msgstr "Nastavení č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-"
@@ -1005,18 +1135,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ýběrem vaší zememě nebo nejbližší město ve stejném "
 "časovém pásmu."
 
 #. 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 "
@@ -1026,7 +1156,7 @@ msgstr ""
 "GMT, také známý jako 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."
@@ -1035,23 +1165,24 @@ msgstr ""
 "jsou všechny nastaveny na místní čas, nebo všichny na UTC/GMT."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:13
+#: en/configureX_card_list.xml:24
 msgid "Choose an X Server (Configure your Graphic Card)"
 msgstr "Výběr X Serveru (Konfigurace vaší grafické karty)"
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_card_list.xml: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=\"summaryBottom-im1\" align="
-"\"center\" fileref=\"dx2-summaryBottom.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."
@@ -1060,7 +1191,7 @@ msgstr ""
 "identifikuje správně."
 
 #. 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:"
@@ -1068,98 +1199,96 @@ msgstr ""
 "Pokud není vaše grafická karta rozpoznána instalačním programem správně a "
 "víte, jakou kartu máte, můžete ji vybrat ze 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 "dodavatel"
 
 #. 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 "pak název vaší 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ší 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 ""
 "Seznam Xorg poskytuje více než 40 obecných a open source ovladačů grafických "
 "karet. Pokud stále nemůžete najít název ovladače pro kartu, existuje možnost "
 "použití VESA ovladač, který 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 ""
 "Uvědomte si, že pokud vyberete nekompatibilní ovladač, můžete mít přístup "
 "pouze k rozhhraní příkazové řádky."
 
 #. 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 ""
 "Někteří výrobci grafických karet poskytují proprietární ovladače pro Linux, "
 "které mohou být k dispozici v nonfree úložišti a v některých případech jen "
 "pouze z webových stránek výrobce karety."
 
-#. 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 ""
-"Přístup k Nonfree úložišti musí být výslovně povolen. Pokud tomu tak není, "
-"nejdříve jej povolte, toto byste měli udělat po prvním restartu."
-
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:3
+#: en/configureX_chooser.xml:11
 msgid "Graphic Card and Monitor Configuration"
 msgstr "Nastavení grafické karty a monitoru"
 
 #.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
+#. 2018/02/15 apb: Some text and typography.
+#. 2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.
+#. 2018/02/23 apb: Typo.
 #. 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=\"reboot-im1\" fileref=\"live-"
-"reboot.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 ohledu na to, které grafické prostředí (známé i jako prostředí pracovní "
 "plochy) jste si vybrali pro tuto instalaci <application>Mageii</"
@@ -1173,23 +1302,33 @@ msgstr ""
 "myslíte, že volba je nesprávná."
 
 #. 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\">Pokročilé</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 ze "
-"seznamu vaši kartu, pokud je to třeba."
 
 #. 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\">Pokročilé</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ýběr možnost "
 "<guilabel>Plug'n Play</guilabel>, pokud je použitelná, nebo si vybrat "
@@ -1198,32 +1337,37 @@ msgstr ""
 "upřednostňujete ruční nastavení vodorovné a svislé obnovovací frekvence "
 "vašeho monitoru."
 
-#. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/configureX_chooser.xml:41
-msgid "Incorrect refresh rates may damage your monitor"
-msgstr "Nesprávná obnovovací frekvence může poškodit 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\">Měnění velikostí oddílu:</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>Rozlišení</guibutton></emphasis>: Zde nastavte "
 "požadované rozlišení a barevnou hloubku monitoru."
 
 #. 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\">Pokročilé</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>Zkouška</guibutton></emphasis>: Ne vždy se během  "
 "instalace objeví testovací tlačítko. Pokud je tu toto tlačítko, můžete "
@@ -1235,21 +1379,35 @@ msgstr ""
 "testovací tlačítko dostupné.</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\">Měnění velikostí oddílu:</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>: Zde si můžete vybrat "
 "zda povolit nebo zakázat různé další 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ýběr 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."
@@ -1258,7 +1416,7 @@ msgstr ""
 "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 "
@@ -1272,25 +1430,26 @@ msgstr ""
 "do dokumentace k vašemu 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=\"reboot-im1\" fileref=\"live-"
-"reboot.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 ""
 
-#. 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."
@@ -1300,8 +1459,8 @@ msgstr ""
 "určuje, jak často je obrazovka obnovována a horizontální synchronizace je "
 "rychlost, kterou jsou zobrazovány skenované řádky."
 
-#. 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 "
@@ -1313,26 +1472,22 @@ msgstr ""
 "byste tím poškodit svůj monitor. Pokud jste na pochybách, vyberte si "
 "konzervativní nastavení a prověřte ho v dokumentaci k vašemu 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 výchozí volba a snaží se určit typ monitoru z databáze monitorů."
 
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:51
-msgid "<emphasis>Vendor</emphasis>"
-msgstr "<emphasis>Dodavatel</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:"
@@ -1340,31 +1495,30 @@ msgstr ""
 "Pokud instalátor správně nerozpoznal váš monitor a vy víte, který máte, "
 "můžete si ho zvolit ze stromu pomocí výběru:"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:61
-msgid "the monitor manufacturers name"
-msgstr "název výrobce monitoru"
+#. 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 "popis monitoru"
+#. 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ýběr této skupiny zobrazí přibližně 30 nastavení obrazovky, jako jsou "
 "1024x768 @ 60Hz zahrnuje i ploché panelové obrazovky, jaké jsou používány ve "
@@ -1374,75 +1528,55 @@ msgstr ""
 "výběru konzervativní."
 
 #. 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í rozdělení disku pomocí DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:12
-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>"
-
-#. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:22
+#: en/diskdrake.xml:27
 #, 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."
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-diskdrake.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-diskdrake.png\"/> </imageobject>"
 msgstr ""
-"Pokud si přejete použít šifrování na vašem <literal>/</literal> oddílu, "
-"musíte se ujistit, že máte samostatný  oddíl <literal>/boot</literal>. Volba "
-"pro zašifrování NESMÍ být nastavena pro zaváděcí oddíl <literal>/boot</"
-"literal>, jinak váš systém nebude možné zavést."
+"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/></imageobject><imageobject condition=\"live"
+"\"><imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/></"
+"imageobject>"
 
-#. 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 ""
 "Zde upravíte rozložení disku (disků). Můžete odstraňovat nebo vytvářet "
 "oddíly, měnit souborový systém oddílu, anebo měnit jeho velikost a dokonce "
 "se podívat, co je na něm, předtím než 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 ""
-"Stiskněte <guibutton>Vyčistit vše</guibutton> pro smazání všech oddílů na "
-"vybraném úložném zařízení."
+"Je tam karta pro každý nalezený pevný disk nebo jiné úložné zařízení, jako "
+"je zařízení USB. Například sda, sdb a sdc, pokud jsou připojena tři."
 
-#. 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 ""
 "Pro všechky ostatní činnosti: klepněte nejprve na požadovaný oddíl. Potom si "
 "jej prohlédněte, nebo si vyberte souborový systém a přípojný bod, změňte "
@@ -1450,34 +1584,71 @@ msgstr ""
 "guibutton> (nebo <guibutton>Expertní režim</guibutton>) dodá některé další "
 "nástroje jako je přidání štítku nebo vybrání typu oddílu."
 
-#. 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 dokud jste nenastavil vše podle vašeho přání."
 
-#. 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 ""
+"Stiskněte <guibutton>Vyčistit vše</guibutton> pro smazání všech oddílů na "
+"vybraném úložném zařízení."
+
+#. 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 ""
-"Klepněte na tlačítko <guibutton>Hotovo</guibutton>, když jste připraven."
+"Pokud si přejete použít šifrování na vašem <literal>/</literal> oddílu, "
+"musíte se ujistit, že máte samostatný  oddíl <literal>/boot</literal>. Volba "
+"pro zašifrování NESMÍ být nastavena pro zaváděcí oddíl <literal>/boot</"
+"literal>, jinak váš systém nebude možné zavést."
 
-#. type: Content of: <section><note><para>
-#: en/diskdrake.xml:56
+#. 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 ""
 "Pokud instalujete Mageiu na UEFI systému, zkontrolujte zda ESP (EFI System "
 "Partition) existuje a je připojen v /boot/EFI (více níže)"
 
-#. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:61
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/diskdrake.xml:93
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
-"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"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 ""
+"Pokud instalujete Mageiu na systém Legacy/GPT, zkontrolujte, že je přítomen "
+"zaváděcí oddíl BIOS a že je správného typu"
+
+#. type: Content of: <section><figure><title>
+#: en/diskdrake.xml:101
+#, fuzzy
+msgid "EFI System Partition"
+msgstr "Použít existující oddíly"
+
+#. type: Content of: <section><figure><mediaobject>
+#: en/diskdrake.xml:104
+#, fuzzy
+msgid ""
+"<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-diskdrake2.png"
@@ -1485,22 +1656,18 @@ msgstr ""
 "\"><imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/></"
 "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
-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 ""
-"Pokud instalujete Mageiu na systém Legacy/GPT, zkontrolujte, že je přítomen "
-"zaváděcí oddíl BIOS a že je správného typu"
 
-#. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:76
+#. type: Content of: <section><mediaobject>
+#: en/diskdrake.xml:118 en/doPartitionDisks.xml:200
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1513,52 +1680,60 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:9
-msgid "Partitioning"
+#: en/doPartitionDisks.xml:25
+#, fuzzy
+msgid "Suggested Partitioning"
 msgstr "Rozdělení disku"
 
 #. 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 této obrazovce můžete vidět obsah vašeho pevného disku (disků) a vidět "
 "nalezená řešení průvodce DrakX rozdělováním disku navrhujícího, kam "
 "nainstalovat <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 ""
 "Volby dostupné z níže uvedeného seznamu se budou lišit v závislosti na "
 "rozložení a obsahu vašeho konkrétního 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-"
-"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
-"\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:32
-msgid "Use Existing Partitions"
-msgstr "Použít existující oddíly"
+#. type: Content of: <section><itemizedlist><title>
+#: en/doPartitionDisks.xml:47
+#, fuzzy
+msgid "Main Options"
+msgstr "Volby"
 
-#. 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\">Měnění velikostí oddílu:</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."
@@ -1566,13 +1741,14 @@ msgstr ""
 "Pokud je dostupná tato volba, potom byly nalezeny stávající s Linuxem "
 "kompatibilní oddíly a tyto mohou být použity pro instalaci."
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:41
-msgid "Use Free Space"
-msgstr "Použít volné místo"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:59
+#, fuzzy
+msgid "<emphasis role=\"bold\">Use Free Space</emphasis>"
+msgstr "<emphasis role=\"bold\">Pokročilé</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."
@@ -1580,109 +1756,88 @@ msgstr ""
 "Pokud máte nevyužité místo na vašem pevném disku, potom ho tato volba "
 "využije pro novou instalaci Mageii."
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:49
-msgid "Use Free Space on a Windows Partition"
-msgstr "Použít volné místo na oddílu Windows"
-
-#. 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 ""
-"Pokud máte nevyužité místo na stávajícím windowsovském oddíle, instalátor "
-"může nabídnout jeho použití."
+"<emphasis role=\"bold\">Use Free Space on a Windows Partition</emphasis>"
+msgstr "<emphasis role=\"bold\">Měnění velikostí oddílu:</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 být užitečná cesta vytvoření prostoru pro vaši novou instalaci "
 "Mageii, ale je to riziková operace, takže byste se měli ujistit, že máte "
 "zazálohovány všechny důležité soubory!"
 
-#. 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 ""
-"Pamatujte, že toto znamená zmenšení velikosti windowsovského oddílu. Oddíl "
-"musí být \"čistý\", to znamená, že Windows musely být správně vypnuty, když "
-"byly naposledy použity. Též musely být defragmentovány, ačkoli toto není "
-"zárukou, že všechny soubory na oddíle byly přesunuty z oblasti, která má být "
-"použita. Velice se doporučuje provedení zálohy vašich osobních souborů."
-
-#. 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 této volby instalátor zobrazí zůstávající windowsovský oddíl v světlemodré "
 "a budoucí oddíl Mageii v tmavomodré barvě spolu s jejich zamýšlenými "
 "velikostmi pod nimi. Máte možnost přizpůsobit tyto velikosti klepnutím a "
 "přesunutím mezery mezi oběma oddíly. Viz snímek obrazovky níže."
 
-#. 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-"
-"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
-"\"center\"/> </imageobject>"
-
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:87
-msgid "Erase and use Entire Disk."
-msgstr "Smazat a použít celý disk"
+msgid "<emphasis role=\"bold\">Erase and use Entire Disk</emphasis>"
+msgstr "<emphasis role=\"bold\">Pokročilé</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 "Tato volba použije celé diskové zařízení pro 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 "Pozor, toto smaže všechna data na vybraném disku. 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 ""
 "Pokud zamýšlíte použít část disku na něco jiného, nebo už máte data na onom "
 "disku, která nejste připraveni ztratit, potom tuto volbu nepoužívejte."
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:103
-msgid "Custom disk partitioning"
-msgstr "Vlastní rozdělení disku"
+#. 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 ""
+"Pamatujte, že toto znamená zmenšení velikosti windowsovského oddílu. Oddíl "
+"musí být \"čistý\", to znamená, že Windows musely být správně vypnuty, když "
+"byly naposledy použity. Též musely být defragmentovány, ačkoli toto není "
+"zárukou, že všechny soubory na oddíle byly přesunuty z oblasti, která má být "
+"použita. Velice se doporučuje provedení zálohy vašich osobních souborů."
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:106
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:110
+#, fuzzy
+msgid "<emphasis role=\"bold\">Custom Disk Partitioning</emphasis>"
+msgstr "<emphasis role=\"bold\">Měnění velikostí oddílu:</emphasis>"
+
+#. 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)."
@@ -1690,81 +1845,100 @@ msgstr ""
 "Toto vám dává úplnou kontrolu nad umístěním instalace na vašem pevném disku "
 "(resp. discích)."
 
-#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:112
-msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
-msgstr "<emphasis role=\"bold\">Měnění velikostí oddílu:</emphasis>"
+#. type: Content of: <section><mediaobject>
+#: en/doPartitionDisks.xml:120
+#, fuzzy
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"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 ""
 "Pokud je celkové dostupné místo menší než 50 GB, bude vytvořen jen jeden "
 "oddíl pro /, nebude tu žádný samostatný oddíl pro /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 "
 "are created"
 msgstr "Pokud je celkové dostupné místo nad 50 GB, potom se vytvoří tři oddíly"
 
-#. 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 místa je přideleno pro / , nanejvýš 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 přiděleno pro swap , nanejvýš 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 "zbytek (přinejmenším 12/19) je přiděleno pro /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 případě 160 GB a víc z dostupného místa, instalátor vytvoří "
-"tři oddíly: 50 GB pro /, 4 GB pro swap a zbytek pro adresář /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 ""
 "Pokud používáte systém UEFI, ESP (systémový oddíl EFI) bude automaticky "
 "rozpoznán, nebo vytvořen, pokud ještě neexistuje, a připojen na /boot/EFI. "
@@ -1772,46 +1946,39 @@ msgstr ""
 "zkontrolovat, že toto bylo provedeno správně."
 
 #. 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
-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 align=\"center\" fileref="
-"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </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-doPartitionDisks4.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 ""
 "Některé novější mechaniky nyní používají 4096 bajtové logické sektory, "
 "namísto předchozího standardu 512 bajtových logických sektorů. Nástroj na "
@@ -1821,20 +1988,37 @@ msgstr ""
 "mechaniku, s použitím alternativních nástrojů na rozdělování disku, jakým je "
 "gparted, pokud vlastníte takové zařízení, a použít následující nastavení:"
 
-#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:189
+#. type: Content of: <section><important><para>
+#: en/doPartitionDisks.xml:221
+#, fuzzy
+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 ""
+"Některé novější mechaniky nyní používají 4096 bajtové logické sektory, "
+"namísto předchozího standardu 512 bajtových logických sektorů. Nástroj na "
+"dělení disku použitý v instalátoru nebyl kvůli nedostatku dostupného "
+"hardware testován s takovou mechanikou. Taktéž některé mechaniky ssd dnes "
+"používají velikost vymazávacího bloku nad 1 MB. Navrhuje se napřed rozdělit "
+"mechaniku, s použitím alternativních nástrojů na rozdělování disku, jakým je "
+"gparted, pokud vlastníte takové zařízení, a použít následující nastavení:"
+
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:228
 #, fuzzy
-msgid "<emphasis role=\"bold\">Align to</emphasis> = MiB"
+msgid "<emphasis>Align to</emphasis> = MiB"
 msgstr "<emphasis role=\"bold\">Pokročilé</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\">Pokročilé</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."
@@ -1842,39 +2026,41 @@ msgstr ""
 "Též se ujistěte, že všechny oddíly jsou vytvořeny se sudým počtem megabajtů."
 
 #. 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 "Instalace ze ŽIVÉHO datového nosiče"
 
 #. 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 "Leden 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ální dokumentace pro 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/"
@@ -1885,8 +2071,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."
@@ -1897,8 +2083,7 @@ msgstr ""
 "\">NeoDoc</link>em."
 
 #. 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</"
@@ -1908,15 +2093,15 @@ msgstr ""
 "href=\"https://wiki.mageia.org/en/Documentation_team\">Dokumentačním týmem</"
 "link>, pokud byste chtěli pomoci tuto příručku vylepšit."
 
-#. 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 "
@@ -1926,43 +2111,49 @@ msgstr ""
 "příručce. Kterou obrazovku uvidíte, záleží na vašem vybavení počítače a na "
 "volbách, které učiníte během instalace."
 
-#. 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 ""
+"Byl napsán dobrovolníky v jejich volném čase. Spojte se, prosím, s <link ns6:"
+"href=\"https://wiki.mageia.org/en/Documentation_team\">Dokumentačním týmem</"
+"link>, pokud byste chtěli pomoci tuto příručku vylepšit."
+
 #. 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 "Instalace pomocí DrakX"
 
 #. type: Content of: <book><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:9
+#: en/DrakX-cover.xml:20
 msgid "February 2014"
 msgstr "Únor 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
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
@@ -1971,27 +2162,27 @@ msgstr ""
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </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 jste instalaci a nastavení <application>Mageii</application> a teď "
 "je bezpečné vyjmout instalační médium a restartovat 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 restartu, na obrazovce zavaděče, si můžete vybrat mezi operačními systémy "
 "ve vašem počítači (pokud jich máte víc 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."
@@ -2000,26 +2191,27 @@ msgstr ""
 "vybrána a spuštěna vaše nainstalovaná Mageia."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:26
+#: en/exitInstall.xml:30
 msgid "Enjoy!"
 msgstr "Bavte se!"
 
 #. 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štivte www.mageia.org, pokud máte nějaké otázky nebo pokud chcete přispět "
 "do Mageii"
 
 #. type: Content of: <section><info><title>
-#: en/firewall.xml:3
+#: en/firewall.xml:7
 msgid "Firewall"
 msgstr "Firewall"
 
 #. 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 "
@@ -2028,46 +2220,46 @@ 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
 msgid "<emphasis role=\"bold\">Advanced</emphasis>"
 msgstr "<emphasis role=\"bold\">Pokročilé</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
 msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
 msgstr "<emphasis>&lt;port-number>/&lt;protocol></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 "
@@ -2075,7 +2267,7 @@ 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."
@@ -2085,21 +2277,21 @@ msgstr ""
 "službou."
 
 #. 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átování"
 
@@ -2107,15 +2299,16 @@ msgstr "Formátování"
 #.  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 revision=\"1\" fileref=\"dx2-"
 "formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id="
@@ -2125,7 +2318,7 @@ msgstr ""
 "</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 "
@@ -2136,28 +2329,31 @@ msgstr ""
 "budou ušetřena."
 
 #. 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 ""
 "Obyčejně potřebují být naformátovány přinejmenším oddíly, které DrakX vybral."
 
 #. 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 ""
 "Klepněte na <guibutton>Pokročilé</guibutton> pro výběr oddílů, které chcete "
 "zkontrolovat 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 ""
 "Pokud si nejste jistí, zda jste vykonali správnou volbu, můžete klepnout na "
 "tlačítko <guibutton>Předchozí</guibutton>, opět na <guibutton>Předchozí</"
@@ -2166,21 +2362,22 @@ msgstr ""
 "na vašich oddílech."
 
 #. 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 ""
 "Pokud jste spokojen s výběrem, klepněte na <guibutton>Další</guibutton> pro "
 "pokračování."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:10
+#: en/installer.xml:14
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, instalátor Mageii"
 
 #. 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 "
@@ -2190,331 +2387,243 @@ msgstr ""
 "je navržen tak, aby instalace nebo aktualizace byla tak jednoduchá, jak jen "
 "je to možné."
 
-#. 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čáteční nabídková obrazovka má různé možnosti, každopádně předvolená "
-"spustí instalátor, který bude obyčejně mít vše, co potřebujete."
-
 #. type: Content of: <section><section><title>
-#: en/installer.xml:22
-msgid "Installation Welcome Screen"
-msgstr "Uvítací instalační obrazovka"
-
-#. type: Content of: <section><section><section><title>
-#: en/installer.xml:25
-msgid "Using a Mageia DVD"
-msgstr "Použití DVD Mageia"
+#: en/installer.xml:20
+msgid "The installation steps"
+msgstr "Instalační kroky"
 
-#. 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 ""
-"Zde jsou výchozí uvítací obrazovky při používaní DVD Mageia. První je se "
-"systémem UEFI a druhá se zastaralým systémem:"
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:32
-msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
+"Proces instalace je rozdělen do více kroků, které je možné sledovat na "
+"bočním panelu obrazovky."
 
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:37
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/installer.xml:28
+#, fuzzy
 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 nebo více obrazovek, které též můžou mít tlačítka "
+"<guibutton>Pokročilé</guibutton> s obyčejně méně žádanými možnostmi navíc."
 
-#. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:45
-msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:50
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/installer.xml:33
+#, fuzzy
 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ětšina obrazovek má tlačítka <guibutton>Nápověda</guibutton>, která dávají "
+"bližší vysvětlení aktuálního 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 ""
+"Pokud se někde během instalace rozhodnete instalaci ukončit, je možný "
+"restart, ale promyslete si to, prosím, dvakrát, dříve než to uděláte. Když "
+"už byl oddíl jednou naformátován nebo se začaly instalovat aktualizace, váš "
+"počítač už nadále není ve stejném stavu a jeho opětovné spuštění by vás "
+"mohlo celkem snadno nechat s nepoužitelným systémem. Pokud jste si přesto "
+"velmi jistí, že chcete provést restart, jděte do textového terminálu za "
+"současného stisknutí tří kláves <guibutton>Alt+Ctrl+F2</guibutton>. Potom "
+"současně stiskněte <guibutton>Alt+Ctrl+Delete</guibutton> pro restart."
 
-#. 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
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+#. type: Content of: <section><section><title>
+#: en/installer.xml:48
+msgid "Installation Welcome Screen"
+msgstr "Uvítací instalační obrazovka"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:72
-#, fuzzy
+#. type: Content of: <section><section><para>
+#: en/installer.xml:49
 msgid ""
-"Use the arrow keys to select the language then press <emphasis role=\"bold"
-"\">Enter</emphasis>."
-msgstr "Použijte šipkové klávesy pro výběr jazyka a stiskněte klávesu Enter."
+"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 ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:77
+#. type: Content of: <section><section><para>
+#: en/installer.xml:52
 #, fuzzy
 msgid ""
-"If needed, change the screen resolution by pressing <emphasis role=\"bold"
-"\">F3</emphasis> (Legacy mode only)."
+"The welcome menu screen has various options, however the default option will "
+"start the installer, and is normally all that you will need."
 msgstr ""
-"Změňte rozlišení obrazovky stisknutím klávesy F3 (jen v zastaralém režimu)."
+"Počáteční nabídková obrazovka má různé možnosti, každopádně předvolená "
+"spustí instalátor, který bude obyčejně mít vše, co potřebujete."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:81
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:56
+msgid "Legacy (BIOS) Systems"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:88
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:58
+#, fuzzy
 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)."
+"<imageobject> <imagedata fileref=\"dx-welcome.png\" align=\"center\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.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 "- Výchozí, tato nemění nic ve výchozích volbách."
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/installer.xml:101
-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 ""
 
-#. 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 ""
-"- Žádné ACPI (pokročilé rozhraní nastavení a napájení), správa napájení není "
-"brána 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 ""
-"- Žádný místní APIC (lokální pokročilý programovatelný ovladač přerušení), "
-"jedná se o přerušení CPU, vyberte tuto volbu, pokud jste k tomu vyzváni."
+msgid "<emphasis role=\"bold\">Rescue System</emphasis>"
+msgstr "<emphasis role=\"bold\">Pokročilé</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 ""
-"Když si vyberete jednu z těchto položek, tato změní výchozí volby zobrazené "
-"v řádku <guilabel>Volby zavádění 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 některých vydáních Mageii se může stát, že se položky vybrané klávesou F6 "
-"neobjevují v řádku <guilabel>Volby zavádění systému</guilabel>, avšak ve "
-"skutečnosti jsou brány do úvahy."
+msgid "<emphasis role=\"bold\">Memory Test</emphasis>"
+msgstr "<emphasis role=\"bold\">Pokročilé</emphasis>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:132
+#. 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 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 ""
-"Stisknutí klávesy F1 otevře nové okno s dalšími dostupnými volbami. Vyberte "
-"jednu šipkovými klávesami a stiskněte klávesu Enter pro obdržení více "
-"podrobností nebo stiskněte klávesu Esc pro návrat na uvítací obrazovku."
+msgid "<emphasis role=\"bold\">F2: Language</emphasis>"
+msgstr "<emphasis role=\"bold\">Pokročilé</emphasis>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:146
-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\"/> </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ý přehled o rozsahu voleb. Stiskněte Esc nebo zvolte <guilabel>návrat "
-"k parametrům spuštění</guilabel> pro návrat zpět do seznamu voleb. Tyto "
-"volby mohou být přidány ručně v řádku <guilabel>Volby zavádění systému</"
-"guilabel>."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:158
+#. 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 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ápověda je přeložena ve zvoleném jazyku pomocí klávesy 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 ""
-"Pro více informací o volbách pro kernel na zastaralých systémech a systémech "
-"UEFI se podívejte na: <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 "Instalační kroky"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.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 instalace je rozdělen do více kroků, které je možné sledovat na "
-"bočním panelu 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 nebo více obrazovek, které též můžou mít tlačítka "
-"<guibutton>Pokročilé</guibutton> s obyčejně méně žádanými možnostmi navíc."
+msgid "<emphasis role=\"bold\">Install:</emphasis> Start the Install process"
+msgstr "<emphasis role=\"bold\">Pokročilé</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ětšina obrazovek má tlačítka <guibutton>Nápověda</guibutton>, která dávají "
-"bližší vysvětlení aktuálního 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 ""
-"Pokud se někde během instalace rozhodnete instalaci ukončit, je možný "
-"restart, ale promyslete si to, prosím, dvakrát, dříve než to uděláte. Když "
-"už byl oddíl jednou naformátován nebo se začaly instalovat aktualizace, váš "
-"počítač už nadále není ve stejném stavu a jeho opětovné spuštění by vás "
-"mohlo celkem snadno nechat s nepoužitelným systémem. Pokud jste si přesto "
-"velmi jistí, že chcete provést restart, jděte do textového terminálu za "
-"současného stisknutí tří kláves <guibutton>Alt+Ctrl+F2</guibutton>. Potom "
-"současně stiskněte <guibutton>Alt+Ctrl+Delete</guibutton> pro restart."
+"Pokud jste počítač spustili ze zařízení USB, dostanete dva doplňující řádky, "
+"které jsou duplikáty předchozích řádků zakončených zkratkou \"USB\". Máte je "
+"vybrat."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:203
+#: en/installer.xml:115
 msgid "Installation Problems and Possible Solutions"
 msgstr "Problémy při instalaci a možné řešení"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:206
+#: en/installer.xml:117
 msgid "No Graphical Interface"
 msgstr "Bez grafického rozhraní"
 
 #. 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čáteční obrazovce vám nenaběhla obrazovka výběru jazyka. Toto se může "
 "stát s některými grafickými kartami a staršími systémy. Zkuste použít nízké "
 "rozlišení obrazovky napsáním <code>vgalo</code> v příkazovém řádku."
 
 #. 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 ""
 "Pokud je vybavení počítače velmi staré, grafická instalace nemusí být možná. "
 "V tomto případě se oplatí vyzkoušet instalaci v textovém režimu. Pro její "
@@ -2523,18 +2632,19 @@ msgstr ""
 "stiskněte ENTER. Nyní pokračujte instalací v textovém režimu."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:230
+#: en/installer.xml:138
 msgid "The Install Freezes"
 msgstr "Instalace 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 ""
 "Pokud sa zdá, že systém během instalace zamrzává, může to být problém se "
 "zjišťováním vybavení počítače součástkami. V tomto případě může být "
@@ -2543,18 +2653,19 @@ msgstr ""
 "může být, když je třeba, též spojena i s jinými volbami."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:240
+#: en/installer.xml:146
 msgid "RAM problem"
 msgstr "Problém paměti 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 potřebné zřídka, ale v některých případech může hardware nesprávně "
 "ohlásit dostupnou paměť RAM. Abyste ji zadali ručně, můžete použít parametr "
@@ -2562,20 +2673,20 @@ msgstr ""
 "<code>mem=256M</code> by znamenalo 256 MB RAM."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:249
+#: en/installer.xml:154
 msgid "Dynamic partitions"
 msgstr "Dynamické oddíly"
 
 #. 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 ""
 "Pokud jste váš pevný disk převedli ze \"základního\" formátu na \"dynamický"
 "\" formát v systému Microsoft Windows, musíte vědět, že je nemožné "
@@ -2585,19 +2696,15 @@ msgstr ""
 "cc776315.aspx</link>."
 
 #. type: Content of: <section><info><title>
-#: en/installUpdates.xml:3
+#: en/installUpdates.xml:16
 msgid "Updates"
 msgstr "Aktualizace"
 
-#.  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 ""
@@ -2605,99 +2712,113 @@ msgstr ""
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </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 ""
 "Od té doby, co byla uvolněna tato verze operačního systému "
 "<application>Mageia</application>, byly některé balíčky aktualizovány nebo "
 "vylepšeny."
 
-#. 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 ""
 "Zvolte <guilabel>ano</guilabel>, pokud si je přejete stáhnout a "
 "nainstalovat, vyberte <guilabel>ne</guilabel>, pokud to teď nechcete udělat, "
 "nebo pokud nejste připojeni 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 stiskněte <guibutton>Další</guibutton> pro pokračování"
 
 #. type: Content of: <section><info><title>
-#: en/login.xml:1
-msgid "Login screen"
+#: en/login.xml:4
+#, fuzzy
+msgid "Login Screen"
 msgstr "Přihlašovací 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 "Přihlašovací obrazovka KDM"
 
 #. 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 "Nakonec se dostanete k přihlašovací obrazovce"
 
 #. 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 své uživatelské jméno a uživatelské heslo a za pár sekund se, podle "
 "toho který živý datový nosič jste použili, ocitnete v nahraném prostředí KDE "
 "nebo GNOME. Nyní můžete začít používat vaši instalaci Mageii."
 
 #. 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 ""
 "Další část naší dokumentace můžete najít 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ýběr zdrojů (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=\"selectCountry-im1\" align="
-"\"center\" fileref=\"dx2-selectCountry.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 "
@@ -2709,7 +2830,7 @@ msgstr ""
 "určuje, které balíčky budou dostupné k vybrání během dalších kroků."
 
 #. 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."
@@ -2718,12 +2839,13 @@ msgstr ""
 "základ distribuce."
 
 #. 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ář pro <emphasis>Nonfree</emphasis> software obsahuje balíčky, které "
@@ -2734,7 +2856,7 @@ msgstr ""
 "WiFi atd."
 
 #. 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 "
@@ -2756,69 +2878,71 @@ msgid "Minimal Install"
 msgstr "Minimální instalace"
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:11
+#: en/minimal-install.xml:17
+#, fuzzy
+msgid ""
+"Minimal Installation is intended for those with specific uses in mind for "
+"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ální instalace je zamýšlena pro ty, kteří zamýšlejí zvláštní využití "
+"své <application>Mageii</application>, jakým je server nebo specializovaná "
+"pracovní stanice. Tuto volbu pravděpodobně použijete spojenu s možností "
+"\"výběru jednotlivých balíčků\" vzpomenutou výše, k doladění vaší instalace. "
+"Podívejte se na <xref linkend=\"choosePackagesTree\"></xref>."
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/minimal-install.xml:24
 #, fuzzy
 msgid ""
-"You can choose a Minimal Installation by de-selecting everything in the "
-"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"/>."
+"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 zvolit Minimální instalaci odznačením všeho na obrazovce Výběru "
 "skupin balíčků. Podívejte se na <xref linkend=\"choosePackageGroups\"></"
 "xref>."
 
-#. type: Content of: <section><para>
-#: en/minimal-install.xml:14
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/minimal-install.xml:28
 #, fuzzy
 msgid ""
-"If desired, you can additionally tick the <emphasis role=\"bold\">Individual "
-"package selection</emphasis> option in the same screen."
+"If desired, you can additionally tick the <emphasis>Individual package "
+"selection</emphasis> option in the same screen."
 msgstr ""
 "Pokud je žádána, můžete na téže obrazovce dodatečně zaškrtnout volbu pro "
 "\"výběr jednotlivých balíčků\"."
 
-#. 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"
-"\"/>."
-msgstr ""
-"Minimální instalace je zamýšlena pro ty, kteří zamýšlejí zvláštní využití "
-"své <application>Mageii</application>, jakým je server nebo specializovaná "
-"pracovní stanice. Tuto volbu pravděpodobně použijete spojenu s možností "
-"\"výběru jednotlivých balíčků\" vzpomenutou výše, k doladění vaší instalace. "
-"Podívejte se na <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:33
 #, 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."
+"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 ""
 "Pokud jste si zvolili tuto instalační třídu, potom vám příslušná obrazovka "
 "nabídne několik užitečných věcí navíc k nainstalování, jakými jsou "
 "dokumentace 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í dokumentace je poskytnuta v podobě manuálových a informačních "
 "stránek. Obsahuje manuálové stránky z <link xlink:href=\"http://www.tldp.org/"
@@ -2827,7 +2951,7 @@ msgstr ""
 "\">jádrových programech GNU</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="
@@ -2839,25 +2963,33 @@ msgstr ""
 
 #. type: Content of: <section><info><title>
 #: en/misc-params.xml:3
-msgid "Summary of miscellaneous parameters"
-msgstr "Souhrn různých parametrů"
+#, fuzzy
+msgid "Configuration Summary"
+msgstr "Nastavení 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=\"dx2-summaryTop.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 udělal chytré volby pro nastavení vašeho systému závisící na volbách, "
 "které jste udělal a na vybavení počítače, které DrakX zjistil. Nastavení "
@@ -2865,43 +2997,43 @@ msgstr ""
 "<guibutton>Nastavit</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 "existují známé problémy s výchozím nastavením"
 
 #. 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 "výchozí nastavení bylo vyzkoušeno, ale selhalo"
 
 #. 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 "Systémové parametry"
 
 #. 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\">Pokročilé</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 pro vás vybral časové pásmo, vzhledem k vašemu oblíbenému jazyku. "
@@ -2909,12 +3041,13 @@ msgstr ""
 "\"configureTimezoneUTC\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:53
-msgid "<guilabel>Country / Region</guilabel>"
-msgstr "<guilabel>Země/Oblast</guilabel>"
+#: en/misc-params.xml:62
+#, fuzzy
+msgid "<emphasis role=\"bold\">Country / Region</emphasis>"
+msgstr "<emphasis role=\"bold\">Měnění velikostí oddílu:</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 "
@@ -2924,47 +3057,49 @@ msgstr ""
 "nastavení. Podívejte se na <xref linkend=\"selectCountry\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:62
-msgid "<guilabel>Bootloader</guilabel>"
-msgstr "<guilabel>Zavaděč</guilabel>"
+#: en/misc-params.xml:70
+#, fuzzy
+msgid "<emphasis role=\"bold\">Bootloader</emphasis>"
+msgstr "<emphasis role=\"bold\">Pokročilé</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 udělal dobré výběry pro nastavení zavaděče 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 "Pokud nevíte jak nastavit Grub2, nic neměňte"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:70
-msgid "For more information, see <xref linkend=\"setupBootloader\"/>"
-msgstr "Pro více informací se podívejte na <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 uživatelů</guilabel>"
+#: en/misc-params.xml:83
+#, fuzzy
+msgid "<emphasis role=\"bold\">User management</emphasis>"
+msgstr "<emphasis role=\"bold\">Pokročilé</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 ""
 "Zde můžete přidat další uživatele. Každý z nich obdrží svůj vlastní "
 "<literal>/home</literal> t. j. domácí adresáře."
 
 #. 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\">Pokročilé</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 "
@@ -2975,32 +3110,29 @@ msgstr ""
 "umožňuje povolit nebo zakázat 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 ""
 "Zde byste měli zaškrtávat opatrně, dříve než tu cokoli změníte - omyl může "
 "zabránit správnému běhu vašeho počítače."
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:94
-msgid "For more information, see <xref linkend=\"configureServices\"/>"
-msgstr ""
-"Pro více informací se podívejte na <xref linkend=\"configureServices\"/>"
-
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:101
+#: en/misc-params.xml:106
 msgid "Hardware parameters"
 msgstr "Hardwarové parametry"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:106
-msgid "<guilabel>Keyboard</guilabel>:"
-msgstr "<guilabel>Klávesnice</guilabel>:"
+#: en/misc-params.xml:111
+#, fuzzy
+msgid "<emphasis role=\"bold\">Keyboard</emphasis>"
+msgstr "<emphasis role=\"bold\">Pokročilé</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 "
@@ -3010,19 +3142,20 @@ msgstr ""
 "vaší poloze, jazyku nebo typu 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\">Pokročilé</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."
@@ -3031,42 +3164,43 @@ msgstr ""
 "kulové ovladače atd."
 
 #. 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\">Pokročilé</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 ""
-"Instalátor používá výchozí ovladač, pokud nějaký výchozí existuje. Možnost "
-"výběru odlišného ovladače je dána jen tehdy, když je více než jeden ovladač "
-"pro vaši kartu, ale žádný z nich není výchozí."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:137
-msgid "<guilabel>Graphical interface</guilabel>:"
-msgstr "<guilabel>Grafické rozhraní</guilabel>:"
+#: en/misc-params.xml:144
+#, fuzzy
+msgid "<emphasis role=\"bold\">Graphical interface</emphasis>"
+msgstr "<emphasis role=\"bold\">Pokročilé</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 ""
 "Tento oddíl vám dovoluje nastavit vaši grafickou 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 ""
-"Pro více informací se podívejte na <xref linkend=\"configureX_chooser\"/>."
-
 #. type: Content of: <section><section><mediaobject>
-#: en/misc-params.xml:149
+#: en/misc-params.xml:155
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
 "\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
@@ -3075,22 +3209,23 @@ msgstr ""
 "\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"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 "Parametry sítě a internetu"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:163
-msgid "<guilabel>Network</guilabel>:"
-msgstr "<guilabel>Síť</guilabel>:"
+#: en/misc-params.xml:169
+#, fuzzy
+msgid "<emphasis role=\"bold\">Network</emphasis>"
+msgstr "<emphasis role=\"bold\">Pokročilé</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 ""
 "Zde můžete nastavit vaši síť, ale pro síťové karty s nesvobodnými ovladači "
@@ -3099,7 +3234,7 @@ msgstr ""
 "(Nonfree)."
 
 #. 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 "
@@ -3109,15 +3244,17 @@ msgstr ""
 "sledování onoho rozhraní."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:179
-msgid "<guilabel>Proxies</guilabel>:"
-msgstr "<guilabel>Proxy</guilabel>:"
+#: en/misc-params.xml:185
+#, fuzzy
+msgid "<emphasis role=\"bold\">Proxies</emphasis>"
+msgstr "<emphasis role=\"bold\">Pokročilé</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 ""
 "Proxy Server slouží jako zprostředkovatel mezi vaším počítačem a širším "
@@ -3125,68 +3262,74 @@ msgstr ""
 "některé 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žná se budete potřebovat poradit s vaším systémovým správcem pro získání "
 "parametrů, které sem potřebujete zadat"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:195
+#: en/misc-params.xml:201
 msgid "Security"
 msgstr "Bezpečnost"
 
 #. 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\">Pokročilé</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 ""
 "Zde nastavujete Úroveň bezpečnosti pro váš počítač, ve většině případů je "
 "výchozí nastavení (standardní) pro běžné použití přiměřené."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:207
-msgid "Check the option which best suits your usage."
-msgstr "Zaškrtněte volbu, která se nejlépe hodí k vašemu používání."
+#: en/misc-params.xml:215
+#, fuzzy
+msgid "<emphasis role=\"bold\">Firewall</emphasis>"
+msgstr "<emphasis role=\"bold\">Pokročilé</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, moravsky ohnivá zeď, má sloužit jako překážka mezi vašimi "
-"důležitými daty a ničemy venku na internetu, kteří by je chtěli vyzradit "
-"nebo ukradnout."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:218
-msgid ""
-"Select the services that you wish to have access to your system. Your "
-"selections will depend on what you use your computer for. For more "
-"information, see <xref linkend=\"firewall\"/>."
+#: en/misc-params.xml:229
+#, fuzzy
+msgid "For more information, see <xref linkend=\"firewall\"/>."
 msgstr ""
-"Vyberte si služby, které si přejete, aby měly přístup k vašemu systému. Vaše "
-"výběry budou záležet na tom, k čemu používáte váš počítač. Další informace "
-"najdete na <xref linkend=\"firewall\"/>."
+"Pro více informací se podívejte na <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 ""
 "Mějte na paměti, že dovolení všeho (žádný firewall) může být velmi riskantní."
 
@@ -3196,35 +3339,50 @@ msgid "Reboot"
 msgstr "Restartovat"
 
 #. 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 ""
 "Když byl zavaděč nainstalován, budete vyzváni k pozastavení vašeho počítače, "
 "odstranění živého CD a restartování počítače. Klepněte na <emphasis role="
 "\"bold\"><guibutton>Dokončit</guibutton></emphasis> a jednejte podle "
 "požadavků<emphasis role=\"bold\">, v tomto pořadí!</emphasis>"
 
+#. 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
-msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
+#: en/reboot.xml:12
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot2.png\"/> </"
+"imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"live-reboot2.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 ""
 "Když restartujete, uvidíte následnost ukazovatelů postupu stahování. Tyto "
 "naznačují, že jsou stahovány seznamy nosičů software (viz Správa software)."
 
 #. type: Content of: <section><mediaobject>
-#: en/reboot.xml:17
+#: en/reboot.xml:19
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
 "reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
@@ -3253,46 +3411,52 @@ msgstr ""
 "instalaci <application>Mageii</application>."
 
 #. type: Content of: <section><info><title>
-#: en/securityLevel.xml:3
+#: en/securityLevel.xml:10
 msgid "Security Level"
 msgstr "Úroveň zabezpečení"
 
 #.  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=\"selectCountry-im1\" align="
-"\"center\" fileref=\"dx2-selectCountry.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\">Měnění velikostí oddílu:</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:19
+#: en/securityLevel.xml:29
+msgid ""
+"<emphasis>Standard</emphasis> is the default, and recommended setting for "
+"the average user."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:32
 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>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:24
+#: en/securityLevel.xml:36
 #, fuzzy
 msgid "<emphasis role=\"bold\">Security Administrator</emphasis>"
 msgstr "<emphasis role=\"bold\">Pokročilé</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 "
@@ -3300,14 +3464,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 "
@@ -3315,27 +3479,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 ""
 "I po instalaci bude vždy možné upravit vaše bezpečnostní nastavení v části "
 "<guilabel>Bezpečnost</guilabel> Ovládacího centra Mageii."
 
 #. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:6
+#: en/SelectAndUseISOs2.xml:15
 msgid "Select and use ISOs"
 msgstr "Vyberte a používejte 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 "
@@ -3345,18 +3509,19 @@ msgstr ""
 "obraz vyhovuje vašim potřebá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 "Jsou tu dvě rodiny nosičů:"
 
 #. 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ý instalátor: Po zavedení z nosiče bude následovat postup dovolující "
 "výběr toho, co chcete nainstalovat a jak nastavit váš cílový systém. Toto "
@@ -3365,43 +3530,91 @@ msgstr ""
 "nainstalujete."
 
 #. 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 ""
-"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"
+"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é soubory ISO mohou být použity jen na vytvoření "
+"čistých instalací, nemohou být použity na aktualizaci z předchozích vydání.</"
+"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ý z nich je malý obraz, který neobsahuje víc než to, co je třeba pro "
+"nastartování drakx instalátoru a nalezení drakx-instalátoru-části2 a dalších "
+"balíčků, které jsou potřebné pro pokračování a dokončení instalace. Tyto "
+"balíčky mohou být na pevném disku v PC, na místním disku, na místní síti "
+"anebo na internetu."
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:53
+#, 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 ""
+"Tyto nosiče jsou velmi lehké (menší než 100 MB) a jsou vhodné, když je "
+"přenosové pásmo příliš malé na stáhnutí plného DVD, když PC nemá DVD "
+"mechaniku anebo když PC nedokáže nastartovat ze zařízení USB."
+
 #. 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 jsou uvedeny v dalších částech."
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:30
+#: en/SelectAndUseISOs2.xml:61
 msgid "Media"
 msgstr "Média"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:32
+#: en/SelectAndUseISOs2.xml:63
 msgid "Definition"
 msgstr "Definice"
 
 #. 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 ""
 "Zde je médiem (nosičem) obrazový soubor ISO, který vám umožňuje instalovat a/"
 "nebo aktualizovat Mageiu a při rozšíření jakoukoli fyzickou podporu, na "
 "kterou je soubor ISO zkopírován."
 
 #. 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/"
@@ -3411,281 +3624,269 @@ msgstr ""
 "link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:39
+#: en/SelectAndUseISOs2.xml:70
 msgid "Classical installation media"
 msgstr "Klasické instalač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 "Běž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 "Tyto soubory ISO používají tradiční instalá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áží udělat čistou instalaci nebo aktualizovat z předchozích vydání."
 
 #. 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ůzné nosiče pro 32 nebo 64 bitové architektury."
 
 #. 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 ""
 "Některé nástroje jsou dostupné na uvítací obrazovce: Záchranný systém, "
 "paměťový test, nástroj na zjištění hardware."
 
 #. 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á prostředí pracovní 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 "Během instalace vám bude dána volba přidat si nesvobodný software."
 
 #. 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 ""
 "Mohou být použity na obhlídku distribuce bez jejího nainstalování na pevný "
 "disk i na volitelné nainstalování Mageii na váš pevný disk."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:79
-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 pouze jedno grafické prostředí (KDE - Plasma, GNOME nebo "
-"Xfce)"
 
 #. 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é soubory ISO mohou být použity jen na vytvoření "
-"čistých instalací, nemohou být použity na aktualizaci z předchozích vydání.</"
-"emphasis>"
+"Každé ISO obsahuje pouze jedno grafické prostředí (KDE - Plasma, GNOME nebo "
+"Xfce)"
 
 #. 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í nesvobodný software."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:96
+#: en/SelectAndUseISOs2.xml:126
 msgid "Live DVD Plasma"
 msgstr "Živé DVD Plasma"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:99
-msgid "Plasma desktop environment only."
+#: en/SelectAndUseISOs2.xml:129
+#, fuzzy
+msgid "Plasma desktop environment only"
 msgstr "Pouze KDE Plasma."
 
 #. 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šechny jazyky jsou přítomny."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:105
-msgid "64 bit architecture only."
-msgstr "Pouze 64 bitová architektura."
+#: en/SelectAndUseISOs2.xml:135 en/SelectAndUseISOs2.xml:149
+#, fuzzy
+msgid "64-bit architecture only"
+msgstr "Pouze 64 bitová architektura"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:110
+#: en/SelectAndUseISOs2.xml:140
 msgid "Live DVD GNOME"
 msgstr "Live 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 "Jen prostředí pracovní plochy GNOME."
 
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:119
-msgid "64 bit architecture only"
-msgstr "Pouze 64 bitová architektura"
-
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:124
+#: en/SelectAndUseISOs2.xml:154
 msgid "Live DVD Xfce"
 msgstr "Živé DVD Xfce"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:127
-msgid "Xfce desktop environment only."
+#: en/SelectAndUseISOs2.xml:157
+#, fuzzy
+msgid "Xfce desktop environment only"
 msgstr "Pouze Xfce."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:133
-msgid "32 or 64 bit architectures."
+#: en/SelectAndUseISOs2.xml:163
+#, fuzzy
+msgid "32 or 64-bit architectures"
 msgstr "32 nebo 64 bitová architektura."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:139
+#: en/SelectAndUseISOs2.xml:169
 #, fuzzy
 msgid "Net install media"
 msgstr "netinstall.iso"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:144
-#, 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ý z nich je malý obraz, který neobsahuje víc než to, co je třeba pro "
-"nastartování drakx instalátoru a nalezení drakx-instalátoru-části2 a dalších "
-"balíčků, které jsou potřebné pro pokračování a dokončení instalace. Tyto "
-"balíčky mohou být na pevném disku v PC, na místním disku, na místní síti "
-"anebo na internetu."
-
-#. 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 ""
-"Tyto nosiče jsou velmi lehké (menší než 100 MB) a jsou vhodné, když je "
-"přenosové pásmo příliš malé na stáhnutí plného DVD, když PC nemá DVD "
-"mechaniku anebo když PC nedokáže nastartovat ze zařízení USB."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:161
+#: en/SelectAndUseISOs2.xml:177
 #, fuzzy
-msgid "First steps are English language only."
+msgid "First steps are English language only"
 msgstr "Jen anglický jazyk."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:166
+#: en/SelectAndUseISOs2.xml:182
 msgid "netinstall.iso"
 msgstr "netinstall.iso"
 
 #. 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 jen svobodný software, pro ty lidi, kteří upřednostňují nepoužívat "
 "nesvobodný software."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:175
+#: en/SelectAndUseISOs2.xml:191
 msgid "netinstall-nonfree.iso"
 msgstr "netinstall-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 nesvobodný software (většinou ovladače, kodeky...) pro lidi, kteří "
 "jej potřebují."
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:186
+#: en/SelectAndUseISOs2.xml:202
 msgid "Downloading and Checking Media"
 msgstr "Stahování a zkontrolování nosiče"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:188
+#: en/SelectAndUseISOs2.xml:204
 msgid "Downloading"
 msgstr "Stažení"
 
 #. 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 ""
 "Pokud jste si už vybrali váš soubor ISO, můžete ho stáhnout buď pomocí http "
 "nebo BitTorrentu. V obou případech vám okno podává pár informací, jako jsou "
 "použitý zrcadlový server a příležitost ke změně, pokud je přenosová rychlost "
 "příliš nízká. Pokud je vybráno http, můžete uvidět i něco takového"
 
-#. 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 jsou nástroje ke zkontrolování neporušenosti souboru ISO. "
-"Jeden z nich si ponechejte <link linkend=\"integrity\">pro budoucí použití</"
-"link>. Potom se objeví tomuto podobné 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
 msgid "Checking the integrity of the downloaded media"
 msgstr "Ověřování neporušenosti stáhnutého nosiče"
 
 #. 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 ""
 "Oba kontrolní součty jsou hexadecimální čísla vypočítaná algoritmem ze "
 "souboru, který má být stáhnut. Když tyto algoritmy požádáte o přepočítání "
@@ -3695,7 +3896,7 @@ msgstr ""
 "nebo pokusit o opravu pomocí BitTorrentu."
 
 #. 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 "
@@ -3703,76 +3904,87 @@ msgid ""
 msgstr "Otevřete konzoli, netřeba být superuživatelem (root), 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 ""
 "- pro použití md5sum, napište: [sam@localhost]$ <userinput>md5sum cesta/k/"
 "obrazovému/souboru.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 ""
+"- pro použití sha1sum, napište: [sam@localhost]$ <userinput>sha1sum cesta/k/"
+"obrazovému/souboru.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 ""
 "- pro použití sha1sum, napište: [sam@localhost]$ <userinput>sha1sum cesta/k/"
 "obrazovému/souboru.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 porovnejte získané číslo z vašeho počítače (možná na ně budete muset "
 "chvilku počkat) s číslem daným Mageiou. Například:"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:237
+#: en/SelectAndUseISOs2.xml:270
 msgid "Burn or dump the ISO"
 msgstr "Vypálení nebo vepsání souboru ISO"
 
 #. 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 ""
 "Zkontrolované ISO může být nyní vypáleno na CD nebo DVD anebo vepsané "
 "(zapsané) na zařízení USB. Tyto operace nejsou obyčejným kopírováním a cílí "
 "k vytvoření zaveditelného nosiče."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:275
 msgid "Burning the ISO to a CD/DVD"
 msgstr "Vypálení souboru ISO 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žijte kterýkoli vypalovací program, který si přejete, ale ujistěte se, že "
 "vypalovací zařízení je správně nastaveno na <emphasis role=\"bold\">vypálit "
@@ -3781,48 +3993,55 @@ 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 "Zapsat ISO na USB flash"
 
 #. 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šechny soubory ISO Mageii jsou hybridy, což znamená, že je můžete "
 "'vepsat' (zapsat) na zařízení USB, a potom je použít na zavedení a instalaci "
 "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 ""
 "\"vepsání\" (zapsání) obrazu na flashové zařízení zničí jakýkoli předešlý "
 "souborový systém na zařízení; všechna ostatní data budou ztracena a kapacita "
 "oddílu bude zmenšena na velikost 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 ""
-"Pro obnovu původní kapacity, musíte znovu předělat oddíl zařízení USB a "
-"naformátovat 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ástroje 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>"
@@ -3831,27 +4050,27 @@ msgstr ""
 "mageia.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ástroje ve Windows"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:304
 msgid "You could try:"
 msgstr "Můžete vyzkoušet:"
 
 #. 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žitím volby \"obraz ISO\";"
 
 #. 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 "
@@ -3861,12 +4080,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žitím příkazového řádku v systému 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 "
@@ -3876,70 +4096,78 @@ msgstr ""
 "diskový oddíl, zadáte-li nesprávně ID zařízení."
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:325
 msgid "Open a console"
 msgstr "Otevřete konzoli"
 
 #. 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 se superuživatelem (rootem) použitím příkazu <userinput>su -</"
 "userinput> (nezapomeňte na koncovou pomlčku '-')"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:291
-msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
+#: en/SelectAndUseISOs2.xml:332
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"Root.png\"/> </"
+"imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Root.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 vaše zařízení USB (nepřipojujte je příkazem mount, což znamená, "
 "neotevírejte žádný program nebo správce souborů, který by ho mohl "
 "zpřístupnit nebo z něho číst)"
 
 #. 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 "Použijte pří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>"
+#: en/SelectAndUseISOs2.xml:345
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"Fdisk.png\"/> </"
+"imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Fdisk.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 ""
 "Najděte název zařízení pro vaše zařízení USB (podle jeho velikosti), "
 "například <code>/dev/sdb</code> na obrázku výše, je to zařízení 8GB USB."
 
 #. 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 ""
 "Případně můžete získat název zařízení příkazem <code>dmesg</code>: na konci, "
 "vidíte název zařízení začínající na <emphasis>sd</emphasis>, a "
 "<emphasis>sdd</emphasis> v tomto případě:"
 
 #. 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"
@@ -3981,53 +4209,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=\"mediaobject\" 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 příkaz: # <userinput>dd if=cesta/k/ISO/souboru 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ázev vašeho zařízení, např. /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 ""
 "Příklad: # <userinput>dd if=/home/uživatel/Stahování/Mageia-6-x86_64-DVD.iso "
 "of=/dev/sdb bs=1M</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><tip><para>
-#: en/SelectAndUseISOs2.xml:345
+#: 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 pří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 ""
 
@@ -4037,8 +4269,10 @@ msgid "Select your Country / Region"
 msgstr "Vyberte zemi"
 
 #.  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
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
 "\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
@@ -4046,35 +4280,35 @@ msgstr ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
 "\"center\" fileref=\"dx2-selectCountry.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ši zemi nebo oblast. Toto je důležité pro všechny druhy nastavení, "
 "jako jsou měna a bezdrátová regulační doména. Nastavení nesprávné země může "
 "vést k neschopnosti používání bezdrátové sítě."
 
-#. 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 ""
 "Pokud vaše země není v seznamu, klepněte na tlačítko <guilabel>Ostatní země</"
 "guilabel> a tam si vyberte vaši zemi/oblast."
 
 #. 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 ""
 "Pokud je vaše země jen v seznamu <guilabel>ostatních zemí</guilabel>, po "
 "klepnutí na <guibutton>OK</guibutton> se může zdát, že země byla vybrána ze "
@@ -4082,15 +4316,15 @@ msgstr ""
 "volbu."
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:33
+#: en/selectCountry.xml:42
 msgid "Input method"
 msgstr "Vstupní metoda"
 
 #. 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. "
@@ -4108,13 +4342,13 @@ msgstr ""
 "balíčků."
 
 #. 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 ""
 "Pokud jste během instalace vynechali nastavení vstupní metody, můžete ji "
 "zpřístupnit po restartu vašeho nainstalovaného systému přes \"Nastavit váš "
@@ -4122,54 +4356,59 @@ msgstr ""
 "(správce root)."
 
 #. type: Content of: <section><info><title>
-#: en/selectInstallClass.xml:14
+#: en/selectInstallClass.xml:29
 msgid "Install or Upgrade"
 msgstr "Instalace nebo aktualizace"
 
 #. 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 "Instalace"
+#: en/selectInstallClass.xml:41
+#, fuzzy
+msgid "<emphasis role=\"bold\">Install</emphasis>"
+msgstr "<emphasis role=\"bold\">Měnění velikostí oddílu:</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 "Aktualizace"
+#: en/selectInstallClass.xml:50
+#, fuzzy
+msgid "<emphasis role=\"bold\">Upgrade</emphasis>"
+msgstr "<emphasis role=\"bold\">Pokročilé</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žijte tuto volbu pro čerstvou instalaci <application>Mageii</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 ""
 "Pouze aktualizování z předchozí verze Mageii, která byla <emphasis>ještě "
 "podporována</emphasis>, když byla vydána verze tohoto instalátoru, bylo "
@@ -4178,37 +4417,15 @@ msgstr ""
 "udělat čistou instalaci, přičemž si ponecháte váš domovský oddíl <literal>/"
 "home</literal>."
 
-#. 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 ""
-"Pokud se během instalace rozhodnete instalaci zastavit, je možné restartovat "
-"počítač, ale dříve než toto uděláte, si to prosím důkladně zvažte. Když už "
-"byl oddíl jednou naformátován nebo se začaly instalovat aktualizace, váš "
-"počítač už nadále není ve stejném stavu a jeho restartování by vás mohlo "
-"velmi lehce zanechat s nepoužitelným systémem. Pokud si jste přesto přese "
-"všechno velmi jistí, že restartování je to, co chcete, jděte do textového "
-"terminálu současným stisknutím tří kláves <guilabel>Alt+Ctrl+F2</guilabel>. "
-"Potom současně stiskněte <guilabel>Alt+Ctrl+Delete</guilabel> pro restart."
-
 #. 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 ""
 "Pokud jste objevili, že jste zapomenuli vybrat nějaký doplňkový jazyk, "
 "můžete se vrátit z obrazovky \"Instalace a aktualizace\" k výběru jazyka "
@@ -4216,39 +4433,41 @@ msgstr ""
 "<emphasis>nedělejte</emphasis> později během instalace."
 
 #. 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ávesnici"
 
 #. 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:24
+msgid "Here you can set the keyboard layout you wish to use with Mageia​​."
+msgstr ""
 
 #. type: Content of: <section><para>
-#: en/selectKeyboardLive.xml:12
+#: 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 muset vybrat rozložení klávesnice, které si přejete používat v "
-"Mageii. Výchozí je vybrána přiměřeně k vašemu jazyku a předchozí vybrané "
-"časové oblasti."
 
 #. type: Content of: <section><info><title>
-#: en/selectKeyboard.xml:7
+#: en/selectKeyboard.xml:20
 msgid "Keyboard"
 msgstr "Klávesnice"
 
 #. 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."
@@ -4257,17 +4476,17 @@ msgstr ""
 "vhodná klávesnice, bude jako výchozí použito rozložení klávesnice US."
 
 #. 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 format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
-"align=\"center\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.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 "
@@ -4285,25 +4504,25 @@ msgstr ""
 "Rozložení_kláves</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 ""
 "Pokud vaše klávesnice není v zobrazeném seznamu, klepněte na "
 "<guibutton>Více</guibutton> pro získání úplného seznamu a vyberte klávesnici "
 "tam."
 
-#. 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 vybrání klávesnice z dialogu <guibutton>Více</guibutton> se vrátíte k "
 "prvnímu dialogu pro výběr klávesnice a bude se zdát, jakoby byla zvolena "
@@ -4312,7 +4531,7 @@ msgstr ""
 "plného seznamu."
 
 #. 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 "
@@ -4324,35 +4543,40 @@ msgstr ""
 "latinským 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 "Zvolte si, prosím, jazyk, který chcete používat"
 
-#. 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áš oblíbený jazyk, tím že nejprve rozbalíte seznam pro váš "
 "světadíl. <application>Mageia</application> použije tento výběr během "
 "instalace a pro váš instalovaný 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áš oblíbený jazyk, tím že nejprve rozbalíte seznam pro váš "
+"světadíl. <application>Mageia</application> použije tento výběr během "
+"instalace a pro váš instalovaný 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 potřebovat mít ve vašem systému nainstalováno více "
@@ -4361,67 +4585,68 @@ msgstr ""
 "náročné přidat další jazykovou podporu po instalaci."
 
 #. 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 format=\"PNG\" fileref="
 "\"dx2-selectLanguage.png\" align=\"center\"/> </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 ""
 "Pokud jste si i zvolili více než jeden jazyk, musíte si nejprve vybrat jeden "
 "z nich jako váš upřednostňovaný jazyk na první jazykové obrazovce. Ten bude "
 "též označen jako vybraný na obrazovce s vícero jazyky."
 
 #. 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 ""
 "Pokud jazyk vaší klávesnice není ten samý jako váš upřednostňovaný jazyk, "
 "potom se doporučuje nainstalovat stejně tak jazyk vaší 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žívá jako výchozí podporu pro UTF-8 (Unicode)."
-
-#. 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 ""
 "Tato může být vypnuta na obrazovce \"více jazyků\", pokud víte, že je "
 "nevhodná pro váš jazyk. Zakázání UTF-8 se použije pro všechny nainstalované "
 "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 vašeho systému po instalaci můžete změnit v nabídce Ovládací centrum "
 "Mageia -> Systém -> Spravovat lokalizaci pro váš systém."
 
 #. type: Content of: <section><info><title>
-#: en/selectMouse.xml:4
+#: en/selectMouse.xml:10
 msgid "Select mouse"
 msgstr "Výběr myši"
 
@@ -4429,17 +4654,19 @@ msgstr "Výběr 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-selectKeyboard.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."
@@ -4448,26 +4675,29 @@ msgstr ""
 "typ."
 
 #. 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 ""
 "Obyčejně je <guilabel>Univerzální</guilabel> - <guilabel>kterákoli PS/2</"
 "guilabel> a <guilabel>USB myš</guilabel> je dobrou volbou."
 
 #. 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ální</guilabel> - <guilabel>Vynutit evdev</"
 "guilabel> pro nastavení tlačítek, která nefungují na myši mající šest nebo "
 "více tlačítek."
 
-#. 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 "Přidaní nebo změna položky v nabídce zavaděče"
 
@@ -4491,105 +4721,63 @@ msgstr ""
 "efi_and_Mageia</link>"
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:7
-msgid "Bootloader main options"
-msgstr "Základní nastavení zaváděcího programu"
-
-#. type: Content of: <section><section><title>
 #: en/setupBootloader.xml:10
-msgid "Bootloader interface"
+#, fuzzy
+msgid "Bootloader"
 msgstr "Rozhraní zavaděče"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:11
-msgid "By default, Mageia uses exclusively:"
-msgstr "Ve výchozím stavu Mageia používá výhradně:"
-
-#. 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><title>
+#: en/setupBootloader.xml:13
+msgid "Grub2"
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:18
+#. type: Content of: <section><section><itemizedlist><title>
+#: en/setupBootloader.xml:15
 #, fuzzy
-msgid "GRUB2-efi for a UEFI system."
-msgstr "Grub2-efi pro UEFI systémy."
-
-#. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:22
-msgid "The Mageia graphical menus are nice :)"
-msgstr "Grafické nabídky Mageii jsou hezké :)"
-
-#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:25
-#, fuzzy
-msgid "GRUB2 on Legacy/MBR and Legacy/GPT systems"
+msgid "Grub2 on Legacy MBR/GPT systems"
 msgstr "Grub2 na systémech Legacy/MBR a Legacy/GPT"
 
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:27
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: 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 fileref=\"dx2-"
-"setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata xml:id=\"setupBootloader-im1\" 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."
-msgstr "Neupravujte \"Zaváděcí zařízení\", pokud s jistotou nevíte, co děláte."
+"By default, a new bootloader will be written into either the MBR (Master "
+"Boot Record) of your first hard drive or in the BIOS boot partition."
+msgstr ""
 
-#. type: Content of: <section><section><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 "Grub2-efi na UEFI systémech"
 
-#. 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 ""
-"Se systémem UEFI je uživatelské rozhraní trochu odlišné, protože si nemůžete "
-"volit postup s nebo bez grafické nabídky"
 
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:42
+#. 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-"
-"setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
-"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 ""
 "Pokud je Mageia jediným systémem nainstalovaným na váš počítač, instalátor "
 "vytvořil ESP (systémový oddíl EFI) pro zapsání zavaděče (Grub2-efi). Pokud "
@@ -4599,240 +4787,344 @@ msgstr ""
 "oddílů ESP, radí se mít a stačí jen jeden, bez ohledu na počet operačních "
 "systémů, které máte v počítači."
 
-#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:61
-msgid "Using a Mageia bootloader"
-msgstr "Použití zavaděče Mageii"
+#. type: Content of: <section><section><info><title>
+#: en/setupBootloader.xml:46
+#, fuzzy
+msgid "Bootloader Setup"
+msgstr "Rozhraní zavaděče"
 
-#. 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 "Základní nastavení zaváděcího programu"
+
+#. 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:"
-msgstr "Ve výchozím nastavení, podle systému, zapíše Mageia nový:"
+"<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 align=\"center\" fileref="
+"\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata fileref=\"live-setupBootloader3.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\">Pokročilé</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
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:67
 #, fuzzy
-msgid "a GRUB2-efi bootloader into the ESP"
-msgstr "Grub2-efi zavaděč do ESP"
+msgid "<emphasis role=\"bold\">Boot device</emphasis>"
+msgstr "<emphasis role=\"bold\">Pokročilé</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 "Věci měňte jen tehdy, když velmi dobře víte, co dělá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\">Měnění velikostí oddílu:</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\">Pokročilé</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 align=\"center\" fileref="
-"\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata fileref=\"live-setupBootloader3.png\" align=\"center\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:87
-msgid "Using an existing bootloader"
-msgstr "Použití už existujícího zavaděče"
 
-#. type: Content of: <section><section><para>
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
 #: en/setupBootloader.xml:88
 #, fuzzy
+msgid "Choose a password for the bootloader (optional)"
+msgstr "<guilabel>Heslo</guilabel>: Do tohoto textového pole vložíte heslo"
+
+#. 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\">Měnění velikostí oddílu:</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:92
+#, 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."
+"Retype the password and DrakX will check that it matches with the one set "
+"above"
 msgstr ""
-"Přesný postup pro přidání vašeho systému Mageia k existujícímu zavaděči "
-"přesahuje oblast této nápovědy, avšak ve většině případů bude zahrnovat "
-"spuštění příslušného programu na instalaci zavaděče, který by ho měl "
-"rozpoznat a přidat automaticky. Podívejte se na dokumentaci k operačnímu "
-"systému, o nějž jde."
+"<guilabel>Heslo (znovu)</guilabel>: Znovu zadejte heslo a drakx zkontroluje, "
+"zda odpovídá heslu zadanému výše."
 
-#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:95
-msgid "Using chain loading"
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:96 en/setupBootloader.xml:154
+#, fuzzy
+msgid "<emphasis>Advanced</emphasis>"
+msgstr "<emphasis role=\"bold\">Pokročilé</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 ""
+"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 ""
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:96
+#. 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 ""
-"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>."
+"This option enables/disables symmetric multiprocessing for multi-core "
+"processors"
 msgstr ""
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:101
+#. 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 condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-setupBootloader4.png\" align="
-"\"center\"/> </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 condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-setupBootloader4.png\" align="
-"\"center\"/> </imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:108
+#. 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 ""
-"You will get a warning that the bootloader is missing, ignore it by clicking "
-"<guibutton>OK</guibutton>."
+"Here you can set Local APIC, which manages all external interrupts for a "
+"specific processor in an SMP system"
 msgstr ""
-"Dostanete varování, že chybí zavaděč. Nevšímejte si toho a klepněte na "
-"<guibutton>OK</guibutton>."
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:111
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:127
+#, fuzzy
+msgid "Bootloader Configuration"
+msgstr "Nastavení zvuku"
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:129
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-setupBootloader3.png\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata fileref=\"live-setupBootloader3.png\" align=\"center\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:117
-msgid "Options"
-msgstr "Volby"
-
-#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:119
-msgid "First page"
-msgstr "První strana"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:139
+#, fuzzy
+msgid "<emphasis role=\"bold\">Default</emphasis>"
+msgstr "<emphasis role=\"bold\">Pokročilé</emphasis>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:120
-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."
+#. 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:122
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:143
+#, fuzzy
+msgid "<emphasis role=\"bold\">Append</emphasis>"
+msgstr "<emphasis role=\"bold\">Pokročilé</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:144
 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."
+"This option lets you pass information to the kernel or tell the kernel to "
+"give you more information as it boots"
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:125
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:148
 #, fuzzy
-msgid "<guilabel>Password</guilabel>: Choose a password for the bootloader."
-msgstr "<guilabel>Heslo</guilabel>: Do tohoto textového pole vložíte heslo"
+msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
+msgstr "<emphasis role=\"bold\">Pokročilé</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:149
+msgid ""
+"If you already have other operating systems installed, Mageia attempts to "
+"add them to your new Mageia boot menu. If you don't want this behaviour, "
+"then untick the Probe Foreign OS option."
+msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:126
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:156
 #, fuzzy
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the password and DrakX will "
-"check that it matches with the one above."
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-setupBootloader4.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-setupBootloader4.png\"/> </"
+"imageobject>"
 msgstr ""
-"<guilabel>Heslo (znovu)</guilabel>: Znovu zadejte heslo a drakx zkontroluje, "
-"zda odpovídá heslu zadanému výše."
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata fileref=\"live-setupBootloader3.png\" align=\"center\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:127 en/setupBootloader.xml:159
-msgid "<guilabel>Advanced</guilabel>"
-msgstr "<guilabel>Pokročilé</guilabel>"
+#: en/setupBootloader.xml:166
+#, fuzzy
+msgid "<emphasis>Video mode</emphasis>"
+msgstr "<emphasis>Dodavatel</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:167
 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)."
+"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:133
-msgid ""
-"<guilabel>Enable SMP</guilabel>: This option enables/disables symmetric "
-"multiprocessing for multi core processors."
-msgstr ""
+#. 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>Dodavatel</emphasis>"
 
-#. 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:173
 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."
+"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><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:138
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:181
+#, fuzzy
 msgid ""
-"<guilabel>Enable Local APIC</guilabel>: Local APIC manages all external "
-"interrupts for a specific processor in an SMP system."
+"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align=\"center"
+"\"/> </imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:143
-msgid "Next page"
-msgstr "Další strana"
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:188
+#, fuzzy
+msgid "Other Options"
+msgstr "Volby"
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:146
-msgid "<guilabel>Default:</guilabel> Operating system started up by default"
-msgstr ""
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:190
+msgid "Using an existing bootloader"
+msgstr "Použití už existujícího zavaděče"
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:150
+#. 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 ""
+"Přesný postup pro přidání vašeho systému Mageia k existujícímu zavaděči "
+"přesahuje oblast této nápovědy, avšak ve většině případů bude zahrnovat "
+"spuštění příslušného programu na instalaci zavaděče, který by ho měl "
+"rozpoznat a přidat automaticky. Podívejte se na dokumentaci k operačnímu "
+"systému, o nějž jde."
 
-#. 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žití zavaděče Mageii"
+
+#. 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 ""
-"<guilabel>Vyzkoušet cizí operační systém</guilabel>: viz výše <link linkend="
-"\"setupMageiaBootloader\">Používat Mageiin zavaděč</link>"
 
-#. 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 ""
+"Pro více informací se podívejte na naše stránky: <link ns2:href=\"https://"
+"wiki.mageia.org/en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-"
+"efi_and_Mageia</link>"
 
 #. type: Content of: <section><info><title>
-#: en/setupSCSI.xml:3
+#: en/setupSCSI.xml:10
 msgid "Setup SCSI"
 msgstr "Nastavení SCSI"
 
@@ -4844,18 +5136,20 @@ msgstr "Nastavení 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 "
@@ -4867,104 +5161,59 @@ msgstr ""
 "rozpoznat disk."
 
 #. 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 ""
 "Pokud k tomuto dojde, budete muset ručně říci Drakx, jaký disk(y) SCSI 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 pak měl být schopen správně nastavit disk(y)."
-
 #. type: Content of: <section><info><title>
-#: en/soundConfig.xml:3
+#: en/soundConfig.xml:10
 msgid "Sound Configuration"
 msgstr "Nastavení 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
-msgid ""
-"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
-"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
-"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
-
-#. type: Content of: <section><para>
-#: en/soundConfig.xml:14
+#: en/soundConfig.xml:20
 #, 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."
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-soundConfig.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"soundConfig-im1\"/> </imageobject>"
 msgstr ""
-"Na této obrazovce je udán název ovladače, který zvolil instalátor pro vaši "
-"zvukovou kartu, což bude výchozí ovladač, pokud máte některý určen jako "
-"výchozí."
+"<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 ""
-"Výchozí ovladač by měl pracovat bez problémů. Avšak, pokud se po instalaci "
-"střetáváte s problémy, potom spustěte příkaz <command>draksound</command> "
-"nebo spustěte tento nástroj přes nabídku MCC (Ovládací centrum Mageii), "
-"zvolením panelu <guilabel>Hardware</guilabel> a klepnutím na "
-"<guilabel>Nastavení zvuku</guilabel> v horní pravé části 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 obrazovce draksound nebo nástroje na \"Nastavení zvuku\", klepněte "
-"na <guibutton>Rozšíření</guibutton> a potom na <guibutton>Řešení problémů</"
-"guibutton>, abyste našli velmi užitečnou radu o tom, jak vyřešit problém."
 
 #. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:30
+#: en/soundConfig.xml:43
 msgid "Advanced"
 msgstr "Rozšíření"
 
-#. 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 ""
-"Klepnutí na <guibutton>Rozšíření</guibutton> na této obrazovce, během "
-"instalace, je užitečné tehdy, pokud tu není žádný výchozí ovladač a je tu "
-"dostupných více ovládačů, ale vy si myslíte, že instalátor vybral nesprávný "
-"ovladač."
-
-#. 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 případě můžete zvolit odlišný ovladač po klepnutí na <guibutton>Nechat "
-"mě vybrat jiný ovladač</guibutton>."
-
 #. type: Content of: <section><info><title>
-#: en/takeOverHdConfirm.xml:3
+#: en/takeOverHdConfirm.xml:10
 msgid "Confirm hard disk to be formatted"
 msgstr "Potvrzení naformátování pevného disku"
 
@@ -4974,80 +5223,80 @@ msgstr "Potvrzení naformátování 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 condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><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 ""
 "Klepněte na <guibutton>Předchozí</guibutton>, pokud si nejste jistí vaší "
 "volbou."
 
-#. 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 ""
 "Klepněte na <guibutton>Další</guibutton>, pokud si jste jistí a chcete "
 "smazat každý oddíl, každý operační systém a všechny údaje na onom pevném "
 "disku."
 
 #. type: Content of: <section><info><title>
-#: en/testing.xml:9
+#: en/testing.xml:3
 msgid "Testing Mageia as Live system"
 msgstr "Vyzkoušení Mageii jako Ž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 ""
-"Tuto obrazovku dostanete, pokud jste si vybrali \"Zavést Mageiu\". Pokud ne, "
-"tak dostanete krok \"<link linkend=\"doPartitionDisks\">Rozdělení disku</"
-"link>\""
-
 #. type: Content of: <section><section><section><info><title>
-#: en/testing.xml:28
+#: en/testing.xml:21
 msgid "Testing hardware"
 msgstr "Zkoušení hardware"
 
 #. 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 cílů Živého režimu je vyzkoušet, zda je hardware Mageiou správně "
 "spravován. Můžete zkontrolovat, zda všechna zařízení mají svůj ovladač v "
@@ -5055,85 +5304,92 @@ msgstr ""
 "zařízení:"
 
 #. 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 "síťové rozhraní: nastavte 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: pokud jste už viděli předešlou 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: znělka už byla zahrána"
 
 #. 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 "tiskárna: nastavte ji a vytiskněte zkušební 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: nasnímejte 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 ""
 "Pokud je to všechno pro vás v pořádku, můžete provést instalaci. Pokud ne, "
 "můžete odejít pomocí tlačítka pro skončení."
 
-#. 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 ""
 "Nastavení nastavení, která jste tu udělali, jsou zachována pro instalaci."
 
 #. type: Content of: <section><section><section><info><title>
-#: en/testing.xml:72
+#: en/testing.xml:68
 msgid "Launch installation"
 msgstr "Spustit instalaci"
 
-#. 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 ""
 "Pro spuštění instalace z Mageia LiveCD nebo Live DVD na pevný disk anebo "
 "mechaniku SSD, jednoduše klepněte na ikonu \"Instalovat na pevný disk\". "
 "Obdržíte tuto obrazovku, a potom krok pro \"<link linkend=\"doPartitionDisks"
 "\">Rozdělení disku</link>\" jako u přímé instalace."
 
+#. 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 "Odinstalování Mageii"
 
 #. 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 "
@@ -5145,13 +5401,13 @@ msgstr ""
 "možnost odinstalování. 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álohování si vašich dat, restartujte počítač s vaším instalačním DVD "
 "Mageii a vyberte Záchranný systém, potom, Obnovit zavaděč Windows. Při "
@@ -5159,15 +5415,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 ""
 "Pro obnovu místa použitého oddíly neboli diskovými oddíly Mageii ve Windows, "
 "klepněte na <code>Start → Ovládací panely → Nástroje na správu → Správa "
@@ -5178,16 +5437,17 @@ msgstr ""
 "guibutton>. Prostor bude uvolněn."
 
 #. 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 ""
 "Pokud používáte Windows XP, můžete vytvořit nový oddíl a naformátovat jej "
 "(FAT32 nebo NTFS). Bude mu přiřazeno písmeno oddílu."
 
 #. 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 "
@@ -5203,34 +5463,50 @@ msgstr ""
 "opatrní a ujistěte se, že všechny důležité věci byly zazálohovány."
 
 #. type: Content of: <section><info><title>
-#: en/unused.xml:9
+#: en/unused.xml:3
 msgid "Keep or delete unused material"
 msgstr "Ponechat nebo smazat 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=\"reboot-im1\" fileref=\"live-"
+"reboot.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 instalátor hledá nevyužité jazykové balíčky a nevyužité "
 "hardwarové balíčky. Potom vám navrhne jejich vymazání. Je dobrou myšlenkou "
 "přijmout to, kromě případu, že připravujete instalaci, která má běžet na "
 "odlišném počítačovém vybavení."
 
+#. 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>"
@@ -5239,14 +5515,780 @@ 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 ""
 "Dalším krokem je kopírování souborů na pevný disk. Toto zabere několik "
 "minut. Na konci dostanete na určitý čas prázdnou obrazovku. To je normální."
 
+#~ msgid "User and Superuser Management"
+#~ msgstr "Správa uživatele  a superuživatele"
+
+#, fuzzy
+#~ msgid ""
+#~ "Every partition is shown to the left as: <emphasis role=\"bold\">Device "
+#~ "(capacity, mount point, type).</emphasis>"
+#~ msgstr ""
+#~ "Každý oddíl je zobrazen takto: \"Zařízení\" (\"Kapacita\", \"Přípojný bod"
+#~ "\", \"Typ\")."
+
+#~ msgid "In advanced tab, you will find more options about clock settings."
+#~ msgstr "Na kartě pokročilé najdete víc voleb pro nastavení č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 zavést z nosiče, na který jste vypálili svůj obrazový "
+#~ "soubor (CD, DVD...). Obyčejně jej stačí jen vložit do vaší CD/DVD "
+#~ "mechaniky, aby zavaděč spustil instalaci automaticky po restartu "
+#~ "počítače. pokud se to nestane, možná potřebujete přenastavit BIOS anebo "
+#~ "stisknout jednu klávesu, která vám nabídne vybrat si zařízení, ze kterého "
+#~ "se počítač zavede."
+
+#~ msgid ""
+#~ "According to which hardware you have, and how it is configured, you get "
+#~ "either one or another of the two screens below."
+#~ msgstr ""
+#~ "Podle toho, jaké máte vybavení počítače a jak je nastaveno, objeví se buď "
+#~ "jedna anebo druhá ze dvou níže uvedených obrazovek."
+
+#~ msgid "From a USB device"
+#~ msgstr "Ze zařízení USB"
+
+#~ 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 spustit ze zařízení USB, na kterém je zaznamenán obraz "
+#~ "ISO. Vzhledem k nastavení vašeho BIOSu se počítač možná už zavádí přímo "
+#~ "ze zařízení USB zastrčeného v přípojném místě (portu) počítače. Pokud se "
+#~ "tak neděje, možná potřebujete přenastavit BIOS anebo stisknout jednu "
+#~ "klávesu, která vám nabídne výběr zařízení, z něhož se počítač spustí."
+
+#~ 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 prostřední nabídce máte volbu mezi třemi činnostmi:"
+
+#~ 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 ""
+#~ "Spustit z pevného disku: Tato volba dovoluje systém zavést z pevného "
+#~ "disku, tak jako obyčejně, když není připojen žádný datový nosič (CD/DVD "
+#~ "anebo zařízení USB). (nepracuje s Mageiou 5)."
+
+#~ msgid "In the bottom menu, are the Boot Options:"
+#~ msgstr "Ve spodní nabídce jsou Volby zavedení systému:"
+
+#~ msgid ""
+#~ "F1 - Help. Explain the options \"splash\", \"apm\", \"acpi\" and \"Ide\""
+#~ msgstr ""
+#~ "F1 - Nápověda. Vysvětluje volby \"splash\", \"apm\", \"acpi\" a \"Ide\""
+
+#~ msgid "F2 - Language. Choose the display language of the screens."
+#~ msgstr "F2 - Jazyk. Vyberte si pro zobrazení jazyka obrazovek."
+
+#~ msgid ""
+#~ "F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728"
+#~ msgstr ""
+#~ "F3 - Rozlišení obrazovky. Volba mezi textem, 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 - Ovladač. Ano nebo Ne. Systém si je vědom přítomnosti volitelného "
+#~ "disku s aktualizací ovladače a bude požadovat jeho vložení během procesu "
+#~ "instalace."
+
+#~ msgid ""
+#~ "F6 - Kernel options. This is a way to specify options according to your "
+#~ "hardware and the drivers to use."
+#~ msgstr ""
+#~ "F6 - Volby jádra. Toto je cesta pro zadání voleb vztahujících se k "
+#~ "vybavení počítače a ovladačům, které se použijí."
+
+#~ msgid "First screen while booting on UEFI system from disk"
+#~ msgstr "První obrazovka během spuštění z disku na systémech UEFI"
+
+#~ msgid ""
+#~ "You have only the choice to run Mageia in Live mode (first choice)  or to "
+#~ "process the installation (second choice)."
+#~ msgstr ""
+#~ "Zde máte jen možnost spustit Mageiu v Živém režimu (první volba) nebo "
+#~ "spustit instalaci (druhá volba)."
+
+#~ 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ždém případě budou první kroky stejné - vybrat si jazyk, časovou zónu "
+#~ "a klávesnici; potom se postupy odlišují v <link linkend=\"testing"
+#~ "\">dodatečných krocích v Živém režimu</link>."
+
+#, fuzzy
+#~ msgid ""
+#~ "Depending on your selection here, you may be offered further screens to "
+#~ "fine-tune your choice."
+#~ msgstr ""
+#~ "V závislosti na vašem výběru zde, vám můžou být nabídnuty další obrazovky "
+#~ "pro jemné doladění vaší volby."
+
+#, fuzzy
+#~ msgid "The settings DrakX chose are usually good."
+#~ msgstr "Nastavení, která DrakX vybral, jsou obyčejně 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=\"summaryBottom-im1\" "
+#~ "align=\"center\" fileref=\"dx2-summaryBottom.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 ""
+#~ "Přístup k Nonfree úložišti musí být výslovně povolen. Pokud tomu tak "
+#~ "není, nejdříve jej povolte, toto byste měli udělat po prvním restartu."
+
+#, 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=\"reboot-im1\" fileref="
+#~ "\"live-reboot.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 ze "
+#~ "seznamu vaši kartu, pokud je to třeba."
+
+#~ msgid "Incorrect refresh rates may damage your monitor"
+#~ msgstr "Nesprávná obnovovací frekvence může poškodit 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=\"reboot-im1\" fileref="
+#~ "\"live-reboot.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 "název výrobce monitoru"
+
+#~ msgid "the monitor description"
+#~ msgstr "popis monitoru"
+
+#~ 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 ""
+#~ "Klepněte na tlačítko <guibutton>Hotovo</guibutton>, když jste připraven."
+
+#~ 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-"
+#~ "doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" "
+#~ "align=\"center\"/> </imageobject>"
+
+#~ msgid "Use Free Space"
+#~ msgstr "Použít volné místo"
+
+#~ msgid "Use Free Space on a Windows Partition"
+#~ msgstr "Použít volné místo na oddílu Windows"
+
+#~ msgid ""
+#~ "If you have unused space on an existing Windows partition, the installer "
+#~ "may offer to use it."
+#~ msgstr ""
+#~ "Pokud máte nevyužité místo na stávajícím windowsovském oddíle, instalátor "
+#~ "může nabídnout jeho použití."
+
+#, 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-"
+#~ "doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" "
+#~ "align=\"center\"/> </imageobject>"
+
+#~ msgid "Erase and use Entire Disk."
+#~ msgstr "Smazat a použít celý disk"
+
+#~ msgid ""
+#~ "Note! This will erase ALL data on the selected hard drive. Take care!"
+#~ msgstr "Pozor, toto smaže všechna data na vybraném disku. Buďte opatrní!"
+
+#~ msgid "Custom disk partitioning"
+#~ msgstr "Vlastní rozdělení disku"
+
+#, 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 případě 160 GB a víc z dostupného místa, instalátor "
+#~ "vytvoří tři oddíly: 50 GB pro /, 4 GB pro swap a zbytek pro adresář /home."
+
+#~ 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 align=\"center\" fileref="
+#~ "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition="
+#~ "\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid "January 2015"
+#~ msgstr "Leden 2015"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+
+#~ msgid "Using a Mageia DVD"
+#~ msgstr "Použití DVD Mageia"
+
+#, 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 ""
+#~ "Zde jsou výchozí uvítací obrazovky při používaní DVD Mageia. První je se "
+#~ "systémem UEFI a druhá se zastaralým systémem:"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
+
+#~ msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "Use the arrow keys to select the language then press <emphasis role=\"bold"
+#~ "\">Enter</emphasis>."
+#~ msgstr ""
+#~ "Použijte šipkové klávesy pro výběr jazyka a stiskněte klávesu Enter."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid "Default: It doesn't alter anything in the default options."
+#~ msgstr "- Výchozí, tato nemění nic ve výchozích volbách."
+
+#~ msgid ""
+#~ "When you select one of these entries, it modifies the default options "
+#~ "displayed in the <guilabel>Boot Options</guilabel> line."
+#~ msgstr ""
+#~ "Když si vyberete jednu z těchto položek, tato změní výchozí volby "
+#~ "zobrazené v řádku <guilabel>Volby zavádění 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 některých vydáních Mageii se může stát, že se položky vybrané klávesou "
+#~ "F6 neobjevují v řádku <guilabel>Volby zavádění systému</guilabel>, avšak "
+#~ "ve skutečnosti jsou brány do úvahy."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata 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 ""
+#~ "Stisknutí klávesy F1 otevře nové okno s dalšími dostupnými volbami. "
+#~ "Vyberte jednu šipkovými klávesami a stiskněte klávesu Enter pro obdržení "
+#~ "více podrobností nebo stiskněte klávesu Esc pro návrat na uvítací "
+#~ "obrazovku."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </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ý přehled o rozsahu voleb. Stiskněte Esc nebo zvolte "
+#~ "<guilabel>návrat k parametrům spuštění</guilabel> pro návrat zpět do "
+#~ "seznamu voleb. Tyto volby mohou být přidány ručně v řádku <guilabel>Volby "
+#~ "zavádění systému</guilabel>."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "The help is translated in the chosen language with <emphasis role=\"bold"
+#~ "\">F2</emphasis>."
+#~ msgstr "Nápověda je přeložena ve zvoleném jazyku pomocí klávesy 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 ""
+#~ "Pro více informací o volbách pro kernel na zastaralých systémech a "
+#~ "systémech UEFI se podívejte na: <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ýběr zdrojů (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=\"selectCountry-im1\" "
+#~ "align=\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </"
+#~ "imageobject>"
+
+#~ msgid "Summary of miscellaneous parameters"
+#~ msgstr "Souhrn různých parametrů"
+
+#~ msgid "<guilabel>Timezone</guilabel>"
+#~ msgstr "<guilabel>Časové pásmo</guilabel>"
+
+#~ msgid "<guilabel>Country / Region</guilabel>"
+#~ msgstr "<guilabel>Země/Oblast</guilabel>"
+
+#~ msgid "<guilabel>Bootloader</guilabel>"
+#~ msgstr "<guilabel>Zavaděč</guilabel>"
+
+#~ msgid "For more information, see <xref linkend=\"setupBootloader\"/>"
+#~ msgstr ""
+#~ "Pro více informací se podívejte na <xref linkend=\"setupBootloader\"/>"
+
+#~ msgid "<guilabel>User management</guilabel>"
+#~ msgstr "<guilabel>Správa uživatelů</guilabel>"
+
+#~ msgid "<guilabel>Services</guilabel>:"
+#~ msgstr "<guilabel>Služby</guilabel>:"
+
+#~ msgid "For more information, see <xref linkend=\"configureServices\"/>"
+#~ msgstr ""
+#~ "Pro více informací se podívejte na <xref linkend=\"configureServices\"/>"
+
+#~ msgid "<guilabel>Keyboard</guilabel>:"
+#~ msgstr "<guilabel>Klávesnice</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 ""
+#~ "Instalátor používá výchozí ovladač, pokud nějaký výchozí existuje. "
+#~ "Možnost výběru odlišného ovladače je dána jen tehdy, když je více než "
+#~ "jeden ovladač pro vaši kartu, ale žádný z nich není výchozí."
+
+#~ msgid "<guilabel>Graphical interface</guilabel>:"
+#~ msgstr "<guilabel>Grafické rozhraní</guilabel>:"
+
+#~ msgid "<guilabel>Network</guilabel>:"
+#~ msgstr "<guilabel>Síť</guilabel>:"
+
+#~ msgid "<guilabel>Proxies</guilabel>:"
+#~ msgstr "<guilabel>Proxy</guilabel>:"
+
+#~ msgid "<guilabel>Security Level</guilabel>:"
+#~ msgstr "<guilabel>Úroveň bezpečnosti</guilabel>:"
+
+#~ msgid "Check the option which best suits your usage."
+#~ msgstr "Zaškrtněte volbu, která se nejlépe hodí k vašemu používání."
+
+#~ 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, moravsky ohnivá zeď, má sloužit jako překážka mezi vašimi "
+#~ "důležitými daty a ničemy venku na internetu, kteří by je chtěli vyzradit "
+#~ "nebo ukradnout."
+
+#~ 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, které si přejete, aby měly přístup k vašemu systému. "
+#~ "Vaše výběry budou záležet na tom, k čemu používáte váš počítač. Další "
+#~ "informace najdete na <xref linkend=\"firewall\"/>."
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata format=\"PNG\" xml:id=\"securityLevel-im1\" "
+#~ "align=\"center\" fileref=\"dx2-securityLevel.png\" revision=\"1\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" "
+#~ "align=\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </"
+#~ "imageobject>"
+
+#~ msgid "64 bit architecture only."
+#~ msgstr "Pouze 64 bitová architektura."
+
+#, 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 jsou nástroje ke zkontrolování neporušenosti souboru "
+#~ "ISO. Jeden z nich si ponechejte <link linkend=\"integrity\">pro budoucí "
+#~ "použití</link>. Potom se objeví tomuto podobné okno:"
+
+#~ msgid ""
+#~ "To recover the original capacity, you must redo partitioning and re-"
+#~ "format the USB stick."
+#~ msgstr ""
+#~ "Pro obnovu původní kapacity, musíte znovu předělat oddíl zařízení USB a "
+#~ "naformátovat ho."
+
+#~ msgid "Install"
+#~ msgstr "Instalace"
+
+#~ msgid "Upgrade"
+#~ msgstr "Aktualizace"
+
+#, 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 ""
+#~ "Pokud se během instalace rozhodnete instalaci zastavit, je možné "
+#~ "restartovat počítač, ale dříve než toto uděláte, si to prosím důkladně "
+#~ "zvažte. Když už byl oddíl jednou naformátován nebo se začaly instalovat "
+#~ "aktualizace, váš počítač už nadále není ve stejném stavu a jeho "
+#~ "restartování by vás mohlo velmi lehce zanechat s nepoužitelným systémem. "
+#~ "Pokud si jste přesto přese všechno velmi jistí, že restartování je to, co "
+#~ "chcete, jděte do textového terminálu současným stisknutím tří kláves "
+#~ "<guilabel>Alt+Ctrl+F2</guilabel>. Potom současně stiskněte <guilabel>Alt"
+#~ "+Ctrl+Delete</guilabel> pro restart."
+
+#~ 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 muset vybrat rozložení klávesnice, které si přejete používat v "
+#~ "Mageii. Výchozí je vybrána přiměřeně k vašemu jazyku a předchozí vybrané "
+#~ "časové oblasti."
+
+#~ msgid "Mageia uses UTF-8 (Unicode) support by default."
+#~ msgstr "Mageia používá jako výchozí podporu pro UTF-8 (Unicode)."
+
+#~ 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>"
+
+#~ msgid "By default, Mageia uses exclusively:"
+#~ msgstr "Ve výchozím stavu Mageia používá výhradně:"
+
+#, fuzzy
+#~ msgid "GRUB2-efi for a UEFI system."
+#~ msgstr "Grub2-efi pro UEFI systémy."
+
+#~ msgid "The Mageia graphical menus are nice :)"
+#~ msgstr "Grafické nabídky Mageii jsou hezké :)"
+
+#~ 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 fileref=\"dx2-"
+#~ "setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata xml:id=\"setupBootloader-im1\" 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áděcí zařízení\", pokud s jistotou nevíte, co dělá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 ""
+#~ "Se systémem UEFI je uživatelské rozhraní trochu odlišné, protože si "
+#~ "nemůžete volit postup s nebo bez grafické nabídky"
+
+#~ 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-"
+#~ "setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "By default, and according to your system, Mageia writes one of the "
+#~ "following:"
+#~ msgstr "Ve výchozím nastavení, podle systému, zapíše Mageia nový:"
+
+#, fuzzy
+#~ msgid "a GRUB2-efi bootloader into the ESP"
+#~ msgstr "Grub2-efi zavaděč do ESP"
+
+#~ 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-"
+#~ "setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-setupBootloader4.png\" "
+#~ "align=\"center\"/> </imageobject>"
+
+#~ msgid ""
+#~ "You will get a warning that the bootloader is missing, ignore it by "
+#~ "clicking <guibutton>OK</guibutton>."
+#~ msgstr ""
+#~ "Dostanete varování, že chybí zavaděč. Nevšímejte si toho a klepněte na "
+#~ "<guibutton>OK</guibutton>."
+
+#~ msgid "First page"
+#~ msgstr "První strana"
+
+#~ msgid "<guilabel>Advanced</guilabel>"
+#~ msgstr "<guilabel>Pokročilé</guilabel>"
+
+#~ msgid "Next page"
+#~ msgstr "Další strana"
+
+#~ msgid ""
+#~ "<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
+#~ "\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
+#~ msgstr ""
+#~ "<guilabel>Vyzkoušet cizí operační systém</guilabel>: viz výše <link "
+#~ "linkend=\"setupMageiaBootloader\">Používat Mageiin zavaděč</link>"
+
+#, 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 pak měl být schopen správně nastavit disk(y)."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" "
+#~ "xml:id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" "
+#~ "xml:id=\"soundConfig-im1\" revision=\"1\"/> </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 této obrazovce je udán název ovladače, který zvolil instalátor pro "
+#~ "vaši zvukovou kartu, což bude výchozí ovladač, pokud máte některý určen "
+#~ "jako výchozí."
+
+#~ 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 ""
+#~ "Výchozí ovladač by měl pracovat bez problémů. Avšak, pokud se po "
+#~ "instalaci střetáváte s problémy, potom spustěte příkaz "
+#~ "<command>draksound</command> nebo spustěte tento nástroj přes nabídku MCC "
+#~ "(Ovládací centrum Mageii), zvolením panelu <guilabel>Hardware</guilabel> "
+#~ "a klepnutím na <guilabel>Nastavení zvuku</guilabel> v horní pravé části "
+#~ "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 obrazovce draksound nebo nástroje na \"Nastavení zvuku\", "
+#~ "klepněte na <guibutton>Rozšíření</guibutton> a potom na <guibutton>Řešení "
+#~ "problémů</guibutton>, abyste našli velmi užitečnou radu o tom, jak "
+#~ "vyřešit 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 ""
+#~ "Klepnutí na <guibutton>Rozšíření</guibutton> na této obrazovce, během "
+#~ "instalace, je užitečné tehdy, pokud tu není žádný výchozí ovladač a je tu "
+#~ "dostupných více ovládačů, ale vy si myslíte, že instalátor vybral "
+#~ "nesprávný ovladač."
+
+#, 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 případě můžete zvolit odlišný ovladač po klepnutí na "
+#~ "<guibutton>Nechat mě vybrat jiný ovladač</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 ""
+#~ "Tuto obrazovku dostanete, pokud jste si vybrali \"Zavést Mageiu\". Pokud "
+#~ "ne, tak dostanete krok \"<link linkend=\"doPartitionDisks\">Rozdělení "
+#~ "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 "
@@ -5355,22 +6397,6 @@ msgstr ""
 #~ "</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 pro každý nalezený pevný disk nebo jiné úložné zařízení, "
-#~ "jako je zařízení USB. Například sda, sdb a sdc, pokud jsou připojena tři."
-
-#~ msgid ""
 #~ "<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
 #~ "doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
 #~ "condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" "
@@ -5480,15 +6506,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 ""
@@ -5550,13 +6567,6 @@ msgstr ""
 #~ "\"center\" format=\"PNG\"></imagedata> </imageobject>"
 
 #~ msgid ""
-#~ "Use this option for a fresh <application>Mageia</application> "
-#~ "installation."
-#~ msgstr ""
-#~ "Použijte tuto volbu pro čerstvou instalaci <application>Mageii</"
-#~ "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."
diff --git a/docs/docs/stable/installer/de.po b/docs/docs/stable/installer/de.po
index edd3863b..76683e26 100644
--- a/docs/docs/stable/installer/de.po
+++ b/docs/docs/stable/installer/de.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2018-04-19 16:32+0300\n"
+"POT-Creation-Date: 2019-01-06 12:43+0200\n"
 "PO-Revision-Date: 2018-11-12 21:31+0000\n"
 "Last-Translator: psyca\n"
 "Language-Team: German (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -34,12 +34,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Content of: <section><info><title>
-#: en/acceptLicense.xml:25
+#: en/acceptLicense.xml:31
 msgid "License and Release Notes"
 msgstr "Lizenz- und Veröffentlichungshinweise"
 
 #. type: Content of: <section><mediaobject>
-#: en/acceptLicense.xml:29
+#: en/acceptLicense.xml:35
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
 "\"acceptLicense-im1\" fileref=\"dx2-license.png\" align=\"center\" revision="
@@ -54,80 +54,88 @@ msgstr ""
 "condition=\"live\"/></imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/acceptLicense.xml:40
+#: en/acceptLicense.xml:46
 msgid "License Agreement"
 msgstr "Lizenzabkommen"
 
-#. 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 ""
 "Bevor Sie <application>Mageia</application> installieren, lesen Sie bitte "
 "sorgfälltig die Begriffe und Bedingungen in der Lizenz."
 
-#. 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 ""
 "Diese Begriffe und Bedingungen beziehen sich auf die gesamte Distribution "
 "von <application>Mageia</application> und muss akzeptiert werden, bevor Sie "
 "mit der Installation fortfahren können."
 
-#. 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 ""
 "Um dies zu akzeptieren, klicken Sie einfach auf <guilabel>Akzeptieren</"
 "guilabel> und anschließend auf <guibutton>Weiter</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 ""
 "Falls Sie sich entschließen, diese Bedingungen nicht zu akzeptieren, "
 "bedanken wir uns, dass Sie vorbeigeschaut haben. Mit einem Klick auf "
 "<guibutton>Beenden</guibutton> wird Ihr Computer neu gestartet."
 
 #. type: Content of: <section><section><info><title>
-#: en/acceptLicense.xml:63
+#: en/acceptLicense.xml:76
 msgid "Release Notes"
 msgstr "Veröffentlichungshinweise"
 
 #. 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 ""
 "Sie erhalten dort wichtige Informationen über diese <application>Mageia</"
 "application> Veröffentlichung und dies lässt sich aufrufen, indem Sie auf "
 "die <guibutton>Versionshinweise</guibutton> Schaltfläche klicken."
 
 #. 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 "de"
 
 #. 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 "Medienauswahl (konfigurieren von zusätzlichen Installationsmedien)"
 
 #.  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
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-add_supplemental_media."
 "png\" xml:id=\"dx2-add_supplemental_media-im1\" align=\"center\" revision="
@@ -138,12 +146,13 @@ msgstr ""
 "\"1\"/> </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 ""
 "Dieser Bildschirm zeigt alle bereits erkannten Medien. Sie können andere "
 "Quellen für das Runterladen von Paketen auswählen, wie optische Laufwerke "
@@ -151,26 +160,27 @@ msgstr ""
 "nächsten Schritte zur Verfügung stehen."
 
 #. 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 "Für die Netzwerkquellen müssen zwei Schritte beachtet werden:"
 
 #. 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 ""
 "Auswählen und Aktivieren der Netzwerkverbindung, falls sie noch nicht "
 "hergestellt ist"
 
 #. 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 ""
 "Auswählen eines Servers oder die URL angeben (der allerste Eintrag). Durch "
 "die Auswahl eines Servers haben Sie die Auswahl aller verfügbaren Quellen, "
@@ -180,14 +190,15 @@ msgstr ""
 "ihre eigene NFS Installation auswählen."
 
 #. 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 ""
 "Falls Sie eine 64-Bit Installation aktualisieren welche womöglich einige 32-"
 "Bit Pakete enthält, wird empfohlen in diesem Bildschirm die Online-"
@@ -198,18 +209,25 @@ msgstr ""
 "und aktualisieren."
 
 #. type: Content of: <section><info><title>
-#: en/addUser.xml:3
-msgid "User and Superuser Management"
-msgstr "Verwaltung des Benutzers und des Superusers"
+#: en/addUser.xml:9
+#, fuzzy
+msgid "User Management"
+msgstr "Fortgeschrittene Benutzerverwaltung"
 
 #.  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 format=\"PNG\" fileref="
 "\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -217,20 +235,21 @@ msgstr ""
 "\"PNG\" 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 "Setzen des Administrator (root)  Passworts:"
 
 #. 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 ""
 "Dies ist für alle Installationen von <application>Mageia</application> "
 "verfügbar, um ein Passwort für den <emphasis role=\"bold\">Superuser</"
@@ -244,9 +263,10 @@ msgstr ""
 "Eingabe des ersten Passwortes nicht vertippt haben."
 
 #. 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 ""
 "Alle Passwörter beachten die Groß-/Kleinschreibung, so dass es am besten "
@@ -254,17 +274,18 @@ msgstr ""
 "Sonderzeichen in einem Passwort verwenden."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:42
+#: en/addUser.xml:57
 msgid "Enter a user"
 msgstr "Einen Benutzer eingeben"
 
 #. 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 ""
 "Hier fügen Sie einen Benutzer hinzu. Ein Benutzer hat weniger Rechte als der "
 "<emphasis role=\"bold\">Superuser</emphasis> (root), aber genügend, um im "
@@ -272,66 +293,91 @@ msgstr ""
 "ein durchschnittlicher Benutzer mit einem Computer macht."
 
 #. 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\">Fortgeschritten</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>Symbol</guibutton>: Wenn Sie auf diesen Knopf klicken, so ändert "
 "sich das Symbol für den Benutzer."
 
 #. 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\">Server</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>Vollständiger Name</guilabel>: Fügen Sie in dieser Textbox den "
 "wirklichen Namen des Benutzers ein."
 
 #. 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\">Fortgeschritten</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>Anmeldename</guilabel>: Hier geben Sie den Anmeldenamen des "
 "Benutzers ein, oder lassen Sie den von drakx vorgeschlagenen Namen stehen "
 "und übernehmen diesen. <emphasis role=\"bold\">Der Anmeldename beachtet die "
 "Groß-/Kleinschreibung</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\">Fortgeschritten</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>Passwort</guilabel>: In dieser Textbox geben Sie das Passwort für "
 "den Benutzer ein. Am Ende der Textbox zeigt ein Schild an, wie sicher das "
 "Passwort ist. (Siehe auch <xref linkend=\"givePassword\"/>)"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml: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>Passwort (erneut)</guilabel>: Geben Sie hier das Passwort erneut "
 "an und Drakx überprüft, ob dieses mit dem oben angegebenen übereinstimmt."
 
 #. 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 ""
 "Jeder Nutzer, der bei der Installation von Mageia hinzugefügt wird, erhält "
 "ein lese- und schreibgeschütztes home Verzeichnis (umask=0027)."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:82
+#: en/addUser.xml:104
 msgid ""
 "You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
@@ -343,33 +389,35 @@ msgstr ""
 "emphasis> aus."
 
 #. 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 ""
 "Die Zugriffsrechte können auch nach der Installation abgeändert werden."
 
 #. 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 "Fortgeschrittene Benutzerverwaltung"
 
 #. 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 ""
 "Wenn der Knopf <guibutton>Fortgeschritten</guibutton> angeklickt wird, dann "
 "wird ein Fenster angezeigt, in welchem Einstellungen für den hinzuzufügenden "
 "Benutzer editiert werden können."
 
 #. 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>Shell</guilabel>: Diese aufklappbare Liste erlaubt es Ihnen, die "
 "Shell zu ändern, die der Benutzer verwendet, den Sie am Bildschirm zuvor "
@@ -378,11 +426,12 @@ msgstr ""
 "\">Sh</emphasis>"
 
 #. 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>Benutzer-ID</guilabel>: Hier können Sie eine <emphasis role=\"bold"
 "\">Benutzer-ID</emphasis> (Benutzeridentifikation) für den Benutzer setzen, "
@@ -390,17 +439,18 @@ msgstr ""
 "Lassen Sie diese Eingabe solange leer, bis Sie wissen, was Sie tun."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:113
+#: en/addUser.xml:136
+#, fuzzy
 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 ""
 "<guilabel>Gruppen-ID</guilabel>: Hier können sie die <emphasis role=\"bold"
 "\">Gruppen-ID</emphasis> setzen. Auch hier gilt, lassen sie die Eingabe "
 "leer, wenn Sie sich nicht sicher sind."
 
 #. type: Content of: <section><info><title>
-#: en/ask_mntpoint_s.xml:3
+#: en/ask_mntpoint_s.xml:10
 msgid "Choose the mount points"
 msgstr "Einhängepunkte wählen"
 
@@ -415,15 +465,17 @@ msgstr "Einhängepunkte wählen"
 #.        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 format=\"PNG\" xml:id="
 "\"chooseMountPoints-im1\" align=\"center\" fileref=\"dx2-chooseMountpoints."
@@ -433,57 +485,37 @@ msgstr ""
 "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 ""
 "Hier können Sie die erkannten Linux-Partitionen auf Ihrem Computer sehen. "
 "Falls Sie mit dem Vorschlag von <application>DrakX</application> nicht "
 "zufrieden sind, können Sie die Einhängepunkte ändern."
 
-#. type: Content of: <section><note><para>
-#: en/ask_mntpoint_s.xml:41
-msgid ""
-"If you change anything, make sure you still have a <emphasis role=\"bold"
-"\"><literal>/</literal></emphasis> (root) partition."
-msgstr ""
-"Falls Sie etwas ändern, stellen Sie sicher, dass Sie noch eine <emphasis "
-"role=\"bold\"><literal>/</literal></emphasis> (root)-Partition haben."
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:46
-msgid ""
-"Every partition is shown to the left as: <emphasis role=\"bold\">Device "
-"(capacity, mount point, type).</emphasis>"
-msgstr ""
-"Jede Partition wird wie folgt angezeigt: <emphasis role=\"bold\">\"Gerät"
-"\" (\"Kapazität\", \"Einhängepunkt\", \"Typ\").</emphasis>"
-
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:50
+#: en/ask_mntpoint_s.xml:55
 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 ""
-"<emphasis role=\"bold\">Gerät</emphasis>, bestehend aus: <emphasis role="
-"\"bold\">Festplatte</emphasis>, [<emphasis role=\"bold\">Festplattennamen</"
-"emphasis> (Buchstabe)], <emphasis role=\"bold\">Partitionsnummer</emphasis> "
-"(zum Beispiel, <emphasis role=\"bold\">sda5</emphasis>)."
 
 #. 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 ""
 "Falls Sie mehrere Partitionen angelegt haben, können Sie verschiedene "
 "Einhängepunkte aus dem Ausklappmenü auswählen, wie z.B.  <emphasis role="
@@ -495,7 +527,7 @@ msgstr ""
 "anderen Namen) für Ihre Dateien."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:63
+#: en/ask_mntpoint_s.xml:73
 msgid ""
 "For any partitions that you don't need to make use of, you can leave the "
 "mount point field blank."
@@ -504,11 +536,22 @@ msgstr ""
 "das Feld für den Einhängepunkt leer."
 
 #. type: Content of: <section><warning><para>
-#: en/ask_mntpoint_s.xml:69
+#: en/ask_mntpoint_s.xml:79
+#, fuzzy
+msgid ""
+"If you make any changes here, ensure you still have a <filename>/</filename> "
+"(root) partition."
+msgstr ""
+"Falls Sie etwas ändern, stellen Sie sicher, dass Sie noch eine <emphasis "
+"role=\"bold\"><literal>/</literal></emphasis> (root)-Partition haben."
+
+#. type: Content of: <section><tip><para>
+#: en/ask_mntpoint_s.xml:84
+#, 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 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 ""
 "Falls Sie nicht sicher sind, was auszuwählen ist, klicken Sie auf <emphasis "
 "role=\"bold\">Zurück</emphasis> und danach auf <guilabel>Benutzerdefinierte "
@@ -516,196 +559,245 @@ msgstr ""
 "eine Partition und Sie können deren Typ und Größe sehen."
 
 #. 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 ""
 "Wenn Sie sicher sind, dass die Einhängepunkte passen, dann klicken Sie bitte "
 "auf <guibutton>Weiter</guibutton> und gebe an, ob nur die von DrakX "
 "vorgeschlagenen Partitionen formatiert werden sollen oder noch weitere."
 
 #. type: Content of: <section><info><title>
-#: en/bestTime.xml:10
-msgid "Clock settings"
+#: en/bestTime.xml:5
+#, fuzzy
+msgid "Clock Settings"
 msgstr "Zeiteinstellungen"
 
 #. 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 ""
 "In diesem Schritt müssen Sie auswählen, auf welche Zeit die PC interne Uhr "
 "eingestellt ist, entweder lokale Zeit oder GMT Zeit."
 
 #. type: Content of: <section><para>
-#: en/bestTime.xml:23
-msgid "In advanced tab, you will find more options about clock settings."
+#: en/bestTime.xml:14
+msgid ""
+"In the <emphasis>Advanced</emphasis> tab, you can enable automatic time "
+"synchronization and specify an NTP server."
 msgstr ""
-"Im Tab Fortgeschrittene Optionen, erhalten Sie weitere Möglichkeiten "
-"bezüglich der Zeiteinstellungen."
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:1
+#: en/bootLive.xml:6
 msgid "Boot Mageia as Live system"
 msgstr "Mageia als Live-System starten"
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:1
+#: en/bootLive.xml:10
 msgid "Booting the medium"
 msgstr "Vom Medium starten"
 
-#. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:1
-msgid "From a disc"
-msgstr "Von einem optischen Laufwerk"
-
-#. 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 ""
-"Sie können direkt von dem Datenträger, auf dem Sie das Image gebrannt haben "
-"(CD-ROM, DVD-ROM...), starten. Sie müssen nur die CD/DVD in Ihr Laufwerk "
-"einlegen, damit der Bootloader die Installation automatisch nach dem "
-"Neustart Ihres Computers beginnt. Falls dies nicht funktioniert, müssen Sie "
-"womöglich die Bootreihenfolge der Laufwerke im BIOS umstellen oder beim "
-"Start eine Taste drücken, wodurch Sie eine Auswahl erhalten, von der Sie "
-"wählen können, von welchem Laufwerk Ihr Computer starten soll."
+#. 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 ""
-"Abhängig davon, welche Hardware Sie besitzen und wie diese konfiguriert ist, "
-"erhalten Sie einen der beiden unten angezeigten Bildschirme."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:7
-msgid "From a USB device"
-msgstr "Von einem USB-Gerät"
+#. 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
-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 ""
-"Sie können von dem USB-Gerät, auf welchem Sie das ISO Image übertragen "
-"haben, starten. Abhängig von den BIOS Einstellungen startet der Computer "
-"möglicherweise direkt von dem bereits eingesteckten USB-Gerät. Falls dies "
-"nicht geschieht, müssen Sie entweder in Ihren BIOS Einstellungen die "
-"Bootreihenfolge ändern, oder eine Taste während dem Startvorgang Ihres "
-"Computers drücken, damit eine Auswahl angezeigt wird, in der Sie auswählen "
-"können von welchem Laufwerk Sie ihren Computer starten möchten."
+#. type: Content of: <section><section><note><para>
+#: en/bootLive.xml:28
+msgid ""
+"The actual screen that you will first see when booting from the Live media "
+"will depend on whether your computer motherboard is of the Legacy (BIOS) or "
+"UEFI type."
+msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:12
+#: en/bootLive.xml:35
 msgid "In BIOS/CSM/Legacy mode"
 msgstr "Im BIOS/CSM/Legacy Modus"
 
-#. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:12
-msgid "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
+#. type: Content of: <section><section><itemizedlist><title>
+#: en/bootLive.xml:38
+msgid "Main Menu"
 msgstr ""
-"<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
-
-#. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:12
-msgid "First screen while booting in BIOS mode"
-msgstr "Der erste Bildschirm beim starten im BIOS Modus"
 
-#. type: Content of: <section><section><para>
-#: en/bootLive.xml:12
-msgid "In the middle menu, you have the choice between three actions:"
-msgstr "Im mittleren Menü haben Sie die Auswahl zwischen drei Möglichkeiten:"
+#. 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\">Arbeitsrechner</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:13
+#: en/bootLive.xml:41
 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."
+"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 ""
-"Mageia starten: Dies bedeutet, dass Mageia 5 vom verwendeten Medium (CD/DVD "
-"oder USB-Stick) gestartet wird, ohne dass etwas auf das Laufwerk geschrieben "
-"wird. Das System ist hierbei sehr langsam. Sobald der Startvorgang beendet "
-"ist können Sie mit der Installation auf der Festplatte fortfahren."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:16
+#: en/bootLive.xml:42
+#, fuzzy
+msgid "Once the boot is done, you can proceed to the installation."
+msgstr ""
+"Die Konfigurationseinstellungen, die Sie hier vorgenommen haben, werden für "
+"die Installation gespeichert."
+
+#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/bootLive.xml:45 en/bootLive.xml:57
+#, fuzzy
 msgid ""
-"Install Mageia: This choice will directly install Mageia on a hard disk."
+"<emphasis role=\"bold\">+ use non-free video drivers (slower to boot)</"
+"emphasis>"
+msgstr ""
+"<emphasis role=\"bold\">Wählen Sie hier ihre Sicherheitsstufe aus</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\">Arbeitsrechner</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 ""
 "Mageia installieren: Diese Auswahl wird Mageia direkt auf eine Festplatte "
 "installieren."
 
+#. 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:65
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-bootCSM.png\" align=\"center\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\"/"
+"> </imageobject>"
+
+#. type: Content of: <section><section><mediaobject><caption><para>
+#: en/bootLive.xml:69
+msgid "First screen while booting in BIOS mode"
+msgstr "Der erste Bildschirm beim starten im BIOS Modus"
+
+#. 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:17
+#: en/bootLive.xml:75
+#, fuzzy
+msgid "<keycap>F1</keycap> <emphasis role=\"bold\">Help</emphasis>"
+msgstr "<emphasis role=\"bold\">Server</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:76
+#, fuzzy
 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)."
+"Within any of the <keycap>F2</keycap> to <keycap>F6</keycap> options, you "
+"can view relevant help by pressing <keycap>F1</keycap>."
 msgstr ""
-"Von der Festplatte starten: Diese Auswahl erlaubt Ihnen das System von der "
-"Festplatte zu starten, so als wäre kein Medium (CD/DVD oder USB-Stick) "
-"angeschlossen. (Funktioniert nicht mit Mageia 5)."
+"Bei den über <emphasis role=\"bold\">F2</emphasis> bis <emphasis role=\"bold"
+"\">F6</emphasis> verfügbaren Optionen, können Sie die entsprechende Hilfe "
+"durch drücken von <emphasis role=\"bold\">F1</emphasis> anzeigen lassen"
 
-#. type: Content of: <section><section><para>
-#: en/bootLive.xml:19
-msgid "In the bottom menu, are the Boot Options:"
-msgstr "Im unteren Menü sind die Startoptionen:"
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:81
+#, fuzzy
+msgid "<keycap>F2</keycap> <emphasis role=\"bold\">Language</emphasis>"
+msgstr "<emphasis role=\"bold\">Fortgeschritten</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:19
+#: en/bootLive.xml:82
 msgid ""
-"F1 - Help. Explain the options \"splash\", \"apm\", \"acpi\" and \"Ide\""
+"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 ""
-"F1 - Hilfe. Beschreibt die Optionen \"splash\", \"apm\", \"acpi\" und \"Ide\""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:20
-msgid "F2 - Language. Choose the display language of the screens."
+#: en/bootLive.xml:87
+#, fuzzy
+msgid "<keycap>F3</keycap> <emphasis role=\"bold\">Video Mode</emphasis>"
+msgstr "<emphasis role=\"bold\">Fortgeschritten</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:89
+#, fuzzy
+msgid ""
+"If needed, change the screen resolution by pressing <keycap>F3</keycap>. "
+"Options are: 640x480, 800x600, 1024x768."
 msgstr ""
-"F2 - Sprache. Hier können Sie die angezeigte Sprache für den Bildschirm "
-"auswählen"
+"Ändere die Bildschirmauflösung durch drücken der <emphasis role=\"bold\">F3</"
+"emphasis> Taste (nur im Legacy Modus)"
 
 #. 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:93
+#, fuzzy
+msgid "<keycap>F4</keycap> <emphasis role=\"bold\">Source</emphasis>"
+msgstr "<emphasis role=\"bold\">Server</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: 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 - Bildschirmauflösung. Wähle zwischen Text, 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 oder Other. Normalerweise wird die Installation vom "
 "eingelegten Installations-Datenträger durchgeführt. Hier können andere "
@@ -715,122 +807,178 @@ msgstr ""
 "dieser Option aus."
 
 #. 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\">Server</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 - Treiber. Ja oder Nein. Dem System wird dadurch gemeldet, das ein "
-"weiterer, optionaler, Datenträger mit einer Treiberaktualisierung zur "
-"Verfügung steht und diese wird dann während dem Installationsvorgang "
-"verlangt."
 
 #. 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\">Arbeitsrechner</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:106
+#, fuzzy
+msgid ""
+"If you experience problems with the installation, you could try modifying "
+"the default settings using the <emphasis>Kernel Option</emphasis> menu:"
+msgstr ""
+"Falls Sie Probleme mit der Installation feststellen, können Sie versuchen, "
+"die voreingestellten Einstellungen mit <emphasis role=\"bold\">F6</emphasis> "
+"<emphasis role=\"bold\">Kernel-Optionen</emphasis> zu ändern (drücke bei "
+"UEFI Systeme stattdessen auf <emphasis role=\"bold\">e</emphasis>)-"
+
+#. 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\">Ausrichten an</emphasis> = MiB"
+
+#. 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 ""
+"- No ACPI (Advanced Configuration and Power Interface): die "
+"Stromsparfunktion wird nicht berücksichtigt."
+
+#. 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 ""
+"- Kein lokales APIC (Local Advanced Programmable Interrupt Controller): es "
+"geht um die CPU Unterbrechung. Wähle die Option wenn Sie Fehler im System, "
+"wie zum Beispiel einer Kernel Panik im Zusammenhang mit APIC, feststellen"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:131
 msgid ""
-"F6 - Kernel options. This is a way to specify options according to your "
-"hardware and the drivers to use."
+"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 - Kernel-Optionen. Auf diesem Weg können Sie Optionen, abhängig von Ihrer "
-"Hardware und die dafür zu verwendeten Treiber, festlegen."
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:29
+#: en/bootLive.xml:139
 msgid "In UEFI mode"
 msgstr "Im UEFI-Modus"
 
 #. 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 ""
-"Der erste Bildschirm beim starten auf einem UEFI System von einem Datenträger"
+#: en/bootLive.xml:146
+#, fuzzy
+msgid "First screen while booting in UEFI mode"
+msgstr "Der erste Bildschirm beim starten im BIOS Modus"
 
 #. 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 ""
-"Sie haben nur die Auswahlmöglichkeit Mageia im Live Modus zu starten (erste "
-"Auswahl) oder die Installation zu beginnen (zweite Auswahl)."
 
-#. 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 ""
-"Falls Sie von einem USB-Stick starten, werden Ihnen zwei zusätzliche Zeilen "
-"angezeigt, welche Duplikate der vorigen Zeilen sind, mit dem zusätzlichen "
-"Suffix \"USB\". Sie müssen diese Auswählen."
+"Mageia starten: Dies bedeutet, dass Mageia 5 vom verwendeten Medium (CD/DVD "
+"oder USB-Stick) gestartet wird, ohne dass etwas auf das Laufwerk geschrieben "
+"wird. Das System ist hierbei sehr langsam. Sobald der Startvorgang beendet "
+"ist können Sie mit der Installation auf der Festplatte fortfahren."
 
-#. 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 ""
-"In jedem Fall sind die ersten Schritte die gleichen, um die Sprache, "
-"Zeitzone und Tastatur auszuwählen. Danach unterscheiden diese sich durch "
-"<link linkend=\"testing\">zusätzliche Schritte im Live Modus</link>."
 
 #. type: Content of: <section><info><title>
-#: en/chooseDesktop.xml:3
+#: en/chooseDesktop.xml:16
 msgid "Desktop Selection"
 msgstr "Desktopauswahl"
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:8
-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 ""
-"Je nachdem, welche Auswahl Sie hier treffen, werden weitere Auswahlfenster "
-"angezeigt, um Ihre Installation individuell zu gestalten."
 
 #. 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 ""
 "Nach den Auswahlschritten wird während der Paketinstallation eine "
 "Präsentation angezeigt. Die Präsentation kann durch Anklicken des "
 "<guilabel>Details</guilabel>-Knopfes beendet werden."
 
 #. 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 format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
 "align=\"center\"/> </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 <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."
+"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 ""
+"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 ""
 "Wählen Sie, ob sie die <application>KDE</application> <emphasis role=\"bold"
 "\">Plasma</emphasis> oder <application>GNOME</application> Desktop-Umgebung "
@@ -848,8 +996,9 @@ msgid "Package Group Selection"
 msgstr "Paketgruppenauswahl"
 
 #. 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
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
 "\" align=\"center\"/> </imageobject>"
@@ -858,7 +1007,7 @@ msgstr ""
 "\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:14
+#: en/choosePackageGroups.xml:16
 msgid ""
 "Packages are arranged into common groups, to make choosing what you need on "
 "your system a lot easier. The groups are fairly self explanatory, however "
@@ -872,22 +1021,22 @@ msgstr ""
 "Gruppen fahren."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:21
+#: en/choosePackageGroups.xml:23
 msgid "<emphasis role=\"bold\">Workstation</emphasis>"
 msgstr "<emphasis role=\"bold\">Arbeitsrechner</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:25
+#: en/choosePackageGroups.xml:27
 msgid "<emphasis role=\"bold\">Server</emphasis>"
 msgstr "<emphasis role=\"bold\">Server</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:29
+#: en/choosePackageGroups.xml:31
 msgid "<emphasis role=\"bold\">Graphical Environment</emphasis>"
 msgstr "<emphasis role=\"bold\">Grafische-Umgebung</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:33
+#: en/choosePackageGroups.xml:35
 msgid ""
 "<emphasis role=\"bold\">Individual Package Selection</emphasis>: you can use "
 "this option to manually add or remove packages"
@@ -896,7 +1045,7 @@ msgstr ""
 "Pakete hinzuzufügen oder entfernen zu können, wählen Sie bitte diese Option."
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:38
+#: en/choosePackageGroups.xml:40
 msgid ""
 "See <xref linkend=\"minimal-install\"/> for instructions on how to do a "
 "minimal install (without or with X &amp; IceWM)."
@@ -910,8 +1059,10 @@ msgid "Choose Individual Packages"
 msgstr "Wählen Sie individuelle Pakete"
 
 #. 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
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackagesTree.png"
 "\" align=\"center\"/> </imageobject>"
@@ -920,7 +1071,7 @@ msgstr ""
 "\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:14
+#: en/choosePackagesTree.xml:18
 msgid ""
 "Here you can add or remove any extra packages to customize your installation."
 msgstr ""
@@ -928,13 +1079,14 @@ msgstr ""
 "anzupassen."
 
 #. 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 ""
 "Nachdem Sie Ihre Wahl getroffen haben, können Sie auf das "
 "<guibutton>Diskettensymbol</guibutton> am unteren Ende der Seite klicken, um "
@@ -951,8 +1103,10 @@ msgstr "Konfigurieren Ihrer Dienste"
 
 #.  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
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-configureServices.png"
 "\" xml:id=\"configureServices-im1\" align=\"center\" revision=\"1\"/> </"
@@ -963,29 +1117,25 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:16
+#: en/configureServices.xml:20
 msgid ""
 "Here you can choose which services should start when you boot your system."
 msgstr ""
 "Hier können Sie einstellen, welche Dienste ausgeführt (oder auch nicht "
 "ausgeführt) werden sollen, nachdem Ihr System gestartet wurde."
 
-#. 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
+#, fuzzy
+msgid ""
+"Click on a triangle to expand a group to all the relevant services. The "
+"settings DrakX chose are usually good."
 msgstr ""
 "Klicke auf ein Dreieck, um eine Gruppe mit allen relevanten Dienste "
 "aufzuschlüsseln."
 
-#. type: Content of: <section><para>
-#: en/configureServices.xml:22
-msgid "The settings DrakX chose are usually good."
-msgstr ""
-"Normalerweise wählt <emphasis role=\"bold\">DrakX</emphasis> passende "
-"Einstellungen."
-
-#. 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."
@@ -994,7 +1144,7 @@ msgstr ""
 "einige Informationen zu diesem Dienst angezeigt."
 
 #. 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 ""
 "Ändern Sie diese Einstellungen nur dann, wenn Sie genau wissen, was Sie tun."
@@ -1006,14 +1156,17 @@ msgstr "Konfiguration der Zeitzone"
 
 #.  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 format=\"PNG\" xml:id="
 "\"configureTimezoneUTC-im1\" align=\"center\" fileref=\"dx2-"
@@ -1021,17 +1174,18 @@ msgstr ""
 "<imagedata format=\"PNG\" fileref=\"live-timeZone.png\" condition=\"live\"/> "
 "</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 ""
 "Wählen Sie die von Ihnen gewünschte Zeitzone, indem Sie ihr Land oder eine "
 "Stadt in Ihrer Nähe aus der gleichen Zeitzone wählen."
 
 #. type: Content of: <section><para>
-#: en/configureTimezoneUTC.xml:24
+#: en/configureTimezoneUTC.xml:32
 msgid ""
 "In the next screen you can choose to set your hardware clock to local time "
 "or to GMT, also known as UTC."
@@ -1040,7 +1194,7 @@ msgstr ""
 "Zeit oder auf GMT, auch als UTC bekannt, gesetzt ist."
 
 #. 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."
@@ -1049,23 +1203,23 @@ msgstr ""
 "alle Betriebssysteme entweder auf Lokalzeit oder auf UTC/GMT gesetzt sind."
 
 #. 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 "Einen X-Server auswählen (Ihre Grafikkarte einrichten)"
 
 #. 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=\"configureX_card_list-im1\" "
-"align=\"center\" fileref=\"dx2-configureX_card_list.png\" 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/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."
@@ -1074,7 +1228,7 @@ msgstr ""
 "Ihre Grafikkarte korrekt erkennen."
 
 #. 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:"
@@ -1083,30 +1237,34 @@ msgstr ""
 "und Sie nicht wissen, welche Sie haben, können Sie sie folgendermaßen aus "
 "dem Baum auswählen:"
 
-#. 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 "Hersteller"
 
 #. 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 "Der Name der Karte"
 
 #. 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 "Der Typ der Karte"
 
 #. 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 ""
 "Wenn Sie Ihre Karte nicht in der Herstellerliste vorhanden ist (weil es noch "
 "nicht in der Datenbank vorhanden ist oder es eine ältere Karte ist), finden "
@@ -1117,66 +1275,63 @@ msgstr ""
 "den <emphasis role=\"bold\">vesa</emphasis> Treiber zu verwenden, welcher "
 "grundlegende Eigenschaften besitzt."
 
-#. 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 ""
 "Denken Sie daran, dass es durch Auswahl eines inkompatiblen Treibers "
 "passieren kann, dass Sie lediglich Zugriff auf eine <emphasis role=\"bold"
 "\">Befehlszeilenschnittstelle</emphasis> erhalten."
 
 #. 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 ""
 "Einige Grafikkartenhersteller bieten proprietäre Treiber für Linux an, "
 "welche nur in den <emphasis role=\"bold\">Nonfree</emphasis>-Paketquellen "
 "oder in einigen Fällen nur über die Webseite des Herstellers erhältlich sind."
 
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:56
-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 ""
-"Die <emphasis role=\"bold\">Nonfree</emphasis>-Paketquellen müssen "
-"ausdrücklich aktiviert werden. Falls Sie dies zuvor nicht gemacht haben, "
-"sollten Sie dies nach dem ersten Neustart tun."
-
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:3
+#: en/configureX_chooser.xml:11
 msgid "Graphic Card and Monitor Configuration"
 msgstr "Konfiguration der Grafikkarte und des Bildschirms"
 
 #.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
+#. 2018/02/15 apb: Some text and typography.
+#. 2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.
+#. 2018/02/23 apb: Typo.
 #. 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=\"configureX_chooser-im1\" "
-"fileref=\"dx2-configureX_chooser.png\" align=\"center\" 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/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 ""
 "Egal, welche grafische Umgebung (auch als Desktop bekannt) Sie für die "
 "Installation von <application>Mageia</application> wählen, diese basieren "
@@ -1190,22 +1345,33 @@ msgstr ""
 "glauben, dass die Auswahl nicht korrekt ist."
 
 #. 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\">Grafische-Umgebung</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>Grafikkarte</guibutton></emphasis>: Wählen Sie Ihre "
-"Karte aus der Liste, wenn nötig."
 
 #. 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\">Server</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>Bildschirm</guibutton></emphasis>: Sie können "
 "<guilabel>Plug'n Play</guilabel> wählen, falls verfügbar, oder Ihren "
@@ -1215,30 +1381,37 @@ msgstr ""
 "horizontale und vertikale Wiederholfrequenz Ihres Bildschirms manuell "
 "einzustellen."
 
-#. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/configureX_chooser.xml:41
-msgid "Incorrect refresh rates may damage your monitor"
-msgstr "Falsche Wiederholfrequenzen können Ihren Bildschirm beschädigen"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_chooser.xml:60
+#, fuzzy
+msgid "<emphasis role=\"bold\">Resolution</emphasis>"
+msgstr "<emphasis role=\"bold\">Arbeitsrechner</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:47
-msgid ""
-"<emphasis><guibutton>Resolution</guibutton></emphasis>: The resolution and "
-"color depth of your monitor can be set here."
+#: en/configureX_chooser.xml:63
+#, fuzzy
+msgid "The resolution and color depth of your monitor can be set here"
 msgstr ""
 "<emphasis><guibutton>Auflösung</guibutton></emphasis>: Legen Sie hier die "
 "entsprechende Auflösung und Farbtiefe für Ihren Bildschirm fest."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:52
+#: en/configureX_chooser.xml:68
+#, fuzzy
+msgid "<emphasis role=\"bold\">Test</emphasis>"
+msgstr "<emphasis role=\"bold\">Server</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>: Der Test-Knopf ist während "
 "der Installation nicht immer sichtbar. Ist der Knopf sichtbar, so können Sie "
@@ -1253,21 +1426,35 @@ msgstr ""
 "verfügbar ist."
 
 #. 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\">Arbeitsrechner</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>Optionen</guibutton></emphasis>: Hier können Sie "
 "verschiedene Optionen aktivieren oder deaktivieren."
 
+#. 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 "Auswahl des Monitors"
 
 #. 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."
@@ -1276,7 +1463,7 @@ msgstr ""
 "normalerweise ihren Monitor korrekt."
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:19
+#: en/configureX_monitor.xml:30
 msgid ""
 "<emphasis role=\"bold\">Selecting a monitor with different characteristics "
 "could damage your monitor or video hardware. Please don't try something "
@@ -1289,25 +1476,26 @@ msgstr ""
 "Zweifel schauen Sie doch bitte in die Dokumentation des Monitors"
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:26
+#: en/configureX_monitor.xml:38
+#, fuzzy
 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=\"configureX_monitor-im1\" "
-"fileref=\"dx2-configureX_monitor.png\" align=\"center\" 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/configureX_monitor.xml:31
-msgid "<emphasis>Custom</emphasis>"
-msgstr "<emphasis>Benutzerdefiniert</emphasis>"
+#. type: Content of: <section><variablelist><varlistentry><term>
+#: en/configureX_monitor.xml:46
+msgid "Custom"
+msgstr ""
 
-#. 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."
@@ -1318,8 +1506,8 @@ msgstr ""
 "und die horizontalen Synchronisationsfrequenz legt die Rate fest, wieviele "
 "Scanlinien dargestellt werden."
 
-#. 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 "
@@ -1331,27 +1519,23 @@ msgstr ""
 "Schäden an ihrem Monitor führen. Wählen Sie im Zweifel lieber eine "
 "niedrigere Einstellung und schauen Sie in die Dokumentation ihres Monitors."
 
-#. 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 ""
 "Dies ist die Standardeinstellung und es wird versucht den Monitor anhand der "
 "Datenbank zu bestimmen"
 
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:51
-msgid "<emphasis>Vendor</emphasis>"
-msgstr "<emphasis>Hersteller</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:"
@@ -1360,30 +1544,30 @@ msgstr ""
 "Sie wissen, um welchen Monitor es sich handelt, können Sie den Monitor "
 "anhand folgender Optionen auswählen:"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:61
-msgid "the monitor manufacturers name"
-msgstr "Monitorbezeichnung"
+#. 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 "Monitorbeschreibung"
+#. 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>Generisch</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 ""
 "Die Auswahl dieser Gruppe zeigt rund 30 Anzeigeneinstellungen wie 1024x768 @ "
 "60Hz und beinhaltet auch Flachbildschirme, die in Laptops verbaut sind. Die "
@@ -1393,79 +1577,57 @@ msgstr ""
 "niedrige Einstellungen zu wählen."
 
 #. 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 "Benutzerdefinierte Laufwerkspartitionierung mit 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"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.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
-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 ""
-"Wünschen Sie auf Ihrer <emphasis role=\"bold\">/</emphasis> -Partition "
-"(Wurzelverzeichnis) eine Verschlüsselung, müssen Sie sicherstellen, dass Sie "
-"eine eigene <emphasis role=\"bold\">/boot</emphasis>-Partition besitzen. Die "
-"Option Verschlüsselung für die <emphasis role=\"bold\">/boot</emphasis>- "
-"Partition darf NICHT gesetzt werden, da sonst das System nicht gebootet "
-"werden kann."
+"<imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/> </imageobject>"
 
-#. 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 ""
 "Passen Sie hier das Layout ihres Datenträger an. Sie können Partitionen "
 "entfernen oder erstellen, das Dateisystem einer Partition ändern oder die "
 "Größe ändern und sogar schauen, was sich in ihnen befindet, bevor Sie "
 "anfangen."
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:34
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/diskdrake.xml:45
+#, fuzzy
 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>."
+"device, like a USB key). In the screenshot above there are two available "
+"devices: <filename>sda </filename>and <filename>sdb</filename>."
 msgstr ""
 "Für jede erkannte Festplatte (oder anderer Datenträger wie einen USB-Stick) "
 "gibt es im oberen Bereich einen Tab. In dem Screenshot oben sind zwei Geräte "
 "verfügbar: <emphasis role=\"bold\">sda</emphasis> und <emphasis role=\"bold"
 "\">sdb</emphasis>."
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:39
-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."
-msgstr ""
-"Sei vorsichtig mit der <guibutton>Alles löschen</guibutton> Option. Nutze "
-"diese nur wenn Sie sich sicher sind, dass alle Partitionen auf dem gewählten "
-"Laufwerk gelöscht werden sollen."
-
-#. 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 ""
 "Für alle anderen Aktivitäten: Klicken Sie zuerst auf die auszuwählende "
 "Partition. Sie können sich diese dann entweder nur ansehen, oder ein "
@@ -1474,56 +1636,96 @@ msgstr ""
 "Möglichkeiten an, beispielsweise eine Bezeichnung (einen Namen) der "
 "Partition zu geben oder einen Partitionstyp festzulegen."
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:49
-msgid "Continue until you have adjusted everything to your satisfaction."
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/diskdrake.xml:60
+#, fuzzy
+msgid ""
+"Continue until you have adjusted everything to your satisfaction, then click "
+"<emphasis>Done</emphasis> when you're ready."
 msgstr ""
 "Wiederholen Sie diesen Vorgang für alle Laufwerke, bis alle Einstellungen "
 "Ihren Wünschen entsprechen."
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:52
-msgid "Click <guibutton>Done</guibutton> when you're ready."
-msgstr "Ist alles bereit, so klicken Sie auf <guibutton>Fertig</guibutton>."
+#. 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 ""
+"Sei vorsichtig mit der <guibutton>Alles löschen</guibutton> Option. Nutze "
+"diese nur wenn Sie sich sicher sind, dass alle Partitionen auf dem gewählten "
+"Laufwerk gelöscht werden sollen."
 
-#. 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 ""
+"Wünschen Sie auf Ihrer <emphasis role=\"bold\">/</emphasis> -Partition "
+"(Wurzelverzeichnis) eine Verschlüsselung, müssen Sie sicherstellen, dass Sie "
+"eine eigene <emphasis role=\"bold\">/boot</emphasis>-Partition besitzen. Die "
+"Option Verschlüsselung für die <emphasis role=\"bold\">/boot</emphasis>- "
+"Partition darf NICHT gesetzt werden, da sonst das System nicht gebootet "
+"werden kann."
+
+#. 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 ""
 "Falls Sie Mageia auf einem UEFI System installieren, überprüfen Sie das eine "
 "ESP (EFI Systempartition) vorhanden und korrekt unter /boot/EFI eingebunden "
 "ist (siehe unten)"
 
-#. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:61
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/diskdrake.xml:93
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
-"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"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 ""
+"Falls Sie Mageia auf einem Legacy/GPT System installieren, überprüfe, dass "
+"eine BIOS Bootpartition vorhanden ist und diese den richtigen Dateisystemtyp "
+"hat"
+
+#. type: Content of: <section><figure><title>
+#: en/diskdrake.xml:101
+#, fuzzy
+msgid "EFI System Partition"
+msgstr "Verwende vorhandene Partitionen"
+
+#. type: Content of: <section><figure><mediaobject>
+#: en/diskdrake.xml:104
+#, fuzzy
+msgid ""
+"<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-diskdrake2.png"
 "\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/> </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
-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 ""
-"Falls Sie Mageia auf einem Legacy/GPT System installieren, überprüfe, dass "
-"eine BIOS Bootpartition vorhanden ist und diese den richtigen Dateisystemtyp "
-"hat"
 
-#. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:76
+#. type: Content of: <section><mediaobject>
+#: en/diskdrake.xml:118 en/doPartitionDisks.xml:200
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1536,50 +1738,60 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:9
-msgid "Partitioning"
+#: en/doPartitionDisks.xml:25
+#, fuzzy
+msgid "Suggested Partitioning"
 msgstr "Partitionierung"
 
 #. 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 ""
 "Auf diesem Bildschirm können Sie Ihre Festplatte(n) sehen und die "
 "Einteilung, die der DrakX Partitionierungswizard für die Installation von "
 "<application>Mageia</application> vorschlägt."
 
 #. 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 ""
 "Die in der Liste verfügbaren Optionen variieren abhängig von Ihren verbauten "
 "Festplatte(n)."
 
 #. 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-"
-"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
-"\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:32
-msgid "Use Existing Partitions"
-msgstr "Verwende vorhandene Partitionen"
+#. type: Content of: <section><itemizedlist><title>
+#: en/doPartitionDisks.xml:47
+#, fuzzy
+msgid "Main Options"
+msgstr "Optionen"
 
-#. 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\">Partitionsaufteilung:</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."
@@ -1587,13 +1799,14 @@ msgstr ""
 "Wenn diese Option verfügbar ist, dann wurden vorhandene Linux-kompatible "
 "Partitionen gefunden und können für die Installation genutzt werden."
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:41
-msgid "Use Free Space"
-msgstr "Nutze freien Speicherplatz"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:59
+#, fuzzy
+msgid "<emphasis role=\"bold\">Use Free Space</emphasis>"
+msgstr "<emphasis role=\"bold\">Server</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."
@@ -1601,59 +1814,36 @@ msgstr ""
 "Falls Sie nicht genutzten freien Speicherplatz auf Ihrer Festplatte haben, "
 "dann wird diese Option diesen für die neue Mageia-Installation verwenden."
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:49
-msgid "Use Free Space on a Windows Partition"
-msgstr "Nutze den freien Speicherplatz einer Windows Partition"
-
-#. 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 ""
-"Falls Sie nicht genutzen freien Speicherplatz auf einer bestehenden Windows-"
-"Partition verfügbar haben, kann das Installationsprogramm diesen zur Nutzung "
-"vorschlagen."
+"<emphasis role=\"bold\">Use Free Space on a Windows Partition</emphasis>"
+msgstr "<emphasis role=\"bold\">Arbeitsrechner</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 ""
 "Dies kann ein sehr nützlicher Weg sein, um Platz für eine neue Mageia-"
 "Installation zu schaffen. Dies ist aber eine sehr riskante Aktion. Also "
 "sollten Sie sicherstellen, dass alle wichtigen Daten auf einem externen "
 "Datenträger gesichert sind."
 
-#. 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 ""
-"Beachten Sie bitte, dass für diese Option eine Verkleinerung der Windows-"
-"Partition durchgeführt werden muss. Die Partition muss zwingend \"sauber\" "
-"sein. Das bedeutet, dass Windows bei der letzten Nutzung korrekt "
-"heruntergefahren wurde. Zusätzlich muss die Partition defragmentiert worden "
-"sein, obwohl es keine Garantie gibt, dass alle Dateien der Partition aus dem "
-"zu nutzenden Teil verschoben wurden. Es ist also wirklich sehr zu empfehlen, "
-"die persönlichen Daten vor dem Vorgang zu sichern."
-
-#. type: Content of: <section><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 ""
 "Bei dieser Option stellt das Installationsprogramm die verbleibende Windows-"
 "Partition in einem hellen und die zukünftige Mageia-Partition in einem "
@@ -1662,54 +1852,56 @@ msgstr ""
 "die Grenze zwischen den beiden Partitionen anklicken und verschieben. Siehe "
 "dazu den Screenshot unten."
 
-#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:76
-msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/> </imageobject>"
-msgstr ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/> </imageobject>"
-
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:87
-msgid "Erase and use Entire Disk."
-msgstr "Komplette Platte löschen und freien Platz benutzen"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:85
+#, fuzzy
+msgid "<emphasis role=\"bold\">Erase and use Entire Disk</emphasis>"
+msgstr "<emphasis role=\"bold\">Grafische-Umgebung</emphasis>"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:90
-msgid "This option will allocate the entire drive for Mageia."
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:88
+#, fuzzy
+msgid "This option will allocate the entire drive for Mageia"
 msgstr "Diese Option wird das gesamte Laufwerk für Mageia zuordnen."
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:93
-msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
-msgstr ""
-"Beachte! Dies wird ALLE Daten auf dem gewählten Laufwerk löschen. Bitte "
-"Vorsicht walten lassen!"
-
-#. 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 ""
 "Falls Sie beabsichtigen, einen Teil der Platte für etwas anderes zu nutzen "
 "oder Sie haben wichtige Daten auf dem Laufwerk, welche nicht verloren gehen "
 "dürfen, dann nutzen Sie bitte nicht diese Option."
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:103
-msgid "Custom disk partitioning"
-msgstr "Benutzerdefinierte Partitionierung"
+#. 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 ""
+"Beachten Sie bitte, dass für diese Option eine Verkleinerung der Windows-"
+"Partition durchgeführt werden muss. Die Partition muss zwingend \"sauber\" "
+"sein. Das bedeutet, dass Windows bei der letzten Nutzung korrekt "
+"heruntergefahren wurde. Zusätzlich muss die Partition defragmentiert worden "
+"sein, obwohl es keine Garantie gibt, dass alle Dateien der Partition aus dem "
+"zu nutzenden Teil verschoben wurden. Es ist also wirklich sehr zu empfehlen, "
+"die persönlichen Daten vor dem Vorgang zu sichern."
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:106
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:110
+#, fuzzy
+msgid "<emphasis role=\"bold\">Custom Disk Partitioning</emphasis>"
+msgstr "<emphasis role=\"bold\">Partitionsaufteilung:</emphasis>"
+
+#. 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)."
@@ -1717,35 +1909,45 @@ msgstr ""
 "Diese Option gibt Ihnen die vollständige Kontrolle über das Platzieren der "
 "Installation auf den Festplatten."
 
-#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:112
-msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
-msgstr "<emphasis role=\"bold\">Partitionsaufteilung:</emphasis>"
+#. type: Content of: <section><mediaobject>
+#: en/doPartitionDisks.xml:120
+#, fuzzy
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:114
+#: en/doPartitionDisks.xml:129
+#, fuzzy
 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 ""
 "Wenn Sie nicht die <emphasis role=\"bold\">Benutzerdefinierte "
 "Partitionierung</emphasis> verwenden, wird das Installationsprogramm den "
 "verfügbaren Speicherplatz anhand folgender Regeln zuordnen:"
 
-#. 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 ""
 "Wenn der gesamte verfügbare Speicherplatz weniger als 50 GB beträgt, wird "
 "nur eine Partition erstellt. Diese ist die <emphasis role=\"bold\">/</"
 "emphasis> (root) Partition."
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:125
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:141
 msgid ""
 "If the total available space is greater than 50 GB, then three partitions "
 "are created"
@@ -1753,50 +1955,63 @@ msgstr ""
 "Wenn der gesamte verfügbare Speicherplatz über 50 GB beträgt, werden drei "
 "Partitionen erstellt"
 
-#. 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 des gesamt verfügbaren Speicherplatz wird <emphasis role=\"bold\">/</"
 "emphasis> zugewiesen, mit einer maximalen Größe von 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 wird swap zugewiesen mit einer maximalen Größe von 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 ""
 "der Rest (mindestens 12/19) wird <emphasis role=\"bold\">/home</emphasis> "
 "zugewiesen."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:144
+#: 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 ""
-"Dies bedeutet, dass bei einem freien Speicherplatz von 160 GB und mehr, das "
-"Installationsprogramm drei Partitionen erstellen wird: 50 GB für <emphasis "
-"role=\"bold\">/</emphasis>, 4 GB für <emphasis role=\"bold\">swap</emphasis> "
-"und der Rest für <emphasis role=\"bold\">/home</emphasis>."
 
 #. 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 ""
 "Wenn Sie ein UEFI System nutzen, wird die ESP (EFI System Partition) "
 "automatisch erkannt oder erstellt, falls diese noch nicht vorhanden ist, und "
@@ -1805,13 +2020,15 @@ msgstr ""
 "nachzuprüfen, ob dies erfolgreich durchgeführt wurde."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:158
+#: en/doPartitionDisks.xml:188
+#, fuzzy
 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 ""
 "Falls Sie ein Legacy System (bekannt als CSM oder BIOS) mit einem GPT-"
 "Laufwerk verwenden, müssen Sie eine BIOS Bootpartition erstellen, falls noch "
@@ -1820,36 +2037,29 @@ msgstr ""
 "diese, sowie andere Partitionen erstellt. Wähle als Dateisystem einfach BIOS "
 "Bootpartition aus."
 
-#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:165
-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 align=\"center\" fileref="
-"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </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-doPartitionDisks4.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 ""
 "Einige neuere Laufwerke nutzen logische Sektoren mit 4.096 Bytes anstelle "
 "der bisherigen 512 Bytes. Aufgrund fehlender Hardware wurde das "
@@ -1859,20 +2069,39 @@ msgstr ""
 "das Laufwerk vorher mit einem alternativen Werkzeug wie <emphasis role=\"bold"
 "\">gparted</emphasis> mit folgende Einstellungen zu partitionieren:"
 
-#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:189
-msgid "<emphasis role=\"bold\">Align to</emphasis> = MiB"
+#. type: Content of: <section><important><para>
+#: en/doPartitionDisks.xml:221
+#, fuzzy
+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 ""
+"Einige neuere Laufwerke nutzen logische Sektoren mit 4.096 Bytes anstelle "
+"der bisherigen 512 Bytes. Aufgrund fehlender Hardware wurde das "
+"Partitionierungswerkzeug im Installationsprogramm nicht mit solchen "
+"Laufwerken getestet. Zusätzlich benutzen einige SSD Laufwerke eine 'Erase "
+"Block' Größe über 1 MB. Wenn Sie solch ein Laufwerk besitzen, empfehlen wir, "
+"das Laufwerk vorher mit einem alternativen Werkzeug wie <emphasis role=\"bold"
+"\">gparted</emphasis> mit folgende Einstellungen zu partitionieren:"
+
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:228
+#, fuzzy
+msgid "<emphasis>Align to</emphasis> = MiB"
 msgstr "<emphasis role=\"bold\">Ausrichten an</emphasis> = MiB"
 
-#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:191
-msgid "<emphasis role=\"bold\">Free space preceding (MiB)</emphasis> = 2"
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:232
+#, fuzzy
+msgid "<emphasis>Free space preceding (MiB)</emphasis> = 2"
 msgstr ""
 "<emphasis role=\"bold\">Vorhergehender freier Speicherplatz (MiB)</emphasis> "
 "= 2"
 
-#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:194
+#. type: Content of: <section><important><para>
+#: en/doPartitionDisks.xml:236
 msgid ""
 "Also make sure all partitions are created using an even number of megabytes."
 msgstr ""
@@ -1880,39 +2109,40 @@ msgstr ""
 "an Megabytes erstellt werden."
 
 #. 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 "Installation vom LIVE-Medium"
 
 #. 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 "Januar 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 "Die offizielle Mageia-Dokumentation"
 
 #. 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
+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/"
@@ -1923,8 +2153,8 @@ msgstr ""
 "\">http://creativecommons.org/licenses/by-sa/3.0/</link>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml: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."
@@ -1935,8 +2165,7 @@ msgstr ""
 "neodoc.biz\">NeoDoc</link>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml: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</"
@@ -1947,15 +2176,15 @@ msgstr ""
 "Documentation_team\">Dokumentationsteam</link>, wenn Sie dazu beitragen "
 "möchten, diese Anleitung zu verbessern."
 
-#. 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 "
@@ -1966,42 +2195,50 @@ msgstr ""
 "normal, denn was Ihnen angezeigt wird, ist abhängig von Ihrer Hardware und "
 "von den Entscheidungen, die Sie während der Installation treffen."
 
-#. 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 ""
+"Diese Anleitung wurde von Freiwilligen in ihrer Freizeit geschrieben. Bitte "
+"kontaktieren Sie das <link ns6:href=\"https://wiki.mageia.org/en/"
+"Documentation_team\">Dokumentationsteam</link>, wenn Sie dazu beitragen "
+"möchten, diese Anleitung zu verbessern."
+
 #. 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 "Installation mit Hilfe von DrakX"
 
 #. type: Content of: <book><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:9
+#: en/DrakX-cover.xml:20
 msgid "February 2014"
 msgstr "Februar 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
-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 "Herzlichen Glückwunsch!"
 
 #.  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
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
@@ -2010,28 +2247,29 @@ msgstr ""
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </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 ""
 "Sie haben die Installation und Konfiguration von <application>Mageia</"
 "application> beendet, so dass Sie das Installationsmedium entfernen und den "
 "Computer neu starten können."
 
 #. 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 ""
 "Nach dem Neustart können Sie am Bildschirm des Bootloaders zwischen den "
 "Betriebssystemen auf Ihrem Computer wählen (falls mehr als eines vorhanden "
 "ist)."
 
 #. 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."
@@ -2040,26 +2278,27 @@ msgstr ""
 "von Ihnen installierte Mageia automatisch gewählt und gestartet."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:26
+#: en/exitInstall.xml:30
 msgid "Enjoy!"
 msgstr "Viel Vergnügen!"
 
 #. 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 ""
 "Besuchen Sie www.mageia.org, falls Sie weitere Fragen haben oder bei Mageia "
 "mitarbeiten wollen."
 
 #. type: Content of: <section><info><title>
-#: en/firewall.xml:3
+#: en/firewall.xml:7
 msgid "Firewall"
 msgstr "Firewall"
 
 #. 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 "
@@ -2072,16 +2311,17 @@ msgstr ""
 "auf die entsprechenden System-Services."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:12
+#: en/firewall.xml:16
+#, fuzzy
 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 ""
 "Als Voreinstellung ist keine Checkbox markiert - kein Systemdienst ist aus "
 "dem Netzwerk erreichbar. Die \"<emphasis role=\"bold\">Alles (Keine "
@@ -2094,11 +2334,12 @@ msgstr ""
 "zu deaktivieren."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:21
+#: en/firewall.xml:25
+#, fuzzy
 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 ""
 "Alle weitere Checkbuttons sind mehr oder weniger selbsterklärend. Als "
 "Beispiel wählen Sie den \"<emphasis role=\"bold\">CUPS Server</emphasis>\" "
@@ -2106,15 +2347,16 @@ msgstr ""
 "das Netzwerk erreichbar sein sollen."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:25
+#: en/firewall.xml:29
 msgid "<emphasis role=\"bold\">Advanced</emphasis>"
 msgstr "<emphasis role=\"bold\">Fortgeschritten</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:27
+#: en/firewall.xml:31
+#, fuzzy
 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 ""
 "Die Schaltfläche \"<emphasis role=\"bold\">Fortgeschritten</emphasis>\" "
@@ -2122,12 +2364,12 @@ msgstr ""
 "Einträge (getrennt durch Leerzeichen) aktiviert werden können.  "
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:31
+#: en/firewall.xml:35
 msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
 msgstr "<emphasis>&lt;port-number>/&lt;protocol></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 "
@@ -2138,7 +2380,7 @@ msgstr ""
 "Dienst), wie dieser von <emphasis>RFC-433</emphasis> vorgegeben ist;"
 
 #. 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."
@@ -2148,7 +2390,7 @@ msgstr ""
 "Dienst verwendet wird."
 
 #. 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>."
@@ -2157,7 +2399,7 @@ msgstr ""
 "dementsprechend <emphasis>873/tcp</emphasis>."
 
 #. 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."
@@ -2166,7 +2408,7 @@ msgstr ""
 "spezifizieren Sie 2 Einträge für den selben Port."
 
 #. type: Content of: <section><info><title>
-#: en/formatPartitions.xml:3
+#: en/formatPartitions.xml:10
 msgid "Formatting"
 msgstr "Formatieren"
 
@@ -2174,14 +2416,16 @@ msgstr "Formatieren"
 #.  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\" fileref="
 "\"dx2-formatPartitions.png\" xml:id=\"formatPartitions-im1\" align=\"center"
@@ -2190,7 +2434,7 @@ msgstr ""
 "\" fileref=\"live-formatPartitions.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:24
+#: en/formatPartitions.xml:35
 msgid ""
 "Here you can choose which partition(s) you wish to format. Any data on "
 "partitions <emphasis>not</emphasis> marked for formatting will be preserved."
@@ -2200,17 +2444,20 @@ msgstr ""
 "Formatieren markiert sind, werden nicht angetastet."
 
 #. 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 ""
 "Normalerweise wählt DrakX zumindest die Partitionen aus, die "
 "notwendigerweise formatiert werden müssen."
 
 #. 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 ""
 "Klicken Sie auf <guibutton><replaceable>Fortgeschrittene Optionen</"
 "replaceable></guibutton>, um jene Partitionen zu wählen, die Sie auf "
@@ -2218,12 +2465,13 @@ msgstr ""
 "möchten."
 
 #. 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 ""
 "Sind Sie sich nicht sicher, die richtige Auswahl getroffen zu haben, so "
 "klicken Sie auf <guibutton>Abbrechen</guibutton>, nochmals auf "
@@ -2232,21 +2480,22 @@ msgstr ""
 "können Sie sehen, welche Daten sich auf diesen Partitionen befinden."
 
 #. 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 ""
 "Wenn Sie mit der Auswahl zufrieden sind, klicken Sie auf <guibutton>Weiter</"
 "guibutton>, um mit der Installation fortzufahren."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:10
+#: en/installer.xml:14
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, das Mageia Installationsprogramm"
 
 #. 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 "
@@ -2256,337 +2505,240 @@ msgstr ""
 "Mageia Installationsprogramm wurde so gestaltet, dass es Ihnen die "
 "Installation oder eine Aktualisierung so leicht wie möglich macht."
 
-#. 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 ""
-"Der Startbildschirm enthält verschiedene Optionen, wobei die vorgegebene "
-"Option das Installationsprogramm startet. Normalerweise ist dies alles, was "
-"Sie tun müssen."
-
 #. type: Content of: <section><section><title>
-#: en/installer.xml:22
-msgid "Installation Welcome Screen"
-msgstr "Willkommensbildschirm der Installation"
-
-#. type: Content of: <section><section><section><title>
-#: en/installer.xml:25
-msgid "Using a Mageia DVD"
-msgstr "Eine Mageia DVD verwenden"
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:27
-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 ""
-"Hier sehen Sie die voreingestellten Willkommensbildschirme, wenn Sie eine "
-"Mageia DVD verwenden. Beim ersten wird ein System mit UEFI verwendet und "
-"beim zweiten ein System mit BIOS:"
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:32
-msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
+#: en/installer.xml:20
+msgid "The installation steps"
+msgstr "Die Installationsschritte"
 
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:37
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/installer.xml:23
+#, fuzzy
 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."
+"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 ""
-"In diesem Bildschirm können Sie auf die Optionen zugreifen, indem Sie den "
-"Buchstaben \"<emphasis role=\"bold\">e</emphasis>\" drücken, um in den "
-"\"Bearbeitungsmodus\" zu kommen. Um zurück auf diesen Bildschirm zu kommen, "
-"drücken Sie die \"<emphasis role=\"bold\">ESC</emphasis>\" Taste um den "
-"Vorgang abzubrechen ohne eine Änderung zu speichern oder drücke die "
-"\"<emphasis role=\"bold\">Strg</emphasis>\" oder \"<emphasis role=\"bold"
-"\">F10</emphasis>\" Taste um die durchgeführten Änderungen zu speichern und "
-"den Vorgang zu beenden."
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:45
-msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
+"Der Installationsprozess ist in mehrere Schritte unterteilt, die an der "
+"linken Seite des Bildschirms verfolgt werden können."
 
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:50
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/installer.xml:28
+#, fuzzy
 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):"
+"Each step has one or more screens, which may also have <emphasis>Advanced</"
+"emphasis> sections with extra, less commonly required options."
 msgstr ""
-"Bei diesem Bildschirm ist es möglich einige Voreinstellungen einzurichten "
-"(beachte die Optionen <emphasis role=\"bold\">F1</emphasis> bis <emphasis "
-"role=\"bold\">F6</emphasis>, die nur bei Legacy Systemen verfügbar sind):"
+"Jeder dieser Schritte besitzt einen oder mehrere Bildschirme, die auch einen "
+"Knopf <guibutton>\"Fortgeschrittene Optionen\"</guibutton> mit weiteren "
+"zusätzlichen Optionen haben."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:55
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/installer.xml:33
+#, 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>"
+"Most screens have <emphasis>Help</emphasis> buttons for further details "
+"about the particular step."
 msgstr ""
-"Bei den über <emphasis role=\"bold\">F2</emphasis> bis <emphasis role=\"bold"
-"\">F6</emphasis> verfügbaren Optionen, können Sie die entsprechende Hilfe "
-"durch drücken von <emphasis role=\"bold\">F1</emphasis> anzeigen lassen"
+"Die meisten Bildschirme enthalten einen <guibutton>Hilfe</guibutton>-Knopf, "
+"über den Sie weitere Erklärungen zum momentan ausgeführten Schritt erhalten."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:63
+#. type: Content of: <section><section><caution><para>
+#: en/installer.xml:38
+#, fuzzy
 msgid ""
-"Press <emphasis role=\"bold\">F2</emphasis> to have the installer use a "
-"specific language for the installation."
+"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 ""
-"Drücke <emphasis role=\"bold\">F2</emphasis> um das Installationsprogramm in "
-"eine spezifische Sprache für die Installation einzustellen."
+"Wenn Sie an irgendeiner Stelle entscheiden, die Installation zu stoppen, ist "
+"es möglich, einen Neustart auszuführen.  Überlegen Sie sich dies aber "
+"zweimal, bevor Sie dies ausführen. Wurde eine Partition bereits formatiert "
+"oder ein Update hat mit der Installation begonnen, so ist Ihr Computer nicht "
+"mehr im gleichen Zustand und ein Neustart kann Sie sehr leicht mit einem "
+"nicht mehr verwendbaren System zurücklassen. Wenn Sie trotz allem sicher "
+"sind, einen Neustart auszuführen, wechseln Sie mit <guibutton>Alt+Strg+F2</"
+"guibutton> in ein Text-Terminal. Anschließend betätigen Sie <guibutton>Alt"
+"+Strg+Entf</guibutton>, um einen Neustart auszulösen."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:67
+#. type: Content of: <section><section><caution><para>
+#: en/installer.xml:43
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+"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 ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:72
-msgid ""
-"Use the arrow keys to select the language then press <emphasis role=\"bold"
-"\">Enter</emphasis>."
-msgstr ""
-"Verwende die Pfeiltasten um die Sprache auszuwählen und drücke danach die "
-"<emphasis role=\"bold\">Enter</emphasis> Taste."
+#. type: Content of: <section><section><title>
+#: en/installer.xml:48
+msgid "Installation Welcome Screen"
+msgstr "Willkommensbildschirm der Installation"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:77
+#. type: Content of: <section><section><para>
+#: en/installer.xml:49
 msgid ""
-"If needed, change the screen resolution by pressing <emphasis role=\"bold"
-"\">F3</emphasis> (Legacy mode only)."
+"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 ""
-"Ändere die Bildschirmauflösung durch drücken der <emphasis role=\"bold\">F3</"
-"emphasis> Taste (nur im Legacy Modus)"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:81
+#. type: Content of: <section><section><para>
+#: en/installer.xml:52
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+"The welcome menu screen has various options, however the default option will "
+"start the installer, and is normally all that you will need."
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+"Der Startbildschirm enthält verschiedene Optionen, wobei die vorgegebene "
+"Option das Installationsprogramm startet. Normalerweise ist dies alles, was "
+"Sie tun müssen."
 
-#. 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)."
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:56
+msgid "Legacy (BIOS) Systems"
 msgstr ""
-"Falls Sie Probleme mit der Installation feststellen, können Sie versuchen, "
-"die voreingestellten Einstellungen mit <emphasis role=\"bold\">F6</emphasis> "
-"<emphasis role=\"bold\">Kernel-Optionen</emphasis> zu ändern (drücke bei "
-"UEFI Systeme stattdessen auf <emphasis role=\"bold\">e</emphasis>)-"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/installer.xml:96
-msgid "Default: It doesn't alter anything in the default options."
-msgstr "- Standard: es ändert nichts an den Standardoptionen."
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/installer.xml:101
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:58
+#, fuzzy
 msgid ""
-"Safe Settings: Priority is given to the safer options at the price of a "
-"performance detriment."
+"<imageobject> <imagedata fileref=\"dx-welcome.png\" align=\"center\"/> </"
+"imageobject>"
 msgstr ""
-"- Sichere Einstellungen: die Priorität wird auf sichere Optionen gelegt zum "
-"Nachteil der Leistung."
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\"/"
+"> </imageobject>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/installer.xml:106
-msgid ""
-"No ACPI: (Advanced Configuration and Power Interface): Power management "
-"features are not used."
+#. type: Content of: <section><section><section><itemizedlist><title>
+#: en/installer.xml:63
+msgid "Menu"
 msgstr ""
-"- No ACPI (Advanced Configuration and Power Interface): die "
-"Stromsparfunktion wird nicht berücksichtigt."
 
-#. 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:66
 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."
+"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 ""
-"- Kein lokales APIC (Local Advanced Programmable Interrupt Controller): es "
-"geht um die CPU Unterbrechung. Wähle die Option wenn Sie Fehler im System, "
-"wie zum Beispiel einer Kernel Panik im Zusammenhang mit APIC, feststellen"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:120
-msgid ""
-"When you select one of these entries, it modifies the default options "
-"displayed in the <guilabel>Boot Options</guilabel> line."
-msgstr ""
-"Wenn Sie einen dieser Einträge auswählen, werden die Standard Bootoptionen "
-"in der <guilabel>Bootoptionen</guilabel> Zeile geändert."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:69
+#, fuzzy
+msgid "<emphasis role=\"bold\">Rescue System</emphasis>"
+msgstr "<emphasis role=\"bold\">Server</emphasis>"
 
-#. 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:70
 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."
+"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 ""
-"Bei einigen Mageia Veröffentlichungen kann es passieren, das die Einträge "
-"welche mit der <emphasis role=\"bold\">F6</emphasis> Taste ausgewählt "
-"wurden, nicht in der <guilabel>Bootoptionen</guilabel> Zeile erscheinen, "
-"diese werden allerdings trotzdem befolgt."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:132
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:75
+#, fuzzy
+msgid "<emphasis role=\"bold\">Memory Test</emphasis>"
+msgstr "<emphasis role=\"bold\">Server</emphasis>"
 
-#. 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:76
 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."
+"Test the installed RAM by performing multiple read and write operations. "
+"Reboot to end the test."
 msgstr ""
-"Durch drücken der <emphasis role=\"bold\">F1</emphasis> Taste erscheint ein "
-"neues Fenster mit weiteren verfügbaren Optionen. Wähle eine mit den "
-"Pfeiltasten aus und drücke <emphasis role=\"bold\">Enter</emphasis> um mehr "
-"Details zu bekommen oder drücke <emphasis role=\"bold\">ESC</emphasis> um in "
-"den Willkommensbildschirm zurückzukehren."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:146
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:80
+#, fuzzy
+msgid "<emphasis role=\"bold\">F2: Language</emphasis>"
+msgstr "<emphasis role=\"bold\">Fortgeschritten</emphasis>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:151
-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><itemizedlist><listitem><para>
+#: en/installer.xml:81
+msgid "Press F2 for alternative languages."
 msgstr ""
-"Die detailierte Ansicht über die splash Optionen. Drücke <emphasis role="
-"\"bold\">ESC</emphasis> oder wähle <guilabel>Zurück zu Boot-Optionen</"
-"guilabel> um zurück zur Optionsliste zu gelangen. Die dort aufgeführten "
-"Optionen können mit der Hand in die <guilabel>Boot-Optionen</guilabel> Zeile "
-"hinzugefügt werden."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:158
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:86
+msgid "UEFI Systems"
 msgstr ""
-"<imageobject> <imagedata 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><para>
+#: en/installer.xml:87
+#, fuzzy
 msgid ""
-"The help is translated in the chosen language with <emphasis role=\"bold"
-"\">F2</emphasis>."
+"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 ""
-"Die Hilfe wird in der, mit der <emphasis role=\"bold\">F2</emphasis> Taste, "
-"ausgewählten Sprache angezeigt."
+"In diesem Bildschirm können Sie auf die Optionen zugreifen, indem Sie den "
+"Buchstaben \"<emphasis role=\"bold\">e</emphasis>\" drücken, um in den "
+"\"Bearbeitungsmodus\" zu kommen. Um zurück auf diesen Bildschirm zu kommen, "
+"drücken Sie die \"<emphasis role=\"bold\">ESC</emphasis>\" Taste um den "
+"Vorgang abzubrechen ohne eine Änderung zu speichern oder drücke die "
+"\"<emphasis role=\"bold\">Strg</emphasis>\" oder \"<emphasis role=\"bold"
+"\">F10</emphasis>\" Taste um die durchgeführten Änderungen zu speichern und "
+"den Vorgang zu beenden."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:168
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:92
+#, fuzzy
 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 ""
-"Für mehr Informationen über Kernel-Optionen auf alten und UEFI-Systemen, "
-"siehe: <link ns2:href=\"https://wiki.mageia.org/de/"
-"Wie_man_Kerneloptionen_einstellt\">https://wiki.mageia.org/de/"
-"Wie_man_Kerneloptionen_einstellt</link>"
-
-#. type: Content of: <section><section><title>
-#: en/installer.xml:177
-msgid "The installation steps"
-msgstr "Die Installationsschritte"
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\"/"
+"> </imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/installer.xml:179
-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 ""
-"Der Installationsprozess ist in mehrere Schritte unterteilt, die an der "
-"linken Seite des Bildschirms verfolgt werden können."
 
-#. type: Content of: <section><section><para>
-#: en/installer.xml:182
-msgid ""
-"Each step has one or more screens which may also have <guibutton>Advanced</"
-"guibutton> sections with extra, less commonly required, options."
-msgstr ""
-"Jeder dieser Schritte besitzt einen oder mehrere Bildschirme, die auch einen "
-"Knopf <guibutton>\"Fortgeschrittene Optionen\"</guibutton> mit weiteren "
-"zusätzlichen Optionen haben."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:99
+#, fuzzy
+msgid "<emphasis role=\"bold\">Install:</emphasis> Start the Install process"
+msgstr "<emphasis role=\"bold\">Ausrichten an</emphasis> = MiB"
 
-#. type: Content of: <section><section><para>
-#: en/installer.xml:186
+#. 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 ""
-"Die meisten Bildschirme enthalten einen <guibutton>Hilfe</guibutton>-Knopf, "
-"über den Sie weitere Erklärungen zum momentan ausgeführten Schritt erhalten."
 
-#. 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 ""
-"Wenn Sie an irgendeiner Stelle entscheiden, die Installation zu stoppen, ist "
-"es möglich, einen Neustart auszuführen.  Überlegen Sie sich dies aber "
-"zweimal, bevor Sie dies ausführen. Wurde eine Partition bereits formatiert "
-"oder ein Update hat mit der Installation begonnen, so ist Ihr Computer nicht "
-"mehr im gleichen Zustand und ein Neustart kann Sie sehr leicht mit einem "
-"nicht mehr verwendbaren System zurücklassen. Wenn Sie trotz allem sicher "
-"sind, einen Neustart auszuführen, wechseln Sie mit <guibutton>Alt+Strg+F2</"
-"guibutton> in ein Text-Terminal. Anschließend betätigen Sie <guibutton>Alt"
-"+Strg+Entf</guibutton>, um einen Neustart auszulösen."
+"Falls Sie von einem USB-Stick starten, werden Ihnen zwei zusätzliche Zeilen "
+"angezeigt, welche Duplikate der vorigen Zeilen sind, mit dem zusätzlichen "
+"Suffix \"USB\". Sie müssen diese Auswählen."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:203
+#: en/installer.xml:115
 msgid "Installation Problems and Possible Solutions"
 msgstr "Installationsprobleme und mögliche Lösungen"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:206
+#: en/installer.xml:117
 msgid "No Graphical Interface"
 msgstr "Keine grafische Schnittstelle"
 
 #. 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 ""
 "Nach dem Startbildschirm gelangen Sie nicht zur Sprachauswahl. Dies kann bei "
 "einigen Grafikkarten und älteren Systemen vorkommen. Versuchen Sie eine "
@@ -2594,15 +2746,15 @@ msgstr ""
 "code> eingeben."
 
 #. 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 ""
 "Wenn die Hardware sehr alt ist, ist eine grafische Installation eventuell "
 "nicht möglich. In diesem Fall ist es möglich die Installation im Textmodus "
@@ -2613,18 +2765,19 @@ msgstr ""
 "\">ENTER</emphasis>. Nun wird die Installation im Textmodus fortgesetzt."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:230
+#: en/installer.xml:138
 msgid "The Install Freezes"
 msgstr "Die Installation friert ein"
 
 #. 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 ""
 "Wenn das System während der Installation einfriert, ist das möglicherweise "
 "auf ein Problem mit der Erkennung der Hardware zurückzuführen. In diesem "
@@ -2636,17 +2789,19 @@ msgstr ""
 "ist."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:240
+#: en/installer.xml:146
 msgid "RAM problem"
 msgstr "RAM Problem"
 
 #. 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 ""
 "Dies wird eher selten benötigt, aber in einigen Fällen kann die Hardware "
 "einen falschen Wert des verfügbaren RAMs liefern oder der Rechner friert ein "
@@ -2656,19 +2811,20 @@ msgstr ""
 "256MB RAM."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:249
+#: en/installer.xml:154
 msgid "Dynamic partitions"
 msgstr "Dynamische Partitionen"
 
 #. 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 ""
 "Wenn Sie unter Windows Ihre Festplatte vom <emphasis role=\"bold"
 "\">einfachen</emphasis> auf das <emphasis role=\"bold\">dynamische</"
@@ -2679,18 +2835,15 @@ msgstr ""
 "\">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>."
 
 #. type: Content of: <section><info><title>
-#: en/installUpdates.xml:3
+#: en/installUpdates.xml:16
 msgid "Updates"
 msgstr "Aktualisierungen (Updates)"
 
-#.  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 ""
@@ -2699,20 +2852,27 @@ 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 ""
 "Seit dem Zeitpunkt, an dem diese Version von <application>Mageia</"
 "application> veröffentlicht wurde, wurden einige Pakete überarbeitet oder "
 "erweitert."
 
-#. 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 ""
 "Wählen Sie <guilabel>\"Ja\"</guilabel>, wenn Sie wünschen, diese herunter zu "
@@ -2720,41 +2880,48 @@ msgstr ""
 "Sie dies im Augenblick nicht wünschen oder nicht mit dem Internet verbunden "
 "sind."
 
-#. type: Content of: <section><para>
-#: en/installUpdates.xml:29
-msgid "Press <guibutton>Next</guibutton> to continue"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installUpdates.xml:40
+#, fuzzy
+msgid "Press <emphasis>Next</emphasis> to continue"
 msgstr "Drücke auf <guibutton>Weiter</guibutton> um fortzufahren"
 
 #. type: Content of: <section><info><title>
-#: en/login.xml:1
-msgid "Login screen"
+#: en/login.xml:4
+#, fuzzy
+msgid "Login Screen"
 msgstr "Anmeldebildschirm"
 
 #. 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 Anmeldebildschirm"
 
 #. 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 "Schließlich kommen Sie zum Anmeldebildschirm."
 
 #. 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 ""
 "Geben Sie Ihren Benutzernamen und das Benutzerpasswort ein und in wenigen "
 "Sekunden befinden Sie sich auf dem geladenen KDE oder GNOME Desktop, "
@@ -2762,36 +2929,38 @@ msgstr ""
 "Mageia Installation verwenden."
 
 #. 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 ""
 "Sie können weitere Teile unserer Dokumentation im <link linkend=\"https://"
 "wiki.mageia.org/de/Kategorie:Dokumentation\">Mageia Wiki</link> finden."
 
 #. type: Content of: <section><info><title>
-#: en/media_selection.xml:3
-msgid "Media Selection (Nonfree)"
-msgstr "Medienauswahl (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
+#: en/media_selection.xml:24
+#, fuzzy
 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=\"media_selection-im1\" align="
-"\"center\" revision=\"1\" fileref=\"dx2-media_selection.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-bestTime.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"bestTime-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 "
@@ -2804,7 +2973,7 @@ msgstr ""
 "zur Verfügung stehen."
 
 #. 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."
@@ -2813,12 +2982,13 @@ msgstr ""
 "die grundlegenden Pakete der Distribution enthält."
 
 #. 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 ""
 "Die <emphasis>Nonfree</emphasis> Quelle enthält Pakete, die kostenlos sind, "
@@ -2828,7 +2998,7 @@ msgstr ""
 "verschiedene WLAN Karten, etc."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:40
+#: en/media_selection.xml:50
 msgid ""
 "The <emphasis>Tainted</emphasis> repository includes packages released under "
 "a free license. The main criteria for placing packages in this repository is "
@@ -2849,32 +3019,14 @@ msgid "Minimal Install"
 msgstr "Minimale Installation"
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:11
-msgid ""
-"You can choose a Minimal Installation by de-selecting everything in the "
-"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"/>."
-msgstr ""
-"Durch das Abwählen aller Paketgruppen im Auswahlmenü können Sie eine "
-"minimale Installation wählen, siehe <xref linkend=\"choosePackageGroups\"/>."
-
-#. type: Content of: <section><para>
-#: en/minimal-install.xml:14
-msgid ""
-"If desired, you can additionally tick the <emphasis role=\"bold\">Individual "
-"package selection</emphasis> option in the same screen."
-msgstr ""
-"Wenn gewünscht, können Sie auf derselben Seite zusätzlich die Option für "
-"<emphasis role=\"bold\">\"Individuelle Paketauswahl\"</emphasis> aktivieren."
-
-#. 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 ""
 "Die minimale Installation ist für die Nutzer gedacht, die besondere "
 "Anwendungsmöglichkeiten für ihr <application>Mageia</application> im Sinn "
@@ -2884,33 +3036,58 @@ msgstr ""
 "verwenden, um Feineinstellungen für Ihre Installation vorzunehmen. Siehe "
 "<xref linkend=\"choosePackagesTree\"/>."
 
-#. type: Content of: <section><para>
-#: en/minimal-install.xml:22
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/minimal-install.xml:24
+#, fuzzy
+msgid ""
+"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 ""
+"Durch das Abwählen aller Paketgruppen im Auswahlmenü können Sie eine "
+"minimale Installation wählen, siehe <xref linkend=\"choosePackageGroups\"/>."
+
+#. 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 ""
+"Wenn gewünscht, können Sie auf derselben Seite zusätzlich die Option für "
+"<emphasis role=\"bold\">\"Individuelle Paketauswahl\"</emphasis> aktivieren."
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/minimal-install.xml:33
+#, 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."
+"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 ""
 "Falls Sie diese Installationsart wählen, wird das nächste Fenster eine "
 "spezielle Paketauswahl zur Installation anbieten (z.B. Dokumentation, "
 "X, ...)."
 
-#. type: Content of: <section><para>
-#: en/minimal-install.xml:26
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/minimal-install.xml:37
+#, fuzzy
 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 ""
 "Wenn <emphasis role=\"bold\">Mit X</emphasis> ausgewählt wird, dann ist "
 "IceWM (eine leichtgewichtige Desktop-Umgebung) mit inbegriffen."
 
 #. 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 ""
 "Die grundlegenden Dokumente werden in Form von man- und info-Seiten "
 "bereitgestellt. Diese beinhalten die man-pages des <link xlink:href=\"http://"
@@ -2919,7 +3096,7 @@ msgstr ""
 "manual/\">GNU coreutils</link>."
 
 #. type: Content of: <section><mediaobject>
-#: en/minimal-install.xml:35
+#: en/minimal-install.xml:48
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"minimal-install-im1\" align="
 "\"center\" fileref=\"dx2-minimal-install.png\" revision=\"1\"/> </"
@@ -2931,24 +3108,33 @@ msgstr ""
 
 #. type: Content of: <section><info><title>
 #: en/misc-params.xml:3
-msgid "Summary of miscellaneous parameters"
-msgstr "Zusammenfassung von verschiedenen Parameter"
+#, fuzzy
+msgid "Configuration Summary"
+msgstr "Soundkonfiguration"
 
 #.  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=\"dx2-summaryTop.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 führt eine intelligente Auswahl für die Konfiguration Ihres Systems "
 "durch, abhängig von der von Ihnen getroffenen Auswahl und der von DrakX "
@@ -2957,7 +3143,7 @@ msgstr ""
 "guibutton> klicken."
 
 #. 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:"
@@ -2966,38 +3152,40 @@ msgstr ""
 "betrachtet werden, die Sie beibehalten können, außer bei folgenden Ausnahmen:"
 
 #. 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 "es gibt bekannte Probleme mit den Standardeinstellungen"
 
 #. 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 ""
 "die Standardeinstellungen wurden bereits ausprobiert, jedoch hat es nicht "
 "funktioniert"
 
 #. 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
+#, fuzzy
+msgid "some other factor mentioned in the detailed sections below is an issue"
 msgstr ""
 "etwas anderes wird weiter unten, in den detaillierten Abschnitten, genannt"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:40
+#: en/misc-params.xml:49
 msgid "System parameters"
 msgstr "Systemparameter"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:45
-msgid "<guilabel>Timezone</guilabel>"
-msgstr "<guilabel>Zeitzone</guilabel>"
+#: en/misc-params.xml:54
+#, fuzzy
+msgid "<emphasis role=\"bold\">Timezone</emphasis>"
+msgstr "<emphasis role=\"bold\">Server</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 wählt eine Zeitzone für Sie, abhängig von der von Ihnen bevorzugten "
@@ -3005,12 +3193,13 @@ msgstr ""
 "unter <xref linkend=\"configureTimezoneUTC\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:53
-msgid "<guilabel>Country / Region</guilabel>"
-msgstr "<guilabel>Land / Region</guilabel>"
+#: en/misc-params.xml:62
+#, fuzzy
+msgid "<emphasis role=\"bold\">Country / Region</emphasis>"
+msgstr "<emphasis role=\"bold\">Arbeitsrechner</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:56
+#: en/misc-params.xml:64
 msgid ""
 "If the selected country is wrong, it is very important that you correct the "
 "setting.  See <xref linkend=\"selectCountry\"/>"
@@ -3019,52 +3208,53 @@ msgstr ""
 "diese Einstellung korrigieren. Siehe <xref linkend=\"selectCountry\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:62
-msgid "<guilabel>Bootloader</guilabel>"
-msgstr "<guilabel>Bootloader</guilabel>"
+#: en/misc-params.xml:70
+#, fuzzy
+msgid "<emphasis role=\"bold\">Bootloader</emphasis>"
+msgstr "<emphasis role=\"bold\">Server</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 trifft normalerweise eine passende Auswahl für die Einstellungen des "
 "Bootloaders."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:67
-msgid "Do not change anything, unless you know how to configure GRUB2"
+#: en/misc-params.xml:75
+#, fuzzy
+msgid ""
+"Do not change anything, unless you know how to configure GRUB2. For more "
+"information, see <xref linkend=\"setupBootloader\"/>"
 msgstr ""
 "Ändern Sie an den Einstellungen nichts, es sei denn, Sie wissen genau, wie "
 "Grub2 zu konfigurieren ist"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:70
-msgid "For more information, see <xref linkend=\"setupBootloader\"/>"
-msgstr ""
-"Weitere Informationen finden Sie unter <xref linkend=\"setupBootloader\"></"
-"xref>"
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:75
-msgid "<guilabel>User management</guilabel>"
-msgstr "<guilabel>Benutzerverwaltung</guilabel>"
+#: en/misc-params.xml:83
+#, fuzzy
+msgid "<emphasis role=\"bold\">User management</emphasis>"
+msgstr "<emphasis role=\"bold\">Server</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 ""
 "Hier können Sie weitere Benutzer hinzufügen. Diese werden in jeweils "
 "benutzereigenen Ordnern unter <literal>/home</literal> angelegt."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:84
-msgid "<guilabel>Services</guilabel>:"
-msgstr "<guilabel>Dienste</guilabel>:"
+#: en/misc-params.xml:91
+#, fuzzy
+msgid "<emphasis role=\"bold\">Services</emphasis>"
+msgstr "<emphasis role=\"bold\">Server</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:86
+#: en/misc-params.xml:93
 msgid ""
 "System services refer to those small programs which run in the background "
 "(daemons).  This tool allows you to enable or disable certain processes."
@@ -3074,32 +3264,29 @@ msgstr ""
 "(Anwendungen/Aufgaben) zu aktivieren oder zu deaktivieren."
 
 #. 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 ""
 "Sie sollten sehr sorgfältig prüfen, was Sie tun, bevor Sie hier etwas ändern "
 "- ein Fehler kann Ihren Computer davon abhalten, korrekt zu funktionieren."
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:94
-msgid "For more information, see <xref linkend=\"configureServices\"/>"
-msgstr ""
-"Weitere Informationen finden Sie unter <xref linkend=\"configureServices\"/>"
-
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:101
+#: en/misc-params.xml:106
 msgid "Hardware parameters"
 msgstr "Hardwareparameter"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:106
-msgid "<guilabel>Keyboard</guilabel>:"
-msgstr "<guilabel>Tastatur</guilabel>:"
+#: en/misc-params.xml:111
+#, fuzzy
+msgid "<emphasis role=\"bold\">Keyboard</emphasis>"
+msgstr "<emphasis role=\"bold\">Server</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:108
+#: en/misc-params.xml:113
 msgid ""
 "Configure your keyboard layout according to your location, language and type "
 "of keyboard."
@@ -3108,7 +3295,7 @@ msgstr ""
 "Ihrem Standort, Ihrer Sprache oder dem Typ der Tastatur."
 
 #. 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."
@@ -3118,12 +3305,13 @@ msgstr ""
 "auch ändert."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:119
-msgid "<guilabel>Mouse</guilabel>:"
-msgstr "<guilabel>Maus</guilabel>:"
+#: en/misc-params.xml:124
+#, fuzzy
+msgid "<emphasis role=\"bold\">Mouse</emphasis>"
+msgstr "<emphasis role=\"bold\">Server</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."
@@ -3132,42 +3320,43 @@ msgstr ""
 "oder einstellen."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:126
-msgid "<guilabel>Sound card</guilabel>:"
-msgstr "<guilabel>Soundkarte</guilabel>:"
+#: en/misc-params.xml:131
+#, fuzzy
+msgid "<emphasis role=\"bold\">Sound card</emphasis>"
+msgstr "<emphasis role=\"bold\">Fortgeschritten</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:129
+#: 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 ""
-"Das Installationsprogramm nutzt den Standardtreiber, wenn einer installiert "
-"ist. Die Option, um einen anderen Treiber zu wählen, wird nur angezeigt, "
-"wenn es mehrere Treiber für ihre Karte gibt und keiner Standard ist."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:137
-msgid "<guilabel>Graphical interface</guilabel>:"
-msgstr "<guilabel>Grafikkarte</guilabel>:"
+#: en/misc-params.xml:144
+#, fuzzy
+msgid "<emphasis role=\"bold\">Graphical interface</emphasis>"
+msgstr "<emphasis role=\"bold\">Grafische-Umgebung</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 ""
 "Dieser Abschnitt erlaubt es Ihnen, die Grafikkarte(n) und die Anzeige "
 "einzustellen."
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:143
-msgid "For more information, see <xref linkend=\"configureX_chooser\"/>."
-msgstr ""
-"Weitere Informationen finden Sie unter <xref linkend=\"configureX_chooser"
-"\"></xref>."
-
 #. type: Content of: <section><section><mediaobject>
-#: en/misc-params.xml:149
+#: en/misc-params.xml:155
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
 "\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
@@ -3176,21 +3365,23 @@ msgstr ""
 "\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"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 "Netzwerk- und Internetparameter"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:163
-msgid "<guilabel>Network</guilabel>:"
-msgstr "<guilabel>Netzwerk</guilabel>:"
+#: en/misc-params.xml:169
+#, fuzzy
+msgid "<emphasis role=\"bold\">Network</emphasis>"
+msgstr "<emphasis role=\"bold\">Server</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 ""
 "Sie können Ihr Netzwerk hier konfigurieren, für Netzwerkkarten mit nonfree "
@@ -3199,7 +3390,7 @@ msgstr ""
 "Repositorium noch nicht aktiviert haben."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:172
+#: en/misc-params.xml:178
 msgid ""
 "When you add a network card, do not forget to set your firewall to monitor "
 "that interface as well."
@@ -3208,15 +3399,17 @@ msgstr ""
 "zu setzen, dass auch diese Netzwerkkarte überwacht wird."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:179
-msgid "<guilabel>Proxies</guilabel>:"
-msgstr "<guilabel>Proxys</guilabel>:"
+#: en/misc-params.xml:185
+#, fuzzy
+msgid "<emphasis role=\"bold\">Proxies</emphasis>"
+msgstr "<emphasis role=\"bold\">Server</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 ""
 "Ein Proxy-Server fungiert als Vermittler zwischen Ihrem Computer und dem "
@@ -3224,69 +3417,74 @@ msgstr ""
 "konfigurieren, dass ein Proxy-Dienst verwendet wird."
 
 #. 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 "Fragen Sie Ihren Systemadministrator nach Ihren Zugangsdaten."
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:195
+#: en/misc-params.xml:201
 msgid "Security"
 msgstr "Sicherheit"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:200
-msgid "<guilabel>Security Level</guilabel>:"
-msgstr "<guilabel>Sicherheitsstufe</guilabel>:"
+#: en/misc-params.xml:206
+#, fuzzy
+msgid "<emphasis role=\"bold\">Security Level</emphasis>"
+msgstr "<emphasis role=\"bold\">Server</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 ""
 "Hier setzen Sie die Sicherheitsstufe für Ihren Computer. In den meisten "
 "Fällen ist die vorgegebene Einstellung (Standard) ausreichend für allgemeine "
 "Zwecke."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:207
-msgid "Check the option which best suits your usage."
-msgstr ""
-"Überprüfen Sie die Option, die Ihnen für Ihren Verwendungzweck am "
-"geeignetsten erscheint."
+#: en/misc-params.xml:215
+#, fuzzy
+msgid "<emphasis role=\"bold\">Firewall</emphasis>"
+msgstr "<emphasis role=\"bold\">Server</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 ""
-"Eine Firewall dient als Barriere zwischen Ihren wichtigen Daten und den "
-"Spitzbuben draußen im Internet, die diese Daten gefährden oder stehlen "
-"wollen."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:218
-msgid ""
-"Select the services that you wish to have access to your system. Your "
-"selections will depend on what you use your computer for. For more "
-"information, see <xref linkend=\"firewall\"/>."
+#: en/misc-params.xml:229
+#, fuzzy
+msgid "For more information, see <xref linkend=\"firewall\"/>."
 msgstr ""
-"Wählen Sie die Dienste, denen Sie Zugriff auf Ihr System gestatten wollen. "
-"Die von Ihnen getroffene Auswahl ist abhängig davon, wofür Sie Ihren "
-"Computer verwenden wollen. Für weitere Informationen siehe <xref linkend="
-"\"firewall\"/>."
+"Weitere Informationen finden Sie unter <xref linkend=\"configureX_chooser"
+"\"></xref>."
 
 #. 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 ""
 "Beachten Sie aber, dass Sie ein großes Risiko eingehen, wenn Sie alles "
 "erlauben (Keine Firewall)."
@@ -3297,12 +3495,11 @@ msgid "Reboot"
 msgstr "Neustart"
 
 #. 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 ""
 "Sobald der Bootloader installiert wurde, werden Sie dazu aufgefordert die "
 "Live-CD zu entfernen und den Computer neu zu starten, indem Sie auf "
@@ -3310,24 +3507,40 @@ msgstr ""
 "Führen Sie diese Schritte <emphasis role=\"bold\">in der angegebenen "
 "Reihenfolge</emphasis> durch."
 
+#. 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
-msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
+#: en/reboot.xml:12
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot2.png\"/> </"
+"imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"live-reboot2.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 ""
 "Sobald Sie neu starten werden Sie mehrere aufeinander folgende Download-"
 "Ladebalken sehen. Diese weisen darauf hin, das die Softwaremedien-Listen "
 "heruntergeladen werden (siehe Softwareverwaltung)."
 
 #. type: Content of: <section><mediaobject>
-#: en/reboot.xml:17
+#: en/reboot.xml:19
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
 "reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
@@ -3356,35 +3569,43 @@ msgstr ""
 "Platz für die <application>Mageia</application> Installation zu schaffen."
 
 #. type: Content of: <section><info><title>
-#: en/securityLevel.xml:3
+#: en/securityLevel.xml:10
 msgid "Security Level"
 msgstr "Sicherheitsstufe"
 
 #.  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=\"securityLevel-im1\" align="
-"\"center\" fileref=\"dx2-securityLevel.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
 msgid ""
 "<emphasis role=\"bold\">Please choose the desired security level</emphasis>"
 msgstr ""
 "<emphasis role=\"bold\">Wählen Sie hier ihre Sicherheitsstufe aus</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:32
+#, fuzzy
+msgid ""
+"<emphasis>Secure</emphasis> will create a highly protected system - for "
+"instance if the system is to be used as a public server."
 msgstr ""
 "<emphasis role=\"bold\">Standard</emphasis> ist die voreingestellte und "
 "empfohlene Einstellung für den durchschnittlichen Anwender. Die <emphasis "
@@ -3392,12 +3613,12 @@ msgstr ""
 "System - zum Beispiel wenn das System als öffentlicher Server verwendet wird."
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:24
+#: en/securityLevel.xml:36
 msgid "<emphasis role=\"bold\">Security Administrator</emphasis>"
 msgstr "<emphasis role=\"bold\">Sicherheitsadministrator</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 "
@@ -3408,17 +3629,18 @@ msgstr ""
 "Benachrichtigung an einen Systemadministrator erfordern."
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:31
+#: en/securityLevel.xml:43
+#, fuzzy
 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 ""
 "Eine gute und einfach zu implementierende Möglichkeit ist es, &lt;"
 "benutzer>@localhost einzugeben - wobei &lt;benutzer> durch den Anmeldename "
 "des Benutzers ersetzt werden muss, der die Meldungen erhalten soll."
 
 #. 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 "
@@ -3429,27 +3651,28 @@ msgstr ""
 "Benutzer muss aus daher für den Erhalt solcher Mails konfiguriert sein!"
 
 #. 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 ""
 "Nach der Installation ist es jederzeit möglich, die Sicherheitseinstellungen "
 "zu ändern, indem Sie im Mageia Kontrollzentrum den Abschnitt "
 "<guilabel>Sicherheit</guilabel> an der linken Seite des Fensters wählen."
 
 #. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:6
+#: en/SelectAndUseISOs2.xml:15
 msgid "Select and use ISOs"
 msgstr "Auswählen und verwenden der ISOs"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:9
+#: en/SelectAndUseISOs2.xml:18
 msgid "Introduction"
 msgstr "Einleitung"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:10
+#: en/SelectAndUseISOs2.xml:19
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
 "which image best suits your needs."
@@ -3458,16 +3681,19 @@ msgstr ""
 "Wahl des zu Ihren Bedürfnissen passenden Images helfen."
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:12
-msgid "There are two families of media:"
+#: en/SelectAndUseISOs2.xml:21
+#, fuzzy
+msgid "There are three types of installation media:"
 msgstr "Es gibt zwei Arten von Medien:"
 
 #. 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 ""
 "Klassische Installationsroutine: Nachdem das Medium gebootet wurde, folgt "
 "ein Prozess, in dem ausgewählt werden kann, was installiert und wie das Ziel-"
@@ -3476,46 +3702,95 @@ msgstr ""
 "Desktop-Umgebung auswählen, die Sie nutzen möchten."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:21
+#: en/SelectAndUseISOs2.xml:31
+#, 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"
+"<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 ""
 "LIVE Medium: Diese Auswahl erlaubt Ihnen Mageia ohne eine Installation oder "
 "ohne eine Änderungen an Ihrem Computer auszuprobieren. Wenn eine Installtion "
 "gewünscht ist, ist dieser Vorgang einfacher, jedoch haben Sie weniger "
 "Auswahlmöglichkeiten, als bei dem klassischen Installer."
 
+#. 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\">Live ISOs können nur dazu verwendet werden, um "
+"frische Installationen durchzuführen. Sie können nicht dazu verwendet werden "
+"um vorige Veröffentlichungen zu aktualisieren.</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 ""
+"Jede einzelne ist ein kleines Abbild, welche nicht mehr als das Nötige "
+"enthält, um das Installationsprogramm drakx zu starten und die ISO-Datei zu "
+"finden, um die Installation fortzusetzen und abzuschließen. Diese ISO-Datei "
+"kann sich auf der Festplatte des Computers, einem lokalen Laufwerk, einem "
+"lokalen Netzwerk oder im Internet befinden."
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:53
+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 ""
+"Diese Medien sind sehr klein (unter 100 MB) und praktisch, wenn die "
+"Bandbreite zu gering ist, um die komplette DVD herunterzuladen, der PC über "
+"kein DVD-Laufwerk verfügt oder nicht von einem USB-Stick booten kann."
+
 #. 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 "Näheres hierzu finden Sie in den nächsten Abschnitten."
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:30
+#: en/SelectAndUseISOs2.xml:61
 msgid "Media"
 msgstr "Medien"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:32
+#: en/SelectAndUseISOs2.xml:63
 msgid "Definition"
 msgstr "Definition"
 
 #. 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 ""
 "Hier ist ein Medium (plural: Medien) eine ISO-Abbilddatei welche es Ihnen "
 "ermöglicht Mageia zu installieren und/oder zu aktualisieren. Die ISO kann "
 "auf verschiedene physische Datenträger übertragen werden."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:36
+#: en/SelectAndUseISOs2.xml:67
 msgid ""
 "You can find Mageia ISO's <link ns4:href=\"http://www.mageia.org/en/"
 "downloads/\">here</link>."
@@ -3524,226 +3799,209 @@ msgstr ""
 "downloads/\">hier</link> finden."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:39
+#: en/SelectAndUseISOs2.xml:70
 msgid "Classical installation media"
 msgstr "Klassische Installationsmedien"
 
 #. 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 "Grundsätzliche Eigenschaften"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:44
-msgid "These ISOs use the Classical installer called drakx."
+#: en/SelectAndUseISOs2.xml:75
+#, fuzzy
+msgid "These ISOs use the Classical installer called DrakX"
 msgstr ""
 "Diese ISOs verwenden ein traditionelles Installationsprogramm namens 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 ""
 "Sie erlauben es eine saubere Installation oder eine Aktualisierung von einer "
 "vorigen Veröffentlichung zu machen."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:51 en/SelectAndUseISOs2.xml:83
-#: en/SelectAndUseISOs2.xml:158
-msgid "Different media for 32 and 64 bit architectures."
+#: en/SelectAndUseISOs2.xml:82 en/SelectAndUseISOs2.xml:118
+#: en/SelectAndUseISOs2.xml:174
+#, fuzzy
+msgid "Different media for 32 and 64-bit architectures"
 msgstr "Verschiedene Medien für 32- oder 64-Bit-Architekturen."
 
 #. 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 ""
 "Einige Werkzeuge sind im Willkommensbildschirm verfügbar: Rettungssystem, "
 "Speichertest, Hardware-Erkennungswerkzeug."
 
 #. 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 "Jede DVD enthält viele verfügbare Desktop-Umgebungen und Sprachen."
 
 #. 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 ""
 "Sie erhalten während der Installation die Möglichkeit non-free Software "
 "hinzuzufügen."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:69
+#: en/SelectAndUseISOs2.xml:102
 msgid "Live media"
 msgstr "Live-Medien"
 
 #. 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 ""
 "Kann dazu verwendet werden um die Distribution anzuschauen ohne diese zuerst "
 "auf eine HDD installieren zu müssen, kann optional Mageia anschließend auf "
 "der HDD installieren."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:79
-msgid "Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)."
-msgstr "Jede ISO enthält nur eine Desktop-Umgebung (Plasma, GNOME oder Xfce)."
+#: en/SelectAndUseISOs2.xml:111
+msgid "The Live media also includes an Installer."
+msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:86
-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>"
-msgstr ""
-"<emphasis role=\"bold\">Live ISOs können nur dazu verwendet werden, um "
-"frische Installationen durchzuführen. Sie können nicht dazu verwendet werden "
-"um vorige Veröffentlichungen zu aktualisieren.</emphasis>"
+#: en/SelectAndUseISOs2.xml:114
+#, fuzzy
+msgid "Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)"
+msgstr "Jede ISO enthält nur eine Desktop-Umgebung (Plasma, GNOME oder Xfce)."
 
 #. 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 "Sie enthält unfreie Software."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:96
+#: en/SelectAndUseISOs2.xml:126
 msgid "Live DVD Plasma"
 msgstr "Live-DVD Plasma"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:99
-msgid "Plasma desktop environment only."
+#: en/SelectAndUseISOs2.xml:129
+#, fuzzy
+msgid "Plasma desktop environment only"
 msgstr "Nur Plasma Desktop-Umgebung."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:102 en/SelectAndUseISOs2.xml:116
-#: en/SelectAndUseISOs2.xml:130
-msgid "All available languages are present."
+#: en/SelectAndUseISOs2.xml:132 en/SelectAndUseISOs2.xml:146
+#: en/SelectAndUseISOs2.xml:160
+#, fuzzy
+msgid "All available languages are present"
 msgstr "Alle Sprachen sind vorhanden."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:105
-msgid "64 bit architecture only."
-msgstr "Nur 64-Bit-Architektur."
+#: en/SelectAndUseISOs2.xml:135 en/SelectAndUseISOs2.xml:149
+#, fuzzy
+msgid "64-bit architecture only"
+msgstr "Nur 64-Bit-Architektur"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:110
+#: en/SelectAndUseISOs2.xml:140
 msgid "Live DVD GNOME"
 msgstr "Live-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 "Nur GNOME Desktop-Umgebung."
 
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:119
-msgid "64 bit architecture only"
-msgstr "Nur 64-Bit-Architektur"
-
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:124
+#: en/SelectAndUseISOs2.xml:154
 msgid "Live DVD Xfce"
 msgstr "Live-DVD Xfce"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:127
-msgid "Xfce desktop environment only."
+#: en/SelectAndUseISOs2.xml:157
+#, fuzzy
+msgid "Xfce desktop environment only"
 msgstr "Nur Xfce Desktop-Umgebung."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:133
-msgid "32 or 64 bit architectures."
+#: en/SelectAndUseISOs2.xml:163
+#, fuzzy
+msgid "32 or 64-bit architectures"
 msgstr "32 oder 64-Bit-Architektur."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:139
+#: en/SelectAndUseISOs2.xml:169
 msgid "Net install media"
 msgstr "Netz-Installationsmedien"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:144
-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 ""
-"Jede einzelne ist ein kleines Abbild, welche nicht mehr als das Nötige "
-"enthält, um das Installationsprogramm drakx zu starten und die ISO-Datei zu "
-"finden, um die Installation fortzusetzen und abzuschließen. Diese ISO-Datei "
-"kann sich auf der Festplatte des Computers, einem lokalen Laufwerk, einem "
-"lokalen Netzwerk oder im Internet befinden."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:152
-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 ""
-"Diese Medien sind sehr klein (unter 100 MB) und praktisch, wenn die "
-"Bandbreite zu gering ist, um die komplette DVD herunterzuladen, der PC über "
-"kein DVD-Laufwerk verfügt oder nicht von einem USB-Stick booten kann."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:161
-msgid "First steps are English language only."
+#: en/SelectAndUseISOs2.xml:177
+#, fuzzy
+msgid "First steps are English language only"
 msgstr "Die ersten Schritte sind nur englische Sprache vorhanden."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:166
+#: en/SelectAndUseISOs2.xml:182
 msgid "netinstall.iso"
 msgstr "netinstall.iso"
 
 #. 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 ""
 "Enthält nur freie Software, für Leute die unfreie Software nicht benutzen "
 "möchten."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:175
+#: en/SelectAndUseISOs2.xml:191
 msgid "netinstall-nonfree.iso"
 msgstr "netinstall-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 ""
 "Enthält unfreie Software (hauptsächlich Treiber, Codecs...), für Leute die "
 "diese benötigen."
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:186
+#: en/SelectAndUseISOs2.xml:202
 msgid "Downloading and Checking Media"
 msgstr "Medien herunterladen und überprüfen"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:188
+#: en/SelectAndUseISOs2.xml:204
 msgid "Downloading"
 msgstr "Herunterladen"
 
 #. 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 ""
 "Sobald Sie eine ISO-Datei ausgewählt haben, können Sie diese über http oder "
 "BitTorrent herunterladen. In beiden Fällen zeigt ein Fenster Informationen "
@@ -3751,47 +4009,63 @@ msgstr ""
 "anderen zu wechseln, falls die Bandbreite zu niedrig ist. Wenn http "
 "ausgewählt wurde sehen Sie womöglich etwas wie"
 
+#. 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: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:191
-msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
+#: en/SelectAndUseISOs2.xml:217
+#, fuzzy
+msgid ""
+"<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:195
-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:"
+#: en/SelectAndUseISOs2.xml:222
+msgid "In the meantime, a window to download the actual ISO will open:"
 msgstr ""
-"md5sum und sha1sum sind Werkzeuge um die Integrität der ISO-Datei zu "
-"überprüfen. Verwende nur eine der beiden. Behalte eine von diesen <link "
-"linkend=\"integrity\">für die spätere Verwendung</link> im Hinterkopf. "
-"Anschließend wird ein ähnliches Fenster wie dieses erscheinen:"
 
 #. 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."
-msgstr "Wähle die Auswahl Datei speichern und klicke anschließend auf 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
 msgid "Checking the integrity of the downloaded media"
 msgstr "Überprüfen der integrität der heruntergeladenen Datei"
 
 #. 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 ""
 "Die eben erwähnten Prüfsummen sind digitale Fingerabdrücke, welche durch "
 "einen Algorithmus von der Datei berechnet wurde, welche heruntergeladen "
@@ -3802,7 +4076,7 @@ msgstr ""
 "der Datei durch Verwendung von BitTorrent durchführen."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:214
+#: en/SelectAndUseISOs2.xml:241
 msgid ""
 "To generate the checksum for your downloaded ISO, open a console, (no need "
 "to be root), and:"
@@ -3811,71 +4085,87 @@ msgstr ""
 "Konsole (Sie müssen hierfür nicht root sein) und:"
 
 #. 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 ""
 "- Um md5sum zu verwenden, geben Sie ein:<userinput>md5sum Pfad/zu/der/Abbild/"
 "Datei.iso</userinput>."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:222
+#: en/SelectAndUseISOs2.xml:249
+#, fuzzy
+msgid ""
+"To use the sha1sum, type: <command>sha1sum path/to/the/image/file.iso</"
+"command>"
+msgstr ""
+"- Um md5sum zu verwenden, geben Sie ein:<userinput>sha1sum Pfad/zu/der/"
+"Abbild/Datei.iso</userinput>."
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:254
+#, fuzzy
 msgid ""
-"To use sha1sum, type: <userinput>sha1sum path/to/the/image/file.iso</"
-"userinput>"
+"To use the sha512sum, type: <command>sha512sum path/to/the/image/file.iso</"
+"command>"
 msgstr ""
 "- Um md5sum zu verwenden, geben Sie ein:<userinput>sha1sum Pfad/zu/der/"
 "Abbild/Datei.iso</userinput>."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:226
+#: en/SelectAndUseISOs2.xml:258
 msgid "Example:"
 msgstr "Beispiel:"
 
 #. 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 ""
 "und vergleiche das Ergebnis (Sie müssen wahrscheinlich eine weile warten) "
 "mit der Prüfsumme die Sie von Mageia erhalten haben."
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:237
+#: en/SelectAndUseISOs2.xml:270
 msgid "Burn or dump the ISO"
 msgstr "Brennen oder übertragen der ISO"
 
 #. 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 ""
 "Die überprüfte ISO kann nun auf eine CD oder DVD gebrannt oder auf einen USB-"
 "Stick gedumpt werden. Diese Tätigkeit ist nicht ein einfaches kopieren, da "
 "hierbei ein bootbares Medium erstellt wird."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:275
 msgid "Burning the ISO to a CD/DVD"
 msgstr "ISO auf eine CD/DVD brennen"
 
 #. 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 ""
 "Verwenden Sie hierfür ein Brennprogramm nach Wahl, aber vergewissern Sie "
 "sich, dass <emphasis role=\"bold\">Abbild brennen</emphasis> ausgewählt ist. "
@@ -3885,46 +4175,54 @@ msgstr ""
 "\">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 "ISO auf einen USB-Stick übertragen"
 
 #. 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 ""
 "Alle Mageia ISOs sind hybrid, was bedeutet das Sie diese auf einen USB-Stick "
 "'dumpen' können um davon zu booten und das System zu installieren."
 
 #. 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 ""
 "\"dumpen\" eines Images auf ein Flash-Gerät zerstört alle Dateisysteme auf "
 "diesem Gerät; alle Dateien gehen verloren und die Partitionskapazität wird "
 "auf die Imagegröße reduziert."
 
-#. 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 ""
-"Um die ursprüngliche Kapazität wieder herzustellen, müssen Sie den USB-Stick "
-"neu partitionieren und formatieren."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:259
+#: en/SelectAndUseISOs2.xml:299
 msgid "Using a graphical tool within Mageia"
 msgstr "Verwenden eines grafischen Werkzeugs in Mageia"
 
 #. 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>"
@@ -3934,26 +4232,27 @@ msgstr ""
 "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 "Verwenden eines grafischen Werkzeugs in Windows"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:304
 msgid "You could try:"
 msgstr "Sie können versuchen:"
 
 #. 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=en_US\">Rufus</link> mit "
 "Verwendung der Auswahl \"ISO-Abbild\";"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:271
+#: en/SelectAndUseISOs2.xml:311
 msgid ""
 "<link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
@@ -3962,12 +4261,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 "Verwenden der Befehlszeile in einem GNU/Linux System"
 
 #. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:279
+#: en/SelectAndUseISOs2.xml:319
 msgid ""
 "It is potentially *dangerous* to do this by hand. You risk overwriting "
 "potentially valuable existing data if you specify the wrong target device."
@@ -3977,60 +4277,71 @@ msgstr ""
 "Versehen die falsche Geräte-ID verwenden."
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:325
 msgid "Open a console"
 msgstr "Öffnen Sie eine Konsole"
 
 #. 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 ""
 "Werden Sie root (Administrator) mit dem Befehl <userinput>su -</userinput> "
 "(vergessen Sie nicht das '-' am Ende)"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:291
-msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
+#: en/SelectAndUseISOs2.xml:332
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"Root.png\"/> </"
+"imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Root.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 ""
 "Schließen Sie Ihren USB-Stick an (hängen Sie diesen nicht ein, das bedeutet "
 "auch, das keine Anwendung oder Dateimanager geöffnet werden sollte, welche "
 "auf diesen zugreift oder liest)"
 
 #. 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 "Geben Sie den Befehl <userinput>fdisk -l</userinput> ein"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:304
-msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
+#: en/SelectAndUseISOs2.xml:345
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"Fdisk.png\"/> </"
+"imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Fdisk.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 ""
 "Finden Sie den Namen Ihres USB-Sticks heraus (anhand der Speichergröße), zum "
 "Beispiel ist <code>/dev/sdb</code> in dem Screenshot oben, ein 8GB USB-Stick."
 
 #. 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 ""
 "Alternativ können Sie auch den Gerätenamen mit dem Befehl <code>dmesg</code> "
 "anzeigen lassen: am Ende sehen Sie den Gerätenamen, welcher mit "
@@ -4038,7 +4349,7 @@ msgstr ""
 "emphasis> ist. Sie sehen ebenfalls die Größe von 2GB:"
 
 #. 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"
@@ -4080,40 +4391,47 @@ 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
 msgid "<placeholder type=\"screen\" id=\"0\"/>"
 msgstr "<placeholder type=\"screen\" 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 ""
 "Geben den Befehl <emphasis role=\"bold\"># <userinput>dd if=Pfad/zu/der/ISO/"
 "Dateiname of=/dev/sdX bs=1M</userinput></emphasis> ein"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:340
-msgid "Where X=your device name eg: /dev/sdd"
+#: en/SelectAndUseISOs2.xml:382
+#, fuzzy
+msgid ""
+"Where <replaceable>X</replaceable>=your device name eg: <filename>/dev/sdd</"
+"filename>"
 msgstr "Wobei X = der Name Ihres Gerätes ist, z.B. /dev/sdd"
 
 #. 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 ""
 "Beispiel: <emphasis role=\"bold\"># <userinput>dd if=/home/user/Downloads/"
 "Mageia-6-x86_64-DVD.iso of=/dev/sdd bs=1M</userinput></emphasis>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><tip><para>
-#: en/SelectAndUseISOs2.xml:345
+#: en/SelectAndUseISOs2.xml:388
+#, fuzzy
 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 ""
 "Es ist möglicherweise hilfreich zu wissen, dass <emphasis role=\"bold\">if</"
 "emphasis> für <emphasis role=\"bold\">i</emphasis>nput <emphasis role=\"bold"
@@ -4122,12 +4440,13 @@ msgstr ""
 "emphasis>ile (Ausgabedatei) steht"
 
 #. 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 "Geben Sie den Befehl # <userinput>sync</userinput> ein"
 
 #. 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 ""
 "Dies ist das Ende des Vorgangs und Sie können Ihren USB-Stick nun entfernen."
@@ -4138,8 +4457,10 @@ msgid "Select your Country / Region"
 msgstr "Wählen des Landes / der Region"
 
 #.  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
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
 "\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
@@ -4147,35 +4468,37 @@ msgstr ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
 "\"center\" fileref=\"dx2-selectCountry.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 ""
 "Wählen Sie Ihr Land oder Ihre Region. Dies ist für alle Einstellungen nötig, "
 "wie für die Währung und die für dieses Land gültigen Einstellungen des "
 "Funknetzes. Wählen Sie das falsche Land aus, kann dies zu einer Fehlfunktion "
 "des WLAN führen."
 
-#. 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 ""
 "Wenn Sie Ihr Land nicht in der Liste finden, klicken Sie auf den Knopf "
 "<guilabel>Andere Länder</guilabel> und wählen Sie hier Ihr Land und Ihre "
 "Region."
 
 #. 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 ""
 "Finden Sie Ihr Land nur in der Liste <guilabel>Andere Länder</guilabel>, "
 "nachdem Sie auf <guibutton>OK</guibutton> geklickt haben, so hat es den "
@@ -4183,14 +4506,15 @@ msgstr ""
 "ignorieren Sie dies, DrakX befolgt die von Ihnen getroffene Auswahl."
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:33
+#: en/selectCountry.xml:42
 msgid "Input method"
 msgstr "Eingabemethode"
 
 #. 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. "
@@ -4207,12 +4531,13 @@ msgstr ""
 "bevor Sie diese Pakete auswählen."
 
 #. 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 ""
 "Falls Sie die Einrichtung der Eingabemethode während der Installation "
 "verpasst haben, können Sie auch darauf zugreifen, nachdem sie Ihr "
@@ -4221,57 +4546,64 @@ msgstr ""
 "gestartet haben, oder indem Sie localedrake als root ausführen."
 
 #. type: Content of: <section><info><title>
-#: en/selectInstallClass.xml:14
+#: en/selectInstallClass.xml:29
 msgid "Install or Upgrade"
 msgstr "Installation oder Aktualisierung"
 
 #. 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 format=\"PNG\" align=\"center\" fileref=\"dx2-"
 "selectInstallClass.png\"/> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:25
-msgid "Install"
-msgstr "Installation"
+#: en/selectInstallClass.xml:41
+#, fuzzy
+msgid "<emphasis role=\"bold\">Install</emphasis>"
+msgstr "<emphasis role=\"bold\">Arbeitsrechner</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:27
+#: en/selectInstallClass.xml:43
+#, fuzzy
 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 ""
 "Diese Auswahl führt eine frische Installation von <application>Mageia</"
 "application> durch. Dies wird die root Partition (/) formatieren, man kann "
 "jedoch eine separate /home Partition beibehalten."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:33
-msgid "Upgrade"
-msgstr "Aktualisiere Mageia"
+#: en/selectInstallClass.xml:50
+#, fuzzy
+msgid "<emphasis role=\"bold\">Upgrade</emphasis>"
+msgstr "<emphasis role=\"bold\">Server</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 ""
 "Diese kann dazu verwendet werden um eine bestehende <application>Mageia</"
 "application> Installation auf eine neue Ausgabe zu aktualisieren."
 
-#. 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 ""
 "Während der Veröffentlichung dieses Installationsprogramms ist nur das "
 "Upgrade von der zuletzt <emphasis>unterstützten</emphasis> Mageia Version "
@@ -4280,36 +4612,15 @@ msgstr ""
 "Neuinstallation durchzuführen und ihre <literal>/home</literal> Partition "
 "bestehen zu lassen."
 
-#. type: Content of: <section><note><para>
-#: en/selectInstallClass.xml:50
-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 ""
-"Falls Sie während des Installationsvorgangs die Installation abbrechen "
-"wollen, besteht die Möglichkeit, das System neu zu booten.  Denken Sie aber "
-"zweimal nach, bevor Sie das tun. Nachdem eine Partition formatiert oder "
-"Aktualisierungen aufgespielt wurden, besitzt der Computer nicht mehr den "
-"ursprünglichen Status und ein Neustart könnte ein instabiles System zur "
-"Folge haben. Falls Sie trotz allem sicher sind, dass Sie einen Neustart "
-"durchführen wollen, wechseln Sie durch das Drücken der Tastenkombination "
-"<guilabel>Strg+Alt+F2</guilabel> zum Terminal. Danach drücken Sie bitte "
-"<guilabel>Strg+Alt+Entf</guilabel> um den Neustart durchzuführen."
-
 #. 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 ""
 "Falls Sie es versäumt haben, bei der Installation eine zusätzliche Sprache "
 "hinzuzufügen, können Sie vom \"<emphasis role=\"bold\">Installations- oder "
@@ -4319,39 +4630,41 @@ msgstr ""
 "Installationsprozess."
 
 #. type: Content of: <section><info><title>
-#: en/selectKeyboardLive.xml:3
-msgid "Select keyboard"
+#: en/selectKeyboardLive.xml:14
+#, fuzzy
+msgid "Select Keyboard"
 msgstr "Tastatur auswählen"
 
 #. 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 ""
-"Sie müssen das Tastaturlayout auswählen, welches Sie in Mageia verwenden "
-"möchten. Die Standardauswahl wird anhand der Sprache und der Zeitzone "
-"getroffen, welche Sie zuvor ausgewählt haben."
 
 #. type: Content of: <section><info><title>
-#: en/selectKeyboard.xml:7
+#: en/selectKeyboard.xml:20
 msgid "Keyboard"
 msgstr "Tastatur"
 
 #. 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."
@@ -4361,16 +4674,17 @@ msgstr ""
 "Tastatur verwendet."
 
 #. 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=\"dx2-selectKeyboard.png\" align=\"center\"/"
-"> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" align=\"center\" fileref=\"dx2-"
+"selectInstallClass.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 "
@@ -4389,23 +4703,25 @@ msgstr ""
 "Tastaturbelegung</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 ""
 "Ist Ihre Tastatur nicht in der angezeigten Liste zu finden, klicken Sie auf "
 "<guibutton>Mehr</guibutton>, um eine vollständige Liste zu erhalten, und "
 "wählen hier Ihre Tastatur."
 
-#. 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 ""
 "Nachdem Sie eine Tastatur aus dem Dialog <guibutton>Mehr</guibutton> gewählt "
 "haben, kehren Sie in den ersten Dialog zum Auswählen der Tastatur zurück, "
@@ -4415,7 +4731,7 @@ msgstr ""
 "Liste gewählt wurde."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:46
+#: en/selectKeyboard.xml:60
 msgid ""
 "If you choose a keyboard based on non-Latin characters, you will see an "
 "extra dialogue screen asking how you would prefer to switch between the "
@@ -4426,16 +4742,17 @@ msgstr ""
 "lateinischen und nicht-lateinischen Tastaturbelegungen umschalten möchten."
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:15
+#: en/selectLanguage.xml:34
 msgid "Please choose a language to use"
 msgstr "Bitte wählen Sie eine Sprache für die Installation"
 
-#. 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 ""
 "Wählen Sie die von Ihnen bevorzugte Sprache, indem Sie zuerst die Liste für "
 "Ihren Kontinent aufklappen. Beachten Sie dabei auch, dass einige Sprachen "
@@ -4443,22 +4760,24 @@ msgstr ""
 "verwendet diese Auswahl für das Installationsprogramm und das installierte "
 "System."
 
-#. 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 ""
 "Wählen Sie die von Ihnen bevorzugte Sprache. <application>Mageia</"
 "application> wird diese Auswahl für das Installationsprogramm und das zu "
 "installierende System verwenden."
 
-#. 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 ""
 "Wünschen (oder benötigen) Sie mehrere installierte Sprachen auf Ihrem "
@@ -4468,50 +4787,50 @@ msgstr ""
 "Sprachen hinzuzufügen."
 
 #. 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 format=\"PNG\" fileref="
 "\"dx2-selectLanguage.png\" align=\"center\"/> </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 ""
 "Auch wenn Sie mehr als eine Sprache wählen, müssen Sie zuerst im ersten "
 "Auswahlbildschirm jene Sprache wählen, die von Ihnen bevorzugt wird. Diese "
 "wird dann am Bildschirm für mehrere Sprachen als gewählt markiert."
 
 #. 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 ""
 "Ist die Tastaturbelegung nicht die gleiche wie die von Ihnen bevorzugte "
 "Sprache, dann ist es empfehlenswert, auch die Sprache Ihrer Tastaturbelegung "
 "zu wählen."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:56
-msgid "Mageia uses UTF-8 (Unicode) support by default."
-msgstr "Mageia verwendet standardmäßig die UTF-8 (Unicode) Unterstützung."
-
-#. 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 ""
 "Dies kann in der Ansicht \"<emphasis role=\"bold\">Mehrere Sprachen</"
 "emphasis>\" deaktiviert werden, wenn Sie wissen, dass es für Ihre Sprache "
@@ -4519,16 +4838,19 @@ msgstr ""
 "Sprachen aus."
 
 #. 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 ""
 "Sie können die Sprache Ihres Systems nach der Installation im Mageia "
 "Kontrollzentrum -> System -> Auswählen der Region und Sprache ändern."
 
 #. type: Content of: <section><info><title>
-#: en/selectMouse.xml:4
+#: en/selectMouse.xml:10
 msgid "Select mouse"
 msgstr "Maus auswählen"
 
@@ -4536,18 +4858,19 @@ msgstr "Maus auswählen"
 #.  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 revision=\"1\" fileref=\"dx2-selectMouse.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"selectMouse-im1\"></imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" align=\"center\" fileref=\"dx2-"
+"selectInstallClass.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."
@@ -4556,26 +4879,29 @@ msgstr ""
 "andere Konfiguration auswählen."
 
 #. 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 ""
 "Üblicherweise ist <guilabel>\"Universell\"</guilabel> - <guilabel>\"Einige "
 "PS/2 und USB Mäuse\"</guilabel> eine gute Wahl."
 
 #. 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 ""
 "Wählen Sie <guilabel>\"Universell\"</guilabel> - <guilabel>\"Evdev erzwingen"
 "\"</guilabel>, um die nicht funktionierenden zusätzlichen Tasten einer "
 "Multifunktionsmaus zu konfigurieren."
 
-#. 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 "Hinzufügen oder ändern eines Boot Menü Eintrags"
 
@@ -4601,104 +4927,69 @@ msgstr ""
 "en/Grub2-efi_and_Mageia</link>"
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:7
-msgid "Bootloader main options"
-msgstr "Hauptoptionen des Bootloaders"
-
-#. type: Content of: <section><section><title>
 #: en/setupBootloader.xml:10
-msgid "Bootloader interface"
+#, fuzzy
+msgid "Bootloader"
 msgstr "Bootloader Oberfläche"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:11
-msgid "By default, Mageia uses exclusively:"
-msgstr "Standardmäßig verwendet Mageia ausschließlich:"
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:13
+msgid "Grub2"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><title>
+#: en/setupBootloader.xml:15
+#, fuzzy
+msgid "Grub2 on Legacy MBR/GPT systems"
+msgstr "Grub2 auf Legacy/MBR und Legacy/GPT Systeme"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:14
+#: en/setupBootloader.xml:17
+#, fuzzy
 msgid ""
-"GRUB2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
+"GRUB2 (with or without graphical menu) will be used exclusively as the "
+"bootloader for a Legacy/MBR or Legacy/GPT system."
 msgstr ""
 "Grub2 (mit oder ohne einem grafischen Menü) für ein Legacy/MBR oder Legacy/"
 "GPT System"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:18
-msgid "GRUB2-efi for a UEFI system."
-msgstr "Grub2-efi für ein UEFI System."
-
-#. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:22
-msgid "The Mageia graphical menus are nice :)"
-msgstr "Das grafische Menü von Mageia ist hübsch :)"
-
-#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:25
-msgid "GRUB2 on Legacy/MBR and Legacy/GPT systems"
-msgstr "Grub2 auf Legacy/MBR und Legacy/GPT Systeme"
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:27
-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 fileref=\"dx2-"
-"setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
-"setupBootloader.png\"/> </imageobject>"
-
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:34 en/setupBootloader.xml:56
+#: en/setupBootloader.xml:21
+#, fuzzy
 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 ""
-"Ändern Sie nicht das <emphasis role=\"bold\">Boot-Medium</emphasis>, außer "
-"Sie wissen genau, was Sie tun."
+"GRUB2 Bootloader, entweder in den MBR (Master Boot Record) auf Ihrer "
+"Festplatte oder in die BIOS Bootpartition."
 
-#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:38
-msgid "GRUB2-efi on UEFI systems"
+#. type: Content of: <section><section><itemizedlist><title>
+#: en/setupBootloader.xml:27
+#, fuzzy
+msgid "Grub2-efi on UEFI systems"
 msgstr "Grub2-efi auf UEFI Systeme"
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:39
-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 ""
-"Mit einem UEFI System ist die Benutzeroberfläche deutlich anders, da Sie "
-"nicht zwischen einer Oberfläche <emphasis role=\"bold\">mit</emphasis> oder "
-"<emphasis role=\"bold\">ohne</emphasis> grafischem Menü wählen können"
 
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:42
+#. 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-"
-"setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
-"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 ""
 "Wenn Mageia das einzige Betriebssystem ist, welches auf Ihrem Computer "
 "installiert ist, dann hat das Installationsprogramm eine ESP (EFI-"
@@ -4709,155 +5000,91 @@ msgstr ""
 "möglich mehrere ESPs zu haben, jedoch wird generell nur eine benötigt und "
 "diese ist auch ausreichend, egal wie viele Betriebssysteme Sie verwenden."
 
-#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:61
-msgid "Using a Mageia bootloader"
-msgstr "Verwenden des Mageia Bootloaders"
-
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:62
-msgid ""
-"By default, and according to your system, Mageia writes one of the following:"
-msgstr ""
-"Standardmäßig, entsprechend Ihres Systems, schreibt Mageia folgendes neu:"
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:66
-msgid ""
-"a GRUB2 bootloader either into the MBR (Master Boot Record) of your first "
-"hard drive or in the BIOS boot partition."
-msgstr ""
-"GRUB2 Bootloader, entweder in den MBR (Master Boot Record) auf Ihrer "
-"Festplatte oder in die BIOS Bootpartition."
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:70
-msgid "a GRUB2-efi bootloader into the ESP"
-msgstr "GRUB2-efi Bootloader in die ESP"
+#. type: Content of: <section><section><info><title>
+#: en/setupBootloader.xml:46
+#, fuzzy
+msgid "Bootloader Setup"
+msgstr "Bootloader Oberfläche"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:73
-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."
-msgstr ""
-"Falls Sie bereits andere Betriebssysteme installiert haben wird Mageia diese "
-"in Ihr neues Mageia Bootmenü hinzufügen. Falls Sie dies nicht haben möchten, "
-"klicke auf <guibutton>Weiter</guibutton> und entferne die Auswahl in der Box "
-"<emphasis role=\"bold\">Fremdes OS testen</emphasis>."
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:49
+msgid "Bootloader main options"
+msgstr "Hauptoptionen des Bootloaders"
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:78
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:51
+#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata fileref=\"live-setupBootloader3.png\" align=\"center\"/> </"
-"imageobject>"
+"\"dx2-setupBootloader.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata fileref=\"live-setupBootloader.png\" xml:id=\"setupBootloader-"
+"im1\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
 "\"> <imagedata fileref=\"live-setupBootloader3.png\" align=\"center\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:87
-msgid "Using an existing bootloader"
-msgstr "Verwenden eines bestehenden Bootloaders"
-
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:88
-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."
-msgstr ""
-"Der exakte Vorgang zum Hinzufügen Ihres Mageia-Systems zu einem bestehenden "
-"Bootloader geht über den Rahmen dieser Dokumentation hinaus, jedoch sollte "
-"in den meisten Fällen, durch ausführen des entsprechenden Bootloader-"
-"Installationsprogramm das Mageia System automatisch erkannt und hinzugefügt "
-"werden. Sehen Sie dazu in der Dokumentation für das Betriebssystem nach, "
-"wenn noch Fragen offen sind."
-
-#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:95
-msgid "Using chain loading"
-msgstr "Verwenden des Chain-Loader"
+#. 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\">Server</emphasis>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:96
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:63
 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>."
+"This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI "
+"systems will not see this option here."
 msgstr ""
-"Falls Sie kein bootbares Mageia haben möchten, dieses jedoch über den "
-"Chainloader eines anderen Betriebssystem starten möchten, klicke auf "
-"<guibutton>Weiter</guibutton>, anschließend auf <guibutton>Fortgeschritten</"
-"guibutton> und wähle die Box <guilabel>Verändere nichts an der ESP oder dem "
-"MBR</guilabel> aus."
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:101
-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-"
-"setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-setupBootloader4.png\" align="
-"\"center\"/> </imageobject>"
+#. 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\">Fortgeschritten</emphasis>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:108
-msgid ""
-"You will get a warning that the bootloader is missing, ignore it by clicking "
-"<guibutton>OK</guibutton>."
+#. 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 ""
-"Sie werden eine Warnmeldung erhalten, dass der Bootloader fehlt. Ignorieren "
-"Sie diese Meldung indem Sie auf <guibutton>OK</guibutton> drücken."
+"Ändern Sie diese Einstellungen nur dann, wenn Sie genau wissen, was Sie tun."
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:111
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:72
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
-"imageobject>"
+"<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:117
-msgid "Options"
-msgstr "Optionen"
-
-#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:119
-msgid "First page"
-msgstr "Erste Seite"
+"<emphasis role=\"bold\">Wählen Sie hier ihre Sicherheitsstufe aus</emphasis>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:120
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:74
+#, 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."
+"This text box lets you set a delay, in seconds, before the default operating "
+"system is started up."
 msgstr ""
 "<guilabel>Wartezeit vor dem Starten des Standard-Betriebssystems</guilabel>: "
 "Diese Textbox lässt Ihnen eine Wartezeit in Sekunden festlegen, bevor das "
 "Standard-Betriebssystem gestartet wird."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:122
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:78
+#, fuzzy
+msgid "<emphasis role=\"bold\">Security</emphasis>"
+msgstr "<emphasis role=\"bold\">Server</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:79
+#, fuzzy
 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."
+"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 ""
 "<guilabel>Sicherheit</guilabel>: Dies erlaubt Ihnen ein Passwort für den "
 "Bootloader festzulegen. Dies bedeutet, dass der Benutzername und das "
@@ -4866,35 +5093,51 @@ msgstr ""
 "\"bold\">root</emphasis> und das Passwort ist welches, dass Sie in diesem "
 "Abschnitt später festlegen können."
 
-#. 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:88
+#, fuzzy
+msgid "Choose a password for the bootloader (optional)"
 msgstr ""
 "<guilabel>Passwort</guilabel>: In dieser Textbox geben Sie das gewünschte "
 "Passwort ein"
 
-#. 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:91
+#, fuzzy
+msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
+msgstr "<emphasis role=\"bold\">Arbeitsrechner</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:92
+#, fuzzy
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the password and DrakX will "
-"check that it matches with the one above."
+"Retype the password and DrakX will check that it matches with the one set "
+"above"
 msgstr ""
 "<guilabel>Passwort (erneut)</guilabel>: Geben Sie hier das Passwort erneut "
 "an und DrakX überprüft, ob dieses mit dem oben angegebenen übereinstimmt."
 
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:96 en/setupBootloader.xml:154
+#, fuzzy
+msgid "<emphasis>Advanced</emphasis>"
+msgstr "<emphasis role=\"bold\">Fortgeschritten</emphasis>"
+
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:127 en/setupBootloader.xml:159
-msgid "<guilabel>Advanced</guilabel>"
-msgstr "<guilabel>Fortgeschrittene Optionen</guilabel>"
+#: en/setupBootloader.xml:99
+#, fuzzy
+msgid "<emphasis>Enable ACPI</emphasis>"
+msgstr "<emphasis>Generisch</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:100
+#, fuzzy
 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)."
+"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 ""
 "<guilabel>ACPI aktivieren:</guilabel> ACPI (Advanced Configuration and Power "
 "Interface) ist ein Standard für die Energieverwaltung. Es kann durch das "
@@ -4904,91 +5147,253 @@ msgstr ""
 "falls Sie finden, dass die ACPI Implementierung einige Probleme verursacht "
 "(als Beispiel wären zufällige Neustarts oder Systemhänger)."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:133
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:108
+#, fuzzy
+msgid "<emphasis>Enable SMP</emphasis>"
+msgstr "<emphasis>Generisch</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:109
+#, fuzzy
 msgid ""
-"<guilabel>Enable SMP</guilabel>: This option enables/disables symmetric "
-"multiprocessing for multi core processors."
+"This option enables/disables symmetric multiprocessing for multi-core "
+"processors"
 msgstr ""
 "<guilabel>SMP aktivieren</guilabel>: Diese Auswahl aktiviert / deaktiviert "
 "das symmetrische Multiprocessing für Multiprozessorsysteme."
 
-#. 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:113
+#, fuzzy
+msgid "<emphasis>Enable APIC</emphasis>"
+msgstr "<emphasis>Generisch</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:114
+#, fuzzy
 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."
+"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 ""
 "<guilabel>APIC aktivieren</guilabel>: Aktivieren oder deaktivierten dieser "
 "Option erlaubt dem Betriebssystem Zugriff auf den Advanced Programmable "
 "Interrupt Controller. APIC Geräte erlauben ein weitaus komplexeres "
 "Prioritätenmodell und erweiterte IRC (Interrupt Request) Verwaltung."
 
-#. 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:120
+#, fuzzy
+msgid "<emphasis>Enable Local APIC</emphasis>"
+msgstr "<emphasis>Generisch</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:121
+#, fuzzy
 msgid ""
-"<guilabel>Enable Local APIC</guilabel>: Local APIC manages all external "
-"interrupts for a specific processor in an SMP system."
+"Here you can set Local APIC, which manages all external interrupts for a "
+"specific processor in an SMP system"
 msgstr ""
 "<guilabel>Lokales APIC aktivieren</guilabel>: Hier können Sie das lokale "
 "APIC auswählen, welches alle externen Interrupts (Unterbrechungen) für einen "
 "bestimmten Prozessor in einem SMP System verwaltet."
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:143
-msgid "Next page"
-msgstr "Nächste Seite"
+#: en/setupBootloader.xml:127
+#, fuzzy
+msgid "Bootloader Configuration"
+msgstr "Soundkonfiguration"
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:129
+#, fuzzy
+msgid ""
+"<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 align=\"center\" fileref="
+"\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata fileref=\"live-setupBootloader3.png\" align=\"center\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:139
+#, fuzzy
+msgid "<emphasis role=\"bold\">Default</emphasis>"
+msgstr "<emphasis role=\"bold\">Server</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:146
-msgid "<guilabel>Default:</guilabel> Operating system started up by default"
+#: en/setupBootloader.xml:140
+#, fuzzy
+msgid "The operating system to started up by default"
 msgstr ""
 "<guilabel>Standard:</guilabel> Das Betriebssystem das als Standardsystem "
 "voreingestellt werden soll"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:150
+#: en/setupBootloader.xml:143
+#, fuzzy
+msgid "<emphasis role=\"bold\">Append</emphasis>"
+msgstr "<emphasis role=\"bold\">Fortgeschritten</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:144
+#, 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."
+"This option lets you pass information to the kernel or tell the kernel to "
+"give you more information as it boots"
 msgstr ""
 "<guilabel>Hinzufügen/Erweitern:</guilabel> Mit dieser Option können Sie "
 "Kernel-Einstellungen einrichten oder dem Kernel die Anweisung geben, mehr "
 "Informationen beim Booten zu geben."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:155
+#: en/setupBootloader.xml:148
+#, fuzzy
+msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
+msgstr "<emphasis role=\"bold\">Server</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:149
+#, fuzzy
 msgid ""
-"<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
-"\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
+"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 ""
-"<guilabel>Fremdes OS testen</guilabel>: siehe oben <link linkend="
-"\"setupMageiaBootloader\">Verwenden des Mageia Bootloaders</link>"
+"Falls Sie bereits andere Betriebssysteme installiert haben wird Mageia diese "
+"in Ihr neues Mageia Bootmenü hinzufügen. Falls Sie dies nicht haben möchten, "
+"klicke auf <guibutton>Weiter</guibutton> und entferne die Auswahl in der Box "
+"<emphasis role=\"bold\">Fremdes OS testen</emphasis>."
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:156
+#, fuzzy
+msgid ""
+"<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 align=\"center\" fileref="
+"\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata fileref=\"live-setupBootloader3.png\" align=\"center\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:166
+#, fuzzy
+msgid "<emphasis>Video mode</emphasis>"
+msgstr "<emphasis>Hersteller</emphasis>"
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:159
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:167
+#, fuzzy
 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."
+"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 ""
 "<guilabel>Video-Modus:</guilabel> Diese legt die Bildschirmauflösung und "
 "Farbtiefe des Bootmenüs fest. Wenn Sie auf das nach unten zeigende Dreieck "
 "klicken werden Ihnen weitere Auflösungen und Farbtiefen angezeigt."
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:162
+#. 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>Hersteller</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:173
 msgid ""
-"<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
-"linkend=\"setupChainLoading\">Using the chain loading</link>"
+"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 ""
-"<emphasis role=\"bold\">Verändere nichts an der ESP oder dem MBR</emphasis>: "
-"siehe oben, <link linkend=\"setupChainLoading\">Verwenden des Chain-Loader</"
-"link>"
+
+#. 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=\"live-setupBootloader5.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:188
+#, fuzzy
+msgid "Other Options"
+msgstr "Optionen"
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:190
+msgid "Using an existing bootloader"
+msgstr "Verwenden eines bestehenden Bootloaders"
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:191
+#, fuzzy
+msgid ""
+"The exact procedure for adding Mageia to an existing bootloader is beyond "
+"the scope of this documentation. However in most cases it will involve "
+"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 ""
+"Der exakte Vorgang zum Hinzufügen Ihres Mageia-Systems zu einem bestehenden "
+"Bootloader geht über den Rahmen dieser Dokumentation hinaus, jedoch sollte "
+"in den meisten Fällen, durch ausführen des entsprechenden Bootloader-"
+"Installationsprogramm das Mageia System automatisch erkannt und hinzugefügt "
+"werden. Sehen Sie dazu in der Dokumentation für das Betriebssystem nach, "
+"wenn noch Fragen offen sind."
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:199
+#, fuzzy
+msgid "Installing Without a Bootloader"
+msgstr "Verwenden des Mageia Bootloaders"
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:200
+msgid ""
+"While you can opt to install Mageia without a bootloader (see section 2.1 "
+"Advanced), this is not recommended unless you absolutely know what you are "
+"doing, as without some form of bootloader your operating system will be "
+"unable to start."
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:207
+#, fuzzy
+msgid ""
+"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 ""
+"Um dies zu tun, müssen Sie /boot/grub2/custom.cfg manuell editieren oder "
+"stattdessen die Software grub-customizer verwenden (Verfügbar in den Mageia "
+"Repositorys)."
+
+#. type: Content of: <section><section><section><note><para>
+#: en/setupBootloader.xml:212
+#, fuzzy
+msgid ""
+"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 ""
+"Für weitere Informationen schauen Sie in unser Wiki: <link ns2:href="
+"\"https://wiki.mageia.org/en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/"
+"en/Grub2-efi_and_Mageia</link>"
 
 #. type: Content of: <section><info><title>
-#: en/setupSCSI.xml:3
+#: en/setupSCSI.xml:10
 msgid "Setup SCSI"
 msgstr "SCSI-Laufwerke einrichten"
 
@@ -5000,17 +5405,20 @@ msgstr "SCSI-Laufwerke einrichten"
 #.  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=\"dx2-setupSCSI.png\" align="
-"\"center\" xml:id=\"setupSCSI-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
 msgid ""
 "DrakX will normally detect hard disks correctly. However, with some older "
 "SCSI controllers it may be unable to determine the correct drivers to use "
@@ -5021,103 +5429,60 @@ msgstr ""
 "Installation der notwendigen Treiber fehlschlagen."
 
 #. 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 ""
 "Falls dies geschieht, müssen Sie DrakX händisch mitteilen, welche SCSI-"
 "Laufwerke Sie haben."
 
-#. type: Content of: <section><para>
-#: en/setupSCSI.xml:35
-msgid "DrakX should then be able to configure the drive(s) correctly."
-msgstr "Danach sollte DrakX die Laufwerke korrekt konfigurieren können."
-
 #. type: Content of: <section><info><title>
-#: en/soundConfig.xml:3
+#: en/soundConfig.xml:10
 msgid "Sound Configuration"
 msgstr "Soundkonfiguration"
 
 #.  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
-msgid ""
-"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
-"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
-"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
-
-#. type: Content of: <section><para>
-#: en/soundConfig.xml:14
+#: en/soundConfig.xml:20
+#, 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."
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-soundConfig.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"soundConfig-im1\"/> </imageobject>"
 msgstr ""
-"In diesem Bildschirm steht der Name des Treibers, den das "
-"Installationsprogramm für ihre Soundkarte ausgewählt hat, welches der "
-"Standardtreiber ist, wenn einer gefunden wurde."
+"<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 ""
-"Der Standardtreiber sollte ohne Probleme funktionieren. Wenn Sie jedoch nach "
-"der Installation Probleme feststellen sollten, starten Sie entweder "
-"<command>draksound</command> oder starte das Werkzeug über das Mageia "
-"Kontrollzentrum (MCC), durch Auswahl des <guilabel>Hardware</guilabel> Tab "
-"und klick auf <guilabel>Soundkonfiguration</guilabel> oben rechts im Fenster."
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:24
+#: 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 ""
-"Dann wählen Sie in <emphasis role=\"bold\">draksound</emphasis> oder im Menü "
-"\"<emphasis role=\"bold\">Soundkonfiguration</emphasis>\" die "
-"<guibutton>Problembehebung</guibutton> aus, um hilfreiche Hinweise zu "
-"bekommen, wie das Problem zu lösen ist."
 
 #. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:30
+#: en/soundConfig.xml:43
 msgid "Advanced"
 msgstr "Fortgeschritten"
 
-#. type: Content of: <section><section><para>
-#: en/soundConfig.xml:33
-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 ""
-"Während der Installation ist die Auswahl von <emphasis role=\"bold"
-"\"><guibutton>Fortgeschritten</guibutton></emphasis> in diesem Fenster "
-"hilfreich, falls kein Standardtreiber vorhanden ist und mehrere Treiber "
-"angezeigt werden, und Sie denken, dass das Installationsprogramm den "
-"falschen ausgewählt hat."
-
-#. type: Content of: <section><section><para>
-#: en/soundConfig.xml:38
-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 ""
-"Im Falle, dass ein anderer Treiber ausgewählt werden soll, klicken Sie auf "
-"<emphasis role=\"bold\"><guibutton>Soll irgendein Treiber ausgewählt werden?"
-"</guibutton></emphasis>."
-
 #. type: Content of: <section><info><title>
-#: en/takeOverHdConfirm.xml:3
+#: en/takeOverHdConfirm.xml:10
 msgid "Confirm hard disk to be formatted"
 msgstr "Bestätigen, dass die Festplatte formatiert wird"
 
@@ -5127,76 +5492,80 @@ msgstr "Bestätigen, dass die Festplatte formatiert wird"
 #.     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 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-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"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 ""
 "Klicken Sie auf <guibutton>Abbrechen</guibutton>, wenn Sie sich bei der "
 "Auswahl nicht sicher sind."
 
-#. 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 ""
 "Klicken Sie auf <guibutton>Weiter</guibutton>, wenn Sie sich sicher sind und "
 "jede Partition, jedes Betriebssystem und alle Daten auf dem Laufwerk löschen "
 "wollen."
 
 #. type: Content of: <section><info><title>
-#: en/testing.xml:9
+#: en/testing.xml:3
 msgid "Testing Mageia as Live system"
 msgstr "Mageia als Live-System testen"
 
 #. type: Content of: <section><section><info><title>
-#: en/testing.xml:14
+#: en/testing.xml:8
 msgid "Live mode"
 msgstr "Live-Modus"
 
+#. 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 ""
-"Ihnen wird diese Ansicht angezeigt, falls Sie \"Mageia booten\" ausgewählt "
-"haben. Anderenfalls gelangen Sie zum Schritt \"<link linkend="
-"\"doPartitionDisks\">Partitionierung</link> step\"."
-
 #. type: Content of: <section><section><section><info><title>
-#: en/testing.xml:28
+#: en/testing.xml:21
 msgid "Testing hardware"
 msgstr "Hardware testen"
 
 #. 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 ""
 "Eines der Ziele des Live Modus ist es, zu überprüfen ob die Hardware korrekt "
 "von Mageia verwaltet wird. Sie können über die Hardware Sektion des Mageia "
@@ -5204,74 +5573,72 @@ msgstr ""
 "können dort die meisten Geräte überprüfen:"
 
 #. 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 "Netzwerk-Schnittstelle: Konfiguration mittels 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 ""
 "Grafikkarte: Wenn Sie den Bildschirm wie im oberen Bild sehen, dann ist "
 "bereits alles in Ordnung."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:47
+#: en/testing.xml:40
 msgid "webcam:"
 msgstr "Webcam:"
 
 #. 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 "Sound: Ein Sound wurde bereits abgespielt"
 
 #. 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 "Drucker: Konfigurieren und Testseite drucken"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:59
+#: en/testing.xml:52
 msgid "scanner: scan a document from ..."
 msgstr "Scanner: Scanne ein Dokument von ..."
 
 #. 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 ""
 "Wenn alles so in Ordnung ist, können Sie mit der Installation fortfahren. "
 "Falls nicht, können Sie die Installation über den Beenden-Knopf abbrechen."
 
-#. 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 ""
 "Die Konfigurationseinstellungen, die Sie hier vorgenommen haben, werden für "
 "die Installation gespeichert."
 
 #. type: Content of: <section><section><section><info><title>
-#: en/testing.xml:72
+#: en/testing.xml:68
 msgid "Launch installation"
 msgstr "Installation beginnen"
 
-#. 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 ""
 "Um die Mageia-Live-CD/-DVD auf der Festplatte zu installieren, klicken Sie "
 "einfach auf die Kachel \"Auf Festplatte installieren\". Daraufhin wird Ihnen "
@@ -5279,13 +5646,22 @@ msgstr ""
 "\"doPartitionDisks\">Partitionierung</link>\" wie bei der direkten "
 "Installation ohne Live-Medium."
 
+#. 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 "Mageia deinstallieren"
 
 #. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:9
+#: en/uninstall-Mageia.xml:18
 msgid ""
 "If Mageia didn't convince you or you can't install it correctly - in short "
 "you want get rid of it - that is your right and Mageia also gives you the "
@@ -5297,12 +5673,13 @@ msgstr ""
 "nicht auf jedes Betriebssystem zu."
 
 #. 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 ""
 "Nach der Sicherung Ihrer Daten, starten Sie die Mageia DVD neu und wählen "
 "<emphasis role=\"bold\">Systemrettung</emphasis>, dann <emphasis role=\"bold"
@@ -5311,14 +5688,18 @@ msgstr ""
 "auszuwählen."
 
 #. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:19
-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."
+#: en/uninstall-Mageia.xml:28
+#, fuzzy
+msgid ""
+"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 ""
 "Um in Windows den durch die Mageia-Partitionen genutzten Speicherplatz "
 "wieder zur Verfügung zu erhalten, klicken Sie auf <code>Start -> "
@@ -5330,17 +5711,18 @@ msgstr ""
 "<guibutton>Löschen</guibutton> um den Speicherplatz freizugeben."
 
 #. 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 ""
 "Wenn Sie Windows XP verwenden können Sie eine neue Partition erstellen und "
 "diese formatieren (FAT32 oder NTFS). Diese wird einen Partitionsbuchstaben "
 "erhalten."
 
 #. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:30
+#: en/uninstall-Mageia.xml:49
 msgid ""
 "If you have Vista or 7, you have one more possibility, you can extend the "
 "existing partition that is at the left of the freed space. There are other "
@@ -5357,34 +5739,50 @@ msgstr ""
 "wichtigen Dingen Sicherungskopien angefertigt haben."
 
 #. type: Content of: <section><info><title>
-#: en/unused.xml:9
+#: en/unused.xml:3
 msgid "Keep or delete unused material"
 msgstr "Behalten oder löschen von nicht benötigten Daten"
 
+#. 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=\"reboot-im1\" fileref=\"live-"
+"reboot.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 ""
 "In diesem Schritt überprüft das Installationsprogramm, welche Sprach- und "
 "Hardwarepakete nicht benötigt werden. Anschließend schlägt er vor diese zu "
 "löschen. Es ist sinnvoll dies zu tun, außer Sie haben vor, die durchgeführte "
 "Installation auch auf anderer Hardware zu verwenden."
 
+#. 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>"
@@ -5393,11 +5791,848 @@ 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 ""
 "Der nächste Schritt ist das kopieren der Dateien auf die Festplatte. Dies "
 "dauert einige Minuten. Am Ende erhalten Sie für eine gewisse Zeit einen "
 "leeren Bildschirm, was normal ist."
+
+#~ msgid "User and Superuser Management"
+#~ msgstr "Verwaltung des Benutzers und des Superusers"
+
+#~ msgid ""
+#~ "Every partition is shown to the left as: <emphasis role=\"bold\">Device "
+#~ "(capacity, mount point, type).</emphasis>"
+#~ msgstr ""
+#~ "Jede Partition wird wie folgt angezeigt: <emphasis role=\"bold\">\"Gerät"
+#~ "\" (\"Kapazität\", \"Einhängepunkt\", \"Typ\").</emphasis>"
+
+#~ 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>)."
+#~ msgstr ""
+#~ "<emphasis role=\"bold\">Gerät</emphasis>, bestehend aus: <emphasis role="
+#~ "\"bold\">Festplatte</emphasis>, [<emphasis role=\"bold"
+#~ "\">Festplattennamen</emphasis> (Buchstabe)], <emphasis role=\"bold"
+#~ "\">Partitionsnummer</emphasis> (zum Beispiel, <emphasis role=\"bold"
+#~ "\">sda5</emphasis>)."
+
+#~ msgid "In advanced tab, you will find more options about clock settings."
+#~ msgstr ""
+#~ "Im Tab Fortgeschrittene Optionen, erhalten Sie weitere Möglichkeiten "
+#~ "bezüglich der Zeiteinstellungen."
+
+#~ msgid "From a disc"
+#~ msgstr "Von einem optischen Laufwerk"
+
+#~ 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 ""
+#~ "Sie können direkt von dem Datenträger, auf dem Sie das Image gebrannt "
+#~ "haben (CD-ROM, DVD-ROM...), starten. Sie müssen nur die CD/DVD in Ihr "
+#~ "Laufwerk einlegen, damit der Bootloader die Installation automatisch nach "
+#~ "dem Neustart Ihres Computers beginnt. Falls dies nicht funktioniert, "
+#~ "müssen Sie womöglich die Bootreihenfolge der Laufwerke im BIOS umstellen "
+#~ "oder beim Start eine Taste drücken, wodurch Sie eine Auswahl erhalten, "
+#~ "von der Sie wählen können, von welchem Laufwerk Ihr Computer starten soll."
+
+#~ msgid ""
+#~ "According to which hardware you have, and how it is configured, you get "
+#~ "either one or another of the two screens below."
+#~ msgstr ""
+#~ "Abhängig davon, welche Hardware Sie besitzen und wie diese konfiguriert "
+#~ "ist, erhalten Sie einen der beiden unten angezeigten Bildschirme."
+
+#~ msgid "From a USB device"
+#~ msgstr "Von einem USB-Gerät"
+
+#~ 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 ""
+#~ "Sie können von dem USB-Gerät, auf welchem Sie das ISO Image übertragen "
+#~ "haben, starten. Abhängig von den BIOS Einstellungen startet der Computer "
+#~ "möglicherweise direkt von dem bereits eingesteckten USB-Gerät. Falls dies "
+#~ "nicht geschieht, müssen Sie entweder in Ihren BIOS Einstellungen die "
+#~ "Bootreihenfolge ändern, oder eine Taste während dem Startvorgang Ihres "
+#~ "Computers drücken, damit eine Auswahl angezeigt wird, in der Sie "
+#~ "auswählen können von welchem Laufwerk Sie ihren Computer starten möchten."
+
+#~ 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 ""
+#~ "Im mittleren Menü haben Sie die Auswahl zwischen drei Möglichkeiten:"
+
+#~ 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 ""
+#~ "Von der Festplatte starten: Diese Auswahl erlaubt Ihnen das System von "
+#~ "der Festplatte zu starten, so als wäre kein Medium (CD/DVD oder USB-"
+#~ "Stick) angeschlossen. (Funktioniert nicht mit Mageia 5)."
+
+#~ msgid "In the bottom menu, are the Boot Options:"
+#~ msgstr "Im unteren Menü sind die Startoptionen:"
+
+#~ msgid ""
+#~ "F1 - Help. Explain the options \"splash\", \"apm\", \"acpi\" and \"Ide\""
+#~ msgstr ""
+#~ "F1 - Hilfe. Beschreibt die Optionen \"splash\", \"apm\", \"acpi\" und "
+#~ "\"Ide\""
+
+#~ msgid "F2 - Language. Choose the display language of the screens."
+#~ msgstr ""
+#~ "F2 - Sprache. Hier können Sie die angezeigte Sprache für den Bildschirm "
+#~ "auswählen"
+
+#~ msgid ""
+#~ "F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728"
+#~ msgstr ""
+#~ "F3 - Bildschirmauflösung. Wähle zwischen Text, 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 - Treiber. Ja oder Nein. Dem System wird dadurch gemeldet, das ein "
+#~ "weiterer, optionaler, Datenträger mit einer Treiberaktualisierung zur "
+#~ "Verfügung steht und diese wird dann während dem Installationsvorgang "
+#~ "verlangt."
+
+#~ msgid ""
+#~ "F6 - Kernel options. This is a way to specify options according to your "
+#~ "hardware and the drivers to use."
+#~ msgstr ""
+#~ "F6 - Kernel-Optionen. Auf diesem Weg können Sie Optionen, abhängig von "
+#~ "Ihrer Hardware und die dafür zu verwendeten Treiber, festlegen."
+
+#~ msgid "First screen while booting on UEFI system from disk"
+#~ msgstr ""
+#~ "Der erste Bildschirm beim starten auf einem UEFI System von einem "
+#~ "Datenträger"
+
+#~ msgid ""
+#~ "You have only the choice to run Mageia in Live mode (first choice)  or to "
+#~ "process the installation (second choice)."
+#~ msgstr ""
+#~ "Sie haben nur die Auswahlmöglichkeit Mageia im Live Modus zu starten "
+#~ "(erste Auswahl) oder die Installation zu beginnen (zweite Auswahl)."
+
+#~ 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 ""
+#~ "In jedem Fall sind die ersten Schritte die gleichen, um die Sprache, "
+#~ "Zeitzone und Tastatur auszuwählen. Danach unterscheiden diese sich durch "
+#~ "<link linkend=\"testing\">zusätzliche Schritte im Live Modus</link>."
+
+#~ msgid ""
+#~ "Depending on your selection here, you may be offered further screens to "
+#~ "fine-tune your choice."
+#~ msgstr ""
+#~ "Je nachdem, welche Auswahl Sie hier treffen, werden weitere "
+#~ "Auswahlfenster angezeigt, um Ihre Installation individuell zu gestalten."
+
+#~ msgid "The settings DrakX chose are usually good."
+#~ msgstr ""
+#~ "Normalerweise wählt <emphasis role=\"bold\">DrakX</emphasis> passende "
+#~ "Einstellungen."
+
+#~ 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=\"configureX_card_list-"
+#~ "im1\" align=\"center\" fileref=\"dx2-configureX_card_list.png\" revision="
+#~ "\"1\"/> </imageobject>"
+
+#~ 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 ""
+#~ "Die <emphasis role=\"bold\">Nonfree</emphasis>-Paketquellen müssen "
+#~ "ausdrücklich aktiviert werden. Falls Sie dies zuvor nicht gemacht haben, "
+#~ "sollten Sie dies nach dem ersten Neustart tun."
+
+#~ 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=\"configureX_chooser-im1\" "
+#~ "fileref=\"dx2-configureX_chooser.png\" align=\"center\" revision=\"1\"/> "
+#~ "</imageobject>"
+
+#~ msgid ""
+#~ "<emphasis><guibutton>Graphic card</guibutton></emphasis>: Choose your "
+#~ "card from the list if needed."
+#~ msgstr ""
+#~ "<emphasis><guibutton>Grafikkarte</guibutton></emphasis>: Wählen Sie Ihre "
+#~ "Karte aus der Liste, wenn nötig."
+
+#~ msgid "Incorrect refresh rates may damage your monitor"
+#~ msgstr "Falsche Wiederholfrequenzen können Ihren Bildschirm beschädigen"
+
+#~ 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=\"configureX_monitor-im1\" "
+#~ "fileref=\"dx2-configureX_monitor.png\" align=\"center\" revision=\"1\"/> "
+#~ "</imageobject>"
+
+#~ msgid "<emphasis>Custom</emphasis>"
+#~ msgstr "<emphasis>Benutzerdefiniert</emphasis>"
+
+#~ msgid "<emphasis>Plug 'n Play</emphasis>"
+#~ msgstr "<emphasis>Plug 'n Play</emphasis>"
+
+#~ msgid "the monitor manufacturers name"
+#~ msgstr "Monitorbezeichnung"
+
+#~ msgid "the monitor description"
+#~ msgstr "Monitorbeschreibung"
+
+#~ 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 "Ist alles bereit, so klicken Sie auf <guibutton>Fertig</guibutton>."
+
+#~ 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-"
+#~ "doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" "
+#~ "align=\"center\"/> </imageobject>"
+
+#~ msgid "Use Free Space"
+#~ msgstr "Nutze freien Speicherplatz"
+
+#~ msgid "Use Free Space on a Windows Partition"
+#~ msgstr "Nutze den freien Speicherplatz einer Windows Partition"
+
+#~ msgid ""
+#~ "If you have unused space on an existing Windows partition, the installer "
+#~ "may offer to use it."
+#~ msgstr ""
+#~ "Falls Sie nicht genutzen freien Speicherplatz auf einer bestehenden "
+#~ "Windows-Partition verfügbar haben, kann das Installationsprogramm diesen "
+#~ "zur Nutzung vorschlagen."
+
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" "
+#~ "align=\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" "
+#~ "align=\"center\"/> </imageobject>"
+
+#~ msgid "Erase and use Entire Disk."
+#~ msgstr "Komplette Platte löschen und freien Platz benutzen"
+
+#~ msgid ""
+#~ "Note! This will erase ALL data on the selected hard drive. Take care!"
+#~ msgstr ""
+#~ "Beachte! Dies wird ALLE Daten auf dem gewählten Laufwerk löschen. Bitte "
+#~ "Vorsicht walten lassen!"
+
+#~ msgid "Custom disk partitioning"
+#~ msgstr "Benutzerdefinierte Partitionierung"
+
+#~ 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 ""
+#~ "Dies bedeutet, dass bei einem freien Speicherplatz von 160 GB und mehr, "
+#~ "das Installationsprogramm drei Partitionen erstellen wird: 50 GB für "
+#~ "<emphasis role=\"bold\">/</emphasis>, 4 GB für <emphasis role=\"bold"
+#~ "\">swap</emphasis> und der Rest für <emphasis role=\"bold\">/home</"
+#~ "emphasis>."
+
+#~ 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 align=\"center\" fileref="
+#~ "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition="
+#~ "\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid "January 2015"
+#~ msgstr "Januar 2015"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+
+#~ msgid "Using a Mageia DVD"
+#~ msgstr "Eine Mageia DVD verwenden"
+
+#~ 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 ""
+#~ "Hier sehen Sie die voreingestellten Willkommensbildschirme, wenn Sie eine "
+#~ "Mageia DVD verwenden. Beim ersten wird ein System mit UEFI verwendet und "
+#~ "beim zweiten ein System mit BIOS:"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
+
+#~ msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
+
+#~ 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):"
+#~ msgstr ""
+#~ "Bei diesem Bildschirm ist es möglich einige Voreinstellungen einzurichten "
+#~ "(beachte die Optionen <emphasis role=\"bold\">F1</emphasis> bis <emphasis "
+#~ "role=\"bold\">F6</emphasis>, die nur bei Legacy Systemen verfügbar sind):"
+
+#~ msgid ""
+#~ "Press <emphasis role=\"bold\">F2</emphasis> to have the installer use a "
+#~ "specific language for the installation."
+#~ msgstr ""
+#~ "Drücke <emphasis role=\"bold\">F2</emphasis> um das Installationsprogramm "
+#~ "in eine spezifische Sprache für die Installation einzustellen."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "Use the arrow keys to select the language then press <emphasis role=\"bold"
+#~ "\">Enter</emphasis>."
+#~ msgstr ""
+#~ "Verwende die Pfeiltasten um die Sprache auszuwählen und drücke danach die "
+#~ "<emphasis role=\"bold\">Enter</emphasis> Taste."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+
+#~ msgid "Default: It doesn't alter anything in the default options."
+#~ msgstr "- Standard: es ändert nichts an den Standardoptionen."
+
+#~ msgid ""
+#~ "Safe Settings: Priority is given to the safer options at the price of a "
+#~ "performance detriment."
+#~ msgstr ""
+#~ "- Sichere Einstellungen: die Priorität wird auf sichere Optionen gelegt "
+#~ "zum Nachteil der Leistung."
+
+#~ msgid ""
+#~ "When you select one of these entries, it modifies the default options "
+#~ "displayed in the <guilabel>Boot Options</guilabel> line."
+#~ msgstr ""
+#~ "Wenn Sie einen dieser Einträge auswählen, werden die Standard "
+#~ "Bootoptionen in der <guilabel>Bootoptionen</guilabel> Zeile geändert."
+
+#~ 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 ""
+#~ "Bei einigen Mageia Veröffentlichungen kann es passieren, das die Einträge "
+#~ "welche mit der <emphasis role=\"bold\">F6</emphasis> Taste ausgewählt "
+#~ "wurden, nicht in der <guilabel>Bootoptionen</guilabel> Zeile erscheinen, "
+#~ "diese werden allerdings trotzdem befolgt."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+
+#~ 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 ""
+#~ "Durch drücken der <emphasis role=\"bold\">F1</emphasis> Taste erscheint "
+#~ "ein neues Fenster mit weiteren verfügbaren Optionen. Wähle eine mit den "
+#~ "Pfeiltasten aus und drücke <emphasis role=\"bold\">Enter</emphasis> um "
+#~ "mehr Details zu bekommen oder drücke <emphasis role=\"bold\">ESC</"
+#~ "emphasis> um in den Willkommensbildschirm zurückzukehren."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+
+#~ 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 ""
+#~ "Die detailierte Ansicht über die splash Optionen. Drücke <emphasis role="
+#~ "\"bold\">ESC</emphasis> oder wähle <guilabel>Zurück zu Boot-Optionen</"
+#~ "guilabel> um zurück zur Optionsliste zu gelangen. Die dort aufgeführten "
+#~ "Optionen können mit der Hand in die <guilabel>Boot-Optionen</guilabel> "
+#~ "Zeile hinzugefügt werden."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "The help is translated in the chosen language with <emphasis role=\"bold"
+#~ "\">F2</emphasis>."
+#~ msgstr ""
+#~ "Die Hilfe wird in der, mit der <emphasis role=\"bold\">F2</emphasis> "
+#~ "Taste, ausgewählten Sprache angezeigt."
+
+#~ 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 ""
+#~ "Für mehr Informationen über Kernel-Optionen auf alten und UEFI-Systemen, "
+#~ "siehe: <link ns2:href=\"https://wiki.mageia.org/de/"
+#~ "Wie_man_Kerneloptionen_einstellt\">https://wiki.mageia.org/de/"
+#~ "Wie_man_Kerneloptionen_einstellt</link>"
+
+#~ msgid "Media Selection (Nonfree)"
+#~ msgstr "Medienauswahl (Nonfree)"
+
+#~ 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=\"media_selection-im1\" "
+#~ "align=\"center\" revision=\"1\" fileref=\"dx2-media_selection.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid "Summary of miscellaneous parameters"
+#~ msgstr "Zusammenfassung von verschiedenen Parameter"
+
+#~ msgid "<guilabel>Timezone</guilabel>"
+#~ msgstr "<guilabel>Zeitzone</guilabel>"
+
+#~ msgid "<guilabel>Country / Region</guilabel>"
+#~ msgstr "<guilabel>Land / Region</guilabel>"
+
+#~ msgid "<guilabel>Bootloader</guilabel>"
+#~ msgstr "<guilabel>Bootloader</guilabel>"
+
+#~ msgid "For more information, see <xref linkend=\"setupBootloader\"/>"
+#~ msgstr ""
+#~ "Weitere Informationen finden Sie unter <xref linkend=\"setupBootloader"
+#~ "\"></xref>"
+
+#~ msgid "<guilabel>User management</guilabel>"
+#~ msgstr "<guilabel>Benutzerverwaltung</guilabel>"
+
+#~ msgid "<guilabel>Services</guilabel>:"
+#~ msgstr "<guilabel>Dienste</guilabel>:"
+
+#~ msgid "For more information, see <xref linkend=\"configureServices\"/>"
+#~ msgstr ""
+#~ "Weitere Informationen finden Sie unter <xref linkend=\"configureServices"
+#~ "\"/>"
+
+#~ msgid "<guilabel>Keyboard</guilabel>:"
+#~ msgstr "<guilabel>Tastatur</guilabel>:"
+
+#~ msgid "<guilabel>Mouse</guilabel>:"
+#~ msgstr "<guilabel>Maus</guilabel>:"
+
+#~ msgid "<guilabel>Sound card</guilabel>:"
+#~ msgstr "<guilabel>Soundkarte</guilabel>:"
+
+#~ 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 ""
+#~ "Das Installationsprogramm nutzt den Standardtreiber, wenn einer "
+#~ "installiert ist. Die Option, um einen anderen Treiber zu wählen, wird nur "
+#~ "angezeigt, wenn es mehrere Treiber für ihre Karte gibt und keiner "
+#~ "Standard ist."
+
+#~ msgid "<guilabel>Graphical interface</guilabel>:"
+#~ msgstr "<guilabel>Grafikkarte</guilabel>:"
+
+#~ msgid "<guilabel>Network</guilabel>:"
+#~ msgstr "<guilabel>Netzwerk</guilabel>:"
+
+#~ msgid "<guilabel>Proxies</guilabel>:"
+#~ msgstr "<guilabel>Proxys</guilabel>:"
+
+#~ msgid "<guilabel>Security Level</guilabel>:"
+#~ msgstr "<guilabel>Sicherheitsstufe</guilabel>:"
+
+#~ msgid "Check the option which best suits your usage."
+#~ msgstr ""
+#~ "Überprüfen Sie die Option, die Ihnen für Ihren Verwendungzweck am "
+#~ "geeignetsten erscheint."
+
+#~ 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 ""
+#~ "Eine Firewall dient als Barriere zwischen Ihren wichtigen Daten und den "
+#~ "Spitzbuben draußen im Internet, die diese Daten gefährden oder stehlen "
+#~ "wollen."
+
+#~ 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 ""
+#~ "Wählen Sie die Dienste, denen Sie Zugriff auf Ihr System gestatten "
+#~ "wollen. Die von Ihnen getroffene Auswahl ist abhängig davon, wofür Sie "
+#~ "Ihren Computer verwenden wollen. Für weitere Informationen siehe <xref "
+#~ "linkend=\"firewall\"/>."
+
+#~ 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=\"securityLevel-im1\" "
+#~ "align=\"center\" fileref=\"dx2-securityLevel.png\" revision=\"1\"/> </"
+#~ "imageobject>"
+
+#~ msgid "64 bit architecture only."
+#~ msgstr "Nur 64-Bit-Architektur."
+
+#~ 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 und sha1sum sind Werkzeuge um die Integrität der ISO-Datei zu "
+#~ "überprüfen. Verwende nur eine der beiden. Behalte eine von diesen <link "
+#~ "linkend=\"integrity\">für die spätere Verwendung</link> im Hinterkopf. "
+#~ "Anschließend wird ein ähnliches Fenster wie dieses erscheinen:"
+
+#~ msgid "Select the Save File option, then, click OK."
+#~ msgstr "Wähle die Auswahl Datei speichern und klicke anschließend auf OK."
+
+#~ msgid ""
+#~ "To recover the original capacity, you must redo partitioning and re-"
+#~ "format the USB stick."
+#~ msgstr ""
+#~ "Um die ursprüngliche Kapazität wieder herzustellen, müssen Sie den USB-"
+#~ "Stick neu partitionieren und formatieren."
+
+#~ msgid "Install"
+#~ msgstr "Installation"
+
+#~ msgid "Upgrade"
+#~ msgstr "Aktualisiere Mageia"
+
+#~ 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 ""
+#~ "Falls Sie während des Installationsvorgangs die Installation abbrechen "
+#~ "wollen, besteht die Möglichkeit, das System neu zu booten.  Denken Sie "
+#~ "aber zweimal nach, bevor Sie das tun. Nachdem eine Partition formatiert "
+#~ "oder Aktualisierungen aufgespielt wurden, besitzt der Computer nicht mehr "
+#~ "den ursprünglichen Status und ein Neustart könnte ein instabiles System "
+#~ "zur Folge haben. Falls Sie trotz allem sicher sind, dass Sie einen "
+#~ "Neustart durchführen wollen, wechseln Sie durch das Drücken der "
+#~ "Tastenkombination <guilabel>Strg+Alt+F2</guilabel> zum Terminal. Danach "
+#~ "drücken Sie bitte <guilabel>Strg+Alt+Entf</guilabel> um den Neustart "
+#~ "durchzuführen."
+
+#~ 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 ""
+#~ "Sie müssen das Tastaturlayout auswählen, welches Sie in Mageia verwenden "
+#~ "möchten. Die Standardauswahl wird anhand der Sprache und der Zeitzone "
+#~ "getroffen, welche Sie zuvor ausgewählt haben."
+
+#~ msgid "Mageia uses UTF-8 (Unicode) support by default."
+#~ msgstr "Mageia verwendet standardmäßig die UTF-8 (Unicode) Unterstützung."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-selectMouse.png\" align=\"center\" "
+#~ "format=\"PNG\" > </imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectMouse.png\" "
+#~ "format=\"PNG\" align=\"center\" xml:id=\"selectMouse-im1\"></imagedata> </"
+#~ "imageobject>"
+
+#~ msgid "By default, Mageia uses exclusively:"
+#~ msgstr "Standardmäßig verwendet Mageia ausschließlich:"
+
+#~ msgid "GRUB2-efi for a UEFI system."
+#~ msgstr "Grub2-efi für ein UEFI System."
+
+#~ msgid "The Mageia graphical menus are nice :)"
+#~ msgstr "Das grafische Menü von Mageia ist hübsch :)"
+
+#~ 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 fileref=\"dx2-"
+#~ "setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata xml:id=\"setupBootloader-im1\" fileref="
+#~ "\"live-setupBootloader.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "Don't modify the <emphasis role=\"bold\">Boot Device</emphasis> unless "
+#~ "you really know what you are doing."
+#~ msgstr ""
+#~ "Ändern Sie nicht das <emphasis role=\"bold\">Boot-Medium</emphasis>, "
+#~ "außer Sie wissen genau, was Sie tun."
+
+#~ 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 ""
+#~ "Mit einem UEFI System ist die Benutzeroberfläche deutlich anders, da Sie "
+#~ "nicht zwischen einer Oberfläche <emphasis role=\"bold\">mit</emphasis> "
+#~ "oder <emphasis role=\"bold\">ohne</emphasis> grafischem Menü wählen können"
+
+#~ 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-"
+#~ "setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "By default, and according to your system, Mageia writes one of the "
+#~ "following:"
+#~ msgstr ""
+#~ "Standardmäßig, entsprechend Ihres Systems, schreibt Mageia folgendes neu:"
+
+#~ msgid "a GRUB2-efi bootloader into the ESP"
+#~ msgstr "GRUB2-efi Bootloader in die ESP"
+
+#~ msgid "Using chain loading"
+#~ msgstr "Verwenden des Chain-Loader"
+
+#~ 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>."
+#~ msgstr ""
+#~ "Falls Sie kein bootbares Mageia haben möchten, dieses jedoch über den "
+#~ "Chainloader eines anderen Betriebssystem starten möchten, klicke auf "
+#~ "<guibutton>Weiter</guibutton>, anschließend auf "
+#~ "<guibutton>Fortgeschritten</guibutton> und wähle die Box "
+#~ "<guilabel>Verändere nichts an der ESP oder dem MBR</guilabel> aus."
+
+#~ 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-"
+#~ "setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-setupBootloader4.png\" "
+#~ "align=\"center\"/> </imageobject>"
+
+#~ msgid ""
+#~ "You will get a warning that the bootloader is missing, ignore it by "
+#~ "clicking <guibutton>OK</guibutton>."
+#~ msgstr ""
+#~ "Sie werden eine Warnmeldung erhalten, dass der Bootloader fehlt. "
+#~ "Ignorieren Sie diese Meldung indem Sie auf <guibutton>OK</guibutton> "
+#~ "drücken."
+
+#~ msgid "First page"
+#~ msgstr "Erste Seite"
+
+#~ msgid "<guilabel>Advanced</guilabel>"
+#~ msgstr "<guilabel>Fortgeschrittene Optionen</guilabel>"
+
+#~ msgid "Next page"
+#~ msgstr "Nächste Seite"
+
+#~ msgid ""
+#~ "<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
+#~ "\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
+#~ msgstr ""
+#~ "<guilabel>Fremdes OS testen</guilabel>: siehe oben <link linkend="
+#~ "\"setupMageiaBootloader\">Verwenden des Mageia Bootloaders</link>"
+
+#~ msgid ""
+#~ "<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above "
+#~ "<link linkend=\"setupChainLoading\">Using the chain loading</link>"
+#~ msgstr ""
+#~ "<emphasis role=\"bold\">Verändere nichts an der ESP oder dem MBR</"
+#~ "emphasis>: siehe oben, <link linkend=\"setupChainLoading\">Verwenden des "
+#~ "Chain-Loader</link>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-setupSCSI.png\" "
+#~ "align=\"center\" xml:id=\"setupSCSI-im1\" revision=\"1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-setupSCSI.png\" "
+#~ "align=\"center\" xml:id=\"setupSCSI-im1\" revision=\"1\"/> </imageobject>"
+
+#~ msgid "DrakX should then be able to configure the drive(s) correctly."
+#~ msgstr "Danach sollte DrakX die Laufwerke korrekt konfigurieren können."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" "
+#~ "xml:id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" "
+#~ "xml:id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
+
+#~ 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 ""
+#~ "In diesem Bildschirm steht der Name des Treibers, den das "
+#~ "Installationsprogramm für ihre Soundkarte ausgewählt hat, welches der "
+#~ "Standardtreiber ist, wenn einer gefunden wurde."
+
+#~ 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 ""
+#~ "Der Standardtreiber sollte ohne Probleme funktionieren. Wenn Sie jedoch "
+#~ "nach der Installation Probleme feststellen sollten, starten Sie entweder "
+#~ "<command>draksound</command> oder starte das Werkzeug über das Mageia "
+#~ "Kontrollzentrum (MCC), durch Auswahl des <guilabel>Hardware</guilabel> "
+#~ "Tab und klick auf <guilabel>Soundkonfiguration</guilabel> oben rechts im "
+#~ "Fenster."
+
+#~ 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 ""
+#~ "Dann wählen Sie in <emphasis role=\"bold\">draksound</emphasis> oder im "
+#~ "Menü \"<emphasis role=\"bold\">Soundkonfiguration</emphasis>\" die "
+#~ "<guibutton>Problembehebung</guibutton> aus, um hilfreiche Hinweise zu "
+#~ "bekommen, wie das Problem zu lösen ist."
+
+#~ 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 ""
+#~ "Während der Installation ist die Auswahl von <emphasis role=\"bold"
+#~ "\"><guibutton>Fortgeschritten</guibutton></emphasis> in diesem Fenster "
+#~ "hilfreich, falls kein Standardtreiber vorhanden ist und mehrere Treiber "
+#~ "angezeigt werden, und Sie denken, dass das Installationsprogramm den "
+#~ "falschen ausgewählt hat."
+
+#~ 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 ""
+#~ "Im Falle, dass ein anderer Treiber ausgewählt werden soll, klicken Sie "
+#~ "auf <emphasis role=\"bold\"><guibutton>Soll irgendein Treiber ausgewählt "
+#~ "werden?</guibutton></emphasis>."
+
+#~ 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 format=\"PNG\" fileref=\"live-"
+#~ "takeOverHdConfirm.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"classical\"> <imagedata format=\"PNG\" fileref=\"dx2-"
+#~ "takeOverHdConfirm.png\" align=\"center\"/> </imageobject>"
+
+#~ msgid ""
+#~ "You get this screen if you selected \"Boot Mageia\". If not, you get the "
+#~ "\"<link linkend=\"doPartitionDisks\">Partitioning</link> step\""
+#~ msgstr ""
+#~ "Ihnen wird diese Ansicht angezeigt, falls Sie \"Mageia booten\" "
+#~ "ausgewählt haben. Anderenfalls gelangen Sie zum Schritt \"<link linkend="
+#~ "\"doPartitionDisks\">Partitionierung</link> step\"."
diff --git a/docs/docs/stable/installer/el.po b/docs/docs/stable/installer/el.po
index 53626ac0..65a22f5f 100644
--- a/docs/docs/stable/installer/el.po
+++ b/docs/docs/stable/installer/el.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2018-04-19 16:32+0300\n"
+"POT-Creation-Date: 2019-01-06 12:43+0200\n"
 "PO-Revision-Date: 2018-12-28 13:46+0000\n"
 "Last-Translator: Dimitrios Glentadakis <dglent@free.fr>\n"
 "Language-Team: Greek (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -28,12 +28,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Content of: <section><info><title>
-#: en/acceptLicense.xml:25
+#: en/acceptLicense.xml:31
 msgid "License and Release Notes"
 msgstr "Άδεια χρήσης και σημειώσεις έκδοσης"
 
 #. type: Content of: <section><mediaobject>
-#: en/acceptLicense.xml:29
+#: en/acceptLicense.xml:35
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
 "\"acceptLicense-im1\" fileref=\"dx2-license.png\" align=\"center\" revision="
@@ -48,78 +48,86 @@ msgstr ""
 "\"center\" condition=\"live\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/acceptLicense.xml:40
+#: en/acceptLicense.xml:46
 msgid "License Agreement"
 msgstr "Άδεια χρήσης"
 
-#. 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 ""
 "Πριν την εγκατάσταση της <application>Mageia</application>, παρακαλώ "
 "διαβάστε τους όρους και τις συνθήκες της άδειας χρήσης προσεκτικά."
 
-#. 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 ""
 "Οι όροι και οι συνθήκες ισχύουν για ολόκληρη τη διανομή <application>Mageia</"
 "application> και θα πρέπει να τους αποδεχτείτε πριν να συνεχίσετε."
 
-#. 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 ""
 "Για να συνεχίσετε, απλά επιλέξτε <guilabel>Αποδοχή</guilabel> και έπειτα "
 "κάντε κλικ στο <guibutton>Επόμενο</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 ""
 "Αν τελικά αποφασίσετε να μην αποδεχτείτε τους όρους, κάντε κλικ στο "
 "<guibutton>Έξοδος</guibutton> για επανεκκίνηση του υπολογιστή σας."
 
 #. type: Content of: <section><section><info><title>
-#: en/acceptLicense.xml:63
+#: en/acceptLicense.xml:76
 msgid "Release Notes"
 msgstr "Σημειώσεις έκδοσης"
 
 #. 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 ""
 "Κάνοντας κλικ στο κουμπί <guibutton>Σημειώσεις έκδοσης</guibutton>, θα "
 "βρείτε σημαντικές πληροφορίες σχετικά με την κυκλοφορία της "
 "<application>Mageia</application>."
 
 #. 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 "el"
 
 #. 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 "Επιλογή μέσων (Διαμόρφωση επιπρόσθετων μέσων εγκατάστασης)"
 
 #.  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
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-add_supplemental_media."
 "png\" xml:id=\"dx2-add_supplemental_media-im1\" align=\"center\" revision="
@@ -130,12 +138,13 @@ msgstr ""
 "\"1\"/> </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 ""
 "Σε αυτήν την οθόνη έχετε μια λίστα των ήδη αναγνωρισμένων αποθετηρίων. "
 "Μπορείτε να προσθέσετε και άλλες πηγές πακέτων, όπως έναν οπτικό οδηγό ή μια "
@@ -143,24 +152,25 @@ msgstr ""
 "διαθέσιμα στα επόμενα βήματα."
 
 #. 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 "Για μια δικτυακή πηγή, θα πρέπει να ακολουθήσετε δυο βήματα:"
 
 #. 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 "Επιλογή και ενεργοποίηση του δικτύου, αν δεν είναι ήδη ενεργοποιημένο."
 
 #. 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 ""
 "Επιλογή ενός καθρεπτισμού ή καθορισμός του URL (η πρώτη καταχώρηση). "
 "Επιλέγοντας έναν καθρεπτισμό , έχετε τη δυνατότητα να επιλέξετε μεταξύ των "
@@ -170,14 +180,15 @@ msgstr ""
 "υποδείξετε ένα συγκεκριμένο αποθετήριο ή τη δική σας εγκατάσταση NFS."
 
 #. 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 ""
 "Αν κάνετε ενημέρωση μιας 64bit εγκατάστασης η οποία μπορεί να περιέχει "
 "μερικά 32bit πακέτα, συνιστάται να χρησιμοποιήσετε την οθόνη προσθήκης ενός "
@@ -187,18 +198,25 @@ msgstr ""
 "διαδικτυακού καθρεπτισμού, ο εγκαταστάτης θα εντοπίσει εκεί τα 32bit πακέτα."
 
 #. type: Content of: <section><info><title>
-#: en/addUser.xml:3
-msgid "User and Superuser Management"
-msgstr "Διαχείριση χρήστη και διαχειριστή"
+#: en/addUser.xml:9
+#, fuzzy
+msgid "User Management"
+msgstr "Προχωρημένη διαχείριση χρήστη"
 
 #.  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 format=\"PNG\" fileref="
 "\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -206,20 +224,21 @@ msgstr ""
 "\"PNG\" 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 "Ορίστε τον κωδικό πρόσβασης του διαχειριστή (root):"
 
 #. 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 ""
 "Συνιστάται για όλες τις εγκαταστάσεις <application>Mageia</application> ο "
 "καθορισμός ενός κωδικού πρόσβαση <emphasis role=\"bold\">διαχειριστή</"
@@ -231,9 +250,10 @@ msgstr ""
 "θα πρέπει να επαναλάβετε τον κωδικό πρόσβασης στο επόμενο πεδίο."
 
 #. 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 ""
 "Όλοι οι κωδικοί κάνουν διάκριση μεταξύ πεζών και κεφαλαίων. Συνιστάται η "
@@ -241,17 +261,18 @@ msgstr ""
 "σε έναν κωδικό."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:42
+#: en/addUser.xml:57
 msgid "Enter a user"
 msgstr "Εισαγωγή ενός χρήστη"
 
 #. 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 ""
 "Εδώ μπορείτε να προσθέσετε έναν χρήστη. Ένας χρήστης έχει λιγότερα "
 "δικαιώματα από τον <emphasis role=\"bold\">διαχειριστή</emphasis> (root), "
@@ -260,41 +281,64 @@ msgstr ""
 "χρήστης με τον υπολογιστή του."
 
 #. 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\">Προχωρημένες</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>Εικονίδιο</guibutton>: Αν κάνετε κλικ σε αυτό το κουμπί θα "
 "αλλάξει το εικονίδιο του χρήστη."
 
 #. 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\">Εξυπηρετητής</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>Πραγματικό όνομα</guilabel>: Εισάγετε το πραγματικό όνομα του "
 "χρήστη σε αυτό το πλαίσιο κειμένου."
 
 #. 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\">Προχωρημένες</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>Όνομα χρήστη</guilabel>: Εισαγάγετε το όνομα σύνδεσης χρήστη ή "
 "αφήστε το DrakX να χρησιμοποιήσει μια μορφή του πραγματικού ονόματος του "
 "χρήστη. <emphasis role=\"bold\">Το όνομα σύνδεσης κάνει διάκριση μεταξύ "
 "πεζών και κεφαλαίων.</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\">Προχωρημένες</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>Κωδικός πρόσβασης</guilabel>: Πληκτρολογήστε τον κωδικό πρόσβασης "
 "του χρήστη.  Και εδώ, υπάρχει μια ασπίδα στην άκρη του πλαισίου που δείχνει "
@@ -302,26 +346,28 @@ msgstr ""
 "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>Κωδικός πρόσβασης (ξανά)</guilabel>: Επαναλάβετε τον κωδικό "
 "πρόσβασης του χρήστη· το DrakX θα ελέγξει ότι έχετε πληκτρολογήσει τον ίδιο "
 "κωδικό πρόσβασης."
 
 #. 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 ""
 "Κάθε χρήστης που προσθέτετε κατά την εγκατάσταση της Mageia, θα έχει έναν "
 "προσωπικό κατάλογο με προστασία εγγραφής και ανάγνωσης (umask=0027)."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:82
+#: en/addUser.xml:104
 msgid ""
 "You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
@@ -332,32 +378,34 @@ msgstr ""
 "<emphasis>Διαχείριση χρηστών</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 ""
 "Οι άδειες πρόσβασης μπορούν επίσης να τροποποιηθούν και μετά την εγκατάσταση."
 
 #. 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 "Προχωρημένη διαχείριση χρήστη"
 
 #. 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 ""
 "Το κουμπί <guibutton>για προχωρημένους</guibutton> σας επιτρέπει να "
 "επεξεργαστείτε τις ρυθμίσεις για τον χρήστη που προσθέτετε."
 
 #. 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>Κέλυφος</guilabel>: Αυτό το αναπτυσσόμενο κατάστιχο σας επιτρέπει "
 "να αλλάξετε το κέλυφος που χρησιμοποιείται από τον χρήστη που προσθέτετε "
@@ -366,28 +414,30 @@ msgstr ""
 "\">Sh</emphasis>"
 
 #. 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>Αναγνωριστικό χρήστη</guilabel>: Εδώ μπορείτε να ορίσετε το "
 "<emphasis role=\"bold\">Αναγνωριστικό του χρήστη</emphasis> που προσθέσατε "
 "στην προηγούμενη οθόνη. Αν δεν ξέρετε τι να κάνετε αφήστε το κενό."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:113
+#: en/addUser.xml:136
+#, fuzzy
 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 ""
 "<guilabel>Αναγνωριστικό ομάδας</guilabel>: Σας επιτρέπει να ορίσετε το "
 "<emphasis role=\"bold\">Αναγνωριστικό της ομάδος</emphasis>. Αν δεν ξέρετε "
 "τι να κάνετε αφήστε το κενό."
 
 #. type: Content of: <section><info><title>
-#: en/ask_mntpoint_s.xml:3
+#: en/ask_mntpoint_s.xml:10
 msgid "Choose the mount points"
 msgstr "Επιλογή των σημείων προσάρτησης"
 
@@ -402,15 +452,17 @@ msgstr "Επιλογή των σημείων προσάρτησης"
 #.        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 format=\"PNG\" xml:id="
 "\"chooseMountPoints-im1\" align=\"center\" fileref=\"dx2-chooseMountpoints."
@@ -420,58 +472,37 @@ msgstr ""
 "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 ""
 "Εδώ βλέπετε τις κατατμήσεις Linux που βρέθηκαν στον υπολογιστή σας. Αν δεν "
 "συμφωνείτε με τις προτάσεις του <application>DrakX</application>, μπορείτε "
 "να αλλάξετε τα σημεία προσάρτησης."
 
-#. type: Content of: <section><note><para>
-#: en/ask_mntpoint_s.xml:41
-msgid ""
-"If you change anything, make sure you still have a <emphasis role=\"bold"
-"\"><literal>/</literal></emphasis> (root) partition."
-msgstr ""
-"Αν πραγματοποιήσετε οποιαδήποτε αλλαγή, σιγουρευτείτε ότι έχετε πάντα μια "
-"κατάτμηση <emphasis role=\"bold\"><literal>/</literal></emphasis> (root)."
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:46
-msgid ""
-"Every partition is shown to the left as: <emphasis role=\"bold\">Device "
-"(capacity, mount point, type).</emphasis>"
-msgstr ""
-"Κάθε κατάτμηση εμφανίζεται στα αριστερά ως ακολούθως: <emphasis role=\"bold"
-"\">Συσκευή (χωρητικότητα, σημείο προσάρτησης, τύπος).</emphasis>"
-
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:50
+#: en/ask_mntpoint_s.xml:55
 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 ""
-"<emphasis role=\"bold\">Η Συσκευή</emphasis>, συντελείται από: <emphasis "
-"role=\"bold\">σκληρός δίσκος</emphasis>, [<emphasis role=\"bold\">αριθμός "
-"σκληρού δίσκου</emphasis> (γράμμα)], <emphasis role=\"bold\">αριθμός "
-"κατάτμησης</emphasis> (για παράδειγμα, <emphasis role=\"bold\">sda5</"
-"emphasis>)."
 
 #. 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 ""
 "Αν έχετε πολλαπλές κατατμήσεις, μπορείτε να επιλέξετε διάφορα σημεία "
 "προσάρτησης από το αναπτυσσόμενο μενού, όπως <emphasis role=\"bold\">/</"
@@ -483,7 +514,7 @@ msgstr ""
 "δεδομένα σας."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:63
+#: en/ask_mntpoint_s.xml:73
 msgid ""
 "For any partitions that you don't need to make use of, you can leave the "
 "mount point field blank."
@@ -492,11 +523,22 @@ msgstr ""
 "το πεδίο του σημείου προσάρτησης κενό."
 
 #. 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 ""
+"Αν πραγματοποιήσετε οποιαδήποτε αλλαγή, σιγουρευτείτε ότι έχετε πάντα μια "
+"κατάτμηση <emphasis role=\"bold\"><literal>/</literal></emphasis> (root)."
+
+#. 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 ""
 "Αν δεν είστε σίγουρος-η τι να επιλέξτε, κάντε κλικ στο <emphasis role=\"bold"
 "\">Προηγούμενο</emphasis> για να οπισθοδρομήσετε και στη συνέχεια επιλέξτε "
@@ -504,11 +546,12 @@ msgstr ""
 "κάνετε κλικ σε μια κατάτμηση για να δείτε τον τύπο και το μέγεθός της."
 
 #. 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 ""
 "Αν είστε σίγουρος-η ότι τα σημεία προσάρτησης είναι σωστά, κάντε κλικ στο "
 "<guibutton>Επόμενο</guibutton>, και επιλέξτε αν επιθυμείτε την μορφοποίηση "
@@ -516,181 +559,232 @@ msgstr ""
 "επιλογές."
 
 #. type: Content of: <section><info><title>
-#: en/bestTime.xml:10
-msgid "Clock settings"
+#: en/bestTime.xml:5
+#, fuzzy
+msgid "Clock Settings"
 msgstr "Ρυθμίσεις του ρολογιού"
 
 #. 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 ""
 "Σε αυτό το βήμα θα πρέπει να επιλέξετε σε ποια ώρα είναι συγχρονισμένο το "
 "εσωτερικό σας ρολόι, στην τοπική ώρα ή στην UTC."
 
 #. type: Content of: <section><para>
-#: en/bestTime.xml:23
-msgid "In advanced tab, you will find more options about clock settings."
+#: 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 "Εκκίνηση της Mageia ως σύστημα Live"
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:1
+#: en/bootLive.xml:10
 msgid "Booting the medium"
 msgstr "Εκκίνηση του μέσου"
 
-#. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:1
-msgid "From a disc"
-msgstr "Από τον δίσκο"
-
-#. 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 ""
-"Μπορείτε να εκκινήσετε απευθείας από το μέσο που χρησιμοποιήθηκε για την "
-"εγγραφή της εικόνας (CD-ROM, DVD-ROM...). Συνήθως χρειάζεται απλά να το "
-"εισαγάγετε στον οδηγό CD/DVD και το πρόγραμμα εκκίνησης θα εκτελέσει την "
-"εγκατάσταση αυτόματα μετά την επανεκκίνηση του υπολογιστή. Αν αυτό δεν "
-"συμβεί θα πρέπει να διαμορφώσετε κατάλληλα το BIOS ή να πιέσετε ένα πλήκτρο "
-"που θα σας επιτρέψει να επιλέξετε το περιφερειακό που θα χρησιμοποιήσει ο "
-"υπολογιστής στην εκκίνηση."
+#. 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 ""
-"Αναλόγως το υλικό που διαθέτετε, και την διαμόρφωσή του, θα λάβετε μια εκ "
-"των δυο παρακάτω οθονών."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:7
-msgid "From a USB device"
-msgstr "Από μια συσκευή USB"
+#. 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 ""
-"Μπορείτε να εκκινήσετε από την συσκευή USB στην οποία αποτυπώσατε την εικόνα "
-"ISO. Αναλόγως τις ρυθμίσεις του BIOS, ο υπολογιστής πιθανώς να εκκινήσει "
-"απευθείας από την συσκευή USB συνδεδεμένη σε μια θύρα. Αν αυτό δεν συμβεί "
-"ίσως θα πρέπει να διαμορφώσετε καταλλήλως το BIOS ή να πιέσετε σε ένα "
-"πλήκτρο που θα σας επιτρέψει να επιλέξετε το περιφερειακό από το οποίο θα "
-"εκκινηθεί ο υπολογιστής."
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:12
+#: en/bootLive.xml:35
 msgid "In BIOS/CSM/Legacy mode"
 msgstr "Στο BIOS/CSM/Λειτουργία παλαιού τύπου"
 
+#. 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\">Σταθμός εργασίας</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 ""
+"Η διαμόρφωση που πραγματοποιήσατε εδώ θα διατηρηθεί για την εγκατάσταση."
+
+#. 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\">Παρακαλώ επιλέξτε το επιθυμητό επίπεδο ασφαλείας</"
+"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\">Σταθμός εργασίας</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 ""
+"Εγκατάσταση της Mageia: Απευθείας εγκατάσταση της Mageia στον σκληρό δίσκο."
+
+#. 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=\"dx2-selectKeyboard.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 "Η πρώτη οθόνη εκκινώντας σε λειτουργία BIOS"
 
-#. type: Content of: <section><section><para>
-#: en/bootLive.xml:12
-msgid "In the middle menu, you have the choice between three actions:"
-msgstr "Στο μεσαίο μενού, μπορείτε να επιλέξετε μεταξύ τριών ενεργειών:"
+#. 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 ""
-"Εκκίνηση της Mageia: Η Mageia 5 θα εκκινηθεί από το συνδεδεμένο μέσο (CD/DVD "
-"ή κλειδί USB) χωρίς καμιά εγγραφή στον δίσκο, που συνεπάγεται ότι θα πρέπει "
-"να αναμένετε ένα αργό σύστημα. Μετά το πέρας της εκκίνησης, μπορείτε να "
-"προχωρήσετε στην εγκατάσταση στον σκληρό δίσκο."
+#: en/bootLive.xml:75
+#, fuzzy
+msgid "<keycap>F1</keycap> <emphasis role=\"bold\">Help</emphasis>"
+msgstr "<emphasis role=\"bold\">Εξυπηρετητής</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:16
+#: en/bootLive.xml:76
+#, fuzzy
 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 ""
-"Εγκατάσταση της Mageia: Απευθείας εγκατάσταση της Mageia στον σκληρό δίσκο."
+"Στις επιλογές από <emphasis role=\"bold\">F2</emphasis> ως <emphasis role="
+"\"bold\">F6</emphasis>, μπορείτε να βρείτε την σχετική βοήθεια πιέζοντας "
+"<emphasis role=\"bold\">F1</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:81
+#, fuzzy
+msgid "<keycap>F2</keycap> <emphasis role=\"bold\">Language</emphasis>"
+msgstr "<emphasis role=\"bold\">Προχωρημένες</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:17
+#: 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 ""
-"Εγκατάσταση από τον σκληρό δίσκο: Αυτή η επιλογή επιτρέπει την συνήθης "
-"εκκίνηση από τον σκληρό δίσκο, όταν δεν υπάρχει κάποιο συνδεδεμένο μέσο (CD/"
-"DVD ή ένα κλειδί USB) (δεν δουλεύει στην Mageia 5)."
 
-#. type: Content of: <section><section><para>
-#: en/bootLive.xml:19
-msgid "In the bottom menu, are the Boot Options:"
-msgstr "Στο μενού στην βάση υπάρχουν οι επιλογές εκκίνησης:"
+#. 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\">Προχωρημένες</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 - Βοήθεια. Επεξηγεί τις επιλογές \"splash\", \"apm\", \"acpi\" και \"Ide\""
+"Αν χρειάζεται, αλλάξτε την ανάλυση της οθόνης πιέζοντας το πλήκτρο <emphasis "
+"role=\"bold\">F3</emphasis> (μόνο σε λειτουργία παλαιού τύπου)."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:20
-msgid "F2 - Language. Choose the display language of the screens."
-msgstr "F2 - Γλώσσα. Επιλέξτε την γλώσσα εμφάνισης της οθόνης."
+#: en/bootLive.xml:93
+#, fuzzy
+msgid "<keycap>F4</keycap> <emphasis role=\"bold\">Source</emphasis>"
+msgstr "<emphasis role=\"bold\">Εξυπηρετητής</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 - Ανάλυση της οθόνης. Επιλέξτε μεταξύ κειμένου, 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 ή Άλλο. Κανονικά, η εγκατάσταση πραγματοποιείται από το "
 "εισηγμένο μέσο εγκατάστασης. Εδώ μπορείτε να επιλέξετε άλλες πηγές όπως "
@@ -699,121 +793,180 @@ msgstr ""
 "διαθέσιμες πηγές στον διακομιστή."
 
 #. 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\">Εξυπηρετητής</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 - Οδηγός. Ναι ή Όχι. Το σύστημα λαμβάνει υπόψιν την ύπαρξη ενός "
-"προαιρετικού δίσκου με μια ενημέρωση ενός οδηγού και θα αιτήσει την εισαγωγή "
-"του κατά την διαδικασία της εγκατάστασης."
 
 #. 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\">Σταθμός εργασίας</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:106
+#, fuzzy
 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 ""
+"Αν αντιμετωπίζετε προβλήματα με την εγκατάσταση, μπορείτε να δοκιμάσετε να "
+"αλλάξετε τις ρυθμίσεις εξ ορισμού χρησιμοποιώντας τις <emphasis role=\"bold"
+"\">F6</emphasis> <emphasis role=\"bold\">Επιλογές πυρήνα</emphasis> (σε UEFI "
+"σύστημα πιέστε <emphasis role=\"bold\">e</emphasis>)."
+
+#. 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\">Στοίχιση σε</emphasis> = MiB"
+
+#. 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 ""
+"Χωρίς ACPI : (Advanced Configuration and Power Interface - εξελιγμένη "
+"διεπαφή ρύθμισης και διαχείρισης ενέργειας): τα χαρακτηριστικά της "
+"διαχείρισης ενέργειας δεν θα χρησιμοποιηθούν."
+
+#. 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 ""
+"Χωρίς τοπικό APIC: (Local Advanced Programmable Interrupt Controller - "
+"προηγμένος προγραμματιζόμενος ελεγκτής διακοπών συστήματος): Διακοπές της "
+"CPU. Επιλέξτε αυτήν την επιλογή αν αντιμετωπίζετε κάποια δυσλειτουργία του "
+"συστήματος όπως έναν πανικό πυρήνα σε σχέση με το APIC."
+
+#. 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 - Επιλογές του πυρήνα. Από εδώ μπορείτε να καθορίσετε τις επιλογές "
-"ανάλογα με το υλικό σας και τους οδηγούς προς χρήση."
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:29
+#: en/bootLive.xml:139
 msgid "In UEFI mode"
 msgstr "Σε λειτουργία UEFI"
 
 #. 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 "Η πρώτη οθόνη εκκινώντας από τον δίσκο σε σύστημα UEFI"
+#: en/bootLive.xml:146
+#, fuzzy
+msgid "First screen while booting in UEFI mode"
+msgstr "Η πρώτη οθόνη εκκινώντας σε λειτουργία BIOS"
 
 #. 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 ""
-"Διαθέτετε μόνο την επιλογή να εκτελέσετε την Mageia σε λειτουργία Live "
-"(πρώτη επιλογή) ή την διαδικασία της εγκατάστασης (δεύτερη επιλογή)."
 
-#. 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 ""
-"Αν η εκκίνηση έγινε από ένα κλειδί USB, θα λάβετε δυο επιπλέον γραμμές οι "
-"οποίες είναι διπλότυπες των προηγούμενων γραμμών με την κατάληξη «USB». Θα "
-"πρέπει να τις επιλέξετε."
+"Εκκίνηση της Mageia: Η Mageia 5 θα εκκινηθεί από το συνδεδεμένο μέσο (CD/DVD "
+"ή κλειδί USB) χωρίς καμιά εγγραφή στον δίσκο, που συνεπάγεται ότι θα πρέπει "
+"να αναμένετε ένα αργό σύστημα. Μετά το πέρας της εκκίνησης, μπορείτε να "
+"προχωρήσετε στην εγκατάσταση στον σκληρό δίσκο."
 
-#. 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 ""
-"Σε κάθε περίπτωση, τα πρώτα βήματα θα είναι τα ίδια με την επιλογή της "
-"γλώσσας, της ωρολογιακής ζώνης και του πληκτρολογίου. Στην συνέχεια η "
-"διαδικασία διαφέρει με <link linkend=\"testing\">επιπλέον βήματα της "
-"λειτουργίας Live</link>."
 
 #. type: Content of: <section><info><title>
-#: en/chooseDesktop.xml:3
+#: en/chooseDesktop.xml:16
 msgid "Desktop Selection"
 msgstr "Επιλογή περιβάλλοντος εργασίας"
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:8
-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 ""
-"Ανάλογα με τις επιλογές σας σε αυτήν την οθόνη, πιθανώς να ερωτηθείτε στη "
-"συνέχεια για επιπλέον επιλογές."
 
 #. 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 ""
 "Μετά τα βήματα επιλογής, θα δείτε ένα διαπόραμα κατά τη διάρκεια της "
 "εγκατάστασης των πακέτων. Η προβολή σλάιντ μπορεί να απενεργοποιηθεί "
 "πατώντας στο κουμπί <guilabel>Λεπτομέρειες</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 format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
 "align=\"center\"/> </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 ""
 "Επιλέξτε αν προτιμάτε να χρησιμοποιήσετε το περιβάλλον εργασίας "
 "<application>KDE</application> <emphasis role=\"bold\">Plasma</emphasis> ή "
@@ -832,8 +985,9 @@ msgid "Package Group Selection"
 msgstr "Επιλογή ομάδας πακέτων"
 
 #. 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
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
 "\" align=\"center\"/> </imageobject>"
@@ -842,7 +996,7 @@ msgstr ""
 "\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:14
+#: en/choosePackageGroups.xml:16
 msgid ""
 "Packages are arranged into common groups, to make choosing what you need on "
 "your system a lot easier. The groups are fairly self explanatory, however "
@@ -856,22 +1010,22 @@ msgstr ""
 "πέρασμα του ποντικιού από πάνω τους."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:21
+#: en/choosePackageGroups.xml:23
 msgid "<emphasis role=\"bold\">Workstation</emphasis>"
 msgstr "<emphasis role=\"bold\">Σταθμός εργασίας</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:25
+#: en/choosePackageGroups.xml:27
 msgid "<emphasis role=\"bold\">Server</emphasis>"
 msgstr "<emphasis role=\"bold\">Εξυπηρετητής</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:29
+#: en/choosePackageGroups.xml:31
 msgid "<emphasis role=\"bold\">Graphical Environment</emphasis>"
 msgstr "<emphasis role=\"bold\">Γραφικό περιβάλλον</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:33
+#: en/choosePackageGroups.xml:35
 msgid ""
 "<emphasis role=\"bold\">Individual Package Selection</emphasis>: you can use "
 "this option to manually add or remove packages"
@@ -881,7 +1035,7 @@ msgstr ""
 "χειροκίνητα."
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:38
+#: en/choosePackageGroups.xml:40
 msgid ""
 "See <xref linkend=\"minimal-install\"/> for instructions on how to do a "
 "minimal install (without or with X &amp; IceWM)."
@@ -895,8 +1049,10 @@ msgid "Choose Individual Packages"
 msgstr "Επιλογή μεμονωμένων πακέτων"
 
 #. 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
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackagesTree.png"
 "\" align=\"center\"/> </imageobject>"
@@ -905,7 +1061,7 @@ msgstr ""
 "\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:14
+#: en/choosePackagesTree.xml:18
 msgid ""
 "Here you can add or remove any extra packages to customize your installation."
 msgstr ""
@@ -913,13 +1069,14 @@ msgstr ""
 "την εγκατάστασή σας."
 
 #. 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 ""
 "Αφού πραγματοποιήσετε την επιλογή σας, μπορείτε να κάνετε κλικ στο "
 "<guibutton>εικονίδιο της δισκέτας</guibutton> στο κάτω μέρος της σελίδας "
@@ -936,8 +1093,10 @@ msgstr "Διαμορφώστε τις υπηρεσίες σας"
 
 #.  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
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-configureServices.png"
 "\" xml:id=\"configureServices-im1\" align=\"center\" revision=\"1\"/> </"
@@ -948,26 +1107,24 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:16
+#: en/configureServices.xml:20
 msgid ""
 "Here you can choose which services should start when you boot your system."
 msgstr ""
 "Εδώ μπορείτε να ορίσετε εκκίνηση των υπηρεσιών με την έναρξη του συστήματος."
 
-#. 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
+#, fuzzy
+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
-msgid "The settings DrakX chose are usually good."
-msgstr "Οι ρυθμίσεις που επιλέγει το DrakX είναι συνήθως οι βέλτιστες."
-
-#. 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."
@@ -976,7 +1133,7 @@ msgstr ""
 "σχετικές πληροφορίες."
 
 #. 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 "Αλλάξτε κάτι μόνο αν γνωρίζετε πολύ καλά τι κάνετε."
 
@@ -987,14 +1144,17 @@ msgstr "Διαμόρφωση της ζώνης ώρας"
 
 #.  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 format=\"PNG\" xml:id="
 "\"configureTimezoneUTC-im1\" align=\"center\" fileref=\"dx2-"
@@ -1002,17 +1162,18 @@ msgstr ""
 "<imagedata format=\"PNG\" fileref=\"live-timeZone.png\" condition=\"live\"/> "
 "</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 ""
 "Επιλέξτε την ωρολογιακή σας ζώνη επιλέγοντας την χώρα ή μια πόλη κοντά σας "
 "στην ίδια ζώνη ώρας."
 
 #. type: Content of: <section><para>
-#: en/configureTimezoneUTC.xml:24
+#: en/configureTimezoneUTC.xml:32
 msgid ""
 "In the next screen you can choose to set your hardware clock to local time "
 "or to GMT, also known as UTC."
@@ -1021,7 +1182,7 @@ msgstr ""
 "του ρολογιού της μητρικής κάρτας ή GMT (Γκρίνουϊτς), γνωστή και ως 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."
@@ -1031,23 +1192,23 @@ msgstr ""
 "σύνολό τους."
 
 #. 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 "Επιλέξτε έναν εξυπηρετητή X (Διαμόρφωση της κάρτας γραφικών)"
 
 #. 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=\"configureX_card_list-im1\" "
-"align=\"center\" fileref=\"dx2-configureX_card_list.png\" 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/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."
@@ -1056,7 +1217,7 @@ msgstr ""
 "συνήθως θα αναγνωρίσει σωστά την κάρτα σας."
 
 #. 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:"
@@ -1064,30 +1225,34 @@ msgstr ""
 "Αν το πρόγραμμα εγκατάστασης δεν εντόπισε σωστά την κάρτα γραφικών σας και "
 "γνωρίζετε τον τύπο της, μπορείτε να την επιλέξετε από τη λίστα δέντρου ανά:"
 
-#. 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 "κατασκευαστή"
 
 #. 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 "έπειτα το όνομα του μοντέλου της κάρτας"
 
 #. 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 "και τον τύπο της κάρτας"
 
 #. 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 ""
 "Αν δεν μπορείτε να βρείτε την κάρτα σας στο κατάστιχο των κατασκευαστών "
 "(διότι δεν βρίσκεται ακόμα στην βάση δεδομένων ή πρόκειται για παλιά κάρτα) "
@@ -1097,66 +1262,63 @@ msgstr ""
 "συγκεκριμένο οδηγό για την κάρτα σας μπορείτε να χρησιμοποιήσετε τον οδηγό "
 "<emphasis role=\"bold\">vesa</emphasis> ο οποίος προσφέρει βασική υποστήριξη."
 
-#. 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 ""
 "Προσέξτε διότι αν επιλέξετε έναν ακατάλληλο οδηγό θα έχετε πρόσβαση μόνο στη "
 "<emphasis role=\"bold\">γραμμή εντολών</emphasis>."
 
 #. 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 ""
 "Μερικοί κατασκευαστές καρτών γραφικών παρέχουν ιδιόκτητους οδηγούς για Linux "
 "οι οποίοι μπορεί να διατεθούν μόνο από τα αποθετήρια <emphasis role=\"bold"
 "\">Nonfree</emphasis> και σε ορισμένες περιπτώσεις μόνο από την ιστοσελίδα "
 "του κατασκευαστή της κάρτας"
 
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:56
-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 ""
-"Το αποθετήριο <emphasis role=\"bold\">Nonfree</emphasis> θα πρέπει να "
-"ενεργοποιηθεί ρητώς ούτως ώστε να αποκτήσετε πρόσβαση. Αν δεν το κάνατε "
-"προηγουμένως, θα πρέπει να το κάνετε μετά την πρώτη σας επανεκκίνηση."
-
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:3
+#: en/configureX_chooser.xml:11
 msgid "Graphic Card and Monitor Configuration"
 msgstr "Διαμόρφωση του X, της κάρτας γραφικών και της οθόνης"
 
 #.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
+#. 2018/02/15 apb: Some text and typography.
+#. 2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.
+#. 2018/02/23 apb: Typo.
 #. 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=\"configureX_chooser-im1\" "
-"fileref=\"dx2-configureX_chooser.png\" align=\"center\" 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/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 ""
 "Ανεξαρτήτου της επιλογής του γραφικού περιβάλλοντος για την εγκατάσταση της "
 "<application>Mageia</application>, όλα τα περιβάλλοντα βασίζονται σε ένα "
@@ -1169,22 +1331,33 @@ msgstr ""
 "λανθασμένες."
 
 #. 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\">Γραφικό περιβάλλον</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>Κάρτα γραφικών</guibutton></emphasis>: Επιλέξτε την "
-"κάρτα σας από τη λίστα αν είναι απαραίτητο."
 
 #. 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\">Εξυπηρετητής</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>Οθόνη</guibutton></emphasis>: Μπορείτε να επιλέξετε "
 "<guilabel>Άμεσης τοποθέτησης και λειτουργίας</guilabel> αν είναι εφικτό, ή "
@@ -1193,30 +1366,37 @@ msgstr ""
 "guilabel> αν επιθυμείτε να ορίσετε τις οριζόντιες και κάθετες συχνότητες "
 "ανανέωσης της οθόνης σας χειροκίνητα."
 
-#. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/configureX_chooser.xml:41
-msgid "Incorrect refresh rates may damage your monitor"
-msgstr "Μια εσφαλμένη συχνότητα ανανέωσης μπορεί να καταστρέψει την οθόνη σας"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_chooser.xml:60
+#, fuzzy
+msgid "<emphasis role=\"bold\">Resolution</emphasis>"
+msgstr "<emphasis role=\"bold\">Σταθμός εργασίας</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:47
-msgid ""
-"<emphasis><guibutton>Resolution</guibutton></emphasis>: The resolution and "
-"color depth of your monitor can be set here."
+#: en/configureX_chooser.xml:63
+#, fuzzy
+msgid "The resolution and color depth of your monitor can be set here"
 msgstr ""
 "<emphasis><guibutton>Ανάλυση</guibutton></emphasis>: Εδώ μπορείτε να ορίσετε "
 "την ανάλυση και το βάθος χρώματος της οθόνης σας."
 
 #. 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\">Εξυπηρετητής</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>Δοκιμή</guibutton></emphasis>: Το κουμπί δοκιμής δεν "
 "εμφανίζεται πάντα κατά την εγκατάσταση. Αν υπάρχει αυτή η επιλογή, και "
@@ -1228,21 +1408,35 @@ msgstr ""
 "τις σωστές ρυθμίσεις."
 
 #. 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\">Σταθμός εργασίας</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>Επιλογές</guibutton></emphasis>: Εδώ μπορείτε να "
 "επιλέξετε την ενεργοποίηση ή απενεργοποίηση ορισμένων παραμέτρων."
 
+#. 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 "Επιλογή της οθόνης"
 
 #. 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."
@@ -1251,7 +1445,7 @@ msgstr ""
 "συνήθως θα αναγνωρίσει σωστά και τη δική σας."
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:19
+#: en/configureX_monitor.xml:30
 msgid ""
 "<emphasis role=\"bold\">Selecting a monitor with different characteristics "
 "could damage your monitor or video hardware. Please don't try something "
@@ -1265,25 +1459,26 @@ msgstr ""
 "οθόνης σας"
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:26
+#: en/configureX_monitor.xml:38
+#, fuzzy
 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=\"configureX_monitor-im1\" "
-"fileref=\"dx2-configureX_monitor.png\" align=\"center\" 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/configureX_monitor.xml:31
-msgid "<emphasis>Custom</emphasis>"
-msgstr "<emphasis>Προσαρμοσμένο</emphasis>"
+#. type: Content of: <section><variablelist><varlistentry><term>
+#: en/configureX_monitor.xml:46
+msgid "Custom"
+msgstr ""
 
-#. 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."
@@ -1294,8 +1489,8 @@ msgstr ""
 "ανανεώνεται η οθόνη και ο οριζόντιος συγχρονισμός είναι η συχνότητα στην "
 "οποία εμφανίζονται οι γραμμές σάρωσης."
 
-#. 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 "
@@ -1307,27 +1502,23 @@ msgstr ""
 "την οθόνη σας.  Αν έχετε αμφιβολία, επιλέξτε μια συντηρητική ρύθμιση και "
 "συμβουλευτείτε την τεκμηρίωση της οθόνης σας."
 
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:44
-msgid "<emphasis>Plug 'n Play</emphasis>"
-msgstr "<emphasis>Άμεσης τοποθέτησης και λειτουργίας</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 ""
 "Αυτή είναι και η εξ' ορισμού επιλογή και γίνεται προσπάθεια εντοπισμού του "
 "τύπου της οθόνης από τη βάση δεδομένων με τις συσκευές οθονών."
 
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:51
-msgid "<emphasis>Vendor</emphasis>"
-msgstr "<emphasis>Κατασκευαστής</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:"
@@ -1335,30 +1526,30 @@ msgstr ""
 "αν το πρόγραμμα εγκατάστασης δεν εντόπισε σωστά την οθόνη σας και γνωρίζεται "
 "τον τύπο της, μπορείτε να την επιλέξετε από τη λίστα δέντρου επιλέγοντας ανά:"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:61
-msgid "the monitor manufacturers name"
-msgstr "το όνομα του μοντέλου της οθόνης"
+#. 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 "την περιγραφή της οθόνης"
+#. 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>Γενικού τύπου</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 ""
 "Επιλέγοντας αυτήν την ομάδα θα εμφανιστούν γύρω στις 30 διαμορφώσεις οθονών "
 "όπως 1024x768 @ 60Hz συμπεριλαμβάνονται και οι οθόνες Flat των φορητών "
@@ -1368,78 +1559,57 @@ msgstr ""
 "αυτόματα.  Ακόμα μια φορά θα πρέπει να είστε συντηρητικοί στις επιλογές σας."
 
 #. 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 "Προσαρμοσμένη κατάτμηση δίσκων με το 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"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.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
-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 ""
-"Αν επιθυμείτε να χρησιμοποιήσετε κρυπτογράφηση στην κατάτμηση <emphasis role="
-"\"bold\">/</emphasis> σιγουρευτείτε ότι έχετε μια ξεχωριστή κατάτμηση "
-"<emphasis role=\"bold\">/boot</emphasis>. Η επιλογή κρυπτογράφησης για την "
-"κατάτμηση <emphasis role=\"bold\">/boot</emphasis> ΔΕΝ θα πρέπει να οριστεί, "
-"διαφορετικά δεν θα είναι δυνατή η εκκίνηση του υπολογιστή σας."
+"<imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/> </imageobject>"
 
-#. 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 ""
 "Εδώ μπορείτε να τροποποιήσετε τη διάταξη των δίσκων σας. Μπορείτε να "
 "αφαιρέσετε ή να δημιουργήσετε κατατμήσεις, να αλλάξετε το σύστημα αρχείων "
 "μιας κατάτμησης ή να αλλάξετε το μέγεθός της και επιπροσθέτως να δείτε τις "
 "λεπτομέρειές τους πριν να ξεκινήσετε."
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:34
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/diskdrake.xml:45
+#, fuzzy
 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>."
+"device, like a USB key). In the screenshot above there are two available "
+"devices: <filename>sda </filename>and <filename>sdb</filename>."
 msgstr ""
 "Υπάρχει μια καρτέλα στην κορυφή κάθε εντοπισμένου σκληρού δίσκου (ή άλλη "
 "συσκευή αποθήκευσης όπως ένα κλειδί USB). Στο ανωτέρω στιγμιότυπο υπάρχουν "
 "δυο συσκευές διαθέσιμες: <emphasis role=\"bold\">sda </emphasis>και "
 "<emphasis role=\"bold\">sdb</emphasis>."
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:39
-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."
-msgstr ""
-"Προσέξτε με την επιλογή του <guibutton>Καθαρισμός όλων</guibutton>, "
-"χρησιμοποιήστε την μόνο αν είστε σίγουρος-η ότι θέλετε να καθαρίσετε όλες "
-"τις κατατμήσεις στην επιλεγμένη συσκευή αποθήκευσης."
-
-#. 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 ""
 "Για τις υπόλοιπες ενέργειες: κάντε κλικ στην επιθυμητή κατάτμηση πρώτα. Στη "
 "συνέχεια μπορείτε να την προβάλετε ή επιλέξετε το σύστημα αρχείων, ένα "
@@ -1448,53 +1618,92 @@ msgstr ""
 "όπως την επιλογή ετικέτας με το όνομα της κατάτμησης, ή την επιλογή του "
 "τύπου της κατάτμησης."
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:49
-msgid "Continue until you have adjusted everything to your satisfaction."
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/diskdrake.xml:60
+#, fuzzy
+msgid ""
+"Continue until you have adjusted everything to your satisfaction, then click "
+"<emphasis>Done</emphasis> when you're ready."
 msgstr "Συνεχίστε την επεξεργασία μέχρι να ικανοποιήσετε τις ανάγκες σας."
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:52
-msgid "Click <guibutton>Done</guibutton> when you're ready."
-msgstr "Κάντε κλικ στο <guibutton>Έγινε</guibutton> όταν είστε έτοιμος-η."
+#. 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 ""
+"Προσέξτε με την επιλογή του <guibutton>Καθαρισμός όλων</guibutton>, "
+"χρησιμοποιήστε την μόνο αν είστε σίγουρος-η ότι θέλετε να καθαρίσετε όλες "
+"τις κατατμήσεις στην επιλεγμένη συσκευή αποθήκευσης."
 
-#. 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 ""
+"Αν επιθυμείτε να χρησιμοποιήσετε κρυπτογράφηση στην κατάτμηση <emphasis role="
+"\"bold\">/</emphasis> σιγουρευτείτε ότι έχετε μια ξεχωριστή κατάτμηση "
+"<emphasis role=\"bold\">/boot</emphasis>. Η επιλογή κρυπτογράφησης για την "
+"κατάτμηση <emphasis role=\"bold\">/boot</emphasis> ΔΕΝ θα πρέπει να οριστεί, "
+"διαφορετικά δεν θα είναι δυνατή η εκκίνηση του υπολογιστή σας."
+
+#. 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 ""
 "Αν κάνετε εγκατάσταση της Mageia σε ένα σύστημα UEFI, ελέγξτε ότι μια "
 "κατάτμηση ESP (EFI System Partition) είναι παρούσα και προσαρτημένη σωστά "
 "στο /boot.EFI (δείτε κατωτέρω)"
 
-#. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:61
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/diskdrake.xml:93
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
-"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"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 ""
+"Αν κάνετε εγκατάσταση της Mageia σε ένα παλιό/GPT σύστημα, ελέγξτε ότι μια "
+"κατάτμηση εκκίνησης BIOS είναι παρούσα και ενός σωστού τύπου"
+
+#. type: Content of: <section><figure><title>
+#: en/diskdrake.xml:101
+#, fuzzy
+msgid "EFI System Partition"
+msgstr "Χρήση των υπαρχουσών κατατμήσεων"
+
+#. type: Content of: <section><figure><mediaobject>
+#: en/diskdrake.xml:104
+#, fuzzy
+msgid ""
+"<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-diskdrake2.png"
 "\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/> </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
-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 ""
-"Αν κάνετε εγκατάσταση της Mageia σε ένα παλιό/GPT σύστημα, ελέγξτε ότι μια "
-"κατάτμηση εκκίνησης BIOS είναι παρούσα και ενός σωστού τύπου"
 
-#. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:76
+#. type: Content of: <section><mediaobject>
+#: en/diskdrake.xml:118 en/doPartitionDisks.xml:200
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1507,50 +1716,61 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:9
-msgid "Partitioning"
+#: en/doPartitionDisks.xml:25
+#, fuzzy
+msgid "Suggested Partitioning"
 msgstr "Διαμερισμός"
 
 #. 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 ""
 "Σε αυτήν την οθόνη μπορείτε να δείτε το περιεχόμενο των σκληρών σας δίσκων "
 "και να δείτε τις προτάσεις που βρήκε ο οδηγός διαμερισμού DrakX για το που "
 "θα γίνει η εγκατάσταση της <application>Mageia</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 ""
 "Οι διαθέσιμες επιλογές από την παρακάτω λίστα ποικίλουν ανάλογα με τη "
 "διάταξη και το περιεχόμενο των σκληρών σας δίσκων."
 
 #. 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-"
-"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
-"\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:32
-msgid "Use Existing Partitions"
-msgstr "Χρήση των υπαρχουσών κατατμήσεων"
+#. type: Content of: <section><itemizedlist><title>
+#: en/doPartitionDisks.xml:47
+#, fuzzy
+msgid "Main Options"
+msgstr "Επιλογές"
 
-#. 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\">Διαμόρφωση του μεγέθους των κατατμήσεων:</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."
@@ -1558,13 +1778,14 @@ msgstr ""
 "Αν αυτή η επιλογή είναι διαθέσιμη, σημαίνει ότι έχουν βρεθεί κατατμήσεις "
 "συμβατές με το Linux και μπορούν να χρησιμοποιηθούν για την εγκατάσταση."
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:41
-msgid "Use Free Space"
-msgstr "Χρήση του ελεύθερου χώρου"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:59
+#, fuzzy
+msgid "<emphasis role=\"bold\">Use Free Space</emphasis>"
+msgstr "<emphasis role=\"bold\">Εξυπηρετητής</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."
@@ -1572,57 +1793,34 @@ msgstr ""
 "Αν έχετε μη χρησιμοποιούμενο χώρο στο σκληρό σας δίσκο τότε αυτή η επιλογή "
 "θα τον χρησιμοποιήσει για τη νέα σας εγκατάσταση της Mageia."
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:49
-msgid "Use Free Space on a Windows Partition"
-msgstr "Χρήση του ελεύθερου χώρου σε μια κατάτμηση των Windows"
-
-#. 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 ""
-"Αν διαθέτετε μη χρησιμοποιούμενο χώρο σε μια υπάρχουσα κατάτμηση Windows, ο "
-"οδηγός εγκατάστασης μπορεί να σας επιτρέψει να τον χρησιμοποιήσετε."
+"<emphasis role=\"bold\">Use Free Space on a Windows Partition</emphasis>"
+msgstr "<emphasis role=\"bold\">Σταθμός εργασίας</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 ""
 "Αυτό μπορεί να φανεί χρήσιμο για την δημιουργία του κατάλληλου χώρου για την "
 "εγκατάσταση της Mageia."
 
-#. 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 ""
-"Σημειώστε ότι αυτό θα προκαλέσει την συρρίκνωση του μεγέθους της κατάτμησης "
-"των Windows, κάτι το οποίο μπορεί να διατρέχει κάποιον κίνδυνο. Η κατάτμηση "
-"θα πρέπει να είναι «καθαρή» δηλαδή τα Windows πρέπει να έχουν κλείσει σωστά "
-"την τελευταία φορά που χρησιμοποιήθηκαν.  Επίσης θα πρέπει να έχετε κάνει "
-"αποκερμάτωση, ωστόσο δεν αποτελεί εγγύηση ότι όλα τα αρχεία στην κατάτμηση "
-"έχουν μετακινηθεί εκτός της περιοχής που θα χρησιμοποιηθεί. Σε κάθε "
-"περίπτωση θα πρέπει να έχετε πάρει αντίγραφα ασφαλείας των σημαντικών σας "
-"αρχείων. Θα πρέπει να το ελέγξετε προσεκτικά πριν συνεχίσετε."
-
-#. 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 ""
 "Με αυτήν την επιλογή, ο εγκαταστάτης εμφανίζει την υπολειπόμενη κατάτμηση "
 "των Windows με ανοιχτό κυανό και της προτεινόμενης κατάτμησης Mageia σε βαθύ "
@@ -1630,54 +1828,58 @@ msgstr ""
 "δυνατότητα να προσαρμόσετε αυτά τα μεγέθη κάνοντας κλικ και σύρσιμο του "
 "διαστήματος μεταξύ των δυο κατατμήσεων. Δείτε στο παρακάτω στιγμιότυπο."
 
-#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:76
-msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/> </imageobject>"
-msgstr ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/> </imageobject>"
-
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:87
-msgid "Erase and use Entire Disk."
-msgstr "Διαγραφή και χρήση ολόκληρου του δίσκου."
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:85
+#, fuzzy
+msgid "<emphasis role=\"bold\">Erase and use Entire Disk</emphasis>"
+msgstr "<emphasis role=\"bold\">Γραφικό περιβάλλον</emphasis>"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:90
-msgid "This option will allocate the entire drive for Mageia."
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:88
+#, fuzzy
+msgid "This option will allocate the entire drive for Mageia"
 msgstr "Αυτή η επιλογή θα χρησιμοποιήσει ολόκληρο τον δίσκο για τη Mageia."
 
-#. 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 ""
-"Προσοχή! Αυτή η ενέργεια θα διαγράψει ΟΛΑ τα δεδομένα στον επιλεγμένο σκληρό "
-"δίσκο. Να είστε προσεκτικός-ή!"
-
-#. 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 ""
 "Αν σκοπεύετε να χρησιμοποιήσετε ένα τμήμα του δίσκου για άλλον σκοπό, ή αν "
 "διαθέτετε ήδη κάποια δεδομένα στον δίσκο τα οποία δεν θα θέλατε να χάσετε, "
 "τότε μην χρησιμοποιήσετε αυτήν την επιλογή."
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:103
-msgid "Custom disk partitioning"
-msgstr "Προσαρμοσμένη κατάτμηση δίσκων"
+#. 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 ""
+"Σημειώστε ότι αυτό θα προκαλέσει την συρρίκνωση του μεγέθους της κατάτμησης "
+"των Windows, κάτι το οποίο μπορεί να διατρέχει κάποιον κίνδυνο. Η κατάτμηση "
+"θα πρέπει να είναι «καθαρή» δηλαδή τα Windows πρέπει να έχουν κλείσει σωστά "
+"την τελευταία φορά που χρησιμοποιήθηκαν.  Επίσης θα πρέπει να έχετε κάνει "
+"αποκερμάτωση, ωστόσο δεν αποτελεί εγγύηση ότι όλα τα αρχεία στην κατάτμηση "
+"έχουν μετακινηθεί εκτός της περιοχής που θα χρησιμοποιηθεί. Σε κάθε "
+"περίπτωση θα πρέπει να έχετε πάρει αντίγραφα ασφαλείας των σημαντικών σας "
+"αρχείων. Θα πρέπει να το ελέγξετε προσεκτικά πριν συνεχίσετε."
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:106
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:110
+#, fuzzy
+msgid "<emphasis role=\"bold\">Custom Disk Partitioning</emphasis>"
+msgstr ""
+"<emphasis role=\"bold\">Διαμόρφωση του μεγέθους των κατατμήσεων:</emphasis>"
+
+#. 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)."
@@ -1685,36 +1887,45 @@ msgstr ""
 "Αυτό σας δίνει πλήρη έλεγχο στον διαμερισμό της εγκατάστασης στους σκληρούς "
 "σας δίσκους."
 
-#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:112
-msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
+#. type: Content of: <section><mediaobject>
+#: en/doPartitionDisks.xml:120
+#, fuzzy
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
 msgstr ""
-"<emphasis role=\"bold\">Διαμόρφωση του μεγέθους των κατατμήσεων:</emphasis>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:114
+#: en/doPartitionDisks.xml:129
+#, fuzzy
 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 ""
 "Αν δεν χρησιμοποιήσετε την επιλογή <emphasis role=\"bold\">Προσαρμοσμένη "
 "κατάτμηση του δίσκου</emphasis>, το πρόγραμμα εγκατάστασης θα διαμοιράσει "
 "τον ελεύθερο κοινόχρηστο χώρο βάσει των ακόλουθων κανόνων:"
 
-#. 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 ""
 "Αν ο συνολικός διαθέσιμος χώρος είναι μικρότερος από 50GB, τότε θα "
 "δημιουργηθεί μόνο η ριζική κατάτμηση <emphasis role=\"bold\">/</emphasis> "
 "(root)."
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:125
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:141
 msgid ""
 "If the total available space is greater than 50 GB, then three partitions "
 "are created"
@@ -1722,52 +1933,65 @@ msgstr ""
 "Αν ο συνολικά διαθέσιμος χώρος είναι μεγαλύτερος από 50 GB, τότε "
 "δημιουργούνται τρεις κατατμήσεις"
 
-#. 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 του συνολικού διαθέσιμου χώρου εκχωρούνται στην κατάτμηση <emphasis "
 "role=\"bold\">/</emphasis> με μέγιστο χώρο 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 του συνολικού διαθέσιμου χώρου εκχωρούνται στην κατάτμηση «swap» με "
 "μέγιστο χώρο 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 ""
 "o υπολειπόμενος χώρος (τουλάχιστον 12/19) εκχωρείται στον προσωπικό κατάλογο "
 "<emphasis role=\"bold\">/home</emphasis>."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:144
+#: 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 ""
-"Αυτό σημαίνει πως από τα 160 GB ελεύθερου χώρου και άνω, το πρόγραμμα "
-"εγκατάστασης δημιουργεί τρεις κατατμήσεις: 50 GB για το <emphasis role=\"bold"
-"\">/</emphasis>, 4 GB για το <emphasis role=\"bold\">swap</emphasis> και τον "
-"υπόλοιπο χώρο για το <emphasis role=\"bold\">/home</emphasis>."
 
 #. 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 ""
 "Αν χρησιμοποιείτε ένα σύστημα UEFI, το ESP (EFI System Partition) θα "
 "εντοπιστεί αυτομάτως, η αν δεν υπάρχει θα δημιουργηθεί, και θα προσαρτηθεί "
@@ -1775,13 +1999,15 @@ msgstr ""
 "δίσκου</emphasis> είναι η μοναδική που επιτρέπει τον έλεγχο επικύρωσης."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:158
+#: en/doPartitionDisks.xml:188
+#, fuzzy
 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 ""
 "Αν χρησιμοποιείτε ένα παλιό σύστημα (γνωστό και ως CSM ή BIOS) με δίσκο GPT, "
 "χρειάζεται να δημιουργήσετε μια κατάτμηση εκκίνησης BIOS αν δεν υφίσταται. "
@@ -1790,36 +2016,29 @@ msgstr ""
 "δημιουργήσετε με τον εγκαταστάτη όπως κάθε άλλη κατάτμηση· απλά επιλέξτε την "
 "κατάτμηση εκκίνησης BIOS ως τύπο συστήματος αρχείων."
 
-#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:165
-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 align=\"center\" fileref="
-"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </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-doPartitionDisks4.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 ""
 "Μερικοί νέοι οδηγοί σκληρών δίσκων χρησιμοποιούν τώρα 4096 byte λογικούς "
 "τομείς, αντί 512 του προηγούμενου πρότυπου. Εξαιτίας της έλλειψης διαθέσιμου "
@@ -1830,19 +2049,39 @@ msgstr ""
 "με τη βοήθεια ενός άλλου εργαλείου κατατμήσεων όπως το <emphasis role=\"bold"
 "\">gparted</emphasis>, και να χρησιμοποιήσετε την παρακάτω διαμόρφωση:"
 
-#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:189
-msgid "<emphasis role=\"bold\">Align to</emphasis> = MiB"
+#. type: Content of: <section><important><para>
+#: en/doPartitionDisks.xml:221
+#, fuzzy
+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 ""
+"Μερικοί νέοι οδηγοί σκληρών δίσκων χρησιμοποιούν τώρα 4096 byte λογικούς "
+"τομείς, αντί 512 του προηγούμενου πρότυπου. Εξαιτίας της έλλειψης διαθέσιμου "
+"υλικού, το εργαλείο κατατμήσεων που χρησιμοποιήθηκε στον εγκαταστάτη δεν "
+"δοκιμάστηκε σε τέτοιους οδηγούς. Επίσης μερικοί οδηγοί SSD χρησιμοποιούν "
+"τώρα τμήματα διαγραφής μεγαλύτερα του 1 MB. Αν έχετε μια τέτοια συσκευή σας "
+"συνιστούμε να πραγματοποιήσετε την κατάτμηση στον οδηγό σας εκ των προτέρων "
+"με τη βοήθεια ενός άλλου εργαλείου κατατμήσεων όπως το <emphasis role=\"bold"
+"\">gparted</emphasis>, και να χρησιμοποιήσετε την παρακάτω διαμόρφωση:"
+
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:228
+#, fuzzy
+msgid "<emphasis>Align to</emphasis> = MiB"
 msgstr "<emphasis role=\"bold\">Στοίχιση σε</emphasis> = MiB"
 
-#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:191
-msgid "<emphasis role=\"bold\">Free space preceding (MiB)</emphasis> = 2"
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:232
+#, fuzzy
+msgid "<emphasis>Free space preceding (MiB)</emphasis> = 2"
 msgstr ""
 "<emphasis role=\"bold\">Ελεύθερος χώρος που προηγείται (MiB)</emphasis> = 2"
 
-#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:194
+#. type: Content of: <section><important><para>
+#: en/doPartitionDisks.xml:236
 msgid ""
 "Also make sure all partitions are created using an even number of megabytes."
 msgstr ""
@@ -1850,39 +2089,40 @@ msgstr ""
 "αριθμό mb."
 
 #. 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 "Εγκατάσταση από ζωντανό μέσο"
 
 #. 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 "Ιανουάριος 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 "Η επίσημη τεκμηρίωση της Mageia"
 
 #. 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
+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/"
@@ -1894,8 +2134,8 @@ msgstr ""
 "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."
@@ -1906,8 +2146,7 @@ msgstr ""
 "<link ns6:href=\"http://www.neodoc.biz\">NeoDoc</link>"
 
 #. 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</"
@@ -1918,15 +2157,15 @@ msgstr ""
 "επικοινωνήστε με την <link ns6:href=\"https://wiki.mageia.org/en/"
 "Documentation_team\">Ομάδα της τεκμηρίωσης</link>."
 
-#. 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 "
@@ -1936,42 +2175,50 @@ msgstr ""
 "εγχειρίδιο. Για το ποιες οθόνες θα βλέπετε, εξαρτάται από το υλικό σας και "
 "τις επιλογές που κάνετε κατά την εγκατάσταση."
 
-#. 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 ""
+"Δημιουργήθηκε από εθελοντές δουλεύοντας στον ελεύθερο χρόνο τους. Αν "
+"επιθυμείτε να βοηθήσετε στην βελτίωση του εγχειριδίου, παρακαλώ "
+"επικοινωνήστε με την <link ns6:href=\"https://wiki.mageia.org/en/"
+"Documentation_team\">Ομάδα της τεκμηρίωσης</link>."
+
 #. 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 "Εγκατάσταση με το DrakX"
 
 #. type: Content of: <book><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:9
+#: en/DrakX-cover.xml:20
 msgid "February 2014"
 msgstr "Φεβρουάριος 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
-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 "Συγχαρητήρια"
 
 #.  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
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
@@ -1980,27 +2227,28 @@ msgstr ""
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </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 ""
 "Έχετε ολοκληρώσει την εγκατάσταση και διαμόρφωση της Mageia και μπορείτε "
 "τώρα να επανεκκινήσετε τον υπολογιστή σας με ασφάλεια."
 
 #. 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 ""
 "Μετά την επανεκκίνηση, στην οθόνη του μενού εκκίνησης, μπορείτε να επιλέξετε "
 "μεταξύ των λειτουργικών συστημάτων σας (αν έχετε περισσότερα από ένα) στον "
 "υπολογιστή σας."
 
 #. 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."
@@ -2009,26 +2257,27 @@ msgstr ""
 "σας της Mageia θα επιλεχθεί αυτόματα και θα εκκινηθεί."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:26
+#: en/exitInstall.xml:30
 msgid "Enjoy!"
 msgstr "Απολαύστε!"
 
 #. 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 ""
 "Μεταβείτε στο www.mageia.org αν έχετε διάφορες απορίες ή αν θέλετε να "
 "συνεισφέρετε στη Mageia"
 
 #. 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 "
@@ -2041,16 +2290,17 @@ msgstr ""
 "αντίστοιχων υπηρεσιών από το διαδίκτυο."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:12
+#: en/firewall.xml:16
+#, fuzzy
 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 ""
 "Στην εξ ορισμού ρύθμιση (δεν υπάρχει κάποιο κουμπί επιλεγμένο), οι υπηρεσίες "
 "συστήματος δεν είναι προσβάσιμες από το διαδίκτυο. Η επιλογή «<emphasis role="
@@ -2063,26 +2313,28 @@ msgstr ""
 "δοκιμές και αποσφαλμάτωση."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:21
+#: en/firewall.xml:25
+#, fuzzy
 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 ""
 "Όλες οι άλλες επιλογές είναι αυτονόητες. Για παράδειγμα, επιλέξτε το πλαίσιο "
 "ελέγχου <emphasis role=\"bold\">Εξυπηρετητής CUPS</emphasis> αν θέλετε οι "
 "εκτυπωτές σας να είναι προσπελάσιμοι από το δίκτυο."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:25
+#: en/firewall.xml:29
 msgid "<emphasis role=\"bold\">Advanced</emphasis>"
 msgstr "<emphasis role=\"bold\">Προχωρημένες</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:27
+#: en/firewall.xml:31
+#, fuzzy
 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 ""
 "Η επιλογή <emphasis role=\"bold\">Προχωρημένες</emphasis> ανοίγει ένα "
@@ -2090,12 +2342,12 @@ msgstr ""
 "πληκτρολογώντας τες και αφήνοντας κενά μεταξύ τους."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:31
+#: en/firewall.xml:35
 msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
 msgstr "<emphasis>&lt;αριθμός-θύρας>/&lt;πρωτόκολλο></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 "
@@ -2106,7 +2358,7 @@ msgstr ""
 "για την υπηρεσία RSYNC) όπως καθορίζεται στο <emphasis>RFC-433</emphasis>·"
 
 #. 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."
@@ -2116,7 +2368,7 @@ 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>."
@@ -2125,7 +2377,7 @@ msgstr ""
 "υπηρεσία RSYNC είναι η <emphasis>873/tcp</emphasis>."
 
 #. 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."
@@ -2134,7 +2386,7 @@ msgstr ""
 "πρωτόκολλα, θα πρέπει να καθορίσετε 2 ζεύγη για την ίδια θύρα."
 
 #. type: Content of: <section><info><title>
-#: en/formatPartitions.xml:3
+#: en/formatPartitions.xml:10
 msgid "Formatting"
 msgstr "Μορφοποίηση"
 
@@ -2142,14 +2394,16 @@ msgstr "Μορφοποίηση"
 #.  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\" fileref="
 "\"dx2-formatPartitions.png\" xml:id=\"formatPartitions-im1\" align=\"center"
@@ -2158,7 +2412,7 @@ msgstr ""
 "\" fileref=\"live-formatPartitions.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:24
+#: en/formatPartitions.xml:35
 msgid ""
 "Here you can choose which partition(s) you wish to format. Any data on "
 "partitions <emphasis>not</emphasis> marked for formatting will be preserved."
@@ -2168,29 +2422,33 @@ msgstr ""
 "μορφοποίηση θα διατηρηθούν."
 
 #. 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 ""
 "Συνήθως τουλάχιστον οι κατατμήσεις που έχει επιλέξει το DrakX, χρειάζεται να "
 "μορφοποιηθούν"
 
 #. 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 ""
 "Κάντε κλικ στο <guibutton>Για προχωρημένους</guibutton> για να επιλέξετε τις "
 "κατατμήσεις για τις οποίες επιθυμείτε να γίνει έλεγχος για "
 "<emphasis>χαλασμένα τμήματα</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 ""
 "Αν δεν είστε σίγουρος-η ότι έχετε κάνει την σωστή επιλογή, μπορείτε να "
 "κάνετε κλικ στο <guibutton>Προηγούμενο</guibutton>, ξανά στο "
@@ -2199,21 +2457,22 @@ msgstr ""
 "όπου μπορείτε να επιλέξετε την  προβολή των λεπτομερειών των κατατμήσεων."
 
 #. 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 ""
 "Όταν είστε βέβαιος-η για την επιλογή σας, κάντε κλικ στο <guibutton>Επόμενο</"
 "guibutton> για να συνεχίσετε."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:10
+#: en/installer.xml:14
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, ο οδηγός εγκατάστασης της Mageia"
 
 #. 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 "
@@ -2224,337 +2483,238 @@ msgstr ""
 "πραγματοποιήσετε την εγκατάστασή σας ή την αναβάθμισή σας όσο το δυνατόν "
 "ευκολότερα."
 
-#. 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 ""
-"Το μενού της αρχικής οθόνης έχει διάφορες επιλογές, η προκαθορισμένη θα "
-"εκκινήσει τον οδηγό εγκατάστασης, και τυπικά είναι αυτό που χρειαζόσαστε."
-
 #. type: Content of: <section><section><title>
-#: en/installer.xml:22
-msgid "Installation Welcome Screen"
-msgstr "Η πρώτη οθόνη καλωσορίσματος στην εγκατάσταση"
-
-#. type: Content of: <section><section><section><title>
-#: en/installer.xml:25
-msgid "Using a Mageia DVD"
-msgstr "Χρήση ενός DVD Mageia"
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:27
-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 ""
-"Αυτές είναι οι εξ ορισμού οθόνες καλωσορίσματος κατά τη χρήση ενός Mageia "
-"DVD· η πρώτη είναι αυτή που βλέπετε σε ένα σύστημα UEFI και η δεύτερη σε ένα "
-"παλαιό σύστημα:"
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:32
-msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
+#: en/installer.xml:20
+msgid "The installation steps"
+msgstr "Τα βήματα εγκατάστασης"
 
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:37
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/installer.xml:23
+#, fuzzy
 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."
+"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 ""
-"Μπορείτε να προσπελάσετε τις επιλογές από αυτήν την οθόνη πατώντας το "
-"<emphasis role=\"bold\">e</emphasis> για να εισέλθετε στην λειτουργία "
-"επεξεργασίας. Για να επιστρέψετε, πιέστε είτε το πλήκτρο <emphasis role="
-"\"bold\">Esc</emphasis> για εγκατάλειψη χωρίς αποθήκευση ή το πλήκτρο "
-"<emphasis role=\"bold\">Ctrl</emphasis> ή το <emphasis role=\"bold\">F10</"
-"emphasis> για εγκατάλειψη με αποθήκευση."
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:45
-msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
+"Η διεργασία της εγκατάστασης είναι διαχωρισμένη σε μια σειρά βημάτων, τα "
+"οποία μπορείτε να παρακολουθήσετε στον πλευρικό πίνακα αριστερά της οθόνης."
 
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:50
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/installer.xml:28
+#, fuzzy
 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):"
+"Each step has one or more screens, which may also have <emphasis>Advanced</"
+"emphasis> sections with extra, less commonly required options."
 msgstr ""
-"Από αυτήν την οθόνη μπορείτε να ορίσετε μερικές προτιμήσεις (σημειώστε ότι "
-"οι επιλογές <emphasis role=\"bold\">F1</emphasis> ως <emphasis role=\"bold"
-"\">F6</emphasis> είναι διαθέσιμες μόνο σε παλιά συστήματα):"
+"Κάθε βήμα έχει μια ή περισσότερες οθόνες οι οποίες μπορεί να διαθέτουν "
+"<guibutton>Προχωρημένες</guibutton> ενότητες, με επιπλέον, που δεν "
+"απαιτούνται συχνά, επιλογές."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:55
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/installer.xml:33
+#, 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>"
+"Most screens have <emphasis>Help</emphasis> buttons for further details "
+"about the particular step."
 msgstr ""
-"Στις επιλογές από <emphasis role=\"bold\">F2</emphasis> ως <emphasis role="
-"\"bold\">F6</emphasis>, μπορείτε να βρείτε την σχετική βοήθεια πιέζοντας "
-"<emphasis role=\"bold\">F1</emphasis>"
+"Οι περισσότερες οθόνες διαθέτουν κουμπιά <guibutton>βοήθειας</guibutton> "
+"όπου θα βρείτε περισσότερες πληροφορίες σχετικά με το τρέχον βήμα."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:63
+#. type: Content of: <section><section><caution><para>
+#: en/installer.xml:38
+#, fuzzy
 msgid ""
-"Press <emphasis role=\"bold\">F2</emphasis> to have the installer use a "
-"specific language for the installation."
+"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 ""
-"Πιέστε <emphasis role=\"bold\">F2</emphasis> για χρήση μιας συγκεκριμένης "
-"γλώσσας για την εγκατάσταση."
+"Αν κάποια στιγμή κατά την εγκατάσταση αποφασίσετε να διακόψετε την "
+"εγκατάσταση, η επανεκκίνηση είναι εφικτή, αλλά σκεφτείτε πολύ καλά πριν το "
+"κάνετε. Από τη στιγμή που μια κατάτμηση έχει μορφοποιηθεί ή έχει ξεκινήσει η "
+"εγκατάσταση των ενημερώσεων, ο υπολογιστή σας δεν είναι πια στην ίδια "
+"κατάσταση που ήταν πριν και η επανεκκίνηση θα μπορούσε κάλλιστα να σας "
+"αφήσει με ένα μη λειτουργικό σύστημα. Αν παρόλα αυτά είστε απόλυτα σίγουρος "
+"ότι θέλετε να κάνετε επανεκκίνηση, μεταβείτε σε ένα τερματικό πατώντας τα "
+"τρία πλήκτρα <guibutton>Alt Ctrl F2</guibutton> ταυτόχρονα. Στη συνέχεια, "
+"πατήστε <guibutton>Alt Ctrl Delete</guibutton> ταυτόχρονα για να κάνετε "
+"επανεκκίνηση."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:67
+#. type: Content of: <section><section><caution><para>
+#: en/installer.xml:43
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+"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 ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:72
-msgid ""
-"Use the arrow keys to select the language then press <emphasis role=\"bold"
-"\">Enter</emphasis>."
-msgstr ""
-"Χρησιμοποιήστε τα βελάκια για να επιλέξετε τη γλώσσα και πιέστε <emphasis "
-"role=\"bold\">Enter</emphasis>."
+#. type: Content of: <section><section><title>
+#: en/installer.xml:48
+msgid "Installation Welcome Screen"
+msgstr "Η πρώτη οθόνη καλωσορίσματος στην εγκατάσταση"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:77
+#. type: Content of: <section><section><para>
+#: en/installer.xml:49
 msgid ""
-"If needed, change the screen resolution by pressing <emphasis role=\"bold"
-"\">F3</emphasis> (Legacy mode only)."
+"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 ""
-"Αν χρειάζεται, αλλάξτε την ανάλυση της οθόνης πιέζοντας το πλήκτρο <emphasis "
-"role=\"bold\">F3</emphasis> (μόνο σε λειτουργία παλαιού τύπου)."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:81
+#. type: Content of: <section><section><para>
+#: en/installer.xml:52
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+"The welcome menu screen has various options, however the default option will "
+"start the installer, and is normally all that you will need."
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </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)."
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:56
+msgid "Legacy (BIOS) Systems"
 msgstr ""
-"Αν αντιμετωπίζετε προβλήματα με την εγκατάσταση, μπορείτε να δοκιμάσετε να "
-"αλλάξετε τις ρυθμίσεις εξ ορισμού χρησιμοποιώντας τις <emphasis role=\"bold"
-"\">F6</emphasis> <emphasis role=\"bold\">Επιλογές πυρήνα</emphasis> (σε UEFI "
-"σύστημα πιέστε <emphasis role=\"bold\">e</emphasis>)."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/installer.xml:96
-msgid "Default: It doesn't alter anything in the default options."
-msgstr "Εξ ορισμού: δεν αλλάζει καμιά από τις προκαθορισμένες επιλογές."
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/installer.xml:101
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:58
+#, fuzzy
 msgid ""
-"Safe Settings: Priority is given to the safer options at the price of a "
-"performance detriment."
+"<imageobject> <imagedata fileref=\"dx-welcome.png\" align=\"center\"/> </"
+"imageobject>"
 msgstr ""
-"Ασφαλές ρυθμίσεις: δίνεται προτεραιότητα στις επισφαλές επιλογές σε βάρος "
-"της απόδοσης."
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\"/"
+"> </imageobject>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/installer.xml:106
-msgid ""
-"No ACPI: (Advanced Configuration and Power Interface): Power management "
-"features are not used."
+#. type: Content of: <section><section><section><itemizedlist><title>
+#: en/installer.xml:63
+msgid "Menu"
 msgstr ""
-"Χωρίς ACPI : (Advanced Configuration and Power Interface - εξελιγμένη "
-"διεπαφή ρύθμισης και διαχείρισης ενέργειας): τα χαρακτηριστικά της "
-"διαχείρισης ενέργειας δεν θα χρησιμοποιηθούν."
 
-#. 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:66
 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."
+"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 ""
-"Χωρίς τοπικό APIC: (Local Advanced Programmable Interrupt Controller - "
-"προηγμένος προγραμματιζόμενος ελεγκτής διακοπών συστήματος): Διακοπές της "
-"CPU. Επιλέξτε αυτήν την επιλογή αν αντιμετωπίζετε κάποια δυσλειτουργία του "
-"συστήματος όπως έναν πανικό πυρήνα σε σχέση με το APIC."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:120
-msgid ""
-"When you select one of these entries, it modifies the default options "
-"displayed in the <guilabel>Boot Options</guilabel> line."
-msgstr ""
-"Όταν επιλέγετε μια από αυτές τις καταχωρήσεις, τροποποιούνται οι εξ ορισμού "
-"ρυθμίσεις που εμφανίζονται στη γραμμή <guilabel>Επιλογές εκκίνησης</"
-"guilabel>. "
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:69
+#, fuzzy
+msgid "<emphasis role=\"bold\">Rescue System</emphasis>"
+msgstr "<emphasis role=\"bold\">Εξυπηρετητής</emphasis>"
 
-#. 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:70
 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."
+"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 ""
-"Σε μερικές εκδόσεις της Mageia, μπορεί οι επιλογές με το πλήκτρο <emphasis "
-"role=\"bold\">F6</emphasis> να μην εμφανιστούν στην γραμμή "
-"<guilabel>Επιλογές εκκίνησης</guilabel>· ωστόσο, λαμβάνονται κανονικά υπόψη."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:132
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:75
+#, fuzzy
+msgid "<emphasis role=\"bold\">Memory Test</emphasis>"
+msgstr "<emphasis role=\"bold\">Εξυπηρετητής</emphasis>"
 
-#. 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:76
 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."
+"Test the installed RAM by performing multiple read and write operations. "
+"Reboot to end the test."
 msgstr ""
-"Πιέζοντας το πλήκτρο <emphasis role=\"bold\">F1</emphasis> ανοίγει ένα νέο "
-"παράθυρο με επιπλέον διαθέσιμες επιλογές εκκίνησης. Επιλέξτε ένα αντικείμενο "
-"με τα βελάκια και πατήστε <emphasis role=\"bold\">Enter</emphasis> για "
-"περισσότερες λεπτομέρειες ή πιέστε <emphasis role=\"bold\">Esc</emphasis> "
-"για να επιστρέψετε στην οθόνη υποδοχής."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:146
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:80
+#, fuzzy
+msgid "<emphasis role=\"bold\">F2: Language</emphasis>"
+msgstr "<emphasis role=\"bold\">Προχωρημένες</emphasis>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:151
-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><itemizedlist><listitem><para>
+#: en/installer.xml:81
+msgid "Press F2 for alternative languages."
 msgstr ""
-"Η προβολή λεπτομερειών για την επιλογή της εικόνας εκκίνησης. Πιέστε "
-"<emphasis role=\"bold\">Esc</emphasis> ή επιλέξτε <guilabel>Επιστροφή στις "
-"επιλογές εκκίνησης</guilabel> για να επιστρέψετε στη λίστα επιλογών. Αυτές "
-"οι επιλογές μπορούν να προστεθούν και χειροκίνητα στη γραμμή "
-"<guilabel>Επιλογές εκκίνησης</guilabel>."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:158
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:86
+msgid "UEFI Systems"
 msgstr ""
-"<imageobject> <imagedata 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><para>
+#: en/installer.xml:87
+#, fuzzy
 msgid ""
-"The help is translated in the chosen language with <emphasis role=\"bold"
-"\">F2</emphasis>."
+"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 ""
-"Η Βοήθεια εμφανίζεται μεταφρασμένη στην επιλεγμένη γλώσσα με το πλήκτρο "
-"<emphasis role=\"bold\">F2</emphasis>."
+"Μπορείτε να προσπελάσετε τις επιλογές από αυτήν την οθόνη πατώντας το "
+"<emphasis role=\"bold\">e</emphasis> για να εισέλθετε στην λειτουργία "
+"επεξεργασίας. Για να επιστρέψετε, πιέστε είτε το πλήκτρο <emphasis role="
+"\"bold\">Esc</emphasis> για εγκατάλειψη χωρίς αποθήκευση ή το πλήκτρο "
+"<emphasis role=\"bold\">Ctrl</emphasis> ή το <emphasis role=\"bold\">F10</"
+"emphasis> για εγκατάλειψη με αποθήκευση."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:168
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:92
+#, fuzzy
 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 ""
-"Για περισσότερες πληροφορίες σχετικά με τις επιλογές του πυρήνα σε παλαιά "
-"και UEFI συστήματα, δείτε: <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 "Τα βήματα εγκατάστασης"
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\"/"
+"> </imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/installer.xml:179
-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 ""
-"Η διεργασία της εγκατάστασης είναι διαχωρισμένη σε μια σειρά βημάτων, τα "
-"οποία μπορείτε να παρακολουθήσετε στον πλευρικό πίνακα αριστερά της οθόνης."
 
-#. type: Content of: <section><section><para>
-#: en/installer.xml:182
-msgid ""
-"Each step has one or more screens which may also have <guibutton>Advanced</"
-"guibutton> sections with extra, less commonly required, options."
-msgstr ""
-"Κάθε βήμα έχει μια ή περισσότερες οθόνες οι οποίες μπορεί να διαθέτουν "
-"<guibutton>Προχωρημένες</guibutton> ενότητες, με επιπλέον, που δεν "
-"απαιτούνται συχνά, επιλογές."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:99
+#, fuzzy
+msgid "<emphasis role=\"bold\">Install:</emphasis> Start the Install process"
+msgstr "<emphasis role=\"bold\">Στοίχιση σε</emphasis> = MiB"
 
-#. type: Content of: <section><section><para>
-#: en/installer.xml:186
+#. 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 ""
-"Οι περισσότερες οθόνες διαθέτουν κουμπιά <guibutton>βοήθειας</guibutton> "
-"όπου θα βρείτε περισσότερες πληροφορίες σχετικά με το τρέχον βήμα."
 
-#. 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 ""
-"Αν κάποια στιγμή κατά την εγκατάσταση αποφασίσετε να διακόψετε την "
-"εγκατάσταση, η επανεκκίνηση είναι εφικτή, αλλά σκεφτείτε πολύ καλά πριν το "
-"κάνετε. Από τη στιγμή που μια κατάτμηση έχει μορφοποιηθεί ή έχει ξεκινήσει η "
-"εγκατάσταση των ενημερώσεων, ο υπολογιστή σας δεν είναι πια στην ίδια "
-"κατάσταση που ήταν πριν και η επανεκκίνηση θα μπορούσε κάλλιστα να σας "
-"αφήσει με ένα μη λειτουργικό σύστημα. Αν παρόλα αυτά είστε απόλυτα σίγουρος "
-"ότι θέλετε να κάνετε επανεκκίνηση, μεταβείτε σε ένα τερματικό πατώντας τα "
-"τρία πλήκτρα <guibutton>Alt Ctrl F2</guibutton> ταυτόχρονα. Στη συνέχεια, "
-"πατήστε <guibutton>Alt Ctrl Delete</guibutton> ταυτόχρονα για να κάνετε "
-"επανεκκίνηση."
+"Αν η εκκίνηση έγινε από ένα κλειδί USB, θα λάβετε δυο επιπλέον γραμμές οι "
+"οποίες είναι διπλότυπες των προηγούμενων γραμμών με την κατάληξη «USB». Θα "
+"πρέπει να τις επιλέξετε."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:203
+#: en/installer.xml:115
 msgid "Installation Problems and Possible Solutions"
 msgstr "Προβλήματα στην εγκατάσταση και πιθανές λύσεις"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:206
+#: en/installer.xml:117
 msgid "No Graphical Interface"
 msgstr "Δεν λειτουργεί το γραφικό περιβάλλον"
 
 #. 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 ""
 "Μετά την αρχική οθόνη δεν γίνεται μετάβαση στην οθόνη επιλογής γλώσσας. Αυτό "
 "μπορεί να συμβεί με ορισμένες κάρτες γραφικών και μερικά παλαιότερα "
@@ -2562,15 +2722,15 @@ msgstr ""
 "<code>vgalo</code> στην προτροπή."
 
 #. 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 ""
 "Αν πρόκειται για πολύ παλιό υλικό, ίσως η εγκατάσταση σε γραφικό περιβάλλον "
 "να είναι αδύνατη. Σε αυτήν την περίπτωση μπορείτε να δοκιμάσετε την "
@@ -2582,18 +2742,19 @@ msgstr ""
 "λειτουργία κειμένου."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:230
+#: en/installer.xml:138
 msgid "The Install Freezes"
 msgstr "Πάγωμα της εγκατάστασης"
 
 #. 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 ""
 "Αν το σύστημα «παγώνει» κατά την εγκατάσταση, η αιτία μπορεί να οφείλεται "
 "στον εντοπισμό του υλικού. Σε αυτή την περίπτωση ο αυτόματος εντοπισμός "
@@ -2603,17 +2764,19 @@ msgstr ""
 "κριθεί απαραίτητο."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:240
+#: en/installer.xml:146
 msgid "RAM problem"
 msgstr "Πρόβλημα 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 ""
 "Μπορεί να χρειαστεί σε σπάνιες περιπτώσεις, αλλά μερικές φορές το υλικό "
 "μπορεί να αναφέρει την διαθέσιμη μνήμη RAM λανθασμένα. Για να την ορίσετε "
@@ -2622,19 +2785,20 @@ msgstr ""
 "καθορίζει 256MB RAM."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:249
+#: en/installer.xml:154
 msgid "Dynamic partitions"
 msgstr "Δυναμικές κατατμήσεις"
 
 #. 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 ""
 "Αν μετατρέψατε τον σκληρό σας δίσκο από <emphasis role=\"bold\">βασική</"
 "emphasis> σε <emphasis role=\"bold\">δυναμική</emphasis> μορφή σε Microsoft "
@@ -2645,18 +2809,15 @@ msgstr ""
 "aspx</link>."
 
 #. type: Content of: <section><info><title>
-#: en/installUpdates.xml:3
+#: en/installUpdates.xml:16
 msgid "Updates"
 msgstr "Ενημερώσεις"
 
-#.  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 ""
@@ -2665,19 +2826,26 @@ 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 ""
 "Από τη στιγμή που κυκλοφόρησε η συγκεκριμένη έκδοση της <application>Mageia</"
 "application>, μερικά πακέτα έχουν ενημερωθεί ή βελτιωθεί."
 
-#. 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 ""
 "Επιλέξτε <guilabel>Ναι</guilabel> αν επιθυμείτε να κάνετε λήψη και να "
@@ -2685,77 +2853,86 @@ msgstr ""
 "επιθυμείτε να το πραγματοποιήσετε τώρα, ή αν δεν είστε συνδεδεμένος-η στο "
 "διαδίκτυο."
 
-#. type: Content of: <section><para>
-#: en/installUpdates.xml:29
-msgid "Press <guibutton>Next</guibutton> to continue"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installUpdates.xml:40
+#, fuzzy
+msgid "Press <emphasis>Next</emphasis> to continue"
 msgstr "Κάντε κλικ στο <guibutton>Επόμενο</guibutton> για να συνεχίσετε"
 
 #. type: Content of: <section><info><title>
-#: en/login.xml:1
-msgid "Login screen"
+#: en/login.xml:4
+#, fuzzy
+msgid "Login Screen"
 msgstr "Οθόνη εισόδου"
 
 #. 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"
 
 #. 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 "Εν τέλει, θα βρεθείτε στην οθόνη εισόδου."
 
 #. 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 ""
 "Εισαγάγετε το όνομα του χρήστη και τον κωδικό πρόσβασης, και σε μερικά "
 "δευτερόλεπτα θα βρεθείτε στο περιβάλλον εργασίας KDE ή GNOME ανάλογα με το "
 "μέσο που χρησιμοποιήσατε. Μπορείτε εφεξής να χρησιμοποιήσετε την Mageia."
 
 #. 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 ""
 "Μπορείτε να βρείτε ένα άλλο τμήμα της τεκμηρίωσης στο <link ns4:href="
 "\"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 "Επιλογή μέσων (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
+#: en/media_selection.xml:24
+#, fuzzy
 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=\"media_selection-im1\" align="
-"\"center\" revision=\"1\" fileref=\"dx2-media_selection.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-bestTime.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"bestTime-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 "
@@ -2768,7 +2945,7 @@ msgstr ""
 "επόμενα βήματα της εγκατάστασης."
 
 #. 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."
@@ -2777,12 +2954,13 @@ msgstr ""
 "περιέχει τη βάση της διανομής."
 
 #. 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 ""
 "Το αποθετήριο <emphasis>Nonfree</emphasis> περιέχει πακέτα που είναι δωρεάν, "
@@ -2793,7 +2971,7 @@ msgstr ""
 "κλπ."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:40
+#: en/media_selection.xml:50
 msgid ""
 "The <emphasis>Tainted</emphasis> repository includes packages released under "
 "a free license. The main criteria for placing packages in this repository is "
@@ -2814,32 +2992,14 @@ msgid "Minimal Install"
 msgstr "Ελάχιστη εγκατάσταση"
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:11
-msgid ""
-"You can choose a Minimal Installation by de-selecting everything in the "
-"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"/>."
-msgstr ""
-"Μπορείτε να επιλέξετε την Ελάχιστη εγκατάσταση αποεπιλέγοντας τα πάντα στην "
-"οθόνη επιλογής Ομάδων πακέτων, δείτε <xref linkend=\"choosePackageGroups\"/>."
-
-#. type: Content of: <section><para>
-#: en/minimal-install.xml:14
-msgid ""
-"If desired, you can additionally tick the <emphasis role=\"bold\">Individual "
-"package selection</emphasis> option in the same screen."
-msgstr ""
-"Αν το επιθυμείτε, μπορείτε να επιλέξετε την <emphasis role=\"bold\">επιλογή "
-"μεμονωμένων πακέτων</emphasis> στην ίδια οθόνη."
-
-#. 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 ""
 "Η ελάχιστη εγκατάσταση προορίζεται για αυτούς που θέλουν να κάνουν μια "
 "ειδική χρήση της <application>Mageia</application>, όπως έναν εξυπηρετητή ή "
@@ -2848,33 +3008,58 @@ msgstr ""
 "πακέτων</emphasis>, όπως αναφέρεται ανωτέρω, δείτε <xref linkend="
 "\"choosePackagesTree\"/>."
 
-#. type: Content of: <section><para>
-#: en/minimal-install.xml:22
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/minimal-install.xml:24
+#, fuzzy
+msgid ""
+"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 ""
+"Μπορείτε να επιλέξετε την Ελάχιστη εγκατάσταση αποεπιλέγοντας τα πάντα στην "
+"οθόνη επιλογής Ομάδων πακέτων, δείτε <xref linkend=\"choosePackageGroups\"/>."
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/minimal-install.xml:28
+#, 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."
+"If desired, you can additionally tick the <emphasis>Individual package "
+"selection</emphasis> option in the same screen."
+msgstr ""
+"Αν το επιθυμείτε, μπορείτε να επιλέξετε την <emphasis role=\"bold\">επιλογή "
+"μεμονωμένων πακέτων</emphasis> στην ίδια οθόνη."
+
+#. 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 ""
 "Αν επιλέξετε αυτήν την μέθοδο εγκατάστασης, τότε στην επόμενη οθόνη θα "
 "μπορείτε να επιλέξετε μεταξύ μερικών χρήσιμων εργαλείων προς εγκατάσταση, "
 "όπως τεκμηρίωση και X."
 
-#. type: Content of: <section><para>
-#: en/minimal-install.xml:26
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/minimal-install.xml:37
+#, fuzzy
 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 ""
 "Αν επιλέξετε <emphasis role=\"bold\">με X</emphasis> θα συμπεριληφθεί επίσης "
 "ο διαχειριστής παραθύρων IceWM ως ένα ελαφρύ περιβάλλον εργασίας."
 
 #. 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 ""
 "Η βασική τεκμηρίωση παρέχεται υπό τη μορφή σελίδων εγχειριδίου man και info. "
 "Περιέχει τις σελίδες man από τις σελίδες info των <link xlink:href=\"http://"
@@ -2883,7 +3068,7 @@ msgstr ""
 "coreutils</link>."
 
 #. type: Content of: <section><mediaobject>
-#: en/minimal-install.xml:35
+#: en/minimal-install.xml:48
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"minimal-install-im1\" align="
 "\"center\" fileref=\"dx2-minimal-install.png\" revision=\"1\"/> </"
@@ -2895,24 +3080,33 @@ msgstr ""
 
 #. type: Content of: <section><info><title>
 #: en/misc-params.xml:3
-msgid "Summary of miscellaneous parameters"
-msgstr "Σύνοψη των διάφορων παραμέτρων"
+#, fuzzy
+msgid "Configuration Summary"
+msgstr "Ρύθμιση του ήχου"
 
 #.  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=\"dx2-summaryTop.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 παρουσιάζει μια πρόταση για την διαμόρφωση του συστήματός σας, "
 "ανάλογα με τις επιλογές που κάνατε προηγουμένως και το υλικό που "
@@ -2920,7 +3114,7 @@ msgstr ""
 "αλλάξετε πατώντας <guibutton>Διαμόρφωση</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:"
@@ -2929,37 +3123,39 @@ 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
+#, fuzzy
+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 "Παράμετροι του συστήματος"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:45
-msgid "<guilabel>Timezone</guilabel>"
-msgstr "<guilabel>Ζώνη ώρας:</guilabel>"
+#: en/misc-params.xml:54
+#, fuzzy
+msgid "<emphasis role=\"bold\">Timezone</emphasis>"
+msgstr "<emphasis role=\"bold\">Εξυπηρετητής</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 επιλέγει μια ζώνη ώρας για εσάς, ανάλογα με την προτιμώμενη γλώσσα. "
@@ -2967,12 +3163,13 @@ msgstr ""
 "\"configureTimezoneUTC\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:53
-msgid "<guilabel>Country / Region</guilabel>"
-msgstr "<guilabel>Χώρα / Περιοχή:</guilabel>"
+#: en/misc-params.xml:62
+#, fuzzy
+msgid "<emphasis role=\"bold\">Country / Region</emphasis>"
+msgstr "<emphasis role=\"bold\">Σταθμός εργασίας</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:56
+#: en/misc-params.xml:64
 msgid ""
 "If the selected country is wrong, it is very important that you correct the "
 "setting.  See <xref linkend=\"selectCountry\"/>"
@@ -2981,49 +3178,51 @@ msgstr ""
 "ρύθμιση.  Δείτε <xref linkend=\"selectCountry\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:62
-msgid "<guilabel>Bootloader</guilabel>"
-msgstr "<guilabel>Πρόγραμμα εκκίνησης:</guilabel>"
+#: en/misc-params.xml:70
+#, fuzzy
+msgid "<emphasis role=\"bold\">Bootloader</emphasis>"
+msgstr "<emphasis role=\"bold\">Εξυπηρετητής</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 έχει πραγματοποιήσει καλές επιλογές για τη ρύθμιση του προγράμματος "
 "εκκίνησης."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:67
-msgid "Do not change anything, unless you know how to configure GRUB2"
+#: en/misc-params.xml:75
+#, fuzzy
+msgid ""
+"Do not change anything, unless you know how to configure GRUB2. For more "
+"information, see <xref linkend=\"setupBootloader\"/>"
 msgstr "Μην αλλάξετε τίποτα, αν δεν γνωρίζετε πως να διαμορφώσετε το GRUB2"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:70
-msgid "For more information, see <xref linkend=\"setupBootloader\"/>"
-msgstr ""
-"Για περισσότερες πληροφορίες, δείτε <xref linkend=\"setupBootloader\"></xref>"
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:75
-msgid "<guilabel>User management</guilabel>"
-msgstr "<guilabel>Διαχείριση χρηστών:</guilabel>"
+#: en/misc-params.xml:83
+#, fuzzy
+msgid "<emphasis role=\"bold\">User management</emphasis>"
+msgstr "<emphasis role=\"bold\">Εξυπηρετητής</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 ""
 "Εδώ μπορείτε να προσθέσετε επιπλέον χρήστες. Καθένας θα αποκτήσει τον δικό "
 "του κατάλογο <literal>/home</literal>."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:84
-msgid "<guilabel>Services</guilabel>:"
-msgstr "<guilabel>Υπηρεσίες</guilabel>:"
+#: en/misc-params.xml:91
+#, fuzzy
+msgid "<emphasis role=\"bold\">Services</emphasis>"
+msgstr "<emphasis role=\"bold\">Εξυπηρετητής</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:86
+#: en/misc-params.xml:93
 msgid ""
 "System services refer to those small programs which run in the background "
 "(daemons).  This tool allows you to enable or disable certain processes."
@@ -3033,32 +3232,29 @@ msgstr ""
 "απενεργοποίηση ορισμένων διεργασιών."
 
 #. 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 ""
 "Θα πρέπει να ελέγξετε προσεκτικά πριν να αλλάξετε οτιδήποτε εδώ - ένα σφάλμα "
 "μπορεί να προκαλέσει τη δυσλειτουργία του υπολογιστή σας."
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:94
-msgid "For more information, see <xref linkend=\"configureServices\"/>"
-msgstr ""
-"Για περισσότερες πληροφορίες, δείτε <xref linkend=\"configureServices\"/>"
-
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:101
+#: en/misc-params.xml:106
 msgid "Hardware parameters"
 msgstr "Παράμετροι υλικού"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:106
-msgid "<guilabel>Keyboard</guilabel>:"
-msgstr "<guilabel>Πληκτρολόγιο:</guilabel>"
+#: en/misc-params.xml:111
+#, fuzzy
+msgid "<emphasis role=\"bold\">Keyboard</emphasis>"
+msgstr "<emphasis role=\"bold\">Εξυπηρετητής</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:108
+#: en/misc-params.xml:113
 msgid ""
 "Configure your keyboard layout according to your location, language and type "
 "of keyboard."
@@ -3067,7 +3263,7 @@ msgstr ""
 "τοποθεσία σας, τη γλώσσα ή τον τύπο του πληκτρολογίου."
 
 #. 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."
@@ -3076,12 +3272,13 @@ msgstr ""
 "αλλάξετε, λάβετε υπόψη ότι ο κωδικός πρόσβασης θα αλλάξει επίσης."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:119
-msgid "<guilabel>Mouse</guilabel>:"
-msgstr "<guilabel>Ποντίκι</guilabel>:"
+#: en/misc-params.xml:124
+#, fuzzy
+msgid "<emphasis role=\"bold\">Mouse</emphasis>"
+msgstr "<emphasis role=\"bold\">Εξυπηρετητής</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."
@@ -3090,43 +3287,43 @@ msgstr ""
 "ταμπλέτες, σφαιροδείκτες κλπ."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:126
-msgid "<guilabel>Sound card</guilabel>:"
-msgstr "<guilabel>Κάρτα ήχου</guilabel>:"
+#: en/misc-params.xml:131
+#, fuzzy
+msgid "<emphasis role=\"bold\">Sound card</emphasis>"
+msgstr "<emphasis role=\"bold\">Προχωρημένες</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:129
+#: 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 ""
-"Το πρόγραμμα εγκατάστασης χρησιμοποιεί τον προκαθορισμένο οδηγό - αν έχει "
-"καθοριστεί κάποιος. Η δυνατότητα επιλογής ενός διαφορετικού οδηγού δίνεται "
-"μόνον όταν υπάρχουν περισσότεροι οδηγοί για την κάρτα σας, αλλά κανένας από "
-"αυτούς δεν είναι ο προκαθορισμένος."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:137
-msgid "<guilabel>Graphical interface</guilabel>:"
-msgstr "<guilabel>Κάρτα γραφικών</guilabel>:"
+#: en/misc-params.xml:144
+#, fuzzy
+msgid "<emphasis role=\"bold\">Graphical interface</emphasis>"
+msgstr "<emphasis role=\"bold\">Γραφικό περιβάλλον</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 ""
 "Αυτή η ενότητα σας επιτρέπει να διαμορφώσετε την κάρτα γραφικών σας και τις "
 "οθόνες σας."
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:143
-msgid "For more information, see <xref linkend=\"configureX_chooser\"/>."
-msgstr ""
-"Για περισσότερες πληροφορίες, δείτε <xref linkend=\"configureX_chooser\"></"
-"xref>."
-
 #. type: Content of: <section><section><mediaobject>
-#: en/misc-params.xml:149
+#: en/misc-params.xml:155
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
 "\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
@@ -3135,21 +3332,23 @@ msgstr ""
 "\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"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 "Παράμετροι δικτύου και διαδικτύου"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:163
-msgid "<guilabel>Network</guilabel>:"
-msgstr "<guilabel>Δίκτυο</guilabel>:"
+#: en/misc-params.xml:169
+#, fuzzy
+msgid "<emphasis role=\"bold\">Network</emphasis>"
+msgstr "<emphasis role=\"bold\">Εξυπηρετητής</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 ""
 "Εδώ μπορείτε να ρυθμίσετε το δίκτυό σας, αλλά για κάρτες δικτύου χωρίς "
@@ -3158,7 +3357,7 @@ msgstr ""
 "τα αποθετήρια Nonfree."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:172
+#: en/misc-params.xml:178
 msgid ""
 "When you add a network card, do not forget to set your firewall to monitor "
 "that interface as well."
@@ -3167,15 +3366,17 @@ msgstr ""
 "προστασίας για την εποπτεία των επαφών αυτών."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:179
-msgid "<guilabel>Proxies</guilabel>:"
-msgstr "<guilabel>Διαμεσολαβητές</guilabel>:"
+#: en/misc-params.xml:185
+#, fuzzy
+msgid "<emphasis role=\"bold\">Proxies</emphasis>"
+msgstr "<emphasis role=\"bold\">Εξυπηρετητής</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 ""
 "Ένας εξυπηρετητής διαμεσολαβητή δρα ως μεσάζοντας μεταξύ του υπολογιστή σας "
@@ -3183,69 +3384,76 @@ msgstr ""
 "υπολογιστή σας για την χρήση μιας υπηρεσίας διαμεσολαβητή."
 
 #. 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 ""
 "Ίσως χρειάζεται να συμβουλευτείτε τον διαχειριστή των συστημάτων σας για να "
 "λάβετε τις παραμέτρους που χρειάζεται να εισαγάγετε εδώ."
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:195
+#: en/misc-params.xml:201
 msgid "Security"
 msgstr "Ασφάλεια"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:200
-msgid "<guilabel>Security Level</guilabel>:"
-msgstr "<guilabel>Επίπεδο ασφάλειας</guilabel>:"
+#: en/misc-params.xml:206
+#, fuzzy
+msgid "<emphasis role=\"bold\">Security Level</emphasis>"
+msgstr "<emphasis role=\"bold\">Εξυπηρετητής</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 ""
 "Εδώ μπορείτε να ορίσετε το Επίπεδο ασφάλειας για τον υπολογιστή σας, στις "
 "περισσότερες περιπτώσεις η προκαθορισμένη επιλογή (Τυπικό) είναι το "
 "καταλληλότερο για γενική χρήση."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:207
-msgid "Check the option which best suits your usage."
-msgstr "Επιλέξτε την επιλογή που ταιριάζει περισσότερο με τη χρήση σας."
+#: en/misc-params.xml:215
+#, fuzzy
+msgid "<emphasis role=\"bold\">Firewall</emphasis>"
+msgstr "<emphasis role=\"bold\">Εξυπηρετητής</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:212
-msgid "<guilabel>Firewall</guilabel>:"
-msgstr "<guilabel>Τείχος προστασίας</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 ""
-"Το τείχος προστασίας έχει ως στόχο να είναι το τείχος μεταξύ των σημαντικών "
-"σας δεδομένων και τους κατεργάρηδες του διαδικτύου οι οποίοι θα ήθελαν να τα "
-"εκθέσουν ή να τα κλέψουν."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:218
-msgid ""
-"Select the services that you wish to have access to your system. Your "
-"selections will depend on what you use your computer for. For more "
-"information, see <xref linkend=\"firewall\"/>."
+#: en/misc-params.xml:229
+#, fuzzy
+msgid "For more information, see <xref linkend=\"firewall\"/>."
 msgstr ""
-"Επιλέξτε τις υπηρεσίες που επιθυμείτε να έχετε πρόσβαση στο σύστημά σας. Οι "
-"επιλογές σας θα εξαρτώνται με την χρήση για την οποία προορίζεται ο "
-"υπολογιστής σας. Για περισσότερες πληροφορίες ανατρέξτε στο <xref linkend="
-"\"firewall\"/>."
+"Για περισσότερες πληροφορίες, δείτε <xref linkend=\"configureX_chooser\"></"
+"xref>."
 
 #. 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 ""
 "Έχετε υπόψη σας ότι επιτρέποντας τα πάντα (χωρίς τείχος προστασίας) μπορεί "
 "να είναι ριψοκίνδυνο."
@@ -3256,12 +3464,11 @@ msgid "Reboot"
 msgstr "Επανεκκίνηση"
 
 #. 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 ""
 "Μετά το πέρας της εγκατάστασης του προγράμματος εκκίνησης, θα σας προταθεί "
 "να κλείσετε τον υπολογιστή, να αφαιρέσετε το live CD και να κάνετε "
@@ -3269,24 +3476,40 @@ msgstr ""
 "\"><guibutton>Τερματισμός</guibutton></emphasis> και ακολουθήστε τις "
 "οδηγίες<emphasis role=\"bold\"> σε αυτήν την σειρά!</emphasis>"
 
+#. 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
-msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
+#: en/reboot.xml:12
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot2.png\"/> </"
+"imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"live-reboot2.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 ""
 "Κατά την επανεκκίνηση θα παρατηρήσετε μια ακολουθία ράβδων προόδου λήψης."
 "Αυτό δείχνει ότι η τηλεφόρτωση των καταλόγων των μέσων λογισμικού είναι σε "
 "εξέλιξη (δείτε στην ενότητα Διαχείριση Λογισμικού)."
 
 #. type: Content of: <section><mediaobject>
-#: en/reboot.xml:17
+#: en/reboot.xml:19
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
 "reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
@@ -3316,23 +3539,25 @@ msgstr ""
 "χώρος για την εγκατάσταση της <application>Mageia</application>."
 
 #. type: Content of: <section><info><title>
-#: en/securityLevel.xml:3
+#: en/securityLevel.xml:10
 msgid "Security Level"
 msgstr "Επίπεδο ασφάλειας"
 
 #.  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=\"securityLevel-im1\" align="
-"\"center\" fileref=\"dx2-securityLevel.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
 msgid ""
 "<emphasis role=\"bold\">Please choose the desired security level</emphasis>"
 msgstr ""
@@ -3340,12 +3565,18 @@ msgstr ""
 "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:32
+#, fuzzy
+msgid ""
+"<emphasis>Secure</emphasis> will create a highly protected system - for "
+"instance if the system is to be used as a public server."
 msgstr ""
 "<emphasis role=\"bold\">Τυπικό</emphasis> είναι η εξ ορισμού και η "
 "συνιστώμενη ρύθμιση για τον μέσο χρήστη. Η <emphasis role=\"bold\">Ασφαλής</"
@@ -3353,12 +3584,12 @@ msgstr ""
 "παράδειγμα αν το σύστημα προορίζεται για χρήση ως ένας δημόσιος εξυπηρετητής."
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:24
+#: en/securityLevel.xml:36
 msgid "<emphasis role=\"bold\">Security Administrator</emphasis>"
 msgstr "<emphasis role=\"bold\">Διαχειριστής ασφαλείας</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 "
@@ -3370,17 +3601,18 @@ msgstr ""
 "διαχειριστής του συστήματος."
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:31
+#: en/securityLevel.xml:43
+#, fuzzy
 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 ""
 "Μια καλή και εύκολη στην ενσωμάτωση λύση είναι το &lt;χρήστης>@localhost - "
 "όπου &lt;χρήστης> είναι το όνομα σύνδεσης του χρήστη που θα λαμβάνει τα "
 "μηνύματα."
 
 #. 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 "
@@ -3391,26 +3623,27 @@ 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 ""
 "Μετά την εγκατάσταση, είναι δυνατό να ρυθμίσετε τις ρυθμίσεις ασφάλειας από "
 "την ενότητα <guilabel>Ασφάλεια</guilabel> του Κέντρου Ελέγχου Mageia."
 
 #. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:6
+#: en/SelectAndUseISOs2.xml:15
 msgid "Select and use ISOs"
 msgstr "Επιλογή και χρήση των ISO"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:9
+#: en/SelectAndUseISOs2.xml:18
 msgid "Introduction"
 msgstr "Εισαγωγή"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:10
+#: en/SelectAndUseISOs2.xml:19
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
 "which image best suits your needs."
@@ -3419,16 +3652,19 @@ msgstr ""
 "επιλέξετε ποια εικόνα ταιριάζει καλύτερα στις ανάγκες σας."
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:12
-msgid "There are two families of media:"
+#: en/SelectAndUseISOs2.xml:21
+#, fuzzy
+msgid "There are three types of installation media:"
 msgstr "Υπάρχουν δυο οικογένειες μέσων:"
 
 #. 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 ""
 "Κλασσικός εγκαταστάτης: Η εκκίνηση με αυτό το μέσο σας παρέχει τη μέγιστη "
 "ευελιξία όταν επιλέγεται τι θα εγκαταστήσετε, και για την διαμόρφωση του "
@@ -3436,46 +3672,97 @@ msgstr ""
 "εργασίας προς εγκατάσταση"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:21
+#: en/SelectAndUseISOs2.xml:31
+#, 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"
+"<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 ""
 "Ζωντανό μέσο: Αυτή η επιλογή σας επιτρέπει να δοκιμάσετε την Mageia χωρίς να "
 "την εγκαταστήσετε ή να κάνετε αλλαγές στο σύστημά σας. Αν αποφασίσετε να την "
 "εγκαταστήσετε η διαδικασία είναι πιο απλή αλλά δεν έχετε τον ίδιο αριθμό "
 "επιλογών όπως με τον Κλασσικό εγκαταστάτη"
 
+#. 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\">Τα Ζωντανά ISO μπορούν να χρησιμοποιηθούν μόνο για "
+"μια καθαρή εγκατάσταση· δεν μπορούν να χρησιμοποιηθούν για την αναβάθμιση "
+"από προηγούμενη έκδοση.</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 ""
+"Πρόκειται για μικρές εικόνες οι οποίες περιέχουν τα απαραίτητα για την "
+"εκκίνηση του προγράμματος εγκατάστασης drakx και την εύρεση του drakx-"
+"installer-stage2 και άλλων πακέτων που απαιτούνται για τη συνέχιση και την "
+"ολοκλήρωση της εγκατάστασης. Αυτά τα πακέτα μπορεί να βρίσκονται στον σκληρό "
+"δίσκο του υπολογιστή, σε έναν τοπικό σκληρό δίσκο, στο τοπικό δίκτυο ή στο "
+"διαδίκτυο."
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:53
+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 ""
+"Αυτά τα μέσα είναι πολύ ελαφριά (μικρότερα από 100 MB) και εξυπηρετούν όταν "
+"το εύρος ζώνης είναι πολύ μικρό για τη λήψη ενός πλήρους DVD, ή όταν ο "
+"υπολογιστής δεν διαθέτει οδηγό DVD ή όταν ο υπολογιστής δεν υποστηρίζει την "
+"εκκίνηση από ένα κλειδί USB."
+
 #. 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 "Στις επόμενες ενότητες δίνονται περισσότερες πληροφορίες."
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:30
+#: en/SelectAndUseISOs2.xml:61
 msgid "Media"
 msgstr "Μέσα"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:32
+#: en/SelectAndUseISOs2.xml:63
 msgid "Definition"
 msgstr "Ορισμός"
 
 #. 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 ""
 "Μέσο αποκαλούμε εδώ ένα αρχείο εικόνας ISO το οποίο επιτρέπει την "
 "εγκατάσταση και/ή την ενημέρωση της Mageia και κατ' επέκταση κάθε φυσικό "
 "μέσο (DVD, κλειδί USB, ...) που το αρχείο ISO έχει αντιγραφεί."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:36
+#: en/SelectAndUseISOs2.xml:67
 msgid ""
 "You can find Mageia ISO's <link ns4:href=\"http://www.mageia.org/en/"
 "downloads/\">here</link>."
@@ -3484,226 +3771,207 @@ msgstr ""
 "en/downloads/\">εδώ</link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:39
+#: en/SelectAndUseISOs2.xml:70
 msgid "Classical installation media"
 msgstr "Μέσο κλασσικής εγκατάστασης"
 
 #. 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 "Κοινά χαρακτηριστικά"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:44
-msgid "These ISOs use the Classical installer called drakx."
+#: en/SelectAndUseISOs2.xml:75
+#, fuzzy
+msgid "These ISOs use the Classical installer called DrakX"
 msgstr "Τα ISO χρησιμοποιούν τον κλασσικό εγκαταστάτη 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 ""
 "Χρησιμοποιούνται για την πραγματοποίηση καθαρών εγκαταστάσεων ή για "
 "αναβάθμιση μιας προηγούμενα εγκατεστημένης έκδοσης της Mageia."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:51 en/SelectAndUseISOs2.xml:83
-#: en/SelectAndUseISOs2.xml:158
-msgid "Different media for 32 and 64 bit architectures."
+#: en/SelectAndUseISOs2.xml:82 en/SelectAndUseISOs2.xml:118
+#: en/SelectAndUseISOs2.xml:174
+#, fuzzy
+msgid "Different media for 32 and 64-bit architectures"
 msgstr "Διαφορετικά μέσα για αρχιτεκτονική 32 και 64 δυφίων αρχιτεκτονικές."
 
 #. 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 ""
 "μερικά εργαλεία είναι διαθέσιμα στην οθόνη υποδοχής: Διάσωση του συστήματος, "
 "Έλεγχος της μνήμης, Εργαλείο εντοπισμού υλικού."
 
 #. 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 "Κάθε DVD περιέχει πολλά διαθέσιμα γραφικά περιβάλλοντα και γλώσσες."
 
 #. 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 ""
 "Κατά την εγκατάσταση θα ερωτηθείτε για την προσθήκη ιδιόκτητου λογισμικού."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:69
+#: en/SelectAndUseISOs2.xml:102
 msgid "Live media"
 msgstr "Ζωντανό μέσο"
 
 #. 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 ""
 "Μπορεί να χρησιμοποιηθεί για την προεπισκόπηση του λειτουργικού συστήματος "
 "Mageia χωρίς να απαιτείται η εγκατάστασή του. Μπορείτε επίσης να "
 "πραγματοποιήσετε την εγκατάσταση της Mageia αν το επιθυμείτε."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:79
-msgid "Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)."
-msgstr "Κάθε ISO περιέχει μόνο ένα περιβάλλον εργασίας (Plasma, GNOME ή XFCE)."
+#: en/SelectAndUseISOs2.xml:111
+msgid "The Live media also includes an Installer."
+msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:86
-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>"
-msgstr ""
-"<emphasis role=\"bold\">Τα Ζωντανά ISO μπορούν να χρησιμοποιηθούν μόνο για "
-"μια καθαρή εγκατάσταση· δεν μπορούν να χρησιμοποιηθούν για την αναβάθμιση "
-"από προηγούμενη έκδοση.</emphasis>"
+#: en/SelectAndUseISOs2.xml:114
+#, fuzzy
+msgid "Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)"
+msgstr "Κάθε ISO περιέχει μόνο ένα περιβάλλον εργασίας (Plasma, GNOME ή XFCE)."
 
 #. 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 "Περιέχουν ιδιόκτητο λογισμικό."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:96
+#: en/SelectAndUseISOs2.xml:126
 msgid "Live DVD Plasma"
 msgstr "Ζωντανό DVD Plasma"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:99
-msgid "Plasma desktop environment only."
+#: en/SelectAndUseISOs2.xml:129
+#, fuzzy
+msgid "Plasma desktop environment only"
 msgstr "Μόνο το περιβάλλον επιφάνειας εργασίας Plasma."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:102 en/SelectAndUseISOs2.xml:116
-#: en/SelectAndUseISOs2.xml:130
-msgid "All available languages are present."
+#: en/SelectAndUseISOs2.xml:132 en/SelectAndUseISOs2.xml:146
+#: en/SelectAndUseISOs2.xml:160
+#, fuzzy
+msgid "All available languages are present"
 msgstr "Περιέχει όλες τις διαθέσιμες γλώσσες."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:105
-msgid "64 bit architecture only."
-msgstr "Μόνο 64 δυφίων αρχιτεκτονική."
+#: en/SelectAndUseISOs2.xml:135 en/SelectAndUseISOs2.xml:149
+#, fuzzy
+msgid "64-bit architecture only"
+msgstr "Μόνο 64 δυφίων αρχιτεκτονική"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:110
+#: en/SelectAndUseISOs2.xml:140
 msgid "Live DVD GNOME"
 msgstr "Live 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 "Μόνο το περιβάλλον επιφάνειας εργασίας GNOME."
 
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:119
-msgid "64 bit architecture only"
-msgstr "Μόνο 64 δυφίων αρχιτεκτονική"
-
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:124
+#: en/SelectAndUseISOs2.xml:154
 msgid "Live DVD Xfce"
 msgstr "Ζωντανό DVD XFCE"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:127
-msgid "Xfce desktop environment only."
+#: en/SelectAndUseISOs2.xml:157
+#, fuzzy
+msgid "Xfce desktop environment only"
 msgstr "Μόνο το περιβάλλον επιφάνειας εργασίας XFCE."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:133
-msgid "32 or 64 bit architectures."
+#: en/SelectAndUseISOs2.xml:163
+#, fuzzy
+msgid "32 or 64-bit architectures"
 msgstr "Αρχιτεκτονική 32 ή 64 δυφίων."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:139
+#: en/SelectAndUseISOs2.xml:169
 msgid "Net install media"
 msgstr "Μέσο εγκατάστασης δικτύου"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:144
-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 ""
-"Πρόκειται για μικρές εικόνες οι οποίες περιέχουν τα απαραίτητα για την "
-"εκκίνηση του προγράμματος εγκατάστασης drakx και την εύρεση του drakx-"
-"installer-stage2 και άλλων πακέτων που απαιτούνται για τη συνέχιση και την "
-"ολοκλήρωση της εγκατάστασης. Αυτά τα πακέτα μπορεί να βρίσκονται στον σκληρό "
-"δίσκο του υπολογιστή, σε έναν τοπικό σκληρό δίσκο, στο τοπικό δίκτυο ή στο "
-"διαδίκτυο."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:152
-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 ""
-"Αυτά τα μέσα είναι πολύ ελαφριά (μικρότερα από 100 MB) και εξυπηρετούν όταν "
-"το εύρος ζώνης είναι πολύ μικρό για τη λήψη ενός πλήρους DVD, ή όταν ο "
-"υπολογιστής δεν διαθέτει οδηγό DVD ή όταν ο υπολογιστής δεν υποστηρίζει την "
-"εκκίνηση από ένα κλειδί USB."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:161
-msgid "First steps are English language only."
+#: en/SelectAndUseISOs2.xml:177
+#, fuzzy
+msgid "First steps are English language only"
 msgstr "Τα πρώτα βήματα είναι μόνο στην αγγλική γλώσσα."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:166
+#: en/SelectAndUseISOs2.xml:182
 msgid "netinstall.iso"
 msgstr "netinstall.iso"
 
 #. 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 ""
 "Περιέχει μόνο ελεύθερο λογισμικό, για αυτούς που προτιμούν να μην "
 "χρησιμοποιούν ιδιόκτητο λογισμικό."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:175
+#: en/SelectAndUseISOs2.xml:191
 msgid "netinstall-nonfree.iso"
 msgstr "netinstall-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 ""
 "Περιέχει ιδιόκτητο λογισμικό (κυρίως οδηγούς συσκευών, αποκωδικοποιητές...) "
 "για αυτούς που το χρειάζονται."
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:186
+#: en/SelectAndUseISOs2.xml:202
 msgid "Downloading and Checking Media"
 msgstr "Λήψη και έλεγχος των μέσων"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:188
+#: en/SelectAndUseISOs2.xml:204
 msgid "Downloading"
 msgstr "Λήψη"
 
 #. 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 ""
 "Αφού επιλέξατε το αρχείο ISO, μπορείτε να το τηλεφορτώσετε είτε μέσω http "
 "είτε μέσω BitTorrent. Και στις δυο περιπτώσεις, σας παρέχουμε τις "
@@ -3711,48 +3979,63 @@ msgstr ""
 "αν το εύρος ζώνης είναι μικρό. Αν επιλέξετε http, θα δείτε και τις "
 "επεξηγήσεις σχετικά με το άθροισμα ελέγχου."
 
+#. 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: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:191
-msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
+#: en/SelectAndUseISOs2.xml:217
+#, fuzzy
+msgid ""
+"<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:195
-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:"
+#: en/SelectAndUseISOs2.xml:222
+msgid "In the meantime, a window to download the actual ISO will open:"
 msgstr ""
-"Τα md5sum και sha1sum είναι εργαλεία ελέγχου της ακεραιότητας των ISO. "
-"Χρησιμοποιήστε ένα από αυτά και αντιγράψτε το άθροισμα ελέγχου <link linkend="
-"\"integrity\"> για μετέπειτα χρήση</link>. Στη συνέχεια ανοίγει ένα παράθυρο "
-"όπως αυτό:"
 
 #. 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
 msgid "Checking the integrity of the downloaded media"
 msgstr "Έλεγχος της ακεραιότητας του ληφθέντος αρχείου"
 
 #. 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 ""
 "Το άθροισμα ελέγχου που αναφέραμε νωρίτερα είναι ένα ψηφιακό αποτύπωμα "
 "δημιουργημένο από έναν αλγόριθμο από το αρχείο προς λήψη. Μπορείτε να "
@@ -3763,7 +4046,7 @@ msgstr ""
 "χρησιμοποιώντας το BitTorrent."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:214
+#: en/SelectAndUseISOs2.xml:241
 msgid ""
 "To generate the checksum for your downloaded ISO, open a console, (no need "
 "to be root), and:"
@@ -3772,71 +4055,87 @@ msgstr ""
 "τερματικό (δεν χρειάζεται σύνδεση ως root), και:"
 
 #. 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 ""
 "Για χρήση του md5sum, πληκτρολογήστε: <userinput>md5sum διαδρομή/προς/το/"
 "αρχείο/εικόνα.iso</userinput>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:222
+#: en/SelectAndUseISOs2.xml:249
+#, fuzzy
+msgid ""
+"To use the sha1sum, type: <command>sha1sum path/to/the/image/file.iso</"
+"command>"
+msgstr ""
+"Για χρήση του sha1sum, πληκτρολογήστε: <userinput>sha1sum διαδρομή/προς/το/"
+"αρχείο/εικόνα.iso</userinput>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:254
+#, fuzzy
 msgid ""
-"To use sha1sum, type: <userinput>sha1sum path/to/the/image/file.iso</"
-"userinput>"
+"To use the sha512sum, type: <command>sha512sum path/to/the/image/file.iso</"
+"command>"
 msgstr ""
 "Για χρήση του sha1sum, πληκτρολογήστε: <userinput>sha1sum διαδρομή/προς/το/"
 "αρχείο/εικόνα.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 ""
 "και συγκρίνετε το υπολογισμένο άθροισμα στον υπολογιστή σας (ίσως χρειαστεί "
 "να περιμένετε λίγο) με το άθροισμα που δίνεται από τη Mageia."
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:237
+#: en/SelectAndUseISOs2.xml:270
 msgid "Burn or dump the ISO"
 msgstr "Εγγραφή ή αποτύπωση του ISO"
 
 #. 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 ""
 "Το επιβεβαιωμένο ISO μπορεί τώρα να εγγραφεί σε ένα CD/DVD ή να αποτυπωθεί "
 "σε ένα κλειδί USB. Αυτή η διεργασία δεν πρόκειται για μια απλή αντιγραφή "
 "αλλά για την δημιουργία ενός εκκινήσιμου μέσου."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:275
 msgid "Burning the ISO to a CD/DVD"
 msgstr "Εγγραφή του ISO σε ένα 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 ""
 "Όποιο λογισμικό και να χρησιμοποιήσετε, σιγουρευτείτε ότι έχετε επιλέξει την "
 "εγγραφή μιας <emphasis role=\"bold\">εικόνας</emphasis>· η επιλογές εγγραφής "
@@ -3846,48 +4145,56 @@ msgstr ""
 "για περισσότερες πληροφορίες."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:248
+#: en/SelectAndUseISOs2.xml:282
 msgid "Dump the ISO to a USB stick"
 msgstr "Αποτύπωση του ISO σε ένα κλειδί USB"
 
 #. 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 ""
 "Όλα τα Mageia ISO είναι υβριδικά. Αυτό σημαίνει ότι μπορείτε να τα "
 "«αποτυπώσετε» σε ένα κλειδί USB και να το χρησιμοποιήσετε για την εκκίνηση "
 "και εγκατάσταση του συστήματος."
 
 #. 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 ""
 "Η «αποτύπωση» μιας εικόνας σε έναν οδηγό flash θα έχει ως αποτέλεσμα την "
 "διαγραφή των αρχείων και την καταστροφή οποιουδήποτε προηγούμενου συστήματος "
 "αρχείων στη συσκευή. Η χωρητικότητα του οδηγού θα συρρικνωθεί στο μέγεθος "
 "της εικόνας ISO."
 
-#. 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 ""
-"Για να ανακτήσετε την αρχική χωρητικότητα, θα πρέπει να πραγματοποιήσετε εκ "
-"νέου την κατάτμηση και την μορφοποίηση του κλειδιού USB."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:259
+#: en/SelectAndUseISOs2.xml:299
 msgid "Using a graphical tool within Mageia"
 msgstr "Χρήση ενός εργαλείου γραφικού περιβάλλοντος στην Mageia"
 
 #. 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>"
@@ -3897,26 +4204,27 @@ msgstr ""
 "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 "Χρήση ενός εργαλείου γραφικού περιβάλλοντος στα Windows"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:304
 msgid "You could try:"
 msgstr "Μπορείτε να δοκιμάσετε:"
 
 #. 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 ""
 "To <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> "
 "χρησιμοποιώντας την επιλογή της «εικόνας ISO»·"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:271
+#: en/SelectAndUseISOs2.xml:311
 msgid ""
 "<link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
@@ -3925,12 +4233,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 "Χρήση της γραμμής εντολών σε ένα σύστημα GNU/Linux "
 
 #. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:279
+#: en/SelectAndUseISOs2.xml:319
 msgid ""
 "It is potentially *dangerous* to do this by hand. You risk overwriting "
 "potentially valuable existing data if you specify the wrong target device."
@@ -3940,61 +4249,72 @@ msgstr ""
 "λανθασμένα το αναγνωριστικό της συσκευής."
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:325
 msgid "Open a console"
 msgstr "Ανοίξτε ένα τερματικό"
 
 #. 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 ""
 "Συνδεθείτε ως διαχειριστής (root) με την εντολή <userinput>su -</userinput> "
 "(μην ξεχάσετε το τελικό '-' )"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:291
-msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
+#: en/SelectAndUseISOs2.xml:332
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"Root.png\"/> </"
+"imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Root.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 ""
 "Συνδέστε το κλειδί USB (μην το προσαρτήσετε, και μην ανοίξετε μια εφαρμογή ή "
 "διαχειριστή αρχείων που μπορεί να έχει πρόσβαση ή να κάνει ανάγνωση στο "
 "κλειδί)"
 
 #. 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 "Εισάγετε την εντολή <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>"
+#: en/SelectAndUseISOs2.xml:345
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"Fdisk.png\"/> </"
+"imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Fdisk.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 ""
 "Αναζητήστε το όνομα της συσκευής του κλειδιού USB (βάσει του μεγέθους του), "
 "για παράδειγμα <code>/dev/sdb</code> στο παραπάνω στιγμιότυπο· πρόκειται για "
 "ένα κλειδί USB 8GB."
 
 #. 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 ""
 "Εναλλακτικά, μπορείτε να βρείτε το όνομα της συσκευής με την εντολή "
 "<code>dmesg</code>: προς το τέλος στο παράδειγμά μας, μπορείτε να δείτε το "
@@ -4003,7 +4323,7 @@ msgstr ""
 "επίσης ότι η χωρητικότητα είναι 2GB:"
 
 #. 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"
@@ -4045,40 +4365,47 @@ 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
 msgid "<placeholder type=\"screen\" id=\"0\"/>"
 msgstr "<placeholder type=\"screen\" 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 ""
 "Εισαγάγετε την εντολή: <emphasis role=\"bold\"># <userinput>dd if=path/to/"
 "the/ISO/file of=/dev/sdX bs=1M</userinput></emphasis>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:340
-msgid "Where X=your device name eg: /dev/sdd"
+#: en/SelectAndUseISOs2.xml:382
+#, fuzzy
+msgid ""
+"Where <replaceable>X</replaceable>=your device name eg: <filename>/dev/sdd</"
+"filename>"
 msgstr "Όπου «X» = το όνομα της συσκευής, πχ: /dev/sdd"
 
 #. 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 ""
 "Παράδειγμα:<emphasis role=\"bold\"> # <userinput>dd if=/home/user/Downloads/"
 "Mageia-6-x86_64-DVD.iso of=/dev/sdd bs=1M</userinput></emphasis>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><tip><para>
-#: en/SelectAndUseISOs2.xml:345
+#: en/SelectAndUseISOs2.xml:388
+#, fuzzy
 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 ""
 "Μπορεί να σας φανεί χρήσιμο ότι <emphasis role=\"bold\">if</emphasis> "
 "σημαίνει <emphasis role=\"bold\">i</emphasis>nput <emphasis role=\"bold\">f</"
@@ -4087,12 +4414,13 @@ msgstr ""
 "\">f</emphasis>ile (αρχείο εξόδου)"
 
 #. 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 "Εισάγετε την εντολή: # <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 ""
 "Φτάσαμε στο τέλος της διεργασίας και μπορείτε να αποσυνδέσετε το κλειδί USB."
@@ -4103,8 +4431,10 @@ msgid "Select your Country / Region"
 msgstr "Επιλέξτε τη χώρα/περιοχή σας"
 
 #.  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
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
 "\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
@@ -4112,32 +4442,34 @@ msgstr ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
 "\"center\" fileref=\"dx2-selectCountry.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 ""
 "Επιλέξτε τη χώρα ή την περιοχή σας. Αυτό είναι σημαντικό για όλων των ειδών "
 "ρυθμίσεων, όπως το νόμισμα και ο κανονιστικός τομέας ασύρματου δικτύου."
 
-#. 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 ""
 "Αν η χώρα σας δεν εμφανίζεται στη λίστα, κάντε κλικ στην επιλογή "
 "<guilabel>Άλλες χώρες</guilabel> και από εκεί επιλέξτε τη χώρα ή την περιοχή."
 
 #. 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 ""
 "Αν η χώρα σας εμφανίζεται μόνο στη λίστα <guilabel>Άλλες χώρες</guilabel>, "
 "αφού κάνετε κλικ στο κουμπί <guibutton>Εντάξει</guibutton> μπορεί να "
@@ -4145,14 +4477,15 @@ msgstr ""
 "αγνοήσετε, το DrakX θα εφαρμόσει την πραγματική σας επιλογή."
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:33
+#: en/selectCountry.xml:42
 msgid "Input method"
 msgstr "Μέθοδος εισαγωγής"
 
 #. 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. "
@@ -4169,12 +4502,13 @@ msgstr ""
 "πριν την επιλογή των πακέτων."
 
 #. 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 ""
 "Αν παραλείψατε τη ρύθμιση της μεθόδου εισαγωγής κατά την εγκατάσταση, "
 "μπορείτε να μεταβείτε εκ νέου σε αυτή μετά την επανεκκίνηση του "
@@ -4183,30 +4517,35 @@ msgstr ""
 "\">Σύστημα</emphasis>, ή εκτελώντας localedrake ως root."
 
 #. type: Content of: <section><info><title>
-#: en/selectInstallClass.xml:14
+#: en/selectInstallClass.xml:29
 msgid "Install or Upgrade"
 msgstr "Εγκατάσταση ή αναβάθμιση"
 
 #. 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 format=\"PNG\" align=\"center\" fileref=\"dx2-"
 "selectInstallClass.png\"/> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:25
-msgid "Install"
-msgstr "Εγκατάσταση"
+#: en/selectInstallClass.xml:41
+#, fuzzy
+msgid "<emphasis role=\"bold\">Install</emphasis>"
+msgstr "<emphasis role=\"bold\">Σταθμός εργασίας</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:27
+#: en/selectInstallClass.xml:43
+#, fuzzy
 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 ""
 "Χρησιμοποιείστε αυτήν την επιλογή για να πραγματοποιήσετε μια νέα "
 "εγκατάσταση της <application>Mageia</application>. Αυτή η ενέργεια θα "
@@ -4214,27 +4553,29 @@ msgstr ""
 "διατηρήσετε μια ξεχωριστή κατάτμηση /home."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:33
-msgid "Upgrade"
-msgstr "Αναβάθμιση"
+#: en/selectInstallClass.xml:50
+#, fuzzy
+msgid "<emphasis role=\"bold\">Upgrade</emphasis>"
+msgstr "<emphasis role=\"bold\">Εξυπηρετητής</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 ""
 "Αυτή η επιλογή χρησιμεύει στην αναβάθμιση μιας υπάρχουσας εγκατάστασης της "
 "<application>Mageia</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 ""
 "Έχει δοκιμαστεί μόνο η αναβάθμιση από μια <emphasis>ακόμα υποστηριζόμενη</"
 "emphasis> προηγούμενη έκδοση της Mageia όταν κυκλοφόρησε η συγκεκριμένη "
@@ -4243,37 +4584,15 @@ msgstr ""
 "πραγματοποιήσετε μια καθαρή εγκατάσταση διαφυλάσσοντας την κατάτμηση "
 "<literal>/home</literal>."
 
-#. type: Content of: <section><note><para>
-#: en/selectInstallClass.xml:50
-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 ""
-"Αν κάποια στιγμή κατά την εγκατάσταση αποφασίσετε να διακόψετε την "
-"εγκατάσταση, η επανεκκίνηση είναι εφικτή, αλλά σκεφτείτε πολύ καλά πριν το "
-"κάνετε Από τη στιγμή που μια κατάτμηση έχει μορφοποιηθεί ή έχει ξεκινήσει η "
-"εγκατάσταση των ενημερώσεων, ο υπολογιστή σας δεν είναι πια στην ίδια "
-"κατάσταση που ήταν πριν και η επανεκκίνηση θα μπορούσε κάλλιστα να σας "
-"αφήσει με ένα μη λειτουργικό σύστημα. Αν παρόλα αυτά είστε απόλυτα σίγουρος-"
-"η ότι θέλετε να κάνετε επανεκκίνηση, μεταβείτε σε ένα τερματικό πατώντας τα "
-"τρία πλήκτρα <guilabel>Alt Ctrl F2</guilabel> ταυτόχρονα. Στη συνέχεια, "
-"πατήστε <guilabel>Alt Ctrl Delete</guilabel> ταυτόχρονα για να κάνετε "
-"επανεκκίνηση."
-
 #. 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 ""
 "Αν ανακαλύψετε ότι ξεχάσατε να επιλέξετε μια επιπλέον γλώσσα, μπορείτε να "
 "επιστρέψετε από την οθόνη <emphasis role=\"bold\">Εγκατάσταση ή Αναβάθμιση</"
@@ -4282,39 +4601,41 @@ msgstr ""
 "στα επόμενα βήματα της εγκατάστασης."
 
 #. type: Content of: <section><info><title>
-#: en/selectKeyboardLive.xml:3
-msgid "Select keyboard"
+#: en/selectKeyboardLive.xml:14
+#, fuzzy
+msgid "Select Keyboard"
 msgstr "Επιλογή του πληκτρολογίου"
 
 #. 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 ""
-"Θα σας απαιτηθεί να καθορίσετε την διάταξη του πληκτρολογίου σας που "
-"επιθυμείτε να χρησιμοποιήσετε στην Mageia. Η εξ ορισμού επιλογή γίνεται "
-"βάσει της γλώσσας και της ωρολογιακής ζώνης που επιλέξατε προηγουμένως."
 
 #. type: Content of: <section><info><title>
-#: en/selectKeyboard.xml:7
+#: en/selectKeyboard.xml:20
 msgid "Keyboard"
 msgstr "Πληκτρολόγιο"
 
 #. 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."
@@ -4324,16 +4645,17 @@ msgstr ""
 "Π.Α."
 
 #. 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=\"dx2-selectKeyboard.png\" align=\"center\"/"
-"> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" align=\"center\" fileref=\"dx2-"
+"selectInstallClass.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 "
@@ -4351,23 +4673,25 @@ msgstr ""
 "Keyboard_layout</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 ""
 "Αν το πληκτρολόγιό σας δεν βρίσκεται στη λίστα, κάντε κλικ στο "
 "<guibutton>Περισσότερα</guibutton> για να δείτε ένα πληρέστερο κατάστιχο, "
 "και επιλέξτε το πληκτρολόγιό σας από εκεί."
 
-#. 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 ""
 "Μετά την επιλογή ενός πληκτρολογίου από το διάλογο <guibutton>Περισσότερα</"
 "guibutton>, θα επιστρέψετε στον πρώτο διάλογο επιλογής πληκτρολογίου και θα "
@@ -4376,7 +4700,7 @@ msgstr ""
 "επιλεγμένο πληκτρολόγιο από το πλήρες κατάστιχο."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:46
+#: en/selectKeyboard.xml:60
 msgid ""
 "If you choose a keyboard based on non-Latin characters, you will see an "
 "extra dialogue screen asking how you would prefer to switch between the "
@@ -4388,37 +4712,40 @@ msgstr ""
 "του μη λατινικού."
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:15
+#: en/selectLanguage.xml:34
 msgid "Please choose a language to use"
 msgstr "Παρακαλώ επιλέξτε τη γλώσσα που θα χρησιμοποιηθεί"
 
-#. 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 ""
 "Επιλέξτε την γλώσσα που προτιμάτε, αναπτύσσοντας πρώτα τη λίστα της ηπείρου "
 "σας. Η <application>Mageia</application> θα χρησιμοποιήσει αυτή την επιλογή "
 "για τον οδηγό εγκατάστασης και για το εγκατεστημένο σύστημα."
 
-#. 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 ""
 "Επιλέξτε την γλώσσα της προτίμησής σας. Η <application>Mageia</application> "
 "θα χρησιμοποιήσει αυτή την επιλογή για τον οδηγό εγκατάστασης και για το "
 "εγκατεστημένο σύστημα."
 
-#. 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 ""
 "Αν υπάρχει πιθανότητα να χρειαστείτε περισσότερες γλώσσες εγκατεστημένες στο "
@@ -4428,67 +4755,70 @@ msgstr ""
 "γλωσσών με αυτόματο τρόπο μετά την εγκατάσταση."
 
 #. 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 format=\"PNG\" fileref="
 "\"dx2-selectLanguage.png\" align=\"center\"/> </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 ""
 "Παρόλο την επιλογή περισσοτέρων γλωσσών, θα πρέπει να επιλέξετε μια από "
 "αυτές ως την προτιμώμενη γλώσσα στην πρώτη οθόνη επιλογής γλώσσας. Θα "
 "σημειωθεί επίσης ως επιλεγμένη στην οθόνη πολλαπλών γλωσσών."
 
 #. 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 ""
 "Αν η γλώσσα της διάταξης του πληκτρολογίου σας δεν είναι η ίδια με την "
 "προτιμώμενη γλώσσα, τότε είναι ορθό να εγκαταστήσετε και τη γλώσσα του "
 "πληκτρολογίου σας."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:56
-msgid "Mageia uses UTF-8 (Unicode) support by default."
-msgstr "Η Mageia χρησιμοποιεί εξ ορισμού την υποστήριξη UTF-8 (Unicode)."
-
-#. 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 ""
 "Αυτό μπορεί να απενεργοποιηθεί στην οθόνη <emphasis role=\"bold\">Πολλαπλές "
 "γλώσσες</emphasis> αν γνωρίζετε ότι δεν είναι κατάλληλο για τη γλώσσα σας. Η "
 "απενεργοποίηση της υποστήριξης UTF-8 θα εφαρμοστεί σε όλες τις γλώσσες."
 
 #. 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 ""
 "Μπορείτε να αλλάξετε τη γλώσσα του συστήματός σας μετά την εγκατάσταση από "
 "το Κέντρο Ελέγχου Mageia -> Σύστημα -> Διαχειριστείτε την τοπικότητα του "
 "συστήματός σας."
 
 #. type: Content of: <section><info><title>
-#: en/selectMouse.xml:4
+#: en/selectMouse.xml:10
 msgid "Select mouse"
 msgstr "Επιλογή ποντικιού"
 
@@ -4496,17 +4826,19 @@ msgstr "Επιλογή ποντικιού"
 #.  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 format=\"PNG\" align=\"center\" fileref=\"dx2-"
+"selectInstallClass.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."
@@ -4515,26 +4847,29 @@ msgstr ""
 "εδώ να επιλέξετε κάποιο άλλο."
 
 #. 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 ""
 "Συνήθως, <guilabel>Γενικό</guilabel> - <guilabel>Οποιοδήποτε PS/2 και USB "
 "ποντίκι</guilabel> είναι μια καλή επιλογή."
 
 #. 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 ""
 "Επιλέξτε <guilabel>Γενικό</guilabel> - <guilabel>Εξαναγκασμός evdev</"
 "guilabel> για να διαμορφώσετε τα κουμπιά που δεν δουλεύουν σε ένα ποντίκι με "
 "έξι ή περισσότερα κουμπιά."
 
-#. 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 "Προσθήκη ή επεξεργασία μιας καταχώρησης στο μενού Εκκίνησης"
 
@@ -4560,102 +4895,67 @@ msgstr ""
 "efi_and_Mageia</link>"
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:7
-msgid "Bootloader main options"
-msgstr "Κύριες επιλογές του προγράμματος εκκίνησης"
-
-#. type: Content of: <section><section><title>
 #: en/setupBootloader.xml:10
-msgid "Bootloader interface"
+#, fuzzy
+msgid "Bootloader"
 msgstr "Διεπαφή του προγράμματος εκκίνησης"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:11
-msgid "By default, Mageia uses exclusively:"
-msgstr "Εξ ορισμού η Mageia χρησιμοποιεί αποκλειστικά:"
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:13
+msgid "Grub2"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><title>
+#: en/setupBootloader.xml:15
+#, fuzzy
+msgid "Grub2 on Legacy MBR/GPT systems"
+msgstr "GRUB2 σε παλιό σύστημα με MBR/GPT"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:14
+#: en/setupBootloader.xml:17
+#, fuzzy
 msgid ""
-"GRUB2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
+"GRUB2 (with or without graphical menu) will be used exclusively as the "
+"bootloader for a Legacy/MBR or Legacy/GPT system."
 msgstr "GRUB2 (με ή χωρίς γραφικό περιβάλλον) για παλιά συστήματα MBR/GPT"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:18
-msgid "GRUB2-efi for a UEFI system."
-msgstr "GRUB2-efi για ένα σύστημα UEFI"
-
-#. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:22
-msgid "The Mageia graphical menus are nice :)"
-msgstr "Τα γραφικά μενού της Mageia είναι πολύ όμορφα:)"
-
-#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:25
-msgid "GRUB2 on Legacy/MBR and Legacy/GPT systems"
-msgstr "GRUB2 σε παλιό σύστημα με MBR/GPT"
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:27
-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 fileref=\"dx2-"
-"setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
-"setupBootloader.png\"/> </imageobject>"
-
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:34 en/setupBootloader.xml:56
+#: en/setupBootloader.xml:21
+#, fuzzy
 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 ""
-"Μην τροποποιήσετε τη <emphasis role=\"bold\">συσκευή εκκίνησης</emphasis> "
-"εκτός και αν γνωρίζεται τι ακριβώς πράττετε."
+"ένα πρόγραμμα εκκίνησης GRUB2 είτε στο MBR (Master Boot Record) του πρώτου "
+"σκληρού δίσκου ή στην κατάτμηση εκκίνησης του BIOS."
 
-#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:38
-msgid "GRUB2-efi on UEFI systems"
+#. type: Content of: <section><section><itemizedlist><title>
+#: en/setupBootloader.xml:27
+#, fuzzy
+msgid "Grub2-efi on UEFI systems"
 msgstr "GRUB2 σε συστήματα UEFI"
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:39
-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 ""
-"Με ένα σύστημα UEFI, το περιβάλλον χρήστη είναι ελαφρώς διαφορετικό όπως ότι "
-"δεν μπορείτε να επιλέξετε <emphasis role=\"bold\">με</emphasis> ή <emphasis "
-"role=\"bold\">χωρίς γραφικό περιβάλλον</emphasis>."
 
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:42
+#. 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-"
-"setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
-"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 ""
 "Αν η Mageia είναι το μοναδικό σύστημα εγκατεστημένο στον υπολογιστή σας, το "
 "πρόγραμμα εγκατάστασης δημιούργησε μια κατάτμηση ESP (EFI System Partition) "
@@ -4666,155 +4966,91 @@ msgstr ""
 "περισσοτέρων κατατμήσεων ESP, απαιτείται και συνιστάται η χρήση μίας, "
 "ανεξαρτήτου του αριθμού των λειτουργικών συστημάτων που διαθέτετε."
 
-#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:61
-msgid "Using a Mageia bootloader"
-msgstr "Χρησιμοποιώντας το πρόγραμμα εκκίνησης της Mageia"
-
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:62
-msgid ""
-"By default, and according to your system, Mageia writes one of the following:"
-msgstr ""
-"Εξ ορισμού, και αναλόγως με το σύστημά σας, η Mageia δημιουργεί ένα από τα "
-"ακόλουθα:"
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:66
-msgid ""
-"a GRUB2 bootloader either into the MBR (Master Boot Record) of your first "
-"hard drive or in the BIOS boot partition."
-msgstr ""
-"ένα πρόγραμμα εκκίνησης GRUB2 είτε στο MBR (Master Boot Record) του πρώτου "
-"σκληρού δίσκου ή στην κατάτμηση εκκίνησης του BIOS."
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:70
-msgid "a GRUB2-efi bootloader into the ESP"
-msgstr "ένα πρόγραμμα εκκίνησης GRUB2-efi στο ESP"
+#. type: Content of: <section><section><info><title>
+#: en/setupBootloader.xml:46
+#, fuzzy
+msgid "Bootloader Setup"
+msgstr "Διεπαφή του προγράμματος εκκίνησης"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:73
-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."
-msgstr ""
-"Αν έχετε και άλλα λειτουργικά συστήματα εγκατεστημένα, η Mageia προσπαθεί να "
-"τα προσθέσει στο νέο μενού εκκίνησης Mageia. Αν δεν το επιθυμείτε, κάντε "
-"κλικ στο <guibutton>Επόμενο</guibutton> και αποεπιλέξτε το πλαίσιο <emphasis "
-"role=\"bold\">Εντοπισμός ξένου λειτουργικού</emphasis>."
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:49
+msgid "Bootloader main options"
+msgstr "Κύριες επιλογές του προγράμματος εκκίνησης"
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:78
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:51
+#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata fileref=\"live-setupBootloader3.png\" align=\"center\"/> </"
-"imageobject>"
+"\"dx2-setupBootloader.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata fileref=\"live-setupBootloader.png\" xml:id=\"setupBootloader-"
+"im1\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
 "\"> <imagedata fileref=\"live-setupBootloader3.png\" align=\"center\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:87
-msgid "Using an existing bootloader"
-msgstr "Χρήση ενός υπάρχοντος μενού εκκίνησης"
-
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:88
-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."
-msgstr ""
-"Η ακριβής διαδικασία για να προσθέσετε το σύστημά σας Mageia σε ένα υπάρχον "
-"πρόγραμμα εκκίνησης δεν είναι το αντικείμενο σε αυτήν την τεκμηρίωση, ωστόσο "
-"στις περισσότερες περιπτώσεις αυτό θα επιφέρει την εκτέλεση του προγράμματος "
-"εγκατάστασης του εν λόγω μενού εκκίνησης, το οποίο θα πρέπει να εντοπίσει "
-"αυτόματα το σύστημα Mageia και να το εγκαταστήσει. Δείτε στην τεκμηρίωση του "
-"εν λόγω λειτουργικού συστήματος."
-
-#. 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:62
+#, fuzzy
+msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
+msgstr "<emphasis role=\"bold\">Εξυπηρετητής</emphasis>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:96
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:63
 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>."
+"This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI "
+"systems will not see this option here."
 msgstr ""
-"Αν δεν επιθυμείτε μια εκκινήσιμη Mageia, αλλά την αλυσιδωτή φόρτωση από άλλο "
-"λειτουργικό σύστημα, κάντε κλικ στο <guibutton>Επόμενο</guibutton>, και στο "
-"<guibutton>Προηγμένες</guibutton> και επιλέξτε το πλαίσιο <guilabel>Μην "
-"αγγίξεις το ESP ή το MBR</guilabel>."
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:101
-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-"
-"setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-setupBootloader4.png\" align="
-"\"center\"/> </imageobject>"
+#. 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\">Προχωρημένες</emphasis>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:108
-msgid ""
-"You will get a warning that the bootloader is missing, ignore it by clicking "
-"<guibutton>OK</guibutton>."
-msgstr ""
-"Θα λάβετε μια προειδοποίηση ότι το πρόγραμμα εκκίνησης θα αποτύχει, αγνοήστε "
-"το με κλικ στο <guibutton>Εντάξει</guibutton>."
+#. 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 "Αλλάξτε κάτι μόνο αν γνωρίζετε πολύ καλά τι κάνετε."
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:111
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:72
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
-"imageobject>"
+"<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:117
-msgid "Options"
-msgstr "Επιλογές"
-
-#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:119
-msgid "First page"
-msgstr "Πρώτη σελίδα"
+"<emphasis role=\"bold\">Παρακαλώ επιλέξτε το επιθυμητό επίπεδο ασφαλείας</"
+"emphasis>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:120
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:74
+#, 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."
+"This text box lets you set a delay, in seconds, before the default operating "
+"system is started up."
 msgstr ""
 "<guilabel>Καθυστέρηση πριν την εκκίνηση της προεπιλεγμένης εικόνας</"
 "guilabel>: Αυτό σας επιτρέπει τον ορισμό μιας καθυστέρησης σε δευτερόλεπτα "
 "πριν την εκκίνηση του εξ ορισμού λειτουργικού συστήματος."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:122
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:78
+#, fuzzy
+msgid "<emphasis role=\"bold\">Security</emphasis>"
+msgstr "<emphasis role=\"bold\">Εξυπηρετητής</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:79
+#, fuzzy
 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."
+"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 ""
 "<guilabel>Ασφάλεια</guilabel>: Σας επιτρέπει τον ορισμό ενός κωδικού "
 "πρόσβασης για το πρόγραμμα εκκίνησης. Αυτό σημαίνει ότι κατά την εκκίνηση θα "
@@ -4823,36 +5059,52 @@ msgstr ""
 "<emphasis role=\"bold\">root</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:88
+#, fuzzy
+msgid "Choose a password for the bootloader (optional)"
 msgstr ""
 "<guilabel>Κωδικός πρόσβασης</guilabel>: Επιλέξτε έναν κωδικό πρόσβασης για "
 "το πρόγραμμα εκκίνησης.'"
 
-#. 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:91
+#, fuzzy
+msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
+msgstr "<emphasis role=\"bold\">Σταθμός εργασίας</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:92
+#, fuzzy
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the password and DrakX will "
-"check that it matches with the one above."
+"Retype the password and DrakX will check that it matches with the one set "
+"above"
 msgstr ""
 "<guilabel>Κωδικός πρόσβασης (ξανά)</guilabel>: Επαναλάβετε την πληκτρολόγηση "
 "του κωδικού πρόσβασης και το DrakX θα ελέγξει αν ο κωδικός πρόσβασης "
 "ταιριάζει με τον ανωτέρω."
 
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:96 en/setupBootloader.xml:154
+#, fuzzy
+msgid "<emphasis>Advanced</emphasis>"
+msgstr "<emphasis role=\"bold\">Προχωρημένες</emphasis>"
+
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:127 en/setupBootloader.xml:159
-msgid "<guilabel>Advanced</guilabel>"
-msgstr "<guilabel>Προηγμένες</guilabel>"
+#: en/setupBootloader.xml:99
+#, fuzzy
+msgid "<emphasis>Enable ACPI</emphasis>"
+msgstr "<emphasis>Γενικού τύπου</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:100
+#, fuzzy
 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)."
+"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 ""
 "<guilabel>Ενεργοποίηση του ACPI:</guilabel> Το ACPI (Advanced Configuration "
 "and Power Interface - Εξελιγμένη διεπαφή ρύθμισης και διαχείρισης ενέργειας) "
@@ -4862,92 +5114,253 @@ msgstr ""
 "αν εκτιμάτε ότι η ενσωμάτωση του ACPI μπορεί να προκαλέσει κάποια προβλήματα "
 "(για παράδειγμα τυχαίες επανεκκινήσεις ή κωλύματα του συστήματος)."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:133
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:108
+#, fuzzy
+msgid "<emphasis>Enable SMP</emphasis>"
+msgstr "<emphasis>Γενικού τύπου</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:109
+#, fuzzy
 msgid ""
-"<guilabel>Enable SMP</guilabel>: This option enables/disables symmetric "
-"multiprocessing for multi core processors."
+"This option enables/disables symmetric multiprocessing for multi-core "
+"processors"
 msgstr ""
 "<guilabel>Ενεργοποίηση του SMP</guilabel>: Αυτή η επιλογή απ-ενεργοποιεί την "
 "συμμετρική πολυδιεργασία για επεξεργαστές πολλαπλών πυρήνων. "
 
-#. 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:113
+#, fuzzy
+msgid "<emphasis>Enable APIC</emphasis>"
+msgstr "<emphasis>Γενικού τύπου</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:114
+#, fuzzy
 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."
+"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 ""
 "<guilabel>Ενεργοποίηση του APIC</guilabel>: Δίνει στο λειτουργικό σύστημα "
 "πρόσβαση στον προηγμένο προγραμματιζόμενο ελεγκτή διακοπών ( Advanced "
 "Programmable Interrupt Controller). Οι συσκευές APIC επιτρέπουν περισσότερο "
 "πολύπλοκα πρότυπα, και προηγμένη διαχείριση IRQ (Αιτήσεις διακοπτών)."
 
-#. 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:120
+#, fuzzy
+msgid "<emphasis>Enable Local APIC</emphasis>"
+msgstr "<emphasis>Γενικού τύπου</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:121
+#, fuzzy
 msgid ""
-"<guilabel>Enable Local APIC</guilabel>: Local APIC manages all external "
-"interrupts for a specific processor in an SMP system."
+"Here you can set Local APIC, which manages all external interrupts for a "
+"specific processor in an SMP system"
 msgstr ""
 "<guilabel>Ενεργοποίηση τοπικού APIC</guilabel>: Το τοπικό APIC, το οποίο "
 "διαχειρίζεται όλους τους εξωτερικούς διακόπτες για μερικούς εξειδικευμένους "
 "επεξεργαστές σε ένα σύστημα SMP."
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:143
-msgid "Next page"
-msgstr "Επόμενη σελίδα"
+#: en/setupBootloader.xml:127
+#, fuzzy
+msgid "Bootloader Configuration"
+msgstr "Ρύθμιση του ήχου"
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:129
+#, fuzzy
+msgid ""
+"<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 align=\"center\" fileref="
+"\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata fileref=\"live-setupBootloader3.png\" align=\"center\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:139
+#, fuzzy
+msgid "<emphasis role=\"bold\">Default</emphasis>"
+msgstr "<emphasis role=\"bold\">Εξυπηρετητής</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:146
-msgid "<guilabel>Default:</guilabel> Operating system started up by default"
+#: en/setupBootloader.xml:140
+#, fuzzy
+msgid "The operating system to started up by default"
 msgstr ""
 "<guilabel>Εξ ορισμού:</guilabel> Το λειτουργικό σύστημα που εκκινείται εξ "
 "ορισμού"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:150
+#: en/setupBootloader.xml:143
+#, fuzzy
+msgid "<emphasis role=\"bold\">Append</emphasis>"
+msgstr "<emphasis role=\"bold\">Προχωρημένες</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:144
+#, 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."
+"This option lets you pass information to the kernel or tell the kernel to "
+"give you more information as it boots"
 msgstr ""
 "<guilabel>Προσάρτηση:</guilabel> Αυτή η επιλογή σας δίνει την δυνατότητα να "
 "προσαρτήσετε επιλογές στον πυρήνα ή να πείτε στον πυρήνα να σας εμφανίσει "
 "περισσότερες πληροφορίες κατά την εκκίνηση."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:155
+#: en/setupBootloader.xml:148
+#, fuzzy
+msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
+msgstr "<emphasis role=\"bold\">Εξυπηρετητής</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:149
+#, fuzzy
 msgid ""
-"<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
-"\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
+"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 ""
-"<guilabel>Εντοπισμός ξένου λειτουργικού συστήματος</guilabel>: Δείτε "
-"παραπάνω <link linkend=\"setupMageiaBootloader\">Χρήση του προγράμματος "
-"εκκίνησης Mageia</link>"
+"Αν έχετε και άλλα λειτουργικά συστήματα εγκατεστημένα, η Mageia προσπαθεί να "
+"τα προσθέσει στο νέο μενού εκκίνησης Mageia. Αν δεν το επιθυμείτε, κάντε "
+"κλικ στο <guibutton>Επόμενο</guibutton> και αποεπιλέξτε το πλαίσιο <emphasis "
+"role=\"bold\">Εντοπισμός ξένου λειτουργικού</emphasis>."
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:156
+#, fuzzy
+msgid ""
+"<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 align=\"center\" fileref="
+"\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata fileref=\"live-setupBootloader3.png\" align=\"center\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:166
+#, fuzzy
+msgid "<emphasis>Video mode</emphasis>"
+msgstr "<emphasis>Κατασκευαστής</emphasis>"
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:159
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:167
+#, fuzzy
 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."
+"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 ""
 "<guilabel>Λειτουργία βίντεο</guilabel>: Ορίζει το μέγεθος της οθόνης και το "
 "χρωματικό βάθος που θα χρησιμοποιεί το πρόγραμμα εκκίνησης Αν κάνετε κλικ "
 "στο κάτω τρίγωνο θα εμφανιστούν οι επιλογές μεγέθους και χρωματικού βάθους."
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:162
+#. 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>Κατασκευαστής</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:173
 msgid ""
-"<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
-"linkend=\"setupChainLoading\">Using the chain loading</link>"
+"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 ""
-"<emphasis role=\"bold\">Μην αγγίξεις το ESP ή το MBR</emphasis>: δείτε "
-"παραπάνω <link linkend=\"setupChainLoading\">Χρήση της αλυσιδωτής φόρτωσης</"
-"link>"
+
+#. 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=\"live-setupBootloader5.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:188
+#, fuzzy
+msgid "Other Options"
+msgstr "Επιλογές"
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:190
+msgid "Using an existing bootloader"
+msgstr "Χρήση ενός υπάρχοντος μενού εκκίνησης"
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:191
+#, fuzzy
+msgid ""
+"The exact procedure for adding Mageia to an existing bootloader is beyond "
+"the scope of this documentation. However in most cases it will involve "
+"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 ""
+"Η ακριβής διαδικασία για να προσθέσετε το σύστημά σας Mageia σε ένα υπάρχον "
+"πρόγραμμα εκκίνησης δεν είναι το αντικείμενο σε αυτήν την τεκμηρίωση, ωστόσο "
+"στις περισσότερες περιπτώσεις αυτό θα επιφέρει την εκτέλεση του προγράμματος "
+"εγκατάστασης του εν λόγω μενού εκκίνησης, το οποίο θα πρέπει να εντοπίσει "
+"αυτόματα το σύστημα Mageia και να το εγκαταστήσει. Δείτε στην τεκμηρίωση του "
+"εν λόγω λειτουργικού συστήματος."
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:199
+#, fuzzy
+msgid "Installing Without a Bootloader"
+msgstr "Χρησιμοποιώντας το πρόγραμμα εκκίνησης της Mageia"
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:200
+msgid ""
+"While you can opt to install Mageia without a bootloader (see section 2.1 "
+"Advanced), this is not recommended unless you absolutely know what you are "
+"doing, as without some form of bootloader your operating system will be "
+"unable to start."
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:207
+#, fuzzy
+msgid ""
+"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 ""
+"Για να το κάνετε αυτό θα πρέπει να επεξεργαστείτε χειροκίνητα το /boot/grub2/"
+"custom.cfg ή να χρησιμοποιήσετε το λογισμικό <emphasis role=\"bold\">grub-"
+"customizer</emphasis> (Διαθέσιμο στα αποθετήρια της Mageia)."
+
+#. type: Content of: <section><section><section><note><para>
+#: en/setupBootloader.xml:212
+#, fuzzy
+msgid ""
+"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 ""
+"Για περισσότερες πληροφορίες ανατρέξτε στο wiki μας <link ns:href=\"https://"
+"wikimageiaorg/en/Grub-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-"
+"efi_and_Mageia</link>"
 
 #. type: Content of: <section><info><title>
-#: en/setupSCSI.xml:3
+#: en/setupSCSI.xml:10
 msgid "Setup SCSI"
 msgstr "Διαμόρφωση SCSI"
 
@@ -4959,17 +5372,20 @@ msgstr "Διαμόρφωση 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=\"dx2-setupSCSI.png\" align="
-"\"center\" xml:id=\"setupSCSI-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
 msgid ""
 "DrakX will normally detect hard disks correctly. However, with some older "
 "SCSI controllers it may be unable to determine the correct drivers to use "
@@ -4980,106 +5396,60 @@ msgstr ""
 "με αποτέλεσμα να αποτύχει η εγκατάσταση των απαραίτητων οδηγών."
 
 #. 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 ""
 "Αν συμβαίνει αυτό, θα πρέπει να δηλώσετε χειροκίνητα στο DrakX τους οδηγούς "
 "SCSI που διαθέτετε."
 
-#. type: Content of: <section><para>
-#: en/setupSCSI.xml:35
-msgid "DrakX should then be able to configure the drive(s) correctly."
-msgstr ""
-"Στη συνέχεια, το DrakX θα πρέπει να είναι σε θέση να αναγνωρίσει ποιες "
-"παραμέτρους χρειάζεται για την διαμόρφωση του οδηγού και για να τον θέσει σε "
-"λειτουργία."
-
 #. type: Content of: <section><info><title>
-#: en/soundConfig.xml:3
+#: en/soundConfig.xml:10
 msgid "Sound Configuration"
 msgstr "Ρύθμιση του ήχου"
 
 #.  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
-msgid ""
-"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
-"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
-"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
-
-#. type: Content of: <section><para>
-#: en/soundConfig.xml:14
+#: en/soundConfig.xml:20
+#, 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."
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-soundConfig.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"soundConfig-im1\"/> </imageobject>"
 msgstr ""
-"Σε αυτήν την οθόνη δίνεται το όνομα του οδηγού που έχει επιλέξει ο "
-"εγκαταστάτης για την κάρτα ήχου, ο οποίος θα είναι και ο εξ' ορισμού οδηγός "
-"αν έχουμε έναν."
+"<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 ""
-"Ο προκαθορισμένος οδηγός θα πρέπει να λειτουργεί χωρίς προβλήματα. Ωστόσο, "
-"αν μετά την εγκατάσταση αντιμετωπίζετε προβλήματα, τότε εκτελέστε "
-"<command>draksound</command> ή εκκινήστε το εργαλείο αυτό από το Κέντρο "
-"Ελέγχου Mageia (MCC), επιλέγοντας την καρτέλα <guilabel>Υλικό</guilabel> και "
-"κάνοντας κλικ στο <guilabel>Διαμόρφωση του ήχου</guilabel> στο επάνω δεξί "
-"μέρος της οθόνης. "
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:24
+#: 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 ""
-"Στη συνέχεια, στην οθόνη του εργαλείου <emphasis role=\"bold\">draksound</"
-"emphasis> ή <emphasis role=\"bold\">Διαμόρφωση του ήχου</emphasis>, κάντε "
-"κλικ στο <guibutton>Επίλυση προβλημάτων</guibutton> για να βρείτε χρήσιμες "
-"πληροφορίες επίλυσης του προβλήματος."
 
 #. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:30
+#: en/soundConfig.xml:43
 msgid "Advanced"
 msgstr "Για προχωρημένους"
 
-#. type: Content of: <section><section><para>
-#: en/soundConfig.xml:33
-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 ""
-"Με κλικ στο <emphasis role=\"bold\"><guibutton>Για προχωρημένους</"
-"guibutton></emphasis> στην οθόνη αυτή, κατά την εγκατάσταση, μπορεί να φανεί "
-"χρήσιμο στην περίπτωση που υπάρχουν περισσότεροι διαθέσιμοι οδηγοί αλλά δεν "
-"έχει επιλεγεί ένας προκαθορισμένος οδηγός, ή πιστεύετε ότι ο εγκαταστάτης "
-"επέλεξε έναν λανθασμένα. "
-
-#. type: Content of: <section><section><para>
-#: en/soundConfig.xml:38
-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 ""
-"Σε αυτήν την περίπτωση μπορείτε να επιλέξετε έναν διαφορετικό οδηγό με κλικ "
-"στο <emphasis role=\"bold\"><guibutton>Επιλογή οδηγού</guibutton></emphasis>."
-
 #. type: Content of: <section><info><title>
-#: en/takeOverHdConfirm.xml:3
+#: en/takeOverHdConfirm.xml:10
 msgid "Confirm hard disk to be formatted"
 msgstr "Επιβεβαίωση του σκληρού δίσκου προς μορφοποίηση"
 
@@ -5089,34 +5459,40 @@ msgstr "Επιβεβαίωση του σκληρού δίσκου προς μο�
 #.     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 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-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"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 ""
 "Κάντε κλικ στο <guibutton>Προηγούμενο</guibutton> αν δεν είστε σίγουρος-η "
 "για την επιλογή σας."
 
-#. 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 ""
 "Κάντε κλικ στο <guibutton>Επόμενο</guibutton> για να συνεχίσετε αν είστε "
 "σίγουρος-η ότι και αποδέχεστε την διαγραφή όλων των κατατμήσεων, όλων των "
@@ -5124,41 +5500,40 @@ msgstr ""
 "δίσκο."
 
 #. type: Content of: <section><info><title>
-#: en/testing.xml:9
+#: en/testing.xml:3
 msgid "Testing Mageia as Live system"
 msgstr "Δοκιμάστε την Mageia ως σύστημα Live"
 
 #. type: Content of: <section><section><info><title>
-#: en/testing.xml:14
+#: en/testing.xml:8
 msgid "Live mode"
 msgstr "Λειτουργία Live"
 
+#. 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 ""
-"Λαμβάνετε αυτήν την οθόνη αν επιλέξετε «Εκκίνηση της Mageia». Διαφορετικά "
-"λαμβάνετε το «βήμα της <link linkend=\"doPartitionDisks\">Κατάτμησης</link>»"
-
 #. type: Content of: <section><section><section><info><title>
-#: en/testing.xml:28
+#: en/testing.xml:21
 msgid "Testing hardware"
 msgstr "Έλεγχος του υλικού"
 
 #. 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 ""
 "Ένας από τους στόχους ενός συστήματος Live είναι ο έλεγχος της συμβατότητας "
 "και της σωστής διαχείρισής του από την Mageia. Μπορείτε να ελέγξετε αν όλες "
@@ -5167,71 +5542,69 @@ msgstr ""
 "συσκευές:"
 
 #. 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 "διεπαφή δικτύου: διαμόρφωση με το 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 "κάρτα γραφικών: αν είδατε την προηγούμενη οθόνη, είναι εντάξει."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:47
+#: en/testing.xml:40
 msgid "webcam:"
 msgstr "ιστοκάμερα:"
 
 #. 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 "ήχος: ένας κωδωνισμός εκτελέσθηκε ήδη"
 
 #. 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 "εκτυπωτής: διαμόρφωση και εκτύπωση μιας δοκιμαστικής σελίδας"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:59
+#: en/testing.xml:52
 msgid "scanner: scan a document from ..."
 msgstr "σαρωτής: σάρωση ενός εγγράφου από την συσκευή..."
 
 #. 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 ""
 "Αν όλα είναι εντάξει για εσάς, μπορείτε να προχωρήσετε στην διαδικασία της "
 "εγκατάστασης. Διαφορετικά μπορείτε να εγκαταλείψετε μέσω του κουμπιού εξόδου."
 
-#. 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 ""
 "Η διαμόρφωση που πραγματοποιήσατε εδώ θα διατηρηθεί για την εγκατάσταση."
 
 #. type: Content of: <section><section><section><info><title>
-#: en/testing.xml:72
+#: en/testing.xml:68
 msgid "Launch installation"
 msgstr "Εκκίνηση της εγκατάστασης"
 
-#. 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 ""
 "Για την εκκίνηση της εγκατάστασης του CD Live Mageia ή του Live DVD στον "
 "σκληρό δίσκο ή τον οδηγό SSD, απλά κάντε κλικ στο εικονίδιο «Εγκατάσταση "
@@ -5239,13 +5612,22 @@ msgstr ""
 "linkend=\"doPartitionDisks\">Κατάτμησης</link>» το αυτό με την απευθείας "
 "εγκατάσταση."
 
+#. 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 "Απεγκατάσταση της Mageia "
 
 #. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:9
+#: en/uninstall-Mageia.xml:18
 msgid ""
 "If Mageia didn't convince you or you can't install it correctly - in short "
 "you want get rid of it - that is your right and Mageia also gives you the "
@@ -5257,12 +5639,13 @@ msgstr ""
 "λειτουργικών συστημάτων."
 
 #. 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 ""
 "Αφού πραγματοποιήσετε εφεδρικά αντίγραφα, επανεκκινήστε το DVD εγκατάστασης "
 "της Mageia και επιλέξτε <emphasis role=\"bold\">Διάσωση του συστήματος</"
@@ -5272,14 +5655,18 @@ msgstr ""
 "συστήματος."
 
 #. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:19
-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."
+#: en/uninstall-Mageia.xml:28
+#, fuzzy
+msgid ""
+"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 ""
 "Για να ανάκτηση του χώρου που χρησιμοποιούσαν οι κατατμήσεις Mageia στα "
 "Windows, κάντε κλικ στο <code>Έναρξη -> Πίνακας ελέγχου -> Εργαλεία "
@@ -5290,17 +5677,18 @@ msgstr ""
 "<guibutton>Διαγραφή</guibutton> για να ελευθερώσετε χώρο."
 
 #. 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 ""
 "Αν χρησιμοποιείτε Windows XP, μπορείτε να δημιουργήσετε μια νέα κατάτμηση "
 "και να την μορφοποιήσετε σε (FAT32 ή NTFS). Θα αποκτήσει ένα γράμμα "
 "κατάτμησης."
 
 #. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:30
+#: en/uninstall-Mageia.xml:49
 msgid ""
 "If you have Vista or 7, you have one more possibility, you can extend the "
 "existing partition that is at the left of the freed space. There are other "
@@ -5316,34 +5704,50 @@ msgstr ""
 "αντίγραφα ασφαλείας για όλα τα σημαντικά σας αρχεία."
 
 #. type: Content of: <section><info><title>
-#: en/unused.xml:9
+#: en/unused.xml:3
 msgid "Keep or delete unused material"
 msgstr "Διατήρηση ή αφαίρεση των μη χρησιμοποιούμενων συσκευών "
 
+#. 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=\"reboot-im1\" fileref=\"live-"
+"reboot.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 ""
 "Σε αυτό το βήμα, το πρόγραμμα εγκατάστασης αναζητά τα μη χρησιμοποιούμενα "
 "πακέτα τοπικότητας και υλικού. Έπειτα σας προτείνεται η διαγραφή τους. "
 "Μπορείτε να τα διαγράψετε με ασφάλεια εκτός και αν προβλέπετε την χρήση ενός "
 "επιπλέον υλικού ή τοπικότητας."
 
+#. 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>"
@@ -5352,11 +5756,842 @@ 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 ""
 "Το επόμενο βήμα είναι η αντιγραφή των αρχείων στον σκληρό δίσκο. Αυτή η "
 "διεργασία θα διαρκέσει μερικά λεπτά. Στο τέλος θα λάβετε μια κενή οθόνη για "
 "λίγο, είναι κανονικό."
+
+#~ msgid "User and Superuser Management"
+#~ msgstr "Διαχείριση χρήστη και διαχειριστή"
+
+#~ msgid ""
+#~ "Every partition is shown to the left as: <emphasis role=\"bold\">Device "
+#~ "(capacity, mount point, type).</emphasis>"
+#~ msgstr ""
+#~ "Κάθε κατάτμηση εμφανίζεται στα αριστερά ως ακολούθως: <emphasis role="
+#~ "\"bold\">Συσκευή (χωρητικότητα, σημείο προσάρτησης, τύπος).</emphasis>"
+
+#~ 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>)."
+#~ msgstr ""
+#~ "<emphasis role=\"bold\">Η Συσκευή</emphasis>, συντελείται από: <emphasis "
+#~ "role=\"bold\">σκληρός δίσκος</emphasis>, [<emphasis role=\"bold\">αριθμός "
+#~ "σκληρού δίσκου</emphasis> (γράμμα)], <emphasis role=\"bold\">αριθμός "
+#~ "κατάτμησης</emphasis> (για παράδειγμα, <emphasis role=\"bold\">sda5</"
+#~ "emphasis>)."
+
+#~ msgid "In advanced tab, you will find more options about clock settings."
+#~ msgstr ""
+#~ "Στην καρτέλα των προηγμένων ρυθμίσεων θα βρείτε περισσότερες επιλογές για "
+#~ "τις ρυθμίσεις του ρολογιού."
+
+#~ msgid "From a disc"
+#~ msgstr "Από τον δίσκο"
+
+#~ 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 ""
+#~ "Μπορείτε να εκκινήσετε απευθείας από το μέσο που χρησιμοποιήθηκε για την "
+#~ "εγγραφή της εικόνας (CD-ROM, DVD-ROM...). Συνήθως χρειάζεται απλά να το "
+#~ "εισαγάγετε στον οδηγό CD/DVD και το πρόγραμμα εκκίνησης θα εκτελέσει την "
+#~ "εγκατάσταση αυτόματα μετά την επανεκκίνηση του υπολογιστή. Αν αυτό δεν "
+#~ "συμβεί θα πρέπει να διαμορφώσετε κατάλληλα το BIOS ή να πιέσετε ένα "
+#~ "πλήκτρο που θα σας επιτρέψει να επιλέξετε το περιφερειακό που θα "
+#~ "χρησιμοποιήσει ο υπολογιστής στην εκκίνηση."
+
+#~ msgid ""
+#~ "According to which hardware you have, and how it is configured, you get "
+#~ "either one or another of the two screens below."
+#~ msgstr ""
+#~ "Αναλόγως το υλικό που διαθέτετε, και την διαμόρφωσή του, θα λάβετε μια εκ "
+#~ "των δυο παρακάτω οθονών."
+
+#~ msgid "From a USB device"
+#~ msgstr "Από μια συσκευή USB"
+
+#~ 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 ""
+#~ "Μπορείτε να εκκινήσετε από την συσκευή USB στην οποία αποτυπώσατε την "
+#~ "εικόνα ISO. Αναλόγως τις ρυθμίσεις του BIOS, ο υπολογιστής πιθανώς να "
+#~ "εκκινήσει απευθείας από την συσκευή USB συνδεδεμένη σε μια θύρα. Αν αυτό "
+#~ "δεν συμβεί ίσως θα πρέπει να διαμορφώσετε καταλλήλως το BIOS ή να πιέσετε "
+#~ "σε ένα πλήκτρο που θα σας επιτρέψει να επιλέξετε το περιφερειακό από το "
+#~ "οποίο θα εκκινηθεί ο υπολογιστής."
+
+#~ 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 "Στο μεσαίο μενού, μπορείτε να επιλέξετε μεταξύ τριών ενεργειών:"
+
+#~ 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 ""
+#~ "Εγκατάσταση από τον σκληρό δίσκο: Αυτή η επιλογή επιτρέπει την συνήθης "
+#~ "εκκίνηση από τον σκληρό δίσκο, όταν δεν υπάρχει κάποιο συνδεδεμένο μέσο "
+#~ "(CD/DVD ή ένα κλειδί USB) (δεν δουλεύει στην Mageia 5)."
+
+#~ msgid "In the bottom menu, are the Boot Options:"
+#~ msgstr "Στο μενού στην βάση υπάρχουν οι επιλογές εκκίνησης:"
+
+#~ msgid ""
+#~ "F1 - Help. Explain the options \"splash\", \"apm\", \"acpi\" and \"Ide\""
+#~ msgstr ""
+#~ "F1 - Βοήθεια. Επεξηγεί τις επιλογές \"splash\", \"apm\", \"acpi\" και "
+#~ "\"Ide\""
+
+#~ msgid "F2 - Language. Choose the display language of the screens."
+#~ msgstr "F2 - Γλώσσα. Επιλέξτε την γλώσσα εμφάνισης της οθόνης."
+
+#~ msgid ""
+#~ "F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728"
+#~ msgstr ""
+#~ "F3 - Ανάλυση της οθόνης. Επιλέξτε μεταξύ κειμένου, 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 - Οδηγός. Ναι ή Όχι. Το σύστημα λαμβάνει υπόψιν την ύπαρξη ενός "
+#~ "προαιρετικού δίσκου με μια ενημέρωση ενός οδηγού και θα αιτήσει την "
+#~ "εισαγωγή του κατά την διαδικασία της εγκατάστασης."
+
+#~ msgid ""
+#~ "F6 - Kernel options. This is a way to specify options according to your "
+#~ "hardware and the drivers to use."
+#~ msgstr ""
+#~ "F6 - Επιλογές του πυρήνα. Από εδώ μπορείτε να καθορίσετε τις επιλογές "
+#~ "ανάλογα με το υλικό σας και τους οδηγούς προς χρήση."
+
+#~ msgid "First screen while booting on UEFI system from disk"
+#~ msgstr "Η πρώτη οθόνη εκκινώντας από τον δίσκο σε σύστημα UEFI"
+
+#~ msgid ""
+#~ "You have only the choice to run Mageia in Live mode (first choice)  or to "
+#~ "process the installation (second choice)."
+#~ msgstr ""
+#~ "Διαθέτετε μόνο την επιλογή να εκτελέσετε την Mageia σε λειτουργία Live "
+#~ "(πρώτη επιλογή) ή την διαδικασία της εγκατάστασης (δεύτερη επιλογή)."
+
+#~ 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 ""
+#~ "Σε κάθε περίπτωση, τα πρώτα βήματα θα είναι τα ίδια με την επιλογή της "
+#~ "γλώσσας, της ωρολογιακής ζώνης και του πληκτρολογίου. Στην συνέχεια η "
+#~ "διαδικασία διαφέρει με <link linkend=\"testing\">επιπλέον βήματα της "
+#~ "λειτουργίας Live</link>."
+
+#~ msgid ""
+#~ "Depending on your selection here, you may be offered further screens to "
+#~ "fine-tune your choice."
+#~ msgstr ""
+#~ "Ανάλογα με τις επιλογές σας σε αυτήν την οθόνη, πιθανώς να ερωτηθείτε στη "
+#~ "συνέχεια για επιπλέον επιλογές."
+
+#~ msgid "The settings DrakX chose are usually good."
+#~ msgstr "Οι ρυθμίσεις που επιλέγει το DrakX είναι συνήθως οι βέλτιστες."
+
+#~ 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=\"configureX_card_list-"
+#~ "im1\" align=\"center\" fileref=\"dx2-configureX_card_list.png\" revision="
+#~ "\"1\"/> </imageobject>"
+
+#~ 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 ""
+#~ "Το αποθετήριο <emphasis role=\"bold\">Nonfree</emphasis> θα πρέπει να "
+#~ "ενεργοποιηθεί ρητώς ούτως ώστε να αποκτήσετε πρόσβαση. Αν δεν το κάνατε "
+#~ "προηγουμένως, θα πρέπει να το κάνετε μετά την πρώτη σας επανεκκίνηση."
+
+#~ 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=\"configureX_chooser-im1\" "
+#~ "fileref=\"dx2-configureX_chooser.png\" align=\"center\" revision=\"1\"/> "
+#~ "</imageobject>"
+
+#~ msgid ""
+#~ "<emphasis><guibutton>Graphic card</guibutton></emphasis>: Choose your "
+#~ "card from the list if needed."
+#~ msgstr ""
+#~ "<emphasis><guibutton>Κάρτα γραφικών</guibutton></emphasis>: Επιλέξτε την "
+#~ "κάρτα σας από τη λίστα αν είναι απαραίτητο."
+
+#~ msgid "Incorrect refresh rates may damage your monitor"
+#~ msgstr ""
+#~ "Μια εσφαλμένη συχνότητα ανανέωσης μπορεί να καταστρέψει την οθόνη σας"
+
+#~ 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=\"configureX_monitor-im1\" "
+#~ "fileref=\"dx2-configureX_monitor.png\" align=\"center\" revision=\"1\"/> "
+#~ "</imageobject>"
+
+#~ msgid "<emphasis>Custom</emphasis>"
+#~ msgstr "<emphasis>Προσαρμοσμένο</emphasis>"
+
+#~ msgid "<emphasis>Plug 'n Play</emphasis>"
+#~ msgstr "<emphasis>Άμεσης τοποθέτησης και λειτουργίας</emphasis>"
+
+#~ msgid "the monitor manufacturers name"
+#~ msgstr "το όνομα του μοντέλου της οθόνης"
+
+#~ msgid "the monitor description"
+#~ msgstr "την περιγραφή της οθόνης"
+
+#~ 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 "Κάντε κλικ στο <guibutton>Έγινε</guibutton> όταν είστε έτοιμος-η."
+
+#~ 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-"
+#~ "doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" "
+#~ "align=\"center\"/> </imageobject>"
+
+#~ msgid "Use Free Space"
+#~ msgstr "Χρήση του ελεύθερου χώρου"
+
+#~ msgid "Use Free Space on a Windows Partition"
+#~ msgstr "Χρήση του ελεύθερου χώρου σε μια κατάτμηση των Windows"
+
+#~ msgid ""
+#~ "If you have unused space on an existing Windows partition, the installer "
+#~ "may offer to use it."
+#~ msgstr ""
+#~ "Αν διαθέτετε μη χρησιμοποιούμενο χώρο σε μια υπάρχουσα κατάτμηση Windows, "
+#~ "ο οδηγός εγκατάστασης μπορεί να σας επιτρέψει να τον χρησιμοποιήσετε."
+
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" "
+#~ "align=\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" "
+#~ "align=\"center\"/> </imageobject>"
+
+#~ msgid "Erase and use Entire Disk."
+#~ msgstr "Διαγραφή και χρήση ολόκληρου του δίσκου."
+
+#~ msgid ""
+#~ "Note! This will erase ALL data on the selected hard drive. Take care!"
+#~ msgstr ""
+#~ "Προσοχή! Αυτή η ενέργεια θα διαγράψει ΟΛΑ τα δεδομένα στον επιλεγμένο "
+#~ "σκληρό δίσκο. Να είστε προσεκτικός-ή!"
+
+#~ msgid "Custom disk partitioning"
+#~ msgstr "Προσαρμοσμένη κατάτμηση δίσκων"
+
+#~ 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 ""
+#~ "Αυτό σημαίνει πως από τα 160 GB ελεύθερου χώρου και άνω, το πρόγραμμα "
+#~ "εγκατάστασης δημιουργεί τρεις κατατμήσεις: 50 GB για το <emphasis role="
+#~ "\"bold\">/</emphasis>, 4 GB για το <emphasis role=\"bold\">swap</"
+#~ "emphasis> και τον υπόλοιπο χώρο για το <emphasis role=\"bold\">/home</"
+#~ "emphasis>."
+
+#~ 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 align=\"center\" fileref="
+#~ "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition="
+#~ "\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid "January 2015"
+#~ msgstr "Ιανουάριος 2015"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+
+#~ msgid "Using a Mageia DVD"
+#~ msgstr "Χρήση ενός DVD Mageia"
+
+#~ 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 ""
+#~ "Αυτές είναι οι εξ ορισμού οθόνες καλωσορίσματος κατά τη χρήση ενός Mageia "
+#~ "DVD· η πρώτη είναι αυτή που βλέπετε σε ένα σύστημα UEFI και η δεύτερη σε "
+#~ "ένα παλαιό σύστημα:"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
+
+#~ msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
+
+#~ 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):"
+#~ msgstr ""
+#~ "Από αυτήν την οθόνη μπορείτε να ορίσετε μερικές προτιμήσεις (σημειώστε "
+#~ "ότι οι επιλογές <emphasis role=\"bold\">F1</emphasis> ως <emphasis role="
+#~ "\"bold\">F6</emphasis> είναι διαθέσιμες μόνο σε παλιά συστήματα):"
+
+#~ msgid ""
+#~ "Press <emphasis role=\"bold\">F2</emphasis> to have the installer use a "
+#~ "specific language for the installation."
+#~ msgstr ""
+#~ "Πιέστε <emphasis role=\"bold\">F2</emphasis> για χρήση μιας συγκεκριμένης "
+#~ "γλώσσας για την εγκατάσταση."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "Use the arrow keys to select the language then press <emphasis role=\"bold"
+#~ "\">Enter</emphasis>."
+#~ msgstr ""
+#~ "Χρησιμοποιήστε τα βελάκια για να επιλέξετε τη γλώσσα και πιέστε <emphasis "
+#~ "role=\"bold\">Enter</emphasis>."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+
+#~ msgid "Default: It doesn't alter anything in the default options."
+#~ msgstr "Εξ ορισμού: δεν αλλάζει καμιά από τις προκαθορισμένες επιλογές."
+
+#~ msgid ""
+#~ "Safe Settings: Priority is given to the safer options at the price of a "
+#~ "performance detriment."
+#~ msgstr ""
+#~ "Ασφαλές ρυθμίσεις: δίνεται προτεραιότητα στις επισφαλές επιλογές σε βάρος "
+#~ "της απόδοσης."
+
+#~ msgid ""
+#~ "When you select one of these entries, it modifies the default options "
+#~ "displayed in the <guilabel>Boot Options</guilabel> line."
+#~ msgstr ""
+#~ "Όταν επιλέγετε μια από αυτές τις καταχωρήσεις, τροποποιούνται οι εξ "
+#~ "ορισμού ρυθμίσεις που εμφανίζονται στη γραμμή <guilabel>Επιλογές "
+#~ "εκκίνησης</guilabel>. "
+
+#~ 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 ""
+#~ "Σε μερικές εκδόσεις της Mageia, μπορεί οι επιλογές με το πλήκτρο "
+#~ "<emphasis role=\"bold\">F6</emphasis> να μην εμφανιστούν στην γραμμή "
+#~ "<guilabel>Επιλογές εκκίνησης</guilabel>· ωστόσο, λαμβάνονται κανονικά "
+#~ "υπόψη."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+
+#~ 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 ""
+#~ "Πιέζοντας το πλήκτρο <emphasis role=\"bold\">F1</emphasis> ανοίγει ένα "
+#~ "νέο παράθυρο με επιπλέον διαθέσιμες επιλογές εκκίνησης. Επιλέξτε ένα "
+#~ "αντικείμενο με τα βελάκια και πατήστε <emphasis role=\"bold\">Enter</"
+#~ "emphasis> για περισσότερες λεπτομέρειες ή πιέστε <emphasis role=\"bold"
+#~ "\">Esc</emphasis> για να επιστρέψετε στην οθόνη υποδοχής."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+
+#~ 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 ""
+#~ "Η προβολή λεπτομερειών για την επιλογή της εικόνας εκκίνησης. Πιέστε "
+#~ "<emphasis role=\"bold\">Esc</emphasis> ή επιλέξτε <guilabel>Επιστροφή "
+#~ "στις επιλογές εκκίνησης</guilabel> για να επιστρέψετε στη λίστα επιλογών. "
+#~ "Αυτές οι επιλογές μπορούν να προστεθούν και χειροκίνητα στη γραμμή "
+#~ "<guilabel>Επιλογές εκκίνησης</guilabel>."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "The help is translated in the chosen language with <emphasis role=\"bold"
+#~ "\">F2</emphasis>."
+#~ msgstr ""
+#~ "Η Βοήθεια εμφανίζεται μεταφρασμένη στην επιλεγμένη γλώσσα με το πλήκτρο "
+#~ "<emphasis role=\"bold\">F2</emphasis>."
+
+#~ 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 ""
+#~ "Για περισσότερες πληροφορίες σχετικά με τις επιλογές του πυρήνα σε παλαιά "
+#~ "και UEFI συστήματα, δείτε: <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 "Επιλογή μέσων (Nonfree)"
+
+#~ 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=\"media_selection-im1\" "
+#~ "align=\"center\" revision=\"1\" fileref=\"dx2-media_selection.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid "Summary of miscellaneous parameters"
+#~ msgstr "Σύνοψη των διάφορων παραμέτρων"
+
+#~ msgid "<guilabel>Timezone</guilabel>"
+#~ msgstr "<guilabel>Ζώνη ώρας:</guilabel>"
+
+#~ msgid "<guilabel>Country / Region</guilabel>"
+#~ msgstr "<guilabel>Χώρα / Περιοχή:</guilabel>"
+
+#~ msgid "<guilabel>Bootloader</guilabel>"
+#~ msgstr "<guilabel>Πρόγραμμα εκκίνησης:</guilabel>"
+
+#~ msgid "For more information, see <xref linkend=\"setupBootloader\"/>"
+#~ msgstr ""
+#~ "Για περισσότερες πληροφορίες, δείτε <xref linkend=\"setupBootloader\"></"
+#~ "xref>"
+
+#~ msgid "<guilabel>User management</guilabel>"
+#~ msgstr "<guilabel>Διαχείριση χρηστών:</guilabel>"
+
+#~ msgid "<guilabel>Services</guilabel>:"
+#~ msgstr "<guilabel>Υπηρεσίες</guilabel>:"
+
+#~ msgid "For more information, see <xref linkend=\"configureServices\"/>"
+#~ msgstr ""
+#~ "Για περισσότερες πληροφορίες, δείτε <xref linkend=\"configureServices\"/>"
+
+#~ msgid "<guilabel>Keyboard</guilabel>:"
+#~ msgstr "<guilabel>Πληκτρολόγιο:</guilabel>"
+
+#~ msgid "<guilabel>Mouse</guilabel>:"
+#~ msgstr "<guilabel>Ποντίκι</guilabel>:"
+
+#~ msgid "<guilabel>Sound card</guilabel>:"
+#~ msgstr "<guilabel>Κάρτα ήχου</guilabel>:"
+
+#~ 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 ""
+#~ "Το πρόγραμμα εγκατάστασης χρησιμοποιεί τον προκαθορισμένο οδηγό - αν έχει "
+#~ "καθοριστεί κάποιος. Η δυνατότητα επιλογής ενός διαφορετικού οδηγού "
+#~ "δίνεται μόνον όταν υπάρχουν περισσότεροι οδηγοί για την κάρτα σας, αλλά "
+#~ "κανένας από αυτούς δεν είναι ο προκαθορισμένος."
+
+#~ msgid "<guilabel>Graphical interface</guilabel>:"
+#~ msgstr "<guilabel>Κάρτα γραφικών</guilabel>:"
+
+#~ msgid "<guilabel>Network</guilabel>:"
+#~ msgstr "<guilabel>Δίκτυο</guilabel>:"
+
+#~ msgid "<guilabel>Proxies</guilabel>:"
+#~ msgstr "<guilabel>Διαμεσολαβητές</guilabel>:"
+
+#~ msgid "<guilabel>Security Level</guilabel>:"
+#~ msgstr "<guilabel>Επίπεδο ασφάλειας</guilabel>:"
+
+#~ msgid "Check the option which best suits your usage."
+#~ msgstr "Επιλέξτε την επιλογή που ταιριάζει περισσότερο με τη χρήση σας."
+
+#~ msgid "<guilabel>Firewall</guilabel>:"
+#~ msgstr "<guilabel>Τείχος προστασίας</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 ""
+#~ "Το τείχος προστασίας έχει ως στόχο να είναι το τείχος μεταξύ των "
+#~ "σημαντικών σας δεδομένων και τους κατεργάρηδες του διαδικτύου οι οποίοι "
+#~ "θα ήθελαν να τα εκθέσουν ή να τα κλέψουν."
+
+#~ 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 ""
+#~ "Επιλέξτε τις υπηρεσίες που επιθυμείτε να έχετε πρόσβαση στο σύστημά σας. "
+#~ "Οι επιλογές σας θα εξαρτώνται με την χρήση για την οποία προορίζεται ο "
+#~ "υπολογιστής σας. Για περισσότερες πληροφορίες ανατρέξτε στο <xref linkend="
+#~ "\"firewall\"/>."
+
+#~ 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=\"securityLevel-im1\" "
+#~ "align=\"center\" fileref=\"dx2-securityLevel.png\" revision=\"1\"/> </"
+#~ "imageobject>"
+
+#~ msgid "64 bit architecture only."
+#~ msgstr "Μόνο 64 δυφίων αρχιτεκτονική."
+
+#~ 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 και sha1sum είναι εργαλεία ελέγχου της ακεραιότητας των ISO. "
+#~ "Χρησιμοποιήστε ένα από αυτά και αντιγράψτε το άθροισμα ελέγχου <link "
+#~ "linkend=\"integrity\"> για μετέπειτα χρήση</link>. Στη συνέχεια ανοίγει "
+#~ "ένα παράθυρο όπως αυτό:"
+
+#~ msgid "Select the Save File option, then, click OK."
+#~ msgstr ""
+#~ "Επιλέξτε το Αποθήκευση αρχείου, και στη συνέχεια κάντε κλικ στο Εντάξει."
+
+#~ msgid ""
+#~ "To recover the original capacity, you must redo partitioning and re-"
+#~ "format the USB stick."
+#~ msgstr ""
+#~ "Για να ανακτήσετε την αρχική χωρητικότητα, θα πρέπει να πραγματοποιήσετε "
+#~ "εκ νέου την κατάτμηση και την μορφοποίηση του κλειδιού USB."
+
+#~ msgid "Install"
+#~ msgstr "Εγκατάσταση"
+
+#~ msgid "Upgrade"
+#~ msgstr "Αναβάθμιση"
+
+#~ 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 ""
+#~ "Αν κάποια στιγμή κατά την εγκατάσταση αποφασίσετε να διακόψετε την "
+#~ "εγκατάσταση, η επανεκκίνηση είναι εφικτή, αλλά σκεφτείτε πολύ καλά πριν "
+#~ "το κάνετε Από τη στιγμή που μια κατάτμηση έχει μορφοποιηθεί ή έχει "
+#~ "ξεκινήσει η εγκατάσταση των ενημερώσεων, ο υπολογιστή σας δεν είναι πια "
+#~ "στην ίδια κατάσταση που ήταν πριν και η επανεκκίνηση θα μπορούσε κάλλιστα "
+#~ "να σας αφήσει με ένα μη λειτουργικό σύστημα. Αν παρόλα αυτά είστε απόλυτα "
+#~ "σίγουρος-η ότι θέλετε να κάνετε επανεκκίνηση, μεταβείτε σε ένα τερματικό "
+#~ "πατώντας τα τρία πλήκτρα <guilabel>Alt Ctrl F2</guilabel> ταυτόχρονα. Στη "
+#~ "συνέχεια, πατήστε <guilabel>Alt Ctrl Delete</guilabel> ταυτόχρονα για να "
+#~ "κάνετε επανεκκίνηση."
+
+#~ 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 ""
+#~ "Θα σας απαιτηθεί να καθορίσετε την διάταξη του πληκτρολογίου σας που "
+#~ "επιθυμείτε να χρησιμοποιήσετε στην Mageia. Η εξ ορισμού επιλογή γίνεται "
+#~ "βάσει της γλώσσας και της ωρολογιακής ζώνης που επιλέξατε προηγουμένως."
+
+#~ msgid "Mageia uses UTF-8 (Unicode) support by default."
+#~ msgstr "Η Mageia χρησιμοποιεί εξ ορισμού την υποστήριξη UTF-8 (Unicode)."
+
+#~ 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>"
+
+#~ msgid "By default, Mageia uses exclusively:"
+#~ msgstr "Εξ ορισμού η Mageia χρησιμοποιεί αποκλειστικά:"
+
+#~ msgid "GRUB2-efi for a UEFI system."
+#~ msgstr "GRUB2-efi για ένα σύστημα UEFI"
+
+#~ msgid "The Mageia graphical menus are nice :)"
+#~ msgstr "Τα γραφικά μενού της Mageia είναι πολύ όμορφα:)"
+
+#~ 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 fileref=\"dx2-"
+#~ "setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata xml:id=\"setupBootloader-im1\" fileref="
+#~ "\"live-setupBootloader.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "Don't modify the <emphasis role=\"bold\">Boot Device</emphasis> unless "
+#~ "you really know what you are doing."
+#~ msgstr ""
+#~ "Μην τροποποιήσετε τη <emphasis role=\"bold\">συσκευή εκκίνησης</emphasis> "
+#~ "εκτός και αν γνωρίζεται τι ακριβώς πράττετε."
+
+#~ 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 ""
+#~ "Με ένα σύστημα UEFI, το περιβάλλον χρήστη είναι ελαφρώς διαφορετικό όπως "
+#~ "ότι δεν μπορείτε να επιλέξετε <emphasis role=\"bold\">με</emphasis> ή "
+#~ "<emphasis role=\"bold\">χωρίς γραφικό περιβάλλον</emphasis>."
+
+#~ 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-"
+#~ "setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "By default, and according to your system, Mageia writes one of the "
+#~ "following:"
+#~ msgstr ""
+#~ "Εξ ορισμού, και αναλόγως με το σύστημά σας, η Mageia δημιουργεί ένα από "
+#~ "τα ακόλουθα:"
+
+#~ msgid "a GRUB2-efi bootloader into the ESP"
+#~ msgstr "ένα πρόγραμμα εκκίνησης GRUB2-efi στο ESP"
+
+#~ msgid "Using chain loading"
+#~ msgstr "Χρήση αλυσιδωτής φόρτωσης"
+
+#~ 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>."
+#~ msgstr ""
+#~ "Αν δεν επιθυμείτε μια εκκινήσιμη Mageia, αλλά την αλυσιδωτή φόρτωση από "
+#~ "άλλο λειτουργικό σύστημα, κάντε κλικ στο <guibutton>Επόμενο</guibutton>, "
+#~ "και στο <guibutton>Προηγμένες</guibutton> και επιλέξτε το πλαίσιο "
+#~ "<guilabel>Μην αγγίξεις το ESP ή το MBR</guilabel>."
+
+#~ 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-"
+#~ "setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-setupBootloader4.png\" "
+#~ "align=\"center\"/> </imageobject>"
+
+#~ msgid ""
+#~ "You will get a warning that the bootloader is missing, ignore it by "
+#~ "clicking <guibutton>OK</guibutton>."
+#~ msgstr ""
+#~ "Θα λάβετε μια προειδοποίηση ότι το πρόγραμμα εκκίνησης θα αποτύχει, "
+#~ "αγνοήστε το με κλικ στο <guibutton>Εντάξει</guibutton>."
+
+#~ msgid "First page"
+#~ msgstr "Πρώτη σελίδα"
+
+#~ msgid "<guilabel>Advanced</guilabel>"
+#~ msgstr "<guilabel>Προηγμένες</guilabel>"
+
+#~ msgid "Next page"
+#~ msgstr "Επόμενη σελίδα"
+
+#~ msgid ""
+#~ "<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
+#~ "\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
+#~ msgstr ""
+#~ "<guilabel>Εντοπισμός ξένου λειτουργικού συστήματος</guilabel>: Δείτε "
+#~ "παραπάνω <link linkend=\"setupMageiaBootloader\">Χρήση του προγράμματος "
+#~ "εκκίνησης Mageia</link>"
+
+#~ msgid ""
+#~ "<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above "
+#~ "<link linkend=\"setupChainLoading\">Using the chain loading</link>"
+#~ msgstr ""
+#~ "<emphasis role=\"bold\">Μην αγγίξεις το ESP ή το MBR</emphasis>: δείτε "
+#~ "παραπάνω <link linkend=\"setupChainLoading\">Χρήση της αλυσιδωτής "
+#~ "φόρτωσης</link>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-setupSCSI.png\" "
+#~ "align=\"center\" xml:id=\"setupSCSI-im1\" revision=\"1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-setupSCSI.png\" "
+#~ "align=\"center\" xml:id=\"setupSCSI-im1\" revision=\"1\"/> </imageobject>"
+
+#~ msgid "DrakX should then be able to configure the drive(s) correctly."
+#~ msgstr ""
+#~ "Στη συνέχεια, το DrakX θα πρέπει να είναι σε θέση να αναγνωρίσει ποιες "
+#~ "παραμέτρους χρειάζεται για την διαμόρφωση του οδηγού και για να τον θέσει "
+#~ "σε λειτουργία."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" "
+#~ "xml:id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" "
+#~ "xml:id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
+
+#~ 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 ""
+#~ "Σε αυτήν την οθόνη δίνεται το όνομα του οδηγού που έχει επιλέξει ο "
+#~ "εγκαταστάτης για την κάρτα ήχου, ο οποίος θα είναι και ο εξ' ορισμού "
+#~ "οδηγός αν έχουμε έναν."
+
+#~ 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 ""
+#~ "Ο προκαθορισμένος οδηγός θα πρέπει να λειτουργεί χωρίς προβλήματα. "
+#~ "Ωστόσο, αν μετά την εγκατάσταση αντιμετωπίζετε προβλήματα, τότε εκτελέστε "
+#~ "<command>draksound</command> ή εκκινήστε το εργαλείο αυτό από το Κέντρο "
+#~ "Ελέγχου Mageia (MCC), επιλέγοντας την καρτέλα <guilabel>Υλικό</guilabel> "
+#~ "και κάνοντας κλικ στο <guilabel>Διαμόρφωση του ήχου</guilabel> στο επάνω "
+#~ "δεξί μέρος της οθόνης. "
+
+#~ 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 ""
+#~ "Στη συνέχεια, στην οθόνη του εργαλείου <emphasis role=\"bold\">draksound</"
+#~ "emphasis> ή <emphasis role=\"bold\">Διαμόρφωση του ήχου</emphasis>, κάντε "
+#~ "κλικ στο <guibutton>Επίλυση προβλημάτων</guibutton> για να βρείτε "
+#~ "χρήσιμες πληροφορίες επίλυσης του προβλήματος."
+
+#~ 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 ""
+#~ "Με κλικ στο <emphasis role=\"bold\"><guibutton>Για προχωρημένους</"
+#~ "guibutton></emphasis> στην οθόνη αυτή, κατά την εγκατάσταση, μπορεί να "
+#~ "φανεί χρήσιμο στην περίπτωση που υπάρχουν περισσότεροι διαθέσιμοι οδηγοί "
+#~ "αλλά δεν έχει επιλεγεί ένας προκαθορισμένος οδηγός, ή πιστεύετε ότι ο "
+#~ "εγκαταστάτης επέλεξε έναν λανθασμένα. "
+
+#~ 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 ""
+#~ "Σε αυτήν την περίπτωση μπορείτε να επιλέξετε έναν διαφορετικό οδηγό με "
+#~ "κλικ στο <emphasis role=\"bold\"><guibutton>Επιλογή οδηγού</guibutton></"
+#~ "emphasis>."
+
+#~ 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 format=\"PNG\" fileref=\"live-"
+#~ "takeOverHdConfirm.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"classical\"> <imagedata format=\"PNG\" fileref=\"dx2-"
+#~ "takeOverHdConfirm.png\" align=\"center\"/> </imageobject>"
+
+#~ msgid ""
+#~ "You get this screen if you selected \"Boot Mageia\". If not, you get the "
+#~ "\"<link linkend=\"doPartitionDisks\">Partitioning</link> step\""
+#~ msgstr ""
+#~ "Λαμβάνετε αυτήν την οθόνη αν επιλέξετε «Εκκίνηση της Mageia». Διαφορετικά "
+#~ "λαμβάνετε το «βήμα της <link linkend=\"doPartitionDisks\">Κατάτμησης</"
+#~ "link>»"
diff --git a/docs/docs/stable/installer/eo.po b/docs/docs/stable/installer/eo.po
index c9d0bb8d..1b54e0d1 100644
--- a/docs/docs/stable/installer/eo.po
+++ b/docs/docs/stable/installer/eo.po
@@ -9,7 +9,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:38+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
@@ -22,12 +22,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 "Licenco kaj publikig-notoj"
 
 #. type: Content of: <section><mediaobject>
-#: en/acceptLicense.xml:29
+#: en/acceptLicense.xml:35
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
@@ -44,81 +44,87 @@ msgstr ""
 "> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/acceptLicense.xml:40
+#: en/acceptLicense.xml:46
 msgid "License Agreement"
 msgstr "Licenco"
 
-#. 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 ""
 "Antaŭ ol instali <application>Magejon</application>, bv. legi la licencon "
 "zorgeme."
 
-#. 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 ""
 "Ĉi tiuj kondiĉoj aplikiĝas al la tuta distribuaĵo <application>Magejo</"
 "application> kaj devas esti akceptataj antaŭ ol daŭrigi la instaladon."
 
-#. 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 ""
 "Por akcepti nur selektu <guilabel>Akceptu</guilabel> kaj klaku sur "
 "<guibutton>Sekvanta</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 ""
 "Se vi decidas ne akcepti tiujn kondiĉojn, tiam ni dankas vin pro via "
 "rigardo. Klakante sur <guibutton>Ĉesu</guibutton> vi reŝarĝos vian "
 "komputilon."
 
 #. type: Content of: <section><section><info><title>
-#: en/acceptLicense.xml:63
+#: en/acceptLicense.xml:76
 msgid "Release Notes"
 msgstr "Publikig-notoj"
 
 #. 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 ""
 "Por vidi kio estas nova en ĉi tiu versio de <application>Magejo</"
 "application>, klaku sur la butono <guibutton>Publikig-notoj (Release Notes)</"
 "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 "eo"
 
 #. 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 "Selekto de datumportilo (Konfiguru aldonaj instal-datumportiloj)"
 
 #.  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."
@@ -130,60 +136,66 @@ msgstr ""
 "add_supplemental_media-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:19
+#: en/add_supplemental_media.xml:23
 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 ""
 
 #. 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 "Por interreta datumportilo sekvighos per du pashoj:"
 
 #. 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 "Selekti kaj aktivigi de retkonekto, se jam ne estas enshaltita"
 
 #. type: Content of: <section><orderedlist><listitem><para>
-#: en/add_supplemental_media.xml:32
+#: en/add_supplemental_media.xml:36
 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 ""
 
 #. type: Content of: <section><note><para>
-#: en/add_supplemental_media.xml:42
+#: en/add_supplemental_media.xml:46
 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/addUser.xml:3
-msgid "User and Superuser Management"
-msgstr "Uzula kaj superuzula administrado"
+#: en/addUser.xml:9
+#, fuzzy
+msgid "User Management"
+msgstr "Sperta uzulo-administrado"
 
 #.  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"
@@ -191,21 +203,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 "Kreo de mastrumanta pasvorto (Set administrator (root) password):"
 
 #. 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 ""
 "Estas konsilinde por ĉiuj instaloj de <application>Magejo</application> krei "
 "superuzulan pasvorton, kutime nomita la <emphasis>mastrumanta (root) "
@@ -216,10 +228,10 @@ msgstr ""
 "mistajpis la unuan pasvorton dank'al komparo inter ambaŭ."
 
 #. 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 ""
 "En ĉiuj pasvortoj diferenciĝas inter majuskloj kaj minuskloj, estas pli bone "
@@ -227,89 +239,110 @@ msgstr ""
 "karaktroj en pasvorto."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:42
+#: en/addUser.xml:57
 msgid "Enter a user"
 msgstr "Enigo de uzulo (Enter a user)"
 
 #. 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 ""
 "Aldonu uzulon ĉi tie. Uzulo havas malpli da rajtoj ol la superuzulo (root), "
 "sed sufiĉajn por retumi, utiligi oficej-programojn aŭ ludi komputil-ludojn "
 "kaj por io ajn kion la averaĝa uzulo faras perkomputile"
 
 #. 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 "\"Free space preceding (MiB)\" \"2\""
+
+#. 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>Piktogramo</guibutton>: se vi klakas sur ĉi tiu butono vi ŝanĝos "
 "la uzulan ikonon."
 
 #. 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 "\"Free space preceding (MiB)\" \"2\""
+
+#. 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>Vera nomo</guilabel>: Metu la uzulan realan nomon en ĉi tiu teksta "
 "skatolo."
 
 #. 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 "\"Free space preceding (MiB)\" \"2\""
+
+#. 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>Saluta nomo (login name)</guilabel>: Ĉi tie eniru la uzulan "
 "salutan nomon aŭ lasu ke drakx-o utiligu version de la uzula vera nomo. "
 "<emphasis>La saluta nomo diferencigas inter majuskloj kaj minuskloj.</"
 "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 "\"Free space preceding (MiB)\" \"2\""
+
 #. 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>Pasvorto</guilabel>: En ĉi tiu teksta skatolo vi devus tajpi la "
 "uzulan pasvorton. Estas kampo je la fino de la teksto-skatolo indikanta la "
 "forton de la pasvorto. (Vidu ankaŭ <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>Pasvorto (denove)</guilabel>: Retajpu la uzulan pasvorton en ĉi "
 "tiu teksta skatolo kaj darkx kontrolos ĉu la pasvorto estas la sama en ĉiuj "
 "uzulaj pasvortaj teksto-skatoloj."
 
 #. 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 ""
 "Any user you add while installing Mageia, will have a world readable (but "
 "write protected) home directory."
 
 #. 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</"
@@ -321,59 +354,59 @@ msgstr ""
 "during the install. Choose <emphasis>User management</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 "The access permissions can also be changed after the install."
 
 #. 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 "Sperta uzulo-administrado"
 
 #. 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 ""
 "Se la <guibutton>Progresinta</guibutton> butono estas klakita aperos ekrano "
 "ebliganta eldoni la konfiguron de la aldonata uzulo."
 
 #. 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>Ŝelo</guilabel>: Ĉi tio vidigos liston ebligantan ŝanĝi la \"shell"
 "\"-on uzatan de la uzulo aldonita en la antaŭa ekrano. Oni povas elekti Bash-"
 "on, Dash-on kaj Sh-on"
 
 #. 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>Uzula ID</guilabel>: Ĉi tie vi povas starigi uzulan identigilon "
 "por la uzulo aldonita en la antaŭa ekrano. La identigilo estas nombro.  Lasu "
 "ĝin malplena se vi ne scias kion fari."
 
 #. 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 "Elekti surmetingojn"
 
@@ -388,16 +421,17 @@ msgstr "Elekti surmetingojn"
 #.        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="
@@ -407,56 +441,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 ""
 "Ĉi tie vi vidas la linuksajn subdiskojn kiuj estis trovitaj en via "
 "komputilo. Se vi ne akordas kun la sugestoj de <application>DrakX</"
 "application> vi povas ŝanĝi la surmetingojn."
 
-#. 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 ""
-"Se vi ŝanĝas ion, certiĝu pri tio ke vi daŭre havas <literal>/</literal> "
-"(radikan) subdiskon."
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:46
-#, fuzzy
-msgid ""
-"Every partition is shown to the left as: <emphasis role=\"bold\">Device "
-"(capacity, mount point, type).</emphasis>"
-msgstr ""
-"Ĉiu subdisko estas montrita tiel: \"Aparato\" (\"Kapablo\", \"Surmetingo\", "
-"\"Speco\")."
-
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:50
+#: en/ask_mntpoint_s.xml:55
 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 ""
 "Se vi havas multajn subdiskojn, vi povas elekti multajn malsamajn "
 "surmetingojn per la faldebla menuo, kiel <literal>/</literal>, <literal>/"
@@ -466,7 +481,7 @@ msgstr ""
 "<literal>/home</literal> subdisko de kaldrona instalo."
 
 #. 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 "
@@ -476,281 +491,399 @@ msgstr ""
 "kampon malplena."
 
 #. type: Content of: <section><warning><para>
-#: en/ask_mntpoint_s.xml:69
+#: en/ask_mntpoint_s.xml:79
+#, fuzzy
+msgid ""
+"If you make any changes here, ensure you still have a <filename>/</filename> "
+"(root) partition."
+msgstr ""
+"Se vi ŝanĝas ion, certiĝu pri tio ke vi daŭre havas <literal>/</literal> "
+"(radikan) subdiskon."
+
+#. type: Content of: <section><tip><para>
+#: en/ask_mntpoint_s.xml:84
 #, 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 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 ""
 "Klaku sur <guibutton>Antaŭa</guibutton> se vi ne scias kion elekti, kaj tiam "
 "aktivigu <guilabel>Agordi subdiskon</guilabel>. En la aperonta ekrano, vi "
 "povas klaki sur konkreta subdisko por vidi ĝian specon kaj grandon."
 
 #. 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 ""
 "Se vi certas pri tio ke la surmetingoj estas ĝustaj, klaku sur "
 "<guibutton>Sekvanta</guibutton>, kaj elektu ĉu vi nur volas strukturi la "
 "subdisko(j)n kiu(j)n sugestas DrakX aŭ pli da ili."
 
 #. type: Content of: <section><info><title>
-#: en/bestTime.xml:10
-msgid "Clock settings"
+#: en/bestTime.xml:5
+msgid "Clock Settings"
 msgstr ""
 
 #. 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
 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 ""
 
 #. type: Content of: <section><para>
-#: en/bestTime.xml:23
-msgid "In advanced tab, you will find more options about clock settings."
+#: 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 ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:1
+#: en/bootLive.xml:10
 msgid "Booting the medium"
 msgstr ""
 
-#. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:1
-msgid "From a disc"
-msgstr ""
-
-#. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:1
+#. type: Content of: <section><section><para>
+#: en/bootLive.xml:12
 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."
+"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 ""
 
-#. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:7
-msgid "From a USB device"
+#. 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 ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:12
+#: en/bootLive.xml:35
 msgid "In BIOS/CSM/Legacy mode"
 msgstr ""
 
+#. 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 "\"Free space preceding (MiB)\" \"2\""
+
+#. 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
+msgid "Once the boot is done, you can proceed to the installation."
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/bootLive.xml:45 en/bootLive.xml:57
+#, fuzzy
+msgid ""
+"<emphasis role=\"bold\">+ use non-free video drivers (slower to boot)</"
+"emphasis>"
+msgstr "\"Free space preceding (MiB)\" \"2\""
+
+#. 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 "\"Free space preceding (MiB)\" \"2\""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:54 en/bootLive.xml:157
+msgid "This option will install Mageia to a hard disk."
+msgstr ""
+
+#. 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=\"dx2-diskdrake.png\" align=\"center\"></"
+"imagedata> </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 ""
 
-#. type: Content of: <section><section><para>
-#: en/bootLive.xml:12
-msgid "In the middle menu, you have the choice between three actions:"
+#. 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:75
+msgid "<keycap>F1</keycap> <emphasis role=\"bold\">Help</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:13
+#: en/bootLive.xml:76
 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."
+"Within any of the <keycap>F2</keycap> to <keycap>F6</keycap> options, you "
+"can view relevant help by pressing <keycap>F1</keycap>."
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:81
+msgid "<keycap>F2</keycap> <emphasis role=\"bold\">Language</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:16
+#: en/bootLive.xml:82
 msgid ""
-"Install Mageia: This choice will directly install Mageia on a hard disk."
+"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 ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:87
+msgid "<keycap>F3</keycap> <emphasis role=\"bold\">Video Mode</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:17
+#: en/bootLive.xml:89
 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)."
+"If needed, change the screen resolution by pressing <keycap>F3</keycap>. "
+"Options are: 640x480, 800x600, 1024x768."
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/bootLive.xml:19
-msgid "In the bottom menu, are the Boot Options:"
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:93
+msgid "<keycap>F4</keycap> <emphasis role=\"bold\">Source</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:19
+#: en/bootLive.xml:94
 msgid ""
-"F1 - Help. Explain the options \"splash\", \"apm\", \"acpi\" and \"Ide\""
+"Normally, the installation is performed from the inserted installation "
+"medium. Here, you may select other sources, like FTP or NFS servers."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:20
-msgid "F2 - Language. Choose the display language of the screens."
+#: en/bootLive.xml:95
+msgid ""
+"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 ""
 
 #. 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:98
+msgid "<keycap>F5</keycap> <emphasis role=\"bold\">Driver</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:22
+#: en/bootLive.xml:99
 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 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 ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:26
+#: en/bootLive.xml:104
+#, fuzzy
+msgid "<keycap>F6</keycap> <emphasis role=\"bold\">Kernel Options</emphasis>"
+msgstr "\"Free space preceding (MiB)\" \"2\""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:106
 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 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
+msgid ""
+"<emphasis role=\"bold\">Default:</emphasis> splash quiet noiswmd resume "
+"audit=0"
+msgstr ""
+
+#. 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
+msgid ""
+"<emphasis role=\"bold\">No ACPI:</emphasis> (Advanced Configuration and "
+"Power Interface): Power management features are not used."
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/bootLive.xml:125
+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 ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:28
+#: en/bootLive.xml:131
 msgid ""
-"F6 - Kernel options. This is a way to specify options according to your "
-"hardware and the drivers to use."
+"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 ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:29
+#: en/bootLive.xml:139
 msgid "In UEFI mode"
 msgstr ""
 
 #. 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"
+#: en/bootLive.xml:146
+msgid "First screen while booting in UEFI mode"
 msgstr ""
 
 #. 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 ""
 
-#. type: Content of: <section><section><para>
-#: en/bootLive.xml:30
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:153
 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 ""
 
-#. 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/chooseDesktop.xml:3
+#: en/chooseDesktop.xml:16
 msgid "Desktop Selection"
 msgstr "Grafika medio"
 
 #. 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."
-msgstr "Depende de viaj elektoj ĉi tie, povos aperi aliaj agordaj ekranoj."
+#: en/chooseDesktop.xml:23
+msgid "Some choices made here will open other screens with related options."
+msgstr ""
 
 #. 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 ""
 "Post la selekto-paŝo(j), vi vidos glitan ekranon dum la pakaĵ-instalo.  La "
 "glitado povas esti malaktivigita premante la butonon <guilabel>Detaloj</"
 "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 ""
 "Elektu ĉu vi preferas uzi la labortablajn mediojn <application>KDE-on</"
 "application> aŭ <application>Gnome-on</application>. Ambaŭ venas kun "
@@ -766,8 +899,9 @@ msgid "Package Group Selection"
 msgstr "Pakaĵaj grupoj"
 
 #. 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"
@@ -778,7 +912,7 @@ msgstr ""
 "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 "
@@ -792,22 +926,22 @@ msgstr ""
 "musan montrilon sur ili."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:21
+#: en/choosePackageGroups.xml:23
 msgid "<emphasis role=\"bold\">Workstation</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:25
+#: en/choosePackageGroups.xml:27
 msgid "<emphasis role=\"bold\">Server</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:29
+#: en/choosePackageGroups.xml:31
 msgid "<emphasis role=\"bold\">Graphical Environment</emphasis>"
 msgstr ""
 
 #. 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 "
@@ -817,7 +951,7 @@ msgstr ""
 "forigi permane pakaĵojn."
 
 #. 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 "
@@ -832,8 +966,10 @@ msgid "Choose Individual Packages"
 msgstr "Elekto de individuaj pakaĵoj"
 
 #. 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"
@@ -844,7 +980,7 @@ msgstr ""
 "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."
@@ -853,13 +989,14 @@ msgstr ""
 "instalon."
 
 #. 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 ""
 "Post fari vian elekton, vi povas klaki sur la <guibutton>disketa ikono</"
 "guibutton> sube en la paĝo por konservi vian pakaĵ-elekton (konservi en USB-"
@@ -874,8 +1011,10 @@ msgstr "Konfiguru viajn Servojn"
 
 #.  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"
@@ -886,7 +1025,7 @@ 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."
@@ -894,26 +1033,22 @@ msgstr ""
 "Ĉi tie vi povas decidi kiuj servoj (ne) devus esti lanĉitaj je la starto de "
 "la sistemo."
 
-#. 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 "La elekto kiun faris DrakX estas kutime adekvata."
-
-#. 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."
 msgstr "Se vi elektas servon, iu informo pri ĝi montriĝos en la suba skatolo."
 
 #. 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 "Ŝanĝu aferojn nur se vi scias tre bone kion vi estas faranta."
 
@@ -924,15 +1059,17 @@ msgstr "Konfiguru vian horzonon"
 
 #.  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-"
@@ -940,18 +1077,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 ""
 "Elektu vian horzonon selektante vian landon aŭ urbon proksiman kiu troviĝu "
 "en la sama tempo-zono."
 
 #. 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 "
@@ -961,7 +1098,7 @@ msgstr ""
 "aŭ je GTM, ankaŭ konata kiel 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."
@@ -970,114 +1107,112 @@ msgstr ""
 "ili estas alĝustigitaj ĉiuj je la loka horo aŭ je UTC/GTM."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:13
+#: en/configureX_card_list.xml:24
 msgid "Choose an X Server (Configure your Graphic Card)"
 msgstr ""
 
 #. 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."
 msgstr ""
 
 #. 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:"
 msgstr ""
 
-#. 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
+msgid "Vendor"
 msgstr ""
 
 #. 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
+msgid "then the make of your card"
 msgstr ""
 
 #. 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
+msgid "and the model of card"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:41
+#: en/configureX_card_list.xml:53
 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 ""
 
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:47
+#. type: Content of: <section><caution><para>
+#: en/configureX_card_list.xml:61
 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 ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:51
+#: en/configureX_card_list.xml:65
 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."
-msgstr ""
-
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:56
-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."
+"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 ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:3
+#: en/configureX_chooser.xml:11
 msgid "Graphic Card and Monitor Configuration"
 msgstr "Konfiguri X, grafik-karton kaj monitoron"
 
 #.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
+#. 2018/02/15 apb: Some text and typography.
+#. 2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.
+#. 2018/02/23 apb: Typo.
 #. 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 ""
 "Ne gravas kiun grafikan medion (ankaŭ konata kiel labortabla medio) vi "
 "elektis por ĉi tiu instalo de <application>Magejo</application>, ili ĉiuj "
@@ -1089,23 +1224,33 @@ msgstr ""
 "application> ne elektis konfiguron aŭ vi pensas ke tiu elekto estas malĝusta."
 
 #. 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 "\"Free space preceding (MiB)\" \"2\""
+
+#. 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>Grafik-karto </guibutton></emphasis>: Elektu vian "
-"karton en la listo se bezonate."
 
 #. 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 "\"Free space preceding (MiB)\" \"2\""
+
+#. 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>Ekrano</guibutton></emphasis>: Vi povas elekti "
 "<guilabel>\"Plug'n Play\"</guilabel> siakaze aŭ elekti vian monitoron en la "
@@ -1113,32 +1258,37 @@ msgstr ""
 "<guilabel>Akomodata</guilabel> se vi preferas permane starigi la "
 "horizontalan kaj vertikalan refreŝ-datumon de via monitoro."
 
-#. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/configureX_chooser.xml:41
-msgid "Incorrect refresh rates may damage your monitor"
-msgstr "Malĝustaj refreŝ-datumoj povas damaĝi vian monitoron"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_chooser.xml:60
+#, fuzzy
+msgid "<emphasis role=\"bold\">Resolution</emphasis>"
+msgstr "\"Free space preceding (MiB)\" \"2\""
 
 #. 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>Distingivo</guibutton></emphasis>: Starigu la deziratan "
 "distingivon kaj kolorprofundon de via monitoro ĉi tie."
 
 #. 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 "\"Free space preceding (MiB)\" \"2\""
+
+#. 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>Testo</guibutton></emphasis>: La testo-butono ne ĉiam "
 "aperas dum la instalo. Se la butono estas tie, vi povas testi vian "
@@ -1149,28 +1299,42 @@ msgstr ""
 "via konfiguro estas ĝusta se la testo-butono ne estas disponebla</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 "\"Free space preceding (MiB)\" \"2\""
+
+#. 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>Opcioj</guibutton></emphasis>: Ĉi tie vi povas aktvigi "
 "aŭ malaktivigi kelkajn elektojn."
 
+#. 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 ""
 
 #. 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."
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:19
+#: en/configureX_monitor.xml:30
 msgid ""
 "<emphasis role=\"bold\">Selecting a monitor with different characteristics "
 "could damage your monitor or video hardware. Please don't try something "
@@ -1179,32 +1343,32 @@ msgid ""
 msgstr ""
 
 #. 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 ""
+#. type: Content of: <section><variablelist><varlistentry><term>
+#: en/configureX_monitor.xml:46
+msgid "Custom"
+msgstr "Subdiskigo"
 
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:33
+#. type: Content of: <section><variablelist><varlistentry><listitem><para>
+#: en/configureX_monitor.xml:49
 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."
 msgstr ""
 
-#. 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 "
@@ -1212,175 +1376,180 @@ msgid ""
 "consult your monitor documentation."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:44
-msgid "<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
 msgid ""
-"This is the default option and tries to determine the monitor type from the "
-"monitor database."
-msgstr ""
-
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:51
-msgid "<emphasis>Vendor</emphasis>"
+"This is the default option and automatically tries to determine the monitor "
+"type from the monitor database."
 msgstr ""
 
-#. 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:"
 msgstr ""
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:61
-msgid "the monitor manufacturers name"
+#. 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"
+#. 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>"
+#. 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
 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 ""
 
 #. 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 "Agordi subdiskon per 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-"
 "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </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 ""
-"Se vi volas utiligi ĉifradon en via subdisko <literal>/</literal> vi devas "
-"havi apartan subdiskon <literal>/boot</literal>.  La ĉifrada elekto por la "
-"subdisko <literal>/boot</literal> ne devas esti selektita, alie via sistemo "
-"ne startos."
-
-#. 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 ""
 "Agordu via(j)n disko(j)n ĉi tie. Vi povas forigi aŭ krei subdiskojn, ŝanĝi "
 "la dosiersistemon de subdisko aŭ ŝanĝi ĝian grandon kaj eĉ vidi kio estas en "
 "ĝi antaŭ ol komenci."
 
-#. 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 ""
-"Premu <guibutton>Forviŝu ĉion</guibutton> por forigi ĉiujn subdiskojn en la "
-"elektita stor-aparato"
+"Estas langeto por ĉiu trovita fiksita disko aŭ alispeca stor-aparato kiel "
+"USB-ŝlosilo. Ekzemple sda, sdb kaj sdc se estas tri."
 
-#. 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 ""
 "Por aliaj agoj: klaku sur la dezirata subdisko unue. Tiam vi povos vidi ĝin, "
 "elekti dosiersistemon kaj surmetingon, ŝanĝi ĝian grandon aŭ forigi ĝin."
 
-#. 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 "Daŭrigu ĝis kiam vi agordos ĉion laŭ via deziro."
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:52
-msgid "Click <guibutton>Done</guibutton> when you're ready."
-msgstr "Klaku sur <guibutton>Finata</guibutton> kiam vi estos preta."
+#. 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 ""
+"Premu <guibutton>Forviŝu ĉion</guibutton> por forigi ĉiujn subdiskojn en la "
+"elektita stor-aparato"
 
-#. 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 ""
+"Se vi volas utiligi ĉifradon en via subdisko <literal>/</literal> vi devas "
+"havi apartan subdiskon <literal>/boot</literal>.  La ĉifrada elekto por la "
+"subdisko <literal>/boot</literal> ne devas esti selektita, alie via sistemo "
+"ne startos."
+
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/diskdrake.xml:87
 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 ""
+
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/diskdrake.xml:93
+msgid ""
+"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
+"partition is present and of the correct type. See Figure 2 below."
 msgstr ""
 
-#. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:61
+#. type: Content of: <section><figure><title>
+#: en/diskdrake.xml:101
+#, fuzzy
+msgid "EFI System Partition"
+msgstr "Uzu ekzistantajn subdiskojn"
+
+#. 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-"
 "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </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 ""
 
-#. type: Content of: <section><note><para>
-#: en/diskdrake.xml:72
-msgid ""
-"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
-"partition is present and of the correct type"
+#. type: Content of: <section><figure><title>
+#: en/diskdrake.xml:115
+msgid "BIOS boot partition"
 msgstr ""
 
-#. 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="
@@ -1393,51 +1562,57 @@ msgstr ""
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:9
-msgid "Partitioning"
+#: en/doPartitionDisks.xml:25
+#, fuzzy
+msgid "Suggested Partitioning"
 msgstr "Kreo de subdiskoj"
 
 #. 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 ""
 "En tiu ĉi ekrano vi povas vidi la enhavon de via(j) stor-aparato(j) kaj la "
 "loko-proponon de DrakX por la instalo de <application>Magejo</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 ""
 "La disponeblaj elektoj en la suba listo varios depende de la trajtoj kaj "
 "enhavo de via konkreta(j)  stor-aparato(j)."
 
 #. 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-"
 "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:32
-msgid "Use Existing Partitions"
-msgstr "Uzu ekzistantajn subdiskojn"
+#. type: Content of: <section><itemizedlist><title>
+#: en/doPartitionDisks.xml:47
+msgid "Main Options"
+msgstr ""
 
-#. 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 "\"Free space preceding (MiB)\" \"2\""
+
+#. 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."
@@ -1445,13 +1620,14 @@ msgstr ""
 "Se tiu elekto estas disponebla oni trovis linuks-akordigeblajn subdiskojn "
 "kiuj povas esti utiligataj por la instalo."
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:41
-msgid "Use Free Space"
-msgstr "Uzu liberan spacon"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:59
+#, fuzzy
+msgid "<emphasis role=\"bold\">Use Free Space</emphasis>"
+msgstr "\"Free space preceding (MiB)\" \"2\""
 
-#. 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."
@@ -1459,107 +1635,84 @@ msgstr ""
 "Se vi havas neuzitan spacon en via fiksita disko ĉi tiu elekto uzos ĝin por "
 "nova Mageja instalo."
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:49
-msgid "Use Free Space on a Windows Partition"
-msgstr "Uzu la liberan spacon de vindoza subdisko"
-
-#. 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 ""
-"Se vi havas neuzitan spacon en ekzistanta vindoza subdisko, la instalilo "
-"povas proponi utiligi ĝin."
+"<emphasis role=\"bold\">Use Free Space on a Windows Partition</emphasis>"
+msgstr "\"Free space preceding (MiB)\" \"2\""
 
-#. 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 ""
 "Ĉi tio povas esti utila maniero atingi spacon por via nova Mageja instalo, "
 "sed temas pri riska operacio do vi devus fari sekurec-kopion de ĉiuj gravaj "
 "dosieroj antaŭe!"
 
-#. 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 ""
-"Rimarku ke ĉi tio implikas la ŝrumpigon de la vindoza subdisko. La subdisko "
-"devas esti \"pura\", tio estas Vindozo devis fermiĝi senprobleme la lastan "
-"fojon kiam ĝi estis uzita. Ĝi ankaŭ devas esti malfragmentiĝita kvankam tio "
-"ne estas garantio pri tio ke ĉiuj dosieroj en la subdisko estis movitaj el "
-"la areo uzota. Estas ege rekomendinde realigi sekurec-kopion de viaj "
-"personaj dosieroj."
-
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:69
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:77
 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 ""
 
-#. 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-"
-"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
-
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:87
-msgid "Erase and use Entire Disk."
-msgstr "Forviŝu kaj uzu la tutan diskon."
+msgid "<emphasis role=\"bold\">Erase and use Entire Disk</emphasis>"
+msgstr "\"Free space preceding (MiB)\" \"2\""
 
-#. 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 "Ĉi tiu elekto utiligos la tutan diskon por Magejo."
 
-#. 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 ""
-"Atentu! Ĉi tio forigos ĈIUJN datumojn en la elektita fiksita disko. Estu "
-"zorgema!"
-
-#. 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 ""
 "Se vi volas uzi parton de la disko por alia celo aŭ vi havas datumojn en la "
 "disko kiujn vi ne volas perdi, ne elektu ĉi tion."
 
-#. 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 ""
+"Rimarku ke ĉi tio implikas la ŝrumpigon de la vindoza subdisko. La subdisko "
+"devas esti \"pura\", tio estas Vindozo devis fermiĝi senprobleme la lastan "
+"fojon kiam ĝi estis uzita. Ĝi ankaŭ devas esti malfragmentiĝita kvankam tio "
+"ne estas garantio pri tio ke ĉiuj dosieroj en la subdisko estis movitaj el "
+"la areo uzota. Estas ege rekomendinde realigi sekurec-kopion de viaj "
+"personaj dosieroj."
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:110
 #, fuzzy
-msgid "Custom disk partitioning"
-msgstr "Agordi subdiskon per DiskDrake"
+msgid "<emphasis role=\"bold\">Custom Disk Partitioning</emphasis>"
+msgstr "\"Free space preceding (MiB)\" \"2\""
 
-#. 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)."
@@ -1567,115 +1720,126 @@ msgstr ""
 "Ĉi tio havigas al vi plenan kontrolon sur la lokigo de la instalo en via(j) "
 "fiksita(j)  disko(j)."
 
-#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:112
-msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
+#. type: Content of: <section><mediaobject>
+#: en/doPartitionDisks.xml:120
+#, fuzzy
+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-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </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
 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 ""
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:125
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:141
 msgid ""
 "If the total available space is greater than 50 GB, then three partitions "
 "are created"
 msgstr ""
 
-#. 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
 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 ""
 
-#. 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
+msgid "1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB"
 msgstr ""
 
-#. 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
 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 ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:144
+#: 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 ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:150
+#: en/doPartitionDisks.xml:182
 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 ""
 
 #. 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-"
-"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-setupBootloader2.png\"/> </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 ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
 "previous standard of 512 byte logical sectors. Due to lack of available "
@@ -1685,19 +1849,36 @@ msgstr ""
 "tool like gparted, if you own such a device, and to use the following "
 "settings:"
 
-#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:189
-msgid "<emphasis role=\"bold\">Align to</emphasis> = MiB"
+#. type: Content of: <section><important><para>
+#: en/doPartitionDisks.xml:221
+#, fuzzy
+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 ""
+"Some newer drives are now using 4096 byte logical sectors, instead of the "
+"previous standard of 512 byte logical sectors. Due to lack of available "
+"hardware, the partitioning tool used in the installer has not been tested "
+"with such a drive. Also some ssd drives now use an erase block size over 1 "
+"MB. We suggest to pre-partition the drive, using an alternative partitioning "
+"tool like gparted, if you own such a device, and to use the following "
+"settings:"
 
-#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:191
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:228
+msgid "<emphasis>Align to</emphasis> = MiB"
+msgstr ""
+
+#. 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 "\"Free space preceding (MiB)\" \"2\""
 
-#. 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."
@@ -1705,39 +1886,41 @@ msgstr ""
 "Also make sure all partitions are created with an even number of megabytes."
 
 #. 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
 #, fuzzy
 msgid "Installation from LIVE medium"
 msgstr "Bonveniga instal-ekrano"
 
 #. 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 ""
 
 #. type: Content of: <book><info><revhistory><revision><date>
-#: en/DrakLive-cover.xml:10
-msgid "January 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 ""
 
 #. 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 ""
 
 #. type: Content of: <book><info><cover><mediaobject>
-#: en/DrakLive-cover.xml:17
-msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
-msgstr ""
+#: en/DrakLive-cover.xml:33 en/DrakX-cover.xml:30
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"../Fdisk.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/"
@@ -1748,8 +1931,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."
@@ -1760,8 +1943,7 @@ msgstr ""
 "\">NeoDoc</link>"
 
 #. 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</"
@@ -1771,15 +1953,15 @@ msgstr ""
 "href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation Team</"
 "link>, if you would like to help improve this manual."
 
-#. 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 "
@@ -1788,42 +1970,49 @@ msgstr ""
 "Neniu vidos ĉiujn ekranojn, kiujn vi vidas en ĉi helpo. Tio kiujn ekranojn "
 "vi vidos, dependas de via komputilo kaj viaj elektoj dum instalado."
 
-#. 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 ""
+"It was written by volunteers in their free time. Please contact <link ns6:"
+"href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation Team</"
+"link>, if you would like to help improve this manual."
+
 #. 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 "Instalado per DrakX-o"
 
 #. type: Content of: <book><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:9
+#: en/DrakX-cover.xml:20
 msgid "February 2014"
 msgstr ""
 
 #. type: Content of: <book><info><revhistory><revision><revremark>
-#: en/DrakX-cover.xml:10
+#: en/DrakX-cover.xml:22
 msgid "Mageia 4"
 msgstr ""
 
-#. 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=\"../Fdisk.png\"/> </imageobject>"
-
 #. type: Content of: <section><info><title>
 #: en/exitInstall.xml:3
 msgid "Congratulations"
 msgstr "Gratulon"
 
 #.  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\" "
@@ -1834,27 +2023,27 @@ msgstr ""
 "\"exitInstall-im1\"></imagedata> </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 ""
 "Finiĝis la instalado kaj konfigurado de <application>Magejo</application> "
 "kaj nun vi povas sekure eltiri la instal-medion kaj reŝarĝi vian komputilon."
 
 #. 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 ""
 "Post tiu reŝarĝo, en la ŝarĝila ekrano vi povos elekti kiun operacian "
 "sistemon lanĉi (se vi havas pli ol unu)."
 
 #. 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."
@@ -1863,25 +2052,26 @@ msgstr ""
 "kaj ŝarĝita."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:26
+#: en/exitInstall.xml:30
 msgid "Enjoy!"
 msgstr "Ĝuu!"
 
 #. 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 ""
 "Vizitu www.mageia.org se vi havas demandojn aŭ volas kontribui al Magejo"
 
 #. 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 "
@@ -1890,46 +2080,46 @@ 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
 msgid "<emphasis role=\"bold\">Advanced</emphasis>"
 msgstr ""
 
 #. 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
 msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
 msgstr ""
 
 #. 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 "
@@ -1937,28 +2127,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 "Strukturi subdiskojn"
 
@@ -1966,25 +2156,26 @@ msgstr "Strukturi subdiskojn"
 #.  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 "
@@ -1995,27 +2186,30 @@ msgstr ""
 "estos savita."
 
 #. 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 "Kutime almenaŭ la subdiskoj elektitaj de DrakX bezonos strukturon"
 
 #. 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 ""
 "Klaku sur <guibutton>Progresinta</guibutton> por elekti subdiskojn kie vi "
 "ŝatus kontroli ĉu ekzistas <emphasis>difektitaj blokoj</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 ""
 "Se vi ne certas ĉu vi faris la ĝustan elekton, vi povas klaki sur "
 "<guibutton>Antaŭa</guibutton>, denove sur <guibutton>Antaŭa</guibutton> kaj "
@@ -2023,21 +2217,22 @@ msgstr ""
 "tiu ekrano vi havas elekton por vidi kio estas en viaj subdiskoj."
 
 #. 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 ""
 "Se vi estas certa pri la elekto, klaku sur <guibutton>Sekvanta</guibutton> "
 "por daŭrigi."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:10
+#: en/installer.xml:14
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, la instalilo de Magejo"
 
 #. 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 "
@@ -2046,329 +2241,253 @@ msgstr ""
 "Se vi estas nova aŭ nesperta uzulo de GNU/Linukso, la instalilo de Magejo "
 "estas desegnita por igi vian instaladon aŭ ĝisdatigon tiel facila kiel eble."
 
-#. 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 ""
-"La komenca menua ekrano havas plurajn elektojn, tamen defaŭlte lanĉiĝos la "
-"mageja instalilo, kiu kutime havos ĉion kion oni bezonas."
-
 #. type: Content of: <section><section><title>
-#: en/installer.xml:22
-msgid "Installation Welcome Screen"
-msgstr "Bonveniga instal-ekrano"
+#: en/installer.xml:20
+msgid "The installation steps"
+msgstr "La instal-paŝoj"
 
-#. type: Content of: <section><section><section><title>
-#: en/installer.xml:25
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/installer.xml:23
 #, fuzzy
-msgid "Using a Mageia DVD"
-msgstr "Uzi la lanĉilon de Magejo"
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:27
 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 ""
+"La instal-procezo dividiĝas en serio da paŝoj, kiuj povas esti sekvataj per "
+"la flanka panelo de la ekrano."
 
-#. 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=\"dx-welcome2.png\" align=\"center\"/> </"
-"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 ""
+"Ĉiu paŝo havas unu aŭ pliajn ekranojn kiuj povas ankaŭ havi "
+"<guibutton>Progresintan</guibutton> butonon kun aldonaj sed malofte "
+"bezonataj elektoj."
 
-#. 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=\"dx2-doPartitionDisks.png\" align=\"center"
-"\"></imagedata> </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):"
-msgstr ""
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:55
-msgid ""
-"Within any of the <emphasis role=\"bold\">F2</emphasis> to <emphasis role="
-"\"bold\">F6</emphasis> options, you can view relevant help by pressing "
-"<emphasis role=\"bold\">F1</emphasis>"
-msgstr ""
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:63
 msgid ""
-"Press <emphasis role=\"bold\">F2</emphasis> to have the installer use a "
-"specific language for the installation."
+"Most screens have <emphasis>Help</emphasis> buttons for further details "
+"about the particular step."
 msgstr ""
+"La plimulto el ekranoj havas butonon pri <guibutton>Helpo</guibutton> "
+"havigantan pliajn karigojn pri tiu paŝo."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:67
+#. type: Content of: <section><section><caution><para>
+#: en/installer.xml:38
 #, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+"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 ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/> "
-"</imageobject>"
+"Se iam dum la instalado vi decidas haltigi ĝin, eblas reŝarĝi la komputilon, "
+"sed bv. pripensi tion dufoje antaŭe.  Post la formatigo de partigo aŭ post "
+"la ekinstalo de ĝisdatigo via komputilo ne plu restos egale, reŝarĝi ĝin "
+"povus igi vian sistemon neuzebla. Se malgraŭ tio vi estas certa pri tio ke "
+"vi volas reŝarĝi, malfermu teksto-terminalon premante la tri klavojn "
+"<guibutton>Alt Ctrl F2</guibutton> samtempe.  Post tio, premu <guibutton>Alt "
+"Ctrl Delete</guibutton> samtempe por reŝarĝi."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:72
+#. type: Content of: <section><section><caution><para>
+#: en/installer.xml:43
 msgid ""
-"Use the arrow keys to select the language then press <emphasis role=\"bold"
-"\">Enter</emphasis>."
+"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><para>
-#: en/installer.xml:77
-msgid ""
-"If needed, change the screen resolution by pressing <emphasis role=\"bold"
-"\">F3</emphasis> (Legacy mode only)."
-msgstr ""
+#. type: Content of: <section><section><title>
+#: en/installer.xml:48
+msgid "Installation Welcome Screen"
+msgstr "Bonveniga instal-ekrano"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:81
-#, fuzzy
+#. type: Content of: <section><section><para>
+#: en/installer.xml:49
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome5def.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-welcome5def.png\" align=\"center\"/> </"
-"imageobject>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:88
+#. type: Content of: <section><section><para>
+#: en/installer.xml:52
+#, fuzzy
 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)."
+"The welcome menu screen has various options, however the default option will "
+"start the installer, and is normally all that you will need."
 msgstr ""
+"La komenca menua ekrano havas plurajn elektojn, tamen defaŭlte lanĉiĝos la "
+"mageja instalilo, kiu kutime havos ĉion kion oni bezonas."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/installer.xml:96
-msgid "Default: It doesn't alter anything in the default options."
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:56
+msgid "Legacy (BIOS) Systems"
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/installer.xml:101
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:58
+#, fuzzy
 msgid ""
-"Safe Settings: Priority is given to the safer options at the price of a "
-"performance detriment."
+"<imageobject> <imagedata fileref=\"dx-welcome.png\" align=\"center\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"></"
+"imagedata> </imageobject>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/installer.xml:106
-msgid ""
-"No ACPI: (Advanced Configuration and Power Interface): Power management "
-"features are not used."
+#. type: Content of: <section><section><section><itemizedlist><title>
+#: en/installer.xml:63
+msgid "Menu"
 msgstr ""
 
-#. 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:66
 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."
+"Install Mageia to a hard disk. This is the default option, and will "
+"automatically start after a short while unless another option is selected."
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:120
-msgid ""
-"When you select one of these entries, it modifies the default options "
-"displayed in the <guilabel>Boot Options</guilabel> line."
-msgstr ""
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:69
+#, fuzzy
+msgid "<emphasis role=\"bold\">Rescue System</emphasis>"
+msgstr "\"Free space preceding (MiB)\" \"2\""
 
-#. 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:70
 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."
+"This option allows you to either re-install the bootloader for an existing "
+"Mageia installation or you can use it to restore a Windows bootloader."
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:132
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:75
 #, fuzzy
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> </"
-"imageobject>"
+msgid "<emphasis role=\"bold\">Memory Test</emphasis>"
+msgstr "\"Free space preceding (MiB)\" \"2\""
 
-#. 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:76
 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."
+"Test the installed RAM by performing multiple read and write operations. "
+"Reboot to end the test."
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:146
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:80
 #, fuzzy
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
-"</imageobject>"
+msgid "<emphasis role=\"bold\">F2: Language</emphasis>"
+msgstr "\"Free space preceding (MiB)\" \"2\""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:151
-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><itemizedlist><listitem><para>
+#: en/installer.xml:81
+msgid "Press F2 for alternative languages."
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:158
-#, fuzzy
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:86
+msgid "UEFI Systems"
 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><para>
+#: en/installer.xml:87
 msgid ""
-"The help is translated in the chosen language with <emphasis role=\"bold"
-"\">F2</emphasis>."
+"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 ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:168
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:92
+#, fuzzy
 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 ""
+"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"></"
+"imagedata> </imageobject>"
 
-#. type: Content of: <section><section><title>
-#: en/installer.xml:177
-msgid "The installation steps"
-msgstr "La instal-paŝoj"
-
-#. 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 ""
-"La instal-procezo dividiĝas en serio da paŝoj, kiuj povas esti sekvataj per "
-"la flanka panelo de la ekrano."
 
-#. type: Content of: <section><section><para>
-#: en/installer.xml:182
-#, fuzzy
-msgid ""
-"Each step has one or more screens which may also have <guibutton>Advanced</"
-"guibutton> sections with extra, less commonly required, options."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:99
+msgid "<emphasis role=\"bold\">Install:</emphasis> Start the Install process"
 msgstr ""
-"Ĉiu paŝo havas unu aŭ pliajn ekranojn kiuj povas ankaŭ havi "
-"<guibutton>Progresintan</guibutton> butonon kun aldonaj sed malofte "
-"bezonataj elektoj."
 
-#. 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 ""
-"La plimulto el ekranoj havas butonon pri <guibutton>Helpo</guibutton> "
-"havigantan pliajn karigojn pri tiu paŝo."
 
-#. type: Content of: <section><section><note><para>
-#: en/installer.xml:190
-#, fuzzy
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:109
 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 ""
-"Se iam dum la instalado vi decidas haltigi ĝin, eblas reŝarĝi la komputilon, "
-"sed bv. pripensi tion dufoje antaŭe.  Post la formatigo de partigo aŭ post "
-"la ekinstalo de ĝisdatigo via komputilo ne plu restos egale, reŝarĝi ĝin "
-"povus igi vian sistemon neuzebla. Se malgraŭ tio vi estas certa pri tio ke "
-"vi volas reŝarĝi, malfermu teksto-terminalon premante la tri klavojn "
-"<guibutton>Alt Ctrl F2</guibutton> samtempe.  Post tio, premu <guibutton>Alt "
-"Ctrl Delete</guibutton> samtempe por reŝarĝi."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:203
+#: en/installer.xml:115
 msgid "Installation Problems and Possible Solutions"
 msgstr "Instal-problemoj kaj eblaj solvoj"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:206
+#: en/installer.xml:117
 msgid "No Graphical Interface"
 msgstr "Sen grafika interfaco"
 
 #. 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 ""
 "Post la komenca ekrano vi eble ne alvenos al la ekrano pri lingvo-selekto. "
 "Ĉi tio povas okazi kun kelkaj grafik-kartoj kaj malnovaj maŝinoj. Provu "
 "utiligi malaltan rezolucion per la tajpo de \"vgalo\" en la komand-linio."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:217
+#: en/installer.xml:126
 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 ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:230
+#: en/installer.xml:138
 msgid "The Install Freezes"
 msgstr "Instal-paneoj"
 
 #. 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 ""
 "Se la sistemo ŝajnas panei dum la instalo, tio povas esti pro aparatar-"
 "detekta problemo. Ĉikaze la aŭtomata detektado de aparatoj povas esti "
@@ -2376,18 +2495,19 @@ msgstr ""
 "Ĉi tiu elekto povas ankaŭ esti miksita kun la antaŭa se estas necese."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:240
+#: en/installer.xml:146
 msgid "RAM problem"
 msgstr ""
 
 #. 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 ""
 "Ili estos malofte necesaj, sed en kelkaj kazoj la aparataro povas kalkuli la "
 "disponeblan ĉefmemoron malĝuste. Por konkretigi ĝin permane vi povas utiligi "
@@ -2395,35 +2515,31 @@ msgstr ""
 "\"mem=256M\" specifus 256MB-ojn el ĉefmemoro."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:249
+#: en/installer.xml:154
 msgid "Dynamic partitions"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:251
+#: en/installer.xml:155
 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/installUpdates.xml:3
+#: en/installUpdates.xml:16
 msgid "Updates"
 msgstr "Ĝisdatigoj"
 
-#.  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 ""
@@ -2432,94 +2548,102 @@ msgstr ""
 "\"exitInstall-im1\"></imagedata> </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 ""
 "Ekde la publikigo de ĉi tiu versio de <application>Magejo</application>, "
 "pluraj pakaĵoj estis probable ĝisdatigitaj aŭ plibonigitaj."
 
-#. 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 ""
 "Elektu <guilabel>jes</guilabel> se vi deziras elŝuti kaj instali ilin, "
 "elektu <guilabel>ne</guilabel> se vi ne volas fari tion nun aŭ se vi ne "
 "havas retaliron"
 
-#. 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 "Klaku sur <guibutton>Sekvanta</guibutton> por daŭrigi"
 
 #. type: Content of: <section><info><title>
-#: en/login.xml:1
-msgid "Login screen"
+#: en/login.xml:4
+msgid "Login Screen"
 msgstr ""
 
 #. 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
+msgid "SDDM login screen"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/login.xml:1
-msgid "Finally, you will come to the login screen."
+#: en/login.xml:14
+msgid "Finally, you will come to the desktop login screen."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/login.xml:1
+#: en/login.xml:15
 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 ""
 
 #. type: Content of: <section><para>
-#: en/login.xml:3
+#: en/login.xml:16
 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/media_selection.xml:3
-msgid "Media Selection (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 "
@@ -2528,24 +2652,24 @@ msgid ""
 msgstr ""
 
 #. 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."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:32
+#: en/media_selection.xml:42
 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 ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:40
+#: en/media_selection.xml:50
 msgid ""
 "The <emphasis>Tainted</emphasis> repository includes packages released under "
 "a free license. The main criteria for placing packages in this repository is "
@@ -2560,66 +2684,67 @@ msgid "Minimal Install"
 msgstr "Minimuma instalo"
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:11
+#: en/minimal-install.xml:17
 #, fuzzy
 msgid ""
-"You can choose a Minimal Installation by de-selecting everything in the "
-"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"/>."
+"Minimal Installation is intended for those with specific uses in mind for "
+"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 ""
-"Vi povas elekti Minimuman Instalon malselektante ĉion en la Pakaĵara Elekta "
-"ekrano, vidu <xref linkend=\"choosePackageGroups\"></xref>."
+"Minimuma Instalo celas konkretajn uzojn por Magejo kiel servilojn aŭ "
+"specialigitajn laborstaciojn. Probable vi uzos ĉi tiun elekton kune kun "
+"Permana Pakaĵ-elekto, vidu <xref linkend=\"choosePackagesTree\"></xref>."
 
-#. type: Content of: <section><para>
-#: en/minimal-install.xml:14
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/minimal-install.xml:24
+#, fuzzy
 msgid ""
-"If desired, you can additionally tick the <emphasis role=\"bold\">Individual "
-"package selection</emphasis> option in the same screen."
+"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 ""
+"Vi povas elekti Minimuman Instalon malselektante ĉion en la Pakaĵara Elekta "
+"ekrano, vidu <xref linkend=\"choosePackageGroups\"></xref>."
 
-#. type: Content of: <section><para>
-#: en/minimal-install.xml:17
-#, fuzzy
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/minimal-install.xml:28
 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"
-"\"/>."
+"If desired, you can additionally tick the <emphasis>Individual package "
+"selection</emphasis> option in the same screen."
 msgstr ""
-"Minimuma Instalo celas konkretajn uzojn por Magejo kiel servilojn aŭ "
-"specialigitajn laborstaciojn. Probable vi uzos ĉi tiun elekton kune kun "
-"Permana Pakaĵ-elekto, vidu <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:33
 #, 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."
+"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 ""
 "Se vi elektas ĉi tian instalon la venonta ekrano proponos al vi instali "
 "plurajn utilajn aldonaĵojn kiel dokumentojn aŭ Ikso-servilon."
 
-#. 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
 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 ""
 
 #. 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="
@@ -2632,25 +2757,31 @@ msgstr ""
 
 #. type: Content of: <section><info><title>
 #: en/misc-params.xml:3
-msgid "Summary of miscellaneous parameters"
-msgstr "Diversaj parametroj"
+msgid "Configuration Summary"
+msgstr ""
 
 #.  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 faris inteligentajn antaŭelektojn por la konfiguro de via sistemo "
 "dependante de tio kion vi elektis kaj la aparataro kiun ĝi mem eltrovis. Vi "
@@ -2658,43 +2789,43 @@ msgstr ""
 "<guibutton>Konfiguru</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 "Sistemaj parametroj"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:45
-msgid "<guilabel>Timezone</guilabel>"
-msgstr "<guilabel>Horzono</guilabel>"
+#: en/misc-params.xml:54
+#, fuzzy
+msgid "<emphasis role=\"bold\">Timezone</emphasis>"
+msgstr "\"Free space preceding (MiB)\" \"2\""
 
 #. 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 elektis tempo-zonon por vi, dependante de via preferata lingvo. Vi "
@@ -2702,12 +2833,13 @@ msgstr ""
 "\"></xref>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:53
-msgid "<guilabel>Country / Region</guilabel>"
-msgstr "<guilabel>Lando</guilabel>"
+#: en/misc-params.xml:62
+#, fuzzy
+msgid "<emphasis role=\"bold\">Country / Region</emphasis>"
+msgstr "\"Free space preceding (MiB)\" \"2\""
 
 #. 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 "
@@ -2717,47 +2849,49 @@ msgstr ""
 "Vidu <xref linkend=\"selectCountry\"></xref>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:62
-msgid "<guilabel>Bootloader</guilabel>"
-msgstr "<guilabel>Startŝarĝilo</guilabel>"
+#: en/misc-params.xml:70
+#, fuzzy
+msgid "<emphasis role=\"bold\">Bootloader</emphasis>"
+msgstr "\"Free space preceding (MiB)\" \"2\""
 
 #. 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 faris bonajn elektojn por la konfiguro de la sistema ŝarĝilo."
 
 #. 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 "Ŝanĝu nenion se vi ne scias kiel konfiguri Grub kaj/aŭ Lilo"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:70
-msgid "For more information, see <xref linkend=\"setupBootloader\"/>"
-msgstr "Por plia informo vidu <xref linkend=\"setupBootloader\"></xref>"
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:75
-msgid "<guilabel>User management</guilabel>"
-msgstr "<guilabel>Uzula administrado (User management)</guilabel>"
+#: en/misc-params.xml:83
+#, fuzzy
+msgid "<emphasis role=\"bold\">User management</emphasis>"
+msgstr "\"Free space preceding (MiB)\" \"2\""
 
 #. 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 ""
 "Vi povas aldoni pliajn uzulojn ĉi tie. Ĉiuj havos sian propran dosierujon "
 "<literal>/home</literal>."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:84
-msgid "<guilabel>Services</guilabel>:"
-msgstr "<guilabel>Servoj</guilabel>:"
+#: en/misc-params.xml:91
+#, fuzzy
+msgid "<emphasis role=\"bold\">Services</emphasis>"
+msgstr "\"Free space preceding (MiB)\" \"2\""
 
 #. 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 "
@@ -2767,31 +2901,29 @@ msgstr ""
 "(demonoj). Ĉi tiu ilo ebligos vin aktivigi aŭ malaktivigi diversajn taskojn."
 
 #. 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 ""
 "Vi devus kontroli zorgeme antaŭ ol ŝanĝi ion ĉi tie - eraro povus okazigi ke "
 "via komputilo ne funkciu ĝuste."
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:94
-msgid "For more information, see <xref linkend=\"configureServices\"/>"
-msgstr "For more information, see <xref linkend=\"configureServices\"/>"
-
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:101
+#: en/misc-params.xml:106
 msgid "Hardware parameters"
 msgstr "Aparatar-parametroj"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:106
-msgid "<guilabel>Keyboard</guilabel>:"
-msgstr "<guilabel>Klavaro</guilabel>:"
+#: en/misc-params.xml:111
+#, fuzzy
+msgid "<emphasis role=\"bold\">Keyboard</emphasis>"
+msgstr "\"Free space preceding (MiB)\" \"2\""
 
 #. 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 "
@@ -2801,19 +2933,20 @@ msgstr ""
 "lando, lingvo aŭ klavar-speco."
 
 #. 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>Muso</guilabel>:"
+#: en/misc-params.xml:124
+#, fuzzy
+msgid "<emphasis role=\"bold\">Mouse</emphasis>"
+msgstr "\"Free space preceding (MiB)\" \"2\""
 
 #. 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."
@@ -2822,36 +2955,42 @@ msgstr ""
 "mov-globojn, ktp."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:126
-msgid "<guilabel>Sound card</guilabel>:"
-msgstr "<guilabel>Son-karto </guilabel>:"
+#: en/misc-params.xml:131
+#, fuzzy
+msgid "<emphasis role=\"bold\">Sound card</emphasis>"
+msgstr "\"Free space preceding (MiB)\" \"2\""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:129
+#: 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 ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:137
-msgid "<guilabel>Graphical interface</guilabel>:"
-msgstr "<guilabel>Grafika interfaco</guilabel>:"
+#: en/misc-params.xml:144
+#, fuzzy
+msgid "<emphasis role=\"bold\">Graphical interface</emphasis>"
+msgstr "\"Free space preceding (MiB)\" \"2\""
 
 #. 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 ""
 "Ĉi tiu sekcio ebligas vin konfiguri vian grafik-karto(j)n kaj montrilo(j)n."
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:143
-msgid "For more information, see <xref linkend=\"configureX_chooser\"/>."
-msgstr "Por plia informo vidu <xref linkend=\"configureX_chooser\"></xref>."
-
 #. 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="
@@ -2862,22 +3001,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 "Retaj parametroj"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:163
-msgid "<guilabel>Network</guilabel>:"
-msgstr "<guilabel>Reto</guilabel>:"
+#: en/misc-params.xml:169
+#, fuzzy
+msgid "<emphasis role=\"bold\">Network</emphasis>"
+msgstr "\"Free space preceding (MiB)\" \"2\""
 
 #. 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 ""
 "Vi povas konfiguri vian reton ĉi tie, sed por ret-kartoj utiligantaj "
@@ -2886,7 +3026,7 @@ msgstr ""
 "aktivigi la neliberajn deponejojn."
 
 #. 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 "
@@ -2896,82 +3036,90 @@ msgstr ""
 "ĝi kontrolu ankaŭ tiun ret-interfacon."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:179
-msgid "<guilabel>Proxies</guilabel>:"
-msgstr "<guilabel>Prokuraj serviloj</guilabel>:"
+#: en/misc-params.xml:185
+#, fuzzy
+msgid "<emphasis role=\"bold\">Proxies</emphasis>"
+msgstr "\"Free space preceding (MiB)\" \"2\""
 
 #. 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 ""
 "Prokura servilo funkcias kiel peranto inter via komputilo kaj interreto.  Ĉi "
 "tiu sekcio ebligas vin konfiguri vian komputilon por utiligi prokuran servon."
 
 #. 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 ""
 "Eble vi devas konsulti vian ret-mastrumanton por scii la parametrojn kiujn "
 "vi devas enigi ĉi tie"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:195
+#: en/misc-params.xml:201
 msgid "Security"
 msgstr "Sekureco"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:200
-msgid "<guilabel>Security Level</guilabel>:"
-msgstr "<guilabel>Sekurec-nivelo </guilabel>:"
+#: en/misc-params.xml:206
+#, fuzzy
+msgid "<emphasis role=\"bold\">Security Level</emphasis>"
+msgstr "\"Free space preceding (MiB)\" \"2\""
 
 #. 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 ""
 "Ĉi tie vi starigas la sekurec-nivelon por via komputilo, en la plimulto el "
 "okazoj la defaŭlta konfiguro estas adekvata por ĝenerala uzo."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:207
-msgid "Check the option which best suits your usage."
-msgstr "Aktivigu la elekton pli adekvatan laŭ viaj bezonoj."
+#: en/misc-params.xml:215
+#, fuzzy
+msgid "<emphasis role=\"bold\">Firewall</emphasis>"
+msgstr "\"Free space preceding (MiB)\" \"2\""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:212
-msgid "<guilabel>Firewall</guilabel>:"
-msgstr "<guilabel>Fajroŝirmilo (Fajromuro)</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 ""
-"Fajroŝirmilo celas esti bariero inter viaj gravaj datumoj kaj la friponoj en "
-"la reto kiuj volas kompromiti aŭ forŝteli ilin."
 
 #. 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 ""
-"Elektu la servojn kiuj devas havi aliron al via sistemo. Viaj elektoj "
-"dependos de tio por kio vi utiligas la komputilon."
+msgid "For more information, see <xref linkend=\"firewall\"/>."
+msgstr "Por plia informo vidu <xref linkend=\"configureX_chooser\"></xref>."
 
 #. 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 "Rimarku ke ebligi ĉion (sen fajroŝirmilo) povas esti tre riska."
 
 #. type: Content of: <section><info><title>
@@ -2980,31 +3128,43 @@ msgid "Reboot"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/reboot.xml:6
+#: en/reboot.xml:7
 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 ""
+
+#. 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
 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 ""
 
 #. 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-"
@@ -3034,45 +3194,50 @@ msgstr ""
 "de spaco por la instalo de <application>Magejo</application>."
 
 #. type: Content of: <section><info><title>
-#: en/securityLevel.xml:3
+#: en/securityLevel.xml:10
 msgid "Security Level"
 msgstr "Sekurec-nivelo"
 
 #.  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
 msgid ""
 "<emphasis role=\"bold\">Please choose the desired security level</emphasis>"
 msgstr ""
 
 #. 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
 msgid "<emphasis role=\"bold\">Security Administrator</emphasis>"
 msgstr ""
 
 #. 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 "
@@ -3080,14 +3245,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 "
@@ -3095,516 +3260,574 @@ 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 ""
 "Post la instalo, ĉiam eblos alĝustigi la sekurec-konfiguron en la fako "
 "<guilabel>Sekureco</guilabel> en la Mageja Kontrolilo."
 
 #. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:6
+#: en/SelectAndUseISOs2.xml:15
 msgid "Select and use ISOs"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:9
+#: en/SelectAndUseISOs2.xml:18
 msgid "Introduction"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:10
+#: en/SelectAndUseISOs2.xml:19
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
 "which image best suits your needs."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:12
-msgid "There are two families of media:"
+#: en/SelectAndUseISOs2.xml:21
+msgid "There are three types of installation media:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:15
+#: en/SelectAndUseISOs2.xml:24
 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 ""
 
 #. 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
+msgid ""
+"Live ISOs can only be used to create <quote>clean</quote> installations, "
+"they cannot be used to upgrade previously installed Mageia releases."
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:47
 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"
+"<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 ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:53
+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 ""
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:27
-msgid "Details are given in the next sections."
+#: en/SelectAndUseISOs2.xml:58
+msgid "More details are given in the next sections."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:30
+#: en/SelectAndUseISOs2.xml:61
 msgid "Media"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:32
+#: en/SelectAndUseISOs2.xml:63
 msgid "Definition"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:33
+#: en/SelectAndUseISOs2.xml:64
 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 ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:36
+#: en/SelectAndUseISOs2.xml:67
 msgid ""
 "You can find Mageia ISO's <link ns4:href=\"http://www.mageia.org/en/"
 "downloads/\">here</link>."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:39
+#: en/SelectAndUseISOs2.xml:70
 msgid "Classical installation media"
 msgstr ""
 
 #. 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 ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:44
-msgid "These ISOs use the Classical installer called drakx."
+#: en/SelectAndUseISOs2.xml:75
+msgid "These ISOs use the Classical installer called DrakX"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:47
+#: en/SelectAndUseISOs2.xml:78
 msgid ""
 "They are used for performing clean installs or to upgrade a previously "
-"installed version of Mageia."
+"installed version of Mageia"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:51 en/SelectAndUseISOs2.xml:83
-#: en/SelectAndUseISOs2.xml:158
-msgid "Different media for 32 and 64 bit architectures."
+#: en/SelectAndUseISOs2.xml:82 en/SelectAndUseISOs2.xml:118
+#: en/SelectAndUseISOs2.xml:174
+msgid "Different media for 32 and 64-bit architectures"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:54
+#: en/SelectAndUseISOs2.xml:85
 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 ""
 
 #. 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
+msgid "Each DVD contains many available desktop environments and languages"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:62
+#: en/SelectAndUseISOs2.xml:95
 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 ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:69
+#: en/SelectAndUseISOs2.xml:102
 msgid "Live media"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:74
+#: en/SelectAndUseISOs2.xml:107
 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 ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:79
-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 ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:86
-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>"
+#: en/SelectAndUseISOs2.xml:114
+msgid "Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:91
-msgid "They contain non free software."
+#: en/SelectAndUseISOs2.xml:121
+msgid "They contain non-free software"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:96
+#: en/SelectAndUseISOs2.xml:126
 msgid "Live DVD Plasma"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:99
-msgid "Plasma desktop environment only."
+#: en/SelectAndUseISOs2.xml:129
+msgid "Plasma desktop environment only"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:102 en/SelectAndUseISOs2.xml:116
-#: en/SelectAndUseISOs2.xml:130
-msgid "All available languages are present."
+#: en/SelectAndUseISOs2.xml:132 en/SelectAndUseISOs2.xml:146
+#: en/SelectAndUseISOs2.xml:160
+msgid "All available languages are present"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:105
-msgid "64 bit architecture only."
+#: en/SelectAndUseISOs2.xml:135 en/SelectAndUseISOs2.xml:149
+msgid "64-bit architecture only"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:110
+#: en/SelectAndUseISOs2.xml:140
 msgid "Live DVD GNOME"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:113
-msgid "GNOME desktop environment only."
-msgstr ""
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:119
-msgid "64 bit architecture only"
+#: en/SelectAndUseISOs2.xml:143
+msgid "GNOME desktop environment only"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:124
+#: en/SelectAndUseISOs2.xml:154
 msgid "Live DVD Xfce"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:127
-msgid "Xfce desktop environment only."
+#: en/SelectAndUseISOs2.xml:157
+msgid "Xfce desktop environment only"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:133
-msgid "32 or 64 bit architectures."
+#: en/SelectAndUseISOs2.xml:163
+msgid "32 or 64-bit architectures"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:139
+#: en/SelectAndUseISOs2.xml:169
 #, fuzzy
 msgid "Net install media"
 msgstr "La instal-paŝoj"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:144
-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 ""
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:152
-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 ""
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:161
-msgid "First steps are English language only."
+#: en/SelectAndUseISOs2.xml:177
+msgid "First steps are English language only"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:166
+#: en/SelectAndUseISOs2.xml:182
 #, fuzzy
 msgid "netinstall.iso"
 msgstr "La instal-paŝoj"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:169
+#: en/SelectAndUseISOs2.xml:185
 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 ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:175
+#: en/SelectAndUseISOs2.xml:191
 msgid "netinstall-nonfree.iso"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:178
+#: en/SelectAndUseISOs2.xml:194
 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 ""
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:186
+#: en/SelectAndUseISOs2.xml:202
 msgid "Downloading and Checking Media"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:188
+#: en/SelectAndUseISOs2.xml:204
 msgid "Downloading"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:189
+#: en/SelectAndUseISOs2.xml:205
 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 ""
 
-#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:191
-msgid "<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 ""
-"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:"
+"<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:199
-msgid "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+#: en/SelectAndUseISOs2.xml:217
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"Checking.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.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 ""
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/SelectAndUseISOs2.xml:225
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"Download.png\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.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
 msgid "Checking the integrity of the downloaded media"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:208
+#: en/SelectAndUseISOs2.xml:235
 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 ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:214
+#: en/SelectAndUseISOs2.xml:241
 msgid ""
 "To generate the checksum for your downloaded ISO, open a console, (no need "
 "to be root), and:"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:218
+#: en/SelectAndUseISOs2.xml:245
 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 ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:222
+#: en/SelectAndUseISOs2.xml:249
+msgid ""
+"To use the sha1sum, type: <command>sha1sum path/to/the/image/file.iso</"
+"command>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:254
 msgid ""
-"To use sha1sum, type: <userinput>sha1sum path/to/the/image/file.iso</"
-"userinput>"
+"To use the sha512sum, type: <command>sha512sum path/to/the/image/file.iso</"
+"command>"
 msgstr ""
 
 #. 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
 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 ""
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:237
+#: en/SelectAndUseISOs2.xml:270
 msgid "Burn or dump the ISO"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:238
+#: en/SelectAndUseISOs2.xml:271
 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 ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:275
 msgid "Burning the ISO to a CD/DVD"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:243
+#: en/SelectAndUseISOs2.xml:276
 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 ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:248
+#: en/SelectAndUseISOs2.xml:282
 msgid "Dump the ISO to a USB stick"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:249
+#: en/SelectAndUseISOs2.xml:283
 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 ""
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:252
+#: en/SelectAndUseISOs2.xml:286
 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 ""
 
-#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:256
+#. type: Content of: <section><section><section><note><para>
+#: en/SelectAndUseISOs2.xml:290
+msgid ""
+"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 ""
-"To recover the original capacity, you must redo partitioning and re-format "
-"the USB stick."
+"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 ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:259
+#: en/SelectAndUseISOs2.xml:299
 msgid "Using a graphical tool within Mageia"
 msgstr ""
 
 #. 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>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:263
+#: en/SelectAndUseISOs2.xml:303
 msgid "Using a graphical tool within Windows"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:304
 msgid "You could try:"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:267
+#: en/SelectAndUseISOs2.xml:307
 msgid ""
 "<link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using the "
-"\"ISO image\" option;"
+"\"ISO image\" option"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:271
+#: en/SelectAndUseISOs2.xml:311
 msgid ""
 "<link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:277
-msgid "Using Command line within a GNU/Linux system"
+#: en/SelectAndUseISOs2.xml:317
+msgid "Using the Command line within a GNU/Linux system"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:279
+#: en/SelectAndUseISOs2.xml:319
 msgid ""
 "It is potentially *dangerous* to do this by hand. You risk overwriting "
 "potentially valuable existing data if you specify the wrong target device."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:325
 msgid "Open a console"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:288
+#: en/SelectAndUseISOs2.xml:328
 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 ""
 
 #. 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
 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 ""
 
 #. 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
+msgid "Enter the command <command>fdisk -l</command>"
 msgstr ""
 
 #. 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
 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 ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:312
+#: en/SelectAndUseISOs2.xml:354
 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 ""
 
 #. 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"
@@ -3628,45 +3851,48 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:317
+#: en/SelectAndUseISOs2.xml:360
 msgid "<placeholder type=\"screen\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:337
+#: en/SelectAndUseISOs2.xml:380
 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 ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:340
-msgid "Where X=your device name eg: /dev/sdd"
+#: en/SelectAndUseISOs2.xml:382
+msgid ""
+"Where <replaceable>X</replaceable>=your device name eg: <filename>/dev/sdd</"
+"filename>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:341
+#: en/SelectAndUseISOs2.xml:384
 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 ""
 
 #. 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
+msgid "Enter the command: <command>sync</command>"
 msgstr ""
 
 #. 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 ""
 
@@ -3676,8 +3902,10 @@ msgid "Select your Country / Region"
 msgstr "Elektu vian Landon / Regionon"
 
 #.  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="
@@ -3687,51 +3915,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 ""
 "Selektu vian landon aŭ regionon. Ĉi tio estas grava por ĉiaj konfiguroj, "
 "kiel la monero kaj senkabla reguliga domajno. Konfiguri eraran landon povus "
 "kaŭzi ke vi ne kapablu utiligi senkablan reton."
 
-#. 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 ""
 "Se via lando ne estas en la listo, klaku sur la butono <guilabel>Aliaj "
 "Landoj</guilabel> kaj elektu vian landon / regionon tie."
 
 #. 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 ""
 "Se via lando estas nur en la listo <guilabel>Aliaj Landoj</guilabel>, post "
 "klaki sur <guibutton>Enorde</guibutton> povas ŝajni ke vi elektis landon de "
 "la unua listo.  Bv. ignori tion, DrakX daŭrigos kun via reala elekto."
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:33
+#: en/selectCountry.xml:42
 msgid "Input method"
 msgstr "Enir-metodo"
 
 #. 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. "
@@ -3748,98 +3975,82 @@ msgstr ""
 "se vi aldonis HTTP/FTP-an medion antaŭ la pakaĵa selekto."
 
 #. 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 ""
 "Se vi nevole preterpaŝis la enir-metodon dum la instalo, vi povas aliri ĝin "
 "post ŝarĝi la instalitan sistemon per \"Konfiguri vian Komputilon\" -> "
 "\"Sistemo\" aŭ lanĉante localdrake kiel mastrumanto."
 
 #. type: Content of: <section><info><title>
-#: en/selectInstallClass.xml:14
+#: en/selectInstallClass.xml:29
 msgid "Install or Upgrade"
 msgstr "Instalado/ĝisdatigo"
 
 #. 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 fileref=\"dx2-selectKeyboard.png\" align=\"center"
 "\"></imagedata> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:25
-msgid "Install"
-msgstr "Instalado"
+#: en/selectInstallClass.xml:41
+#, fuzzy
+msgid "<emphasis role=\"bold\">Install</emphasis>"
+msgstr "\"Free space preceding (MiB)\" \"2\""
 
 #. 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 "Ĝisdatigu"
+#: en/selectInstallClass.xml:50
+#, fuzzy
+msgid "<emphasis role=\"bold\">Upgrade</emphasis>"
+msgstr "\"Free space preceding (MiB)\" \"2\""
 
 #. 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 ""
+"Uzu tiun elekton por freŝa instalado de <application>Magejo</application> ."
 
-#. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/selectInstallClass.xml:39
+#. type: Content of: <section><important><para>
+#: en/selectInstallClass.xml:58
 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."
-msgstr ""
-
-#. 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."
+"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 ""
-"Se iam dum la instalado vi decidas haltigi ĝin, eblas reŝarĝi la komputilon, "
-"sed bv. pripensi tion dufoje antaŭe.  Post la strukturado de subdisko aŭ "
-"post la ekinstalo de ĝisdatigo via komputilo ne plu restos egale, reŝarĝi "
-"ĝin povus igi vian sistemon neuzebla. Se malgraŭ tio vi estas certa pri tio "
-"ke vi volas reŝarĝi, malfermu teksto-terminalon premante la tri klavojn "
-"<guibutton>Alt Ctrl F2</guibutton> samtempe.  Post tio, premu <guibutton>Alt "
-"Ctrl Delete</guibutton> samtempe por reŝarĝi."
 
 #. 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 ""
 "Se vi rimarkas ke vi forgesis selekti aldonan lingvon, vi povas reveni el la "
 "ekrano \"Instalado/ĝisdatigo\" al la ekrano por lingva elekto per la premo "
@@ -3847,37 +4058,41 @@ msgstr ""
 "poste en la instalo."
 
 #. type: Content of: <section><info><title>
-#: en/selectKeyboardLive.xml:3
+#: en/selectKeyboardLive.xml:14
 #, fuzzy
-msgid "Select keyboard"
+msgid "Select Keyboard"
 msgstr "Klavaro"
 
 #. 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:24
+msgid "Here you can set the keyboard layout you wish to use with Mageia​​."
+msgstr ""
 
 #. type: Content of: <section><para>
-#: en/selectKeyboardLive.xml:12
+#: 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/selectKeyboard.xml:7
+#: en/selectKeyboard.xml:20
 msgid "Keyboard"
 msgstr "Klavaro"
 
 #. 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."
@@ -3886,17 +4101,17 @@ msgstr ""
 "aŭtomate elektos usonan klavaron."
 
 #. 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=\"dx2-diskdrake.png\" align=\"center\"></"
-"imagedata> </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 "
@@ -3912,25 +4127,25 @@ msgstr ""
 "wikipedia.org/wiki/Klavarfasono\">eo.wikipedia.org/wiki/Klavarfasono</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 ""
 "Se via klavaro ne estas en la montrita listo klaku sur la butono "
 "<guibutton>Pli (Plu)</guibutton> por aliri etenditan liston kaj selektu vian "
 "klavaron tie."
 
-#. 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 ""
 "Post elekti klavaron per la butono <guibutton>Pli (Plu)</guibutton> , vi "
 "revenos al la unua priklavara ekrano sed povos ŝajni kvazaŭ klavaro de tiu "
@@ -3938,7 +4153,7 @@ msgstr ""
 "instaladon: Via klavaro estas tiu kiun vi elektis per la etendita listo."
 
 #. 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 "
@@ -3949,39 +4164,40 @@ msgstr ""
 "ekranon demandantan kiel vi ŝatus ŝanĝi inter latinaj kaj nelatinaj klavaroj"
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:15
+#: en/selectLanguage.xml:34
 msgid "Please choose a language to use"
 msgstr "Bv. elekti la uzotan lingvon"
 
-#. 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 ""
 "Selektu vian preferatan lingvon unue per la disfaldo de via kontinenta "
 "listo. <application>Magejo</application> uzos ĉi tiun selekton dum la "
 "instalado kaj por la instalita sistemo."
 
-#. 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 ""
 "Selektu vian preferatan lingvon unue per la disfaldo de via kontinenta "
 "listo. <application>Magejo</application> uzos ĉi tiun selekton dum la "
 "instalado kaj por la instalita sistemo."
 
-#. 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 ""
 "Se vi bezonas instali en via sistemo plurajn lingvojn por vi aŭ aliaj "
@@ -3990,68 +4206,68 @@ msgstr ""
 "lingvan eltenon post la instalo."
 
 #. 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 ""
 "Se vi elektas pli ol unu lingvon, vi devas selekti unu el ili kiel vian "
 "preferatan lingvon en la komenca lingva ekrano. Ĝi markiĝos ankaŭ en la "
 "plurlingva ekrano ."
 
 #. 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 ""
 "Se via klavara lingvo ne estas la sama kiel via preferata lingvo, tiam estas "
 "rekomendinde instali la lingvon de via klavaro ankaŭ."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:56
-msgid "Mageia uses UTF-8 (Unicode) support by default."
-msgstr ""
-
-#. 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 ""
 "Ĉi tio povas esti malŝaltita en la plurlingva ekrano se vi certas pri tio ke "
 "ĝi estas neadekvata por via lingvo. Malŝalti unikodon havos konsekvencojn "
 "sur ĉiuj instalitaj lingvoj."
 
 #. 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 ""
 "Vi povas ŝanĝi la lingvon de via sistemo post la instalo per la Kontrolilo "
 "de Magejo -> Sistemo -> Agordi skrib-sistemojn."
 
 #. type: Content of: <section><info><title>
-#: en/selectMouse.xml:4
+#: en/selectMouse.xml:10
 msgid "Select mouse"
 msgstr "Selekti muson"
 
@@ -4059,18 +4275,19 @@ msgstr "Selekti muson"
 #.  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 revision=\"1\" fileref=\"dx2-selectMouse.png\" "
-"width=\"800\" depth=\"600\" format=\"PNG\" align=\"center\" xml:id="
-"\"selectMouse-im1\"></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."
@@ -4079,25 +4296,28 @@ msgstr ""
 "ĉi tie."
 
 #. 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 ""
 "Ofte, <guilabel>Universala</guilabel> - <guilabel>Ajna PS/2- kaj USB-musoj</"
 "guilabel> estas bona elekto."
 
 #. 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 ""
 "Selektu <guilabel>Universalan</guilabel> - <guilabel>Trudi evdev</guilabel> "
 "por konfiguri la butonojn kiuj ne funkcias en muso kun ses aŭ pli butonoj."
 
-#. 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 ""
 
@@ -4117,332 +4337,384 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:7
-msgid "Bootloader main options"
-msgstr "Lanĉilaj ĉefaj elektoj"
-
-#. type: Content of: <section><section><title>
 #: en/setupBootloader.xml:10
 #, fuzzy
-msgid "Bootloader interface"
+msgid "Bootloader"
 msgstr "Lanĉilaj ĉefaj elektoj"
 
-#. 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><title>
+#: en/setupBootloader.xml:15
+msgid "Grub2 on Legacy MBR/GPT systems"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:14
+#: en/setupBootloader.xml:17
 msgid ""
-"GRUB2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
+"GRUB2 (with or without graphical menu) will be used exclusively as the "
+"bootloader for a Legacy/MBR or Legacy/GPT system."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:18
-msgid "GRUB2-efi for a UEFI system."
+#: en/setupBootloader.xml:21
+msgid ""
+"By default, a new bootloader will be written into either the MBR (Master "
+"Boot Record) of your first hard drive or in the BIOS boot partition."
 msgstr ""
 
-#. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:22
-#, fuzzy
-msgid "The Mageia graphical menus are nice :)"
-msgstr "La grafika menuo de Magejo estas bela :)"
+#. type: Content of: <section><section><itemizedlist><title>
+#: en/setupBootloader.xml:27
+msgid "Grub2-efi on UEFI systems"
+msgstr ""
 
-#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:25
-msgid "GRUB2 on Legacy/MBR and Legacy/GPT systems"
+#. 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 ""
 
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:27
-#, fuzzy
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:33
 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>"
+"By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI "
+"System Partition)."
 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
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:35
 msgid ""
-"Don't modify the <emphasis role=\"bold\">Boot Device</emphasis> unless you "
-"really know what you are doing."
+"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 ""
 
-#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:38
-msgid "GRUB2-efi on UEFI systems"
-msgstr ""
+#. type: Content of: <section><section><info><title>
+#: en/setupBootloader.xml:46
+#, fuzzy
+msgid "Bootloader Setup"
+msgstr "Lanĉilaj ĉefaj elektoj"
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:39
-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 ""
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:49
+msgid "Bootloader main options"
+msgstr "Lanĉilaj ĉefaj elektoj"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:42
+#: en/setupBootloader.xml:51
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
-"imageobject>"
+"<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-"
 "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:49
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:62
+#, fuzzy
+msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
+msgstr "\"Free space preceding (MiB)\" \"2\""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:63
 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."
+"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><title>
-#: en/setupBootloader.xml:61
-msgid "Using a Mageia bootloader"
-msgstr "Uzi la lanĉilon de Magejo"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:67
+#, fuzzy
+msgid "<emphasis role=\"bold\">Boot device</emphasis>"
+msgstr "\"Free space preceding (MiB)\" \"2\""
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:62
-msgid ""
-"By default, and according to your system, Mageia writes one of the following:"
-msgstr ""
+#. 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 "Ŝanĝu aferojn nur se vi scias tre bone kion vi estas faranta."
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:66
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:72
+#, fuzzy
 msgid ""
-"a GRUB2 bootloader either into the MBR (Master Boot Record) of your first "
-"hard drive or in the BIOS boot partition."
-msgstr ""
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:70
-msgid "a GRUB2-efi bootloader into the ESP"
-msgstr ""
+"<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
+msgstr "\"Free space preceding (MiB)\" \"2\""
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:73
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:74
 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."
+"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 "\"Free space preceding (MiB)\" \"2\""
+
+#. 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-"
-"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:87
-msgid "Using an existing bootloader"
-msgstr "Uzi ekzistantan lanĉilon"
-
-#. type: Content of: <section><section><para>
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
 #: en/setupBootloader.xml:88
+msgid "Choose a password for the bootloader (optional)"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:91
+#, fuzzy
+msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
+msgstr "\"Free space preceding (MiB)\" \"2\""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:92
 #, 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."
+"Retype the password and DrakX will check that it matches with the one set "
+"above"
 msgstr ""
-"La ĝusta procezo por aldoni vian Magejan sistemon al ekzistanta lanĉilo "
-"estas preter la celo de tiu ĉi helpilo, tamen en la plimulto el la kazoj "
-"estos necese lanĉi lanĉilan instal-programon kiu devus detekti kaj konfiguri "
-"ĝin aŭtomate.  Vidu la dokumentaron por la konkreta operacia sistemo."
+"<guilabel>Pasvorto (denove)</guilabel>: Retajpu la uzulan pasvorton en ĉi "
+"tiu teksta skatolo kaj darkx kontrolos ĉu la pasvorto estas la sama en ĉiuj "
+"uzulaj pasvortaj teksto-skatoloj."
 
-#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:95
-msgid "Using chain loading"
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:96 en/setupBootloader.xml:154
+msgid "<emphasis>Advanced</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:96
-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>."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:99
+msgid "<emphasis>Enable ACPI</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:101
-#, fuzzy
+#. 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-"
-"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><para>
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
 #: en/setupBootloader.xml:108
-msgid ""
-"You will get a warning that the bootloader is missing, ignore it by clicking "
-"<guibutton>OK</guibutton>."
+msgid "<emphasis>Enable SMP</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:111
-#, fuzzy
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:109
 msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
-"imageobject>"
+"This option enables/disables symmetric multiprocessing for multi-core "
+"processors"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
-"\"></imagedata> </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:113
+msgid "<emphasis>Enable APIC</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:119
-msgid "First page"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:114
+msgid ""
+"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 ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
 #: en/setupBootloader.xml:120
+msgid "<emphasis>Enable Local APIC</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:121
 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."
+"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><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:122
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:127
+#, fuzzy
+msgid "Bootloader Configuration"
+msgstr "Lanĉilaj ĉefaj elektoj"
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:129
+#, fuzzy
 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."
+"<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-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:139
+#, fuzzy
+msgid "<emphasis role=\"bold\">Default</emphasis>"
+msgstr "\"Free space preceding (MiB)\" \"2\""
 
-#. 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 "\"Free space preceding (MiB)\" \"2\""
+
+#. 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>Pasvorto (denove)</guilabel>: Retajpu la uzulan pasvorton en ĉi "
-"tiu teksta skatolo kaj darkx kontrolos ĉu la pasvorto estas la sama en ĉiuj "
-"uzulaj pasvortaj teksto-skatoloj."
 
 #. 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>Servoj</guilabel>:"
+msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
+msgstr "\"Free space preceding (MiB)\" \"2\""
 
-#. 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-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:135
-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."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:166
+msgid "<emphasis>Video mode</emphasis>"
 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:167
 msgid ""
-"<guilabel>Enable Local APIC</guilabel>: Local APIC manages all external "
-"interrupts for a specific processor in an SMP system."
+"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><title>
-#: en/setupBootloader.xml:143
-msgid "Next page"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:172
+msgid "<emphasis>Do not touch ESP or MBR</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:146
-msgid "<guilabel>Default:</guilabel> Operating system started up by default"
+#: en/setupBootloader.xml:173
+msgid ""
+"Select this option if you don't want a bootable Mageia, but would rather "
+"chain-load it from another OS. You will get a warning that the bootloader is "
+"missing. Click<emphasis> Ok</emphasis> if you are sure you understand the "
+"implications, and wish to proceed."
 msgstr ""
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:150
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:181
+#, 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."
+"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align=\"center"
+"\"/> </imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
+"\"></imagedata> </imageobject>"
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:155
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:188
+msgid "Other Options"
+msgstr ""
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:190
+msgid "Using an existing bootloader"
+msgstr "Uzi ekzistantan lanĉilon"
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:191
+#, fuzzy
+msgid ""
+"The exact procedure for adding Mageia to an existing bootloader is beyond "
+"the scope of this documentation. However in most cases it will involve "
+"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 ""
+"La ĝusta procezo por aldoni vian Magejan sistemon al ekzistanta lanĉilo "
+"estas preter la celo de tiu ĉi helpilo, tamen en la plimulto el la kazoj "
+"estos necese lanĉi lanĉilan instal-programon kiu devus detekti kaj konfiguri "
+"ĝin aŭtomate.  Vidu la dokumentaron por la konkreta operacia sistemo."
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:199
+#, fuzzy
+msgid "Installing Without a Bootloader"
+msgstr "Uzi la lanĉilon de Magejo"
+
+#. 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
 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/setupSCSI.xml:3
+#: en/setupSCSI.xml:10
 msgid "Setup SCSI"
 msgstr "Konfiguri SCSI"
 
@@ -4454,18 +4726,20 @@ msgstr "Konfiguri 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 "
@@ -4477,84 +4751,59 @@ msgstr ""
 "bezonataj peliloj."
 
 #. 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 ""
 "Se tio okazas, vi devos permane diri al Drakx kiun SCSI-aparaton vi havas."
 
-#. type: Content of: <section><para>
-#: en/setupSCSI.xml:35
-msgid "DrakX should then be able to configure the drive(s) correctly."
-msgstr "DrakX devus tiam esti kapabla konfiguri la aparato(j)n ĝuste."
-
 #. type: Content of: <section><info><title>
-#: en/soundConfig.xml:3
+#: en/soundConfig.xml:10
 msgid "Sound Configuration"
 msgstr ""
 
 #.  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>"
-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
-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."
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-soundConfig.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"soundConfig-im1\"/> </imageobject>"
 msgstr ""
+"<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 ""
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:24
+#: 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 ""
 
 #. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:30
+#: en/soundConfig.xml:43
 msgid "Advanced"
 msgstr "Progresinta"
 
-#. type: Content of: <section><section><para>
-#: en/soundConfig.xml:33
-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 ""
-
-#. type: Content of: <section><section><para>
-#: en/soundConfig.xml:38
-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 ""
-
 #. type: Content of: <section><info><title>
-#: en/takeOverHdConfirm.xml:3
+#: en/takeOverHdConfirm.xml:10
 msgid "Confirm hard disk to be formatted"
 msgstr ""
 
@@ -4564,121 +4813,135 @@ msgstr ""
 #.     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=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </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 "Klaku sur <guibutton>Finata</guibutton> kiam vi estos preta."
 
-#. type: Content of: <section><para>
-#: en/takeOverHdConfirm.xml:31
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/takeOverHdConfirm.xml:48
 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/testing.xml:9
+#: en/testing.xml:3
 msgid "Testing Mageia as Live system"
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/testing.xml:14
+#: en/testing.xml:8
 msgid "Live mode"
 msgstr ""
 
+#. 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 ""
-
 #. type: Content of: <section><section><section><info><title>
-#: en/testing.xml:28
+#: en/testing.xml:21
 msgid "Testing hardware"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/testing.xml:31
+#: en/testing.xml:24
 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 ""
 
 #. 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 ""
 
 #. 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
+msgid "graphics card: if you see the previous screen, it's already OK."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:47
+#: en/testing.xml:40
 msgid "webcam:"
 msgstr ""
 
 #. 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 ""
 
 #. 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
+msgid "printer: configure your printer/s and print a test page"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:59
+#: en/testing.xml:52
 msgid "scanner: scan a document from ..."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/testing.xml:63
+#: en/testing.xml:56
 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 ""
 
-#. 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
+msgid ""
+"The configuration settings you apply here are carried over if you decide to "
+"proceed with the installation."
 msgstr ""
 
 #. type: Content of: <section><section><section><info><title>
-#: en/testing.xml:72
+#: en/testing.xml:68
 #, fuzzy
 msgid "Launch installation"
 msgstr "La instal-paŝoj"
 
+#. type: Content of: <section><section><section><para>
+#: en/testing.xml:71
+msgid ""
+"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 ""
+
 #. type: Content of: <section><section><section><mediaobject>
-#: en/testing.xml:76
+#: en/testing.xml:77
 msgid ""
 "<imageobject> <imagedata fileref=\"live-liveMode-install.png\"/> </"
 "imageobject>"
@@ -4686,22 +4949,13 @@ msgstr ""
 "<imageobject> <imagedata fileref=\"live-liveMode-install.png\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><section><section><para>
-#: en/testing.xml:81
-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."
-msgstr ""
-
 #. type: Content of: <section><info><title>
-#: en/uninstall-Mageia.xml:3
+#: en/uninstall-Mageia.xml:10
 msgid "Uninstalling Mageia"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:9
+#: en/uninstall-Mageia.xml:18
 msgid ""
 "If Mageia didn't convince you or you can't install it correctly - in short "
 "you want get rid of it - that is your right and Mageia also gives you the "
@@ -4709,34 +4963,37 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:14
+#: en/uninstall-Mageia.xml:23
 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 ""
 
 #. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:19
+#: en/uninstall-Mageia.xml:28
 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 ""
 
 #. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:27
+#: en/uninstall-Mageia.xml:46
 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 ""
 
 #. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:30
+#: en/uninstall-Mageia.xml:49
 msgid ""
 "If you have Vista or 7, you have one more possibility, you can extend the "
 "existing partition that is at the left of the freed space. There are other "
@@ -4746,30 +5003,45 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/unused.xml:9
+#: en/unused.xml:3
 msgid "Keep or delete unused material"
 msgstr ""
 
+#. 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
 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 ""
+
+#. 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>"
@@ -4778,12 +5050,443 @@ msgstr ""
 "> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/unused.xml:30
+#: en/unused.xml:31
 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 ""
 
+#~ msgid "User and Superuser Management"
+#~ msgstr "Uzula kaj superuzula administrado"
+
+#, fuzzy
+#~ msgid ""
+#~ "Every partition is shown to the left as: <emphasis role=\"bold\">Device "
+#~ "(capacity, mount point, type).</emphasis>"
+#~ msgstr ""
+#~ "Ĉiu subdisko estas montrita tiel: \"Aparato\" (\"Kapablo\", \"Surmetingo"
+#~ "\", \"Speco\")."
+
+#~ msgid ""
+#~ "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
+#~ msgstr ""
+#~ "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "Depending on your selection here, you may be offered further screens to "
+#~ "fine-tune your choice."
+#~ msgstr "Depende de viaj elektoj ĉi tie, povos aperi aliaj agordaj ekranoj."
+
+#, 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 "La elekto kiun faris DrakX estas kutime adekvata."
+
+#, 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 ""
+#~ "<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>Grafik-karto </guibutton></emphasis>: Elektu vian "
+#~ "karton en la listo se bezonate."
+
+#~ msgid "Incorrect refresh rates may damage your monitor"
+#~ msgstr "Malĝustaj refreŝ-datumoj povas damaĝi vian monitoron"
+
+#, 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>"
+
+#, 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-"
+#~ "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+
+#~ msgid "Click <guibutton>Done</guibutton> when you're ready."
+#~ msgstr "Klaku sur <guibutton>Finata</guibutton> kiam vi estos preta."
+
+#, 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-"
+#~ "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+
+#~ msgid "Use Free Space"
+#~ msgstr "Uzu liberan spacon"
+
+#~ msgid "Use Free Space on a Windows Partition"
+#~ msgstr "Uzu la liberan spacon de vindoza subdisko"
+
+#~ msgid ""
+#~ "If you have unused space on an existing Windows partition, the installer "
+#~ "may offer to use it."
+#~ msgstr ""
+#~ "Se vi havas neuzitan spacon en ekzistanta vindoza subdisko, la instalilo "
+#~ "povas proponi utiligi ĝin."
+
+#, 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-"
+#~ "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+
+#~ msgid "Erase and use Entire Disk."
+#~ msgstr "Forviŝu kaj uzu la tutan diskon."
+
+#~ msgid ""
+#~ "Note! This will erase ALL data on the selected hard drive. Take care!"
+#~ msgstr ""
+#~ "Atentu! Ĉi tio forigos ĈIUJN datumojn en la elektita fiksita disko. Estu "
+#~ "zorgema!"
+
+#, fuzzy
+#~ msgid "Custom disk partitioning"
+#~ msgstr "Agordi subdiskon per DiskDrake"
+
+#, 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-"
+#~ "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.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 "Uzi la lanĉilon de Magejo"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align="
+#~ "\"center\"></imagedata> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/"
+#~ "> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/"
+#~ "> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/"
+#~ "> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/"
+#~ "> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcomeHelp2.png\"/"
+#~ "> </imageobject>"
+
+#, 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 "Diversaj parametroj"
+
+#~ msgid "<guilabel>Timezone</guilabel>"
+#~ msgstr "<guilabel>Horzono</guilabel>"
+
+#~ msgid "<guilabel>Country / Region</guilabel>"
+#~ msgstr "<guilabel>Lando</guilabel>"
+
+#~ msgid "<guilabel>Bootloader</guilabel>"
+#~ msgstr "<guilabel>Startŝarĝilo</guilabel>"
+
+#~ msgid "For more information, see <xref linkend=\"setupBootloader\"/>"
+#~ msgstr "Por plia informo vidu <xref linkend=\"setupBootloader\"></xref>"
+
+#~ msgid "<guilabel>User management</guilabel>"
+#~ msgstr "<guilabel>Uzula administrado (User management)</guilabel>"
+
+#~ msgid "<guilabel>Services</guilabel>:"
+#~ msgstr "<guilabel>Servoj</guilabel>:"
+
+#~ msgid "For more information, see <xref linkend=\"configureServices\"/>"
+#~ msgstr "For more information, see <xref linkend=\"configureServices\"/>"
+
+#~ msgid "<guilabel>Keyboard</guilabel>:"
+#~ msgstr "<guilabel>Klavaro</guilabel>:"
+
+#~ msgid "<guilabel>Mouse</guilabel>:"
+#~ msgstr "<guilabel>Muso</guilabel>:"
+
+#~ msgid "<guilabel>Sound card</guilabel>:"
+#~ msgstr "<guilabel>Son-karto </guilabel>:"
+
+#~ msgid "<guilabel>Graphical interface</guilabel>:"
+#~ msgstr "<guilabel>Grafika interfaco</guilabel>:"
+
+#~ msgid "<guilabel>Network</guilabel>:"
+#~ msgstr "<guilabel>Reto</guilabel>:"
+
+#~ msgid "<guilabel>Proxies</guilabel>:"
+#~ msgstr "<guilabel>Prokuraj serviloj</guilabel>:"
+
+#~ msgid "<guilabel>Security Level</guilabel>:"
+#~ msgstr "<guilabel>Sekurec-nivelo </guilabel>:"
+
+#~ msgid "Check the option which best suits your usage."
+#~ msgstr "Aktivigu la elekton pli adekvatan laŭ viaj bezonoj."
+
+#~ msgid "<guilabel>Firewall</guilabel>:"
+#~ msgstr "<guilabel>Fajroŝirmilo (Fajromuro)</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 ""
+#~ "Fajroŝirmilo celas esti bariero inter viaj gravaj datumoj kaj la friponoj "
+#~ "en la reto kiuj volas kompromiti aŭ forŝteli ilin."
+
+#, 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 ""
+#~ "Elektu la servojn kiuj devas havi aliron al via sistemo. Viaj elektoj "
+#~ "dependos de tio por kio vi utiligas la komputilon."
+
+#, 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>"
+
+#~ 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 "Instalado"
+
+#~ msgid "Upgrade"
+#~ msgstr "Ĝisdatigu"
+
+#, 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 ""
+#~ "Se iam dum la instalado vi decidas haltigi ĝin, eblas reŝarĝi la "
+#~ "komputilon, sed bv. pripensi tion dufoje antaŭe.  Post la strukturado de "
+#~ "subdisko aŭ post la ekinstalo de ĝisdatigo via komputilo ne plu restos "
+#~ "egale, reŝarĝi ĝin povus igi vian sistemon neuzebla. Se malgraŭ tio vi "
+#~ "estas certa pri tio ke vi volas reŝarĝi, malfermu teksto-terminalon "
+#~ "premante la tri klavojn <guibutton>Alt Ctrl F2</guibutton> samtempe.  "
+#~ "Post tio, premu <guibutton>Alt Ctrl Delete</guibutton> samtempe por "
+#~ "reŝarĝi."
+
+#~ 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 ""
+#~ "<imageobject> <imagedata fileref=\"dx2-selectMouse.png\" align=\"center\" "
+#~ "format=\"PNG\" > </imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectMouse.png\" "
+#~ "width=\"800\" depth=\"600\" format=\"PNG\" align=\"center\" xml:id="
+#~ "\"selectMouse-im1\"></imagedata> </imageobject>"
+
+#, fuzzy
+#~ msgid "The Mageia graphical menus are nice :)"
+#~ msgstr "La grafika menuo de Magejo estas bela :)"
+
+#, 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 ""
+#~ "<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-"
+#~ "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata fileref=\"live-setupBootloader2.png\"/> </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-"
+#~ "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid "<guilabel>Advanced</guilabel>"
+#~ msgstr "<guilabel>Servoj</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 devus tiam esti kapabla konfiguri la aparato(j)n ĝuste."
+
+#, 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 ""
+#~ "<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=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+
 #~ 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 "
@@ -4878,22 +5581,6 @@ msgstr ""
 #~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureX-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 ""
-#~ "Estas langeto por ĉiu trovita fiksita disko aŭ alispeca stor-aparato kiel "
-#~ "USB-ŝlosilo. Ekzemple sda, sdb kaj sdc se estas tri."
-
 #, fuzzy
 #~ msgid ""
 #~ "<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
@@ -4908,21 +5595,6 @@ msgstr ""
 #~ msgid "\"Align to\" \"MiB\""
 #~ msgstr "\"Align to\" \"MiB\""
 
-#~ 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 ""
 #~ "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
@@ -4944,15 +5616,6 @@ msgstr ""
 #~ "\"installUpdates-im1\"></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 ""
 #~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png"
 #~ "\" align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></"
 #~ "imagedata> </imageobject>"
@@ -4986,13 +5649,6 @@ msgstr ""
 #~ "imageobject>"
 
 #~ msgid ""
-#~ "Use this option for a fresh <application>Mageia</application> "
-#~ "installation."
-#~ msgstr ""
-#~ "Uzu tiun elekton por freŝa instalado de <application>Magejo</"
-#~ "application> ."
-
-#~ msgid ""
 #~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" "
 #~ "format=\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </"
 #~ "imageobject>"
@@ -5012,9 +5668,6 @@ msgstr ""
 #~ "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
 #~ "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
-#~ msgid "Custom"
-#~ msgstr "Subdiskigo"
-
 #, fuzzy
 #~ msgid ""
 #~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
@@ -5168,13 +5821,6 @@ msgstr ""
 #~ "\" format=\"PNG\"/> </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 ""
diff --git a/docs/docs/stable/installer/es.po b/docs/docs/stable/installer/es.po
index eb1bdd9d..b2502d55 100644
--- a/docs/docs/stable/installer/es.po
+++ b/docs/docs/stable/installer/es.po
@@ -25,7 +25,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: 2018-05-22 11:30+0000\n"
 "Last-Translator: Jose Manuel López <joselp@outlook.es>\n"
 "Language-Team: Spanish (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -37,12 +37,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Content of: <section><info><title>
-#: en/acceptLicense.xml:25
+#: en/acceptLicense.xml:31
 msgid "License and Release Notes"
 msgstr "Licencia y Notas de la Versión"
 
 #. type: Content of: <section><mediaobject>
-#: en/acceptLicense.xml:29
+#: en/acceptLicense.xml:35
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
 "\"acceptLicense-im1\" fileref=\"dx2-license.png\" align=\"center\" revision="
@@ -52,79 +52,87 @@ msgid ""
 msgstr "Noticias localizadas"
 
 #. type: Content of: <section><section><info><title>
-#: en/acceptLicense.xml:40
+#: en/acceptLicense.xml:46
 msgid "License Agreement"
 msgstr "Acuerdo de licencia"
 
-#. 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 ""
 "Antes de instalar <application>Mageia</application>, por favor, lea "
 "cuidadosamente los términos y condiciones de la licencia."
 
-#. 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 ""
 "Estos términos y condiciones se aplican a la distribución completa de "
 "<application>Mageia</application> y tiene que aceptarlos para poder "
 "continuar."
 
-#. 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 ""
 "Para continuar, simplemente seleccione\n"
 "Aceptar y luego pulsar en Siguiente."
 
 #. 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 ""
 "Si decide no aceptar las condiciones, nosotros le agradecemos que las haya "
 "leído. Haciendo click en <guibutton>Salir</guibutton> se reiniciará su "
 "ordenador."
 
 #. type: Content of: <section><section><info><title>
-#: en/acceptLicense.xml:63
+#: en/acceptLicense.xml:76
 msgid "Release Notes"
 msgstr "Notas de la versión"
 
 #. 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 ""
 "Información importante sobre este lanzamiento de\n"
 "Mageia se puede ver haciendo clic en el botón Notas de la versión."
 
 #. 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 "es"
 
 #. 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 "Selección de Medios (Configurar Medios de Instalación Complementarios)"
 
 #.  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
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-add_supplemental_media."
 "png\" xml:id=\"dx2-add_supplemental_media-im1\" align=\"center\" revision="
@@ -132,12 +140,13 @@ msgid ""
 msgstr ""
 
 #. 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 ""
 "Esta pantalla muestra la lista de repositorios ya reconocidos. Puede agregar "
 "otras fuentes para paquetes, desde un disco óptico o una fuente remota. La "
@@ -145,24 +154,25 @@ msgstr ""
 "pasos siguientes."
 
 #. 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 "Para un repositorio por red, hay dos pasos a seguir:"
 
 #. 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 "Elección y activación de la red, si es que no está activada ya."
 
 #. 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 ""
 "Seleccionar un espejo o especificar una URL (primera entrada). Al "
 "seleccionar un espejo, tiene acceso a la selección de todos los repositorios "
@@ -171,14 +181,15 @@ msgstr ""
 "designar un repositorio específico o su propia instalación de NFS."
 
 #. 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 ""
 "Si está actualizando una instalación de 64 bits que puede contener algunos "
 "paquetes de 32 bits, se recomienda utilizar esta pantalla para agregar un "
@@ -188,18 +199,25 @@ msgstr ""
 "instalador encontrará allí los paquetes de 32 bits necesarios."
 
 #. type: Content of: <section><info><title>
-#: en/addUser.xml:3
-msgid "User and Superuser Management"
-msgstr "Administración de usuarios y del administrador"
+#: en/addUser.xml:9
+#, fuzzy
+msgid "User Management"
+msgstr "Administración Avanzada de Usuarios"
 
 #.  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 format=\"PNG\" fileref="
 "\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -207,20 +225,21 @@ msgstr ""
 "\"PNG\" 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 "Establezca la Contraseña del Administrador (root)"
 
 #. 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 ""
 "Es aconsejable en todas las instalaciones de Mageia configurar una "
 "contraseña de superusuario (administrador), generalmente llamada contraseña "
@@ -231,9 +250,10 @@ msgstr ""
 "verificar que la primera entrada no haya sido mal escrita."
 
 #. 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 ""
 "Todas las contraseñas son sensibles a mayúsculas Lo mejor es usar una "
@@ -241,17 +261,18 @@ msgstr ""
 "en una contraseña."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:42
+#: en/addUser.xml:57
 msgid "Enter a user"
 msgstr "Introduzca un usuario"
 
 #. 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 ""
 "Agregue un usuario aquí. Un usuario regular tiene menos privilegios que el\n"
 "superusuario (root), pero suficiente para usar Internet, aplicaciones de "
@@ -259,64 +280,89 @@ msgstr ""
 "usar su computadora."
 
 #. 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\">Avanzado</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>Icono</guibutton>: Si hace click en este botón cambiará el icono "
 "del usuario."
 
 #. 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 "Servidor"
+
+#. 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>Nombre y Apellidos</guilabel>: Introduzca el nombre real del "
 "usuario en este recuadro."
 
 #. 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\">Avanzado</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 ""
 "Nombre de inicio de sesión: ingrese el nombre de usuario o permita que DrakX "
 "use una versión del nombre real del usuario. El nombre de usuario es "
 "sensible a mayúsculas y minúsculas"
 
+#. 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\">Avanzado</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 ""
 "Contraseña: escriba la contraseña del usuario. Hay un escudo al final del "
 "cuadro de texto que indica la fuerza de la contraseña. (Ver también )"
 
 #. 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 ""
 "Contraseña (nuevamente): Vuelva a escribir la contraseña del usuario. DrakX "
 "verificará que no ha escrito mal la contraseña."
 
 #. 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 ""
 "Cualquier usuario que haya agregado al instalar Mageia tendrá un directorio "
 "de inicio que esté protegido de lectura y escritura (umask = 0027)."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:82
+#: en/addUser.xml:104
 msgid ""
 "You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
@@ -327,58 +373,62 @@ msgstr ""
 "usuarios."
 
 #. 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 "Los permisos de acceso se pueden cambiar también tras la instalación."
 
 #. 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 "Administración Avanzada de Usuarios"
 
 #. 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 ""
 "La opción avanzada le permite editar configuraciones adicionales para el "
 "usuario que está agregando."
 
 #. 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 ""
 "Shell: esta lista desplegable le permite cambiar el shell disponible para "
 "cualquier usuario que haya agregado en la pantalla anterior. Las opciones "
 "son Bash, Dash y 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 ""
 "ID de usuario: aquí puede establecer la ID de usuario para cualquier usuario "
 "que haya agregado en la pantalla anterior. Si no está seguro de cuál es el "
 "propósito de esto, déjelo en blanco."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:113
+#: en/addUser.xml:136
+#, fuzzy
 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 ""
 "ID de grupo: esto le permite configurar la ID del grupo\n"
 "De nuevo, si no está seguro, déjelo en blanco."
 
 #. type: Content of: <section><info><title>
-#: en/ask_mntpoint_s.xml:3
+#: en/ask_mntpoint_s.xml:10
 msgid "Choose the mount points"
 msgstr "Elija los puntos de montaje"
 
@@ -393,67 +443,55 @@ msgstr "Elija los puntos de montaje"
 #.        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 align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"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 ""
 "Aquí puede ver las particiones de Linux que se han encontrado en su "
 "ordenador. Si no está de acuerdo con la sugerencia de <application>DrakX</"
 "application>, puede cambiar los puntos de montaje."
 
-#. type: Content of: <section><note><para>
-#: en/ask_mntpoint_s.xml:41
-msgid ""
-"If you change anything, make sure you still have a <emphasis role=\"bold"
-"\"><literal>/</literal></emphasis> (root) partition."
-msgstr ""
-"Si cambia algo, asegúrese de que todavía tenga una\n"
-"partición de raíz /"
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:46
-msgid ""
-"Every partition is shown to the left as: <emphasis role=\"bold\">Device "
-"(capacity, mount point, type).</emphasis>"
-msgstr ""
-"Cada partición se muestra a la izquierda como:\n"
-"Dispositivo (capacidad, punto de montaje, tipo)."
-
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:50
+#: en/ask_mntpoint_s.xml:55
 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 ""
-"Dispositivo, se compone de: disco duro, [nombre del disco duro (letra)], "
-"número de partición (por ejemplo, sda5)."
 
 #. 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 ""
 "Si tiene varias particiones, puede elegir varios puntos de montaje "
 "diferentes en el menú desplegable, como /, / home y / var. Incluso puede "
@@ -462,7 +500,7 @@ msgstr ""
 "sus datos."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:63
+#: en/ask_mntpoint_s.xml:73
 msgid ""
 "For any partitions that you don't need to make use of, you can leave the "
 "mount point field blank."
@@ -471,201 +509,264 @@ msgstr ""
 "campo de punto de montaje."
 
 #. type: Content of: <section><warning><para>
-#: en/ask_mntpoint_s.xml:69
+#: en/ask_mntpoint_s.xml:79
+#, fuzzy
+msgid ""
+"If you make any changes here, ensure you still have a <filename>/</filename> "
+"(root) partition."
+msgstr ""
+"Si cambia algo, asegúrese de que todavía tenga una\n"
+"partición de raíz /"
+
+#. type: Content of: <section><tip><para>
+#: en/ask_mntpoint_s.xml:84
+#, 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 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 ""
 "Si no está seguro de qué elegir, haga clic en Atrás para volver y luego "
 "marque Partición de disco personalizada, donde puede hacer clic en una "
 "partición para ver su tipo y tamaño."
 
 #. 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 ""
 "Si está seguro de que los puntos de montaje son correctos, haga click en "
 "<guibutton>Siguiente</guibutton>, y elija si quiere formatear o bien "
 "solamentelas particiones que DrakX sugiere o bien alguna más."
 
 #. type: Content of: <section><info><title>
-#: en/bestTime.xml:10
-msgid "Clock settings"
+#: en/bestTime.xml:5
+#, fuzzy
+msgid "Clock Settings"
 msgstr "Ajustes del Reloj"
 
 #. 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 ""
 "En este paso, tiene que seleccionar en que hora está establecido su reloj, "
 "ya sea la hora local o UTC."
 
 #. type: Content of: <section><para>
-#: en/bestTime.xml:23
-msgid "In advanced tab, you will find more options about clock settings."
+#: en/bestTime.xml:14
+msgid ""
+"In the <emphasis>Advanced</emphasis> tab, you can enable automatic time "
+"synchronization and specify an NTP server."
 msgstr ""
-"En la ficha Avanzada, encontrara más opciones de configuración del reloj."
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:1
+#: en/bootLive.xml:6
 msgid "Boot Mageia as Live system"
 msgstr "Iniciar Mageia en modo Live"
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:1
+#: en/bootLive.xml:10
 msgid "Booting the medium"
 msgstr "Arrancando el medio"
 
-#. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:1
-msgid "From a disc"
-msgstr "Desde un disco"
-
-#. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:1
+#. type: Content of: <section><section><para>
+#: en/bootLive.xml:12
 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."
+"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 ""
-"Puede arrancar directamente desde el CD o DVD en el que grabó la imagen ISO. "
-"Normalmente tiene que insertarlo en el lector de CD/DVD para que se lance el "
-"instalador automáticamente cuando reinicie su ordenador. Si eso no ocurre, "
-"tendrá que configurar la BIOS o pulsar una tecla durante el arranque, y que "
-"le ofrecerá un menú arranque donde escoger. "
 
-#. 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 ""
-"De acuerdo al hardware que tiene, y cómo está configurado, se obtiene una de "
-"las dos pantallas siguientes."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:7
-msgid "From a USB device"
-msgstr "Desde un dispositivo USB"
+#. 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 ""
-"Puede arrancar desde el dispositivo USB en el que volcó su imagen ISO. De "
-"acuerdo a la configuración de su BIOS, quizás la computadora arranque "
-"directamente en el dispositivo USB que ya está conectado al puerto. Si esto "
-"no ocurre, puede que tenga que volver a configurar su BIOS o presionar una "
-"tecla que le de la posibilidad de elegir el periférico desde el cual "
-"arrancará la computadora."
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:12
+#: en/bootLive.xml:35
 msgid "In BIOS/CSM/Legacy mode"
 msgstr "En modo BIOS/CSM/Legacy"
 
+#. 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 "Estación de trabajo"
+
+#. 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 ""
+"Los valores de configuración que Ud estableció aquí, se mantienen durante la "
+"instalación."
+
+#. 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 "Por favor elija el nivel de seguridad deseado"
+
+#. 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 "Estación de trabajo"
+
+#. 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 ""
+"Instalar Mageia: Esta opción instalará Mageia directamente en un disco "
+"rígido."
+
+#. 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>"
 
 #. 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 "Primera pantalla al arrancar en modo BIOS"
 
-#. type: Content of: <section><section><para>
-#: en/bootLive.xml:12
-msgid "In the middle menu, you have the choice between three actions:"
-msgstr "En el menú del medio, tiene que elegir entre tres acciones:"
+#. 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 ""
-"Arrancar Mageia: Esto significa que Mageia 5 arrancará desde el medio "
-"conectado (CD/DVD o memoria USB) sin escribir nada en el disco, por lo que "
-"se espera que el sistema sea muy lento. Una vez realizado el arranque, puede "
-"seguir con la instalación en el disco rígido."
+#: en/bootLive.xml:75
+#, fuzzy
+msgid "<keycap>F1</keycap> <emphasis role=\"bold\">Help</emphasis>"
+msgstr "Servidor"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:16
+#: en/bootLive.xml:76
+#, fuzzy
 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 ""
-"Instalar Mageia: Esta opción instalará Mageia directamente en un disco "
-"rígido."
+"En cualquiera de las opciones F2 a F6, puede ver ayuda relevante al "
+"presionar F1"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:81
+#, fuzzy
+msgid "<keycap>F2</keycap> <emphasis role=\"bold\">Language</emphasis>"
+msgstr "<emphasis role=\"bold\">Avanzado</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:17
+#: 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 ""
-"Arrancar desde el disco rígido: Esta opción permite arrancar desde el disco "
-"rígido, como de costumbre, cuando ningún medio (CD/DVD o memoria USB) está "
-"conectado (no funciona con Mageia 5)."
 
-#. type: Content of: <section><section><para>
-#: en/bootLive.xml:19
-msgid "In the bottom menu, are the Boot Options:"
-msgstr "En el menú inferior, las Opciones de Inicio son:"
+#. 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\">Avanzado</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 - Ayuda. Explicar las opciones \"splash\", \"apm\", \"acpi\" e \"Ide\""
+"Si es necesario, cambie la resolución de la pantalla presionando F3 (solo "
+"modo Legacy)."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:20
-msgid "F2 - Language. Choose the display language of the screens."
-msgstr "F2 - Idioma. Elegir el idioma de visualización de las pantallas."
+#: en/bootLive.xml:93
+#, fuzzy
+msgid "<keycap>F4</keycap> <emphasis role=\"bold\">Source</emphasis>"
+msgstr "Servidor"
 
 #. 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 - Resolución de pantalla. Elegir entre texto, 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 u otro. Normalmente, la instalación se realiza desde el "
 "medio de instalación insertado. Aquí seleccionar otras fuentes, como "
@@ -674,119 +775,177 @@ msgstr ""
 "disponibles en el servidor."
 
 #. 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 "Servidor"
+
+#. 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 - Controlador. Si o No. El sistema sabe de la presencia de un disco "
-"opcional con una actualización del controlador y requerirá su inserción "
-"durante el proceso de instalación."
 
 #. 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 "Estación de trabajo"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:106
+#, fuzzy
 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 ""
+"Si tiene problemas con la instalación, puede intentar modificar la "
+"configuración predeterminada utilizando las Opciones de Kernel F6 (para "
+"sistemas UEFI presione \"e\" en su lugar)."
+
+#. 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 "Alinear a = MiB"
+
+#. 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 ""
+"Sin ACPI: (Configuración avanzada e interfaz de alimentación): las funciones "
+"de administración de energía no se utilizan."
+
+#. 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 ""
+"No Local APIC: (Controlador de interrupción programable avanzado local): "
+"Interrupción de la CPU. Seleccione esta opción si experimenta mal "
+"comportamiento del sistema como un kernel panic en relación con APIC."
+
+#. 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 - Opciones del Kernel. Esta es la manera de especificar las opciones de "
-"acuerdo a su hardware y los controladores a usar."
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:29
+#: en/bootLive.xml:139
 msgid "In UEFI mode"
 msgstr "En modo UEFI"
 
 #. 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 "Primera pantalla durante el arranque del sistema UEFI desde el disco"
+#: en/bootLive.xml:146
+#, fuzzy
+msgid "First screen while booting in UEFI mode"
+msgstr "Primera pantalla al arrancar en modo BIOS"
 
 #. 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 ""
-"Ud solamente tiene la opción de ejecutar Mageia en modo Live (primera "
-"opción) o procesar la instalación (segunda opción)."
 
-#. 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 ""
-"Si arrancó desde un pen-drive USB, obtendrá dos líneas suplementarias que "
-"son duplicados de líneas previas con un sufijo \"USB\". Ha de elegirlas."
+"Arrancar Mageia: Esto significa que Mageia 5 arrancará desde el medio "
+"conectado (CD/DVD o memoria USB) sin escribir nada en el disco, por lo que "
+"se espera que el sistema sea muy lento. Una vez realizado el arranque, puede "
+"seguir con la instalación en el disco rígido."
 
-#. 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 ""
-"En cada caso, los primeros pasos serán elegir idioma, zona horaria y "
-"teclado. Después, los procesos serán diferentes, con <link linked=\"testing"
-"\">pasos adicionales en modo Live</link>."
 
 #. type: Content of: <section><info><title>
-#: en/chooseDesktop.xml:3
+#: en/chooseDesktop.xml:16
 msgid "Desktop Selection"
 msgstr "Selección de escritorio"
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:8
-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 ""
-"Dependiendo de su selección aquí, aparecerán más pantallas para ajustar su "
-"elección."
 
 #. 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 ""
 "Después del (los) pasos de selección, verá una presentación de diapositivas "
 "durante la instalación del paquete. La presentación de diapositivas se puede "
 "desactivar presionando el botón Detalles"
 
 #. 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 format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
 "align=\"center\"/> </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 ""
 "Elija si prefiere usar el entorno de escritorio de KDE Plasma o GNOME. Ambos "
 "vienen con un conjunto completo de aplicaciones y herramientas útiles. "
@@ -802,8 +961,9 @@ msgid "Package Group Selection"
 msgstr "Selección de Grupo de Paquetes"
 
 #. 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
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
 "\" align=\"center\"/> </imageobject>"
@@ -812,7 +972,7 @@ msgstr ""
 "\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:14
+#: en/choosePackageGroups.xml:16
 msgid ""
 "Packages are arranged into common groups, to make choosing what you need on "
 "your system a lot easier. The groups are fairly self explanatory, however "
@@ -826,22 +986,22 @@ msgstr ""
 "medida que el mouse se desplaza sobre ellos."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:21
+#: en/choosePackageGroups.xml:23
 msgid "<emphasis role=\"bold\">Workstation</emphasis>"
 msgstr "Estación de trabajo"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:25
+#: en/choosePackageGroups.xml:27
 msgid "<emphasis role=\"bold\">Server</emphasis>"
 msgstr "Servidor"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:29
+#: en/choosePackageGroups.xml:31
 msgid "<emphasis role=\"bold\">Graphical Environment</emphasis>"
 msgstr "Entorno gráfico"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:33
+#: en/choosePackageGroups.xml:35
 msgid ""
 "<emphasis role=\"bold\">Individual Package Selection</emphasis>: you can use "
 "this option to manually add or remove packages"
@@ -850,7 +1010,7 @@ msgstr ""
 "eliminar paquetes manualmente"
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:38
+#: en/choosePackageGroups.xml:40
 msgid ""
 "See <xref linkend=\"minimal-install\"/> for instructions on how to do a "
 "minimal install (without or with X &amp; IceWM)."
@@ -865,15 +1025,17 @@ msgid "Choose Individual Packages"
 msgstr "Elegir paquetes detalladamente"
 
 #. 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
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackagesTree.png"
 "\" align=\"center\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:14
+#: en/choosePackagesTree.xml:18
 msgid ""
 "Here you can add or remove any extra packages to customize your installation."
 msgstr ""
@@ -881,13 +1043,14 @@ msgstr ""
 "su instalación."
 
 #. 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 ""
 "Después de elegir, puede hacer click en el <guibutton>icono del disquete</"
 "guibutton> al final de la página para guardar su elección de paquetes "
@@ -902,8 +1065,10 @@ msgstr "Configure sus Servicios"
 
 #.  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
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-configureServices.png"
 "\" xml:id=\"configureServices-im1\" align=\"center\" revision=\"1\"/> </"
@@ -911,26 +1076,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:16
+#: en/configureServices.xml:20
 msgid ""
 "Here you can choose which services should start when you boot your system."
 msgstr ""
 "Aquí puede elegir qué servicios deberían comenzar cuando reinicie su sistema."
 
-#. 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
+#, fuzzy
+msgid ""
+"Click on a triangle to expand a group to all the relevant services. The "
+"settings DrakX chose are usually good."
 msgstr ""
 "Haga clic en un triángulo para expandir un grupo de todos los servicios "
 "relevantes."
 
-#. type: Content of: <section><para>
-#: en/configureServices.xml:22
-msgid "The settings DrakX chose are usually good."
-msgstr "La configuración que DrakX eligió suele ser buena."
-
-#. 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."
@@ -939,7 +1102,7 @@ msgstr ""
 "abajo."
 
 #. 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 "Sólo cambie servicios cuando sepa bien lo que está haciendo."
 
@@ -950,27 +1113,35 @@ msgstr "Configure su huso horario"
 
 #.  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 align=\"center\" fileref="
+"\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata fileref=\"live-setupBootloader3.png\" align=\"center\"/> </"
+"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 ""
 "Elija su zona horaria eligiendo su país o una ciudad cercana a usted en la "
 "misma zona horaria."
 
 #. type: Content of: <section><para>
-#: en/configureTimezoneUTC.xml:24
+#: en/configureTimezoneUTC.xml:32
 msgid ""
 "In the next screen you can choose to set your hardware clock to local time "
 "or to GMT, also known as UTC."
@@ -979,7 +1150,7 @@ msgstr ""
 "hora local o a GMT, también conocido como 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."
@@ -988,20 +1159,23 @@ msgstr ""
 "están ajustados bien a la hora local bien a 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 "Escoja un servidor X (Configurando su tarjeta gráfica)"
 
 #. 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 align=\"center\" fileref=\"live-unused.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"unused-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."
@@ -1010,7 +1184,7 @@ msgstr ""
 "usualmente puede identificar su tarjeta correctamente."
 
 #. 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:"
@@ -1018,30 +1192,34 @@ msgstr ""
 "Si el instalador no ha dectectado su tarjeta grafica correctamente y usted "
 "sabe cuál es, puede escogerla del árbol:"
 
-#. 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 "fabricante"
 
 #. 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 "el nombre de su tarjeta"
 
 #. 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 "y el tipo de tarjeta"
 
 #. 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 ""
 "Si no puede encontrar su tarjeta en la lista de proveedores (porque todavía "
 "no está en la base de datos o es una tarjeta más vieja), puede encontrar un "
@@ -1051,64 +1229,64 @@ msgstr ""
 "controlador específico para su tarjeta, existe la opción de usar el "
 "controlador vesa que brinda capacidades básicas."
 
-#. 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 ""
 "Tenga en cuenta que si selecciona un controlador incompatible, es posible "
 "que solo tenga acceso a la\n"
 "Interfaz de línea de comandos."
 
 #. 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 ""
 "Algunos fabricantes de tarjetas de video proporcionan controladores "
 "propietarios para Linux que solo pueden estar disponibles en el\n"
 "repositorio no libre y, en algunos casos, solo desde los sitios web de los "
 "fabricantes de tarjetas."
 
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:56
-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 ""
-"Los repositorios Nonfree deben estar explícitamente habilitados para acceder "
-"a ellos. Si no los habilitó previamente, debe hacerlo después de reiniciar "
-"su sistema por primera vez."
-
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:3
+#: en/configureX_chooser.xml:11
 msgid "Graphic Card and Monitor Configuration"
 msgstr "Configuración de la tarjeta gráfica y del monitor"
 
 #.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
+#. 2018/02/15 apb: Some text and typography.
+#. 2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.
+#. 2018/02/23 apb: Typo.
 #. 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 align=\"center\" fileref=\"live-unused.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"unused-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 ""
 "No importa qué entorno gráfico (también conocido como entorno de escritorio) "
 "elija para esta instalación de Mageia, todos están basados en un sistema "
@@ -1119,52 +1297,70 @@ msgstr ""
 "detalles son incorrectos."
 
 #. 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 "Entorno gráfico"
+
+#. 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>Tarjeta gráfica</guibutton></emphasis>: Elija su "
-"tarjeta de la lista si es necesario."
 
 #. 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 "Servidor"
+
+#. 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 ""
 "Monitor: puede elegir Plug'n Play, si corresponde, o elegir su monitor de la "
 "lista de proveedores o genéricos. Elija Personalizado si prefiere configurar "
 "manualmente las frecuencias de actualización horizontal y vertical de su "
 "monitor."
 
-#. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/configureX_chooser.xml:41
-msgid "Incorrect refresh rates may damage your monitor"
-msgstr "Tasas de refresco incorrectas pueden dañar su monitor"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_chooser.xml:60
+#, fuzzy
+msgid "<emphasis role=\"bold\">Resolution</emphasis>"
+msgstr "Estación de trabajo"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:47
-msgid ""
-"<emphasis><guibutton>Resolution</guibutton></emphasis>: The resolution and "
-"color depth of your monitor can be set here."
+#: en/configureX_chooser.xml:63
+#, fuzzy
+msgid "The resolution and color depth of your monitor can be set here"
 msgstr ""
 "Resolución: la resolución y la profundidad de color de su monitor se pueden "
 "configurar aquí."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:52
+#: en/configureX_chooser.xml:68
+#, fuzzy
+msgid "<emphasis role=\"bold\">Test</emphasis>"
+msgstr "Servidor"
+
+#. 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 ""
 "Prueba: el botón de prueba no siempre aparece durante la instalación. Si la "
 "opción está ahí, y prueba su configuración, se le preguntará si su "
@@ -1175,21 +1371,35 @@ msgstr ""
 "su configuración esté puesta correctamente."
 
 #. 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 "Estación de trabajo"
+
+#. 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>Opciones</guibutton></emphasis>: Aquí puede escoger el "
 "activar o desactivar varias opciones."
 
+#. 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 "Escogiendo su monitor"
 
 #. 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."
@@ -1198,7 +1408,7 @@ msgstr ""
 "identificar su monitor correctamente."
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:19
+#: en/configureX_monitor.xml:30
 msgid ""
 "<emphasis role=\"bold\">Selecting a monitor with different characteristics "
 "could damage your monitor or video hardware. Please don't try something "
@@ -1211,22 +1421,26 @@ msgstr ""
 "monitor."
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:26
+#: en/configureX_monitor.xml:38
+#, fuzzy
 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 align=\"center\" fileref=\"live-unused.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"unused-im1\"/> </imageobject>"
 
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:31
-msgid "<emphasis>Custom</emphasis>"
-msgstr "<emphasis>Personalizado</emphasis>"
+#. type: Content of: <section><variablelist><varlistentry><term>
+#: en/configureX_monitor.xml:46
+msgid "Custom"
+msgstr ""
 
-#. 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."
@@ -1236,8 +1450,8 @@ msgstr ""
 "determina cada cuánto se actualiza la pantalla y la sincronizacion "
 "horizontal es la tasa por lo cual las lineas de escaneo se pueden ver."
 
-#. 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 "
@@ -1249,27 +1463,23 @@ msgstr ""
 "puede dañarlo. Si tiene duda, escoja un configuración conservadora y "
 "consulte la documentacion de su monitor."
 
-#. 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 ""
 "Esta es la opción predeterminada y trata de identificar el tipo de monitor "
 "que tiene usando la base de datos de monitores."
 
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:51
-msgid "<emphasis>Vendor</emphasis>"
-msgstr "<emphasis>Vendedor</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:"
@@ -1277,30 +1487,30 @@ msgstr ""
 "Si el instalador no pudo identificar su monitor correctamente y usted sabe "
 "cuál es, lo puede escoger del árbol:"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:61
-msgid "the monitor manufacturers name"
-msgstr "el nombre del fabricante del monitor"
+#. 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 "la descripción del monitor"
+#. 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>Genérico</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 ""
 "Al seleccionar este grupo, se mostrarán casi 30 configuraciones de pantalla, "
 "como 1024x768 @ 60Hz, e incluye pantallas planas como las que se usan en las "
@@ -1310,124 +1520,147 @@ msgstr ""
 "determinarse automáticamente. Una vez más, tenga cuidado en su selección."
 
 #. 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 "Particionado de disco personalizado con DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:12
-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>"
-
-#. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:22
+#: en/diskdrake.xml:27
+#, 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."
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-diskdrake.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-diskdrake.png\"/> </imageobject>"
 msgstr ""
-"Si desea usar el cifrado en su partición /, debe asegurarse de tener una "
-"partición / boot separada. La opción de encriptación para la partición / "
-"boot NO se debe establecer; de lo contrario, su sistema no podrá arrancar."
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><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 ""
 "Modifique el diseño de su (s) disco (s) aquí. Puede eliminar o crear "
 "particiones, cambiar el sistema de archivos de una partición o cambiar su "
 "tamaño e incluso ver sus detalles antes de comenzar."
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:34
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/diskdrake.xml:45
+#, fuzzy
 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>."
+"device, like a USB key). In the screenshot above there are two available "
+"devices: <filename>sda </filename>and <filename>sdb</filename>."
 msgstr ""
 "Hay una pestaña en la parte superior para cada disco duro detectado (u otro "
 "dispositivo de almacenamiento como un USB). En la captura de pantalla de "
 "arriba hay dos dispositivos disponibles: sda y sdb."
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:39
-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."
-msgstr ""
-"Cuidado con la opción \"Borrar todo\", úsela solo si está seguro de que "
-"desea borrar todas las particiones del dispositivo de almacenamiento "
-"seleccionado."
-
-#. 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 ""
 "Para el resto de acciones: pulse primero en la partición deseada. Luego, "
 "visualícelo o elija un sistema de archivos y un punto de montaje, cambie su "
 "tamaño o límpielo. El modo experto proporciona más opciones, como una "
 "etiqueta (dar un nombre a) una partición, o elegir un tipo de partición."
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:49
-msgid "Continue until you have adjusted everything to your satisfaction."
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/diskdrake.xml:60
+#, fuzzy
+msgid ""
+"Continue until you have adjusted everything to your satisfaction, then click "
+"<emphasis>Done</emphasis> when you're ready."
 msgstr "Continúe hasta que haya ajustado todo a su gusto."
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:52
-msgid "Click <guibutton>Done</guibutton> when you're ready."
-msgstr "Haga click en <guibutton>Hecho</guibutton> cuando esté listo."
+#. 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 ""
+"Cuidado con la opción \"Borrar todo\", úsela solo si está seguro de que "
+"desea borrar todas las particiones del dispositivo de almacenamiento "
+"seleccionado."
 
-#. 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 ""
+"Si desea usar el cifrado en su partición /, debe asegurarse de tener una "
+"partición / boot separada. La opción de encriptación para la partición / "
+"boot NO se debe establecer; de lo contrario, su sistema no podrá arrancar."
+
+#. 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 ""
 "Si está instalando Mageia en un sistema UEFI, verifique que esté presente "
 "una ESP (Partición del sistema EFI) y que esté correctamente montada en / "
 "boot / EFI (consulte a continuación)."
 
-#. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:61
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/diskdrake.xml:93
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
-"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"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 ""
+"Si está instalando Mageia en un sistema Legacy / GPT, compruebe que hay una "
+"partición de arranque del BIOS y del tipo correcto."
+
+#. type: Content of: <section><figure><title>
+#: en/diskdrake.xml:101
+#, fuzzy
+msgid "EFI System Partition"
+msgstr "Usar la partición existente"
+
+#. type: Content of: <section><figure><mediaobject>
+#: en/diskdrake.xml:104
+#, fuzzy
+msgid ""
+"<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 align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"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
-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 ""
-"Si está instalando Mageia en un sistema Legacy / GPT, compruebe que hay una "
-"partición de arranque del BIOS y del tipo correcto."
 
-#. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:76
+#. type: Content of: <section><mediaobject>
+#: en/diskdrake.xml:118 en/doPartitionDisks.xml:200
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1440,49 +1673,59 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:9
-msgid "Partitioning"
+#: en/doPartitionDisks.xml:25
+#, fuzzy
+msgid "Suggested Partitioning"
 msgstr "Particionando"
 
 #. 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 ""
 "En esta pantalla puede ver el contenido de sus discos duros junto con las "
 "propuestas de particiones de DrakX para saber dónde instalar Mageia."
 
 #. 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 ""
 "Las opciones disponibles de las que se muestran a continuación variarán de "
 "acuerdo con el diseño y el contenido de su (s) disco (s) particular (es)."
 
 #. 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-"
-"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
-"\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:32
-msgid "Use Existing Partitions"
-msgstr "Usar la partición existente"
+#. type: Content of: <section><itemizedlist><title>
+#: en/doPartitionDisks.xml:47
+#, fuzzy
+msgid "Main Options"
+msgstr "Opciones"
 
-#. 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\">Tamaño de partición:</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."
@@ -1490,13 +1733,14 @@ msgstr ""
 "Si esta opción está disponible significa que se han encontrado particiones "
 "compatibles con Linux que pueden ser usadas para la instalación."
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:41
-msgid "Use Free Space"
-msgstr "Usar el espacio libre"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:59
+#, fuzzy
+msgid "<emphasis role=\"bold\">Use Free Space</emphasis>"
+msgstr "Servidor"
 
-#. 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."
@@ -1504,57 +1748,35 @@ msgstr ""
 "Si tiene espacio sin usar en su disco duro, esta opción lo usará para su "
 "nueva instalación de Mageia."
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:49
-msgid "Use Free Space on a Windows Partition"
-msgstr "Usar espacio libre en una partición de Windows"
-
-#. 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 ""
-"Si tiene espacio libre en una partición existente de Windows, el instalador "
-"puede ofrecer usarlo."
+"<emphasis role=\"bold\">Use Free Space on a Windows Partition</emphasis>"
+msgstr "Estación de trabajo"
 
-#. 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 ""
 "¡Esta puede ser una manera útil de hacer espacio para su nueva instalación "
 "de Mageia, pero es una operación peligrosa, así que debería hacer una copia "
 "de seguridad de todos sus archivos importantes!"
 
-#. 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 ""
-"Sea consciente de que esta operación implica una reducción del tamaño de la "
-"partición de Windows. Esta partición debe de estar \"limpia\", es decir, "
-"Windows debe de haberse cerrado correctamente la última vez que fue usado. "
-"También debe de haber sido desfragmentada, aunque esto no garantiza que "
-"todos los archivos de la partición hayan sido movidos fuera del área que se "
-"va a usar. Por ello, es altamente recomendable hacer una copia de seguridad "
-"de sus archivos personales."
-
-#. 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 ""
 "Con esta opción, el instalador muestra la partición de Windows restante en "
 "azul claro y la partición propuesta de Mageia en azul oscuro con los tamaños "
@@ -1562,53 +1784,55 @@ msgstr ""
 "clic y arrastrando el espacio entre ambas particiones. Vea la siguiente "
 "captura de pantalla."
 
-#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:76
-msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/> </imageobject>"
-msgstr ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/> </imageobject>"
-
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:87
-msgid "Erase and use Entire Disk."
-msgstr "Borrar y usar el disco entero"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:85
+#, fuzzy
+msgid "<emphasis role=\"bold\">Erase and use Entire Disk</emphasis>"
+msgstr "Entorno gráfico"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:90
-msgid "This option will allocate the entire drive for Mageia."
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:88
+#, fuzzy
+msgid "This option will allocate the entire drive for Mageia"
 msgstr "Esta opción asignará todo el disco para Mageia."
 
-#. 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 ""
-"¡Aviso! Esto borrara TODA la información en el disco duro seleccionado. "
-"¡Tenga cuidado!"
-
-#. 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 ""
 "Si pretende usar una parte del disco para otra cosa o ya tiene información "
 "en la unidad que no quiere perder, no use esta opción."
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:103
-msgid "Custom disk partitioning"
-msgstr "Particionamiento de disco personalizado"
+#. 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 ""
+"Sea consciente de que esta operación implica una reducción del tamaño de la "
+"partición de Windows. Esta partición debe de estar \"limpia\", es decir, "
+"Windows debe de haberse cerrado correctamente la última vez que fue usado. "
+"También debe de haber sido desfragmentada, aunque esto no garantiza que "
+"todos los archivos de la partición hayan sido movidos fuera del área que se "
+"va a usar. Por ello, es altamente recomendable hacer una copia de seguridad "
+"de sus archivos personales."
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:106
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:110
+#, fuzzy
+msgid "<emphasis role=\"bold\">Custom Disk Partitioning</emphasis>"
+msgstr "<emphasis role=\"bold\">Tamaño de partición:</emphasis>"
+
+#. 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)."
@@ -1616,81 +1840,105 @@ msgstr ""
 "Esta opción le ofrece el control completo sobre donde colocar su instalación "
 "en su(s)  disco(s) duro(s)."
 
-#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:112
-msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
-msgstr "<emphasis role=\"bold\">Tamaño de partición:</emphasis>"
+#. type: Content of: <section><mediaobject>
+#: en/doPartitionDisks.xml:120
+#, fuzzy
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:114
+#: en/doPartitionDisks.xml:129
+#, fuzzy
 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 ""
 "Si no estás usando la opción de particionado de disco personalizado, el "
 "instalador asignará el espacio disponible de acuerdo con las siguientes "
 "reglas:"
 
-#. 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 ""
 "Si el espacio total disponible es inferior a 50 GB, solo se creará una "
 "partición. Esta será la\n"
 "partición (raíz) /."
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:125
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:141
 msgid ""
 "If the total available space is greater than 50 GB, then three partitions "
 "are created"
 msgstr ""
 "Si el espacio total disponible es superior a 50 GB, se crean tres particiones"
 
-#. 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 del total del espacio disponible se asigna a / con un máximo de 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 se asigna a swap con un máximo de 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 "el resto (al menos 12/19) se asigna a /home."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:144
+#: 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 ""
-"Eso significa que desde 160 GB o más de espacio disponible, el instalador "
-"creará tres particiones: 50 GB para /, 4 GB para intercambio y el resto "
-"para /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 ""
 "Si está utilizando un sistema UEFI, la ESP (Partición del sistema EFI) se "
 "detectará automáticamente o se creará si aún no existe y se montará en / "
@@ -1698,13 +1946,15 @@ msgstr ""
 "permite comprobar que se ha realizado correctamente"
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:158
+#: en/doPartitionDisks.xml:188
+#, fuzzy
 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 ""
 "Si está utilizando un sistema heredado (CSM o BIOS) con un disco GPT, debe "
 "crear una partición de arranque del BIOS si aún no existe. Es una partición "
@@ -1712,36 +1962,29 @@ msgstr ""
 "con el Instalador como cualquier otra partición, solo seleccione la "
 "partición de arranque del BIOS como el tipo de sistema de archivos."
 
-#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:165
-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 align=\"center\" fileref="
-"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </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-doPartitionDisks4.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 ""
 "Algunas unidades más nuevas, ahora usan sectores lógicos de 4096 bytes, en "
 "lugar del estándar anterior de 512. Debido a la falta de hardware "
@@ -1752,18 +1995,38 @@ msgstr ""
 "anticipación, utilizando una herramienta alternativa de particionado como "
 "gparted, y para utilizar la siguiente configuración:"
 
-#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:189
-msgid "<emphasis role=\"bold\">Align to</emphasis> = MiB"
+#. type: Content of: <section><important><para>
+#: en/doPartitionDisks.xml:221
+#, fuzzy
+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 ""
+"Algunas unidades más nuevas, ahora usan sectores lógicos de 4096 bytes, en "
+"lugar del estándar anterior de 512. Debido a la falta de hardware "
+"disponible, la herramienta de creación de particiones utilizada en el "
+"instalador no se ha probado con dicha unidad. También algunos dispositivos "
+"SSD ahora usan un tamaño de bloque de borrado de más de 1 MB. Si tiene un "
+"dispositivo de este tipo, le sugerimos que particione el disco con "
+"anticipación, utilizando una herramienta alternativa de particionado como "
+"gparted, y para utilizar la siguiente configuración:"
+
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:228
+#, fuzzy
+msgid "<emphasis>Align to</emphasis> = MiB"
 msgstr "Alinear a = MiB"
 
-#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:191
-msgid "<emphasis role=\"bold\">Free space preceding (MiB)</emphasis> = 2"
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:232
+#, fuzzy
+msgid "<emphasis>Free space preceding (MiB)</emphasis> = 2"
 msgstr "Espacio libre precedente (MiB) = 2"
 
-#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:194
+#. type: Content of: <section><important><para>
+#: en/doPartitionDisks.xml:236
 msgid ""
 "Also make sure all partitions are created using an even number of megabytes."
 msgstr ""
@@ -1771,39 +2034,39 @@ msgstr ""
 "cantidad par de megabytes."
 
 #. 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 "Instalación desde un medio LIVE"
 
 #. 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 "Enero de 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 "Documentación Oficial para Mageia"
 
 #. type: Content of: <book><info><cover><mediaobject>
-#: en/DrakLive-cover.xml:17
-msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
-msgstr ""
+#: en/DrakLive-cover.xml:33 en/DrakX-cover.xml:30
+msgid ""
 "<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+msgstr ""
 
 #. 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/"
@@ -1814,8 +2077,8 @@ msgstr ""
 "by-sa/3.0/\">http://creativecommons.org/licenses/by-sa/3.0/</link>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml: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."
@@ -1826,8 +2089,7 @@ msgstr ""
 "www.neodoc.biz\">NeoDoc</link>"
 
 #. 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</"
@@ -1837,15 +2099,15 @@ msgstr ""
 "<link ns6:href=\"https://wiki.mageia.org/en/Documentation_team\">Equipo de "
 "Documentación</link> si puede ayudar a mejorar este manual."
 
-#. 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 "
@@ -1854,41 +2116,49 @@ msgstr ""
 "Nadie verá las imágenes que puede ver en este manual. Las imágenes que verá "
 "dependerán de su hardware y las decisiones que tomó durante la instalación."
 
-#. 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 ""
+"Fue escrito por voluntarios en sus ratos libres. Por favor contacte con el "
+"<link ns6:href=\"https://wiki.mageia.org/en/Documentation_team\">Equipo de "
+"Documentación</link> si puede ayudar a mejorar este manual."
+
 #. 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 "Instalación con DrakX"
 
 #. type: Content of: <book><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:9
+#: en/DrakX-cover.xml:20
 msgid "February 2014"
 msgstr "Febrero 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
-msgid ""
-"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
-msgstr ""
-
 #. type: Content of: <section><info><title>
 #: en/exitInstall.xml:3
 msgid "Congratulations"
 msgstr "Felicitaciones"
 
 #.  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
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
@@ -1897,26 +2167,27 @@ msgstr ""
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </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 ""
 "Ha terminado de instalar y configurar <application>Mageia</application> y "
 "ahora es seguro retirar el medio de instalación y reiniciar su ordenador."
 
 #. 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 ""
 "Después del reinicio, en la pantalla del gestor de arranque, puede elegir "
 "entre los sistemas operativos (si hay más de uno) en su equipo."
 
 #. 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."
@@ -1925,25 +2196,26 @@ msgstr ""
 "Mageia será automáticamente seleccionada e iniciada."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:26
+#: en/exitInstall.xml:30
 msgid "Enjoy!"
 msgstr "¡Que lo disfrute!"
 
 #. 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 ""
 "Visite www.mageia.org si tiene alguna duda o quiere contribuir con Mageia."
 
 #. type: Content of: <section><info><title>
-#: en/firewall.xml:3
+#: en/firewall.xml:7
 msgid "Firewall"
 msgstr "Cortafuegos"
 
 #. 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 "
@@ -1956,16 +2228,17 @@ msgstr ""
 "sistema sean accesibles desde Internet."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:12
+#: en/firewall.xml:16
+#, fuzzy
 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 ""
 "En la configuración predeterminada (no se marca ningún botón), no se puede "
 "acceder a ningún servicio del sistema desde la red. La opción \"Todo (sin "
@@ -1977,38 +2250,40 @@ msgstr ""
 "para fines de prueba y depuración."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:21
+#: en/firewall.xml:25
+#, fuzzy
 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 ""
 "Las demás opciones son más o menos autoexplicativas. Como ejemplo, "
 "habilitará el Servidor CUPS si desea que las impresoras de su máquina sean "
 "accesibles desde la red."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:25
+#: en/firewall.xml:29
 msgid "<emphasis role=\"bold\">Advanced</emphasis>"
 msgstr "<emphasis role=\"bold\">Avanzado</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:27
+#: en/firewall.xml:31
+#, fuzzy
 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 ""
 "La opción avanzada abre una ventana donde puede habilitar una serie de "
 "servicios escribiendo una lista de pares (separados por espacios en blanco)"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:31
+#: en/firewall.xml:35
 msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
 msgstr "<emphasis>&lt;port-number>/&lt;protocolo></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 "
@@ -2019,7 +2294,7 @@ msgstr ""
 "definido como <emphasis>RFC-433</emphasis>;"
 
 #. 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."
@@ -2028,7 +2303,7 @@ msgstr ""
 "<emphasis>UDP</emphasis> - el protocolo de internet que usa el servicio."
 
 #. 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>."
@@ -2037,7 +2312,7 @@ msgstr ""
 "tanto <emphasis>873/tcp</emphasis>."
 
 #. 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."
@@ -2046,7 +2321,7 @@ msgstr ""
 "añadir dos parejas para el mismo puerto."
 
 #. type: Content of: <section><info><title>
-#: en/formatPartitions.xml:3
+#: en/formatPartitions.xml:10
 msgid "Formatting"
 msgstr "Formateo"
 
@@ -2054,18 +2329,24 @@ msgstr "Formateo"
 #.  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 align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:24
+#: en/formatPartitions.xml:35
 msgid ""
 "Here you can choose which partition(s) you wish to format. Any data on "
 "partitions <emphasis>not</emphasis> marked for formatting will be preserved."
@@ -2074,49 +2355,54 @@ msgstr ""
 "particiones no marcado para formatear será preservado."
 
 #. 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 ""
 "Normalmente, por lo menos las particiones seleccionadas por DrakX, necesitan "
 "formatearse."
 
 #. 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 ""
 "Haga click en <guibutton>Avanzado</guibutton> para elegir particiones que "
 "quiera comprobar los <emphasis>bloques defectuosos</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 ""
 "Si no está seguro de haber tomado la decisión correcta, puede hacer clic en "
 "Anterior, nuevamente en Anterior y luego en Personalizar para regresar a la "
 "pantalla principal, donde puede elegir ver los detalles de sus particiones."
 
 #. 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 ""
 "Cuando esté seguro de su elección, haga click en <guibutton>Siguiente</"
 "guibutton> para continuar."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:10
+#: en/installer.xml:14
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, el instalador de Mageia"
 
 #. 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 "
@@ -2126,320 +2412,228 @@ msgstr ""
 "diseñado para ayudarle a hacer su instalación o actualización lo más fácil "
 "posible."
 
-#. 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 ""
-"El menú inicial tiene varias opciones, aunque la elegida por defecto "
-"iniciará el instalador, que normalmente será todo lo que necesite."
-
 #. type: Content of: <section><section><title>
-#: en/installer.xml:22
-msgid "Installation Welcome Screen"
-msgstr "Pantalla de bienvenida del Instalador"
-
-#. type: Content of: <section><section><section><title>
-#: en/installer.xml:25
-msgid "Using a Mageia DVD"
-msgstr "Usando un DVD Mageia"
+#: en/installer.xml:20
+msgid "The installation steps"
+msgstr "Los pasos de la instalación"
 
-#. 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 ""
-"Estas son las pantallas de bienvenida predeterminadas cuando se usa un DVD "
-"de Mageia. La primera es la que verá si tiene un sistema UEFI, la segunda es "
-"para un sistema Legacy:"
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:32
-msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
+"El proceso de instalación se divide en una serie de pasos, cuyo estado se "
+"indica en un panel a la izquierda de la pantalla."
 
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:37
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/installer.xml:28
+#, fuzzy
 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 ""
-"Desde esta pantalla, tiene acceso a las opciones presionando \"e\" para "
-"ingresar al modo de edición. Para volver a esta pantalla, presione la tecla "
-"Esc para salir sin guardar o presione la tecla Ctrl o F10 para salir con el "
-"guardado."
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:45
-msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
+"Cada paso tiene una o más pantallas que también pueden tener secciones "
+"avanzadas con opciones adicionales, menos requeridas."
 
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:50
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/installer.xml:33
+#, fuzzy
 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 ""
-"Desde esta pantalla, es posible establecer algunas preferencias (tenga en "
-"cuenta que las opciones F1 a F6 están disponibles solo en sistemas Legacy):"
+"La mayoría de las pantallas tienen botones de ayuda para obtener más "
+"detalles sobre el paso en particular."
 
-#. 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 ""
-"En cualquiera de las opciones F2 a F6, puede ver ayuda relevante al "
-"presionar F1"
+"Si en algunos momentos durante la instalación decide detenerla, es posible "
+"reiniciar, pero por favor piense dos veces antes de hacer esto. Una vez que "
+"una partición ha sido formateada o las actualizaciones han comenzado a "
+"instalarse, su equipo ya no está en el mismo estado y reiniciarlo podría "
+"dejarlo con un sistema inutilizable. Si a pesar de esto está seguro de que "
+"reiniciar es lo que desea, vaya a un terminal de texto presionando las tres "
+"teclas Alt+Ctrl+F2 al mismo tiempo. Después de eso, presione Alt+Ctrl"
+"+Eliminar simultáneamente para reiniciar."
 
-#. 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 ""
-"Presione F2 para que el instalador use un lenguaje específico para la "
-"instalación."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:67
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+#. type: Content of: <section><section><title>
+#: en/installer.xml:48
+msgid "Installation Welcome Screen"
+msgstr "Pantalla de bienvenida del Instalador"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:72
+#. type: Content of: <section><section><para>
+#: en/installer.xml:49
 msgid ""
-"Use the arrow keys to select the language then press <emphasis role=\"bold"
-"\">Enter</emphasis>."
+"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 ""
-"Use las teclas de flecha para seleccionar el idioma y luego presione Enter."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:77
+#. type: Content of: <section><section><para>
+#: en/installer.xml:52
+#, fuzzy
 msgid ""
-"If needed, change the screen resolution by pressing <emphasis role=\"bold"
-"\">F3</emphasis> (Legacy mode only)."
+"The welcome menu screen has various options, however the default option will "
+"start the installer, and is normally all that you will need."
 msgstr ""
-"Si es necesario, cambie la resolución de la pantalla presionando F3 (solo "
-"modo Legacy)."
+"El menú inicial tiene varias opciones, aunque la elegida por defecto "
+"iniciará el instalador, que normalmente será todo lo que necesite."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:81
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:56
+msgid "Legacy (BIOS) Systems"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:88
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:58
+#, fuzzy
 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 ""
-"Si tiene problemas con la instalación, puede intentar modificar la "
-"configuración predeterminada utilizando las Opciones de Kernel F6 (para "
-"sistemas UEFI presione \"e\" en su lugar)."
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/installer.xml:96
-msgid "Default: It doesn't alter anything in the default options."
-msgstr "Predeterminado: no altera nada en las opciones predeterminadas."
+"<imageobject> <imagedata fileref=\"dx-welcome.png\" align=\"center\"/> </"
+"imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/installer.xml:101
-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 ""
-"Configuración segura: se da prioridad a las opciones más seguras en "
-"detrimento del rendimiento."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/installer.xml:106
+#. 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 ""
-"Sin ACPI: (Configuración avanzada e interfaz de alimentación): las funciones "
-"de administración de energía no se utilizan."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/installer.xml:113
-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 ""
-"No Local APIC: (Controlador de interrupción programable avanzado local): "
-"Interrupción de la CPU. Seleccione esta opción si experimenta mal "
-"comportamiento del sistema como un kernel panic en relación con APIC."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:69
+#, fuzzy
+msgid "<emphasis role=\"bold\">Rescue System</emphasis>"
+msgstr "Servidor"
 
-#. 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 ""
-"Cuando seleccione una de estas entradas, se modifica las opciones por "
-"defecto mostradas en la línea <guilabel>Opciones de Arranque</guilabel>."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:125
-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 ""
-"En algunas versiones de Mageia, puede suceder que las entradas seleccionadas "
-"con F6 no aparezcan en la línea de Opciones de arranque, a pesar de esto, "
-"serán aplicadas."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:75
+#, fuzzy
+msgid "<emphasis role=\"bold\">Memory Test</emphasis>"
+msgstr "Servidor"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:132
+#. 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 fileref=\"dx-welcome6opt.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:139
-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 ""
-"Presionando F1 abrirá una ventana de ayuda para varias opciones de arranque. "
-"Seleccione una de ellas con las teclas de flecha y presione Enter para "
-"obtener más detalles o presione Esc para regresar a la pantalla de "
-"bienvenida."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:80
+#, fuzzy
+msgid "<emphasis role=\"bold\">F2: Language</emphasis>"
+msgstr "<emphasis role=\"bold\">Avanzado</emphasis>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:146
-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\"/> </imageobject>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:151
-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 ""
-"La vista detallada sobre la opción splash. Presione Esc o seleccione Volver "
-"a las opciones de inicio para volver a la lista de opciones. Estas opciones "
-"se pueden agregar a mano en la línea Opciones de inicio."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:158
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:87
+#, fuzzy
 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 fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:164
-msgid ""
-"The help is translated in the chosen language with <emphasis role=\"bold"
-"\">F2</emphasis>."
-msgstr "La ayuda se traduce en el idioma elegido con F2."
+"Desde esta pantalla, tiene acceso a las opciones presionando \"e\" para "
+"ingresar al modo de edición. Para volver a esta pantalla, presione la tecla "
+"Esc para salir sin guardar o presione la tecla Ctrl o F10 para salir con el "
+"guardado."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:168
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:92
+#, fuzzy
 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 ""
-"Para más información acerca de las opciones del kernel en sistemas antiguos "
-"y UEFI, ver <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 "Los pasos de la instalación"
+"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+"imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/installer.xml:179
-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 ""
-"El proceso de instalación se divide en una serie de pasos, cuyo estado se "
-"indica en un panel a la izquierda de la pantalla."
 
-#. type: Content of: <section><section><para>
-#: en/installer.xml:182
-msgid ""
-"Each step has one or more screens which may also have <guibutton>Advanced</"
-"guibutton> sections with extra, less commonly required, options."
-msgstr ""
-"Cada paso tiene una o más pantallas que también pueden tener secciones "
-"avanzadas con opciones adicionales, menos requeridas."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:99
+#, fuzzy
+msgid "<emphasis role=\"bold\">Install:</emphasis> Start the Install process"
+msgstr "Alinear a = MiB"
 
-#. type: Content of: <section><section><para>
-#: en/installer.xml:186
+#. 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 ""
-"La mayoría de las pantallas tienen botones de ayuda para obtener más "
-"detalles sobre el paso en particular."
 
-#. 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 ""
-"Si en algunos momentos durante la instalación decide detenerla, es posible "
-"reiniciar, pero por favor piense dos veces antes de hacer esto. Una vez que "
-"una partición ha sido formateada o las actualizaciones han comenzado a "
-"instalarse, su equipo ya no está en el mismo estado y reiniciarlo podría "
-"dejarlo con un sistema inutilizable. Si a pesar de esto está seguro de que "
-"reiniciar es lo que desea, vaya a un terminal de texto presionando las tres "
-"teclas Alt+Ctrl+F2 al mismo tiempo. Después de eso, presione Alt+Ctrl"
-"+Eliminar simultáneamente para reiniciar."
+"Si arrancó desde un pen-drive USB, obtendrá dos líneas suplementarias que "
+"son duplicados de líneas previas con un sufijo \"USB\". Ha de elegirlas."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:203
+#: en/installer.xml:115
 msgid "Installation Problems and Possible Solutions"
 msgstr "Problemas en la Instalación y Posibles Soluciones."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:206
+#: en/installer.xml:117
 msgid "No Graphical Interface"
 msgstr "No hay Interfaz Gráfica"
 
 #. 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 ""
 "Después de la pantalla inicial, no carga la pantalla de selección del "
 "idioma. Esto puede ocurrir con algunas tarjetas gráficas y sistemas "
@@ -2447,15 +2641,15 @@ msgstr ""
 "code> en la terminal."
 
 #. 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 ""
 "Si el hardware es muy viejo, una instalación gráfica puede no ser posible. "
 "En este caso, vale la pena intentar una instalación en modo texto. Para ello "
@@ -2464,18 +2658,19 @@ msgstr ""
 "presione ENTER para continuar con la instalación en modo de texto."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:230
+#: en/installer.xml:138
 msgid "The Install Freezes"
 msgstr "La Instalación se congela"
 
 #. 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 ""
 "Si el sistema parece congelarse durante la instalación, puede ser un "
 "problema con la detección de hardware. En este caso, la detección automática "
@@ -2484,17 +2679,19 @@ msgstr ""
 "con otras si es necesario."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:240
+#: en/installer.xml:146
 msgid "RAM problem"
 msgstr "Problema de 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 ""
 "Esto rara vez será necesario, pero en algunos casos el hardware puede "
 "informar la RAM disponible incorrectamente. Para especificar esto "
@@ -2502,19 +2699,20 @@ msgstr ""
 "correcta de RAM. p.ej. mem = 256M especificaría 256MB de RAM."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:249
+#: en/installer.xml:154
 msgid "Dynamic partitions"
 msgstr "Particiones dinámicas"
 
 #. 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 ""
 "Si convirtió su disco duro de formato básico a formato dinámico en Microsoft "
 "Windows, entonces no es posible instalar Mageia en este disco. Para volver a "
@@ -2522,110 +2720,128 @@ msgstr ""
 "microsoft.com/en-us/library/cc776315.aspx."
 
 #. type: Content of: <section><info><title>
-#: en/installUpdates.xml:3
+#: en/installUpdates.xml:16
 msgid "Updates"
 msgstr "Actualizaciones"
 
-#.  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 ""
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml: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 ""
 "Desde que se lanzara esta versión de <application>Mageia</application>, se "
 "han actualizado o mejorado algunos paquetes."
 
-#. 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 ""
 "Escoja Sí, si desea descargarlos e instalarlos, seleccione No si no desea "
 "hacer esto ahora o si no está conectado a Internet."
 
-#. type: Content of: <section><para>
-#: en/installUpdates.xml:29
-msgid "Press <guibutton>Next</guibutton> to continue"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installUpdates.xml:40
+#, fuzzy
+msgid "Press <emphasis>Next</emphasis> to continue"
 msgstr "Presione Next para continuar"
 
 #. type: Content of: <section><info><title>
-#: en/login.xml:1
-msgid "Login screen"
+#: en/login.xml:4
+#, fuzzy
+msgid "Login Screen"
 msgstr "Pantalla de inicio de sesión"
 
 #. 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 "Pantalla de inicio de sesión de KDM"
 
 #. 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 "Por último, se llega a la pantalla de inicio de sesión."
 
 #. 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 ""
 "Ingrese su nombre de usuario y contraseña, y en pocos segundos se encontrará "
 "con un escritorio KDE o GNOME cargado, dependiendo del medio live que usó. "
 "Ahora puede comenzar a utilizar la instalación de Mageia."
 
 #. 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 ""
 "Puede encontrar otra parte de nuestra documentación en <link linkend="
 "\"https://wiki.mageia.org/en/Category:Documentation\">la wiki de Mageia</"
 "link>."
 
 #. type: Content of: <section><info><title>
-#: en/media_selection.xml:3
-msgid "Media Selection (Nonfree)"
-msgstr "Selección de medio (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
+#: en/media_selection.xml:24
+#, fuzzy
 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 align=\"center\" fileref=\"live-bestTime.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"bestTime-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 "
@@ -2638,7 +2854,7 @@ msgstr ""
 "elegidos en los próximos pasos."
 
 #. 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."
@@ -2647,12 +2863,13 @@ msgstr ""
 "contiene la base de la distribución."
 
 #. 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 ""
 "El repositorio <emphasis>Nonfree</emphasis> incluye paquetes que son gratis, "
@@ -2662,7 +2879,7 @@ msgstr ""
 "firmware para diversas tarjetas WiFi, etc."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:40
+#: en/media_selection.xml:50
 msgid ""
 "The <emphasis>Tainted</emphasis> repository includes packages released under "
 "a free license. The main criteria for placing packages in this repository is "
@@ -2682,64 +2899,71 @@ msgid "Minimal Install"
 msgstr "Instalación mínima."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:11
+#: en/minimal-install.xml:17
+#, fuzzy
 msgid ""
-"You can choose a Minimal Installation by de-selecting everything in the "
-"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"/>."
+"Minimal Installation is intended for those with specific uses in mind for "
+"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 ""
+"La instalación mínima está destinada a usos específicos para Mageia, como un "
+"servidor o una estación de trabajo especializada. Probablemente usará esta "
+"opción combinada con la opción de selección de paquete individual mencionada "
+"anteriormente, para ajustar su instalación, ver."
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/minimal-install.xml:24
+#, fuzzy
+msgid ""
+"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 ""
 "Puede elegir una instalación mínima al de-seleccionar todo en la pantalla de "
 "selección de grupos de paquetes, ver."
 
-#. type: Content of: <section><para>
-#: en/minimal-install.xml:14
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/minimal-install.xml:28
+#, fuzzy
 msgid ""
-"If desired, you can additionally tick the <emphasis role=\"bold\">Individual "
-"package selection</emphasis> option in the same screen."
+"If desired, you can additionally tick the <emphasis>Individual package "
+"selection</emphasis> option in the same screen."
 msgstr ""
 "Si lo desea, también puede marcar Opción de selección de paquete individual "
 "en la misma pantalla."
 
-#. type: Content of: <section><para>
-#: en/minimal-install.xml:17
-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"
-"\"/>."
-msgstr ""
-"La instalación mínima está destinada a usos específicos para Mageia, como un "
-"servidor o una estación de trabajo especializada. Probablemente usará esta "
-"opción combinada con la opción de selección de paquete individual mencionada "
-"anteriormente, para ajustar su instalación, ver."
-
-#. type: Content of: <section><para>
-#: en/minimal-install.xml:22
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/minimal-install.xml:33
+#, 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."
+"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 ""
 "Si elige este método de instalación, la pantalla correspondiente le ofrecerá "
 "algunos extras útiles para instalar, como documentación y X."
 
-#. type: Content of: <section><para>
-#: en/minimal-install.xml:26
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/minimal-install.xml:37
+#, fuzzy
 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 ""
 "Si ha elegido Con X, también se incluirá IceWM (un entorno de escritorio "
 "liviano)."
 
 #. 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 ""
 "La documentación básica aparece en la forma de páginas man e info. Contiene "
 "las páginas de manuales del <link xlink:href=\"http://www.tldp.org/manpages/"
@@ -2748,7 +2972,7 @@ msgstr ""
 "coreutils</link>."
 
 #. type: Content of: <section><mediaobject>
-#: en/minimal-install.xml:35
+#: en/minimal-install.xml:48
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"minimal-install-im1\" align="
 "\"center\" fileref=\"dx2-minimal-install.png\" revision=\"1\"/> </"
@@ -2757,24 +2981,33 @@ msgstr ""
 
 #. type: Content of: <section><info><title>
 #: en/misc-params.xml:3
-msgid "Summary of miscellaneous parameters"
-msgstr "Resumen de la Configuración"
+#, fuzzy
+msgid "Configuration Summary"
+msgstr "Configurar el sonido"
 
 #.  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=\"dx2-summaryTop.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 presenta una propuesta para la configuración de su sistema en función "
 "de las elecciones que haya realizado y del hardware detectado. Puede "
@@ -2782,7 +3015,7 @@ msgstr ""
 "Configurar"
 
 #. 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:"
@@ -2791,49 +3024,52 @@ msgstr ""
 "a menos que:"
 
 #. 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 "se conocen algunos problemas en la configuración por defecto"
 
 #. 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 "la configuración por defecto se ha probado ya y falla"
 
 #. 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
+#, fuzzy
+msgid "some other factor mentioned in the detailed sections below is an issue"
 msgstr ""
 "algún otro factor mencionado en las secciones detalladas a continuación es "
 "un problema."
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:40
+#: en/misc-params.xml:49
 msgid "System parameters"
 msgstr "Configuraciones del sistema"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:45
-msgid "<guilabel>Timezone</guilabel>"
-msgstr "<guilabel>Huso horario</guilabel>:"
+#: en/misc-params.xml:54
+#, fuzzy
+msgid "<emphasis role=\"bold\">Timezone</emphasis>"
+msgstr "Servidor"
 
 #. 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 selecciona una zona horaria para usted, dependiendo de su idioma "
 "preferido. Puede cambiarlo si es necesario. Ver también"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:53
-msgid "<guilabel>Country / Region</guilabel>"
-msgstr "<guilabel>País / Región</guilabel>:"
+#: en/misc-params.xml:62
+#, fuzzy
+msgid "<emphasis role=\"bold\">Country / Region</emphasis>"
+msgstr "Estación de trabajo"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:56
+#: en/misc-params.xml:64
 msgid ""
 "If the selected country is wrong, it is very important that you correct the "
 "setting.  See <xref linkend=\"selectCountry\"/>"
@@ -2842,46 +3078,49 @@ msgstr ""
 "configuración. Ver"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:62
-msgid "<guilabel>Bootloader</guilabel>"
-msgstr "<guilabel>Cargador de arranque</guilabel>:"
+#: en/misc-params.xml:70
+#, fuzzy
+msgid "<emphasis role=\"bold\">Bootloader</emphasis>"
+msgstr "Servidor"
 
 #. 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 ha hecho una buena elección para el cargador del arranque."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:67
-msgid "Do not change anything, unless you know how to configure GRUB2"
+#: en/misc-params.xml:75
+#, fuzzy
+msgid ""
+"Do not change anything, unless you know how to configure GRUB2. For more "
+"information, see <xref linkend=\"setupBootloader\"/>"
 msgstr "No cambie nada, a menos que sepa cómo configurar GRUB2"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:70
-msgid "For more information, see <xref linkend=\"setupBootloader\"/>"
-msgstr "Para más información, vea <xref linkend=\"setupBootloader\"/>"
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:75
-msgid "<guilabel>User management</guilabel>"
-msgstr "<guilabel>Administración de usuarios</guilabel>:"
+#: en/misc-params.xml:83
+#, fuzzy
+msgid "<emphasis role=\"bold\">User management</emphasis>"
+msgstr "Servidor"
 
 #. 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 ""
 "Aquí puede añadir más usuarios. Cada uno tendrá su propio directorio "
 "<literal>/home</literal>."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:84
-msgid "<guilabel>Services</guilabel>:"
-msgstr "<guilabel>Servicios</guilabel>:"
+#: en/misc-params.xml:91
+#, fuzzy
+msgid "<emphasis role=\"bold\">Services</emphasis>"
+msgstr "Servidor"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:86
+#: en/misc-params.xml:93
 msgid ""
 "System services refer to those small programs which run in the background "
 "(daemons).  This tool allows you to enable or disable certain processes."
@@ -2891,32 +3130,29 @@ msgstr ""
 "deshabilitar ciertos procesos."
 
 #. 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 ""
 "Debe de pensar con mucho cuidado antes de cambiar nada aquí, una "
 "equivocación puede hacer que su ordenador no funcione correctamente."
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:94
-msgid "For more information, see <xref linkend=\"configureServices\"/>"
-msgstr ""
-"Para obtener más información, consulte <xref linkend=\"configureServices\"/>"
-
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:101
+#: en/misc-params.xml:106
 msgid "Hardware parameters"
 msgstr "Configuraciones de hardware"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:106
-msgid "<guilabel>Keyboard</guilabel>:"
-msgstr "<guilabel>Teclado</guilabel>:"
+#: en/misc-params.xml:111
+#, fuzzy
+msgid "<emphasis role=\"bold\">Keyboard</emphasis>"
+msgstr "Servidor"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:108
+#: en/misc-params.xml:113
 msgid ""
 "Configure your keyboard layout according to your location, language and type "
 "of keyboard."
@@ -2925,7 +3161,7 @@ msgstr ""
 "tipo de teclado."
 
 #. 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."
@@ -2934,12 +3170,13 @@ msgstr ""
 "cuenta que las contraseñas cambiarán también."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:119
-msgid "<guilabel>Mouse</guilabel>:"
-msgstr "<guilabel>Ratón</guilabel>:"
+#: en/misc-params.xml:124
+#, fuzzy
+msgid "<emphasis role=\"bold\">Mouse</emphasis>"
+msgstr "Servidor"
 
 #. 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."
@@ -2948,39 +3185,42 @@ msgstr ""
 "trackballs, etc."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:126
-msgid "<guilabel>Sound card</guilabel>:"
-msgstr "<guilabel>Tarjeta de sonido</guilabel>:"
+#: en/misc-params.xml:131
+#, fuzzy
+msgid "<emphasis role=\"bold\">Sound card</emphasis>"
+msgstr "<emphasis role=\"bold\">Avanzado</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:129
+#: 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 ""
-"El instalador usa el controlador predeterminado, si lo hay. La opción de "
-"seleccionar un controlador diferente solo se proporciona cuando hay más de "
-"un controlador para su tarjeta, pero ninguno de ellos es el predeterminado."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:137
-msgid "<guilabel>Graphical interface</guilabel>:"
-msgstr "<guilabel>Interfaz gráfica</guilabel>:"
+#: en/misc-params.xml:144
+#, fuzzy
+msgid "<emphasis role=\"bold\">Graphical interface</emphasis>"
+msgstr "Entorno gráfico"
 
 #. 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 ""
 "Esta sección le permite configurar sus tarjeta(s) gráficas y pantallas."
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:143
-msgid "For more information, see <xref linkend=\"configureX_chooser\"/>."
-msgstr "Para más información, vea <xref linkend=\"configureX_chooser\"/>."
-
 #. type: Content of: <section><section><mediaobject>
-#: en/misc-params.xml:149
+#: en/misc-params.xml:155
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
 "\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
@@ -2989,21 +3229,23 @@ msgstr ""
 "\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"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 "Configuraciones de redes e Internet"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:163
-msgid "<guilabel>Network</guilabel>:"
-msgstr "<guilabel>Red</guilabel>:"
+#: en/misc-params.xml:169
+#, fuzzy
+msgid "<emphasis role=\"bold\">Network</emphasis>"
+msgstr "Servidor"
 
 #. 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 ""
 "Puede configurar su red aquí, pero para las tarjetas de red con "
@@ -3012,7 +3254,7 @@ msgstr ""
 "Nonfree."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:172
+#: en/misc-params.xml:178
 msgid ""
 "When you add a network card, do not forget to set your firewall to monitor "
 "that interface as well."
@@ -3021,15 +3263,17 @@ msgstr ""
 "monitorear esa interfaz también."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:179
-msgid "<guilabel>Proxies</guilabel>:"
-msgstr "<guilabel>Servidores proxy</guilabel>:"
+#: en/misc-params.xml:185
+#, fuzzy
+msgid "<emphasis role=\"bold\">Proxies</emphasis>"
+msgstr "Servidor"
 
 #. 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 ""
 "Un servidor proxy actúa como un intermediario entre su ordenador e Internet. "
@@ -3037,68 +3281,74 @@ msgstr ""
 "proxy."
 
 #. 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 ""
 "Es posible que deba consultar a su administrador de sistemas para obtener "
 "los parámetros que necesita ingresar aquí."
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:195
+#: en/misc-params.xml:201
 msgid "Security"
 msgstr "Seguridad"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:200
-msgid "<guilabel>Security Level</guilabel>:"
-msgstr "<guilabel>Nivel de seguridad</guilabel>:"
+#: en/misc-params.xml:206
+#, fuzzy
+msgid "<emphasis role=\"bold\">Security Level</emphasis>"
+msgstr "Servidor"
 
 #. 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 ""
 "Aquí puede configurar el nivel de seguridad que desee para su ordenador, en "
 "la mayoría de los casos, la configuración por defecto (Estándar) es adecuada "
 "para un uso general."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:207
-msgid "Check the option which best suits your usage."
-msgstr "Marque la opción que se ajuste mejor al uso que le dé a su ordenador."
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:212
-msgid "<guilabel>Firewall</guilabel>:"
-msgstr "<guilabel>Cortafuegos</guilabel>:"
+#: en/misc-params.xml:215
+#, fuzzy
+msgid "<emphasis role=\"bold\">Firewall</emphasis>"
+msgstr "Servidor"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:214
+#: en/misc-params.xml:217
 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."
+"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 ""
-"El propósito de un cortafuegos es ser una barrera entre sus archivos "
-"importantes y la gente malintencionada que pulula por Internet, quienes "
-"pueden intentar robar o comprometer sus archivos."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:218
+#: en/misc-params.xml:223
 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\"/>."
+"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 ""
-"Seleccione los servicios que desea tener acceso a su sistema. Sus "
-"selecciones dependerán de lo que utilice su computadora. Para obtener más "
-"información, consulte <xref linkend=\"firewall\" />."
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/misc-params.xml:229
+#, fuzzy
+msgid "For more information, see <xref linkend=\"firewall\"/>."
+msgstr "Para más información, vea <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 ""
 "¡Tenga en cuenta de que permitiendo todo (sin cortafuegos) puede ser muy "
 "peligroso!"
@@ -3109,36 +3359,51 @@ msgid "Reboot"
 msgstr "Reiniciar"
 
 #. 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 ""
 "Una vez que se haya instalado el gestor de arranque, se le pedirá que "
 "detenga su ordenador, retire el CD en vivo y reinicie el ordenador, haga "
 "clic en <emphasis role=\"bold\"> <guibutton>Terminar</guibutton> </emphasis> "
 "y actúe como pidió <emphasis role=\"bold\"> en este orden! </emphasis>"
 
+#. 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
-msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
+#: en/reboot.xml:12
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot2.png\"/> </"
+"imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"live-reboot2.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 ""
 "Cuando reinicie, verá una sucesión de barras de progreso de descarga. Estas "
 "indican que se están descargando las listas de medios de software (consulte "
 "Gestión de software)."
 
 #. type: Content of: <section><mediaobject>
-#: en/reboot.xml:17
+#: en/reboot.xml:19
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
 "reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
@@ -3167,44 +3432,54 @@ msgstr ""
 "espacio para instalar <application>Mageia</application>."
 
 #. type: Content of: <section><info><title>
-#: en/securityLevel.xml:3
+#: en/securityLevel.xml:10
 msgid "Security Level"
 msgstr "Nivel de seguridad"
 
 #.  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 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
 msgid ""
 "<emphasis role=\"bold\">Please choose the desired security level</emphasis>"
 msgstr "Por favor elija el nivel de seguridad deseado"
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:19
+#: en/securityLevel.xml:29
+msgid ""
+"<emphasis>Standard</emphasis> is the default, and recommended setting for "
+"the average user."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:32
+#, fuzzy
 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>Secure</emphasis> will create a highly protected system - for "
+"instance if the system is to be used as a public server."
 msgstr ""
 "El estándar es la configuración predeterminada y recomendada para el usuario "
 "promedio. La configuración segura creará un sistema altamente protegido, por "
 "ejemplo, si el sistema se va a utilizar como servidor público."
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:24
+#: en/securityLevel.xml:36
 msgid "<emphasis role=\"bold\">Security Administrator</emphasis>"
 msgstr "Administrador de seguridad."
 
 #. 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 "
@@ -3215,17 +3490,18 @@ msgstr ""
 "situaciones que requieren notificación a un administrador del sistema."
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:31
+#: en/securityLevel.xml:43
+#, fuzzy
 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 ""
 "Una opción buena y fácil de implementar es ingresar &lt;usuario> @localhost "
 "- donde &lt;usuario> es el nombre de inicio de sesión del usuario para "
 "recibir estos mensajes."
 
 #. 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 "
@@ -3236,26 +3512,27 @@ msgstr ""
 "para recibir dicho correo!"
 
 #. 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 ""
 "Después de la instalación, siempre será posible ajustar su configuración de "
 "seguridad en la Sección de seguridad del Centro de control de Mageia."
 
 #. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:6
+#: en/SelectAndUseISOs2.xml:15
 msgid "Select and use ISOs"
 msgstr "Seleccione y use una ISO"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:9
+#: en/SelectAndUseISOs2.xml:18
 msgid "Introduction"
 msgstr "Introducción"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:10
+#: en/SelectAndUseISOs2.xml:19
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
 "which image best suits your needs."
@@ -3264,287 +3541,322 @@ msgstr ""
 "elegir qué imagen se adapta mejor a sus necesidades."
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:12
-msgid "There are two families of media:"
+#: en/SelectAndUseISOs2.xml:21
+#, fuzzy
+msgid "There are three types of installation media:"
 msgstr "Hay dos familias de medios:"
 
 #. 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 ""
 "Instalador clásico: el arranque con este medio le brinda la máxima "
 "flexibilidad a la hora de elegir qué instalar y para configurar su sistema. "
 "En particular, puede elegir qué entorno de escritorio instalar"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:21
+#: en/SelectAndUseISOs2.xml:31
+#, 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"
+"<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 ""
 "Medios Live: Esta opción le permite probar Mageia sin tener que instalarlo o "
 "realizar cambios en su equipo. Si se decide por la instalación, el proceso "
 "es más simple, pero obtiene menos opciones que las ofrecidas por el "
 "instalador clásico."
 
+#. 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 ""
+"Las ISO Live solo se pueden usar para crear instalaciones limpias, no se "
+"pueden usar para actualizar versiones de Mageia instaladas previamente."
+
+#. 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 ""
+"Estas son ISO mínimas que no contienen más que lo que se necesita para "
+"iniciar el instalador de drakx y encontrar drakx-installer-stage2 y otros "
+"paquetes que son necesarios para continuar y completar la instalación. Estos "
+"paquetes pueden estar en el disco duro de la PC, en una unidad local, en una "
+"red local o en Internet."
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:53
+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 ""
+"Estos medios son muy livianos (menos de 100 MB) y son convenientes si el "
+"ancho de banda es demasiado bajo para descargar un DVD completo, o si tiene "
+"una PC sin una unidad de DVD o no puede arrancar desde una memoria USB."
+
 #. 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 "En las siguientes secciones se dan los detalles."
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:30
+#: en/SelectAndUseISOs2.xml:61
 msgid "Media"
 msgstr "Medio"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:32
+#: en/SelectAndUseISOs2.xml:63
 msgid "Definition"
 msgstr "Definicion"
 
 #. 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 ""
 "Aquí, un medio (plural: media) es un archivo de imagen ISO que le permite "
 "instalar y / o actualizar Mageia y, por extensión, cualquier soporte físico "
 "(DVD, dispositivo USB, ...) en el que se copia el archivo ISO."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:36
+#: en/SelectAndUseISOs2.xml:67
 msgid ""
 "You can find Mageia ISO's <link ns4:href=\"http://www.mageia.org/en/"
 "downloads/\">here</link>."
 msgstr "Puede encontrar las ISO de Mageia aquí."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:39
+#: en/SelectAndUseISOs2.xml:70
 msgid "Classical installation media"
 msgstr "Medio de instalación clásico."
 
 #. 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 "Caracterśticas comunes."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:44
-msgid "These ISOs use the Classical installer called drakx."
+#: en/SelectAndUseISOs2.xml:75
+#, fuzzy
+msgid "These ISOs use the Classical installer called DrakX"
 msgstr "Estas ISO usan el instalador clásico llamado 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 ""
 "Se usan para realizar instalaciones limpias o para actualizar una versión "
 "previamente instalada de Mageia"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:51 en/SelectAndUseISOs2.xml:83
-#: en/SelectAndUseISOs2.xml:158
-msgid "Different media for 32 and 64 bit architectures."
+#: en/SelectAndUseISOs2.xml:82 en/SelectAndUseISOs2.xml:118
+#: en/SelectAndUseISOs2.xml:174
+#, fuzzy
+msgid "Different media for 32 and 64-bit architectures"
 msgstr "Diferentes medios para arquitecturas de 32 y 64 bits."
 
 #. 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 ""
 "Algunas herramientas están disponibles en la pantalla de bienvenida: Sistema "
 "de Rescate, Prueba de Memoria, Herramienta de Detección de Hardware."
 
 #. 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 ""
 "Cada DVD contiene todos los entornos de escritorio y lenguajes disponibles."
 
 #. 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 ""
 "Se le dará la opción durante la instalación de agregar o no software no "
 "libre."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:69
+#: en/SelectAndUseISOs2.xml:102
 msgid "Live media"
 msgstr "Medio Live"
 
 #. 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 ""
 "Se puede usar para obtener una vista previa del sistema operativo Mageia sin "
 "tener que instalarlo. También se puede usar para instalar Mageia si lo desea."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:79
-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 ""
-"Cada ISO contiene sólo un entorno de escritorio (Plasma, GNOME o Xfce)."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:86
-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>"
+#: en/SelectAndUseISOs2.xml:114
+#, fuzzy
+msgid "Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)"
 msgstr ""
-"Las ISO Live solo se pueden usar para crear instalaciones limpias, no se "
-"pueden usar para actualizar versiones de Mageia instaladas previamente."
+"Cada ISO contiene sólo un entorno de escritorio (Plasma, GNOME o Xfce)."
 
 #. 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 "Ellos contienen software no libre."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:96
+#: en/SelectAndUseISOs2.xml:126
 msgid "Live DVD Plasma"
 msgstr "DVD Live Plasma"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:99
-msgid "Plasma desktop environment only."
+#: en/SelectAndUseISOs2.xml:129
+#, fuzzy
+msgid "Plasma desktop environment only"
 msgstr "Solo entorno de escritorio Plasma"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:102 en/SelectAndUseISOs2.xml:116
-#: en/SelectAndUseISOs2.xml:130
-msgid "All available languages are present."
+#: en/SelectAndUseISOs2.xml:132 en/SelectAndUseISOs2.xml:146
+#: en/SelectAndUseISOs2.xml:160
+#, fuzzy
+msgid "All available languages are present"
 msgstr "Todos los idiomas disponibles están presentes."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:105
-msgid "64 bit architecture only."
+#: en/SelectAndUseISOs2.xml:135 en/SelectAndUseISOs2.xml:149
+#, fuzzy
+msgid "64-bit architecture only"
 msgstr "Arquitectura de 64 bits solamente."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:110
+#: en/SelectAndUseISOs2.xml:140
 msgid "Live DVD GNOME"
 msgstr "Live 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 "Sólo entorno de escritorio GNOME."
 
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:119
-msgid "64 bit architecture only"
-msgstr "Arquitectura de 64 bits solamente."
-
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:124
+#: en/SelectAndUseISOs2.xml:154
 msgid "Live DVD Xfce"
 msgstr "DVD Live Xfce"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:127
-msgid "Xfce desktop environment only."
+#: en/SelectAndUseISOs2.xml:157
+#, fuzzy
+msgid "Xfce desktop environment only"
 msgstr "Solo entorno de escritorio Xfce"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:133
-msgid "32 or 64 bit architectures."
+#: en/SelectAndUseISOs2.xml:163
+#, fuzzy
+msgid "32 or 64-bit architectures"
 msgstr "Arquitecturas de 32 o 64 bits."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:139
+#: en/SelectAndUseISOs2.xml:169
 msgid "Net install media"
 msgstr "Medios de instalación net."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:144
-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 ""
-"Estas son ISO mínimas que no contienen más que lo que se necesita para "
-"iniciar el instalador de drakx y encontrar drakx-installer-stage2 y otros "
-"paquetes que son necesarios para continuar y completar la instalación. Estos "
-"paquetes pueden estar en el disco duro de la PC, en una unidad local, en una "
-"red local o en Internet."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:152
-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 ""
-"Estos medios son muy livianos (menos de 100 MB) y son convenientes si el "
-"ancho de banda es demasiado bajo para descargar un DVD completo, o si tiene "
-"una PC sin una unidad de DVD o no puede arrancar desde una memoria USB."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:161
-msgid "First steps are English language only."
+#: en/SelectAndUseISOs2.xml:177
+#, fuzzy
+msgid "First steps are English language only"
 msgstr "Los primeros pasos estan solo en inglés."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:166
+#: en/SelectAndUseISOs2.xml:182
 msgid "netinstall.iso"
 msgstr "netinstall.iso"
 
 #. 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 ""
 "Contiene sólo software gratuito, para aquellas personas que prefieren no "
 "usar software no libre."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:175
+#: en/SelectAndUseISOs2.xml:191
 msgid "netinstall-nonfree.iso"
 msgstr "netinstall-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 ""
 "Contiene software propietario (mayormente drivers, codecs, etc.) para "
 "aquellos que lo necesiten."
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:186
+#: en/SelectAndUseISOs2.xml:202
 msgid "Downloading and Checking Media"
 msgstr "Descargando y verificando medios."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:188
+#: en/SelectAndUseISOs2.xml:204
 msgid "Downloading"
 msgstr "Descargando"
 
 #. 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 ""
 "Una vez que haya elegido su archivo ISO, puede descargarlo usando http o "
 "BitTorrent. En ambos casos, se le proporciona cierta información, como el "
@@ -3552,46 +3864,63 @@ msgstr ""
 "bajo. Si se elige http, también verá algo relacionado con las sumas de "
 "comprobación."
 
+#. 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: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:191
-msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
+#: en/SelectAndUseISOs2.xml:217
+#, fuzzy
+msgid ""
+"<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:195
-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:"
+#: en/SelectAndUseISOs2.xml:222
+msgid "In the meantime, a window to download the actual ISO will open:"
 msgstr ""
-"md5sum y sha1sum son herramientas para verificar la integridad ISO. Elija "
-"una u otra y copie la suma de comprobación para uso posterior. Entonces "
-"aparecerá una ventana similar a esta:"
 
 #. 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."
-msgstr "Seleccione la opción Guardar archivo, luego, haga clic en Aceptar."
+#: 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
 msgid "Checking the integrity of the downloaded media"
 msgstr "Comprobando la integridad de los medios descargados"
 
 #. 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 ""
 "Las sumas de comprobación mencionadas anteriormente son huellas digitales "
 "generadas por un algoritmo del archivo que se descargará. Puede comparar la "
@@ -3601,7 +3930,7 @@ msgstr ""
 "descarga o intentar una reparación utilizando BitTorrent."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:214
+#: en/SelectAndUseISOs2.xml:241
 msgid ""
 "To generate the checksum for your downloaded ISO, open a console, (no need "
 "to be root), and:"
@@ -3610,117 +3939,141 @@ msgstr ""
 "consola, (no necesita ser root), y:"
 
 #. 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 ""
 "Usar md5sum, tipo:\n"
 "md5sum path/to/the/image/file.iso."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:222
+#: en/SelectAndUseISOs2.xml:249
+#, fuzzy
+msgid ""
+"To use the sha1sum, type: <command>sha1sum path/to/the/image/file.iso</"
+"command>"
+msgstr ""
+"Para usar sha1sum, escriba:\n"
+"sha1sum ruta / a / la / imagen / archivo.iso"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:254
+#, fuzzy
 msgid ""
-"To use sha1sum, type: <userinput>sha1sum path/to/the/image/file.iso</"
-"userinput>"
+"To use the sha512sum, type: <command>sha512sum path/to/the/image/file.iso</"
+"command>"
 msgstr ""
 "Para usar sha1sum, escriba:\n"
 "sha1sum ruta / a / la / imagen / archivo.iso"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:226
+#: en/SelectAndUseISOs2.xml:258
 msgid "Example:"
 msgstr "Ejemplo:"
 
 #. 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 ""
 "y compare el resultado (puede que tenga que esperar un tiempo) con la suma "
 "de comprobación provista por Mageia."
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:237
+#: en/SelectAndUseISOs2.xml:270
 msgid "Burn or dump the ISO"
 msgstr "Grabar o volcar el ISO"
 
 #. 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 ""
 "La ISO verificada ahora se puede grabar en un CD / DVD o descargar a un "
 "dispositivo USB. Esta no es una operación de copia estándar ya que se creará "
 "un medio de arranque."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:275
 msgid "Burning the ISO to a CD/DVD"
 msgstr "Grabar el ISO en un 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 ""
 "Cualquiera sea el software que use, asegúrese de que la opción de grabar una "
 "imagen es usada, grabar datos o archivos no es correcto. Vea la wiki de "
 "Mageia para más información."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:248
+#: en/SelectAndUseISOs2.xml:282
 msgid "Dump the ISO to a USB stick"
 msgstr "Volvar el ISO en un USB"
 
 #. 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 ""
 "Todas las ISOs de Mageia son híbridas, lo que significa que se pueden volcar "
 "en un USB y usarlas para arrancar e instalar el sistema."
 
 #. 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 ""
 "\"Volcar\" una imagen en un dispositivo flash destruye cualquier sistema de "
 "archivos anterior en el dispositivo; cualquier información existente se "
 "perderá y la capacidad de la partición se reducirá al tamaño de la imagen."
 
-#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:256
+#. type: Content of: <section><section><section><note><para>
+#: en/SelectAndUseISOs2.xml:290
+msgid ""
+"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 ""
-"To recover the original capacity, you must redo partitioning and re-format "
-"the USB stick."
+"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 ""
-"Para recuperar la capacidad original, ha de reparticionar y reformatear el "
-"dispositivo USB."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:259
+#: en/SelectAndUseISOs2.xml:299
 msgid "Using a graphical tool within Mageia"
 msgstr "Usando una herramienta gráfica dentro de Mageia"
 
 #. 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>"
@@ -3729,36 +4082,38 @@ 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 "Usando una herramienta gráfica dentro de Windows"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:304
 msgid "You could try:"
 msgstr "Usted puede probar:"
 
 #. 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 "Rufus usando la opción de \"imagen ISO\";"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:271
+#: en/SelectAndUseISOs2.xml:311
 msgid ""
 "<link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
 msgstr "Win32 Disk Imager"
 
 #. 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 "Usando la Línea de comandos dentro de un sistema GNU/Linux"
 
 #. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:279
+#: en/SelectAndUseISOs2.xml:319
 msgid ""
 "It is potentially *dangerous* to do this by hand. You risk overwriting "
 "potentially valuable existing data if you specify the wrong target device."
@@ -3768,60 +4123,71 @@ msgstr ""
 "dispositivo de destino equivocado."
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:325
 msgid "Open a console"
 msgstr "Abrir consola"
 
 #. 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 ""
 "Conviértase en usuario root (Administrador) con el comando\n"
 "su - (no olvide el final '-')"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:291
-msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
+#: en/SelectAndUseISOs2.xml:332
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"Root.png\"/> </"
+"imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Root.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 ""
 "Conecte su memoria USB (no montar, no habrá cualquier aplicación o gestor de "
 "archivos que pueda leerlo)."
 
 #. 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 "Introduzca el comando \"fdisk-l\"."
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:304
-msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
+#: en/SelectAndUseISOs2.xml:345
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"Fdisk.png\"/> </"
+"imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Fdisk.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 ""
 "Encuentre el nombre del dispositivo para su dispositivo USB (por su tamaño), "
 "por ejemplo / dev / sdb en la captura de pantalla anterior, es un "
 "dispositivo USB de 8GB."
 
 #. 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 ""
 "Alternativamente, puede encontrar el nombre del dispositivo con el comando\n"
 "dmesg: al final de este ejemplo, puede ver el nombre del dispositivo que "
@@ -3829,7 +4195,7 @@ msgstr ""
 "ver que su tamaño es de 2 GB:"
 
 #. 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"
@@ -3871,51 +4237,59 @@ msgstr ""
 "[72595.969446] sd 8:0:0:0: [sdd] Disco extraíble SCSI adjunto"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:317
+#: en/SelectAndUseISOs2.xml:360
 msgid "<placeholder type=\"screen\" id=\"0\"/>"
 msgstr ""
 
 #. 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 ""
 "Ingrese el comando:\n"
 "# dd if=path/to/the/ISO/file of=/dev/sdX bs=1M"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:340
-msgid "Where X=your device name eg: /dev/sdd"
+#: en/SelectAndUseISOs2.xml:382
+#, fuzzy
+msgid ""
+"Where <replaceable>X</replaceable>=your device name eg: <filename>/dev/sdd</"
+"filename>"
 msgstr "Donde X = el nombre de su dispositivo, por ejemplo: / dev / sdd"
 
 #. 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 ""
 "Ejemplo:\n"
 "# dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso of=/dev/sdd bs=1M"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><tip><para>
-#: en/SelectAndUseISOs2.xml:345
+#: en/SelectAndUseISOs2.xml:388
+#, fuzzy
 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 ""
 "Puede ser útil saber que\n"
 "si representa archivo de entrada y de soportes para archivo de salida"
 
 #. 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 "Introduce el comando: # <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 "Este es el final de proceso, ahora puede retirar la USB stick."
 
@@ -3925,8 +4299,10 @@ msgid "Select your Country / Region"
 msgstr "Seleccione su país / 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
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
 "\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
@@ -3934,47 +4310,50 @@ msgstr ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
 "\"center\" fileref=\"dx2-selectCountry.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 ""
 "Elija su país o región. Esto es importante para todo tipo de "
 "configuraciones, como la moneda o la red wifi. Elegir el país incorrecto "
 "puede hacer que no pueda usar una red inalámbrica."
 
-#. 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 ""
 "Si su país no está en la lista, haga clic en la opción \"Otros países\" y "
 "elija su país / región allí."
 
 #. 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 ""
 "Si su país está solo en la lista Otros países, después de hacer clic en "
 "Aceptar, puede parecer que se eligió un país de la primera lista. Por favor, "
 "ignore esto, ya que DrakX aplicará su elección real."
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:33
+#: en/selectCountry.xml:42
 msgid "Input method"
 msgstr "Método de entrada"
 
 #. 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. "
@@ -3991,66 +4370,76 @@ msgstr ""
 "paquete."
 
 #. 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 ""
 "Si olvidó la configuración del método de entrada durante la instalación, "
 "puede acceder a ella después de iniciar el sistema instalado a través de "
 "Configure su computadora -> Sistema, o ejecutando localedrake como root."
 
 #. type: Content of: <section><info><title>
-#: en/selectInstallClass.xml:14
+#: en/selectInstallClass.xml:29
 msgid "Install or Upgrade"
 msgstr "Instalar o actualizar"
 
 #. 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=\"live-unused.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"unused-im1\"/> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:25
-msgid "Install"
-msgstr "Instalación"
+#: en/selectInstallClass.xml:41
+#, fuzzy
+msgid "<emphasis role=\"bold\">Install</emphasis>"
+msgstr "Estación de trabajo"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:27
+#: en/selectInstallClass.xml:43
+#, fuzzy
 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 ""
 "Use esta opción para realizar una nueva instalación de Mageia. Esto "
 "formateará la partición raíz (/), pero puede conservar una partición "
 "separada / home."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:33
-msgid "Upgrade"
-msgstr "Actualización"
+#: en/selectInstallClass.xml:50
+#, fuzzy
+msgid "<emphasis role=\"bold\">Upgrade</emphasis>"
+msgstr "Servidor"
 
 #. 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 ""
 "Esto se puede usar para actualizar una instalación existente de Mageia."
 
-#. 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 ""
 "Solo se ha probado exhaustivamente la actualización de una versión anterior "
 "de Mageia que todavía era compatible cuando se lanzó la versión de este "
@@ -4058,36 +4447,15 @@ msgstr ""
 "Fin de vida útil, entonces es mejor hacer una instalación limpia en su lugar "
 "mientras conserva su partición / home."
 
-#. type: Content of: <section><note><para>
-#: en/selectInstallClass.xml:50
-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 ""
-"Si durante la instalación decide detener la instalación, es posible "
-"reiniciar, pero por favor piense dos veces antes de hacer esto. Una vez que "
-"se ha formateado una partición o se han comenzado a instalar "
-"actualizaciones, su equipo ya no está en el mismo estado y reiniciarlo "
-"podría dejarlo con un sistema inutilizable. Si a pesar de eso, y solo si "
-"está seguro de que reiniciar es lo que desea, vaya a un terminal de texto "
-"presionando\n"
-"Alt Ctrl F2 simultáneamente. Después de eso, presione Alt Ctrl Eliminar "
-"simultáneamente para reiniciar."
-
 #. 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 ""
 "Si ha descubierto que olvidó seleccionar un idioma adicional, puede regresar "
 "del \"Instale o actualice la pantalla\" a la pantalla de selección de idioma "
@@ -4095,39 +4463,41 @@ msgstr ""
 "instalación."
 
 #. type: Content of: <section><info><title>
-#: en/selectKeyboardLive.xml:3
-msgid "Select keyboard"
+#: en/selectKeyboardLive.xml:14
+#, fuzzy
+msgid "Select Keyboard"
 msgstr "Seleccionar teclado"
 
 #. 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:24
+msgid "Here you can set the keyboard layout you wish to use with Mageia​​."
+msgstr ""
 
 #. type: Content of: <section><para>
-#: en/selectKeyboardLive.xml:12
+#: 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 ""
-"Se le pedirá que defina el teclado que quiere usar en Mageia. Por defecto "
-"aparece el correspondiente al idioma y la zona horaria previamente "
-"seleccionados."
 
 #. type: Content of: <section><info><title>
-#: en/selectKeyboard.xml:7
+#: en/selectKeyboard.xml:20
 msgid "Keyboard"
 msgstr "Teclado"
 
 #. 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."
@@ -4136,14 +4506,15 @@ msgstr ""
 "teclado compatible, elegirá el teclado estadounidense."
 
 #. 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 ""
+msgstr "<imageobject> <imagedata fileref=\"dx-welcome.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 "
@@ -4161,22 +4532,24 @@ msgstr ""
 "Distribución_del_teclado</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 ""
 "Si su teclado no está en la lista que se muestra, haga clic en \"Más\" para "
 "obtener una lista más completa, y seleccione su teclado allí."
 
-#. 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 ""
 "Después de elegir un teclado del apartado \"Más\", volverá al primer "
 "apartado de elección de teclado y parecerá que se eligió un teclado de esa "
@@ -4184,7 +4557,7 @@ msgstr ""
 "aplicará el teclado elegido de la lista completa."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:46
+#: en/selectKeyboard.xml:60
 msgid ""
 "If you choose a keyboard based on non-Latin characters, you will see an "
 "extra dialogue screen asking how you would prefer to switch between the "
@@ -4195,36 +4568,39 @@ msgstr ""
 "latino y no latino."
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:15
+#: en/selectLanguage.xml:34
 msgid "Please choose a language to use"
 msgstr "Por favor elija un idioma"
 
-#. 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 ""
 "Elija su idioma preferido extendiendo la lista de su continente.  "
 "<application>Mageia</application> usará esta selección durante la "
 "instalación y para su sistema instalado."
 
-#. 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 ""
 "Seleccione su idioma preferido.  <application>Mageia</application> lo usará "
 "durante la instalación y en su sistema instalado."
 
-#. 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 ""
 "Si es probable que usted (u otros) necesite instalar varios idiomas en su "
@@ -4233,65 +4609,68 @@ msgstr ""
 "instalación."
 
 #. 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 format=\"PNG\" fileref="
 "\"dx2-selectLanguage.png\" align=\"center\"/> </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 ""
 "Incluso si elige más de un idioma, primero debe elegir uno como idioma "
 "preferido en la pantalla del primer idioma. También se marcará como elegido "
 "en la pantalla de idiomas múltiples."
 
 #. 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 ""
 "Si su teclado no es de su idioma preferido, es recomendable que instale "
 "también el idioma de su teclado."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:56
-msgid "Mageia uses UTF-8 (Unicode) support by default."
-msgstr "Mageia usa soporte UTF-8 (Unicode) por defecto."
-
-#. 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 ""
 "Esto puede ser deshabilitado en la pantalla de \"Idiomas múltiples\" si sabe "
 "que no es apropiado para su idioma. La desactivación de UTF-8 se aplica a "
 "todos los idiomas instalados."
 
 #. 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 ""
 "Se puede cambiar el idioma del sistema tras la instalación en Centro de "
 "Control de Mageia > Sistema > Administrar la localizacón para su sistema."
 
 #. type: Content of: <section><info><title>
-#: en/selectMouse.xml:4
+#: en/selectMouse.xml:10
 msgid "Select mouse"
 msgstr "Elección del ratón"
 
@@ -4299,17 +4678,19 @@ msgstr "Elección del ratón"
 #.  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 align=\"center\" fileref=\"../es/dx2-selectMouse.png"
 "\" format=\"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."
@@ -4317,26 +4698,29 @@ msgstr ""
 "Si el ratón no responde correctamente, aquí puede elegir uno diferente."
 
 #. 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 ""
 "Normalmente, <guilabel>Universal</guilabel> - <guilabel>Cualquier ratón PS/2 "
 "y ratones USB</guilabel> es la mejor elección."
 
 #. 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 ""
 "Seleccione <guilabel>Universal</guilabel> - <guilabel>Forzar evdev</"
 "guilabel> para configurar los botones que no funcionan en un ratón de seis o "
 "más botones."
 
-#. 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 "Agregando o modificando una entrada en el menú de arranque"
 
@@ -4361,102 +4745,68 @@ msgstr ""
 "https://wiki.mageia.org/en/Grub2-efi_and_Mageia"
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:7
-msgid "Bootloader main options"
-msgstr "Opciones principales del cargador de arranque"
-
-#. type: Content of: <section><section><title>
 #: en/setupBootloader.xml:10
-msgid "Bootloader interface"
+#, fuzzy
+msgid "Bootloader"
 msgstr "Interfaz del cargador de arranque"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:11
-msgid "By default, Mageia uses exclusively:"
-msgstr "Por defecto, Mageia usa exclusivamente:"
-
-#. 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><title>
+#: en/setupBootloader.xml:13
+msgid "Grub2"
 msgstr ""
-"GRUB2 (con o sin menú gráfico) para un sistema Legacy / MBR o Legacy / GPT"
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:18
-msgid "GRUB2-efi for a UEFI system."
-msgstr "GRUB2-efi para un sistema UEFI."
-
-#. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:22
-msgid "The Mageia graphical menus are nice :)"
-msgstr "Los menús gráficos de Mageia son buenos y bonitos :)"
 
-#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:25
-msgid "GRUB2 on Legacy/MBR and Legacy/GPT systems"
+#. type: Content of: <section><section><itemizedlist><title>
+#: en/setupBootloader.xml:15
+#, fuzzy
+msgid "Grub2 on Legacy MBR/GPT systems"
 msgstr "GRUB2 en sistemas Legacy / MBR y Legacy / GPT"
 
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:27
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:17
+#, 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>"
+"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 fileref=\"dx2-"
-"setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
-"setupBootloader.png\"/> </imageobject>"
+"GRUB2 (con o sin menú gráfico) para un sistema Legacy / MBR o Legacy / GPT"
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:34 en/setupBootloader.xml:56
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:21
+#, fuzzy
 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 ""
-"No modifique el dispositivo de arranque a menos que realmente sepa lo que "
-"está haciendo."
+"un gestor de arranque GRUB2 en el MBR (Master Boot Record) de su primer "
+"disco duro o en la partición de arranque del BIOS."
 
-#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:38
-msgid "GRUB2-efi on UEFI systems"
+#. type: Content of: <section><section><itemizedlist><title>
+#: en/setupBootloader.xml:27
+#, fuzzy
+msgid "Grub2-efi on UEFI systems"
 msgstr "GRUB2-efi en sistemas UEFI"
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:39
-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 ""
-"Con un sistema UEFI, la interfaz de usuario es ligeramente diferente ya que "
-"no puede elegir entre las opciones \"con o sin menú gráfico\"."
 
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:42
+#. 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-"
-"setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
-"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 ""
 "Si Mageia es el único sistema instalado en su computadora, el instalador "
 "creó un ESP (Partición de sistema EFI) para alojar el gestor de arranque "
@@ -4466,154 +4816,89 @@ msgstr ""
 "solo se requiere uno (y se recomienda), independientemente de la cantidad de "
 "sistemas operativos que tenga."
 
-#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:61
-msgid "Using a Mageia bootloader"
-msgstr "Usando el cargador de arranque de Mageia"
-
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:62
-msgid ""
-"By default, and according to your system, Mageia writes one of the following:"
-msgstr ""
-"De forma predeterminada, y de acuerdo con su sistema, Mageia escriba uno de "
-"los siguientes:"
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:66
-msgid ""
-"a GRUB2 bootloader either into the MBR (Master Boot Record) of your first "
-"hard drive or in the BIOS boot partition."
-msgstr ""
-"un gestor de arranque GRUB2 en el MBR (Master Boot Record) de su primer "
-"disco duro o en la partición de arranque del BIOS."
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:70
-msgid "a GRUB2-efi bootloader into the ESP"
-msgstr "un gestor de arranque GRUB2-efi en el ESP"
+#. type: Content of: <section><section><info><title>
+#: en/setupBootloader.xml:46
+#, fuzzy
+msgid "Bootloader Setup"
+msgstr "Interfaz del cargador de arranque"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:73
-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."
-msgstr ""
-"Si ya tiene instalados otros sistemas operativos, Mageia intenta agregarlos "
-"al nuevo menú de inicio de Mageia. Si no quiere este comportamiento, haga "
-"clic en \"A continuación\", desmarque la opción \"Buscar otros sistemas "
-"operativos\"."
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:49
+msgid "Bootloader main options"
+msgstr "Opciones principales del cargador de arranque"
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:78
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:51
+#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata fileref=\"live-setupBootloader3.png\" align=\"center\"/> </"
-"imageobject>"
+"\"dx2-setupBootloader.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata fileref=\"live-setupBootloader.png\" xml:id=\"setupBootloader-"
+"im1\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
 "\"> <imagedata fileref=\"live-setupBootloader3.png\" align=\"center\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:87
-msgid "Using an existing bootloader"
-msgstr "Usando un cargador de arranque existente"
-
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:88
-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."
-msgstr ""
-"El procedimiento exacto para agregar su sistema Mageia a un gestor de "
-"arranque existente está fuera del alcance de esta documentación, sin "
-"embargo, en la mayoría de los casos implicará ejecutar el programa de "
-"instalación del gestor de arranque correspondiente, que debería detectarlo y "
-"agregarlo automáticamente. Consulte la documentación del sistema operativo "
-"en cuestión."
-
-#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:95
-msgid "Using chain loading"
-msgstr "Carga en uso"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:62
+#, fuzzy
+msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
+msgstr "Servidor"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:96
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:63
 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>."
+"This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI "
+"systems will not see this option here."
 msgstr ""
-"Si no quiere un arranque de Mageia, sino que se incie desde otro sistema "
-"operativo, haga clic en \"A continuación\", luego en Avanzado y marque la "
-"casilla No toque ESP o MBR."
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:101
-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-"
-"setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-setupBootloader4.png\" align="
-"\"center\"/> </imageobject>"
+#. 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\">Avanzado</emphasis>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:108
-msgid ""
-"You will get a warning that the bootloader is missing, ignore it by clicking "
-"<guibutton>OK</guibutton>."
-msgstr ""
-"Obtendrá una advertencia de que falta el cargador de arranque, ignórelo "
-"haciendo clic en <guibutton>Aceptar</guibutton>."
+#. 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 "Sólo cambie servicios cuando sepa bien lo que está haciendo."
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:111
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:72
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:117
-msgid "Options"
-msgstr "Opciones"
-
-#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:119
-msgid "First page"
-msgstr "Primera página"
+"<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
+msgstr "Por favor elija el nivel de seguridad deseado"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:120
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:74
+#, 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."
+"This text box lets you set a delay, in seconds, before the default operating "
+"system is started up."
 msgstr ""
 "Retraso antes de iniciar la imagen predeterminada: esto le permite "
 "establecer un retraso en segundos antes de que se inicie el sistema "
 "operativo predeterminado."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:122
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:78
+#, fuzzy
+msgid "<emphasis role=\"bold\">Security</emphasis>"
+msgstr "Servidor"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:79
+#, fuzzy
 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."
+"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 ""
 "Seguridad: esto le permite establecer una contraseña para el gestor de "
 "arranque. Esto significa que se requerirá un nombre de usuario y una "
@@ -4621,33 +4906,49 @@ msgstr ""
 "configuración. El nombre de usuario es root y la contraseña es la que se "
 "elige aquí después."
 
-#. 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:88
+#, fuzzy
+msgid "Choose a password for the bootloader (optional)"
 msgstr "Contraseña: elija una contraseña para el gestor de arranque."
 
-#. 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:91
+#, fuzzy
+msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
+msgstr "Estación de trabajo"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:92
+#, fuzzy
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the password and DrakX will "
-"check that it matches with the one above."
+"Retype the password and DrakX will check that it matches with the one set "
+"above"
 msgstr ""
 "Contraseña (nuevamente): Vuelva a escribir la contraseña y DrakX verificará "
 "que coincida con la anterior."
 
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:96 en/setupBootloader.xml:154
+#, fuzzy
+msgid "<emphasis>Advanced</emphasis>"
+msgstr "<emphasis role=\"bold\">Avanzado</emphasis>"
+
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:127 en/setupBootloader.xml:159
-msgid "<guilabel>Advanced</guilabel>"
-msgstr "<guilabel>Avanzado</guilabel>"
+#: en/setupBootloader.xml:99
+#, fuzzy
+msgid "<emphasis>Enable ACPI</emphasis>"
+msgstr "<emphasis>Genérico</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:100
+#, fuzzy
 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)."
+"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 ""
 "Habilitar ACPI: ACPI (Configuración avanzada e interfaz de alimentación) es "
 "un estándar para la administración de energía. Puede ahorrar energía al "
@@ -4656,90 +4957,251 @@ msgstr ""
 "de ACPI podría causar algunos problemas (por ejemplo, reinicios aleatorios o "
 "bloqueos del sistema)."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:133
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:108
+#, fuzzy
+msgid "<emphasis>Enable SMP</emphasis>"
+msgstr "<emphasis>Genérico</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:109
+#, fuzzy
 msgid ""
-"<guilabel>Enable SMP</guilabel>: This option enables/disables symmetric "
-"multiprocessing for multi core processors."
+"This option enables/disables symmetric multiprocessing for multi-core "
+"processors"
 msgstr ""
 "Habilitar SMP: esta opción habilita / deshabilita el multiprocesamiento "
 "simétrico para procesadores multinúcleo."
 
-#. 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:113
+#, fuzzy
+msgid "<emphasis>Enable APIC</emphasis>"
+msgstr "<emphasis>Genérico</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:114
+#, fuzzy
 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."
+"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 ""
 "Habilite APIC: Esto le da acceso al sistema operativo al Controlador de "
 "interrupción programable avanzado. Los dispositivos APIC permiten modelos de "
 "prioridad más complejos y administración avanzada de IRQ (solicitud de "
 "interrupción)."
 
-#. 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:120
+#, fuzzy
+msgid "<emphasis>Enable Local APIC</emphasis>"
+msgstr "<emphasis>Genérico</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:121
+#, fuzzy
 msgid ""
-"<guilabel>Enable Local APIC</guilabel>: Local APIC manages all external "
-"interrupts for a specific processor in an SMP system."
+"Here you can set Local APIC, which manages all external interrupts for a "
+"specific processor in an SMP system"
 msgstr ""
 "Habilite el APIC local: el APIC local administra todas las interrupciones "
 "externas para un procesador específico en un sistema SMP."
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:143
-msgid "Next page"
-msgstr "Página siguiente"
+#: en/setupBootloader.xml:127
+#, fuzzy
+msgid "Bootloader Configuration"
+msgstr "Configurar el sonido"
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:129
+#, fuzzy
+msgid ""
+"<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 align=\"center\" fileref="
+"\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata fileref=\"live-setupBootloader3.png\" align=\"center\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:146
-msgid "<guilabel>Default:</guilabel> Operating system started up by default"
+#: en/setupBootloader.xml:139
+#, fuzzy
+msgid "<emphasis role=\"bold\">Default</emphasis>"
+msgstr "Servidor"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:140
+#, fuzzy
+msgid "The operating system to started up by default"
 msgstr ""
 "<guilabel>Predeterminado:</guilabel> Sistema operativo iniciado de forma "
 "predeterminada"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:150
+#: en/setupBootloader.xml:143
+#, fuzzy
+msgid "<emphasis role=\"bold\">Append</emphasis>"
+msgstr "<emphasis role=\"bold\">Avanzado</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:144
+#, 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."
+"This option lets you pass information to the kernel or tell the kernel to "
+"give you more information as it boots"
 msgstr ""
 "<guilabel>Añadir:</guilabel> Esta opción le permite pasar la información del "
 "kernel o decirle al núcleo que le proporcione más información a medida que "
 "arranca."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:155
+#: en/setupBootloader.xml:148
+#, fuzzy
+msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
+msgstr "Servidor"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:149
+#, fuzzy
 msgid ""
-"<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
-"\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
+"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 ""
-"<guilabel>Detección de otros sistemas operativos</guilabel>: ver arriba "
-"<link linkend=\"setupMageiaBootloader\"> Utilizar un gestor de arranque "
-"Mageia </link>"
+"Si ya tiene instalados otros sistemas operativos, Mageia intenta agregarlos "
+"al nuevo menú de inicio de Mageia. Si no quiere este comportamiento, haga "
+"clic en \"A continuación\", desmarque la opción \"Buscar otros sistemas "
+"operativos\"."
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:156
+#, fuzzy
+msgid ""
+"<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 align=\"center\" fileref="
+"\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata fileref=\"live-setupBootloader3.png\" align=\"center\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:166
+#, fuzzy
+msgid "<emphasis>Video mode</emphasis>"
+msgstr "<emphasis>Vendedor</emphasis>"
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:159
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:167
+#, fuzzy
 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."
+"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 ""
 "Modo de video: establece el tamaño de pantalla y la profundidad de color que "
 "usará el menú de inicio. Si hace clic en el triángulo hacia abajo, se le "
 "ofrecerán otras opciones de tamaño y profundidad de color."
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:162
+#. 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>Vendedor</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:173
+msgid ""
+"Select this option if you don't want a bootable Mageia, but would rather "
+"chain-load it from another OS. You will get a warning that the bootloader is "
+"missing. Click<emphasis> Ok</emphasis> if you are sure you understand the "
+"implications, and wish to proceed."
+msgstr ""
+
+#. 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=\"live-setupBootloader5.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:188
+#, fuzzy
+msgid "Other Options"
+msgstr "Opciones"
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:190
+msgid "Using an existing bootloader"
+msgstr "Usando un cargador de arranque existente"
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:191
+#, fuzzy
+msgid ""
+"The exact procedure for adding Mageia to an existing bootloader is beyond "
+"the scope of this documentation. However in most cases it will involve "
+"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 ""
+"El procedimiento exacto para agregar su sistema Mageia a un gestor de "
+"arranque existente está fuera del alcance de esta documentación, sin "
+"embargo, en la mayoría de los casos implicará ejecutar el programa de "
+"instalación del gestor de arranque correspondiente, que debería detectarlo y "
+"agregarlo automáticamente. Consulte la documentación del sistema operativo "
+"en cuestión."
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:199
+#, fuzzy
+msgid "Installing Without a Bootloader"
+msgstr "Usando el cargador de arranque de Mageia"
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:200
+msgid ""
+"While you can opt to install Mageia without a bootloader (see section 2.1 "
+"Advanced), this is not recommended unless you absolutely know what you are "
+"doing, as without some form of bootloader your operating system will be "
+"unable to start."
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:207
+#, fuzzy
 msgid ""
-"<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
-"linkend=\"setupChainLoading\">Using the chain loading</link>"
+"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 ""
-"<emphasis role=\"bold\">No toque ESP o MBR</emphasis>: ver arriba <link "
-"linkend=\"setupChainLoading\">Uso de la cadena de arranque</link>"
+"Para hacer esto, necesita editar manualmente /boot/grub2/custom.cfg o usar "
+"la herramienta de software grub-customizer en su lugar (disponible en los "
+"repositorios de Mageia)."
+
+#. type: Content of: <section><section><section><note><para>
+#: en/setupBootloader.xml:212
+#, fuzzy
+msgid ""
+"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 ""
+"Para más información, ver:\n"
+"https://wiki.mageia.org/en/Grub2-efi_and_Mageia"
 
 #. type: Content of: <section><info><title>
-#: en/setupSCSI.xml:3
+#: en/setupSCSI.xml:10
 msgid "Setup SCSI"
 msgstr "Configurando SCSI"
 
@@ -4751,15 +5213,20 @@ msgstr "Configurando 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 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
 msgid ""
 "DrakX will normally detect hard disks correctly. However, with some older "
 "SCSI controllers it may be unable to determine the correct drivers to use "
@@ -4771,101 +5238,60 @@ msgstr ""
 "reconocerá la unidad."
 
 #. 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 ""
 "Si esto sucede, tendrá que decirle manualmente a DrakX qué unidad (es) SCSI "
 "tiene."
 
-#. type: Content of: <section><para>
-#: en/setupSCSI.xml:35
-msgid "DrakX should then be able to configure the drive(s) correctly."
-msgstr ""
-"Después DrakX debería de poder configurar el(los) disco(s) correctamente."
-
 #. type: Content of: <section><info><title>
-#: en/soundConfig.xml:3
+#: en/soundConfig.xml:10
 msgid "Sound Configuration"
 msgstr "Configurar el sonido"
 
 #.  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 format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
-"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
-
-#. type: Content of: <section><para>
-#: en/soundConfig.xml:14
-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 ""
-"En esta pantalla, se proporciona el nombre del controlador que el instalador "
-"eligió para su tarjeta de sonido, que será el controlador predeterminado si "
-"existe."
+"<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 ""
-"El driver por defecto debería funcionar sin problemas. Sin embargo, si tras "
-"la instalación hay problemas, ejecute <command>draksound</command> o inicie "
-"esta herramienta vía MCC (Centro de Control de Mageia), escogiendo la "
-"etiqueta <guilabel>Hardware</guilabel> y haciendo click en "
-"<guilabel>Configurar Sonido</guilabel> en la esquina superior derecha de la "
-"pantalla."
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:24
+#: 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 ""
-"Entonces, en el Draksound o la pantalla de la herramienta de configuración "
-"de sonido, haga clic en Solución de problemas para encontrar consejos útiles "
-"sobre cómo resolver el problema."
 
 #. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:30
+#: en/soundConfig.xml:43
 msgid "Advanced"
 msgstr "Avanzado"
 
-#. type: Content of: <section><section><para>
-#: en/soundConfig.xml:33
-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 ""
-"Haciendo clic \"Avanzado\" en esta pantalla, durante la instalación, es útil "
-"si no hay un controlador predeterminado y hay varios controladores "
-"disponibles, pero piense si el instalador seleccionó el incorrecto."
-
-#. type: Content of: <section><section><para>
-#: en/soundConfig.xml:38
-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 ""
-"En ese caso, puede seleccionar un controlador diferente después de hacer "
-"clic en \"Dejarme elegir cualquier controlador\"."
-
 #. type: Content of: <section><info><title>
-#: en/takeOverHdConfirm.xml:3
+#: en/takeOverHdConfirm.xml:10
 msgid "Confirm hard disk to be formatted"
 msgstr "Confirme el disco que va a formatear"
 
@@ -4875,69 +5301,78 @@ msgstr "Confirme el disco que va a formatear"
 #.     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=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"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 "Haga clic en \"Anterior\" si no está seguro de su elección."
 
-#. 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 ""
 "Haga clic en \"Siguiente\", proceda si está seguro de que está bien borrar "
 "todas las particiones, todos los sistemas operativos y todos los datos que "
 "puedan estar en ese disco duro."
 
 #. type: Content of: <section><info><title>
-#: en/testing.xml:9
+#: en/testing.xml:3
 msgid "Testing Mageia as Live system"
 msgstr "Probar Mageia como sistema Live"
 
 #. type: Content of: <section><section><info><title>
-#: en/testing.xml:14
+#: en/testing.xml:8
 msgid "Live mode"
 msgstr "Modo Live"
 
+#. 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 ""
-"Obtiene esta pantalla si seleccionó \"Arrancar Mageia\". Si no, obtiene el "
-"\"paso de <link linkend=\"doPartitionDisks\">particionado</link>\""
-
 #. type: Content of: <section><section><section><info><title>
-#: en/testing.xml:28
+#: en/testing.xml:21
 msgid "Testing hardware"
 msgstr "Probar hardware"
 
 #. 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 ""
 "Uno de los objetivos del modo Live es probar si Mageia administra "
 "correctamente el hardware. Ud puede verificar si todos los dispositivos "
@@ -4945,85 +5380,92 @@ msgstr ""
 "Mageia. Puede probar los dispositivos más actuales:"
 
 #. 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 "interfaz de red: configurarla con 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 "tarjeta gráfica: si ve la pantalla anterior, ya está OK."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:47
+#: en/testing.xml:40
 msgid "webcam:"
 msgstr "cámara web:"
 
 #. 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 "sonido: ya se ejecutó un jingle."
 
 #. 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 "impresora: configúrela e imprima una página de prueba"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:59
+#: en/testing.xml:52
 msgid "scanner: scan a document from ..."
 msgstr "escáner: escanee un documento desde..."
 
 #. 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 ""
 "Si todo está bien, puede procesar la instalación. Si no, puede cancelar con "
 "el botón abandonar."
 
-#. 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 ""
 "Los valores de configuración que Ud estableció aquí, se mantienen durante la "
 "instalación."
 
 #. type: Content of: <section><section><section><info><title>
-#: en/testing.xml:72
+#: en/testing.xml:68
 msgid "Launch installation"
 msgstr "Iniciar la instalación"
 
-#. 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 ""
 "Para iniciar la instalación del LiveCD o LiveDVD de Mageia en en disco duro "
 "o unidad SSD, simplemente haga click en el icono \"Instalar en Disco Duro\". "
 "Obtendrá la pantalla correspondiente y a continuación el \"paso de <link "
 "linkend=\"doPartitionDisks\">Particionar</link>\" a la instalación directa."
 
+#. 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 "Desinstalando Mageia"
 
 #. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:9
+#: en/uninstall-Mageia.xml:18
 msgid ""
 "If Mageia didn't convince you or you can't install it correctly - in short "
 "you want get rid of it - that is your right and Mageia also gives you the "
@@ -5035,12 +5477,13 @@ msgstr ""
 "operativos."
 
 #. 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 ""
 "Después de su copia de seguridad de datos, reinicie su DVD de instalación de "
 "Mageia y seleccione \"Sistema de rescate\", entonces, restaure el cargador "
@@ -5048,14 +5491,18 @@ msgstr ""
 "opción de elegir su sistema operativo."
 
 #. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:19
-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."
+#: en/uninstall-Mageia.xml:28
+#, fuzzy
+msgid ""
+"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 ""
 "En Windows para recuperar el espacio utilizado por las particiones de "
 "Mageia: haga clic en\n"
@@ -5066,16 +5513,17 @@ msgstr ""
 "particiones y seleccione Eliminar para liberar el espacio."
 
 #. 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 ""
 "Si tienes XP, puedes crear una nueva partición y darle formato (FAT32 o "
 "NTFS). Se obtendrá una letra de partición."
 
 #. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:30
+#: en/uninstall-Mageia.xml:49
 msgid ""
 "If you have Vista or 7, you have one more possibility, you can extend the "
 "existing partition that is at the left of the freed space. There are other "
@@ -5091,34 +5539,50 @@ msgstr ""
 "importante para usted."
 
 #. type: Content of: <section><info><title>
-#: en/unused.xml:9
+#: en/unused.xml:3
 msgid "Keep or delete unused material"
 msgstr "Mantener o eliminar el material no usado"
 
+#. 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=\"reboot-im1\" fileref=\"live-"
+"reboot.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 ""
 "En este paso, el instalador busca paquetes de idioma y paquetes de hardware "
 "no utilizados. A continuación, le proponer eliminarlos. Es aconsejable "
 "aceptar, excepto si prepara una instalación que tiene que ejecutarse en "
 "hardware diferente."
 
+#. 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>"
@@ -5127,11 +5591,727 @@ 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 ""
 "El siguiente paso es copiar los archivos al disco rígido. Esto toma algunos "
 "minutos. Al final se obtiene una pantalla en blanco durante algún tiempo. Es "
 "normal."
+
+#~ msgid "User and Superuser Management"
+#~ msgstr "Administración de usuarios y del administrador"
+
+#~ msgid ""
+#~ "Every partition is shown to the left as: <emphasis role=\"bold\">Device "
+#~ "(capacity, mount point, type).</emphasis>"
+#~ msgstr ""
+#~ "Cada partición se muestra a la izquierda como:\n"
+#~ "Dispositivo (capacidad, punto de montaje, tipo)."
+
+#~ 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>)."
+#~ msgstr ""
+#~ "Dispositivo, se compone de: disco duro, [nombre del disco duro (letra)], "
+#~ "número de partición (por ejemplo, sda5)."
+
+#~ msgid "In advanced tab, you will find more options about clock settings."
+#~ msgstr ""
+#~ "En la ficha Avanzada, encontrara más opciones de configuración del reloj."
+
+#~ msgid "From a disc"
+#~ msgstr "Desde un disco"
+
+#~ 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 ""
+#~ "Puede arrancar directamente desde el CD o DVD en el que grabó la imagen "
+#~ "ISO. Normalmente tiene que insertarlo en el lector de CD/DVD para que se "
+#~ "lance el instalador automáticamente cuando reinicie su ordenador. Si eso "
+#~ "no ocurre, tendrá que configurar la BIOS o pulsar una tecla durante el "
+#~ "arranque, y que le ofrecerá un menú arranque donde escoger. "
+
+#~ msgid ""
+#~ "According to which hardware you have, and how it is configured, you get "
+#~ "either one or another of the two screens below."
+#~ msgstr ""
+#~ "De acuerdo al hardware que tiene, y cómo está configurado, se obtiene una "
+#~ "de las dos pantallas siguientes."
+
+#~ msgid "From a USB device"
+#~ msgstr "Desde un dispositivo USB"
+
+#~ 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 ""
+#~ "Puede arrancar desde el dispositivo USB en el que volcó su imagen ISO. De "
+#~ "acuerdo a la configuración de su BIOS, quizás la computadora arranque "
+#~ "directamente en el dispositivo USB que ya está conectado al puerto. Si "
+#~ "esto no ocurre, puede que tenga que volver a configurar su BIOS o "
+#~ "presionar una tecla que le de la posibilidad de elegir el periférico "
+#~ "desde el cual arrancará la computadora."
+
+#~ msgid "In the middle menu, you have the choice between three actions:"
+#~ msgstr "En el menú del medio, tiene que elegir entre tres acciones:"
+
+#~ 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 ""
+#~ "Arrancar desde el disco rígido: Esta opción permite arrancar desde el "
+#~ "disco rígido, como de costumbre, cuando ningún medio (CD/DVD o memoria "
+#~ "USB) está conectado (no funciona con Mageia 5)."
+
+#~ msgid "In the bottom menu, are the Boot Options:"
+#~ msgstr "En el menú inferior, las Opciones de Inicio son:"
+
+#~ msgid ""
+#~ "F1 - Help. Explain the options \"splash\", \"apm\", \"acpi\" and \"Ide\""
+#~ msgstr ""
+#~ "F1 - Ayuda. Explicar las opciones \"splash\", \"apm\", \"acpi\" e \"Ide\""
+
+#~ msgid "F2 - Language. Choose the display language of the screens."
+#~ msgstr "F2 - Idioma. Elegir el idioma de visualización de las pantallas."
+
+#~ msgid ""
+#~ "F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728"
+#~ msgstr ""
+#~ "F3 - Resolución de pantalla. Elegir entre texto, 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 - Controlador. Si o No. El sistema sabe de la presencia de un disco "
+#~ "opcional con una actualización del controlador y requerirá su inserción "
+#~ "durante el proceso de instalación."
+
+#~ msgid ""
+#~ "F6 - Kernel options. This is a way to specify options according to your "
+#~ "hardware and the drivers to use."
+#~ msgstr ""
+#~ "F6 - Opciones del Kernel. Esta es la manera de especificar las opciones "
+#~ "de acuerdo a su hardware y los controladores a usar."
+
+#~ msgid "First screen while booting on UEFI system from disk"
+#~ msgstr ""
+#~ "Primera pantalla durante el arranque del sistema UEFI desde el disco"
+
+#~ msgid ""
+#~ "You have only the choice to run Mageia in Live mode (first choice)  or to "
+#~ "process the installation (second choice)."
+#~ msgstr ""
+#~ "Ud solamente tiene la opción de ejecutar Mageia en modo Live (primera "
+#~ "opción) o procesar la instalación (segunda opción)."
+
+#~ 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 ""
+#~ "En cada caso, los primeros pasos serán elegir idioma, zona horaria y "
+#~ "teclado. Después, los procesos serán diferentes, con <link linked="
+#~ "\"testing\">pasos adicionales en modo Live</link>."
+
+#~ msgid ""
+#~ "Depending on your selection here, you may be offered further screens to "
+#~ "fine-tune your choice."
+#~ msgstr ""
+#~ "Dependiendo de su selección aquí, aparecerán más pantallas para ajustar "
+#~ "su elección."
+
+#~ msgid "The settings DrakX chose are usually good."
+#~ msgstr "La configuración que DrakX eligió suele ser buena."
+
+#~ 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 ""
+#~ "Los repositorios Nonfree deben estar explícitamente habilitados para "
+#~ "acceder a ellos. Si no los habilitó previamente, debe hacerlo después de "
+#~ "reiniciar su sistema por primera vez."
+
+#~ msgid ""
+#~ "<emphasis><guibutton>Graphic card</guibutton></emphasis>: Choose your "
+#~ "card from the list if needed."
+#~ msgstr ""
+#~ "<emphasis><guibutton>Tarjeta gráfica</guibutton></emphasis>: Elija su "
+#~ "tarjeta de la lista si es necesario."
+
+#~ msgid "Incorrect refresh rates may damage your monitor"
+#~ msgstr "Tasas de refresco incorrectas pueden dañar su monitor"
+
+#~ msgid "<emphasis>Custom</emphasis>"
+#~ msgstr "<emphasis>Personalizado</emphasis>"
+
+#~ msgid "<emphasis>Plug 'n Play</emphasis>"
+#~ msgstr "<emphasis>Plug 'n Play</emphasis>"
+
+#~ msgid "the monitor manufacturers name"
+#~ msgstr "el nombre del fabricante del monitor"
+
+#~ msgid "the monitor description"
+#~ msgstr "la descripción del monitor"
+
+#~ 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 "Haga click en <guibutton>Hecho</guibutton> cuando esté listo."
+
+#~ 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-"
+#~ "doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" "
+#~ "align=\"center\"/> </imageobject>"
+
+#~ msgid "Use Free Space"
+#~ msgstr "Usar el espacio libre"
+
+#~ msgid "Use Free Space on a Windows Partition"
+#~ msgstr "Usar espacio libre en una partición de Windows"
+
+#~ msgid ""
+#~ "If you have unused space on an existing Windows partition, the installer "
+#~ "may offer to use it."
+#~ msgstr ""
+#~ "Si tiene espacio libre en una partición existente de Windows, el "
+#~ "instalador puede ofrecer usarlo."
+
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" "
+#~ "align=\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" "
+#~ "align=\"center\"/> </imageobject>"
+
+#~ msgid "Erase and use Entire Disk."
+#~ msgstr "Borrar y usar el disco entero"
+
+#~ msgid ""
+#~ "Note! This will erase ALL data on the selected hard drive. Take care!"
+#~ msgstr ""
+#~ "¡Aviso! Esto borrara TODA la información en el disco duro seleccionado. "
+#~ "¡Tenga cuidado!"
+
+#~ msgid "Custom disk partitioning"
+#~ msgstr "Particionamiento de disco personalizado"
+
+#~ 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 ""
+#~ "Eso significa que desde 160 GB o más de espacio disponible, el instalador "
+#~ "creará tres particiones: 50 GB para /, 4 GB para intercambio y el resto "
+#~ "para /home."
+
+#~ 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 align=\"center\" fileref="
+#~ "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition="
+#~ "\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid "January 2015"
+#~ msgstr "Enero de 2015"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+
+#~ msgid "Using a Mageia DVD"
+#~ msgstr "Usando un DVD Mageia"
+
+#~ 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 ""
+#~ "Estas son las pantallas de bienvenida predeterminadas cuando se usa un "
+#~ "DVD de Mageia. La primera es la que verá si tiene un sistema UEFI, la "
+#~ "segunda es para un sistema Legacy:"
+
+#~ 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):"
+#~ msgstr ""
+#~ "Desde esta pantalla, es posible establecer algunas preferencias (tenga en "
+#~ "cuenta que las opciones F1 a F6 están disponibles solo en sistemas "
+#~ "Legacy):"
+
+#~ msgid ""
+#~ "Press <emphasis role=\"bold\">F2</emphasis> to have the installer use a "
+#~ "specific language for the installation."
+#~ msgstr ""
+#~ "Presione F2 para que el instalador use un lenguaje específico para la "
+#~ "instalación."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "Use the arrow keys to select the language then press <emphasis role=\"bold"
+#~ "\">Enter</emphasis>."
+#~ msgstr ""
+#~ "Use las teclas de flecha para seleccionar el idioma y luego presione "
+#~ "Enter."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+
+#~ msgid "Default: It doesn't alter anything in the default options."
+#~ msgstr "Predeterminado: no altera nada en las opciones predeterminadas."
+
+#~ msgid ""
+#~ "Safe Settings: Priority is given to the safer options at the price of a "
+#~ "performance detriment."
+#~ msgstr ""
+#~ "Configuración segura: se da prioridad a las opciones más seguras en "
+#~ "detrimento del rendimiento."
+
+#~ msgid ""
+#~ "When you select one of these entries, it modifies the default options "
+#~ "displayed in the <guilabel>Boot Options</guilabel> line."
+#~ msgstr ""
+#~ "Cuando seleccione una de estas entradas, se modifica las opciones por "
+#~ "defecto mostradas en la línea <guilabel>Opciones de Arranque</guilabel>."
+
+#~ 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 ""
+#~ "En algunas versiones de Mageia, puede suceder que las entradas "
+#~ "seleccionadas con F6 no aparezcan en la línea de Opciones de arranque, a "
+#~ "pesar de esto, serán aplicadas."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+
+#~ 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 ""
+#~ "Presionando F1 abrirá una ventana de ayuda para varias opciones de "
+#~ "arranque. Seleccione una de ellas con las teclas de flecha y presione "
+#~ "Enter para obtener más detalles o presione Esc para regresar a la "
+#~ "pantalla de bienvenida."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+
+#~ 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 ""
+#~ "La vista detallada sobre la opción splash. Presione Esc o seleccione "
+#~ "Volver a las opciones de inicio para volver a la lista de opciones. Estas "
+#~ "opciones se pueden agregar a mano en la línea Opciones de inicio."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "The help is translated in the chosen language with <emphasis role=\"bold"
+#~ "\">F2</emphasis>."
+#~ msgstr "La ayuda se traduce en el idioma elegido con 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 ""
+#~ "Para más información acerca de las opciones del kernel en sistemas "
+#~ "antiguos y UEFI, ver <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 "Selección de medio (Nonfree)"
+
+#~ msgid "Summary of miscellaneous parameters"
+#~ msgstr "Resumen de la Configuración"
+
+#~ msgid "<guilabel>Timezone</guilabel>"
+#~ msgstr "<guilabel>Huso horario</guilabel>:"
+
+#~ msgid "<guilabel>Country / Region</guilabel>"
+#~ msgstr "<guilabel>País / Región</guilabel>:"
+
+#~ msgid "<guilabel>Bootloader</guilabel>"
+#~ msgstr "<guilabel>Cargador de arranque</guilabel>:"
+
+#~ msgid "For more information, see <xref linkend=\"setupBootloader\"/>"
+#~ msgstr "Para más información, vea <xref linkend=\"setupBootloader\"/>"
+
+#~ msgid "<guilabel>User management</guilabel>"
+#~ msgstr "<guilabel>Administración de usuarios</guilabel>:"
+
+#~ msgid "<guilabel>Services</guilabel>:"
+#~ msgstr "<guilabel>Servicios</guilabel>:"
+
+#~ msgid "For more information, see <xref linkend=\"configureServices\"/>"
+#~ msgstr ""
+#~ "Para obtener más información, consulte <xref linkend=\"configureServices"
+#~ "\"/>"
+
+#~ msgid "<guilabel>Keyboard</guilabel>:"
+#~ msgstr "<guilabel>Teclado</guilabel>:"
+
+#~ msgid "<guilabel>Mouse</guilabel>:"
+#~ msgstr "<guilabel>Ratón</guilabel>:"
+
+#~ msgid "<guilabel>Sound card</guilabel>:"
+#~ msgstr "<guilabel>Tarjeta de sonido</guilabel>:"
+
+#~ 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 ""
+#~ "El instalador usa el controlador predeterminado, si lo hay. La opción de "
+#~ "seleccionar un controlador diferente solo se proporciona cuando hay más "
+#~ "de un controlador para su tarjeta, pero ninguno de ellos es el "
+#~ "predeterminado."
+
+#~ msgid "<guilabel>Graphical interface</guilabel>:"
+#~ msgstr "<guilabel>Interfaz gráfica</guilabel>:"
+
+#~ msgid "<guilabel>Network</guilabel>:"
+#~ msgstr "<guilabel>Red</guilabel>:"
+
+#~ msgid "<guilabel>Proxies</guilabel>:"
+#~ msgstr "<guilabel>Servidores proxy</guilabel>:"
+
+#~ msgid "<guilabel>Security Level</guilabel>:"
+#~ msgstr "<guilabel>Nivel de seguridad</guilabel>:"
+
+#~ msgid "Check the option which best suits your usage."
+#~ msgstr ""
+#~ "Marque la opción que se ajuste mejor al uso que le dé a su ordenador."
+
+#~ msgid "<guilabel>Firewall</guilabel>:"
+#~ msgstr "<guilabel>Cortafuegos</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 ""
+#~ "El propósito de un cortafuegos es ser una barrera entre sus archivos "
+#~ "importantes y la gente malintencionada que pulula por Internet, quienes "
+#~ "pueden intentar robar o comprometer sus archivos."
+
+#~ 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 ""
+#~ "Seleccione los servicios que desea tener acceso a su sistema. Sus "
+#~ "selecciones dependerán de lo que utilice su computadora. Para obtener más "
+#~ "información, consulte <xref linkend=\"firewall\" />."
+
+#~ msgid "64 bit architecture only."
+#~ msgstr "Arquitectura de 64 bits solamente."
+
+#~ 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 y sha1sum son herramientas para verificar la integridad ISO. Elija "
+#~ "una u otra y copie la suma de comprobación para uso posterior. Entonces "
+#~ "aparecerá una ventana similar a esta:"
+
+#~ msgid "Select the Save File option, then, click OK."
+#~ msgstr "Seleccione la opción Guardar archivo, luego, haga clic en Aceptar."
+
+#~ msgid ""
+#~ "To recover the original capacity, you must redo partitioning and re-"
+#~ "format the USB stick."
+#~ msgstr ""
+#~ "Para recuperar la capacidad original, ha de reparticionar y reformatear "
+#~ "el dispositivo USB."
+
+#~ msgid "Install"
+#~ msgstr "Instalación"
+
+#~ msgid "Upgrade"
+#~ msgstr "Actualización"
+
+#~ 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 ""
+#~ "Si durante la instalación decide detener la instalación, es posible "
+#~ "reiniciar, pero por favor piense dos veces antes de hacer esto. Una vez "
+#~ "que se ha formateado una partición o se han comenzado a instalar "
+#~ "actualizaciones, su equipo ya no está en el mismo estado y reiniciarlo "
+#~ "podría dejarlo con un sistema inutilizable. Si a pesar de eso, y solo si "
+#~ "está seguro de que reiniciar es lo que desea, vaya a un terminal de texto "
+#~ "presionando\n"
+#~ "Alt Ctrl F2 simultáneamente. Después de eso, presione Alt Ctrl Eliminar "
+#~ "simultáneamente para reiniciar."
+
+#~ 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 ""
+#~ "Se le pedirá que defina el teclado que quiere usar en Mageia. Por defecto "
+#~ "aparece el correspondiente al idioma y la zona horaria previamente "
+#~ "seleccionados."
+
+#~ msgid "Mageia uses UTF-8 (Unicode) support by default."
+#~ msgstr "Mageia usa soporte UTF-8 (Unicode) por defecto."
+
+#~ msgid "By default, Mageia uses exclusively:"
+#~ msgstr "Por defecto, Mageia usa exclusivamente:"
+
+#~ msgid "GRUB2-efi for a UEFI system."
+#~ msgstr "GRUB2-efi para un sistema UEFI."
+
+#~ msgid "The Mageia graphical menus are nice :)"
+#~ msgstr "Los menús gráficos de Mageia son buenos y bonitos :)"
+
+#~ 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 fileref=\"dx2-"
+#~ "setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata xml:id=\"setupBootloader-im1\" fileref="
+#~ "\"live-setupBootloader.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "Don't modify the <emphasis role=\"bold\">Boot Device</emphasis> unless "
+#~ "you really know what you are doing."
+#~ msgstr ""
+#~ "No modifique el dispositivo de arranque a menos que realmente sepa lo que "
+#~ "está haciendo."
+
+#~ 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 ""
+#~ "Con un sistema UEFI, la interfaz de usuario es ligeramente diferente ya "
+#~ "que no puede elegir entre las opciones \"con o sin menú gráfico\"."
+
+#~ 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-"
+#~ "setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "By default, and according to your system, Mageia writes one of the "
+#~ "following:"
+#~ msgstr ""
+#~ "De forma predeterminada, y de acuerdo con su sistema, Mageia escriba uno "
+#~ "de los siguientes:"
+
+#~ msgid "a GRUB2-efi bootloader into the ESP"
+#~ msgstr "un gestor de arranque GRUB2-efi en el ESP"
+
+#~ msgid "Using chain loading"
+#~ msgstr "Carga en uso"
+
+#~ 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>."
+#~ msgstr ""
+#~ "Si no quiere un arranque de Mageia, sino que se incie desde otro sistema "
+#~ "operativo, haga clic en \"A continuación\", luego en Avanzado y marque la "
+#~ "casilla No toque ESP o MBR."
+
+#~ 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-"
+#~ "setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-setupBootloader4.png\" "
+#~ "align=\"center\"/> </imageobject>"
+
+#~ msgid ""
+#~ "You will get a warning that the bootloader is missing, ignore it by "
+#~ "clicking <guibutton>OK</guibutton>."
+#~ msgstr ""
+#~ "Obtendrá una advertencia de que falta el cargador de arranque, ignórelo "
+#~ "haciendo clic en <guibutton>Aceptar</guibutton>."
+
+#~ msgid "First page"
+#~ msgstr "Primera página"
+
+#~ msgid "<guilabel>Advanced</guilabel>"
+#~ msgstr "<guilabel>Avanzado</guilabel>"
+
+#~ msgid "Next page"
+#~ msgstr "Página siguiente"
+
+#~ msgid ""
+#~ "<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
+#~ "\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
+#~ msgstr ""
+#~ "<guilabel>Detección de otros sistemas operativos</guilabel>: ver arriba "
+#~ "<link linkend=\"setupMageiaBootloader\"> Utilizar un gestor de arranque "
+#~ "Mageia </link>"
+
+#~ msgid ""
+#~ "<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above "
+#~ "<link linkend=\"setupChainLoading\">Using the chain loading</link>"
+#~ msgstr ""
+#~ "<emphasis role=\"bold\">No toque ESP o MBR</emphasis>: ver arriba <link "
+#~ "linkend=\"setupChainLoading\">Uso de la cadena de arranque</link>"
+
+#~ msgid "DrakX should then be able to configure the drive(s) correctly."
+#~ msgstr ""
+#~ "Después DrakX debería de poder configurar el(los) disco(s) correctamente."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" "
+#~ "xml:id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" "
+#~ "xml:id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
+
+#~ 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 ""
+#~ "En esta pantalla, se proporciona el nombre del controlador que el "
+#~ "instalador eligió para su tarjeta de sonido, que será el controlador "
+#~ "predeterminado si existe."
+
+#~ 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 ""
+#~ "El driver por defecto debería funcionar sin problemas. Sin embargo, si "
+#~ "tras la instalación hay problemas, ejecute <command>draksound</command> o "
+#~ "inicie esta herramienta vía MCC (Centro de Control de Mageia), escogiendo "
+#~ "la etiqueta <guilabel>Hardware</guilabel> y haciendo click en "
+#~ "<guilabel>Configurar Sonido</guilabel> en la esquina superior derecha de "
+#~ "la pantalla."
+
+#~ 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 ""
+#~ "Entonces, en el Draksound o la pantalla de la herramienta de "
+#~ "configuración de sonido, haga clic en Solución de problemas para "
+#~ "encontrar consejos útiles sobre cómo resolver el problema."
+
+#~ 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 ""
+#~ "Haciendo clic \"Avanzado\" en esta pantalla, durante la instalación, es "
+#~ "útil si no hay un controlador predeterminado y hay varios controladores "
+#~ "disponibles, pero piense si el instalador seleccionó el incorrecto."
+
+#~ 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 ""
+#~ "En ese caso, puede seleccionar un controlador diferente después de hacer "
+#~ "clic en \"Dejarme elegir cualquier controlador\"."
+
+#~ msgid ""
+#~ "You get this screen if you selected \"Boot Mageia\". If not, you get the "
+#~ "\"<link linkend=\"doPartitionDisks\">Partitioning</link> step\""
+#~ msgstr ""
+#~ "Obtiene esta pantalla si seleccionó \"Arrancar Mageia\". Si no, obtiene "
+#~ "el \"paso de <link linkend=\"doPartitionDisks\">particionado</link>\""
diff --git a/docs/docs/stable/installer/et.po b/docs/docs/stable/installer/et.po
index 1c4eb99f..2ac10cd5 100644
--- a/docs/docs/stable/installer/et.po
+++ b/docs/docs/stable/installer/et.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2018-04-19 16:32+0300\n"
+"POT-Creation-Date: 2019-01-06 12:43+0200\n"
 "PO-Revision-Date: 2018-05-13 21:49+0000\n"
 "Last-Translator: Marek Laane <qiilaq69@gmail.com>\n"
 "Language-Team: Estonian (http://www.transifex.com/MageiaLinux/mageia/"
@@ -23,12 +23,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Content of: <section><info><title>
-#: en/acceptLicense.xml:25
+#: en/acceptLicense.xml:31
 msgid "License and Release Notes"
 msgstr "Litsents ja väljalaskemärkmed"
 
 #. type: Content of: <section><mediaobject>
-#: en/acceptLicense.xml:29
+#: en/acceptLicense.xml:35
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
 "\"acceptLicense-im1\" fileref=\"dx2-license.png\" align=\"center\" revision="
@@ -43,77 +43,85 @@ msgstr ""
 "\"center\" condition=\"live\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/acceptLicense.xml:40
+#: en/acceptLicense.xml:46
 msgid "License Agreement"
 msgstr "Litsentsileping"
 
-#. 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 ""
 "Enne <application>Mageia</application> paigaldamist lugege palun hoolikalt "
 "läbi litsentsi tingimused."
 
-#. 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 ""
 "Need tingimused kehtivad kogu <application>Mageia</application> "
 "distributsioonile ja enne jätkamist tuleb nendega nõustuda."
 
-#. 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 ""
 "Jätkamiseks valige lihtsalt <guilabel>Nõustun</guilabel> ja klõpsake siis "
 "<guibutton>Edasi</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 ""
 "Kui te aga ei ole tingimustega nõus, siis täname teid huvi eest.  Klõps "
 "nupule <guibutton>Välju</guibutton> taaskäivitab arvuti."
 
 #. type: Content of: <section><section><info><title>
-#: en/acceptLicense.xml:63
+#: en/acceptLicense.xml:76
 msgid "Release Notes"
 msgstr "Väljalaskemärkmed"
 
 #. 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 ""
 "Olulist teavet käesolerva <application>Mageia</application> väljalaske kohta "
 "näeb, kui klõpsata nupule <guibutton>Väljalaskemärkmed</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 "et"
 
 #. 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 "Andmekandjate valik (täiendavate paigaldusandmekandjate seadistamine)"
 
 #.  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
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-add_supplemental_media."
 "png\" xml:id=\"dx2-add_supplemental_media-im1\" align=\"center\" revision="
@@ -124,12 +132,13 @@ msgstr ""
 "\"1\"/> </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 ""
 "Siin on näha juba tuvastatud tarkvarahoidlad. Võite lisada ka teisi "
 "allikaid, kust tarkvarapakette hankida, näiteks plaadi pealt või "
@@ -137,24 +146,25 @@ msgstr ""
 "järgmistel etappidel kasutada."
 
 #. 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 "Võrguallika korral tuleb lisaks ette võtta järgmised sammud:"
 
 #. 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 "Valida ja aktiveerida võrk, kui see veel ei tööta."
 
 #. 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 ""
 "Valida peegel või määrata URL (esimene kirje). Peegli valimisel saab "
 "kasutada kõiki Mageia määratud hoidlaid, sealhulgas mittevaba (<emphasis "
@@ -164,14 +174,15 @@ msgstr ""
 "mõnda konkreetset hoidlat või omaenda NFS-allikat."
 
 #. 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 ""
 "Kui uuendate 64-bitist paigaldust, milles võib leiduda mõningaid 32-bitiseid "
 "rakendusi, on soovitatav sellel ekraanil lisada võrgupeegel, märkides "
@@ -182,18 +193,25 @@ msgstr ""
 "tarkvarapaketid."
 
 #. type: Content of: <section><info><title>
-#: en/addUser.xml:3
-msgid "User and Superuser Management"
-msgstr "Kasutajate ja administraatori haldamine"
+#: en/addUser.xml:9
+#, fuzzy
+msgid "User Management"
+msgstr "Põhjalikum kasutajate haldamine"
 
 #.  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 format=\"PNG\" fileref="
 "\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -201,20 +219,21 @@ msgstr ""
 "\"PNG\" 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 "Administraatori (root) parooli määramine"
 
 #. 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 ""
 "Kõigi <application>Mageia</application> paigalduste korral on soovitatav "
 "määrata administraatori (Linuxis kasutatakse selle kohta tavaliselt "
@@ -227,9 +246,10 @@ msgstr ""
 "omavahel võrreldes."
 
 #. 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 ""
 "Kõik paroolid on tõstutundlikud, see tähendab arvestavad väike- ja "
@@ -237,17 +257,18 @@ msgstr ""
 "kui ka väiketähtede) kõrval ka numbreid ja muid märke."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:42
+#: en/addUser.xml:57
 msgid "Enter a user"
 msgstr "Kasutaja lisamine"
 
 #. 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 ""
 "Siin saab lisada kasutaja. Kasutajal on vähem õigusi kui administraatoril "
 "(<emphasis role=\"bold\">root</emphasis>), kuid siiski piisavalt internetis "
@@ -255,65 +276,90 @@ msgstr ""
 "muuks, mida tavaline kasutaja oma arvutis teeb"
 
 #. 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\">Muud valikud</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>Ikoon</guibutton>: sellele nupule klõpsates saab muuta kasutaja "
 "ikooni."
 
 #. 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\">Server</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>Pärisnimi</guilabel>: siin saab kirja panna kasutaja tegeliku nime."
 
 #. 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\">Muud valikud</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>Kasutajatunnus</guilabel>: siin saab kirja panna kasutajanime või "
 "lasta DrakXil pakkuda pärisnimest tuletatud variandi. <emphasis role=\"bold"
 "\">Kasutajatunnus on tõstutundlik.</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\">Muud valikud</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>Parool</guilabel>: siin saab kirja panna kasutaja parooli. "
 "Tekstikasti lõpus on kilp, mis näitab parooli tugevust (vt ka <xref linkend="
 "\"givePassword\"/>)."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml: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>Parool (uuesti)</guilabel>: siia tuleb parool teist korda "
 "kirjutada, mille järel Drakx kontrollib, kas see ikka sobib kokku sellega, "
 "mille sisestasid esimesel korral."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml: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 ""
 "Kõigi Mageia paigaldamise ajal lisatud kasutajate kodukataloog on nii "
 "lugemis- kui ka kirjutuskaitstud (umask=0027)."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:82
+#: en/addUser.xml:104
 msgid ""
 "You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
@@ -324,31 +370,33 @@ msgstr ""
 "haldamine</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 "Ligipääsuõigusi saab mõistagi muuta ka pärast paigaldamist."
 
 #. 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 "Põhjalikum kasutajate haldamine"
 
 #. 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 ""
 "Nupule <guibutton>Muud valikud</guibutton> klõpsates ilmub ekraan, kus saab "
 "muuta lisatava kasutaja mõningaid seadistusi."
 
 #. 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>Shell</guilabel>: selles rippmenüüs saab muuta shelli, mida "
 "kasutab eelmisel ekraanil lisatud kasutaja. Valikuteks on <emphasis role="
@@ -356,28 +404,30 @@ msgstr ""
 "<emphasis role=\"bold\">Sh</emphasis>."
 
 #. 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>Kasutaja ID</guilabel>: siin saab määrata eelmisel ekraanil "
 "lisatud <emphasis role=\"bold\">kasutaja ID</emphasis>. See on arv. Kui te "
 "ei tea, milleks see hea on, ärge siia midagi kirjutage."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:113
+#: en/addUser.xml:136
+#, fuzzy
 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 ""
 "<guilabel>Grupi ID</guilabel>: siin saab määrata <emphasis role=\"bold"
 "\">grupi ID</emphasis>. Kui te ei tea, milleks see hea on, ärge ka siia "
 "midagi kirjutage."
 
 #. type: Content of: <section><info><title>
-#: en/ask_mntpoint_s.xml:3
+#: en/ask_mntpoint_s.xml:10
 msgid "Choose the mount points"
 msgstr "Haakepunktide valimine"
 
@@ -392,15 +442,17 @@ msgstr "Haakepunktide valimine"
 #.        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 format=\"PNG\" xml:id="
 "\"chooseMountPoints-im1\" align=\"center\" fileref=\"dx2-chooseMountpoints."
@@ -410,57 +462,37 @@ msgstr ""
 "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 ""
 "Siin näeb Linuxi partitsioone, mis arvutist leiti. Kui te pole "
 "<application>DrakX</application>i ettepanekutega nõus, võite haakepunkte "
 "muuta."
 
-#. type: Content of: <section><note><para>
-#: en/ask_mntpoint_s.xml:41
-msgid ""
-"If you change anything, make sure you still have a <emphasis role=\"bold"
-"\"><literal>/</literal></emphasis> (root) partition."
-msgstr ""
-"Kui te ka midagi muudate, kontrollige alati, et teil jääks alles "
-"juurpartitsioon (<emphasis role=\"bold\"><literal>/)</literal></emphasis>."
-
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:46
+#: 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 ""
-"Kõiki partitsioone näidatakse kujul <emphasis role=\"bold\">\"Seade"
-"\" (\"Suurus\", \"Haakepunkt\", \"Tüüp\")</emphasis>."
-
-#. 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 ""
-"<emphasis role=\"bold\">Seade</emphasis> koosneb järgmistest elementidest:"
-"<emphasis role=\"bold\">kõvaketas</emphasis>, [<emphasis role=\"bold"
-"\">kõvaketta nimi</emphasis> (täht)], <emphasis role=\"bold\">partitsiooni "
-"number</emphasis> (näiteks <emphasis role=\"bold\">sda5</emphasis>)."
 
 #. 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 ""
 "Kui partitsioone on palju, saab neile haakepunkte valida rippmenüüst "
 "(näiteks <emphasis role=\"bold\">/</emphasis>, <emphasis role=\"bold"
@@ -470,7 +502,7 @@ msgstr ""
 "salvestada filme, või <emphasis role=\"bold\">Andmed</emphasis>."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:63
+#: en/ask_mntpoint_s.xml:73
 msgid ""
 "For any partitions that you don't need to make use of, you can leave the "
 "mount point field blank."
@@ -479,11 +511,22 @@ msgstr ""
 "jätta."
 
 #. type: Content of: <section><warning><para>
-#: en/ask_mntpoint_s.xml:69
+#: en/ask_mntpoint_s.xml:79
+#, fuzzy
+msgid ""
+"If you make any changes here, ensure you still have a <filename>/</filename> "
+"(root) partition."
+msgstr ""
+"Kui te ka midagi muudate, kontrollige alati, et teil jääks alles "
+"juurpartitsioon (<emphasis role=\"bold\"><literal>/)</literal></emphasis>."
+
+#. type: Content of: <section><tip><para>
+#: en/ask_mntpoint_s.xml:84
+#, 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 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 ""
 "Kui te pole kindel, mida valida, klõpsake <emphasis role=\"bold\">Tagasi</"
 "emphasis> ning märkige <guilabel>Ketta jagamine oma tahtmist mööda</"
@@ -491,186 +534,241 @@ msgstr ""
 "ja suurust."
 
 #. 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 ""
 "Kui olete kindel, et haakepunktid on paigas, klõpsake <guibutton>Edasi</"
 "guibutton> ja valige, kas soovite vormindada ainult partitsioonid, mida "
 "DrakX soovitab, või rohkem."
 
 #. type: Content of: <section><info><title>
-#: en/bestTime.xml:10
-msgid "Clock settings"
+#: en/bestTime.xml:5
+#, fuzzy
+msgid "Clock Settings"
 msgstr "Kellaaja seadistamine"
 
 #. 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 ""
 "Siin tuleb valida, kas arvuti sisemine kell on seatud kohalikule ajale või "
 "UTC ehk standardajale."
 
 #. type: Content of: <section><para>
-#: en/bestTime.xml:23
-msgid "In advanced tab, you will find more options about clock settings."
+#: en/bestTime.xml:14
+msgid ""
+"In the <emphasis>Advanced</emphasis> tab, you can enable automatic time "
+"synchronization and specify an NTP server."
 msgstr ""
-"Muude valikute kaadril leiab rohkem võimalusi kellaaega täpsemalt seadistada."
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:1
+#: en/bootLive.xml:6
 msgid "Boot Mageia as Live system"
 msgstr "Mageia laadimine Live-süsteemina"
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:1
+#: en/bootLive.xml:10
 msgid "Booting the medium"
 msgstr "Käivitamine andmekandjalt"
 
-#. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:1
-msgid "From a disc"
-msgstr "Kettalt"
-
-#. 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 ""
-"Algkäivituse võib teha otse andmekandjalt, millele olete kirjutanud oma "
-"tõmmise (CD-ROM, DVD-ROM vms). Tavaliselt tuleb andmekandja lihtsalt asetada "
-"CD/DVD-seadmesse ning alglaadur käivitab arvuti taaskäivitamise järel "
-"paigaldamise automaatselt. Kui seda ei juhtu, võib olla vajalik BIOS ümber "
-"seadistada või vajutada vastavat klahvi, mis võimaldab valida lisaseadme, "
-"millest arvuti käivitada."
+#. 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 ""
-"Sõltuvalt teie riistvarast ja selle kehtivast seadistusest näete üht kahest "
-"alltoodud ekraanist."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:7
-msgid "From a USB device"
-msgstr "USB-pulgalt"
+#. 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 ""
-"Algkäivituse saab teha USB-pulgalt, millele kirjutasite ISO-tõmmise. "
-"Sõltuvalt BIOS-e seadistusest võib arvuti otse käivituda USB-pulgalt, mis on "
-"masinaga ühendatud. Kui seda ei juhtu, võib olla vajalik BIOS ümber "
-"seadistada või vajutada vastavat klahvi, mis võimaldab valida lisaseadme, "
-"millest arvuti käivitada. "
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:12
+#: en/bootLive.xml:35
 msgid "In BIOS/CSM/Legacy mode"
 msgstr "BIOS-e/CSM-i/Pärandrežiimis"
 
+#. 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\">Tööjaam</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 ""
+"Siin langetatud seadistamisvalikud jäetakse paigaldamise käigus meelde."
+
+#. 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\">Palun valige sobiv turbetase</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\">Tööjaam</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 "Mageia paigaldamine: sel juhul paigaldatakse Mageia kohe kõvakettale."
+
+#. 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=\"dx2-selectKeyboard.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 "Esimene ekraan BIOS-e režiimis algkäivitusel"
 
-#. type: Content of: <section><section><para>
-#: en/bootLive.xml:12
-msgid "In the middle menu, you have the choice between three actions:"
-msgstr "Keskel asuvas menüüs saab valida kolme võimaluse vahel:"
+#. 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:75
+#, fuzzy
+msgid "<keycap>F1</keycap> <emphasis role=\"bold\">Help</emphasis>"
+msgstr "<emphasis role=\"bold\">Server</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:13
+#: en/bootLive.xml:76
+#, fuzzy
 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."
+"Within any of the <keycap>F2</keycap> to <keycap>F6</keycap> options, you "
+"can view relevant help by pressing <keycap>F1</keycap>."
 msgstr ""
-"Mageia laadimine: see tähendab, et Mageia 5 käivitatakse ühendatud "
-"andmekandjalt (CD/DVD või USB-pulk) ilma midagi kettale kirjutamata, mis "
-"ühtlasi tähendab, et kõik võib olla väga aeglane. Kui käivitamine on läbi, "
-"võite ka süsteemi kõvakettale paigaldada."
+"Kõigi <emphasis role=\"bold\">F2</emphasis> kuni <emphasis role=\"bold\">F6</"
+"emphasis> valikute korral näeb asjakohast abi, kui vajutada <emphasis role="
+"\"bold\">F1</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:16
-msgid ""
-"Install Mageia: This choice will directly install Mageia on a hard disk."
-msgstr "Mageia paigaldamine: sel juhul paigaldatakse Mageia kohe kõvakettale."
+#: en/bootLive.xml:81
+#, fuzzy
+msgid "<keycap>F2</keycap> <emphasis role=\"bold\">Language</emphasis>"
+msgstr "<emphasis role=\"bold\">Muud valikud</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:17
+#: 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 ""
-"Alglaadimine kõvakettalt: sel juhul käivitatakse süsteem kõvakettal, nagu "
-"seda tehakse ka siis, kui andmekandjat (CD/DVD või USB-pulk) pole masinaga "
-"ühendatud (Mageia 5 puhul see ei toimi)."
 
-#. type: Content of: <section><section><para>
-#: en/bootLive.xml:19
-msgid "In the bottom menu, are the Boot Options:"
-msgstr "Allservas asuvas menüüs leiab alglaadimisvalikud:"
+#. 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\">Muud valikud</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\""
-msgstr "F1 - Abi. Selgitab valikuid \"splash\", \"apm\", \"acpi\" ja \"Ide\"."
+"If needed, change the screen resolution by pressing <keycap>F3</keycap>. "
+"Options are: 640x480, 800x600, 1024x768."
+msgstr ""
+"Muuta ekraanilahutust klahvile<emphasis role=\"bold\"> F3</emphasis> "
+"vajutades (ainult pärandsüsteemis)"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:20
-msgid "F2 - Language. Choose the display language of the screens."
-msgstr "F2 - keel. Ekraanil nähtava keele valimine."
+#: en/bootLive.xml:93
+#, fuzzy
+msgid "<keycap>F4</keycap> <emphasis role=\"bold\">Source</emphasis>"
+msgstr "<emphasis role=\"bold\">Server</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:21
-msgid "F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728"
-msgstr "F3 - ekraanilahutus. Valida on tekst, 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 ""
 
 #. 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 või Muu. Tavaliselt sooritatakse paigaldamine ühendatud "
 "paigaldusandmekandjalt. Siin saab valida ka muu allika, näiteks FTP- või NFS-"
@@ -678,119 +776,175 @@ msgstr ""
 "valida serveril saada olev paigaldusandmekandja."
 
 #. 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\">Server</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 ""
-"F6 - draiver. Jah või Ei. Süsteem on teadlik draiveriuuendusega lisaketta "
-"olemasolust ning nõuab selle paigaldamise käigus selle ühendamist."
 
 #. 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\">Tööjaam</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:106
+#, fuzzy
+msgid ""
+"If you experience problems with the installation, you could try modifying "
+"the default settings using the <emphasis>Kernel Option</emphasis> menu:"
+msgstr ""
+"Kui paigaldamisel peaks tekkima raskusi, võib üritada muuta vaikeseadistusi, "
+"valides <emphasis role=\"bold\">F6</emphasis> <emphasis role=\"bold\">Kernel "
+"Options</emphasis> (UEFI sõsteemi korral vajutage <emphasis role=\"bold\">e</"
+"emphasis>)."
+
+#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/bootLive.xml:111
+#, fuzzy
 msgid ""
-"F6 - Kernel options. This is a way to specify options according to your "
-"hardware and the drivers to use."
+"<emphasis role=\"bold\">Default:</emphasis> splash quiet noiswmd resume "
+"audit=0"
+msgstr "<emphasis role=\"bold\">Align to</emphasis> = MiB"
+
+#. 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 "Ilma ACPI-ta: toitehalduse valikuid ei arvestata."
+
+#. 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 ""
+"Ilma kohaliku APIC-ta: see puudutab CPU katkestusi. Valige see siis, kui "
+"seda nõutakse."
+
+#. 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 - kerneli võtmed. Siin saab määrata konkreetseid võtmeid, mida vajavad "
-"teie riistvara ja kasutatavad draiverid."
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:29
+#: en/bootLive.xml:139
 msgid "In UEFI mode"
 msgstr "UEFI režiimis"
 
 #. 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 "Esimene ekraan UEFI süsteemi käivitamisel kettalt"
+#: en/bootLive.xml:146
+#, fuzzy
+msgid "First screen while booting in UEFI mode"
+msgstr "Esimene ekraan BIOS-e režiimis algkäivitusel"
 
 #. 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 ""
-"Siin on ainult kaks valikut: Mageia käivitamine live-režiimis (esimene "
-"valik) või paigaldamine (teine valik)."
 
-#. 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 ""
-"Kui olete süsteemi laadinud USB-pulgalt, näeb veel kaht rida, mis on muidu "
-"samasugused nagu kaks esimest, ainult et lisatud on \"USB\". Siis tuleb "
-"valida üks neist."
+"Mageia laadimine: see tähendab, et Mageia 5 käivitatakse ühendatud "
+"andmekandjalt (CD/DVD või USB-pulk) ilma midagi kettale kirjutamata, mis "
+"ühtlasi tähendab, et kõik võib olla väga aeglane. Kui käivitamine on läbi, "
+"võite ka süsteemi kõvakettale paigaldada."
 
-#. 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 ""
-"Kõigil juhtudel on esimesteks sammudeks ühtmoodi keele, ajavööndi ja "
-"klaviatuuri valimine, seejärel aga lähevad asjad lahku <link linkend="
-"\"testing\">Live-režiimi lisasammude</link> tõttu."
 
 #. type: Content of: <section><info><title>
-#: en/chooseDesktop.xml:3
+#: en/chooseDesktop.xml:16
 msgid "Desktop Selection"
 msgstr "Töölaua valimine"
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:8
-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 ""
-"Sõltuvalt siin langetatud valikutest võite näha täiendavaid ekraane, kus "
-"saab valikut täpsustada."
 
 #. 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 ""
 "Pärast valiku(te) langetamist näeb pakettide paigaldamise ajal "
 "slaidiseanssi. Sellest saab loobuda, kui klõpsata nupule "
 "<guilabel>Üksikasjad</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 format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
 "align=\"center\"/> </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 ""
 "Siin saab valida, kas soovite kasutada <application>KDE</application> "
 "<emphasis role=\"bold\">Plasma</emphasis> või <application>Gnome</"
@@ -806,8 +960,9 @@ msgid "Package Group Selection"
 msgstr "Paketigruppide valimine"
 
 #. 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
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
 "\" align=\"center\"/> </imageobject>"
@@ -816,7 +971,7 @@ msgstr ""
 "\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:14
+#: en/choosePackageGroups.xml:16
 msgid ""
 "Packages are arranged into common groups, to make choosing what you need on "
 "your system a lot easier. The groups are fairly self explanatory, however "
@@ -828,22 +983,22 @@ msgstr ""
 "kohta pakutakse ka rohkem teavet, kui viite hiirekursori nime kohale."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:21
+#: en/choosePackageGroups.xml:23
 msgid "<emphasis role=\"bold\">Workstation</emphasis>"
 msgstr "<emphasis role=\"bold\">Tööjaam</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:25
+#: en/choosePackageGroups.xml:27
 msgid "<emphasis role=\"bold\">Server</emphasis>"
 msgstr "<emphasis role=\"bold\">Server</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:29
+#: en/choosePackageGroups.xml:31
 msgid "<emphasis role=\"bold\">Graphical Environment</emphasis>"
 msgstr "<emphasis role=\"bold\">Graafiline keskkond</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:33
+#: en/choosePackageGroups.xml:35
 msgid ""
 "<emphasis role=\"bold\">Individual Package Selection</emphasis>: you can use "
 "this option to manually add or remove packages"
@@ -852,7 +1007,7 @@ msgstr ""
 "pakette käsitsi lisada või eemaldada."
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:38
+#: en/choosePackageGroups.xml:40
 msgid ""
 "See <xref linkend=\"minimal-install\"/> for instructions on how to do a "
 "minimal install (without or with X &amp; IceWM)."
@@ -866,8 +1021,10 @@ msgid "Choose Individual Packages"
 msgstr "Üksikpakettide valimine"
 
 #. 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
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackagesTree.png"
 "\" align=\"center\"/> </imageobject>"
@@ -876,20 +1033,21 @@ msgstr ""
 "\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:14
+#: en/choosePackagesTree.xml:18
 msgid ""
 "Here you can add or remove any extra packages to customize your installation."
 msgstr ""
 "Siin saab oma paigaldust kohandada, lisades või eemaldades tarkvarapakette."
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml: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 ""
 "Kui olete vajalikud valikud langetanud, võite klõpsata lehekülje allosas "
 "<guibutton>disketiikoonile</guibutton>, mis lubab salvestada paketivaliku "
@@ -904,8 +1062,10 @@ msgstr "Teenuste seadistamine"
 
 #.  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
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-configureServices.png"
 "\" xml:id=\"configureServices-im1\" align=\"center\" revision=\"1\"/> </"
@@ -916,26 +1076,24 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:16
+#: en/configureServices.xml:20
 msgid ""
 "Here you can choose which services should start when you boot your system."
 msgstr ""
 "Siin saab määrata, millised teenused käivitada või mitte käivitada koos "
 "süsteemi alglaadimisega."
 
-#. type: Content of: <section><para>
-#: en/configureServices.xml: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
+#, fuzzy
+msgid ""
+"Click on a triangle to expand a group to all the relevant services. The "
+"settings DrakX chose are usually good."
 msgstr ""
 "Kolmnurgal klõpsates saab avada kõiki vastavaid teenusi sisaldava grupi."
 
-#. type: Content of: <section><para>
-#: en/configureServices.xml:22
-msgid "The settings DrakX chose are usually good."
-msgstr "Valikud, mille on langetanud DrakX, on tavaliselt mõistlikud ja head."
-
-#. type: Content of: <section><para>
-#: en/configureServices.xml: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."
@@ -944,7 +1102,7 @@ msgstr ""
 "kohta."
 
 #. 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 ""
 "Muutke siin midagi ainult siis, kui olete kindel, et teate, mida teete."
@@ -956,14 +1114,17 @@ msgstr "Ajavööndi seadistamine"
 
 #.  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 format=\"PNG\" xml:id="
 "\"configureTimezoneUTC-im1\" align=\"center\" fileref=\"dx2-"
@@ -971,17 +1132,18 @@ msgstr ""
 "<imagedata format=\"PNG\" fileref=\"live-timeZone.png\" condition=\"live\"/> "
 "</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 ""
 "Määrake ajavöönd kindlaks, valides oma riigi või linna, mis asub samas "
 "ajavööndis teie lähedal."
 
 #. type: Content of: <section><para>
-#: en/configureTimezoneUTC.xml:24
+#: en/configureTimezoneUTC.xml:32
 msgid ""
 "In the next screen you can choose to set your hardware clock to local time "
 "or to GMT, also known as UTC."
@@ -990,7 +1152,7 @@ msgstr ""
 "ajale või GMT-le ehk maailmaajale (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."
@@ -999,23 +1161,23 @@ msgstr ""
 "oleksid lültiatud kas kohalikule ajale või siis UTC/GMT-le."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:13
+#: en/configureX_card_list.xml:24
 msgid "Choose an X Server (Configure your Graphic Card)"
 msgstr "X-serveri valimine (graafikakaardi seadistamine)"
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_card_list.xml: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=\"configureX_card_list-im1\" "
-"align=\"center\" fileref=\"dx2-configureX_card_list.png\" 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/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."
@@ -1024,7 +1186,7 @@ msgstr ""
 "teie videoseadme korrektselt tuvastada."
 
 #. 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:"
@@ -1033,30 +1195,34 @@ msgstr ""
 "te teate, milline kaart teil on, võite valida selle loetelust järgmiste "
 "parameetrite alusel:"
 
-#. 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 "tootja"
 
 #. 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 "seejärel kaardi nimi"
 
 #. 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 "ja lõpuks kaardi tüüp"
 
 #. 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 ""
 "Kui te ei leia oma kaarti tootjate nimekirjast (sest seda pole veel "
 "andmebaasis või on tegu väga vana kaardiga), võib siiski leida sobiva "
@@ -1066,64 +1232,62 @@ msgstr ""
 "<emphasis role=\"bold\">Vesa</emphasis> draiveri, mis pakub kõige "
 "elementaarsemaid võimalusi."
 
-#. 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 ""
 "Arvestage kindlasti, et kui valite sobimatu draiveri, võite saada kasutada "
 "ainult <emphasis role=\"bold\">käsurida</emphasis>."
 
 #. 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 ""
 "Mõned videokaartide tootjad pakuvad Linuxile omanduslikke draivereid, mis "
 "võivad olla saadaval ainult <emphasis role=\"bold\">Nonfree</emphasis> "
 "tarkvarahoidlas, mõnel juhul isegi kõigest tootja enda veebileheküljel."
 
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:56
-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 ""
-"<emphasis role=\"bold\">Nonfree</emphasis> hoidlad tuleb kasutamiseks "
-"spetsiaalselt lubada.  Seda saab teha pärast arvuti esimest taaskäivitamist."
-
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:3
+#: en/configureX_chooser.xml:11
 msgid "Graphic Card and Monitor Configuration"
 msgstr "Graafikakaardi ja monitori seadistamine"
 
 #.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
+#. 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=\"configureX_chooser-im1\" "
-"fileref=\"dx2-configureX_chooser.png\" align=\"center\" 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/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 ""
 "Sõltumata sellest, millise graafilise keskkonna ehk töökeskkonna olete "
 "otsustanud oma <application>Mageia</application> paigaldusele valida, "
@@ -1135,22 +1299,33 @@ msgstr ""
 "näete, et DrakX ei ole midagi valinud, või kui arvate, et valik ei ole õige."
 
 #. 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\">Graafiline keskkond</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>Graafikakaart</guibutton></emphasis>: valige vajaduse "
-"korral loetelust oma kaart."
 
 #. 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\">Server</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>: valida saab "
 "<guilabel>Plug'n Play</guilabel>, kui see sobib, või siis vajaliku monitori "
@@ -1158,30 +1333,37 @@ msgstr ""
 "guilabel> all. Valige <guilabel>Kohandatud</guilabel>, kui eelistate käsitsi "
 "paika panna oma monitori realaotus- ja ekraaniuuendussageduse."
 
-#. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/configureX_chooser.xml:41
-msgid "Incorrect refresh rates may damage your monitor"
-msgstr "Väärad sagedused võivad monitori kahjustada."
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_chooser.xml:60
+#, fuzzy
+msgid "<emphasis role=\"bold\">Resolution</emphasis>"
+msgstr "<emphasis role=\"bold\">Tööjaam</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:47
-msgid ""
-"<emphasis><guibutton>Resolution</guibutton></emphasis>: The resolution and "
-"color depth of your monitor can be set here."
+#: en/configureX_chooser.xml:63
+#, fuzzy
+msgid "The resolution and color depth of your monitor can be set here"
 msgstr ""
 "<emphasis><guibutton>Ekraanilahutus</guibutton></emphasis>: siin saab "
 "määrata vajaliku monitori ekraanilahutuse ja värvisügavuse."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:52
+#: en/configureX_chooser.xml:68
+#, fuzzy
+msgid "<emphasis role=\"bold\">Test</emphasis>"
+msgstr "<emphasis role=\"bold\">Server</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>: testimisnuppu paigaldamise "
 "ajal alati ei näe. Kui see on näha, siis saab sellele vajutades kontrollida "
@@ -1193,21 +1375,35 @@ msgstr ""
 "seadistused oleksid korras."
 
 #. 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\">Tööjaam</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>Eelistused</guibutton></emphasis>: siin saab "
 "mitmesuguseid valikuid lubada või keelata."
 
+#. 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 "Monitori valimine"
 
 #. 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."
@@ -1216,7 +1412,7 @@ msgstr ""
 "teie monitori õigesti."
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:19
+#: en/configureX_monitor.xml:30
 msgid ""
 "<emphasis role=\"bold\">Selecting a monitor with different characteristics "
 "could damage your monitor or video hardware. Please don't try something "
@@ -1229,25 +1425,26 @@ msgstr ""
 "emphasis> Kahtluste korral uurige oma monitori dokumentatsiooni."
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:26
+#: en/configureX_monitor.xml:38
+#, fuzzy
 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=\"configureX_monitor-im1\" "
-"fileref=\"dx2-configureX_monitor.png\" align=\"center\" 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/configureX_monitor.xml:31
-msgid "<emphasis>Custom</emphasis>"
-msgstr "<emphasis>Kohandatud</emphasis>"
+#. type: Content of: <section><variablelist><varlistentry><term>
+#: en/configureX_monitor.xml:46
+msgid "Custom"
+msgstr ""
 
-#. 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."
@@ -1255,8 +1452,8 @@ msgstr ""
 "Selle valimine võimaldab paika panna kaks äärmiselt tähtsat parameetrit: "
 "realaotussageduse ja ekraaniuuendussageduse."
 
-#. 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 "
@@ -1268,27 +1465,23 @@ msgstr ""
 "moel võib monitorile tõsist kahju teha. Kui kahtlete, valige pigem "
 "tagasihoidlikum väärtus ja kindlasti uurige monitori dokumentatsiooni."
 
-#. 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 ""
 "See on vaikimisi valik, mis üritab määrata monitori tüübi monitoride "
 "andmebaasi põhjal."
 
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:51
-msgid "<emphasis>Vendor</emphasis>"
-msgstr "<emphasis>Tootja</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:"
@@ -1297,30 +1490,30 @@ msgstr ""
 "teate, milline kaart teil on, võite valida selle puust järgmiste "
 "parameetrite alusel:"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:61
-msgid "the monitor manufacturers name"
-msgstr "monitori nimi"
+#. 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 "monitori kirjeldus"
+#. 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>Tavaline</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 ""
 "Selles grupis on valida ligemale 30 seadistuse seast, näiteks 1024x768 @ "
 "60Hz, sealhulgas lamekuvarid, mida kasutavad eriti sülearvutid. See on "
@@ -1329,128 +1522,146 @@ msgstr ""
 "emphasis> draiverit. Ka siin tasub valides olla pigem konservatiivne."
 
 #. 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 "Ketta kohandatud partitsioneerimine DiskDrake'i abil"
 
 #. 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"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.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
-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 ""
-"Kui soovite krüptida oma <emphasis role=\"bold\">/</emphasis> partitsiooni, "
-"peab teil kindlasti olema ka eraldi <emphasis role=\"bold\">/boot</"
-"emphasis>partitsioon. <emphasis role=\"bold\">/boot</emphasis> "
-"partitsioonile EI TOHI määrata krüptimisvalikut, sest siis ei ole süsteemi "
-"võimalik üldse laadida."
+"<imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/> </imageobject>"
 
-#. 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 ""
 "Siin saab kohandada ketta või ketaste jagamist: eemaldada või luua "
 "partitsioone, muuta partitsiooni failisüsteemi või suurust ning isegi enne "
 "alustamist näha, mida partitsioon sisaldab."
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:34
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/diskdrake.xml:45
+#, fuzzy
 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>."
+"device, like a USB key). In the screenshot above there are two available "
+"devices: <filename>sda </filename>and <filename>sdb</filename>."
 msgstr ""
 "Igale leitud kõvakettale või muule salvestusseadmele (näiteks USB-pulgale) "
 "on omaette kaart. Siinsel pildil on näha kaks seadet: <emphasis role=\"bold"
 "\">sda</emphasis> ja <emphasis role=\"bold\">sdb</emphasis>."
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:39
-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."
-msgstr ""
-"Kõigi valitud salvestusseadme partitsioonide kustutamiseks valige "
-"<guibutton>Kustuta kõik</guibutton>."
-
-#. 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 ""
 "Kõigi teiste toimingute jaoks klõpsake kõigepealt vajalikul partitsioonil. "
 "Siis saate seda uurida, valida failisüsteemi või haakepunkti, suurust muuta "
 "või ka kustutada. <guibutton>Ekspertrežiim</guibutton> pakub rohkem "
 "võimalusi, näiteks nime lisamine või partitsiooni tüübi valimine."
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:49
-msgid "Continue until you have adjusted everything to your satisfaction."
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/diskdrake.xml:60
+#, fuzzy
+msgid ""
+"Continue until you have adjusted everything to your satisfaction, then click "
+"<emphasis>Done</emphasis> when you're ready."
 msgstr "Jätkake, kuni kõik on nii, nagu soovite."
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:52
-msgid "Click <guibutton>Done</guibutton> when you're ready."
-msgstr "Kui kõik on valmis, klõpsake nupule <guibutton>Tehtud</guibutton>."
+#. type: Content of: <section><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 ""
+"Kõigi valitud salvestusseadme partitsioonide kustutamiseks valige "
+"<guibutton>Kustuta kõik</guibutton>."
 
-#. 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 ""
+"Kui soovite krüptida oma <emphasis role=\"bold\">/</emphasis> partitsiooni, "
+"peab teil kindlasti olema ka eraldi <emphasis role=\"bold\">/boot</"
+"emphasis>partitsioon. <emphasis role=\"bold\">/boot</emphasis> "
+"partitsioonile EI TOHI määrata krüptimisvalikut, sest siis ei ole süsteemi "
+"võimalik üldse laadida."
+
+#. 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 ""
 "Kui paigaldate Mageia UEFI süsteemi, kontrollige, kas ESP (EFI süsteemne "
 "partitsioon) on ikka olemas ja korrektselt haagitud asukohta /boot/EFI (vt "
 "tagapool)."
 
-#. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:61
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/diskdrake.xml:93
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
-"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"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 ""
+"Kui paigaldate Mageia pärand/GPT süsteemi, kontrollige, kas korrektse "
+"tüübiga BIOS-e alglaadimispartitsioon on ikka olemas."
+
+#. type: Content of: <section><figure><title>
+#: en/diskdrake.xml:101
+#, fuzzy
+msgid "EFI System Partition"
+msgstr "Olemasolevate partitsioonide kasutamine"
+
+#. type: Content of: <section><figure><mediaobject>
+#: en/diskdrake.xml:104
+#, fuzzy
+msgid ""
+"<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-diskdrake2.png"
 "\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/> </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
-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 ""
-"Kui paigaldate Mageia pärand/GPT süsteemi, kontrollige, kas korrektse "
-"tüübiga BIOS-e alglaadimispartitsioon on ikka olemas."
 
-#. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:76
+#. type: Content of: <section><mediaobject>
+#: en/diskdrake.xml:118 en/doPartitionDisks.xml:200
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1463,50 +1674,60 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:9
-msgid "Partitioning"
+#: en/doPartitionDisks.xml:25
+#, fuzzy
+msgid "Suggested Partitioning"
 msgstr "Partitsioneerimine"
 
 #. 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 ""
 "Sellel ekraanil näete oma kõvaketta või -ketaste sisu ning lahendusi, mida "
 "DrakXi partitsioneerimisnõustaja pakub <application>Mageia</application> "
 "paigaldamiseks."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml: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 ""
 "Pakutavad valikud sõltuvad teie kõvaketaste konkreetsest ülesehitusest ja "
 "sisust."
 
 #. 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-"
-"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
-"\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:32
-msgid "Use Existing Partitions"
-msgstr "Olemasolevate partitsioonide kasutamine"
+#. type: Content of: <section><itemizedlist><title>
+#: en/doPartitionDisks.xml:47
+#, fuzzy
+msgid "Main Options"
+msgstr "Valikud"
 
-#. 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\">Partitsiooni suurus:</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."
@@ -1514,13 +1735,14 @@ msgstr ""
 "Kui see on näha, leiti olemasolevad Linuxiga ühilduvad partitsioonid ning "
 "neid võib kasutada paigaldamiseks."
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:41
-msgid "Use Free Space"
-msgstr "Vaba ruumi kasutamine"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:59
+#, fuzzy
+msgid "<emphasis role=\"bold\">Use Free Space</emphasis>"
+msgstr "<emphasis role=\"bold\">Server</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."
@@ -1528,56 +1750,35 @@ msgstr ""
 "Kui kõvakettal on kasutamata ruumi, siis selle valikuga saab selle eraldada "
 "uuele Mageia paigaldusele."
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:49
-msgid "Use Free Space on a Windows Partition"
-msgstr "Vaba ruumi kasutamine Windowsi partitsioonil"
-
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml: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 ""
-"Kui olemasoleval Windowsi partitsioonil on vaba ruumi, võib "
-"paigaldusprogramm seda kasutada."
+"<emphasis role=\"bold\">Use Free Space on a Windows Partition</emphasis>"
+msgstr "<emphasis role=\"bold\">Tööjaam</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 ""
 "See võib olla väga mõistlik valik oma uuele Mageia paigaldusele ruumi "
 "leidmiseks, kuid samal ajal on see riskantne, mistõttu tuleks kindlasti teha "
 "kõigist olulistest failidest varukoopia!"
 
-#. 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 ""
-"Pange tähele, et sellega kaasneb Windowsi partitsiooni suuruse vähendamine. "
-"Partitsioon peab olema \"puhas\", see tähendab Windows peab olema viimasel "
-"korral korrektselt suletud. Samuti peab partitsioon olema defragmenteeritud, "
-"ehkki see ei garanteeri veel, et kõik failid on alalt, mida Mageia "
-"paigaldamiseks kasutatakse, tõepoolest eemaldatud. Sellepärast ongi "
-"äärmiselt soovitatav kõik vähegi olulised failid eelnevalt varundada."
-
-#. type: Content of: <section><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 ""
 "Selle valiku korral näitab paigaldusprogramm alles jäävat Windowsi "
 "partitsiooni helesinisena ja tulevast Mageia partitsiooni tumesinisena ning "
@@ -1585,53 +1786,54 @@ msgstr ""
 "muuta, klõpsates partitsioonide vahel asuvale tühialale ja seda lohistades. "
 "Seda näitab allolev pilt."
 
-#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:76
-msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/> </imageobject>"
-msgstr ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/> </imageobject>"
-
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:87
-msgid "Erase and use Entire Disk."
-msgstr "Kogu ketta tühjendamine ja kasutamine"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:85
+#, fuzzy
+msgid "<emphasis role=\"bold\">Erase and use Entire Disk</emphasis>"
+msgstr "<emphasis role=\"bold\">Graafiline keskkond</emphasis>"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:90
-msgid "This option will allocate the entire drive for Mageia."
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:88
+#, fuzzy
+msgid "This option will allocate the entire drive for Mageia"
 msgstr "Selle valimisel kasutatakse kogu ketast ainult Mageia jaoks."
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:93
-msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
-msgstr ""
-"Tähelepanu! Sellega kustutatakse valitud kõvakettalt KÕIK andmed. Olge "
-"ettevaatlik!"
-
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml: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 ""
 "Kui kavatsete kasutada osa kettast millegi muu tarbeks või on teil juba "
 "kettal andmeid, mida te ei soovi kaotada, ärge seda võimalust valige."
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:103
-msgid "Custom disk partitioning"
-msgstr "Ketta jagamine oma tahtmist mööda"
+#. 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 ""
+"Pange tähele, et sellega kaasneb Windowsi partitsiooni suuruse vähendamine. "
+"Partitsioon peab olema \"puhas\", see tähendab Windows peab olema viimasel "
+"korral korrektselt suletud. Samuti peab partitsioon olema defragmenteeritud, "
+"ehkki see ei garanteeri veel, et kõik failid on alalt, mida Mageia "
+"paigaldamiseks kasutatakse, tõepoolest eemaldatud. Sellepärast ongi "
+"äärmiselt soovitatav kõik vähegi olulised failid eelnevalt varundada."
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:106
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:110
+#, fuzzy
+msgid "<emphasis role=\"bold\">Custom Disk Partitioning</emphasis>"
+msgstr "<emphasis role=\"bold\">Partitsiooni suurus:</emphasis>"
+
+#. 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)."
@@ -1639,84 +1841,107 @@ msgstr ""
 "See valik annab täieliku kontrolli määrata, kuidas ja kuhu Mageia kõvakettal "
 "või -ketastel paigaldatakse."
 
-#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:112
-msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
-msgstr "<emphasis role=\"bold\">Partitsiooni suurus:</emphasis>"
+#. type: Content of: <section><mediaobject>
+#: en/doPartitionDisks.xml:120
+#, fuzzy
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:114
+#: en/doPartitionDisks.xml:129
+#, fuzzy
 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 ""
 "Kui te ei vali võimalust <emphasis role=\"bold\">Ketta jagamine oma tahtmist "
 "mööda</emphasis>, siis jagab paigaldusprogramm saadaoleva ruumi ära "
 "järgmiste reeglite kohaselt:"
 
-#. 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 ""
 "Kui kokku on saadaval alla 50 GB, luuakse ainult üks partitsioon<emphasis "
 "role=\"bold\"> /</emphasis> jaoks ning /home jaoks eraldi partitsiooni ei "
 "looda."
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:125
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:141
 msgid ""
 "If the total available space is greater than 50 GB, then three partitions "
 "are created"
 msgstr "Kui kokku on saadaval üle 50 GB, luuakse kolm partitsiooni"
 
-#. type: Content of: <section><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 saadaolevast koguruumist eraldatakse <emphasis role=\"bold\">/</"
 "emphasis> jaoks maksimaalse suurusega 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 eraldatakse saalealaks maksimaalse suurusega 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 ""
 "ülejäänu (vähemalt 12/19) eraldatakse <emphasis role=\"bold\">/home</"
 "emphasis> jaoks"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:144
+#: 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 ""
-"See tähendab, et kui ruumi on 160 GB või rohkem, loob paigaldusprogramm kolm "
-"partitsiooni: 50 GB <emphasis role=\"bold\">/</emphasis> jaoks, 4 GB "
-"<emphasis role=\"bold\">saaleala</emphasis> jaoks ja ülejäänu <emphasis role="
-"\"bold\">/home</emphasis> jaoks."
 
 #. 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 ""
 "Kui kasutate UEFI süsteemi, tuvastatakse automaatselt ESP (EFI süsteemne "
 "partitsioon) või see luuakse, kui seda pole, ja haagitakse asukohas /boot/"
@@ -1724,13 +1949,15 @@ msgstr ""
 "emphasis> on ainuke, mis lubab kontrollida, kas seda on õigesti tehtud."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:158
+#: en/doPartitionDisks.xml:188
+#, fuzzy
 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 ""
 "Kui kasutate pärandsüsteemi (tuntud ka kui CSM või BIOS) GPT-kettaga, tuleb "
 "luua BIOS-e alglaadimispartitsioon, kui seda veel ei ole. See on umbes 1 MiB "
@@ -1738,36 +1965,29 @@ msgstr ""
 "linkend=\"diskdrake\"/>\" ja looge see nagu iga teine partitsioon, ainult et "
 "valige failisüsteemiks BIOS boot partition."
 
-#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:165
-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 align=\"center\" fileref="
-"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </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-doPartitionDisks4.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 ""
 "Mõned uuemad kettad kasutavad nüüd 4096-baidiseid loogilisi sektoreid "
 "varasema standardi, 512-baidiste sektorite asemel. Sobiva riistvara "
@@ -1778,18 +1998,38 @@ msgstr ""
 "partitsioneerida, kasutades mõnda muud partitsioneerimistööriista, näiteks "
 "<emphasis role=\"bold\">gparted</emphasis>."
 
-#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:189
-msgid "<emphasis role=\"bold\">Align to</emphasis> = MiB"
+#. type: Content of: <section><important><para>
+#: en/doPartitionDisks.xml:221
+#, fuzzy
+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 ""
+"Mõned uuemad kettad kasutavad nüüd 4096-baidiseid loogilisi sektoreid "
+"varasema standardi, 512-baidiste sektorite asemel. Sobiva riistvara "
+"puudumise tõttu ei ole paigaldusprogrammis kasutatavat "
+"partitsioneerimistööriista niisuguste ketastega testitud. Samuti on mõnes "
+"SSD-seadmes nüüdseks kasutusel kustutusblokk suurusega üle 1 MB. Seepärast "
+"soovitame juhul, kui Teil peaks olema niisugune seade, selle eelnevalt "
+"partitsioneerida, kasutades mõnda muud partitsioneerimistööriista, näiteks "
+"<emphasis role=\"bold\">gparted</emphasis>."
+
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:228
+#, fuzzy
+msgid "<emphasis>Align to</emphasis> = MiB"
 msgstr "<emphasis role=\"bold\">Align to</emphasis> = MiB"
 
-#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:191
-msgid "<emphasis role=\"bold\">Free space preceding (MiB)</emphasis> = 2"
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:232
+#, fuzzy
+msgid "<emphasis>Free space preceding (MiB)</emphasis> = 2"
 msgstr "<emphasis role=\"bold\">Free space preceding (MiB)</emphasis> = 2"
 
-#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:194
+#. type: Content of: <section><important><para>
+#: en/doPartitionDisks.xml:236
 msgid ""
 "Also make sure all partitions are created using an even number of megabytes."
 msgstr ""
@@ -1797,39 +2037,40 @@ msgstr ""
 "paarisarv."
 
 #. 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 "Paigaldamine Live-andmekandjalt"
 
 #. 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 "Jaanuar 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 "Mageia ametlik dokumentatsioon"
 
 #. 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
+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/"
@@ -1840,8 +2081,8 @@ msgstr ""
 "\">http://creativecommons.org/licenses/by-sa/3.0/</link>."
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml: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."
@@ -1852,8 +2093,7 @@ msgstr ""
 "neodoc.biz\">NeoDoc</link>."
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml: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</"
@@ -1864,15 +2104,15 @@ msgstr ""
 "ns6:href=\"https://wiki.mageia.org/en/Documentation_team"
 "\">dokumentatsioonimeeskonnaga</link>."
 
-#. 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 "
@@ -1882,42 +2122,50 @@ msgstr ""
 "millised ekraanid on näha, sõltub teie riistvarast ja paigaldamise käigus "
 "langetatud valikutest."
 
-#. 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 ""
+"Käsiraamatu on kirjutanud ja tõlkinud vabatahtlikud oma vabast ajast. Kui "
+"soovite kaasa aidata käsiraamatu paremaks muutmisele, võtke ühendust <link "
+"ns6:href=\"https://wiki.mageia.org/en/Documentation_team"
+"\">dokumentatsioonimeeskonnaga</link>."
+
 #. 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 "Paigaldamine DrakX'i abil"
 
 #. type: Content of: <book><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:9
+#: en/DrakX-cover.xml:20
 msgid "February 2014"
 msgstr "Veebruar 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
-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 "Õnnitleme!"
 
 #.  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
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
@@ -1926,27 +2174,28 @@ msgstr ""
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </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 ""
 "Olete lõpetanud <application>Mageia</application> paigaldamise ja "
 "seadistamise ning nüüd on turvaline eemaldada paigaldusandmekandja ja arvuti "
 "taaskäivitada."
 
 #. 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 ""
 "Pärast taaskäivitamist saab alglaaduri ekraanil valida käivitatava "
 "operatsioonisüsteemi, kui teil peaks neid arvutis üle ühe olema."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml: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."
@@ -1955,26 +2204,27 @@ msgstr ""
 "automaatselt teie uus Mageia."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:26
+#: en/exitInstall.xml:30
 msgid "Enjoy!"
 msgstr "Tundke rõõmu ja nautige!"
 
 #. 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 ""
 "Külastage veebilehte www.mageia.org, kui teil on küsimusi või kui soovite "
 "anda oma panuse Mageia edusse."
 
 #. type: Content of: <section><info><title>
-#: en/firewall.xml:3
+#: en/firewall.xml:7
 msgid "Firewall"
 msgstr "Tulemüür"
 
 #. 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 "
@@ -1986,16 +2236,17 @@ msgstr ""
 "võimaldab süsteemi vastavatele teenustele ligi pääseda ka internetist."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:12
+#: en/firewall.xml:16
+#, fuzzy
 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 ""
 "Vaikimisi ei ole ükski nupp märgitud, mis tähendab, et võrgust ei ole "
 "kättesaadav ükski süsteemi teenus. Nupul <emphasis role=\"bold\">Kõik "
@@ -2007,26 +2258,28 @@ msgstr ""
 "ajutiseks tühistamiseks näiteks testimise või silumise eesmärgil."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:21
+#: en/firewall.xml:25
+#, fuzzy
 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 ""
 "Kõigi muude märkekastide juures olev tekst peaks enda eest rääkima. Näiteks "
 "on mõtet märkida <emphasis role=\"bold\">CUPS-i server</emphasis>, kui "
 "soovite, et masinaga ühendatud printerid oleksid kättesaadavad ka võrgust."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:25
+#: en/firewall.xml:29
 msgid "<emphasis role=\"bold\">Advanced</emphasis>"
 msgstr "<emphasis role=\"bold\">Muud valikud</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:27
+#: en/firewall.xml:31
+#, fuzzy
 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 ""
 "Nupule <emphasis role=\"bold\">Muud valikud</emphasis> klõpsates avaneb "
@@ -2034,12 +2287,12 @@ msgstr ""
 "eraldatult järgmiselt"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:31
+#: en/firewall.xml:35
 msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
 msgstr "<emphasis>&lt;pordi-number>/&lt;protokoll></emphasis>"
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml: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 "
@@ -2050,7 +2303,7 @@ msgstr ""
 "<emphasis>RFC-433</emphasis>;"
 
 #. 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."
@@ -2059,7 +2312,7 @@ msgstr ""
 "<emphasis>UDP</emphasis> - teenuse kasutatav internetiprotokoll."
 
 #. 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>."
@@ -2068,7 +2321,7 @@ msgstr ""
 "<emphasis>873/tcp</emphasis>."
 
 #. 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."
@@ -2077,7 +2330,7 @@ msgstr ""
 "2 määrata."
 
 #. type: Content of: <section><info><title>
-#: en/formatPartitions.xml:3
+#: en/formatPartitions.xml:10
 msgid "Formatting"
 msgstr "Vormindamine"
 
@@ -2085,14 +2338,16 @@ msgstr "Vormindamine"
 #.  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\" fileref="
 "\"dx2-formatPartitions.png\" xml:id=\"formatPartitions-im1\" align=\"center"
@@ -2101,7 +2356,7 @@ msgstr ""
 "\" fileref=\"live-formatPartitions.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:24
+#: en/formatPartitions.xml:35
 msgid ""
 "Here you can choose which partition(s) you wish to format. Any data on "
 "partitions <emphasis>not</emphasis> marked for formatting will be preserved."
@@ -2111,27 +2366,31 @@ msgstr ""
 "säilivad."
 
 #. 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 ""
 "Üldjuhul on vaja vormindada vähemalt partitsioonid, mille DrakX on valinud."
 
 #. 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 ""
 "Kui klõpsata <guibutton>Muud valikud</guibutton>, saab valida partitsioonid, "
 "millel kontrollitakse niinimetatud <emphasis>riknenud plokke.</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 ""
 "Kui te pole kindel, et olete langetanud õige valiku, klõpsake "
 "<guibutton>Tagasi</guibutton>, veel kord <guibutton>Tagasi</guibutton> ja "
@@ -2139,21 +2398,22 @@ msgstr ""
 "saate uurida, mis partitsioonidel leidub."
 
 #. 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 ""
 "Kui olete oma valikus kindel, klõpsake jätkamiseks <guibutton>Edasi</"
 "guibutton>."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:10
+#: en/installer.xml:14
 msgid "DrakX, the Mageia Installer"
 msgstr "Mageia paigaldusprogramm DrakX"
 
 #. 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 "
@@ -2163,339 +2423,251 @@ msgstr ""
 "kasutaja, on Mageia paigaldusprogramm loodud nii, et paigaldamine või "
 "uuendamine oleks kõigile võimalikult lihtne."
 
-#. 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 ""
-"Avamenüüs näete mitmeid valikuid, kuid vaikimisi valitu käivitab "
-"paigaldusprogrammi, mida tavaliselt ongi vaja."
-
 #. type: Content of: <section><section><title>
-#: en/installer.xml:22
-msgid "Installation Welcome Screen"
-msgstr "Paigaldusprogrammi avaekraan"
-
-#. type: Content of: <section><section><section><title>
-#: en/installer.xml:25
-msgid "Using a Mageia DVD"
-msgstr "Mageia DVD kasutamine"
+#: en/installer.xml:20
+msgid "The installation steps"
+msgstr "Paigaldamise etapid"
 
-#. 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 ""
-"Siin on näha Mageia DVD vaikimisi tervitusekraanid: esimest näeb UEFI "
-"süsteemi, teist pärandsüsteemi korral."
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:32
-msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
+"Paigaldamine on jagatud mitmeks etapiks, mille loetelu näeb ekraani "
+"külgpaneelil vasakul."
 
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:37
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/installer.xml:28
+#, fuzzy
 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 ""
-"Sellel ekraanil pääseb valikute juurde, kui vajutada tähte <emphasis role="
-"\"bold\">e</emphasis>, mis avab redigeerimisrežiimi. Nähtavale ekraanile "
-"tagasipääsemiseks vajutage klahvi <emphasis role=\"bold\">Esc</emphasis>, et "
-"väljuda salvestamata, või klahvi <emphasis role=\"bold\">Ctrl</emphasis> või "
-"<emphasis role=\"bold\">F10</emphasis>, et väljuda tehtud valikuid "
-"salvestades."
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:45
-msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
+"Igal etapil kohtate üht või enamat ekraani, millel võib olla ka nupp "
+"<guibutton>Muud valikud</guibutton>, mis avab täiendavad ja harvemini "
+"vajalikud valikud."
 
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:50
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/installer.xml:33
+#, fuzzy
 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 ""
-"Sellel ekraanil on võimalik määrata mõned isiklikud eelistused (pange "
-"tähele, et valikud <emphasis role=\"bold\">F1</emphasis> kuni <emphasis role="
-"\"bold\">F6</emphasis> on kasutusel ainult pärandsüsteemis):"
+"Enamikul ekraanidel on nupp <guibutton>Abi</guibutton>, mis selgitab antud "
+"etappi põhjalikumalt."
 
-#. 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 ""
-"Kõigi <emphasis role=\"bold\">F2</emphasis> kuni <emphasis role=\"bold\">F6</"
-"emphasis> valikute korral näeb asjakohast abi, kui vajutada <emphasis role="
-"\"bold\">F1</emphasis>"
+"Kui soovite mingil hetkel paigaldamise katkestada, võite ka teha arvutile "
+"taaskäivituse, aga palun mõelge enne seda hoolikalt järele. Kui partitsioon "
+"on vormindatud või uuendusi on hakatud paigaldama, ei ole arvuti enam "
+"varasemas olekus ning taaskäivitamise tulemus võib olla mittetöötav masin. "
+"Kui te ikkagi olete kindel, et just taaskäivitus on õige samm, minge "
+"tekstiterminali, vajutades korraga kolme klahvi <guibutton>Alt Ctrl F2</"
+"guibutton>. Seejärel vajutage taaskäivitamiseks korraga klahve "
+"<guibutton>Alt Ctrl Delete</guibutton>."
 
-#. 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 ""
-"<emphasis role=\"bold\">F2</emphasis> vajutamisel kasutab paigaldusprogramm "
-"paigaldamisel valitavat keelt."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:67
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+#. type: Content of: <section><section><title>
+#: en/installer.xml:48
+msgid "Installation Welcome Screen"
+msgstr "Paigaldusprogrammi avaekraan"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:72
+#. type: Content of: <section><section><para>
+#: en/installer.xml:49
 msgid ""
-"Use the arrow keys to select the language then press <emphasis role=\"bold"
-"\">Enter</emphasis>."
+"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 ""
-"Valige nooleklahvidega liikudes keel ja vajutage klahvile <emphasis role="
-"\"bold\">Enter</emphasis>."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:77
+#. type: Content of: <section><section><para>
+#: en/installer.xml:52
+#, fuzzy
 msgid ""
-"If needed, change the screen resolution by pressing <emphasis role=\"bold"
-"\">F3</emphasis> (Legacy mode only)."
+"The welcome menu screen has various options, however the default option will "
+"start the installer, and is normally all that you will need."
 msgstr ""
-"Muuta ekraanilahutust klahvile<emphasis role=\"bold\"> F3</emphasis> "
-"vajutades (ainult pärandsüsteemis)"
+"Avamenüüs näete mitmeid valikuid, kuid vaikimisi valitu käivitab "
+"paigaldusprogrammi, mida tavaliselt ongi vaja."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:81
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:56
+msgid "Legacy (BIOS) Systems"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:88
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:58
+#, fuzzy
 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)."
+"<imageobject> <imagedata fileref=\"dx-welcome.png\" align=\"center\"/> </"
+"imageobject>"
 msgstr ""
-"Kui paigaldamisel peaks tekkima raskusi, võib üritada muuta vaikeseadistusi, "
-"valides <emphasis role=\"bold\">F6</emphasis> <emphasis role=\"bold\">Kernel "
-"Options</emphasis> (UEFI sõsteemi korral vajutage <emphasis role=\"bold\">e</"
-"emphasis>)."
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/installer.xml:96
-msgid "Default: It doesn't alter anything in the default options."
-msgstr "Vaikimisi: vaikimisi võtmeid ei muudeta."
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/installer.xml:101
-msgid ""
-"Safe Settings: Priority is given to the safer options at the price of a "
-"performance detriment."
-msgstr "Ohutud sätted: jõudlusele eelistatakse ohutust."
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/installer.xml:106
-msgid ""
-"No ACPI: (Advanced Configuration and Power Interface): Power management "
-"features are not used."
-msgstr "Ilma ACPI-ta: toitehalduse valikuid ei arvestata."
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\"/"
+"> </imageobject>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/installer.xml:113
-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."
+#. type: Content of: <section><section><section><itemizedlist><title>
+#: en/installer.xml:63
+msgid "Menu"
 msgstr ""
-"Ilma kohaliku APIC-ta: see puudutab CPU katkestusi. Valige see siis, kui "
-"seda nõutakse."
 
-#. 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:66
 msgid ""
-"When you select one of these entries, it modifies the default options "
-"displayed in the <guilabel>Boot Options</guilabel> line."
+"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 ""
-"Mõnda neist valikutest valides muutuvad vaikimisi võtmed, mida näeb real "
-"<guilabel>Alglaadimise sätted</guilabel>."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:125
-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 ""
-"Mõne Mageia väljalaske puhul võib juhtuda, et klahviga <emphasis role=\"bold"
-"\">F6</emphasis> valitud kirjeid ei näe real <guilabel>Alglaadimise sätted</"
-"guilabel>, aga neid siiski arvestatakse."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:69
+#, fuzzy
+msgid "<emphasis role=\"bold\">Rescue System</emphasis>"
+msgstr "<emphasis role=\"bold\">Server</emphasis>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:132
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:70
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+"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 ""
-"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:139
-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 ""
-"Klahvile <emphasis role=\"bold\">F1</emphasis> vajutades ilmub uus aken "
-"saadaolevate võtmetega. Valige neist vajalik ja vajutage klahvile <emphasis "
-"role=\"bold\">Enter</emphasis> üksikasjade nägemiseks või klahvile <emphasis "
-"role=\"bold\">Esc</emphasis> tervitusekraani juurde naasmiseks."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:75
+#, fuzzy
+msgid "<emphasis role=\"bold\">Memory Test</emphasis>"
+msgstr "<emphasis role=\"bold\">Server</emphasis>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:146
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:76
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+"Test the installed RAM by performing multiple read and write operations. "
+"Reboot to end the test."
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:151
-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 ""
-"Siin on näidatud võtme splash üksikasjaliku kirjelduse aken. Vajutage "
-"klahvile <emphasis role=\"bold\">Esc</emphasis> või valige <guilabel>Tagasi "
-"alglaadimise sätete juurde</guilabel>, et minna tagasi võtmete loendisse. "
-"Võtmeid saab lisada käsitsi reale <guilabel>Alglaadimise sätted</guilabel>."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:80
+#, fuzzy
+msgid "<emphasis role=\"bold\">F2: Language</emphasis>"
+msgstr "<emphasis role=\"bold\">Muud valikud</emphasis>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:158
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.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-welcomeHelp2.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:164
-msgid ""
-"The help is translated in the chosen language with <emphasis role=\"bold"
-"\">F2</emphasis>."
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:86
+msgid "UEFI Systems"
 msgstr ""
-"Abi tõlgitakse keelde, mis on valitud klahviga <emphasis role=\"bold\">F2</"
-"emphasis>."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:168
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:87
+#, fuzzy
 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>"
+"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 ""
-"Täpsemat teavet kerneli võtmete kohta tavapärases ja UEFI süsteemis leiab "
-"meie Wiki-lehelt <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 "Paigaldamise etapid"
+"Sellel ekraanil pääseb valikute juurde, kui vajutada tähte <emphasis role="
+"\"bold\">e</emphasis>, mis avab redigeerimisrežiimi. Nähtavale ekraanile "
+"tagasipääsemiseks vajutage klahvi <emphasis role=\"bold\">Esc</emphasis>, et "
+"väljuda salvestamata, või klahvi <emphasis role=\"bold\">Ctrl</emphasis> või "
+"<emphasis role=\"bold\">F10</emphasis>, et väljuda tehtud valikuid "
+"salvestades."
 
-#. type: Content of: <section><section><para>
-#: en/installer.xml:179
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:92
+#, 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."
+"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+"imageobject>"
 msgstr ""
-"Paigaldamine on jagatud mitmeks etapiks, mille loetelu näeb ekraani "
-"külgpaneelil vasakul."
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\"/"
+"> </imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/installer.xml:182
-msgid ""
-"Each step has one or more screens which may also have <guibutton>Advanced</"
-"guibutton> sections with extra, less commonly required, options."
+#. 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 ""
-"Igal etapil kohtate üht või enamat ekraani, millel võib olla ka nupp "
-"<guibutton>Muud valikud</guibutton>, mis avab täiendavad ja harvemini "
-"vajalikud valikud."
 
-#. type: Content of: <section><section><para>
-#: en/installer.xml:186
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:99
+#, fuzzy
+msgid "<emphasis role=\"bold\">Install:</emphasis> Start the Install process"
+msgstr "<emphasis role=\"bold\">Align to</emphasis> = MiB"
+
+#. 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 ""
-"Enamikul ekraanidel on nupp <guibutton>Abi</guibutton>, mis selgitab antud "
-"etappi põhjalikumalt."
 
-#. 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 ""
-"Kui soovite mingil hetkel paigaldamise katkestada, võite ka teha arvutile "
-"taaskäivituse, aga palun mõelge enne seda hoolikalt järele. Kui partitsioon "
-"on vormindatud või uuendusi on hakatud paigaldama, ei ole arvuti enam "
-"varasemas olekus ning taaskäivitamise tulemus võib olla mittetöötav masin. "
-"Kui te ikkagi olete kindel, et just taaskäivitus on õige samm, minge "
-"tekstiterminali, vajutades korraga kolme klahvi <guibutton>Alt Ctrl F2</"
-"guibutton>. Seejärel vajutage taaskäivitamiseks korraga klahve "
-"<guibutton>Alt Ctrl Delete</guibutton>."
+"Kui olete süsteemi laadinud USB-pulgalt, näeb veel kaht rida, mis on muidu "
+"samasugused nagu kaks esimest, ainult et lisatud on \"USB\". Siis tuleb "
+"valida üks neist."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:203
+#: en/installer.xml:115
 msgid "Installation Problems and Possible Solutions"
 msgstr "Paigaldamisprobleemid ja nende võimalikud lahendused"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:206
+#: en/installer.xml:117
 msgid "No Graphical Interface"
 msgstr "Graafiline liides puudub"
 
 #. 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 ""
 "Pärast avaekraani ei tulegi keele valiku ekraani ette. See võib juhtuda mõne "
 "graafikakaardi ja vanema süsteemi korral.  Proovige kasutada madalamat "
 "ekraanilahutust, kirjutades käsureale <code>vgalo</code>."
 
 #. 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 ""
 "Kui riistvara on väga vana, ei pruugi graafiline paigaldamine üldse võimalik "
 "olla. Sel juhul võib proovida tekstipõhist paigaldamist. Selleks vajutage "
@@ -2506,18 +2678,19 @@ msgstr ""
 "tekstipõhise paigaldamisega."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:230
+#: en/installer.xml:138
 msgid "The Install Freezes"
 msgstr "Paigaldamine hangub"
 
 #. 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 ""
 "Kui süsteem paistab paigaldamise käigus hanguvat, võib olla raskusi "
 "riistvara tuvastamisega. Sel juhul võib riistvara automaatse tuvastamise "
@@ -2526,17 +2699,19 @@ msgstr ""
 "võtmetega."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:240
+#: en/installer.xml:146
 msgid "RAM problem"
 msgstr "RAM-i probleem"
 
 #. 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 ""
 "Neid läheb väga harva vaja, kuid mõnel juhul võib riistvara teatada valesti "
 "saadaoleva mälu (RAM) suuruse. Selle käsitsi määramiseks tuleb kasutada "
@@ -2544,19 +2719,20 @@ msgstr ""
 "<code>mem=256M</code> määrab, et kasutada on 256 MB mälu."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:249
+#: en/installer.xml:154
 msgid "Dynamic partitions"
 msgstr "Dünaamilised partitsioonid"
 
 #. 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 ""
 "Kui olete valinud oma kõvaketta vorminguks Microsoft Windowsi all <emphasis "
 "role=\"bold\">dynamic</emphasis> tavalise <emphasis role=\"bold\">basic</"
@@ -2567,18 +2743,15 @@ msgstr ""
 "aspx</link>."
 
 #. type: Content of: <section><info><title>
-#: en/installUpdates.xml:3
+#: en/installUpdates.xml:16
 msgid "Updates"
 msgstr "Uuendused"
 
-#.  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 ""
@@ -2587,96 +2760,112 @@ 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 ""
 "Võimalik, et pärast <application>Mageia</application> väljalaske ilmumist on "
 "mõningaid pakette uuendatud või parandatud."
 
-#. type: Content of: <section><para>
-#: en/installUpdates.xml:24
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installUpdates.xml:30
 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>Yes</emphasis> if you wish to download and install them"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installUpdates.xml:35
+#, fuzzy
+msgid ""
+"Select <emphasis>No</emphasis> if you don't want to do this now, or if you "
 "aren't connected to the Internet"
 msgstr ""
 "Valige <guilabel>Jah</guilabel>, kui soovite sellised paketid alla laadida "
 "ja paigaldada, või <guilabel>Ei</guilabel>, kui te seda praegu ei soovi või "
 "kui teil puudub parajasti internetiühendus."
 
-#. type: Content of: <section><para>
-#: en/installUpdates.xml:29
-msgid "Press <guibutton>Next</guibutton> to continue"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installUpdates.xml:40
+#, fuzzy
+msgid "Press <emphasis>Next</emphasis> to continue"
 msgstr "Seejärel klõpsake jätkamiseks <guibutton>Edasi</guibutton>."
 
 #. type: Content of: <section><info><title>
-#: en/login.xml:1
-msgid "Login screen"
+#: en/login.xml:4
+#, fuzzy
+msgid "Login Screen"
 msgstr "Sisselogimisekraan"
 
 #. 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-i sisselogimisekraan"
 
 #. 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 "Lõpuks ilmub sisselogimisekraan."
 
 #. 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 ""
 "Kirjutage oma kasutajanimi ja parool ning mõne hetke pärast ilmub teie ette "
 "juba KDE või GNOME töölaud vastavalt sellele, millist live-andmekandjat te "
 "kasutate. Nüüd võite oma vastset Mageiat kasutama hakata."
 
 #. 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 ""
 "Rohkem teavet leiab <link linkend=\"https://wiki.mageia.org/en/Category:"
 "Documentation\">Mageia wikist</link>."
 
 #. type: Content of: <section><info><title>
-#: en/media_selection.xml:3
-msgid "Media Selection (Nonfree)"
-msgstr "Andmekandjate valik (mittevaba tarkvara)"
+#: 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
+#: en/media_selection.xml:24
+#, fuzzy
 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=\"media_selection-im1\" align="
-"\"center\" revision=\"1\" fileref=\"dx2-media_selection.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-bestTime.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"bestTime-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 "
@@ -2689,7 +2878,7 @@ msgstr ""
 "etappidel võimalik paigaldada."
 
 #. 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."
@@ -2698,12 +2887,13 @@ msgstr ""
 "see sisaldab distributsiooni põhikomponente."
 
 #. 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 ""
 "Hoidla <emphasis>Nonfree</emphasis> (mittevaba tarkvara) sidaldab pakette, "
@@ -2713,7 +2903,7 @@ msgstr ""
 "draivereid, mitmesuguste WiFi-kaartide püsivara jms."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:40
+#: en/media_selection.xml:50
 msgid ""
 "The <emphasis>Tainted</emphasis> repository includes packages released under "
 "a free license. The main criteria for placing packages in this repository is "
@@ -2734,32 +2924,14 @@ msgid "Minimal Install"
 msgstr "Minimaalne paigaldus"
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:11
-msgid ""
-"You can choose a Minimal Installation by de-selecting everything in the "
-"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"/>."
-msgstr ""
-"Kui paketigruppide ekraanil jätta kõik valimata, saab kasutada minimaalset "
-"paigaldust, vt. <xref linkend=\"choosePackageGroups\"/>"
-
-#. type: Content of: <section><para>
-#: en/minimal-install.xml:14
-msgid ""
-"If desired, you can additionally tick the <emphasis role=\"bold\">Individual "
-"package selection</emphasis> option in the same screen."
-msgstr ""
-"Soovi korral võite samal ekraanil ära märkida valiku <emphasis role=\"bold"
-"\">Valik paketthaaval</emphasis>."
-
-#. 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 ""
 "Minimaalne paigaldus on mõeldud neile, kel mõlgub <application>Mageia</"
 "application> jaoks meeles midagi erilist, näiteks server või spetsiaalne "
@@ -2767,32 +2939,57 @@ msgstr ""
 "\">pakettide ükshaaval</emphasis> valimisega, vt. <xref linkend="
 "\"choosePackagesTree\"/>."
 
-#. type: Content of: <section><para>
-#: en/minimal-install.xml:22
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/minimal-install.xml:24
+#, fuzzy
+msgid ""
+"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 ""
+"Kui paketigruppide ekraanil jätta kõik valimata, saab kasutada minimaalset "
+"paigaldust, vt. <xref linkend=\"choosePackageGroups\"/>"
+
+#. 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 ""
+"Soovi korral võite samal ekraanil ära märkida valiku <emphasis role=\"bold"
+"\">Valik paketthaaval</emphasis>."
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/minimal-install.xml:33
+#, 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."
+"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 ""
 "Kui valite niisuguse paigaldamise, saab järgmisel ekraanil üht-teist "
 "täpsustada, näiteks lasta paigaldada ka dokumentatsioon või X."
 
-#. type: Content of: <section><para>
-#: en/minimal-install.xml:26
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/minimal-install.xml:37
+#, fuzzy
 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 ""
 "Kui märkida <emphasis role=\"bold\">X'iga</emphasis>, paigaldatakse ka "
 "kergekaaluline töökeskkond IceWM."
 
 #. 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 ""
 "Baasdokumentatsioon tähendab man- ja info-lehekülgi. See sisaldab <link "
 "xlink:href=\"http://www.tldp.org/manpages/man.html\">Linux Documentation "
@@ -2800,7 +2997,7 @@ msgstr ""
 "gnu.org/software/coreutils/manual/\">GNU coreutils</link> info-lehekülgi."
 
 #. type: Content of: <section><mediaobject>
-#: en/minimal-install.xml:35
+#: en/minimal-install.xml:48
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"minimal-install-im1\" align="
 "\"center\" fileref=\"dx2-minimal-install.png\" revision=\"1\"/> </"
@@ -2812,31 +3009,40 @@ msgstr ""
 
 #. type: Content of: <section><info><title>
 #: en/misc-params.xml:3
-msgid "Summary of miscellaneous parameters"
-msgstr "Seadistuste kokkuvõte"
+#, fuzzy
+msgid "Configuration Summary"
+msgstr "Heli seadistamine"
 
 #.  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=\"dx2-summaryTop.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 langetab teie süsteemi seadistamisel mõistlikud otsused vastavalt Teie "
 "valikutele ja tuvastatud riistvarale. Siin saab neid seadistusi üle vaadata "
 "ja vajaduse korral muuta, klõpsates <guibutton>Seadista</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:"
@@ -2845,47 +3051,50 @@ msgstr ""
 "mõnel erandjuhul:"
 
 #. 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 "on teada, et vaikeseadistused tekitavad probleeme"
 
 #. 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 "vaikeseadistusi on juba proovitud ja need ei andnud soovitud tulemust"
 
 #. type: Content of: <section><note><para><itemizedlist><listitem><para>
-#: en/misc-params.xml:32
-msgid ""
-"some other factor mentionned in the detailed sections below is an issue."
+#: en/misc-params.xml:41
+#, fuzzy
+msgid "some other factor mentioned in the detailed sections below is an issue"
 msgstr "veel midagi, millest on üksikasjalikumalt juttu allpool"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:40
+#: en/misc-params.xml:49
 msgid "System parameters"
 msgstr "Süsteemi parameetrid"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:45
-msgid "<guilabel>Timezone</guilabel>"
-msgstr "<guilabel>Ajavöönd</guilabel>"
+#: en/misc-params.xml:54
+#, fuzzy
+msgid "<emphasis role=\"bold\">Timezone</emphasis>"
+msgstr "<emphasis role=\"bold\">Server</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 määrab vastavalt valitud keelele ajavööndi. Soovi korral saab seda "
 "muuta. Vt ka <xref linkend=\"configureTimezoneUTC\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:53
-msgid "<guilabel>Country / Region</guilabel>"
-msgstr "<guilabel>Riik / Piirkond</guilabel>"
+#: en/misc-params.xml:62
+#, fuzzy
+msgid "<emphasis role=\"bold\">Country / Region</emphasis>"
+msgstr "<emphasis role=\"bold\">Tööjaam</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:56
+#: en/misc-params.xml:64
 msgid ""
 "If the selected country is wrong, it is very important that you correct the "
 "setting.  See <xref linkend=\"selectCountry\"/>"
@@ -2894,48 +3103,51 @@ msgstr ""
 "Vt <xref linkend=\"selectCountry\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:62
-msgid "<guilabel>Bootloader</guilabel>"
-msgstr "<guilabel>Alglaadur</guilabel>"
+#: en/misc-params.xml:70
+#, fuzzy
+msgid "<emphasis role=\"bold\">Bootloader</emphasis>"
+msgstr "<emphasis role=\"bold\">Server</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 langetab tavaliselt alglaaduri osas hea ja õige valiku."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:67
-msgid "Do not change anything, unless you know how to configure GRUB2"
+#: en/misc-params.xml:75
+#, fuzzy
+msgid ""
+"Do not change anything, unless you know how to configure GRUB2. For more "
+"information, see <xref linkend=\"setupBootloader\"/>"
 msgstr ""
 "Kui Te just väga täpselt ei tea, kuidas Grub2 seadistada, ei tasu siin "
 "midagi muuta."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:70
-msgid "For more information, see <xref linkend=\"setupBootloader\"/>"
-msgstr "Täpsemalt kõneleb sellest <xref linkend=\"setupBootloader\"/>"
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:75
-msgid "<guilabel>User management</guilabel>"
-msgstr "<guilabel>Kasutajate haldamine</guilabel>"
+#: en/misc-params.xml:83
+#, fuzzy
+msgid "<emphasis role=\"bold\">User management</emphasis>"
+msgstr "<emphasis role=\"bold\">Server</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 ""
 "Siin saab lisada uusi kasutajaid. Nad kõik saavad oma isikliku <literal>/"
 "home</literal> kataloogi."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:84
-msgid "<guilabel>Services</guilabel>:"
-msgstr "<guilabel>Teenused</guilabel>"
+#: en/misc-params.xml:91
+#, fuzzy
+msgid "<emphasis role=\"bold\">Services</emphasis>"
+msgstr "<emphasis role=\"bold\">Server</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:86
+#: en/misc-params.xml:93
 msgid ""
 "System services refer to those small programs which run in the background "
 "(daemons).  This tool allows you to enable or disable certain processes."
@@ -2944,31 +3156,29 @@ msgstr ""
 "(deemonid). See tööriist võimaldab teatavaid ülesandeid lubada või keelata."
 
 #. 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 ""
 "Enne millegi muutmist tuleks hoolikalt mõelda - eksimuse korral ei pruugi "
 "arvuti enam korralikult töötada."
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:94
-msgid "For more information, see <xref linkend=\"configureServices\"/>"
-msgstr "Täpsemalt kõneleb sellest <xref linkend=\"configureServices\"/>"
-
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:101
+#: en/misc-params.xml:106
 msgid "Hardware parameters"
 msgstr "Riistvara parameetrid"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:106
-msgid "<guilabel>Keyboard</guilabel>:"
-msgstr "<guilabel>Klaviatuur</guilabel>"
+#: en/misc-params.xml:111
+#, fuzzy
+msgid "<emphasis role=\"bold\">Keyboard</emphasis>"
+msgstr "<emphasis role=\"bold\">Server</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:108
+#: en/misc-params.xml:113
 msgid ""
 "Configure your keyboard layout according to your location, language and type "
 "of keyboard."
@@ -2977,7 +3187,7 @@ msgstr ""
 "asukohast, keelest ja klaviatuuritüübist."
 
 #. 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."
@@ -2986,12 +3196,13 @@ msgstr ""
 "pidage meeles, et muutuvad ka paroolid."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:119
-msgid "<guilabel>Mouse</guilabel>:"
-msgstr "<guilabel>Hiir</guilabel>"
+#: en/misc-params.xml:124
+#, fuzzy
+msgid "<emphasis role=\"bold\">Mouse</emphasis>"
+msgstr "<emphasis role=\"bold\">Server</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."
@@ -3000,38 +3211,41 @@ msgstr ""
 "puuteplaate jms."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:126
-msgid "<guilabel>Sound card</guilabel>:"
-msgstr "<guilabel>Helikaart</guilabel>"
+#: en/misc-params.xml:131
+#, fuzzy
+msgid "<emphasis role=\"bold\">Sound card</emphasis>"
+msgstr "<emphasis role=\"bold\">Muud valikud</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:129
+#: 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 ""
-"Paigaldusprogramm kasutab vaikimisi draiverit, kui see on olemas. Võimalus "
-"valida teist draiverit antakse ainult siis, kui helikaardile on olemas mitu "
-"draiverit, aga ükski neist ei ole vaikimisi draiver."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:137
-msgid "<guilabel>Graphical interface</guilabel>:"
-msgstr "<guilabel>Graafiline kasutajaliides</guilabel>"
+#: en/misc-params.xml:144
+#, fuzzy
+msgid "<emphasis role=\"bold\">Graphical interface</emphasis>"
+msgstr "<emphasis role=\"bold\">Graafiline keskkond</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 "Siin saab seadistada graafikakaarte ja monitore."
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:143
-msgid "For more information, see <xref linkend=\"configureX_chooser\"/>."
-msgstr "Täpsemalt kõneleb sellest <xref linkend=\"configureX_chooser\"/>."
-
 #. type: Content of: <section><section><mediaobject>
-#: en/misc-params.xml:149
+#: en/misc-params.xml:155
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
 "\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
@@ -3040,21 +3254,23 @@ msgstr ""
 "\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"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 "Võrgu- ja internetiparameetrid"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:163
-msgid "<guilabel>Network</guilabel>:"
-msgstr "<guilabel>Võrk</guilabel>"
+#: en/misc-params.xml:169
+#, fuzzy
+msgid "<emphasis role=\"bold\">Network</emphasis>"
+msgstr "<emphasis role=\"bold\">Server</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 ""
 "Siin saab seadistada võrgu, kuid võrgukaartide korral, mis kasutavad "
@@ -3063,7 +3279,7 @@ msgstr ""
 "mittevaba tarkvara hoidlate kasutamist."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:172
+#: en/misc-params.xml:178
 msgid ""
 "When you add a network card, do not forget to set your firewall to monitor "
 "that interface as well."
@@ -3072,81 +3288,90 @@ msgstr ""
 "kaarti jälgitaks."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:179
-msgid "<guilabel>Proxies</guilabel>:"
-msgstr "<guilabel>Puhverserverid</guilabel>"
+#: en/misc-params.xml:185
+#, fuzzy
+msgid "<emphasis role=\"bold\">Proxies</emphasis>"
+msgstr "<emphasis role=\"bold\">Server</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 ""
 "Puhverserver on omamoodi vahendaja Teie arvuti ja interneti vahel. Siin saab "
 "panna arvuti kasutama puhverservereid."
 
 #. 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 ""
 "Vajalike parameetrite täpsustamiseks võib olla vajalik pidada nõu oma "
 "süsteemiadministraatoriga."
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:195
+#: en/misc-params.xml:201
 msgid "Security"
 msgstr "Turvalisus"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:200
-msgid "<guilabel>Security Level</guilabel>:"
-msgstr "<guilabel>Turbetase</guilabel>"
+#: en/misc-params.xml:206
+#, fuzzy
+msgid "<emphasis role=\"bold\">Security Level</emphasis>"
+msgstr "<emphasis role=\"bold\">Server</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 ""
 "Siin saab määrata oma arvuti turbetaseme. Enamasti peaks normaalseks "
 "kasutamiseks kõlbama vaikimisi seadistused (valik Standardne)."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:207
-msgid "Check the option which best suits your usage."
-msgstr "Valige tase, mis paistab Teie vajadusi kõige paremini rahuldavat."
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:212
-msgid "<guilabel>Firewall</guilabel>:"
-msgstr "<guilabel>Tulemüür</guilabel>"
+#: en/misc-params.xml:215
+#, fuzzy
+msgid "<emphasis role=\"bold\">Firewall</emphasis>"
+msgstr "<emphasis role=\"bold\">Server</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:214
+#: en/misc-params.xml:217
 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."
+"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 ""
-"Tulemüür on mõeldud tõkkeks Teie tähtsate andmete ja internetis luuravate "
-"röövloomade vahel, kes üritavad neid varastada või rikkuda."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:218
+#: en/misc-params.xml:223
 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\"/>."
+"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 ""
-"Valige teenused, millel lubate oma süsteemile ligi pääseda. Valik sõltub "
-"mõistagi sellest, milleks Te oma arvutit kasutada soovite. Täpsemat teavet "
-"vt <xref linkend=\"firewall\"/>."
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/misc-params.xml:229
+#, fuzzy
+msgid "For more information, see <xref linkend=\"firewall\"/>."
+msgstr "Täpsemalt kõneleb sellest <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 ""
 "Pange tähele, et kõige lubamine (st tulemüür puudub) võib olla väga ohtlik."
 
@@ -3156,36 +3381,51 @@ msgid "Reboot"
 msgstr "Taaskäivitamine"
 
 #. 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 ""
 "Kui alglaadur on paigaldatud, palutakse teil arvuti seisata, Live-CD "
 "eemaldada ja arvuti taaskäivitada. Klõpsake nupule <emphasis role=\"bold"
 "\"><guibutton>Lõpeta</guibutton></emphasis> ja talitage, nagu nõutud - ning "
 "<emphasis role=\"bold\">just sellises järjekorras!</emphasis>"
 
+#. 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
-msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
+#: en/reboot.xml:12
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot2.png\"/> </"
+"imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"live-reboot2.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 ""
 "Taaskäivitamise järel näete allalaadimise edenemisribasid. Need annavad "
 "märku, et parajasti laaditakse alla tarkvaraallikaid (vt täpsemalt "
 "tarkvarahalduse osast)."
 
 #. type: Content of: <section><mediaobject>
-#: en/reboot.xml:17
+#: en/reboot.xml:19
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
 "reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
@@ -3214,46 +3454,54 @@ msgstr ""
 "<application>Mageia</application> paigaldusele."
 
 #. type: Content of: <section><info><title>
-#: en/securityLevel.xml:3
+#: en/securityLevel.xml:10
 msgid "Security Level"
 msgstr "Turbetase"
 
 #.  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=\"securityLevel-im1\" align="
-"\"center\" fileref=\"dx2-securityLevel.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
 msgid ""
 "<emphasis role=\"bold\">Please choose the desired security level</emphasis>"
 msgstr "<emphasis role=\"bold\">Palun valige sobiv turbetase</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:19
+#: en/securityLevel.xml:29
+msgid ""
+"<emphasis>Standard</emphasis> is the default, and recommended setting for "
+"the average user."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:32
+#, fuzzy
 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>Secure</emphasis> will create a highly protected system - for "
+"instance if the system is to be used as a public server."
 msgstr ""
 "<emphasis role=\"bold\">Standardne</emphasis> on vaikevalik ja soovitatav "
 "tavalisele kasutajale. <emphasis role=\"bold\">Turvaline</emphasis> loob "
 "väga kaitstud süsteemi, mida on vaja näiteks avaliku serveri ülesseadmisel."
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:24
+#: en/securityLevel.xml:36
 msgid "<emphasis role=\"bold\">Security Administrator</emphasis>"
 msgstr "<emphasis role=\"bold\">Turbeadministraator</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 "
@@ -3264,16 +3512,17 @@ msgstr ""
 "süsteemiadministraatori teavitamist."
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:31
+#: en/securityLevel.xml:43
+#, fuzzy
 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 ""
 "Hea ja hõlpus viis on kirjutada siia &lt;kasutaja>@localhost - kus &lt;"
 "kasutaja> on selle kasutaja kasutajanimi, kes neid teateid saama peab."
 
 #. 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 "
@@ -3285,26 +3534,27 @@ msgstr ""
 "saama!"
 
 #. 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 ""
 "Pärast paigaldamist on alati võimalik turvalisusega seotud seadistusi muuta "
 "Mageia juhtimiskeskuse sektsioonis <guilabel>Turvalisus</guilabel>."
 
 #. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:6
+#: en/SelectAndUseISOs2.xml:15
 msgid "Select and use ISOs"
 msgstr "ISO-tõmmise valimine ja kasutamine"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:9
+#: en/SelectAndUseISOs2.xml:18
 msgid "Introduction"
 msgstr "Sissejuhatus"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:10
+#: en/SelectAndUseISOs2.xml:19
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
 "which image best suits your needs."
@@ -3313,61 +3563,112 @@ msgstr ""
 "tõmmist, mis vastab teie vajadustele."
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:12
-msgid "There are two families of media:"
+#: en/SelectAndUseISOs2.xml:21
+#, fuzzy
+msgid "There are three types of installation media:"
 msgstr "Andmekandjaid on kaht tüüpi:"
 
 #. 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 ""
 "Klassikaline paigaldusandmekandja. See annab maksimaalse paindlikkuse ja "
 "lubab luua kohandatud paigalduse, eriti just valida, millist töökeskkonda "
 "kasutama hakata."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:21
+#: en/SelectAndUseISOs2.xml:31
+#, 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"
+"<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 ""
 "Live-andmekandja: sel juhul saab andmekandja pealt käivitada toimiva Mageia "
 "süsteemi ilma seda paigaldamata, et näiteks näha, mida üldse pakutakse. "
 "Paigaldamine on lihtsam, aga ka valikuid on vähem."
 
+#. type: Content of: <section><section><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\">LiveISO-sid saab kasutada ainult puhta paigalduse, "
+"mitte aga uuendamise jaoks varasemalt versioonilt.</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 ""
+"Need on väikesed tõmmised, mis sisaldavad vaid tarkvara, mida on vaja "
+"paigaldusprogrammi drakx käivitamiseks ning drakx-installer-stage2 ja veel "
+"mõningate pakettide leidmiseks, et siis jätkata paigaldamisega. Need paketid "
+"võivad asuda arvuti kõvakettal, mõnel muul kohalikul kettal, kohalikus "
+"võrgus või internetis."
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:53
+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 ""
+"Need andmekandjad on väga väikesed (alla 100 MB) ja abiks siis, kui "
+"internetiühenduse maht on liiga väike terve DVD allalaadimiseks, arvuti on "
+"ilma DVD-seadmeta või ei saa arvutit käivitada USB-pulga pealt."
+
 #. type: Content of: <section><section><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 "Üksikasjadest kõneldakse järgmistes osades."
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:30
+#: en/SelectAndUseISOs2.xml:61
 msgid "Media"
 msgstr "Andmekandjad"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:32
+#: en/SelectAndUseISOs2.xml:63
 msgid "Definition"
 msgstr "Määratlus"
 
 #. 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 ""
 "Me nimetame siinkohal andmekandjaks ISO-tõmmisefaili, mis võimaldab "
 "paigaldada ja/või uuendada Mageiat, ning ühtlasi ka igasugust füüsilist "
 "seadet, millele ISO-tõmmis on kopeeritud (DVD, USB-pulk jne.)."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:36
+#: en/SelectAndUseISOs2.xml:67
 msgid ""
 "You can find Mageia ISO's <link ns4:href=\"http://www.mageia.org/en/"
 "downloads/\">here</link>."
@@ -3376,268 +3677,269 @@ msgstr ""
 "downloads/\">siit</link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:39
+#: en/SelectAndUseISOs2.xml:70
 msgid "Classical installation media"
 msgstr "Klassikalised paigaldusandmekandjad"
 
 #. 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 "Ühised omadused"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:44
-msgid "These ISOs use the Classical installer called drakx."
+#: en/SelectAndUseISOs2.xml:75
+#, fuzzy
+msgid "These ISOs use the Classical installer called DrakX"
 msgstr "Kasutavad traditsioonilist paigaldusprogrammi drakx."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml: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 ""
 "Saab teha nii puhta paigalduse kui ka uuendada varasematelt väljalasetelt."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:51 en/SelectAndUseISOs2.xml:83
-#: en/SelectAndUseISOs2.xml:158
-msgid "Different media for 32 and 64 bit architectures."
+#: en/SelectAndUseISOs2.xml:82 en/SelectAndUseISOs2.xml:118
+#: en/SelectAndUseISOs2.xml:174
+#, fuzzy
+msgid "Different media for 32 and 64-bit architectures"
 msgstr "Eri andmekandjad 32- ja 64-bitisele arhitektuurile."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml: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 ""
 "Tervitusekraanil on saada mõned tööriistad: päästesüsteem, mälu testimine, "
 "riistvara tuvastamise tööriist."
 
 #. 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 "Iga DVD sisaldab paljusid saadaolevaid töökeskkondi ja keeli."
 
 #. 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 ""
 "Paigaldamise käigus lastakse valida, kas kasutada mittevaba tarkvara või "
 "mitte."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:69
+#: en/SelectAndUseISOs2.xml:102
 msgid "Live media"
 msgstr "Live-andmekandjad"
 
 #. 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 ""
 "Saab tarvitada distributsiooni tundmaõppimiseks ilma seda kohe kõvakettale "
 "paigaldamata, aga soovi korral siiski ka Mageia paigaldamiseks."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:79
-msgid "Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)."
-msgstr "Iga ISO sisaldab ainult üht töökeskkonda (Plasma, GNOME või Xfce)."
+#: en/SelectAndUseISOs2.xml:111
+msgid "The Live media also includes an Installer."
+msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:86
-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>"
-msgstr ""
-"<emphasis role=\"bold\">LiveISO-sid saab kasutada ainult puhta paigalduse, "
-"mitte aga uuendamise jaoks varasemalt versioonilt.</emphasis>"
+#: en/SelectAndUseISOs2.xml:114
+#, fuzzy
+msgid "Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)"
+msgstr "Iga ISO sisaldab ainult üht töökeskkonda (Plasma, GNOME või Xfce)."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:91
-msgid "They contain non free software."
+#: en/SelectAndUseISOs2.xml:121
+#, fuzzy
+msgid "They contain non-free software"
 msgstr "Sisaldavad mittevaba tarkvara."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:96
+#: en/SelectAndUseISOs2.xml:126
 msgid "Live DVD Plasma"
 msgstr "Plasma LiveDVD"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:99
-msgid "Plasma desktop environment only."
+#: en/SelectAndUseISOs2.xml:129
+#, fuzzy
+msgid "Plasma desktop environment only"
 msgstr "Ainult Plasma töökeskkond."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:102 en/SelectAndUseISOs2.xml:116
-#: en/SelectAndUseISOs2.xml:130
-msgid "All available languages are present."
+#: en/SelectAndUseISOs2.xml:132 en/SelectAndUseISOs2.xml:146
+#: en/SelectAndUseISOs2.xml:160
+#, fuzzy
+msgid "All available languages are present"
 msgstr "Sisaldab kõiki keeli."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:105
-msgid "64 bit architecture only."
+#: en/SelectAndUseISOs2.xml:135 en/SelectAndUseISOs2.xml:149
+#, fuzzy
+msgid "64-bit architecture only"
 msgstr "Ainult 64-bitine arhitektuur."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:110
+#: en/SelectAndUseISOs2.xml:140
 msgid "Live DVD GNOME"
 msgstr "GNOME LiveDVD"
 
 #. 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 "Ainult GNOME töökeskkond."
 
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:119
-msgid "64 bit architecture only"
-msgstr "Ainult 64-bitine arhitektuur."
-
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:124
+#: en/SelectAndUseISOs2.xml:154
 msgid "Live DVD Xfce"
 msgstr "Xfce LiveDVD"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:127
-msgid "Xfce desktop environment only."
+#: en/SelectAndUseISOs2.xml:157
+#, fuzzy
+msgid "Xfce desktop environment only"
 msgstr "Ainult Xfce töökeskkond."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:133
-msgid "32 or 64 bit architectures."
+#: en/SelectAndUseISOs2.xml:163
+#, fuzzy
+msgid "32 or 64-bit architectures"
 msgstr "32- või 64-bitine arhitektuur."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:139
+#: en/SelectAndUseISOs2.xml:169
 msgid "Net install media"
 msgstr "Võrgupaigalduse andmekandjad"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:144
-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 ""
-"Need on väikesed tõmmised, mis sisaldavad vaid tarkvara, mida on vaja "
-"paigaldusprogrammi drakx käivitamiseks ning drakx-installer-stage2 ja veel "
-"mõningate pakettide leidmiseks, et siis jätkata paigaldamisega. Need paketid "
-"võivad asuda arvuti kõvakettal, mõnel muul kohalikul kettal, kohalikus "
-"võrgus või internetis."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:152
-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 ""
-"Need andmekandjad on väga väikesed (alla 100 MB) ja abiks siis, kui "
-"internetiühenduse maht on liiga väike terve DVD allalaadimiseks, arvuti on "
-"ilma DVD-seadmeta või ei saa arvutit käivitada USB-pulga pealt."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:161
-msgid "First steps are English language only."
+#: en/SelectAndUseISOs2.xml:177
+#, fuzzy
+msgid "First steps are English language only"
 msgstr "Esimesed sammud on ainult inglise keeles."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:166
+#: en/SelectAndUseISOs2.xml:182
 msgid "netinstall.iso"
 msgstr "netinstall.iso"
 
 #. 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 ""
 "Sisaldab ainult vaba tarkvara neile, kes ei ole nõus mittevaba tarkvara "
 "kasutama."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:175
+#: en/SelectAndUseISOs2.xml:191
 msgid "netinstall-nonfree.iso"
 msgstr "netinstall-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 ""
 "Sisaldab mittevaba tarkvara (peamiselt draiverid, koodekid jms.) neile, kes "
 "seda vajavad."
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:186
+#: en/SelectAndUseISOs2.xml:202
 msgid "Downloading and Checking Media"
 msgstr "Andmekandja allalaadimine ja kontrollimine"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:188
+#: en/SelectAndUseISOs2.xml:204
 msgid "Downloading"
 msgstr "Allalaadimine"
 
 #. 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 ""
 "Kui olete sobiva ISO-faili valinud, saab selle alla laadida kas HTTP või "
 "BitTorrenti vahendusel. Mõlemal juhul annab aken mõningat teavet, näiteks "
 "kasutatava peegelsaidi ja võimaluse kohta seda vahetada, kui ribalaius on "
 "liiga väike. HTTP valimise korral peaks pilt olema umbes selline:"
 
+#. 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: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:191
-msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
+#: en/SelectAndUseISOs2.xml:217
+#, fuzzy
+msgid ""
+"<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:195
-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:"
+#: en/SelectAndUseISOs2.xml:222
+msgid "In the meantime, a window to download the actual ISO will open:"
 msgstr ""
-"md5sum ja sha1sum on tööriistad ISO terviklikkuse kontrollimiseks. Kasutada "
-"tuleks ainult üht neist. Hoidke üks neist varuks <link linkend=\"integrity"
-"\">edasiseks kasutamiseks</link>. Seejärel ilmub selline aken:"
 
 #. 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."
-msgstr "Valige faili salvestamine ja klõpsake 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
 msgid "Checking the integrity of the downloaded media"
 msgstr "Allalaaditud andmekandja terviklikkuse kontrollimine"
 
 #. 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 ""
 "Mõlemad kontrollsummad on kuueteistkümnendarvud, mis arvutatakse kindla "
 "algoritmiga allalaaditava faili põhjal. Kui paluda algoritmil arv uuesti "
@@ -3647,7 +3949,7 @@ msgstr ""
 "laadida või püüda see BitTorrenti abil parandada."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:214
+#: en/SelectAndUseISOs2.xml:241
 msgid ""
 "To generate the checksum for your downloaded ISO, open a console, (no need "
 "to be root), and:"
@@ -3656,69 +3958,85 @@ msgstr ""
 "(selleks ei pea olema administraator) ja kirjutage:"
 
 #. 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 ""
 "- md5sum kasutamiseks: <userinput>md5sum tõmmisefail.iso/asukoht</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 ""
+"- sha1sum kasutamiseks: <userinput>sha1sum tõmmisefail.iso/asukoht</"
+"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 ""
 "- sha1sum kasutamiseks: <userinput>sha1sum tõmmisefail.iso/asukoht</"
 "userinput>."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:226
+#: en/SelectAndUseISOs2.xml:258
 msgid "Example:"
 msgstr "Näide:"
 
 #. 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 ""
 "ja võrrelge arvutis saadud arvu (võimalik, et peate natuke ootama) Mageia "
 "allalaadimissaidil näidatuga."
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:237
+#: en/SelectAndUseISOs2.xml:270
 msgid "Burn or dump the ISO"
 msgstr "ISO kirjutamine"
 
 #. 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 ""
 "Kontrollitud ISO võib nüüd kirjutada CD-le, DVD-le või USB-pulgale. See ei "
 "ole tavaline kopeerimine, vaid eesmärk on luua käivitatav andmekandja."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:275
 msgid "Burning the ISO to a CD/DVD"
 msgstr "ISO kirjutamine CD-le või DVD-le"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml: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 ""
 "Kasutage soovikohast kirjutamisprogrammi, aga kontrollige kindlasti, et "
 "seade oleks määratud <emphasis role=\"bold\">kirjutama tõmmist</emphasis>, "
@@ -3727,45 +4045,54 @@ msgstr ""
 "mageia.org/en/Writing_CD_and_DVD_images\">Mageia wikist</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 "ISO kirjutamine USB-pulgale"
 
 #. 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 ""
 "Kõik Mageia ISO-d on hübriidsed, mis tähendab, et neid saab kirjutada ka USB-"
 "pulgale, mis on käivitatav ja mille pealt saab süsteemi paigaldada."
 
 #. 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 ""
 "Tõmmise kirjutamine USB-pulgale hävitab kõik varasemad failisüsteemid "
 "seadmes, kõik andmed lähevad kaotsi ja partitsiooni suurus väheneb tõmmise "
 "suurusele."
 
-#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml: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 ""
-"Algse mahu taastamiseks tuleb USB-pulk uuesti partitsioneerida ja vormindada."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:259
+#: en/SelectAndUseISOs2.xml:299
 msgid "Using a graphical tool within Mageia"
 msgstr "Graafilise tööriista kasutamine Mageias"
 
 #. 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>"
@@ -3775,26 +4102,27 @@ msgstr ""
 "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 "Graafilise tööriista kasutamine Windowsis"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:304
 msgid "You could try:"
 msgstr "Võite proovida järgmisi programme:"
 
 #. 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=en_US\">Rufus</link> "
 "valikuga \"ISO image\";"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:271
+#: en/SelectAndUseISOs2.xml:311
 msgid ""
 "<link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
@@ -3803,12 +4131,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 "Käsurea kasutamine GNU/Linuxi süsteemis"
 
 #. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:279
+#: en/SelectAndUseISOs2.xml:319
 msgid ""
 "It is potentially *dangerous* to do this by hand. You risk overwriting "
 "potentially valuable existing data if you specify the wrong target device."
@@ -3817,66 +4146,77 @@ msgstr ""
 "võib ketta partitsiooni sootuks üle kirjutada."
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:325
 msgid "Open a console"
 msgstr "Avage konsool"
 
 #. 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 ""
 "Võtke administraatori õigused käsuga <userinput>su -</userinput> (ärge "
 "unustage kriipsukest lõpus)"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:291
-msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
+#: en/SelectAndUseISOs2.xml:332
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"Root.png\"/> </"
+"imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Root.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 ""
 "Ühendage USB-pulk (ärge haakige seda, see tähendab ärge avage ühtegi "
 "rakendust või failihaldurit, mis seda lugeda võiks)"
 
 #. 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 "Sisestage käsk <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>"
+#: en/SelectAndUseISOs2.xml:345
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"Fdisk.png\"/> </"
+"imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Fdisk.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 ""
 "Leidke oma USB-pulga seadmenimi (suuruse järgi); näiteks toodud pildil on "
 "selleks <code>/dev/sdb</code>, mis on 8 GB suurune USB-pulk."
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:312
+#: 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 ""
 "Teine võimalus on leida seadme nimi käsuga <code>dmesg</code>: lõpus näeb "
 "seadme nime, mille alguses seisab <emphasis>sd</emphasis>, antud juhul "
 "<emphasis>sdd</emphasis>; samuti on näha, et suurus on 2GB:"
 
 #. 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"
@@ -3918,40 +4258,47 @@ 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
 msgid "<placeholder type=\"screen\" id=\"0\"/>"
 msgstr "<placeholder type=\"screen\" 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 ""
 "Sisestage käsk <emphasis role=\"bold\"># <userinput>dd if=ISO-faili/asukoht "
 "of=/dev/sdX bs=1M</userinput></emphasis>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:340
-msgid "Where X=your device name eg: /dev/sdd"
+#: en/SelectAndUseISOs2.xml:382
+#, fuzzy
+msgid ""
+"Where <replaceable>X</replaceable>=your device name eg: <filename>/dev/sdd</"
+"filename>"
 msgstr "kus X on teie seadme nimi, nt: /dev/sdd"
 
 #. 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 ""
 "Näide: <emphasis role=\"bold\"># <userinput>dd if=/home/user/Downloads/"
 "Mageia-6-x86_64-DVD.iso of=/dev/sdd bs=1M</userinput></emphasis>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><tip><para>
-#: en/SelectAndUseISOs2.xml:345
+#: en/SelectAndUseISOs2.xml:388
+#, fuzzy
 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 ""
 "Võib-olla tasub teada sedagi, et <emphasis role=\"bold\">if</emphasis> "
 "tähendab<emphasis role=\"bold\">i</emphasis>nput <emphasis role=\"bold\">f</"
@@ -3960,12 +4307,13 @@ msgstr ""
 "\"bold\">f</emphasis>ile'i ehk väljundfaili."
 
 #. 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 "Sisestage käsk: # <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 "See ongi kõik: nüüd võib USB-pulga välja võtta."
 
@@ -3975,8 +4323,10 @@ msgid "Select your Country / Region"
 msgstr "Riigi / piirkonna valimine"
 
 #.  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
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
 "\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
@@ -3984,33 +4334,35 @@ msgstr ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
 "\"center\" fileref=\"dx2-selectCountry.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 ""
 "Valige oma riik või piirkond. See on oluline paljudele muudele "
 "seadistustele, näiteks vääring või juhtmeta side regulatsioonipiirkond. Vale "
 "riigi määramisel võib juhtuda, et te ei saagi juhtmeta võrku kasutada."
 
-#. 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 ""
 "Kui teie riiki nimekirjas pole, klõpsake nupule <guilabel>Muud valikud</"
 "guilabel> ja valige oma riik / piirkond sealt."
 
 #. type: Content of: <section><note><para>
-#: en/selectCountry.xml:24
+#: 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 ""
 "Kui teie riik esineb ainult <guilabel>muude valikute</guilabel> nimekirjas, "
 "siis võib pärast <guibutton>Olgu</guibutton> klõpsamist paista, nagu oleks "
@@ -4018,14 +4370,15 @@ msgstr ""
 "arvestab teie tegeliku valikuga."
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:33
+#: en/selectCountry.xml:42
 msgid "Input method"
 msgstr "Sisestusmeetod"
 
 #. 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. "
@@ -4040,12 +4393,13 @@ msgstr ""
 "neid saab paigaldada, kui lisada enne paketivalikut HTTP või FTP andmekandja."
 
 #. 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 ""
 "Kui jätsite paigaldamise ajal sisestusmeetodi valimata, saab seda teha "
 "pärast paigaldatud süsteemi laadimist, valides <emphasis role=\"bold"
@@ -4053,57 +4407,64 @@ msgstr ""
 "emphasis> või käivitades administraatorina localedrake'i."
 
 #. type: Content of: <section><info><title>
-#: en/selectInstallClass.xml:14
+#: en/selectInstallClass.xml:29
 msgid "Install or Upgrade"
 msgstr "Paigaldamine või uuendamine"
 
 #. 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 format=\"PNG\" align=\"center\" fileref=\"dx2-"
 "selectInstallClass.png\"/> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:25
-msgid "Install"
-msgstr "Paigaldamine"
+#: en/selectInstallClass.xml:41
+#, fuzzy
+msgid "<emphasis role=\"bold\">Install</emphasis>"
+msgstr "<emphasis role=\"bold\">Tööjaam</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:27
+#: en/selectInstallClass.xml:43
+#, fuzzy
 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 ""
 "Selle valimisel saab ette võtta <application>Mageia</application> värske "
 "paigalduse. Sellega vormindatakse juurpartitsioon (/), kuid eraldi asuv /"
 "home partitsioon on võimalik alles hoida."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:33
-msgid "Upgrade"
-msgstr "Uuendamine"
+#: en/selectInstallClass.xml:50
+#, fuzzy
+msgid "<emphasis role=\"bold\">Upgrade</emphasis>"
+msgstr "<emphasis role=\"bold\">Server</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 ""
 "Selle valimisel saab ette võtta olemasoleva <application>Mageia</"
 "application> paigalduse uuendamise."
 
-#. 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 ""
 "Põhjalikult testitud on uuendamine ainult selliselt varasemalt Mageia "
 "versioonilt, mis oli <emphasis>veel toetatud</emphasis> ajal, mil ilmus "
@@ -4113,35 +4474,15 @@ msgstr ""
 "paigaldus (selle juures tasub mõistagi jätta alles oma <literal>/home</"
 "literal>-partitsioon)."
 
-#. type: Content of: <section><note><para>
-#: en/selectInstallClass.xml:50
-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 ""
-"Kui soovite mingil hetkel paigaldamise katkestada, võite ka teha arvutile "
-"taaskäivituse, aga palun mõelge enne seda hoolikalt järele. Kui partitsioon "
-"on vormindatud või uuendusi on hakatud paigaldama, ei ole arvuti enam "
-"varasemas olekus ning taaskäivitamise tulemus võib olla mittetöötav masin. "
-"Kui te ikkagi olete kindel, et just taaskäivitus on õige samm, minge "
-"tekstiterminali, vajutades korraga kolme klahvi <guilabel>Alt Ctrl F2</"
-"guilabel>. Seejärel vajutage taaskäivitamiseks korraga klahve <guilabel>Alt "
-"Ctrl Delete</guilabel>"
-
 #. 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 ""
 "Kui avastate, et olete unustanud mõne keele lisada, saab <emphasis role="
 "\"bold\">Paigaldamise või uuendamise</emphasis> ekraanilt naasta keelevaliku "
@@ -4150,38 +4491,41 @@ msgstr ""
 "käigus."
 
 #. type: Content of: <section><info><title>
-#: en/selectKeyboardLive.xml:3
-msgid "Select keyboard"
+#: en/selectKeyboardLive.xml:14
+#, fuzzy
+msgid "Select Keyboard"
 msgstr "Klaviatuuri valimine"
 
 #. 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 ""
-"Teil palutakse määrata klaviatuuripaigutus, mida soovite Mageias kasutada. "
-"Vaikimisi valitu vastab keelele ja ajavööndile, mille varem valisite."
 
 #. type: Content of: <section><info><title>
-#: en/selectKeyboard.xml:7
+#: en/selectKeyboard.xml:20
 msgid "Keyboard"
 msgstr "Klaviatuur"
 
 #. 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."
@@ -4190,16 +4534,17 @@ msgstr ""
 "leita, kasutatakse vaikimisi US klaviatuuripaigutust."
 
 #. 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=\"dx2-selectKeyboard.png\" align=\"center\"/"
-"> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" align=\"center\" fileref=\"dx2-"
+"selectInstallClass.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 "
@@ -4216,22 +4561,24 @@ msgstr ""
 "Keyboard_layout\">en.wikipedia.org/wiki/Keyboard_layout</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 ""
 "Kui teie klaviatuuri nimekirjas ei ole, klõpsake täieliku loetelu nägemiseks "
 "<guibutton>Veel</guibutton> ja valige oma klaviatuur sealt."
 
-#. type: Content of: <section><itemizedlist><listitem><para><warning><para>
-#: en/selectKeyboard.xml: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 ""
 "Olles valinud klaviatuuri pärast nupule <guibutton>Veel</guibutton> "
 "klõpsamist, võite esimese dialoogi juurde naastes näha, nagu oleks valitud "
@@ -4239,7 +4586,7 @@ msgstr ""
 "ikkagi seda, millise klaviatuuri te tegelikult täisnimekirjas olete valinud."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:46
+#: en/selectKeyboard.xml:60
 msgid ""
 "If you choose a keyboard based on non-Latin characters, you will see an "
 "extra dialogue screen asking how you would prefer to switch between the "
@@ -4250,36 +4597,39 @@ msgstr ""
 "klaviatuuripaigutuste vahel."
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:15
+#: en/selectLanguage.xml:34
 msgid "Please choose a language to use"
 msgstr "Kasutatava keele valimine"
 
-#. 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 ""
 "Valige vajalik keel, laiendades nimekirja kõigepealt maailmajao järgi.  "
 "<application>Mageia</application> kasutab langetatud valikut nii "
 "paigaldamise ajal kui ka paigaldatud süsteemis."
 
-#. 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 ""
 "Valige vajalik keel.  <application>Mageia</application> kasutab langetatud "
 "valikut nii paigaldamise ajal kui ka paigaldatud süsteemis."
 
-#. 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 ""
 "Kui teie süsteemi tuleks paigaldada mitu keelt kas teie enda või teiste "
@@ -4288,64 +4638,67 @@ msgstr ""
 "keelte lisamine juba palju keerulisem."
 
 #. 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 format=\"PNG\" fileref="
 "\"dx2-selectLanguage.png\" align=\"center\"/> </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 ""
 "Isegi kui paigaldate mitu keelt, tuleb üks neist valida esimesel ekraanil "
 "eelistatud keeleks. See keel on märgitud ka mitme keele valimise ekraanil."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml: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 ""
 "Kui klaviatuuri keel ei sobi kokku eelistatud keelega, oleks mõistlik "
 "paigaldada kohe ka klaviatuurile vastav keel."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:56
-msgid "Mageia uses UTF-8 (Unicode) support by default."
-msgstr "Mageia toetab vaikimisi UTF-8 (Unicode)."
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml: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 ""
 "Selle võib keelata <emphasis role=\"bold\">mitme keele valimise</emphasis> "
 "ekraanil, kui olete kindel, et see teie keelele kohe üldse ei sobi. UTF-8 "
 "keelamine rakendub kõigile paigaldatavatele keeltele."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml: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 ""
 "Oma süsteemi keelt saab pärast paigaldamist muuta, valides Mageia "
 "juhtimiskeskus -> Süsteem -> Süsteemi lokaliseerimine."
 
 #. type: Content of: <section><info><title>
-#: en/selectMouse.xml:4
+#: en/selectMouse.xml:10
 msgid "Select mouse"
 msgstr "Hiire valimine"
 
@@ -4353,42 +4706,47 @@ msgstr "Hiire valimine"
 #.  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>"
-msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectMouse.png\" "
-"format=\"PNG\" /> </imageobject>"
+"format=\"PNG\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata format=\"PNG\" align=\"center\" fileref=\"dx2-"
+"selectInstallClass.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."
 msgstr "Kui te ei ole rahul oma hiire tööga, saate siit valida mõne teise."
 
 #. 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 ""
 "Tavaliselt on mõistlik valik <guilabel>Universaalne</guilabel> - "
 "<guilabel>Suvaline PS/2 ja USB hiir</guilabel>."
 
 #. 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 ""
 "Valige <guilabel>Universaalne</guilabel> - <guilabel>Evdev jõuga</guilabel>, "
 "et seadistada nuppe, mis peaksid töötama kuue või rohkema nupuga hiirel."
 
-#. 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 "Alglaadimismenüü kirje lisamine või muutmine"
 
@@ -4413,104 +4771,69 @@ msgstr ""
 "Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link>"
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:7
-msgid "Bootloader main options"
-msgstr "Alglaaduri põhiseadistused"
-
-#. type: Content of: <section><section><title>
 #: en/setupBootloader.xml:10
-msgid "Bootloader interface"
+#, fuzzy
+msgid "Bootloader"
 msgstr "Alglaaduri liides"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:11
-msgid "By default, Mageia uses exclusively:"
-msgstr "Vaikimisi kasutab Mageia üht kahest võimalusest:"
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:13
+msgid "Grub2"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><title>
+#: en/setupBootloader.xml:15
+#, fuzzy
+msgid "Grub2 on Legacy MBR/GPT systems"
+msgstr "Grub2 pärand/MBR ja pärand/GPT süsteemis"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:14
+#: en/setupBootloader.xml:17
+#, fuzzy
 msgid ""
-"GRUB2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
+"GRUB2 (with or without graphical menu) will be used exclusively as the "
+"bootloader for a Legacy/MBR or Legacy/GPT system."
 msgstr ""
 "Grub2 (graafilise menüüga või ilma selleta) pärand/MBR või pärand/GPT "
 "süsteemi korral"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:18
-msgid "GRUB2-efi for a UEFI system."
-msgstr "Grub2-efi UEFI süsteemi korral"
-
-#. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:22
-msgid "The Mageia graphical menus are nice :)"
-msgstr "Mageia graafiline menüü näeb kena välja :)"
-
-#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:25
-msgid "GRUB2 on Legacy/MBR and Legacy/GPT systems"
-msgstr "Grub2 pärand/MBR ja pärand/GPT süsteemis"
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:27
-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 fileref=\"dx2-"
-"setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
-"setupBootloader.png\"/> </imageobject>"
-
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:34 en/setupBootloader.xml:56
+#: en/setupBootloader.xml:21
+#, fuzzy
 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 ""
-"Ärge muutke <emphasis role=\"bold\">Alglaadimisseadet</emphasis>, kui te "
-"pole täiesti kindel, et teate, mida teete."
+"Grub2 alglaaduri kas Teie esimese kõvaketta MBR-i (Master Boot Record) või "
+"BIOS-e alglaadepartisioonile"
 
-#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:38
-msgid "GRUB2-efi on UEFI systems"
+#. type: Content of: <section><section><itemizedlist><title>
+#: en/setupBootloader.xml:27
+#, fuzzy
+msgid "Grub2-efi on UEFI systems"
 msgstr "Grub2-efi UEFI süsteemis"
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:39
-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 ""
-"UEFI süsteemi korral on kasutajaliides pisut teistsugune, sest te ei saa "
-"valida graafilise menüü <emphasis role=\"bold\">kasutamist</emphasis> või "
-"<emphasis role=\"bold\">kasutamata jätmist</emphasis>."
 
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:42
+#. 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-"
-"setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
-"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 ""
 "Kui Mageia on ainuke süsteem, mis on teie arvutisse paigaldatud, loob "
 "paigaldusprogramm ESP (EFI süsteemse partitsiooni) alglaaduri (Grub2-efi) "
@@ -4520,187 +4843,141 @@ msgstr ""
 "aga väga soovitatav on siiski kasutada ainult üht sõltumata sellest, kui "
 "palju on arvutis operatsioonisüsteeme."
 
-#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:61
-msgid "Using a Mageia bootloader"
-msgstr "Mageia alglaaduri kasutamine"
-
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:62
-msgid ""
-"By default, and according to your system, Mageia writes one of the following:"
-msgstr "Vaikimisi kirjutab Mageia sõltuvalt süsteemist uue:"
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:66
-msgid ""
-"a GRUB2 bootloader either into the MBR (Master Boot Record) of your first "
-"hard drive or in the BIOS boot partition."
-msgstr ""
-"Grub2 alglaaduri kas Teie esimese kõvaketta MBR-i (Master Boot Record) või "
-"BIOS-e alglaadepartisioonile"
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:70
-msgid "a GRUB2-efi bootloader into the ESP"
-msgstr "Grub2-efi alglaaduri ESP-le"
+#. type: Content of: <section><section><info><title>
+#: en/setupBootloader.xml:46
+#, fuzzy
+msgid "Bootloader Setup"
+msgstr "Alglaaduri liides"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:73
-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."
-msgstr ""
-"Kui arvutisse peaks olema paigaldatud teisigi operatsioonisüsteeme, püüab "
-"Mageia lisada need oma alglaadimismenüüsse. Kui Te seda ei soovi, klõpsake "
-"<guibutton>Järgmine</guibutton> ja eemaldage märge kastikesest <emphasis "
-"role=\"bold\">Võõraste operatsioonisüsteemide otsimine</emphasis>"
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:49
+msgid "Bootloader main options"
+msgstr "Alglaaduri põhiseadistused"
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:78
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:51
+#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata fileref=\"live-setupBootloader3.png\" align=\"center\"/> </"
-"imageobject>"
+"\"dx2-setupBootloader.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata fileref=\"live-setupBootloader.png\" xml:id=\"setupBootloader-"
+"im1\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
 "\"> <imagedata fileref=\"live-setupBootloader3.png\" align=\"center\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:87
-msgid "Using an existing bootloader"
-msgstr "Olemasoleva alglaaduri kasutamine"
-
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:88
-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."
-msgstr ""
-"Täpne protseduur, kuidas lisada Mageia süsteem olemasolevale alglaadurile, "
-"väljub käesoleva abiteksti raamest, kuid enamasti tähendab see asjakohase "
-"alglaaduri paigaldamise programmi käivitamist, mis tuvastab ja lisab selle "
-"automaatselt. Uurige selle kohta lähemalt vastava operatsioonisüsteemi "
-"dokumentatsiooni."
-
-#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:95
-msgid "Using chain loading"
-msgstr "Ahellaadimise kasutamine"
+#. 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\">Server</emphasis>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:96
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:63
 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>."
+"This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI "
+"systems will not see this option here."
 msgstr ""
-"Kui Te ei soovi alglaaditavat Mageiat, vaid tahate seda laadida mõnest "
-"teisest operatsioonisüsteemist, siis klõpsake <guibutton>Järgmine</"
-"guibutton>, seejärel <guibutton>Muu</guibutton> ja märkige ära kastike "
-"<guilabel>ESP-i ega MBR-i ei puudutata</guilabel>."
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:101
-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-"
-"setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-setupBootloader4.png\" align="
-"\"center\"/> </imageobject>"
+#. 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\">Muud valikud</emphasis>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:108
-msgid ""
-"You will get a warning that the bootloader is missing, ignore it by clicking "
-"<guibutton>OK</guibutton>."
+#. 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 ""
-"Näete hoiatust, et alglaadur puudub. Eirake seda ja klõpsake "
-"<guibutton>Olgu</guibutton>."
+"Muutke siin midagi ainult siis, kui olete kindel, et teate, mida teete."
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:111
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:72
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:117
-msgid "Options"
-msgstr "Valikud"
-
-#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:119
-msgid "First page"
-msgstr "Esimene kaart"
+"<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
+msgstr "<emphasis role=\"bold\">Palun valige sobiv turbetase</emphasis>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:120
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:74
+#, 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."
+"This text box lets you set a delay, in seconds, before the default operating "
+"system is started up."
 msgstr ""
 "<guilabel>Ooteaeg alglaadimisel</guilabel>: selles kastis saab panna paika, "
 "kui mitu sekundit oodatakse, enne kui käivitatakse vaikimisi "
 "operatsioonisüsteem."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:122
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:78
+#, fuzzy
+msgid "<emphasis role=\"bold\">Security</emphasis>"
+msgstr "<emphasis role=\"bold\">Server</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:79
+#, fuzzy
 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."
+"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 ""
 "<guilabel>Turvalisus</guilabel>: siin saab määrata alglaaduri parooli. "
 "Sellisel juhul küsitakse alglaadimise ajal kasutajanime ja parooli, kui "
 "soovite valida mõnda alglaadimiskirjet või seadistusi muuta. Kasutajanimeks "
 "on <emphasis role=\"bold\">root</emphasis>, parooli saate siin ise määrata."
 
-#. 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:88
+#, fuzzy
+msgid "Choose a password for the bootloader (optional)"
 msgstr ""
 "<guilabel>Parool</guilabel>: selles kastis saab parooli kindlaks määrata."
 
-#. 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:91
+#, fuzzy
+msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
+msgstr "<emphasis role=\"bold\">Tööjaam</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:92
+#, fuzzy
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the password and DrakX will "
-"check that it matches with the one above."
+"Retype the password and DrakX will check that it matches with the one set "
+"above"
 msgstr ""
 "<guilabel>Parool (uuesti)</guilabel>: siia tuleb parool teist korda "
 "kirjutada, mille järel Drakx kontrollib, kas see ikka sobib kokku sellega, "
 "mille sisestasite esimesel korral."
 
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:96 en/setupBootloader.xml:154
+#, fuzzy
+msgid "<emphasis>Advanced</emphasis>"
+msgstr "<emphasis role=\"bold\">Muud valikud</emphasis>"
+
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:127 en/setupBootloader.xml:159
-msgid "<guilabel>Advanced</guilabel>"
-msgstr "<guilabel>Edasijõudnuile</guilabel>"
+#: en/setupBootloader.xml:99
+#, fuzzy
+msgid "<emphasis>Enable ACPI</emphasis>"
+msgstr "<emphasis>Tavaline</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:100
+#, fuzzy
 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)."
+"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 ""
 "<guilabel>ACPI lubamine:</guilabel> ACPI (täiustatud konfiguratsiooni- ja "
 "toiteliides) on toitehalduse standard. See võib säästa energiat, lülitades "
@@ -4709,21 +4986,35 @@ msgstr ""
 "arvate, et ACPI võib põhjustada mingeid probleeme (näiteks suvalisi\n"
 "taaskäivitusi või süsteemi hangumisi)."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:133
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:108
+#, fuzzy
+msgid "<emphasis>Enable SMP</emphasis>"
+msgstr "<emphasis>Tavaline</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:109
+#, fuzzy
 msgid ""
-"<guilabel>Enable SMP</guilabel>: This option enables/disables symmetric "
-"multiprocessing for multi core processors."
+"This option enables/disables symmetric multiprocessing for multi-core "
+"processors"
 msgstr ""
 "<guilabel>SMP lubamine</guilabel>: see valik lülitab sisse või välja "
 "sümmeetrilise mitmiktöötluse mitme tuumaga protsessorite korral."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:135
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:113
+#, fuzzy
+msgid "<emphasis>Enable APIC</emphasis>"
+msgstr "<emphasis>Tavaline</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:114
+#, fuzzy
 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."
+"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 ""
 "<guilabel>APIC lubamine</guilabel>: selle lubamine või keelamine annab "
 "operatsioonisüsteemile või võtab sellelt ligipääsu täiustatud "
@@ -4731,68 +5022,214 @@ msgstr ""
 "keerulisemaid prioriteedi määramise mudeleid ja täiustatud IRQ "
 "(katkestusnõuded) haldamist."
 
-#. 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:120
+#, fuzzy
+msgid "<emphasis>Enable Local APIC</emphasis>"
+msgstr "<emphasis>Tavaline</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:121
+#, fuzzy
 msgid ""
-"<guilabel>Enable Local APIC</guilabel>: Local APIC manages all external "
-"interrupts for a specific processor in an SMP system."
+"Here you can set Local APIC, which manages all external interrupts for a "
+"specific processor in an SMP system"
 msgstr ""
 "<guilabel>Kohaliku APIC lubamine</guilabel>: siin saab lubada või keelata "
 "kohaliku APIC, mis haldab kõiki konkreetse protsessori väliseid katkestusi "
 "SMP-süsteemis."
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:143
-msgid "Next page"
-msgstr "Järgmine kaart"
+#: en/setupBootloader.xml:127
+#, fuzzy
+msgid "Bootloader Configuration"
+msgstr "Heli seadistamine"
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:129
+#, fuzzy
+msgid ""
+"<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 align=\"center\" fileref="
+"\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata fileref=\"live-setupBootloader3.png\" align=\"center\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:139
+#, fuzzy
+msgid "<emphasis role=\"bold\">Default</emphasis>"
+msgstr "<emphasis role=\"bold\">Server</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:146
-msgid "<guilabel>Default:</guilabel> Operating system started up by default"
+#: en/setupBootloader.xml:140
+#, fuzzy
+msgid "The operating system to started up by default"
 msgstr ""
 "<guilabel>Vaikimisi:</guilabel> vaikimisi käivitatav operatsioonisüsteem."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:150
+#: en/setupBootloader.xml:143
+#, fuzzy
+msgid "<emphasis role=\"bold\">Append</emphasis>"
+msgstr "<emphasis role=\"bold\">Muud valikud</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:144
+#, 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."
+"This option lets you pass information to the kernel or tell the kernel to "
+"give you more information as it boots"
 msgstr ""
 "<guilabel>Lisaargumendid:</guilabel> siin saab edastada kernelile vajalikku "
 "teavet või lasta kernelil alglaadimise ajal anda rohkem teavet."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:155
+#: en/setupBootloader.xml:148
+#, fuzzy
+msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
+msgstr "<emphasis role=\"bold\">Server</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:149
+#, fuzzy
 msgid ""
-"<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
-"\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
+"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 ""
-"<guilabel>Võõraste operatsioonisüsteemide otsimine</guilabel>: vt eespool "
-"osa <link linkend=\"setupMageiaBootloader\">Mageia alglaaduri kasutamine</"
-"link>."
+"Kui arvutisse peaks olema paigaldatud teisigi operatsioonisüsteeme, püüab "
+"Mageia lisada need oma alglaadimismenüüsse. Kui Te seda ei soovi, klõpsake "
+"<guibutton>Järgmine</guibutton> ja eemaldage märge kastikesest <emphasis "
+"role=\"bold\">Võõraste operatsioonisüsteemide otsimine</emphasis>"
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:156
+#, fuzzy
+msgid ""
+"<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 align=\"center\" fileref="
+"\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata fileref=\"live-setupBootloader3.png\" align=\"center\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:166
+#, fuzzy
+msgid "<emphasis>Video mode</emphasis>"
+msgstr "<emphasis>Tootja</emphasis>"
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:159
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:167
+#, fuzzy
 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."
+"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 ""
 "<guilabel>Videorežiim:</guilabel> siin saab määrata ekraani suuruse ja "
 "värvisügavuse, mida alglaadur kasutab. Allapoole kolmnurgale klõpsates saab "
 "vaiida muute suuruse ja värvisügavuse valikute seast."
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:162
+#. 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>Tootja</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:173
+msgid ""
+"Select this option if you don't want a bootable Mageia, but would rather "
+"chain-load it from another OS. You will get a warning that the bootloader is "
+"missing. Click<emphasis> Ok</emphasis> if you are sure you understand the "
+"implications, and wish to proceed."
+msgstr ""
+
+#. 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=\"live-setupBootloader5.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:188
+#, fuzzy
+msgid "Other Options"
+msgstr "Valikud"
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:190
+msgid "Using an existing bootloader"
+msgstr "Olemasoleva alglaaduri kasutamine"
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:191
+#, fuzzy
+msgid ""
+"The exact procedure for adding Mageia to an existing bootloader is beyond "
+"the scope of this documentation. However in most cases it will involve "
+"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 ""
+"Täpne protseduur, kuidas lisada Mageia süsteem olemasolevale alglaadurile, "
+"väljub käesoleva abiteksti raamest, kuid enamasti tähendab see asjakohase "
+"alglaaduri paigaldamise programmi käivitamist, mis tuvastab ja lisab selle "
+"automaatselt. Uurige selle kohta lähemalt vastava operatsioonisüsteemi "
+"dokumentatsiooni."
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:199
+#, fuzzy
+msgid "Installing Without a Bootloader"
+msgstr "Mageia alglaaduri kasutamine"
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:200
+msgid ""
+"While you can opt to install Mageia without a bootloader (see section 2.1 "
+"Advanced), this is not recommended unless you absolutely know what you are "
+"doing, as without some form of bootloader your operating system will be "
+"unable to start."
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:207
+#, fuzzy
+msgid ""
+"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 ""
+"Selleks tuleb käsitsi muuta faili /boot/grub2/custom.cfg või kasutada "
+"rakendust <emphasis role=\"bold\">grub-customizer</emphasis> (selle leiab "
+"Mageia tarkvarahoidlast)."
+
+#. 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 ""
-"<emphasis role=\"bold\">ESP-i ega MBR-i ei puudutata</emphasis>: vt eespool "
-"osa <link linkend=\"setupChainLoading\">Ahellaadimise kasutamine</link>"
+"Täpsemat teavet annab meie wiki: <link ns2:href=\"https://wiki.mageia.org/en/"
+"Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link>"
 
 #. type: Content of: <section><info><title>
-#: en/setupSCSI.xml:3
+#: en/setupSCSI.xml:10
 msgid "Setup SCSI"
 msgstr "SCSI seadistamine"
 
@@ -4804,17 +5241,20 @@ msgstr "SCSI seadistamine"
 #.  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=\"dx2-setupSCSI.png\" align="
-"\"center\" xml:id=\"setupSCSI-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
 msgid ""
 "DrakX will normally detect hard disks correctly. However, with some older "
 "SCSI controllers it may be unable to determine the correct drivers to use "
@@ -4825,100 +5265,60 @@ msgstr ""
 "ja seetõttu ka ketast ära tunda."
 
 #. 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 ""
 "Kui nii peaks juhtuma, tuleb DrakX-ile käsitsi selgeks teha, millised SCSI "
 "seadmed teil on."
 
-#. type: Content of: <section><para>
-#: en/setupSCSI.xml:35
-msgid "DrakX should then be able to configure the drive(s) correctly."
-msgstr "Seejärel peaks DrakX olema võimeline kettad korrektselt seadistama."
-
 #. type: Content of: <section><info><title>
-#: en/soundConfig.xml:3
+#: en/soundConfig.xml:10
 msgid "Sound Configuration"
 msgstr "Heli seadistamine"
 
 #.  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
-msgid ""
-"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
-"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
-"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
-
-#. type: Content of: <section><para>
-#: en/soundConfig.xml:14
+#: en/soundConfig.xml:20
+#, 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."
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-soundConfig.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"soundConfig-im1\"/> </imageobject>"
 msgstr ""
-"Siin näeb draiveri nime, mille paigaldusprogramm on välja valinud teie "
-"helikaardile ja millest saab vaikimisi draiver."
+"<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 ""
-"Vaikimisi draiver peaks töötama probleemideta. Kui siiski esineb pärast "
-"paigaldamist probleeme heliga, andke käsk <command>draksound</command> või "
-"käivitage sama tööriist Mageia juhtimiskeskuses, valides seal külgpaneelil "
-"<guilabel>Riistvara</guilabel> ning klõpsates ilmuvas aknas ülal paremal "
-"asuvale ikoonile <guilabel>Heli seadistamine</guilabel>."
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:24
+#: 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 ""
-"Seejärel klõpsake <emphasis role=\"bold\">draksoundi</emphasis> ehk "
-"<emphasis role=\"bold\">Heli seadistamise</emphasis> tööriistas nupule "
-"<guibutton>Probleemi otsimine</guibutton>, kust leiab mitmeid häid "
-"soovitusi, kuidas hädast üle saada."
 
 #. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:30
+#: en/soundConfig.xml:43
 msgid "Advanced"
 msgstr "Muud valikud"
 
-#. type: Content of: <section><section><para>
-#: en/soundConfig.xml:33
-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 ""
-"Klõpsamisest nupule <emphasis role=\"bold\"><guibutton>Muud valikud</"
-"guibutton></emphasis> võib paigaldamise ajal abi olla, kui vaikimisi "
-"draiverit ei ole, küll on aga saada mitu draiverit ning te arvate, et "
-"paigaldusprogramm on valinud neist vale."
-
-#. type: Content of: <section><section><para>
-#: en/soundConfig.xml:38
-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 ""
-"Sellisel juhul saate valida mõne muu draiveri, kui klõpsate nupule <emphasis "
-"role=\"bold\"><guibutton>Suvalise draiveri valimine</guibutton></emphasis>."
-
 #. type: Content of: <section><info><title>
-#: en/takeOverHdConfirm.xml:3
+#: en/takeOverHdConfirm.xml:10
 msgid "Confirm hard disk to be formatted"
 msgstr "Kõvaketta vormindamise kinnitamine"
 
@@ -4928,74 +5328,79 @@ msgstr "Kõvaketta vormindamise kinnitamine"
 #.     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 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-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"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 ""
 "Klõpsake <guibutton>Tagasi</guibutton>, kui te ei ole oma valikus kindel."
 
-#. 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 ""
 "Klõpsake <guibutton>Edasi</guibutton>, kui olete kindel ning soovite "
 "kustutada kõvakettal kõik partitsioonid, kõik operatsioonisüsteemid ja üldse "
 "kõik andmed."
 
 #. type: Content of: <section><info><title>
-#: en/testing.xml:9
+#: en/testing.xml:3
 msgid "Testing Mageia as Live system"
 msgstr "Mageia proovimine Live-süsteemina"
 
 #. type: Content of: <section><section><info><title>
-#: en/testing.xml:14
+#: en/testing.xml:8
 msgid "Live mode"
 msgstr "Live-režiim"
 
+#. 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 ""
-"See ekraan ilmub, kui valida \"Mageia laadimine\". Kui seda ei juhtu, jõuate "
-"sammu <link linkend=\"doPartitionDisks\">Partitsioneerimine</link> juurde."
-
 #. type: Content of: <section><section><section><info><title>
-#: en/testing.xml:28
+#: en/testing.xml:21
 msgid "Testing hardware"
 msgstr "Riistvara järeleproovimine"
 
 #. 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 ""
 "Üks Live-režiimi eesmärke on järele proovida, kas Mageia suudab riistvara "
 "korrektselt hallata. Sel juhul saab näiteks Mageia juhtimiskeskuse riistvara "
@@ -5003,84 +5408,91 @@ msgstr ""
 "saab proovida enamiku seadmeid:"
 
 #. 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 "võrguliides: seda aitab seadistada 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 "videokaart: kui nägite eelmist ekraani, on sellega kõik korras"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:47
+#: en/testing.xml:40
 msgid "webcam:"
 msgstr "veebikaamera"
 
 #. 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 "helikaart: mingi kõll on juba kõlanud"
 
 #. 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 "printer: seda saab seadistada ja testlehekülje välja trükkida"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:59
+#: en/testing.xml:52
 msgid "scanner: scan a document from ..."
 msgstr "skanner: võimalik on dokument skannida"
 
 #. 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 ""
 "Kui kõik on korras, võib paigaldamisega jätkata. Kui mitte, siis saab "
 "lihtsalt väljuda."
 
-#. 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 ""
 "Siin langetatud seadistamisvalikud jäetakse paigaldamise käigus meelde."
 
 #. type: Content of: <section><section><section><info><title>
-#: en/testing.xml:72
+#: en/testing.xml:68
 msgid "Launch installation"
 msgstr "Paigaldamise käivitamine"
 
-#. 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 ""
 "Mageia LiveCD või LiveDVD paigaldamiseks kõvakettale või SSD-kettale "
 "klõpsake lihtsalt ikoonile \"Paigaldamine kõvakettale\". Ilmub näidatav "
 "ekraan ja seejärel samm <link linkend=\"doPartitionDisks"
 "\">Partitsioneerimine</link>, nagu ka otsepaigalduse korral."
 
+#. 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 "Mageia eemaldamine"
 
 #. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:9
+#: en/uninstall-Mageia.xml:18
 msgid ""
 "If Mageia didn't convince you or you can't install it correctly - in short "
 "you want get rid of it - that is your right and Mageia also gives you the "
@@ -5092,12 +5504,13 @@ msgstr ""
 "korral ka endale täielikult selja keerata."
 
 #. 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 ""
 "Kui olete oma andmed varundanud, taaskäivitage Mageia DVD ja valige "
 "<emphasis role=\"bold\">Päästesüsteem</emphasis> ning seejärel käsk "
@@ -5106,14 +5519,18 @@ msgstr ""
 "operatsioonisüsteemi valida."
 
 #. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:19
-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."
+#: en/uninstall-Mageia.xml:28
+#, fuzzy
+msgid ""
+"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 ""
 "Ruumi tagasisaamiseks Windowsis, mida Mageia oma partitsioonide alla võttis, "
 "valige <code>Start -> Control Panel -> Administrative Tools -> Computer "
@@ -5124,16 +5541,17 @@ msgstr ""
 "guibutton>. Ruum vabanebki."
 
 #. 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 ""
 "Kui teil on XP, saate luua uue partitsiooni ja selle vormindada (kas FAT32 "
 "või NTFS-vormingusse). Uuele partitsioonile antakse oma täht."
 
 #. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:30
+#: en/uninstall-Mageia.xml:49
 msgid ""
 "If you have Vista or 7, you have one more possibility, you can extend the "
 "existing partition that is at the left of the freed space. There are other "
@@ -5149,34 +5567,50 @@ msgstr ""
 "eelnevalt kõik oma vähegi olulisemad andmed."
 
 #. type: Content of: <section><info><title>
-#: en/unused.xml:9
+#: en/unused.xml:3
 msgid "Keep or delete unused material"
 msgstr "Kasutuseta materjali säilitamine või kustutamine"
 
+#. 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=\"reboot-im1\" fileref=\"live-"
+"reboot.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 ""
 "Sellel sammul otsib paigaldusprogramm tarbetuid lokaadi- ja "
 "riistvarapakette. Seejärel tehakse ettepanek need kustutada. See on üldiselt "
 "hea mõte, kui te just ei valmistu paigalduseks sootuks teistsugusel "
 "riistvaral."
 
+#. 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>"
@@ -5185,11 +5619,811 @@ 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 ""
 "Järgmisel sammul kopeeritakse failid kõvakettale. See võtab mõne minuti "
 "aega. Lõpus näeb mõnda aega tühja ekraani, millest ei tasu end heidutada "
 "lasta."
+
+#~ msgid "User and Superuser Management"
+#~ msgstr "Kasutajate ja administraatori haldamine"
+
+#~ msgid ""
+#~ "Every partition is shown to the left as: <emphasis role=\"bold\">Device "
+#~ "(capacity, mount point, type).</emphasis>"
+#~ msgstr ""
+#~ "Kõiki partitsioone näidatakse kujul <emphasis role=\"bold\">\"Seade"
+#~ "\" (\"Suurus\", \"Haakepunkt\", \"Tüüp\")</emphasis>."
+
+#~ 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>)."
+#~ msgstr ""
+#~ "<emphasis role=\"bold\">Seade</emphasis> koosneb järgmistest elementidest:"
+#~ "<emphasis role=\"bold\">kõvaketas</emphasis>, [<emphasis role=\"bold"
+#~ "\">kõvaketta nimi</emphasis> (täht)], <emphasis role=\"bold"
+#~ "\">partitsiooni number</emphasis> (näiteks <emphasis role=\"bold\">sda5</"
+#~ "emphasis>)."
+
+#~ msgid "In advanced tab, you will find more options about clock settings."
+#~ msgstr ""
+#~ "Muude valikute kaadril leiab rohkem võimalusi kellaaega täpsemalt "
+#~ "seadistada."
+
+#~ msgid "From a disc"
+#~ msgstr "Kettalt"
+
+#~ 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 ""
+#~ "Algkäivituse võib teha otse andmekandjalt, millele olete kirjutanud oma "
+#~ "tõmmise (CD-ROM, DVD-ROM vms). Tavaliselt tuleb andmekandja lihtsalt "
+#~ "asetada CD/DVD-seadmesse ning alglaadur käivitab arvuti taaskäivitamise "
+#~ "järel paigaldamise automaatselt. Kui seda ei juhtu, võib olla vajalik "
+#~ "BIOS ümber seadistada või vajutada vastavat klahvi, mis võimaldab valida "
+#~ "lisaseadme, millest arvuti käivitada."
+
+#~ msgid ""
+#~ "According to which hardware you have, and how it is configured, you get "
+#~ "either one or another of the two screens below."
+#~ msgstr ""
+#~ "Sõltuvalt teie riistvarast ja selle kehtivast seadistusest näete üht "
+#~ "kahest alltoodud ekraanist."
+
+#~ msgid "From a USB device"
+#~ msgstr "USB-pulgalt"
+
+#~ 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 ""
+#~ "Algkäivituse saab teha USB-pulgalt, millele kirjutasite ISO-tõmmise. "
+#~ "Sõltuvalt BIOS-e seadistusest võib arvuti otse käivituda USB-pulgalt, mis "
+#~ "on masinaga ühendatud. Kui seda ei juhtu, võib olla vajalik BIOS ümber "
+#~ "seadistada või vajutada vastavat klahvi, mis võimaldab valida lisaseadme, "
+#~ "millest arvuti käivitada. "
+
+#~ 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 "Keskel asuvas menüüs saab valida kolme võimaluse vahel:"
+
+#~ 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 ""
+#~ "Alglaadimine kõvakettalt: sel juhul käivitatakse süsteem kõvakettal, nagu "
+#~ "seda tehakse ka siis, kui andmekandjat (CD/DVD või USB-pulk) pole "
+#~ "masinaga ühendatud (Mageia 5 puhul see ei toimi)."
+
+#~ msgid "In the bottom menu, are the Boot Options:"
+#~ msgstr "Allservas asuvas menüüs leiab alglaadimisvalikud:"
+
+#~ msgid ""
+#~ "F1 - Help. Explain the options \"splash\", \"apm\", \"acpi\" and \"Ide\""
+#~ msgstr ""
+#~ "F1 - Abi. Selgitab valikuid \"splash\", \"apm\", \"acpi\" ja \"Ide\"."
+
+#~ msgid "F2 - Language. Choose the display language of the screens."
+#~ msgstr "F2 - keel. Ekraanil nähtava keele valimine."
+
+#~ msgid ""
+#~ "F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728"
+#~ msgstr "F3 - ekraanilahutus. Valida on tekst, 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 ""
+#~ "F6 - draiver. Jah või Ei. Süsteem on teadlik draiveriuuendusega lisaketta "
+#~ "olemasolust ning nõuab selle paigaldamise käigus selle ühendamist."
+
+#~ msgid ""
+#~ "F6 - Kernel options. This is a way to specify options according to your "
+#~ "hardware and the drivers to use."
+#~ msgstr ""
+#~ "F6 - kerneli võtmed. Siin saab määrata konkreetseid võtmeid, mida vajavad "
+#~ "teie riistvara ja kasutatavad draiverid."
+
+#~ msgid "First screen while booting on UEFI system from disk"
+#~ msgstr "Esimene ekraan UEFI süsteemi käivitamisel kettalt"
+
+#~ msgid ""
+#~ "You have only the choice to run Mageia in Live mode (first choice)  or to "
+#~ "process the installation (second choice)."
+#~ msgstr ""
+#~ "Siin on ainult kaks valikut: Mageia käivitamine live-režiimis (esimene "
+#~ "valik) või paigaldamine (teine valik)."
+
+#~ 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 ""
+#~ "Kõigil juhtudel on esimesteks sammudeks ühtmoodi keele, ajavööndi ja "
+#~ "klaviatuuri valimine, seejärel aga lähevad asjad lahku <link linkend="
+#~ "\"testing\">Live-režiimi lisasammude</link> tõttu."
+
+#~ msgid ""
+#~ "Depending on your selection here, you may be offered further screens to "
+#~ "fine-tune your choice."
+#~ msgstr ""
+#~ "Sõltuvalt siin langetatud valikutest võite näha täiendavaid ekraane, kus "
+#~ "saab valikut täpsustada."
+
+#~ msgid "The settings DrakX chose are usually good."
+#~ msgstr ""
+#~ "Valikud, mille on langetanud DrakX, on tavaliselt mõistlikud ja head."
+
+#~ 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=\"configureX_card_list-"
+#~ "im1\" align=\"center\" fileref=\"dx2-configureX_card_list.png\" revision="
+#~ "\"1\"/> </imageobject>"
+
+#~ 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 ""
+#~ "<emphasis role=\"bold\">Nonfree</emphasis> hoidlad tuleb kasutamiseks "
+#~ "spetsiaalselt lubada.  Seda saab teha pärast arvuti esimest "
+#~ "taaskäivitamist."
+
+#~ 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=\"configureX_chooser-im1\" "
+#~ "fileref=\"dx2-configureX_chooser.png\" align=\"center\" revision=\"1\"/> "
+#~ "</imageobject>"
+
+#~ msgid ""
+#~ "<emphasis><guibutton>Graphic card</guibutton></emphasis>: Choose your "
+#~ "card from the list if needed."
+#~ msgstr ""
+#~ "<emphasis><guibutton>Graafikakaart</guibutton></emphasis>: valige "
+#~ "vajaduse korral loetelust oma kaart."
+
+#~ msgid "Incorrect refresh rates may damage your monitor"
+#~ msgstr "Väärad sagedused võivad monitori kahjustada."
+
+#~ 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=\"configureX_monitor-im1\" "
+#~ "fileref=\"dx2-configureX_monitor.png\" align=\"center\" revision=\"1\"/> "
+#~ "</imageobject>"
+
+#~ msgid "<emphasis>Custom</emphasis>"
+#~ msgstr "<emphasis>Kohandatud</emphasis>"
+
+#~ msgid "<emphasis>Plug 'n Play</emphasis>"
+#~ msgstr "<emphasis>Plug'n Play</emphasis>"
+
+#~ msgid "the monitor manufacturers name"
+#~ msgstr "monitori nimi"
+
+#~ msgid "the monitor description"
+#~ msgstr "monitori kirjeldus"
+
+#~ 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 "Kui kõik on valmis, klõpsake nupule <guibutton>Tehtud</guibutton>."
+
+#~ 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-"
+#~ "doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" "
+#~ "align=\"center\"/> </imageobject>"
+
+#~ msgid "Use Free Space"
+#~ msgstr "Vaba ruumi kasutamine"
+
+#~ msgid "Use Free Space on a Windows Partition"
+#~ msgstr "Vaba ruumi kasutamine Windowsi partitsioonil"
+
+#~ msgid ""
+#~ "If you have unused space on an existing Windows partition, the installer "
+#~ "may offer to use it."
+#~ msgstr ""
+#~ "Kui olemasoleval Windowsi partitsioonil on vaba ruumi, võib "
+#~ "paigaldusprogramm seda kasutada."
+
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" "
+#~ "align=\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" "
+#~ "align=\"center\"/> </imageobject>"
+
+#~ msgid "Erase and use Entire Disk."
+#~ msgstr "Kogu ketta tühjendamine ja kasutamine"
+
+#~ msgid ""
+#~ "Note! This will erase ALL data on the selected hard drive. Take care!"
+#~ msgstr ""
+#~ "Tähelepanu! Sellega kustutatakse valitud kõvakettalt KÕIK andmed. Olge "
+#~ "ettevaatlik!"
+
+#~ msgid "Custom disk partitioning"
+#~ msgstr "Ketta jagamine oma tahtmist mööda"
+
+#~ 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 ""
+#~ "See tähendab, et kui ruumi on 160 GB või rohkem, loob paigaldusprogramm "
+#~ "kolm partitsiooni: 50 GB <emphasis role=\"bold\">/</emphasis> jaoks, 4 GB "
+#~ "<emphasis role=\"bold\">saaleala</emphasis> jaoks ja ülejäänu <emphasis "
+#~ "role=\"bold\">/home</emphasis> jaoks."
+
+#~ 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 align=\"center\" fileref="
+#~ "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition="
+#~ "\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid "January 2015"
+#~ msgstr "Jaanuar 2015"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+
+#~ msgid "Using a Mageia DVD"
+#~ msgstr "Mageia DVD kasutamine"
+
+#~ 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 ""
+#~ "Siin on näha Mageia DVD vaikimisi tervitusekraanid: esimest näeb UEFI "
+#~ "süsteemi, teist pärandsüsteemi korral."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
+
+#~ msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
+
+#~ 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):"
+#~ msgstr ""
+#~ "Sellel ekraanil on võimalik määrata mõned isiklikud eelistused (pange "
+#~ "tähele, et valikud <emphasis role=\"bold\">F1</emphasis> kuni <emphasis "
+#~ "role=\"bold\">F6</emphasis> on kasutusel ainult pärandsüsteemis):"
+
+#~ msgid ""
+#~ "Press <emphasis role=\"bold\">F2</emphasis> to have the installer use a "
+#~ "specific language for the installation."
+#~ msgstr ""
+#~ "<emphasis role=\"bold\">F2</emphasis> vajutamisel kasutab "
+#~ "paigaldusprogramm paigaldamisel valitavat keelt."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "Use the arrow keys to select the language then press <emphasis role=\"bold"
+#~ "\">Enter</emphasis>."
+#~ msgstr ""
+#~ "Valige nooleklahvidega liikudes keel ja vajutage klahvile <emphasis role="
+#~ "\"bold\">Enter</emphasis>."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+
+#~ msgid "Default: It doesn't alter anything in the default options."
+#~ msgstr "Vaikimisi: vaikimisi võtmeid ei muudeta."
+
+#~ msgid ""
+#~ "Safe Settings: Priority is given to the safer options at the price of a "
+#~ "performance detriment."
+#~ msgstr "Ohutud sätted: jõudlusele eelistatakse ohutust."
+
+#~ msgid ""
+#~ "When you select one of these entries, it modifies the default options "
+#~ "displayed in the <guilabel>Boot Options</guilabel> line."
+#~ msgstr ""
+#~ "Mõnda neist valikutest valides muutuvad vaikimisi võtmed, mida näeb real "
+#~ "<guilabel>Alglaadimise sätted</guilabel>."
+
+#~ 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 ""
+#~ "Mõne Mageia väljalaske puhul võib juhtuda, et klahviga <emphasis role="
+#~ "\"bold\">F6</emphasis> valitud kirjeid ei näe real <guilabel>Alglaadimise "
+#~ "sätted</guilabel>, aga neid siiski arvestatakse."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+
+#~ 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 ""
+#~ "Klahvile <emphasis role=\"bold\">F1</emphasis> vajutades ilmub uus aken "
+#~ "saadaolevate võtmetega. Valige neist vajalik ja vajutage klahvile "
+#~ "<emphasis role=\"bold\">Enter</emphasis> üksikasjade nägemiseks või "
+#~ "klahvile <emphasis role=\"bold\">Esc</emphasis> tervitusekraani juurde "
+#~ "naasmiseks."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+
+#~ 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 ""
+#~ "Siin on näidatud võtme splash üksikasjaliku kirjelduse aken. Vajutage "
+#~ "klahvile <emphasis role=\"bold\">Esc</emphasis> või valige "
+#~ "<guilabel>Tagasi alglaadimise sätete juurde</guilabel>, et minna tagasi "
+#~ "võtmete loendisse. Võtmeid saab lisada käsitsi reale "
+#~ "<guilabel>Alglaadimise sätted</guilabel>."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "The help is translated in the chosen language with <emphasis role=\"bold"
+#~ "\">F2</emphasis>."
+#~ msgstr ""
+#~ "Abi tõlgitakse keelde, mis on valitud klahviga <emphasis role=\"bold"
+#~ "\">F2</emphasis>."
+
+#~ 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 ""
+#~ "Täpsemat teavet kerneli võtmete kohta tavapärases ja UEFI süsteemis leiab "
+#~ "meie Wiki-lehelt <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 "Andmekandjate valik (mittevaba tarkvara)"
+
+#~ 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=\"media_selection-im1\" "
+#~ "align=\"center\" revision=\"1\" fileref=\"dx2-media_selection.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid "Summary of miscellaneous parameters"
+#~ msgstr "Seadistuste kokkuvõte"
+
+#~ msgid "<guilabel>Timezone</guilabel>"
+#~ msgstr "<guilabel>Ajavöönd</guilabel>"
+
+#~ msgid "<guilabel>Country / Region</guilabel>"
+#~ msgstr "<guilabel>Riik / Piirkond</guilabel>"
+
+#~ msgid "<guilabel>Bootloader</guilabel>"
+#~ msgstr "<guilabel>Alglaadur</guilabel>"
+
+#~ msgid "For more information, see <xref linkend=\"setupBootloader\"/>"
+#~ msgstr "Täpsemalt kõneleb sellest <xref linkend=\"setupBootloader\"/>"
+
+#~ msgid "<guilabel>User management</guilabel>"
+#~ msgstr "<guilabel>Kasutajate haldamine</guilabel>"
+
+#~ msgid "<guilabel>Services</guilabel>:"
+#~ msgstr "<guilabel>Teenused</guilabel>"
+
+#~ msgid "For more information, see <xref linkend=\"configureServices\"/>"
+#~ msgstr "Täpsemalt kõneleb sellest <xref linkend=\"configureServices\"/>"
+
+#~ msgid "<guilabel>Keyboard</guilabel>:"
+#~ msgstr "<guilabel>Klaviatuur</guilabel>"
+
+#~ msgid "<guilabel>Mouse</guilabel>:"
+#~ msgstr "<guilabel>Hiir</guilabel>"
+
+#~ msgid "<guilabel>Sound card</guilabel>:"
+#~ msgstr "<guilabel>Helikaart</guilabel>"
+
+#~ 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 ""
+#~ "Paigaldusprogramm kasutab vaikimisi draiverit, kui see on olemas. "
+#~ "Võimalus valida teist draiverit antakse ainult siis, kui helikaardile on "
+#~ "olemas mitu draiverit, aga ükski neist ei ole vaikimisi draiver."
+
+#~ msgid "<guilabel>Graphical interface</guilabel>:"
+#~ msgstr "<guilabel>Graafiline kasutajaliides</guilabel>"
+
+#~ msgid "<guilabel>Network</guilabel>:"
+#~ msgstr "<guilabel>Võrk</guilabel>"
+
+#~ msgid "<guilabel>Proxies</guilabel>:"
+#~ msgstr "<guilabel>Puhverserverid</guilabel>"
+
+#~ msgid "<guilabel>Security Level</guilabel>:"
+#~ msgstr "<guilabel>Turbetase</guilabel>"
+
+#~ msgid "Check the option which best suits your usage."
+#~ msgstr "Valige tase, mis paistab Teie vajadusi kõige paremini rahuldavat."
+
+#~ msgid "<guilabel>Firewall</guilabel>:"
+#~ msgstr "<guilabel>Tulemüür</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 ""
+#~ "Tulemüür on mõeldud tõkkeks Teie tähtsate andmete ja internetis luuravate "
+#~ "röövloomade vahel, kes üritavad neid varastada või rikkuda."
+
+#~ 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 ""
+#~ "Valige teenused, millel lubate oma süsteemile ligi pääseda. Valik sõltub "
+#~ "mõistagi sellest, milleks Te oma arvutit kasutada soovite. Täpsemat "
+#~ "teavet vt <xref linkend=\"firewall\"/>."
+
+#~ 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=\"securityLevel-im1\" "
+#~ "align=\"center\" fileref=\"dx2-securityLevel.png\" revision=\"1\"/> </"
+#~ "imageobject>"
+
+#~ msgid "64 bit architecture only."
+#~ msgstr "Ainult 64-bitine arhitektuur."
+
+#~ 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 ja sha1sum on tööriistad ISO terviklikkuse kontrollimiseks. "
+#~ "Kasutada tuleks ainult üht neist. Hoidke üks neist varuks <link linkend="
+#~ "\"integrity\">edasiseks kasutamiseks</link>. Seejärel ilmub selline aken:"
+
+#~ msgid "Select the Save File option, then, click OK."
+#~ msgstr "Valige faili salvestamine ja klõpsake OK."
+
+#~ msgid ""
+#~ "To recover the original capacity, you must redo partitioning and re-"
+#~ "format the USB stick."
+#~ msgstr ""
+#~ "Algse mahu taastamiseks tuleb USB-pulk uuesti partitsioneerida ja "
+#~ "vormindada."
+
+#~ msgid "Install"
+#~ msgstr "Paigaldamine"
+
+#~ msgid "Upgrade"
+#~ msgstr "Uuendamine"
+
+#~ 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 ""
+#~ "Kui soovite mingil hetkel paigaldamise katkestada, võite ka teha arvutile "
+#~ "taaskäivituse, aga palun mõelge enne seda hoolikalt järele. Kui "
+#~ "partitsioon on vormindatud või uuendusi on hakatud paigaldama, ei ole "
+#~ "arvuti enam varasemas olekus ning taaskäivitamise tulemus võib olla "
+#~ "mittetöötav masin. Kui te ikkagi olete kindel, et just taaskäivitus on "
+#~ "õige samm, minge tekstiterminali, vajutades korraga kolme klahvi "
+#~ "<guilabel>Alt Ctrl F2</guilabel>. Seejärel vajutage taaskäivitamiseks "
+#~ "korraga klahve <guilabel>Alt Ctrl Delete</guilabel>"
+
+#~ 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 ""
+#~ "Teil palutakse määrata klaviatuuripaigutus, mida soovite Mageias "
+#~ "kasutada. Vaikimisi valitu vastab keelele ja ajavööndile, mille varem "
+#~ "valisite."
+
+#~ msgid "Mageia uses UTF-8 (Unicode) support by default."
+#~ msgstr "Mageia toetab vaikimisi UTF-8 (Unicode)."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-selectMouse.png\" align=\"center\" "
+#~ "format=\"PNG\" > </imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectMouse.png\" "
+#~ "format=\"PNG\" /> </imageobject>"
+
+#~ msgid "By default, Mageia uses exclusively:"
+#~ msgstr "Vaikimisi kasutab Mageia üht kahest võimalusest:"
+
+#~ msgid "GRUB2-efi for a UEFI system."
+#~ msgstr "Grub2-efi UEFI süsteemi korral"
+
+#~ msgid "The Mageia graphical menus are nice :)"
+#~ msgstr "Mageia graafiline menüü näeb kena välja :)"
+
+#~ 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 fileref=\"dx2-"
+#~ "setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata xml:id=\"setupBootloader-im1\" fileref="
+#~ "\"live-setupBootloader.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "Don't modify the <emphasis role=\"bold\">Boot Device</emphasis> unless "
+#~ "you really know what you are doing."
+#~ msgstr ""
+#~ "Ärge muutke <emphasis role=\"bold\">Alglaadimisseadet</emphasis>, kui te "
+#~ "pole täiesti kindel, et teate, mida teete."
+
+#~ 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 ""
+#~ "UEFI süsteemi korral on kasutajaliides pisut teistsugune, sest te ei saa "
+#~ "valida graafilise menüü <emphasis role=\"bold\">kasutamist</emphasis> või "
+#~ "<emphasis role=\"bold\">kasutamata jätmist</emphasis>."
+
+#~ 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-"
+#~ "setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "By default, and according to your system, Mageia writes one of the "
+#~ "following:"
+#~ msgstr "Vaikimisi kirjutab Mageia sõltuvalt süsteemist uue:"
+
+#~ msgid "a GRUB2-efi bootloader into the ESP"
+#~ msgstr "Grub2-efi alglaaduri ESP-le"
+
+#~ msgid "Using chain loading"
+#~ msgstr "Ahellaadimise kasutamine"
+
+#~ 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>."
+#~ msgstr ""
+#~ "Kui Te ei soovi alglaaditavat Mageiat, vaid tahate seda laadida mõnest "
+#~ "teisest operatsioonisüsteemist, siis klõpsake <guibutton>Järgmine</"
+#~ "guibutton>, seejärel <guibutton>Muu</guibutton> ja märkige ära kastike "
+#~ "<guilabel>ESP-i ega MBR-i ei puudutata</guilabel>."
+
+#~ 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-"
+#~ "setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-setupBootloader4.png\" "
+#~ "align=\"center\"/> </imageobject>"
+
+#~ msgid ""
+#~ "You will get a warning that the bootloader is missing, ignore it by "
+#~ "clicking <guibutton>OK</guibutton>."
+#~ msgstr ""
+#~ "Näete hoiatust, et alglaadur puudub. Eirake seda ja klõpsake "
+#~ "<guibutton>Olgu</guibutton>."
+
+#~ msgid "First page"
+#~ msgstr "Esimene kaart"
+
+#~ msgid "<guilabel>Advanced</guilabel>"
+#~ msgstr "<guilabel>Edasijõudnuile</guilabel>"
+
+#~ msgid "Next page"
+#~ msgstr "Järgmine kaart"
+
+#~ msgid ""
+#~ "<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
+#~ "\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
+#~ msgstr ""
+#~ "<guilabel>Võõraste operatsioonisüsteemide otsimine</guilabel>: vt eespool "
+#~ "osa <link linkend=\"setupMageiaBootloader\">Mageia alglaaduri kasutamine</"
+#~ "link>."
+
+#~ msgid ""
+#~ "<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above "
+#~ "<link linkend=\"setupChainLoading\">Using the chain loading</link>"
+#~ msgstr ""
+#~ "<emphasis role=\"bold\">ESP-i ega MBR-i ei puudutata</emphasis>: vt "
+#~ "eespool osa <link linkend=\"setupChainLoading\">Ahellaadimise kasutamine</"
+#~ "link>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-setupSCSI.png\" "
+#~ "align=\"center\" xml:id=\"setupSCSI-im1\" revision=\"1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-setupSCSI.png\" "
+#~ "align=\"center\" xml:id=\"setupSCSI-im1\" revision=\"1\"/> </imageobject>"
+
+#~ msgid "DrakX should then be able to configure the drive(s) correctly."
+#~ msgstr "Seejärel peaks DrakX olema võimeline kettad korrektselt seadistama."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" "
+#~ "xml:id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" "
+#~ "xml:id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
+
+#~ 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 ""
+#~ "Siin näeb draiveri nime, mille paigaldusprogramm on välja valinud teie "
+#~ "helikaardile ja millest saab vaikimisi draiver."
+
+#~ 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 ""
+#~ "Vaikimisi draiver peaks töötama probleemideta. Kui siiski esineb pärast "
+#~ "paigaldamist probleeme heliga, andke käsk <command>draksound</command> "
+#~ "või käivitage sama tööriist Mageia juhtimiskeskuses, valides seal "
+#~ "külgpaneelil <guilabel>Riistvara</guilabel> ning klõpsates ilmuvas aknas "
+#~ "ülal paremal asuvale ikoonile <guilabel>Heli seadistamine</guilabel>."
+
+#~ 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 ""
+#~ "Seejärel klõpsake <emphasis role=\"bold\">draksoundi</emphasis> ehk "
+#~ "<emphasis role=\"bold\">Heli seadistamise</emphasis> tööriistas nupule "
+#~ "<guibutton>Probleemi otsimine</guibutton>, kust leiab mitmeid häid "
+#~ "soovitusi, kuidas hädast üle saada."
+
+#~ 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 ""
+#~ "Klõpsamisest nupule <emphasis role=\"bold\"><guibutton>Muud valikud</"
+#~ "guibutton></emphasis> võib paigaldamise ajal abi olla, kui vaikimisi "
+#~ "draiverit ei ole, küll on aga saada mitu draiverit ning te arvate, et "
+#~ "paigaldusprogramm on valinud neist vale."
+
+#~ 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 ""
+#~ "Sellisel juhul saate valida mõne muu draiveri, kui klõpsate nupule "
+#~ "<emphasis role=\"bold\"><guibutton>Suvalise draiveri valimine</"
+#~ "guibutton></emphasis>."
+
+#~ 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 format=\"PNG\" fileref=\"live-"
+#~ "takeOverHdConfirm.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"classical\"> <imagedata format=\"PNG\" fileref=\"dx2-"
+#~ "takeOverHdConfirm.png\" align=\"center\"/> </imageobject>"
+
+#~ msgid ""
+#~ "You get this screen if you selected \"Boot Mageia\". If not, you get the "
+#~ "\"<link linkend=\"doPartitionDisks\">Partitioning</link> step\""
+#~ msgstr ""
+#~ "See ekraan ilmub, kui valida \"Mageia laadimine\". Kui seda ei juhtu, "
+#~ "jõuate sammu <link linkend=\"doPartitionDisks\">Partitsioneerimine</link> "
+#~ "juurde."
diff --git a/docs/docs/stable/installer/eu.po b/docs/docs/stable/installer/eu.po
index ae3e6ae7..44047801 100644
--- a/docs/docs/stable/installer/eu.po
+++ b/docs/docs/stable/installer/eu.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2018-04-19 16:32+0300\n"
+"POT-Creation-Date: 2019-01-06 12:43+0200\n"
 "PO-Revision-Date: 2017-08-18 17:14+0000\n"
 "Last-Translator: Egoitz Rodriguez Obieta <egoitzro@gmail.com>\n"
 "Language-Team: Basque (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -22,12 +22,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Content of: <section><info><title>
-#: en/acceptLicense.xml:25
+#: en/acceptLicense.xml:31
 msgid "License and Release Notes"
 msgstr "Lizentzia eta Askatze Oharrak"
 
 #. type: Content of: <section><mediaobject>
-#: en/acceptLicense.xml:29
+#: en/acceptLicense.xml:35
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
@@ -43,81 +43,87 @@ msgstr ""
 "\"live-license.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/acceptLicense.xml:40
+#: en/acceptLicense.xml:46
 msgid "License Agreement"
 msgstr "Lizentzia Kontratua"
 
-#. 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 ""
 "<application>Mageia</application> instalatu aurretik, irakurri arretaz "
 "baldintzak eta lizentzia."
 
-#. 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 ""
 "Baldintza horiek <application>Mageia</application> distribuzio osoaari "
 "aplikatzen dira eta jarraitzeko onartu behar dituzu."
 
-#. 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 ""
 "Onartzeko, hautatu <guilabel>Ados</guilabel> eta egin klik "
 "<guibutton>Hurrengo</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 ""
 "Aukeratu baduzu baldintza hauek ez onestea, irakurri duzula ere baloratuko "
 "dugu. <guibutton>Irten</guibutton> Klik eginda zure ordenagailua "
 "berrabiaraziko da."
 
 #. type: Content of: <section><section><info><title>
-#: en/acceptLicense.xml:63
+#: en/acceptLicense.xml:76
 msgid "Release Notes"
 msgstr "Askapen Oharrak"
 
 #. 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 ""
 "Informazio garrantzitsua <application>Mageia</application> oharra honi buruz "
 "ematen da eta <guibutton>argitalpen oharrak</guibutton> botoian klik eginez "
 "daude eskuragarri."
 
 #. 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 "eu"
 
 #. 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 "Baliabide Aukeraketa (Konfiguratu Instalazio Baliabide Osagarriak)"
 
 #.  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 ""
 "Pantaila honek dagoeneko aitortutako biltegi zerrenda erakusten du. Pakete "
 "iturri batzuk gehi ditzakezu disko optikoa edo urrutiko iturri gisa. "
@@ -143,25 +149,25 @@ msgstr ""
 "zehazten dute."
 
 #. 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 "Sare iturri batentzat, bi pausu jarraitu beharko ditugu:"
 
 #. 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 "Sarea aukeratzea eta aktibatzea, dagoeneko ez baldin badago."
 
 #. 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 ""
 "Aukeratu ispilu bat, edo URL bat (lehen sarrera) zehaztu. Noiz ispilu "
 "zerbitzari bat hautatuta mageia biltegi administratze guztien aukeraketa "
@@ -169,15 +175,15 @@ msgstr ""
 "batekin, biltegi-zehatzak edo zure NFS instalazioa izenda dezakezu."
 
 #. 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 ""
 "64 biteko instalazio bat eguneratzen ari bazara 32 biteko pakete batzuk izan "
 "ditzake, pantaila hau erabiltzea gomendatzen da online ispilu bat gehitzeko, "
@@ -187,18 +193,25 @@ msgstr ""
 "32 biteko paketeak han topatuko ditu."
 
 #. type: Content of: <section><info><title>
-#: en/addUser.xml:3
-msgid "User and Superuser Management"
-msgstr "Erabiltzaile eta Supererabiltzaileen Kudeaketa"
+#: en/addUser.xml:9
+#, fuzzy
+msgid "User Management"
+msgstr "Erabiltzailearen Kudeaketa Aurreratua"
 
 #.  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 format=\"PNG\" fileref="
 "\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -206,21 +219,21 @@ msgstr ""
 "\"PNG\" 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 "Ezarri administratzaile (root) pasahitza:"
 
 #. 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 ""
 "Administratzaile / supererabiltzaile pasahitz bat konfiguratzea "
 "gomendagarria da, Linux-en <emphasis>root pasahitz</emphasis> bezala "
@@ -232,28 +245,28 @@ msgstr ""
 "egiaztatzeko."
 
 #. 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 ""
 "Pasahitz guztiak kasu sentikorrak dira, onena da letrak (maiuskulak eta "
 "minuskulak), zenbakiak eta bestelako karaktereak nahastea pasahitz batean."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:42
+#: en/addUser.xml:57
 msgid "Enter a user"
 msgstr "Sartu erabiltzaile bat"
 
 #. 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 ""
 "Hemen erabiltzaile bat gehi daiteke. Erabiltzaile batek administratzaileak "
 "baino baimen gutxiago ditu, baina nahikoak Interneten nabigatzeko, aplikazio "
@@ -261,43 +274,64 @@ msgstr ""
 "ordenagailuarekin edozer egiteko."
 
 #. 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\">Aurreratua</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>Ikonoa</guibutton>: botoi honetan klik egiten baduzu, "
 "erabiltzaile ikonoa aldatu egingo da."
 
 #. 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\">Aurreratua</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>Benetako Izena</guilabel>:  Erabiltzaileen benetako izena sartu "
 "ezazu testu-kutxa honetan."
 
 #. 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\">Aurreratua</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>Saio Hasiera Izena</guilabel>: Erabiltzailearen saio-hasierako "
 "izena hemen sartzen da edo drakx bertsioari uzten diozu erabiltzaileen "
 "benetako izena erabiltzen.<emphasis> Saio-hasiera-izena maiuskula eta "
 "minuskulei sentibera da.</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\">Aurreratua</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>Pasahitza</guilabel>: Testu-kutxa honetan erabiltzaile-pasahitza "
 "idatzi behar izango zenuke. Ezkutu bat agertzen da pasahitzaren indarra "
@@ -305,27 +339,27 @@ msgstr ""
 "\"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>Pasahitza (berriz)</guilabel>: Idatzi berriro pasahitza eta DrakX "
 "lehen ezarritakoarekin bat etortzea egiaztatuko du."
 
 #. 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 ""
 "Mageia instalatzen duzun bitartean gehitutako edozein erabiltzaile, bai "
 "irakur eta idazteko babestutako etxe direktorioa izango du (umask=0027)."
 
 #. 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</"
@@ -337,59 +371,59 @@ msgstr ""
 "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 "Sarbide baimena instalatu ondoren ere aldatu egin daiteke."
 
 #. 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 "Erabiltzailearen Kudeaketa Aurreratua"
 
 #. 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 ""
 "Botoi <guibutton>aurreratua</guibutton> sakatzen bada konfigurazioa gehitzen "
 "duen erabiltzailearentzat editatzea baimentzen dion pantaila eskaintzen zaio."
 
 #. 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>Shell</guilabel>: Beherapen hori zerrendan behera ematen dio "
 "erabiltzaileari aurreko pantailara ere gehitzen ari zaren erabilitako shell-"
 "a aldatzeko aukera, aukerak dira Bash, Dash eta 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>Erabiltzaile ID</guilabel>: ID erabiltzailea hemen jar diezaiokezu "
 "aurreko pantailan gehitu duzun erabiltzaileari. Hau zenbaki bat da. Hutsik "
 "utzi ezazu ez badakizu zer egiten ari zaren."
 
 #. 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 "Aukeratu muntatze-puntuak"
 
@@ -404,16 +438,17 @@ msgstr "Aukeratu muntatze-puntuak"
 #.        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="
@@ -423,56 +458,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 ""
 "Hemen ordenagailuan aurkitutako Linux partizioak ikusi ahal izango dituzu. "
 "Gomendioarekin ados ez bazaude <application>DrakX</application>, muntatze "
 "puntu alda ditzake."
 
-#. 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 ""
-"Edozer aldatzen baduzu, ziurtatu oraindik <literal>/</literal> (root) "
-"partizioa duzual."
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:46
-#, fuzzy
-msgid ""
-"Every partition is shown to the left as: <emphasis role=\"bold\">Device "
-"(capacity, mount point, type).</emphasis>"
-msgstr ""
-"Partizio bakoitza honela erakutsiko da: \"Gailua\" (\"Tamaina\", \"Muntatze "
-"puntua\", \"Mota\")."
-
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:50
+#: en/ask_mntpoint_s.xml:55
 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 ""
 "Partizio batzuk badituzu, muntai puntu ezberdinak aukera ditzakezu zerrenda "
 "zabaltzen, <literal>/</literal>, <literal>/home</literal> eta <literal>/var</"
@@ -482,7 +498,7 @@ msgstr ""
 "instalazioko home partiziorako."
 
 #. 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 "
@@ -492,203 +508,259 @@ msgstr ""
 "dezakezu."
 
 #. type: Content of: <section><warning><para>
-#: en/ask_mntpoint_s.xml:69
+#: en/ask_mntpoint_s.xml:79
+#, fuzzy
+msgid ""
+"If you make any changes here, ensure you still have a <filename>/</filename> "
+"(root) partition."
+msgstr ""
+"Edozer aldatzen baduzu, ziurtatu oraindik <literal>/</literal> (root) "
+"partizioa duzual."
+
+#. type: Content of: <section><tip><para>
+#: en/ask_mntpoint_s.xml:84
 #, 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 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 ""
 "Aukeratu <guibutton>Aurrekoa</guibutton> zein aukeratu seguru ez bazau, eta "
 "ondoren markatu <guilabel>Partizio pertsonalizatua</guilabel>. Hurrengo "
 "pantailan, partizio batean klik egin dezakezu bere tamaina eta mota ikusteko."
 
 #. 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 ""
 "Muntatze puntu zuzenak direla ziur bazaude, egin klik <guibutton>Hurrengoa</"
 "guibutton>, eta aukeratu formatua eman edo DrakX iradokitutako partizioa(k) "
 "gobernatu soilik edo baita batzuk gehiago nahi dituzun."
 
 #. type: Content of: <section><info><title>
-#: en/bestTime.xml:10
-msgid "Clock settings"
+#: en/bestTime.xml:5
+#, fuzzy
+msgid "Clock Settings"
 msgstr "Erlojuaren ezarpenak"
 
 #. 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 ""
 "Urrats honetan, zein ordutan dagoen zure barneko erloju ezarrita hautatu "
 "behar duzu, bai tokiko ordua edo UTC denbora."
 
 #. type: Content of: <section><para>
-#: en/bestTime.xml:23
-msgid "In advanced tab, you will find more options about clock settings."
+#: en/bestTime.xml:14
+msgid ""
+"In the <emphasis>Advanced</emphasis> tab, you can enable automatic time "
+"synchronization and specify an NTP server."
 msgstr ""
-"Fitxa aurreratuan, erloju ezarpenei buruzko aukera gehiago aurkituko duzu."
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:1
+#: en/bootLive.xml:6
 msgid "Boot Mageia as Live system"
 msgstr "Abiatu Mageia Zuzeneko sistema bezala"
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:1
+#: en/bootLive.xml:10
 msgid "Booting the medium"
 msgstr "Euskarria abiarazten"
 
-#. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:1
-msgid "From a disc"
-msgstr "Diskotik"
-
-#. 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 ""
-"Zuzenean abiarazi dezakezu irudia erre duzun (CD-ROM, DVD-ROM ...) "
-"baliabidetik. Normalean zure CD/DVD unitatean txertatzea besterik ez da "
-"behar instalazioa automatikoki abiarazteko ordenagailua berrabiarazi "
-"ondoren. Hori gertatzen ez bada BIOS-a konfiguratu beharko zenuke edo "
-"zeinetatik ordenagailua martxan jarriko den periferikoa aukeratzea eskainiko "
-"zaituen tekla bati zapaldu."
+#. 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 ""
-"Hardwarea eta konfiguratuta arabera nola dagoen, hurrengo bat edo bi "
-"pantailetako beste bat lortzen da."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:7
-msgid "From a USB device"
-msgstr "USB gailu batetik"
+#. 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 ""
-"Zure irudia ISO irauli duzun USB gailu horretatik abia dezakezu. Zure BIOS "
-"ezarpenen arabera, abiarazketa agian zuzenean USB gailua dagoeneko portu "
-"batean sartuta dagoela. Hori gertatzen ez bada BIOS-a konfiguratu beharko "
-"zenuke edo zeinetatik ordenagailua martxan jarriko den periferikoa "
-"aukeratzea eskainiko zaituen tekla bati zapaldu."
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:12
+#: en/bootLive.xml:35
 msgid "In BIOS/CSM/Legacy mode"
 msgstr "BIOS/CSM/Legacy moduan"
 
-#. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:12
-msgid "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
+#. type: Content of: <section><section><itemizedlist><title>
+#: en/bootLive.xml:38
+msgid "Main Menu"
 msgstr ""
-"<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
-
-#. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:12
-msgid "First screen while booting in BIOS mode"
-msgstr "Lehen pantaila BIOS moduan abiarazten den bitartean"
 
-#. type: Content of: <section><section><para>
-#: en/bootLive.xml:12
-msgid "In the middle menu, you have the choice between three actions:"
-msgstr "Erdiko menuan, hiru ekintzen artean erabaki behar duzu:"
+#. 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\">Partizioaren tamaina:</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:13
+#: en/bootLive.xml:41
 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."
+"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 ""
-"Mageia Abiarazi: Horrek 5 Mageia konektatutako baliabidetik hasiko dela esan "
-"nahi du (CD / DVDa edo USB memoria) diskoan ezer idatzi gabe , beraz, "
-"sistema oso geldoa espero da. Behin abiatuta, instalazioa jarrai dezakezu "
-"disko gogor batean."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:16
+#: en/bootLive.xml:42
+#, fuzzy
+msgid "Once the boot is done, you can proceed to the installation."
+msgstr ""
+"Hemen egin dituzun konfigurazio ezarpenak instalaziorako mantenduko dira."
+
+#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/bootLive.xml:45 en/bootLive.xml:57
+#, fuzzy
 msgid ""
-"Install Mageia: This choice will directly install Mageia on a hard disk."
+"<emphasis role=\"bold\">+ use non-free video drivers (slower to boot)</"
+"emphasis>"
+msgstr "<emphasis role=\"bold\">Partizioaren tamaina:</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\">Partizioaren tamaina:</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 ""
 "Mageia Instalatu: aukera hau zuzenean instalatu egingo da Mageia disko "
 "gogorrean."
 
+#. 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:65
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-bootCSM.png\" align=\"center\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+"align=\"center\"/> </imageobject>"
+
+#. type: Content of: <section><section><mediaobject><caption><para>
+#: en/bootLive.xml:69
+msgid "First screen while booting in BIOS mode"
+msgstr "Lehen pantaila BIOS moduan abiarazten den bitartean"
+
+#. 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:75
+#, fuzzy
+msgid "<keycap>F1</keycap> <emphasis role=\"bold\">Help</emphasis>"
+msgstr "<emphasis role=\"bold\">Aurreratua</emphasis>"
+
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:17
+#: en/bootLive.xml:76
 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)."
+"Within any of the <keycap>F2</keycap> to <keycap>F6</keycap> options, you "
+"can view relevant help by pressing <keycap>F1</keycap>."
 msgstr ""
-"Disko gogorretik abiarazi: aukera honek aukera ematen du disko gogorretik "
-"abiarazteko, ohikoa den bezala, (CD/DVD edo USB) baliabidea konektatuta ez "
-"dagoenean. (Mageia 5-ean ez du funtzionatzen)."
 
-#. type: Content of: <section><section><para>
-#: en/bootLive.xml:19
-msgid "In the bottom menu, are the Boot Options:"
-msgstr "Menuaren azpikaldean, Abio Aukerak daude:"
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:81
+#, fuzzy
+msgid "<keycap>F2</keycap> <emphasis role=\"bold\">Language</emphasis>"
+msgstr "<emphasis role=\"bold\">Aurreratua</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:19
+#: en/bootLive.xml:82
 msgid ""
-"F1 - Help. Explain the options \"splash\", \"apm\", \"acpi\" and \"Ide\""
+"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 ""
-"F1 - Laguntza. Azaldu aukerak \"splash\", \"APM\", \"acpi\" eta \"Ide\""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:20
-msgid "F2 - Language. Choose the display language of the screens."
-msgstr "F2 - Hizkuntza. Aukeratu pantailen hizkuntza."
+#: en/bootLive.xml:87
+#, fuzzy
+msgid "<keycap>F3</keycap> <emphasis role=\"bold\">Video Mode</emphasis>"
+msgstr "<emphasis role=\"bold\">Aurreratua</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:89
+#, fuzzy
+msgid ""
+"If needed, change the screen resolution by pressing <keycap>F3</keycap>. "
+"Options are: 640x480, 800x600, 1024x768."
+msgstr "Aldatu pantailaren bereizmena F3 tekla (Ondare moduan soilik) sakatuz."
 
 #. 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:93
+#, fuzzy
+msgid "<keycap>F4</keycap> <emphasis role=\"bold\">Source</emphasis>"
+msgstr "<emphasis role=\"bold\">Aurreratua</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: 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 - Pantailaren bereizmena. Aukeratu testua, 640x400, 800x600, 1024x728 "
-"artean"
 
 #. 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 edo besteak. Normalean, instalazioa txertatuko "
 "instalazio euskarri batetik egiten da. Hemen, hautatu beste iturri bat, FTP "
@@ -697,123 +769,172 @@ msgstr ""
 "eskuragarri."
 
 #. 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\">Aurreratua</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 - Driver. Bai edo Ez. Sistemak disko optikoak ontrolatzailea "
-"eguneraketarik duen jakitun da eta instalazio prozesuan zehar txertatzeko "
-"eskatzen du."
 
 #. 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\">Partizioaren tamaina:</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:106
+msgid ""
+"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 ""
-"F6 - Kernel options. This is a way to specify options according to your "
-"hardware and the drivers to use."
+"<emphasis role=\"bold\">Default:</emphasis> splash quiet noiswmd resume "
+"audit=0"
+msgstr "<emphasis role=\"bold\">Aurreratua</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 ""
+"- ACPI-rik gabe (Advanced Configuration and Power Interface), energia-"
+"administrazioa ez da kontuan hartzen."
+
+#. 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 ""
+"- APIC-a Lokalik (Local Advanced Programmable Interrupt Controller) gabe, "
+"CPU-aren etenez dihardu. Aukera hau aukeratu ezazu eskatzen bazaizu."
+
+#. 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 - Kernel aukera. Hau zure hardware eta gidarien erabileraren araberako "
-"aukerak zehazteko modu bat da."
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:29
+#: en/bootLive.xml:139
 msgid "In UEFI mode"
 msgstr "UEFI moduan"
 
 #. 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 "Lehen pantaila diskotik UEFI sistema abiaraztean"
+#: en/bootLive.xml:146
+#, fuzzy
+msgid "First screen while booting in UEFI mode"
+msgstr "Lehen pantaila BIOS moduan abiarazten den bitartean"
 
 #. 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 ""
-"Aukera bakarra duzu Mageia Live moduan exekutatzeko (lehenengo aukera) edo "
-"instalazioa prozesatzeko (bigarren aukera)."
 
-#. 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 ""
-"USB batetik abiarazi baduzu, hau da, aurreko lerroetako kopia bat bi lerro "
-"osagarrirekin lortzen dira \"USB\" atzizkiarekin. Haiek aukeratu behar "
-"dituzu."
+"Mageia Abiarazi: Horrek 5 Mageia konektatutako baliabidetik hasiko dela esan "
+"nahi du (CD / DVDa edo USB memoria) diskoan ezer idatzi gabe , beraz, "
+"sistema oso geldoa espero da. Behin abiatuta, instalazioa jarrai dezakezu "
+"disko gogor batean."
 
-#. 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 ""
-"Kasu bakoitzean, lehen urrats bera aukeratu hizkuntza, ordu-eremua\n"
-"eta teklatua, ondoren, prozesu ezberina da, <link linkend=\"testing\">Live "
-"moduan urrats osagarriekin</link>."
 
 #. type: Content of: <section><info><title>
-#: en/chooseDesktop.xml:3
+#: en/chooseDesktop.xml:16
 msgid "Desktop Selection"
 msgstr "Idaztegi hautaketa"
 
 #. 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 ""
-"Zure hautapena arabera hemen, pantaila gehiago eskaini ahal izango duzu zure "
-"aukera doitzeko."
 
 #. 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 ""
 "Aukeraketa pusuen ondoren, paketeen instalazioan zehar aurkezpen bat ikusiko "
 "duzu. Aurkezpen hau <guilabel>Xehetasunak</guilabel> sakatuz desaktiba "
 "daiteke."
 
 #. 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 format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
 "align=\"center\"/> </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 ""
 "Nahiago duzun idazmahaiko ingurunea, <application>KDE</application> edo "
 "<application>Gnome</application> aukera itzazu. Biek aplikazio erabilgarri "
@@ -829,8 +950,9 @@ msgid "Package Group Selection"
 msgstr "Pakete-taldearen hautapena"
 
 #. 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
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
 "\" align=\"center\"/> </imageobject>"
@@ -839,7 +961,7 @@ msgstr ""
 "\" align=\"center\"/> </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 "
@@ -853,25 +975,25 @@ msgstr ""
 "talde bakoitzaren gainetik sagua pasatzean."
 
 #. 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\">Partizioaren tamaina:</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\">Aurreratua</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\">Aurreratua</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 "
@@ -881,7 +1003,7 @@ msgstr ""
 "edo kentzeko paketeak."
 
 #. 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 "
@@ -896,8 +1018,10 @@ msgid "Choose Individual Packages"
 msgstr "Aukeratu Banakako Paketeak"
 
 #. 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"
@@ -907,7 +1031,7 @@ msgstr ""
 "\" align=\"center\"/> </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."
@@ -916,13 +1040,14 @@ msgstr ""
 "pertsonalizatzeko."
 
 #. 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 ""
 "Aukeratu ondoren, orrialde amaierako <guibutton>diskete ikono</guibutton>an "
 "klikatu dezakezu zure pakete aukera gordetzeko (baita USB unitate batean "
@@ -936,8 +1061,10 @@ msgstr "Konfiguratu zure Zerbitzuak"
 
 #.  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"
@@ -948,7 +1075,7 @@ msgstr ""
 "id=\"soundConfig-im1\" revision=\"1\"/> </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."
@@ -956,19 +1083,15 @@ msgstr ""
 "Hona hemen zein zerbitzu (ez) duten hasi behar zure sistema abiarazterakoan "
 "ezar dezakezu."
 
-#. 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 "Aukeratutako DrakX ezarpenak onak izaten dira."
-
-#. 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."
@@ -977,7 +1100,7 @@ msgstr ""
 "koadroan erakusten da."
 
 #. 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 "Gauza bakarra aldatzen duzunean, oso ondo dakizu zer egiten ari zaren."
 
@@ -988,15 +1111,17 @@ msgstr "Konfiguratu zure Denbora-Eremua"
 
 #.  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-"
@@ -1004,18 +1129,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 ""
 "Aukera ezazu zure ordu-eremua zure herrialdea edo hiri bat behar duzu ordu "
 "zona berekoa aukeratuz."
 
 #. 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 "
@@ -1025,7 +1150,7 @@ msgstr ""
 "ezagutzen dena ezartzeko aukera daukazu."
 
 #. 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."
@@ -1034,23 +1159,24 @@ msgstr ""
 "bertako orduan ezarrita dutela, edota 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 "Aukeratu X zerbitzari bat (Konfiguratu Txartel Grafikoa)"
 
 #. 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=\"summaryBottom-im1\" align="
-"\"center\" fileref=\"dx2-summaryBottom.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."
@@ -1059,7 +1185,7 @@ msgstr ""
 "behar bezala identifikatuko du."
 
 #. 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:"
@@ -1067,31 +1193,34 @@ msgstr ""
 "Instalatzaileak ez du behar bezala zure txartel grafikoa detektatu, eta zein "
 "duzun baldin badakizu, hautatu ahal izango duzu zuhaitzean:"
 
-#. 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 "hornitzailea"
 
 #. 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 "ondoren zure txartela izena"
 
 #. 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 "eta txartel mota"
 
 #. 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 ""
 "Xorg-eko zerrendak generiko eta kode irekiko 40 kontrolatzaile baino gehiago "
 "hornitzen ditu bideo-txartelerako. Oraindik zure txartelerako kontrolatzaile "
@@ -1099,68 +1228,63 @@ msgstr ""
 "Kontrolatzaile honek zure bideo-txartelerako oinarrizko ahalmena hornitzen "
 "du."
 
-#. 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 ""
 "Kontutan izan bateraezina kontrolatzaile bat hautatzen baduzu Aginte "
 "Interfazerako sarbidea soilik izan dezakezula."
 
 #. 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 ""
 "Bideo-txartel fabrikatzaile batzuek Nonfree biltegietan soilik aurkitzen "
 "diren jabedun kontrolatzaileak hornitzen dituzte Linux-erako. Kasu "
 "batzuetan, fabrikatzailearen webgunean aurkitzen dira soilik."
 
-#. 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 ""
-"Nonfree biltegia esplizituki gaituta egon behar da sartzeko. Ez baduzu hura "
-"aurretik hautatu, hau egin beharko duzu berrabiarazi ondoren lehenengoz."
-
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:3
+#: en/configureX_chooser.xml:11
 msgid "Graphic Card and Monitor Configuration"
 msgstr "Txartel Grafikoa eta Pantaila Konfigurazioa"
 
 #.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
+#. 2018/02/15 apb: Some text and typography.
+#. 2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.
+#. 2018/02/23 apb: Typo.
 #. 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=\"reboot-im1\" fileref=\"live-"
-"reboot.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 ""
 "Zuk Mageia-ren instalazio honetarako aukeratu duzun ingurune grafikoarekiko "
 "(idazmahai-ingurune bezala ere ezagututa) independenteki, guztiak "
@@ -1173,23 +1297,33 @@ msgstr ""
 "egoki aukeratu ikusten baduzu."
 
 #. 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\">Aurreratua</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>Txartel Grafikoa</guibutton></emphasis>: Aukeratu zure "
-"txartela zerrendatik behar izanez gero."
 
 #. 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\">Aurreratua</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>Pantaila</guibutton></emphasis>: Aukera dezakezu "
 "<guilabel>Plug'n Play</guilabel> posible denean, edo <guilabel>Hornitzaile</"
@@ -1197,32 +1331,37 @@ msgstr ""
 "aukeratu. Aukeratu <guilabel>pertsonalizatua</guilabel> pantailaren "
 "freskatze horizontaleko eta bertikaleko tasak eskuz jartzea nahiago baduzu."
 
-#. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/configureX_chooser.xml:41
-msgid "Incorrect refresh rates may damage your monitor"
-msgstr "Freskatze tasa okerra zure pantaila kaltetu dezake"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_chooser.xml:60
+#, fuzzy
+msgid "<emphasis role=\"bold\">Resolution</emphasis>"
+msgstr "<emphasis role=\"bold\">Partizioaren tamaina:</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>Bereizmena</guibutton></emphasis>: Hemen pantailan "
 "ezarri nahi den ebazpen eta kolore sakonera."
 
 #. 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\">Aurreratua</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>Froga</guibutton></emphasis>: Froga botoia ez da beti "
 "agertzen instalazioan zehar. Botoia baldin badago, bere ezarpenak kontrola "
@@ -1233,21 +1372,35 @@ msgstr ""
 "seguruan dagoela froga botoia eskuragarri ez badago</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\">Partizioaren tamaina:</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>Aukerak</guibutton></emphasis>: Hemen hainbat aukera "
 "aktibatzeko edo desaktibatzeko aukera dezakezu."
 
+#. 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 "Aukeratu zure Pantaila"
 
 #. 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."
@@ -1256,7 +1409,7 @@ msgstr ""
 "identifika dezake."
 
 #. 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 "
@@ -1270,25 +1423,26 @@ msgstr ""
 "zure pantailaren dokumentazioa."
 
 #. 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=\"reboot-im1\" fileref=\"live-"
-"reboot.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>Pertsonalizatua</emphasis>"
+#. type: Content of: <section><variablelist><varlistentry><term>
+#: en/configureX_monitor.xml:46
+msgid "Custom"
+msgstr ""
 
-#. 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."
@@ -1298,8 +1452,8 @@ msgstr ""
 "nola freskatuko den pantailan askotan zehazten du, eta sinkronismo "
 "horizontal tasa zein lerro ikus daitezke."
 
-#. 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 "
@@ -1311,27 +1465,23 @@ msgstr ""
 "baitezake. Zalantzarik izanez gero, ezarpen kontserbadore bat aukeratu eta "
 "ikusi zure pantailaren dokumentazioa."
 
-#. 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 ""
 "Hau da aukera lehenetsia eta pantaila pantailaren mota datu-basetik zehazten "
 "saiatzen da."
 
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:51
-msgid "<emphasis>Vendor</emphasis>"
-msgstr "<emphasis>Hornitzailea</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:"
@@ -1339,31 +1489,30 @@ msgstr ""
 "Instalatzaileak ez du behar bezala zure pantaila detektatu, eta zein duzun "
 "baldin badakizu, hautatu ahal izango duzu hautaketa zuhaitzean:"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:61
-msgid "the monitor manufacturers name"
-msgstr "pantailaren fabrikatzailearen izena"
+#. 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 "pantailaren deskribapena"
+#. 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>Generikoa</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 ""
 "hautatu 30 talde inguruko pantaila ezarpenak 1024x768 @ 60Hz pantaila lauak "
 "eta eramangarriak bezalakoak erabiltzen dira. Hau da, askotan pantaila "
@@ -1372,75 +1521,56 @@ msgstr ""
 "kontserbadorea izan behar da."
 
 #. 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 "Pertsonalizatua disko partizioak DiskDrake-rekin"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:12
-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>"
-
-#. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:22
+#: en/diskdrake.xml:27
 #, 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."
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-diskdrake.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-diskdrake.png\"/> </imageobject>"
 msgstr ""
-"Zure <literal>/</literal> partizioa enkriptatu nahi baduzu, bereiztutako  "
-"<literal>/boot</literal> partizio bat duzula ziurtatu behar duzu. <literal>/"
-"boot</literal> partizioaren enkriptatzea ez da erabili behar, bestela, zure "
-"sistema ez izango da abiarazi."
+"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/></imageobject><imageobject condition=\"live"
+"\"><imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/></"
+"imageobject>"
 
-#. 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 ""
 "Hemen zure disko gogor(ren) egitura estutu. Partizioak gehitu eta kendu "
 "daitezke, partizio bateko sistema edo tamaina alda daiteke, eta \n"
 "haietan hasi baino lehen dagoena arren ikusi."
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:34
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/diskdrake.xml:45
+#, fuzzy
 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>."
+"device, like a USB key). In the screenshot above there are two available "
+"devices: <filename>sda </filename>and <filename>sdb</filename>."
 msgstr ""
+"Erlaitz bat dago disko gogor bakoitzerako edo antzemandako biltegiratze-"
+"sistemarako, USB unitatea bezala. Adibidez, sda, sdb eta sdc hiru aurkitzen "
+"badira."
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:39
-#, 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."
-msgstr ""
-"Sakatu <guibutton>Garbitu guztia</guibutton> aukeratutako biltegi gailu "
-"partizio guztiak garbitzeko"
-
-#. 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 ""
 "Beste ekintza guztiak: sakatu nahi den partizioa lehenik. Gero ikusi, edo "
 "aukeratu fitxategi sistema eta muntatze puntua, tamainaz aldatu edo "
@@ -1448,34 +1578,72 @@ msgstr ""
 "modua</guibutton>) etiketa bat gehitu edo partizio-mota bat aukeratzeko "
 "bezalako tresna gehiago batzuk ematen ditu."
 
-#. 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 "Jarraitu dena zure nahiei egokitu arte."
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:52
-msgid "Click <guibutton>Done</guibutton> when you're ready."
-msgstr "Klik <guibutton>Eginda</guibutton> prest zaudenean."
+#. 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 ""
+"Sakatu <guibutton>Garbitu guztia</guibutton> aukeratutako biltegi gailu "
+"partizio guztiak garbitzeko"
 
-#. 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 ""
+"Zure <literal>/</literal> partizioa enkriptatu nahi baduzu, bereiztutako  "
+"<literal>/boot</literal> partizio bat duzula ziurtatu behar duzu. <literal>/"
+"boot</literal> partizioaren enkriptatzea ez da erabili behar, bestela, zure "
+"sistema ez izango da abiarazi."
+
+#. 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 ""
 "Mageia instalatzen ari bazara UEFI sistema baten, egiaztatu ESP (EFI Sistema "
 "Partizioa) presente dagoela, eta behar bezala /boot/EFI-n muntatuta (ikus "
 "goian)"
 
-#. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:61
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/diskdrake.xml:93
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
-"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"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 ""
+"Mageia Legacy/GPT sisteman instalatzen ari bazara, egiaztatu BIOSen abioko "
+"partizioa dagoela eta mota zuzena duela"
+
+#. type: Content of: <section><figure><title>
+#: en/diskdrake.xml:101
+#, fuzzy
+msgid "EFI System Partition"
+msgstr "Lehendik dauden Partizioak"
+
+#. type: Content of: <section><figure><mediaobject>
+#: en/diskdrake.xml:104
+#, fuzzy
+msgid ""
+"<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-diskdrake2.png"
@@ -1483,22 +1651,18 @@ msgstr ""
 "\"><imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/></"
 "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
-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 ""
-"Mageia Legacy/GPT sisteman instalatzen ari bazara, egiaztatu BIOSen abioko "
-"partizioa dagoela eta mota zuzena duela"
 
-#. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:76
+#. type: Content of: <section><mediaobject>
+#: en/diskdrake.xml:118 en/doPartitionDisks.xml:200
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1511,52 +1675,60 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:9
-msgid "Partitioning"
+#: en/doPartitionDisks.xml:25
+#, fuzzy
+msgid "Suggested Partitioning"
 msgstr "Partizioa egiten"
 
 #. 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 ""
 "Pantaila honetan zure disko gogor(ren) edukia ikus dezakezu eta DrakX "
 "partizio morroiak <application>Mageia</application> instalatzeko aurkitu "
 "duen tokia ikusi."
 
 #. 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 ""
 "Beheko zerrendatik erabilgarri dauden aukerak bereziki aldatuko dira zure "
 "disko gogor(rren) diseinu eta edukien arabera."
 
 #. 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-"
-"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
-"\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:32
-msgid "Use Existing Partitions"
-msgstr "Lehendik dauden Partizioak"
+#. type: Content of: <section><itemizedlist><title>
+#: en/doPartitionDisks.xml:47
+#, fuzzy
+msgid "Main Options"
+msgstr "Aukerak"
 
-#. 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\">Partizioaren tamaina:</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."
@@ -1564,13 +1736,14 @@ msgstr ""
 "Aukera hori eskuragarri badago, orduan Linux partizioak bateragarria aurkitu "
 "egin dira eta instalazioa erabili ahal izango du."
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:41
-msgid "Use Free Space"
-msgstr "Erabili Espazio Hutsa"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:59
+#, fuzzy
+msgid "<emphasis role=\"bold\">Use Free Space</emphasis>"
+msgstr "<emphasis role=\"bold\">Aurreratua</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."
@@ -1578,112 +1751,89 @@ msgstr ""
 "Erabili gabeko espazio baduzu zure disko gogorrean orduan aukera hau "
 "erabiliko da zure Mageia instalazio berriarentzat."
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:49
-msgid "Use Free Space on a Windows Partition"
-msgstr "Erabili Espazio Librea Windows-en Partizioan"
-
-#. 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 ""
-"Lehendik dauden Windows partiziotik erabili gabeko espazioa baduzu, "
-"instalatzaileak, erabili ahal izateko eskainiko dizu."
+"<emphasis role=\"bold\">Use Free Space on a Windows Partition</emphasis>"
+msgstr "<emphasis role=\"bold\">Partizioaren tamaina:</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 ""
 "Hau zure Mageia-ren instalazio berrirarentzako lekua uzteko modu "
 "erabilgarria izan daiteke, baina eragiketa arriskutsua da, beraz, fitxategi "
 "garrantzitsuen babeskopia egin behar duzu!"
 
-#. 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 ""
-"Kontutan prozedura hori dakar Windows partizioaren tamaina murrizteko. "
-"Partizio honek \"garbi \" egon beharko du, hau da, Windows azken aldiz "
-"erabili denean ondo itxita egon behar du. Halaber desfragmentatuta egon "
-"behar du, baina horrek ez du bermatzen partizioko fitxategi guztiak mugitu "
-"egin direla erabiliko den eremutik kanpo. Hori dela eta, Guztiz "
-"gomendagarria da zure fitxategi pertsonalaren babeskopia bat egitea."
-
-#. 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 ""
 "Aukera honekin instalatzailea gainerako Windows-en partizioa  urdin argiz "
 "eta etorkizuneko Mageia partizioa urdin ilunez euren xede tamainekin "
 "erakusten ditu. Tamaina hauek egokitzeko aukera duzu klik eginez eta "
 "partizioen arteko hutsunea arrastatuz. Ikusi beheko pantaila."
 
-#. 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-"
-"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
-"\"center\"/> </imageobject>"
-
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:87
-msgid "Erase and use Entire Disk."
-msgstr "Ezabatu eta erabili disko osoa."
+msgid "<emphasis role=\"bold\">Erase and use Entire Disk</emphasis>"
+msgstr "<emphasis role=\"bold\">Aurreratua</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 "Aukera honek disko osoa erabiliko du Mageia-rantzat."
 
-#. 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 ""
-"Oharra! Aukeratutako disko gogorraren datu guztiak ezabatuko dira. Kontuz "
-"ibili!"
-
-#. 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 ""
 "Diskoko zati bat beste zerbaitetan erabili edo jada galdu nahi ez duzun "
 "informazioa baduzu,, ez ezazu aukera hau erabili."
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:103
-msgid "Custom disk partitioning"
-msgstr "Disko-partizio pertsonalizatua"
+#. 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 ""
+"Kontutan prozedura hori dakar Windows partizioaren tamaina murrizteko. "
+"Partizio honek \"garbi \" egon beharko du, hau da, Windows azken aldiz "
+"erabili denean ondo itxita egon behar du. Halaber desfragmentatuta egon "
+"behar du, baina horrek ez du bermatzen partizioko fitxategi guztiak mugitu "
+"egin direla erabiliko den eremutik kanpo. Hori dela eta, Guztiz "
+"gomendagarria da zure fitxategi pertsonalaren babeskopia bat egitea."
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:106
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:110
+#, fuzzy
+msgid "<emphasis role=\"bold\">Custom Disk Partitioning</emphasis>"
+msgstr "<emphasis role=\"bold\">Partizioaren tamaina:</emphasis>"
+
+#. 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)."
@@ -1691,32 +1841,40 @@ msgstr ""
 "Honek erabateko kontrola ematen dizu instalazioan jartzen zure disko "
 "gogorrean."
 
-#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:112
-msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
-msgstr "<emphasis role=\"bold\">Partizioaren tamaina:</emphasis>"
+#. type: Content of: <section><mediaobject>
+#: en/doPartitionDisks.xml:120
+#, fuzzy
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"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 ""
 "Eskuragarri dagoen leku guztia 50GB baino gutxiago bada, partizio bat baino "
 "ez da sortuko /, ez baitago /home partizioa bereizita ."
 
-#. 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 "
@@ -1725,50 +1883,60 @@ msgstr ""
 "Eskuragarri dagoen leku guztia 50GB baino gehiago baldin bada, orduan, hiru "
 "partizio sortuko dira"
 
-#. 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 erabateko espazio libretik /-ra esleitzen da 50 GB-ko gehiengoarekin"
 
-#. 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 4 GB gehienez trukatzeko esleitzen da"
 
-#. 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 "gainerakoa (gutxienez 12/19) da / home-ra esleitzen da"
 
 #. 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 ""
-"Horrek esan nahi du 160 GB-tik eta gehiago eskuragarri, instalatzaileak hiru "
-"partizio sortuko dituela: 50GB /-rako , 4 GB swap-rako eta gainontzekoa /"
-"home-entzako."
 
 #. 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 ""
 "UEFI sistema bat erabiltzen ari bazara, ESP (EFI sistema partizioa) "
 "automatikoki detektatu egingo da, edo sortu ez bada existitzen oraindik, "
@@ -1776,46 +1944,39 @@ msgstr ""
 "arrakastaz bete dela frogatzen du."
 
 #. 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
-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 align=\"center\" fileref="
-"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </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-doPartitionDisks4.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 ""
 "Zenbait disko gogor berri 4096-byteko sektore logikoak erabilitzen dituzte, "
 "512 byte estandarraren ordez. Hardware librerik ezagatik partizio tresna ez "
@@ -1824,59 +1985,77 @@ msgstr ""
 "tresna mota bart erabiltzea gparted bezala, mota honetako disko bat izanez "
 "gero, eta hurrengo konfigurazioak erabil ditzala:"
 
-#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:189
+#. type: Content of: <section><important><para>
+#: en/doPartitionDisks.xml:221
+#, fuzzy
+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 ""
+"Zenbait disko gogor berri 4096-byteko sektore logikoak erabilitzen dituzte, "
+"512 byte estandarraren ordez. Hardware librerik ezagatik partizio tresna ez "
+"da egiztatu halako diskoetan. Gainera, SSD disko batzuek 1MB baino gehiagoko "
+"ezabatze bloke bat darabilte. Iradokitzen dugu aurrez partiziorako beste "
+"tresna mota bart erabiltzea gparted bezala, mota honetako disko bat izanez "
+"gero, eta hurrengo konfigurazioak erabil ditzala:"
+
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:228
 #, fuzzy
-msgid "<emphasis role=\"bold\">Align to</emphasis> = MiB"
+msgid "<emphasis>Align to</emphasis> = MiB"
 msgstr "<emphasis role=\"bold\">Aurreratua</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\">Aurreratua</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."
 msgstr "Ziurtatzen partizio guztiak sortzen diturela megabyte kopuru batekin."
 
 #. 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 "LIVE euskarriko instalazioa"
 
 #. 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 "2015eko Urtarrila"
+#: 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 "Mageia-ren dokumentazio Ofiziala"
 
 #. 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/"
@@ -1887,8 +2066,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."
@@ -1899,8 +2078,7 @@ msgstr ""
 "\">NeoDoc</link>-k garatuta."
 
 #. 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</"
@@ -1910,15 +2088,15 @@ msgstr ""
 "wiki.mageia.org/en/Documentation_team\">Dokumentazio Talde</link>ra bada "
 "eskuliburu hau hobetzen lagundu ahal baduzu."
 
-#. 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 "
@@ -1928,43 +2106,49 @@ msgstr ""
 "dituzun irudiak zure hardwarea eta instalazioan zehar hartutako erabakien "
 "araberakoa izango da."
 
-#. 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 ""
+"Boluntarioek beren aisialdian idatzi zuten. Zoaz <link ns6:href=\"https://"
+"wiki.mageia.org/en/Documentation_team\">Dokumentazio Talde</link>ra bada "
+"eskuliburu hau hobetzen lagundu ahal baduzu."
+
 #. 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 "DrakX-rekin Instalazioa"
 
 #. type: Content of: <book><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:9
+#: en/DrakX-cover.xml:20
 msgid "February 2014"
 msgstr "2014ko Otsaila"
 
 #. 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 "Zorionak"
 
 #.  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
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
@@ -1973,28 +2157,28 @@ msgstr ""
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </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 ""
 "<application>Mageia</application> instalatzen eta konfiguratzen amaitu duzu "
 "eta orain segurua da instalazio baliabidea kentzea, eta zure ordenagailua "
 "berrabiaraztea."
 
 #. 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 ""
 "Berrezarri ondoren, abioko kargatzailea, zure ordenagailuko sistema "
 "eragileen artean aukera dezakezu (bat baino gehiago izanez gero)."
 
 #. 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."
@@ -2003,26 +2187,27 @@ msgstr ""
 "automatikoki hautatu eta hasiko da."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:26
+#: en/exitInstall.xml:30
 msgid "Enjoy!"
 msgstr "Gozatu!"
 
 #. 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 ""
 "Bisitatu www.mageia.org zalantzarik izanez gero edo mageia lagundu nahi "
 "izanez"
 
 #. type: Content of: <section><info><title>
-#: en/firewall.xml:3
+#: en/firewall.xml:7
 msgid "Firewall"
 msgstr "Suhesia"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:6
+#: en/firewall.xml:10
 #, fuzzy
 msgid ""
 "This section allows you to configure some simple firewall rules: they "
@@ -2036,50 +2221,50 @@ msgstr ""
 "sartzeko errazak izan daitezela baimentzen du."
 
 #. 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
 #, fuzzy
 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 ""
 "Gainontzeko checkbutton guztiak gutxi gorabehera azaleratzen dira. Adibidez, "
 "\"CUPS zerbitzaria\" botoia egiaztatuko duzu zure makinako inprimagailuak "
 "sarean eskuragarri nahi badituzu."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:25
+#: en/firewall.xml:29
 msgid "<emphasis role=\"bold\">Advanced</emphasis>"
 msgstr "<emphasis role=\"bold\">Aurreratua</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
 msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
 msgstr "<emphasis>&lt;port-number>/&lt;protocol></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 "
@@ -2087,14 +2272,14 @@ 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>."
@@ -2103,7 +2288,7 @@ msgstr ""
 "emphasis> da."
 
 #. 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."
@@ -2112,7 +2297,7 @@ msgstr ""
 "zehazten dira portu bererako."
 
 #. type: Content of: <section><info><title>
-#: en/formatPartitions.xml:3
+#: en/formatPartitions.xml:10
 msgid "Formatting"
 msgstr "Formateatzen"
 
@@ -2120,15 +2305,16 @@ msgstr "Formateatzen"
 #.  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 revision=\"1\" fileref=\"dx2-"
 "formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id="
@@ -2138,7 +2324,7 @@ msgstr ""
 "</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 "
@@ -2148,29 +2334,32 @@ msgstr ""
 "formateatzeko markatutako partizioetako edozein datu gordeko dira."
 
 #. 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 ""
 "Normalean gutxienez DrakX hautatutaako partizioak, formateatu behar izaten "
 "dira"
 
 #. 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 ""
 "Klikatu <guibutton>Aurreratua</guibutton> hautatzeko partizioko "
 "<emphasis>Bloke okerrak</emphasis> egiaztatzeko."
 
 #. 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 ""
 "Ez bazaude ziur aukeraketa egokia egin duzula,  <guibutton>Atzera</"
 "guibutton>, eta berriro <guibutton>Atzera</guibutton> eta gero "
@@ -2178,21 +2367,22 @@ msgstr ""
 "pantailara itzultzeko. Pantaila honetan zure partizioek dutena ikus dezakzu."
 
 #. 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 ""
 "Zure aukeretaz ziur zaudenean, <guibutton>Hurrengoa</guibutton> botoia "
 "klikatu jarraitzeko."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:10
+#: en/installer.xml:14
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, Mageia Instalatzilea"
 
 #. 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 "
@@ -2202,318 +2392,232 @@ msgstr ""
 "instalatzailea diseinatuta dago zure instalazioa edo eguneratzea posible "
 "bezain erraz egiten laguntzeko."
 
-#. 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 ""
-"Hasierako menuak hainbat aukera ditu, baina aukera lehenetsia instalatzailea "
-"da, normalean, behar duzun guztia dela."
-
 #. type: Content of: <section><section><title>
-#: en/installer.xml:22
-msgid "Installation Welcome Screen"
-msgstr "Instalazio Ongi etorri Pantaila"
-
-#. type: Content of: <section><section><section><title>
-#: en/installer.xml:25
-msgid "Using a Mageia DVD"
-msgstr "Mageia DVDa erabiliz"
+#: en/installer.xml:20
+msgid "The installation steps"
+msgstr "Instalazio urratsak"
 
-#. 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 ""
-"Hemen lehenetsitako ongietorri pantaila, Lehenean UEFI sistema batekin eta "
-"bigarrenean Legacy sistema duen Mageia DVD bat erabiliz:"
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:32
-msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
+"Instalazio prozesuko hainbat urrats pantailaren alboko panelean jarraitu "
+"daitezke."
 
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:37
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/installer.xml:28
 #, fuzzy
 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."
-msgstr ""
-"Pantaila honetan, aukerak sartzeko sakatu \"e\" letra \"editatzeko moduan\" "
-"sartzeko. Pantaila honetara itzultzeko, sakatu \"esc\" tekla irten eta gorde "
-"gabe edo sakatu \"Ktrl\" edo \"F10\" tekla gorde eta irtetzeko."
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:45
-msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml: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):"
+"Each step has one or more screens, which may also have <emphasis>Advanced</"
+"emphasis> sections with extra, less commonly required options."
 msgstr ""
+"Urrats bakoitzak pantailetan bat edo gehiago ditu aukera osagarrietarako "
+"botoiak <guibutton>Aurreratua</guibutton> izan dezakeena, normalean gutxi "
+"erabiltzen dira ."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:55
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/installer.xml:33
+#, 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>"
+"Most screens have <emphasis>Help</emphasis> buttons for further details "
+"about the particular step."
 msgstr ""
+"Pantailak gehienek <guibutton>Laguntza</guibutton> botoiak dituzte, zienek "
+"pausuei buruzko azalpenak emango dizute."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:63
+#. type: Content of: <section><section><caution><para>
+#: en/installer.xml:38
+#, fuzzy
 msgid ""
-"Press <emphasis role=\"bold\">F2</emphasis> to have the installer use a "
-"specific language for the installation."
+"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 ""
+"Instalazioan zehar nonbait instalazioa gelditzea erabakitzen baduzu, "
+"berrastea posiblea da, baina bi aldiz pentsa ezazu. Behin partizio bat "
+"formateatu denez gero edo behin eguneratzeak jartzen hasi direnean, zure "
+"ordenagailua ez da egoera berean izango eta berrabiarazteak sistema "
+"erabilezinarekin utz dezake. Hala ere, berrastea erabakitzen baduzu, "
+"terminalera sar zaitez <guilabel>Alt Ctrl F2</guilabel> aldi berean sakatuz. "
+"Gero, <guilabel>Alt Ctrl Delete</guilabel> saka ezazu aldi berean berrasteko."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:67
+#. type: Content of: <section><section><caution><para>
+#: en/installer.xml:43
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+"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 ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:72
-#, fuzzy
-msgid ""
-"Use the arrow keys to select the language then press <emphasis role=\"bold"
-"\">Enter</emphasis>."
-msgstr "Erabili geziak hizkuntza aukeratzeko eta sakatu Sartu."
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:77
-#, fuzzy
-msgid ""
-"If needed, change the screen resolution by pressing <emphasis role=\"bold"
-"\">F3</emphasis> (Legacy mode only)."
-msgstr "Aldatu pantailaren bereizmena F3 tekla (Ondare moduan soilik) sakatuz."
+#. type: Content of: <section><section><title>
+#: en/installer.xml:48
+msgid "Installation Welcome Screen"
+msgstr "Instalazio Ongi etorri Pantaila"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:81
+#. type: Content of: <section><section><para>
+#: en/installer.xml:49
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome5def.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-welcome5def.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:88
+#. type: Content of: <section><section><para>
+#: en/installer.xml:52
+#, fuzzy
 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)."
+"The welcome menu screen has various options, however the default option will "
+"start the installer, and is normally all that you will need."
 msgstr ""
+"Hasierako menuak hainbat aukera ditu, baina aukera lehenetsia instalatzailea "
+"da, normalean, behar duzun guztia dela."
 
-#. 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 "- Berez, ez du lehenetsitako aukeretan ezer aldatzen."
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/installer.xml:101
-msgid ""
-"Safe Settings: Priority is given to the safer options at the price of a "
-"performance detriment."
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:56
+msgid "Legacy (BIOS) Systems"
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/installer.xml:106
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:58
 #, fuzzy
 msgid ""
-"No ACPI: (Advanced Configuration and Power Interface): Power management "
-"features are not used."
+"<imageobject> <imagedata fileref=\"dx-welcome.png\" align=\"center\"/> </"
+"imageobject>"
 msgstr ""
-"- ACPI-rik gabe (Advanced Configuration and Power Interface), energia-"
-"administrazioa ez da kontuan hartzen."
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+"align=\"center\"/> </imageobject>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/installer.xml:113
-#, fuzzy
-msgid ""
-"No Local APIC: (Local Advanced Programmable Interrupt Controller): CPU "
-"interrupt. Select this option if you experience system misbehaviour like a "
-"kernel panic in relation to APIC."
+#. type: Content of: <section><section><section><itemizedlist><title>
+#: en/installer.xml:63
+msgid "Menu"
 msgstr ""
-"- APIC-a Lokalik (Local Advanced Programmable Interrupt Controller) gabe, "
-"CPU-aren etenez dihardu. Aukera hau aukeratu ezazu eskatzen bazaizu."
 
-#. 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:66
 msgid ""
-"When you select one of these entries, it modifies the default options "
-"displayed in the <guilabel>Boot Options</guilabel> line."
+"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 ""
-"Sarrera horietako bat hautatzean, <guilabel>Abio aukera</guilabel> lerroan "
-"erakutsitako jatorrizko aukerak aldatzen dira."
 
-#. 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:69
 #, 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 ""
-"Maegia bertsio batzuetan, hautatutako F6 gakoarekin hautatutako aukerak ez "
-"direla <guilabel>Abio aukerak</guilabel> lerroan agertzen gerta daiteke. "
-"Hala ere, kontuan izango dira."
+msgid "<emphasis role=\"bold\">Rescue System</emphasis>"
+msgstr "<emphasis role=\"bold\">Aurreratua</emphasis>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:132
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:70
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+"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 ""
-"<imageobject> <imagedata 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:75
 #, 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 ""
-"F1 Sakatuz aukera berrien leihoa irekitzen da. Bat aukera ezazu gezi-"
-"teklekin eta ENTER-a saka ezazu xehetasun gehiago izateko edo Esc tekla saka "
-"ezazu ongietorri-pantailara itzultzeko."
+msgid "<emphasis role=\"bold\">Memory Test</emphasis>"
+msgstr "<emphasis role=\"bold\">Aurreratua</emphasis>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:146
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:76
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+"Test the installed RAM by performing multiple read and write operations. "
+"Reboot to end the test."
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:151
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:80
 #, 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."
+msgid "<emphasis role=\"bold\">F2: Language</emphasis>"
+msgstr "<emphasis role=\"bold\">Aurreratua</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:81
+msgid "Press F2 for alternative languages."
 msgstr ""
-"Aukeren pantailaren ikuspegi zehatza. Sakatu Esc edo hautatu "
-"<guilabel>Abioko aukeretara Itzultzea</guilabel> aukeren zerrendara "
-"itzultzeko. Aukera hauek eskuz gehitu daitezke <guilabel>Abioko Aukera</"
-"guilabel> lerroan."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:158
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:86
+msgid "UEFI Systems"
 msgstr ""
-"<imageobject> <imagedata 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><para>
+#: en/installer.xml:87
 #, fuzzy
 msgid ""
-"The help is translated in the chosen language with <emphasis role=\"bold"
-"\">F2</emphasis>."
-msgstr "Laguntzak F2 teklaz aukeratutako hizkuntza emaitza du."
-
-#. 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>"
+"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 ""
-"Kernel ondare eta UEFI sistemtako aukerei buruzko informazio gehiago "
-"lortzeko, ikus:<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 "Instalazio urratsak"
+"Pantaila honetan, aukerak sartzeko sakatu \"e\" letra \"editatzeko moduan\" "
+"sartzeko. Pantaila honetara itzultzeko, sakatu \"esc\" tekla irten eta gorde "
+"gabe edo sakatu \"Ktrl\" edo \"F10\" tekla gorde eta irtetzeko."
 
-#. type: Content of: <section><section><para>
-#: en/installer.xml:179
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:92
 #, 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."
+"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+"imageobject>"
 msgstr ""
-"Instalazio prozesuko hainbat urrats pantailaren alboko panelean jarraitu "
-"daitezke."
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+"align=\"center\"/> </imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/installer.xml:182
-#, fuzzy
-msgid ""
-"Each step has one or more screens which may also have <guibutton>Advanced</"
-"guibutton> sections with extra, less commonly required, options."
+#. 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 ""
-"Urrats bakoitzak pantailetan bat edo gehiago ditu aukera osagarrietarako "
-"botoiak <guibutton>Aurreratua</guibutton> izan dezakeena, normalean gutxi "
-"erabiltzen dira ."
 
-#. type: Content of: <section><section><para>
-#: en/installer.xml:186
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:99
 #, fuzzy
+msgid "<emphasis role=\"bold\">Install:</emphasis> Start the Install process"
+msgstr "<emphasis role=\"bold\">Aurreratua</emphasis>"
+
+#. 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 ""
-"Pantailak gehienek <guibutton>Laguntza</guibutton> botoiak dituzte, zienek "
-"pausuei buruzko azalpenak emango dizute."
 
-#. 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 ""
-"Instalazioan zehar nonbait instalazioa gelditzea erabakitzen baduzu, "
-"berrastea posiblea da, baina bi aldiz pentsa ezazu. Behin partizio bat "
-"formateatu denez gero edo behin eguneratzeak jartzen hasi direnean, zure "
-"ordenagailua ez da egoera berean izango eta berrabiarazteak sistema "
-"erabilezinarekin utz dezake. Hala ere, berrastea erabakitzen baduzu, "
-"terminalera sar zaitez <guilabel>Alt Ctrl F2</guilabel> aldi berean sakatuz. "
-"Gero, <guilabel>Alt Ctrl Delete</guilabel> saka ezazu aldi berean berrasteko."
+"USB batetik abiarazi baduzu, hau da, aurreko lerroetako kopia bat bi lerro "
+"osagarrirekin lortzen dira \"USB\" atzizkiarekin. Haiek aukeratu behar "
+"dituzu."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:203
+#: en/installer.xml:115
 msgid "Installation Problems and Possible Solutions"
 msgstr "Instalazio arazoak eta Konponbide Posibleak"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:206
+#: en/installer.xml:117
 msgid "No Graphical Interface"
 msgstr "Interfaze Grafikorik gabe"
 
 #. 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 ""
 "Hasierako pantailaren ondoren, ez du hizkuntzako aukeraketa pantaila "
 "kargatzen. Hau gerta daiteke txartel grafiko batzuekin eta sistema "
@@ -2521,16 +2625,15 @@ msgstr ""
 "terminalean idatziz."
 
 #. 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 ""
 "Hardwarea zaharra bada, Beharbada ez da posible instalazio grafikoa egitea. "
 "Aipaturiko kasuan, testu modu instalazio bat saia liteke. Aipaturiko modua "
@@ -2540,18 +2643,19 @@ msgstr ""
 "instalazioarekin jarrai ezazu."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:230
+#: en/installer.xml:138
 msgid "The Install Freezes"
 msgstr "Instalatu Osagaiak"
 
 #. 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 ""
 "Sistemak instalazioan zehar izoztu egiten dela badirudi, hardware "
 "detekzioekin arazoa izan daiteke. Kasu honetan, hardwareko detekzio "
@@ -2560,18 +2664,19 @@ msgstr ""
 "beste batzuekin konbina daiteke."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:240
+#: en/installer.xml:146
 msgid "RAM problem"
 msgstr "RAM arazoak"
 
 #. 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 ""
 "Hura behar izatea arraroa da, baina kasu batzuetan, hardwareak RAM-aren "
 "kantitate libreari buruz oker informa dezake. Hura eskuz zehazteko, "
@@ -2580,20 +2685,20 @@ msgstr ""
 "lituzke."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:249
+#: en/installer.xml:154
 msgid "Dynamic partitions"
 msgstr "Partizio dinamikoak"
 
 #. 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 ""
 "Zuk \"oinarrizko\" formatutik zure disko gogorra \"dinamiko\"-ra bihurtu "
 "bazenuen Microsoft Windows-en, Mageia disko honetan jartzea ezinezkoa izango "
@@ -2603,19 +2708,15 @@ msgstr ""
 "aspx</link>."
 
 #. type: Content of: <section><info><title>
-#: en/installUpdates.xml:3
+#: en/installUpdates.xml:16
 msgid "Updates"
 msgstr "Eguneraketak"
 
-#.  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 ""
@@ -2623,62 +2724,74 @@ msgstr ""
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </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 ""
 "<application>Mageia</application>-ko bertsio hau askatu zenetik, pakete "
 "batzuk eguneratu edo hobetu dira."
 
-#. 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 ""
 "<guilabel>Bai</guilabel> aukeratu instalatu nahi baduzu, <guilabel>Ez</"
 "guilabel> aukeratu orain egin nahi ez baduzu, edo Internetera konektaturik "
 "ez bazaude"
 
-#. 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 "Ondoren, sakatu <guibutton>Hurrengoa</guibutton> jarraitzeko"
 
 #. type: Content of: <section><info><title>
-#: en/login.xml:1
-msgid "Login screen"
+#: en/login.xml:4
+#, fuzzy
+msgid "Login Screen"
 msgstr "Sarrera pantaila"
 
 #. 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 sarrera pantaila"
 
 #. 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 "Azkenik, saio hasiera pantailara zatoz."
 
 #. 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 ""
 "Idatzi zure erabiltzaile izena eta erbiltzaile pasahitza, eta segundo "
 "batzuen buruan aurkituko zara KDE edo GNOME mahaigain batekin, bertan "
@@ -2686,36 +2799,38 @@ msgstr ""
 "Mageia instalazioa erabiliz."
 
 #. 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 ""
 "Aurki ditzakezu <link linkend=\"https://wiki.mageia.org/en/Category:"
 "Documentation\">hemen</link>."
 
 #. type: Content of: <section><info><title>
-#: en/media_selection.xml:3
-msgid "Media Selection (Nonfree)"
-msgstr "Baliabide Aukeraketa (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=\"selectCountry-im1\" align="
-"\"center\" fileref=\"dx2-selectCountry.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 "
@@ -2727,7 +2842,7 @@ msgstr ""
 "aukeraketa hurrengo urratsetan hautagai izagon diren paketeak zehaztuko ditu."
 
 #. 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."
@@ -2736,12 +2851,13 @@ msgstr ""
 "oinarria daukanez gero."
 
 #. 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 ""
 "<emphasis>Nonfree</emphasis> biltegiak doakoak diren paketeak ditu, hau da, "
@@ -2751,7 +2867,7 @@ msgstr ""
 "ditu."
 
 #. 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 "
@@ -2773,67 +2889,69 @@ msgid "Minimal Install"
 msgstr "Instalazio Minimoa"
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:11
+#: en/minimal-install.xml:17
 #, fuzzy
 msgid ""
-"You can choose a Minimal Installation by de-selecting everything in the "
-"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"/>."
+"Minimal Installation is intended for those with specific uses in mind for "
+"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 ""
-"Instalazio txikiena aukeratu dezakezu pakete taldeen pantailan dena "
-"desautatuz, ikus <xref linkend=\"choosePackageGroups\"></xref>."
+"<application>Mageiaren</application> erabilera espezifikoak buruan "
+"dutenentzat dago zuzenduta instalazio minimoa, zerbitzari edo lanpostu "
+"espezialitatua bezala. Seguruenik aukera hau \"Banakako pakete aukeraketa\" "
+"aipatutako aukera konbinatuta erabili ahal izango duzu,  instalazioa "
+"fintzeko, ikus <xref linkend=\"choosePackagesTree\"></xref>."
 
-#. type: Content of: <section><para>
-#: en/minimal-install.xml:14
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/minimal-install.xml:24
 #, fuzzy
 msgid ""
-"If desired, you can additionally tick the <emphasis role=\"bold\">Individual "
-"package selection</emphasis> option in the same screen."
+"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 ""
-"Nahi izanez gero, halaber \"banakako pakete aukeraketa\" egiaztatu dezakezu "
-"pantaila berean."
+"Instalazio txikiena aukeratu dezakezu pakete taldeen pantailan dena "
+"desautatuz, ikus <xref linkend=\"choosePackageGroups\"></xref>."
 
-#. type: Content of: <section><para>
-#: en/minimal-install.xml:17
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/minimal-install.xml:28
 #, 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"
-"\"/>."
+"If desired, you can additionally tick the <emphasis>Individual package "
+"selection</emphasis> option in the same screen."
 msgstr ""
-"<application>Mageiaren</application> erabilera espezifikoak buruan "
-"dutenentzat dago zuzenduta instalazio minimoa, zerbitzari edo lanpostu "
-"espezialitatua bezala. Seguruenik aukera hau \"Banakako pakete aukeraketa\" "
-"aipatutako aukera konbinatuta erabili ahal izango duzu,  instalazioa "
-"fintzeko, ikus <xref linkend=\"choosePackagesTree\"></xref>."
+"Nahi izanez gero, halaber \"banakako pakete aukeraketa\" egiaztatu dezakezu "
+"pantaila berean."
 
-#. type: Content of: <section><para>
-#: en/minimal-install.xml:22
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/minimal-install.xml:33
 #, 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."
+"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 ""
 "Instalazio mota hau aukeratuz gero, ondoko pantailan osagarri erabilgarri "
 "batzuk eskainiko ditu, hala nola, dokumentazioa eta X."
 
-#. 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 ""
 "Oinarrizko dokumentazioa man edo info orri forman ematen da. Batetik man "
 "orriak <link xlink:href=\"http://www.tldp.org/manpages/man.html\">Linux "
@@ -2842,7 +2960,7 @@ msgstr ""
 "ditu."
 
 #. 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="
@@ -2854,32 +2972,40 @@ msgstr ""
 
 #. type: Content of: <section><info><title>
 #: en/misc-params.xml:3
-msgid "Summary of miscellaneous parameters"
-msgstr "Hainbat parametroen laburpena"
+#, fuzzy
+msgid "Configuration Summary"
+msgstr "Soinu Konfiguraketa"
 
 #.  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=\"dx2-summaryTop.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 adimentasunez hautatzen ditu ezarpenak zure sistemaren detektatutako "
 "hardwarearen arabera. Ezarpenak egiaztatu ahal izango dituzu hemen eta "
 "<guibutton>Ezarri</guibutton> sakatu aldatu nahi baduzu."
 
 #. type: Content of: <section><note><para>
-#: en/misc-params.xml:21
+#: en/misc-params.xml:30
 #, fuzzy
 msgid ""
 "As a general rule, it is recommended that you accept the default settings "
@@ -2889,37 +3015,37 @@ msgstr ""
 "gorde ditzakezu:"
 
 #. 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 "Badago arazo ezagun bat ezarpen lehenetsiarekin"
 
 #. 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 "Dagoeneko ezarpen lehenetsia probatu dae eta porrot egin du"
 
 #. type: Content of: <section><note><para><itemizedlist><listitem><para>
-#: en/misc-params.xml:32
+#: en/misc-params.xml:41
 #, fuzzy
-msgid ""
-"some other factor mentionned in the detailed sections below is an issue."
+msgid "some other factor mentioned in the detailed sections below is an issue"
 msgstr "Beste zerbait esaten da beheko atal zehatzetan"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:40
+#: en/misc-params.xml:49
 msgid "System parameters"
 msgstr "Sistema parametroak"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:45
-msgid "<guilabel>Timezone</guilabel>"
-msgstr "<guilabel>Denbora-Eremua</guilabel>"
+#: en/misc-params.xml:54
+#, fuzzy
+msgid "<emphasis role=\"bold\">Timezone</emphasis>"
+msgstr "<emphasis role=\"bold\">Aurreratua</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 ordu eremua hautatutako hizkuntzaren arabera aukeratzen du. Aldatu "
@@ -2927,12 +3053,13 @@ msgstr ""
 "\"configureTimezoneUTC\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:53
-msgid "<guilabel>Country / Region</guilabel>"
-msgstr "<guilabel>Herrialde/Eskualde</guilabel>"
+#: en/misc-params.xml:62
+#, fuzzy
+msgid "<emphasis role=\"bold\">Country / Region</emphasis>"
+msgstr "<emphasis role=\"bold\">Partizioaren tamaina:</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 "
@@ -2942,47 +3069,49 @@ msgstr ""
 "<xref linkend=\"selectCountry\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:62
-msgid "<guilabel>Bootloader</guilabel>"
-msgstr "<guilabel>Abio kargatzailea</guilabel>"
+#: en/misc-params.xml:70
+#, fuzzy
+msgid "<emphasis role=\"bold\">Bootloader</emphasis>"
+msgstr "<emphasis role=\"bold\">Aurreratua</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 aukera onak egin ditu abio kargatzailearen ezarpenekin."
 
 #. 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 "Ezer ez aldatu, Grub2 konfiguratzeaz jakin ezean"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:70
-msgid "For more information, see <xref linkend=\"setupBootloader\"/>"
-msgstr "Informazio gehiagorako, ikus <xref linkend=\"setupBootloader\"/>"
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:75
-msgid "<guilabel>User management</guilabel>"
-msgstr "<guilabel>Erabiltzaile kudeaketa</guilabel>"
+#: en/misc-params.xml:83
+#, fuzzy
+msgid "<emphasis role=\"bold\">User management</emphasis>"
+msgstr "<emphasis role=\"bold\">Aurreratua</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 ""
 "Erabiltzaile extrak hemen gehi dezakezu. Bakoitzak bere <literal>/home</"
 "literal> direktorioa izango du."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:84
-msgid "<guilabel>Services</guilabel>:"
-msgstr "<guilabel>Zerbitzuak</guilabel>:"
+#: en/misc-params.xml:91
+#, fuzzy
+msgid "<emphasis role=\"bold\">Services</emphasis>"
+msgstr "<emphasis role=\"bold\">Aurreratua</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 "
@@ -2993,31 +3122,29 @@ msgstr ""
 "desgaitzeko aukera ematen dizu."
 
 #. 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 ""
 "Arretaz pentsatu behar duzu hemen ezer aldatu aurretik, hutsegite batek "
 "ordenagailuak gaizki funtzionatzea eragin dezake."
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:94
-msgid "For more information, see <xref linkend=\"configureServices\"/>"
-msgstr "For more information, see <xref linkend=\"configureServices\"/>"
-
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:101
+#: en/misc-params.xml:106
 msgid "Hardware parameters"
 msgstr "Hardware parametroak"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:106
-msgid "<guilabel>Keyboard</guilabel>:"
-msgstr "<guilabel>Teklatua</guilabel>:"
+#: en/misc-params.xml:111
+#, fuzzy
+msgid "<emphasis role=\"bold\">Keyboard</emphasis>"
+msgstr "<emphasis role=\"bold\">Aurreratua</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 "
@@ -3027,7 +3154,7 @@ msgstr ""
 "kokapen, hizkuntza edo teklatu motaren arabera."
 
 #. 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."
@@ -3036,12 +3163,13 @@ msgstr ""
 "kontuan izan zure pasahitzak ere aldatu egingo direla."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:119
-msgid "<guilabel>Mouse</guilabel>:"
-msgstr "<guilabel>Sagua</guilabel>:"
+#: en/misc-params.xml:124
+#, fuzzy
+msgid "<emphasis role=\"bold\">Mouse</emphasis>"
+msgstr "<emphasis role=\"bold\">Aurreratua</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."
@@ -3050,41 +3178,43 @@ msgstr ""
 "trackballs, etab "
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:126
-msgid "<guilabel>Sound card</guilabel>:"
-msgstr "<guilabel>Soinu txartela</guilabel>:"
+#: en/misc-params.xml:131
+#, fuzzy
+msgid "<emphasis role=\"bold\">Sound card</emphasis>"
+msgstr "<emphasis role=\"bold\">Aurreratua</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 ""
-"Instalatzaileak gidari lehenetsia erabiltzen du, baldin badago. Gidari bat "
-"baino gehiago dagoenean agertzen da beste bat aukeratzeko aukera soilik, "
-"baina bat ere ez dator lehenetsita."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:137
-msgid "<guilabel>Graphical interface</guilabel>:"
-msgstr "<guilabel>Interfaze grafikoa</guilabel>:"
+#: en/misc-params.xml:144
+#, fuzzy
+msgid "<emphasis role=\"bold\">Graphical interface</emphasis>"
+msgstr "<emphasis role=\"bold\">Aurreratua</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 ""
 "Atal honen bitartez, zure txartel grafikoa(k) eta pantaila konfigura "
 "dezakezu."
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:143
-msgid "For more information, see <xref linkend=\"configureX_chooser\"/>."
-msgstr "Informazio gehiagorako, ikus <xref linkend=\"configureX_chooser\"/>."
-
 #. type: Content of: <section><section><mediaobject>
-#: en/misc-params.xml:149
+#: en/misc-params.xml:155
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
 "\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
@@ -3093,22 +3223,23 @@ msgstr ""
 "\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"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 "Sare eta Internet parametroak"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:163
-msgid "<guilabel>Network</guilabel>:"
-msgstr "<guilabel>Sarea</guilabel>:"
+#: en/misc-params.xml:169
+#, fuzzy
+msgid "<emphasis role=\"bold\">Network</emphasis>"
+msgstr "<emphasis role=\"bold\">Aurreratua</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 ""
 "Zure sarea hemen ezarri ditzakezu, baina gidari libre gabeko txartelentzat "
@@ -3116,7 +3247,7 @@ msgstr ""
 "Kontrol Gunean</application>, non-free biltegiak gaituta eduki ondoren."
 
 #. 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 "
@@ -3126,15 +3257,17 @@ msgstr ""
 "ezartzen, ikusteko ere."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:179
-msgid "<guilabel>Proxies</guilabel>:"
-msgstr "<guilabel>Proxiak</guilabel>:"
+#: en/misc-params.xml:185
+#, fuzzy
+msgid "<emphasis role=\"bold\">Proxies</emphasis>"
+msgstr "<emphasis role=\"bold\">Aurreratua</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 ""
 "Proxy-zerbitzari batek zure ordenagailuaren eta Interneten arteko "
@@ -3142,69 +3275,74 @@ msgstr ""
 "ordenagailuak erabiltzeko ezarpenak jartzeko baimentzen dizu."
 
 #. 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 ""
 "Zure sistema administratzaileari kontsultatu beharko diozu eskuratzeko hemen "
 "sartu beharreko parametroak"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:195
+#: en/misc-params.xml:201
 msgid "Security"
 msgstr "Segurtasuna"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:200
-msgid "<guilabel>Security Level</guilabel>:"
-msgstr "<guilabel>Segurtasun Maila</guilabel>:"
+#: en/misc-params.xml:206
+#, fuzzy
+msgid "<emphasis role=\"bold\">Security Level</emphasis>"
+msgstr "<emphasis role=\"bold\">Aurreratua</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 ""
 "Hemen ezarri daiteke zure ordenagailurako desiratzen duzun segurtasun maila, "
 "gehienetan, lehenetsitako ezarpena (Estandarra) egokitzen du erabilera "
 "orokorrerako."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:207
-msgid "Check the option which best suits your usage."
-msgstr "Begiratu zure erabilerara hoberen egokitzen den aukera."
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:212
-msgid "<guilabel>Firewall</guilabel>:"
-msgstr "<guilabel>Suebakia</guilabel>:"
+#: en/misc-params.xml:215
+#, fuzzy
+msgid "<emphasis role=\"bold\">Firewall</emphasis>"
+msgstr "<emphasis role=\"bold\">Aurreratua</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:214
+#: en/misc-params.xml:217
 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."
+"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 ""
-"Suebaki baten asmoa, zure artxibo garrantzitsuen eta Internetetik dabiltzan "
-"asmo txarreko jende ugariren, lapurtzen saia daitezkeen edo zure artxiboak "
-"arriskuan jarri dezaketenen artean hesi bat jartzea da."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:218
+#: en/misc-params.xml:223
 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\"/>."
+"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 ""
-"Aukera itzazu zure sisteman sartu nahi dituzun zerbitzuak. Zure aukeraketa "
-"zure ordenagailuan egiten duzun erabileraren mende egongo da. Informazio "
-"gehiago lortzeko, ikus<xref linkend=\"firewall\"/> ."
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/misc-params.xml:229
+#, fuzzy
+msgid "For more information, see <xref linkend=\"firewall\"/>."
+msgstr "Informazio gehiagorako, ikus <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 ""
 "Kontuan izan dena ahalbidetzea (suebaki gabe) oso arriskutsua izan "
 "daitekeela."
@@ -3215,36 +3353,51 @@ msgid "Reboot"
 msgstr "Berrabiarazi"
 
 #. 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 ""
 "Behin kargatzailea instalatuta, eskatuko dizu zure ordenagailua gelditzeko, "
 "zuzeneko CD-a kendu eta ordenagailua berrabiarazteko. klikatu<emphasis role="
 "\"bold\"><guibutton>Amaitu</guibutton></emphasis> eta egin ezazu  <emphasis "
 "role=\"bold\"> agindu honetan eskatutakoa!</emphasis>"
 
+#. 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
-msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
+#: en/reboot.xml:12
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot2.png\"/> </"
+"imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"live-reboot2.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 ""
 "Abiaraztean, deskarga aurrerapen barra segida bat ikusiko duzu. Hornek "
 "adierazten du software baliabide zerrendak deskargatzen ari direla (ikus "
 "Software kudeaketa). "
 
 #. type: Content of: <section><mediaobject>
-#: en/reboot.xml:17
+#: en/reboot.xml:19
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
 "reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
@@ -3273,46 +3426,52 @@ msgstr ""
 "<application>Mageia</application> instalatzeko tokia egiteko."
 
 #. type: Content of: <section><info><title>
-#: en/securityLevel.xml:3
+#: en/securityLevel.xml:10
 msgid "Security Level"
 msgstr "Segurtasun-maila"
 
 #.  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=\"selectCountry-im1\" align="
-"\"center\" fileref=\"dx2-selectCountry.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\">Partizioaren tamaina:</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:19
+#: en/securityLevel.xml:29
+msgid ""
+"<emphasis>Standard</emphasis> is the default, and recommended setting for "
+"the average user."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:32
 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>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:24
+#: en/securityLevel.xml:36
 #, fuzzy
 msgid "<emphasis role=\"bold\">Security Administrator</emphasis>"
 msgstr "<emphasis role=\"bold\">Aurreratua</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 "
@@ -3320,14 +3479,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 "
@@ -3335,27 +3494,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 ""
 "Instalatu ondoren, beti posible da <guilabel>Segurtasuna</guilabel> Mageia "
 "Kontrol Gunean segurtasun ezarpenak aldatzea."
 
 #. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:6
+#: en/SelectAndUseISOs2.xml:15
 msgid "Select and use ISOs"
 msgstr "Aukeratu eta erabili ISOa"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:9
+#: en/SelectAndUseISOs2.xml:18
 msgid "Introduction"
 msgstr "Sarrera"
 
 #. 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 "
@@ -3365,18 +3524,19 @@ msgstr ""
 "aukeratzen lagunduko dizu."
 
 #. 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 "Bi media famili daude:"
 
 #. 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 ""
 "Instalatzaile Klasikoa: baliabidea abiarazi ondoren, aukera baimentzen duen "
 "prozesua jarraituko duela zer jarri eta sistema nola itxuratu.. Honek emango "
@@ -3384,43 +3544,91 @@ msgstr ""
 "Idazmahaiko Ingurunea aukeratzeko."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:21
+#: en/SelectAndUseISOs2.xml:31
 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"
+"<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\">Live ISOak instalazio garbiak sortzeko soilik "
+"erabiliko dira, ezin dira aurreko bertsioetatik eguneratzeko erabili.</"
+"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 ""
+"Bakoitza irudi txiki bat da eta hori drakx instalatzailea abiarazteko "
+"beharrezkoa dena baino ez dauke eta drakx-installer-Stage2 eta beharrezkoak "
+"diren beste pakete batzuk instalazioa jarraitu eta burutzeko. Pakete hauek "
+"PC disko gogorrean egon daiteke, tokiko drive baten, sare lokalean zein "
+"Interneten."
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:53
+#, 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 ""
+"Media hauek oso arinak dira (100 MB baino gutxiago), eta komenigarria denean "
+"banda zabalera oso baxua denean DVD oso bat jaisteko, PC bat DVD unitate "
+"gabea edo USB batetik ezin abiarazi dezakeen PC bat."
+
 #. 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 "Xehetasunak ematen dira hurrengo ataletan."
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:30
+#: en/SelectAndUseISOs2.xml:61
 msgid "Media"
 msgstr "Baliabidea"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:32
+#: en/SelectAndUseISOs2.xml:63
 msgid "Definition"
 msgstr "Definizioa"
 
 #. 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 ""
 "Hemen, baliabide bat (plurala: baliabideak) da ISO fitxategi bat Mageia "
 "instalatzeko eta/edo eguneratzeko eta hedaduratik onartzen da ISO fitxategia "
 "kopiatzen den edozein fisiko sostengatzen du."
 
 #. 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/"
@@ -3430,234 +3638,207 @@ msgstr ""
 "\">hemen</link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:39
+#: en/SelectAndUseISOs2.xml:70
 msgid "Classical installation media"
 msgstr "Instalazioa Klasiko baliabidea"
 
 #. 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 "Ezaugarri komunak"
 
 #. 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 ""
 "ISO hauek DrakX deituriko Instalatzaile tradizionalak erabilitzen dituzte."
 
 #. 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 ""
 "Eskuragarri dago instalazio garbi bat egitea edo berritzea aurreko bertsio "
 "batetatik."
 
 #. 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 "32 edo 64 biteko arkitektura media ezberdinak."
 
 #. 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 ""
 "Tresna batzuk Ongi etorri pantailan eskuragarri daude: Berreskuratze "
 "Sistema, Memoria Testa, Hardware hautemate tresna."
 
 #. 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 "DVD bakoitzak mahaigaineko ingurune eta hizkuntza asko dauka."
 
 #. 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 "Instalazioan zehar software ez librea gehitzeko aukera izango duzue."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:69
+#: en/SelectAndUseISOs2.xml:102
 msgid "Live media"
 msgstr "Live baliabidea"
 
 #. 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 ""
 "Distribuzioa aurreikusteko HDD baten instalatu gabe, eta aukeran Mageia zure "
 "HDD-an instalatzeko erabil daiteke."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:79
-msgid "Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)."
-msgstr "ISO bakoitzak mahaigain ingurune bakarra (Plasma, GNOME edo Xfce)."
+#: en/SelectAndUseISOs2.xml:111
+msgid "The Live media also includes an Installer."
+msgstr ""
 
 #. 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>"
-msgstr ""
-"<emphasis role=\"bold\">Live ISOak instalazio garbiak sortzeko soilik "
-"erabiliko dira, ezin dira aurreko bertsioetatik eguneratzeko erabili.</"
-"emphasis>"
+msgid "Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)"
+msgstr "ISO bakoitzak mahaigain ingurune bakarra (Plasma, GNOME edo Xfce)."
 
 #. 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 "Software ez librea dute."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:96
+#: en/SelectAndUseISOs2.xml:126
 msgid "Live DVD Plasma"
 msgstr "Plasma Live DVDa"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:99
-msgid "Plasma desktop environment only."
+#: en/SelectAndUseISOs2.xml:129
+#, fuzzy
+msgid "Plasma desktop environment only"
 msgstr "Plasma mahaigain ingurunea soilik."
 
 #. 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 "Hizkuntza guztiak presente daude."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:105
-msgid "64 bit architecture only."
-msgstr "64 bit arkitektura soilik."
+#: en/SelectAndUseISOs2.xml:135 en/SelectAndUseISOs2.xml:149
+#, fuzzy
+msgid "64-bit architecture only"
+msgstr "64 bit arkitektura soilik"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:110
+#: en/SelectAndUseISOs2.xml:140
 msgid "Live DVD GNOME"
 msgstr "GNOME-ren Live DVD-a"
 
 #. 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 "GNOME mahaigaineko ingurunea soilik."
 
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:119
-msgid "64 bit architecture only"
-msgstr "64 bit arkitektura soilik"
-
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:124
+#: en/SelectAndUseISOs2.xml:154
 msgid "Live DVD Xfce"
 msgstr "Xfce Live DVDa"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:127
-msgid "Xfce desktop environment only."
+#: en/SelectAndUseISOs2.xml:157
+#, fuzzy
+msgid "Xfce desktop environment only"
 msgstr "Xfce mahaigain ingurunea soilik."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:133
-msgid "32 or 64 bit architectures."
+#: en/SelectAndUseISOs2.xml:163
+#, fuzzy
+msgid "32 or 64-bit architectures"
 msgstr "32 edo 64 bit arkitektura"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:139
+#: en/SelectAndUseISOs2.xml:169
 #, fuzzy
 msgid "Net install media"
 msgstr "netinstall.iso"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:144
-#, 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 ""
-"Bakoitza irudi txiki bat da eta hori drakx instalatzailea abiarazteko "
-"beharrezkoa dena baino ez dauke eta drakx-installer-Stage2 eta beharrezkoak "
-"diren beste pakete batzuk instalazioa jarraitu eta burutzeko. Pakete hauek "
-"PC disko gogorrean egon daiteke, tokiko drive baten, sare lokalean zein "
-"Interneten."
-
-#. 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 ""
-"Media hauek oso arinak dira (100 MB baino gutxiago), eta komenigarria denean "
-"banda zabalera oso baxua denean DVD oso bat jaisteko, PC bat DVD unitate "
-"gabea edo USB batetik ezin abiarazi dezakeen PC bat."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:161
+#: en/SelectAndUseISOs2.xml:177
 #, fuzzy
-msgid "First steps are English language only."
+msgid "First steps are English language only"
 msgstr "Ingelera hizkuntza soilik"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:166
+#: en/SelectAndUseISOs2.xml:182
 msgid "netinstall.iso"
 msgstr "netinstall.iso"
 
 #. 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 ""
 "Software librea dauka soilik, software ez-librea erabiltzeari uko egiten "
 "dutenentzat."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:175
+#: en/SelectAndUseISOs2.xml:191
 msgid "netinstall-nonfree.iso"
 msgstr "netinstall-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 ""
 "Software ez-librea (batez gidariak, kodek...) behar duten pertsonentzat "
 "dauzka."
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:186
+#: en/SelectAndUseISOs2.xml:202
 msgid "Downloading and Checking Media"
 msgstr "Media Deskargatu eta Egiaztatzen"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:188
+#: en/SelectAndUseISOs2.xml:204
 msgid "Downloading"
 msgstr "Deskargatzen"
 
 #. 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 ""
 "Behin zuk zure ISO fitxategia aukeratuta, deskargatu dezakezu http edo "
 "BitTorrent-a erabiliz. Bi kasuetan, leiho batek informazioren bat ematen "
@@ -3665,48 +3846,63 @@ msgstr ""
 "aukera baxu bada. Http aukeratzen baduzu, zuk onen antzeko zerbait ikusi "
 "ahal izango duzu"
 
-#. 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 eta sha1sum ISOaren osotasuna egiaztatzeko tresnak dira. Erabili "
-"horietako bat bakarrik. Gorde bat <link linkend=\"integrity\">geroago "
-"erabiltzeko</link>. Ondoren leiho hau agertuko da:"
 
 #. 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
 msgid "Checking the integrity of the downloaded media"
 msgstr "Deskargatutako baliabide osotasunaren egiaztapena"
 
 #. 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 ""
 "Checksum zenbaki biak deskargaturiko fitxategitik algoritmo batek "
 "kalkulatzen hamaseitarrak dira. Algoritmo hauei eskatzen diezunean zenbaki "
@@ -3716,7 +3912,7 @@ msgstr ""
 "izango zenukeela edo konponketa bat egin BitTorrent erabiliz. "
 
 #. 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 "
@@ -3724,76 +3920,87 @@ msgid ""
 msgstr "Ireki kontsola bat, ez da root izan beharrik, eta:"
 
 #. 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 ""
 "- md5sum erabiltzeko, idatzi: [sam@localhost]$ <userinput>md5sum path/to/the/"
 "image/file.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 ""
+"- sha1sum erabiltzeko, idatzi: [sam@localhost]$ <userinput>sha1sum path/to/"
+"the/image/file.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 ""
 "- sha1sum erabiltzeko, idatzi: [sam@localhost]$ <userinput>sha1sum path/to/"
 "the/image/file.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 ""
 "eta lortutako zenbakia zure ordenagailuan konparatu mageia emandako "
 "zenbakiarekin (pixka bat itxaron beharko duzu). Adibidea:"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:237
+#: en/SelectAndUseISOs2.xml:270
 msgid "Burn or dump the ISO"
 msgstr "Grabatu edo irauli ISOa"
 
 #. 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 ""
 "Hautatutako ISOa orain CD edo DVD batean erre daiteke edo USB baten irauli. "
 "Eragiketa hauek ez dira kopia sinple bat eta helburua abiatzeko gai den "
 "baliabide bat egitea da."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:275
 msgid "Burning the ISO to a CD/DVD"
 msgstr "ISOa CD/DVDan grabatzen"
 
 #. 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 ""
 "Erabil ezazu nahiago duzun edozein erregailua baina ziurta ezazu grabatzeko "
 "gailuak ondo dagoela <emphasis role=\"bold\">irudi bat grabatzeko</"
@@ -3802,48 +4009,55 @@ msgstr ""
 "\">Mageia wikia</link>n."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:248
+#: en/SelectAndUseISOs2.xml:282
 msgid "Dump the ISO to a USB stick"
 msgstr "Irauli ISOa USB baten"
 
 #. 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 ""
 "Mageia ISO guztiak hibridoak dira, horrek esan dezake horiekn USB baten "
 "\"isuri\" ditzakezula eta, ondoren, erabili sistema abiarazi eta "
 "instalatzeko."
 
 #. 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 ""
 "Irudi \"isurketa\" bat flash gailu baten gainean aldez aurreko partizio "
 "fitxategi-sistema suntsitzen du; edozein datu galduko dira eta partizio "
 "ahalmena irudiaren tamainara murriztuko da."
 
-#. 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 ""
-"Jatorrizko ahalmena berreskuratzeko, berriro formateatu eta zatitu behar "
-"duzu USB makila."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:259
+#: en/SelectAndUseISOs2.xml:299
 msgid "Using a graphical tool within Mageia"
 msgstr "Tresna grafiko bat  erabiliz Mageia-ren barnean"
 
 #. 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>"
@@ -3853,27 +4067,27 @@ msgstr ""
 "tresna grafiko bat erabil dezakezu"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:263
+#: en/SelectAndUseISOs2.xml:303
 msgid "Using a graphical tool within Windows"
 msgstr "Tresna grafiko bat  erabiliz Windows-en barnean"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:304
 msgid "You could try:"
 msgstr "Zu saiatuko zinateke:"
 
 #. 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=en_US\">Rufus</link> \"ISO "
 "irudia\" aukera erabiliz;"
 
 #. 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 "
@@ -3883,12 +4097,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 "Komando lerroa erabiliz GNU/Linux sistema barnean"
 
 #. 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 "
@@ -3898,68 +4113,76 @@ msgstr ""
 "okerreko identifikatzailea lortzeko arriskua dago."
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:325
 msgid "Open a console"
 msgstr "Kontsola bat ireki"
 
 #. 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 ""
 "Bihurtu root komando <userinput> su - </userinput> (ez ahaztu finalean '-')"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:291
-msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
+#: en/SelectAndUseISOs2.xml:332
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"Root.png\"/> </"
+"imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Root.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 ""
 "Entxufatu zure USBa (ez muntatu, hau ere esan dezake edozein aplikazio edo "
 "fitxategi kudeatzaile ez ireki  hori eskuratu eta irakurri, ezin)"
 
 #. 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 "Idatzi <userinput>fdisk-l</userinput> komandoa"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:304
-msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
+#: en/SelectAndUseISOs2.xml:345
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"Fdisk.png\"/> </"
+"imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Fdisk.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 ""
 "Aurkitu zure USB gailuaren izena (bere tamainaren arabera), adibidez <code>/"
 "dev/sdb</code> goiko irudian, 8GB USB-makila."
 
 #. 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 ""
 "Bestela, gailuaren izena lor dezakezu <code>dmesg</code> komandoarekin: "
 "amaieran, gailuaren izena <emphasis>sd</emphasis> hasita ikusiko duzu, eta "
 "<emphasis>sdd</emphasis> honetan kasu:"
 
 #. 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"
@@ -4001,53 +4224,57 @@ msgstr ""
 "[72595.969446] sd 8:0:0:0-a: [sdd-a] Attached SCSI-ren desmuntagarri|ateratzeko moduko diskoa"
 
 #. 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=\"mediaobject\" 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 ""
 "Agindua sartu: # <userinput>dd if=path/to/the/ISO/file 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 "Non X=zure dispositiboaren izena adibidez: /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 ""
 "Adibidea: # <userinput>dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso "
 "of=/dev/sdb bs=1M</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><tip><para>
-#: en/SelectAndUseISOs2.xml:345
+#: 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 "Agindua sartu: # <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 ""
 
@@ -4057,8 +4284,10 @@ msgid "Select your Country / Region"
 msgstr "Aukeratu zure Herrialdea / Eskualdea"
 
 #.  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
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
 "\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
@@ -4066,35 +4295,35 @@ msgstr ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
 "\"center\" fileref=\"dx2-selectCountry.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 ""
 "Aukeratu herrialdea edo lurraldea. Ezarpen guztientzako garrantzitzua da, "
 "hala nola moneta eta haririk gabeko erregulazioa. Okerreko herrialdea "
 "ezartzen baduzu, hari gabeko konexioa ezingo duzu erabili."
 
-#. 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 ""
 "Zure herrialdea zerrendan ez badago, sakatu <guilabel>Beste Herrialdeak</"
 "guilabel> eta aukeratu zure herrialde / eskualdea han."
 
 #. 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 ""
 "Zure herrialdea <guilabel>Beste Herrialde</guilabel> zerrendan soilik "
 "badago, <guibutton>Ados</guibutton> sakatu ondoren lehen zerrendako beste "
@@ -4102,15 +4331,15 @@ msgstr ""
 "zure benetako aukera jarraituko du."
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:33
+#: en/selectCountry.xml:42
 msgid "Input method"
 msgstr "Sarrera metodoa"
 
 #. 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. "
@@ -4129,67 +4358,73 @@ msgstr ""
 "daitezke."
 
 #. 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 ""
 "Ahaztu duzu instalazioan zehar sarrera metodoa konfiguratzea, zure sistema "
 "instalatutakoan egin dezakezu, sartu \"Zure Ordenagailua konfiguratu\" -> "
 "\"Sistema\" edo localdrake root gisa exekutatuz."
 
 #. type: Content of: <section><info><title>
-#: en/selectInstallClass.xml:14
+#: en/selectInstallClass.xml:29
 msgid "Install or Upgrade"
 msgstr "Instalatu edo Berritu"
 
 #. 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 "Instalatu"
+#: en/selectInstallClass.xml:41
+#, fuzzy
+msgid "<emphasis role=\"bold\">Install</emphasis>"
+msgstr "<emphasis role=\"bold\">Partizioaren tamaina:</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 "Berritu"
+#: en/selectInstallClass.xml:50
+#, fuzzy
+msgid "<emphasis role=\"bold\">Upgrade</emphasis>"
+msgstr "<emphasis role=\"bold\">Aurreratua</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 ""
+"Aukera hau erabili ezazu <application>Mageia</application> instalazio fresko "
+"baterako."
 
-#. 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 ""
 "Gaurkotzearen testatzea soilik egin da oraindik instalatzailearen bertsio "
 "hau bota <emphasis>zenean jasanda zegoen</emphasis> Mageia-ko aurreko "
@@ -4197,36 +4432,15 @@ msgstr ""
 "nahi baduzu, zure <literal>/home</literal> partizioa babestuz instalazio "
 "garbia egitea hobea da."
 
-#. 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 ""
-"Instalazioan zehar instalazioa gelditzea erabakitzen baduzu, berrastea "
-"posiblea da, baina bi aldiz pentsa ezazu. Behin partizio bat formateatu "
-"denez gero edo behin eguneratzeak jartzen hasi direnean, zure ordenagailua "
-"ez da egoera berean izango eta berrabiarazteak sistema erabilezinarekin utz "
-"dezake. Hala ere, berrastea erabakitzen baduzu, terminalera sar zaitez "
-"<guilabel>Alt Ctrl F2</guilabel> aldi berean sakatuz. Gero, <guilabel>Alt "
-"Ctrl Delete</guilabel> saka ezazu aldi berean berrasteko."
-
 #. 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 ""
 "Zuk konturatu bazara hizkuntza gehigarri bat aukeratzea ahaztu duzula, "
 "\"Instalatu edo Eguneratu\" pantailatik itzuli zaitezke hizkuntza aukeretara "
@@ -4234,39 +4448,41 @@ msgstr ""
 "instalazioan zehar."
 
 #. type: Content of: <section><info><title>
-#: en/selectKeyboardLive.xml:3
-msgid "Select keyboard"
+#: en/selectKeyboardLive.xml:14
+#, fuzzy
+msgid "Select Keyboard"
 msgstr "Aukeratu teklatua"
 
 #. 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 ""
-"Beharrezkoa izango da Mageian erabili nahi duzun teklatu-diseinua ezartzea. "
-"Lehenetsi bat zuk aurretik aukeratutako hizkuntzaren eta ordu-eremuaren "
-"arabera hautatzen da."
 
 #. type: Content of: <section><info><title>
-#: en/selectKeyboard.xml:7
+#: en/selectKeyboard.xml:20
 msgid "Keyboard"
 msgstr "Teklatua"
 
 #. 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."
@@ -4275,17 +4491,17 @@ msgstr ""
 "ez bada aurkitzen, Amerikar teklatua aukeratuko da."
 
 #. 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 format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
-"align=\"center\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.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 "
@@ -4302,24 +4518,24 @@ msgstr ""
 "%C3%B3n_del_teclado\">es.wikipedia.org/wiki/Distribución_del_teclado</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 ""
 "Zure teklatua zerrendan ez badago, sakatu <guibutton>Gehiago</guibutton> "
 "zerrenda bat bistaratzeko, eta ondoren hautatu zure teklatua."
 
-#. 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 ""
 "<guibutton>Gehiago</guibutton> Leihotik teklatu bat hautatu ondoren, "
 "instalatzailea lehenengo teklatu hautapen leihora itzuliko da, eta "
@@ -4328,7 +4544,7 @@ msgstr ""
 "osotik aukeratutakoa da."
 
 #. 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 "
@@ -4340,35 +4556,40 @@ msgstr ""
 "xedapen artean aldatzeko."
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:15
+#: en/selectLanguage.xml:34
 msgid "Please choose a language to use"
 msgstr "Aukeratu erabiltzeko hizkuntza bat"
 
-#. 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 ""
 "Zure hizkuntza gogokoena aukeratu zure kontinenteko zerrenda luzatzen. "
 "<application>Mageia</application> aukeraketa hori erabiliko da instalazioan "
 "zehar eta instalatutako sisteman."
 
-#. 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 ""
+"Zure hizkuntza gogokoena aukeratu zure kontinenteko zerrenda luzatzen. "
+"<application>Mageia</application> aukeraketa hori erabiliko da instalazioan "
+"zehar eta instalatutako sisteman."
 
-#. 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 ""
 "Zuretzat edo beste erabiltzaile batzuentzat hainbat hizkuntza instalaturik "
@@ -4377,67 +4598,68 @@ msgstr ""
 "izan daiteke."
 
 #. 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 format=\"PNG\" fileref="
 "\"dx2-selectLanguage.png\" align=\"center\"/> </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 ""
 "Hizkuntza bat baino gehiago aukeratzen bada ere, lehen pantailan nahiago "
 "izandako zure hizkuntza lehena aukeratu behar duzu. Gainera, hainbat "
 "hizkuntzatako aukera pantailan markatuta egongo da."
 
 #. 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 ""
 "Zure teklatu hizkuntza ez da zure gogoko hizkuntzaren berdina, orduan, "
 "komeni da, zure teklatuaren hizkuntza instalatzea."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:56
-msgid "Mageia uses UTF-8 (Unicode) support by default."
-msgstr "Mageia UTF-8 (Unicode) laguntza erabiltzen du lehenespenez."
-
-#. 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 ""
 "\"Hainbat hizkuntza\" pantailan ezgaitu daiteke zure hizkuntzarekin "
 "funtzionatzen ez duela baldin badakizu. UTF-8 Ezgaitzen baduzu, ez da "
 "eskuragarri egongo instalatutako inongo hizkuntzatarako."
 
 #. 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 ""
 "Zure sistemako hizkuntza alda dezakezu Mageia Kontrol Gunean instalazioa "
 "egin ondoren --> Sistema --> kudeatu zure sistemaren kokalekua."
 
 #. type: Content of: <section><info><title>
-#: en/selectMouse.xml:4
+#: en/selectMouse.xml:10
 msgid "Select mouse"
 msgstr "Aukeratu sagua"
 
@@ -4445,17 +4667,19 @@ msgstr "Aukeratu sagua"
 #.  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-selectKeyboard.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."
@@ -4464,26 +4688,29 @@ msgstr ""
 "ahal izango duzu."
 
 #. 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 ""
 "Normalean, <guilabel>Unibertsal</guilabel> - <guilabel>Edozein PS/2 eta USB "
 "sagu</guilabel> aukera ona da."
 
 #. 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 ""
 "Aukeratu <guilabel>Unibertsal</guilabel> - <guilabel>Behartu evdev</"
 "guilabel> lan egiten ez duten sei botoi edo gehiagoko saguaren botoiak "
 "konfiguratzen."
 
-#. 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 "Gegitu edo Aldatu Abio Menuko Sarrera"
 
@@ -4510,107 +4737,68 @@ msgstr ""
 "efi_and_Mageia</link>"
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:7
-msgid "Bootloader main options"
-msgstr "Abio kargatzailearen aukera nagusiak"
-
-#. type: Content of: <section><section><title>
 #: en/setupBootloader.xml:10
-msgid "Bootloader interface"
+#, fuzzy
+msgid "Bootloader"
 msgstr "Abioko kargatzailearen interfazea"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:11
-msgid "By default, Mageia uses exclusively:"
-msgstr "Lehenespenez, Mageia-k soilik darabil:"
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:13
+msgid "Grub2"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><title>
+#: en/setupBootloader.xml:15
+#, fuzzy
+msgid "Grub2 on Legacy MBR/GPT systems"
+msgstr "Grub2 Legacy/MBR eta Legacy/GPT sistemetan"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:14
+#: en/setupBootloader.xml:17
 #, fuzzy
 msgid ""
-"GRUB2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
+"GRUB2 (with or without graphical menu) will be used exclusively as the "
+"bootloader for a Legacy/MBR or Legacy/GPT system."
 msgstr ""
 "Grub2 (enu grafikoarekin edo gabe) Legacy/MBR edo Legacy/GPT sistemarako"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:18
-#, fuzzy
-msgid "GRUB2-efi for a UEFI system."
-msgstr "Grub2-efi UEFI sistementzat."
-
-#. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:22
-msgid "The Mageia graphical menus are nice :)"
-msgstr "The mageia menuak grafikoa politak ditu :)"
-
-#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:25
+#: en/setupBootloader.xml:21
 #, fuzzy
-msgid "GRUB2 on Legacy/MBR and Legacy/GPT systems"
-msgstr "Grub2 Legacy/MBR eta Legacy/GPT sistemetan"
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:27
 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>"
+"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 ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
-"setupBootloader.png\"/> </imageobject>"
-
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:34 en/setupBootloader.xml:56
-#, fuzzy
-msgid ""
-"Don't modify the <emphasis role=\"bold\">Boot Device</emphasis> unless you "
-"really know what you are doing."
-msgstr "Ez aldatu \"Abio Gailua\" zer egiten duzun benetan jakin gabe."
+"GRUB2 abiarazlea MBR (Master Boot Record) zure lehen disko gogorrean edo "
+"BIOSen abioko partizioan."
 
-#. 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 "Grub2-efi UEFI sistemetan"
 
-#. 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 ""
-"UEFI sistema batekin, erabiltzaile interfazearen zertxobait ezberdinak dira, "
-"ezin duzu abioko kargatzailea aukeratu, Grub2-efi soilik dagoelako"
 
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:42
+#. 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-"
-"setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
-"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 ""
 "Mageia zure ordenagailuan instalatutako sistema bakarra bada, "
 "instalatzaileak ESP (EFI sistema partizioa) sortuko du (Grub2-EFI) "
@@ -4620,247 +4808,356 @@ msgstr ""
 "ditu. Hainbat ESP izatea posiblea izan arren, soilik bat izatea aholkatzen "
 "da eta aski dituzun sistema eragileetako kopurua edozein izanik ere."
 
-#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:61
-msgid "Using a Mageia bootloader"
-msgstr "Mageia abio kargatzailea erabiliz"
+#. type: Content of: <section><section><info><title>
+#: en/setupBootloader.xml:46
+#, fuzzy
+msgid "Bootloader Setup"
+msgstr "Abioko kargatzailearen interfazea"
 
-#. 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 "Abio kargatzailearen aukera nagusiak"
+
+#. 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:"
-msgstr "Lehenespenez, zure sistemaren arabera, Mageia-k berri bat idazten du:"
+"<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 align=\"center\" fileref="
+"\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata fileref=\"live-setupBootloader3.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\">Aurreratua</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 ""
-"GRUB2 abiarazlea MBR (Master Boot Record) zure lehen disko gogorrean edo "
-"BIOSen abioko partizioan."
 
-#. 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\">Aurreratua</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 "Gauza bakarra aldatzen duzunean, oso ondo dakizu zer egiten ari zaren."
+
+#. 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\">Partizioaren tamaina:</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\">Aurreratua</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 align=\"center\" fileref="
-"\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata fileref=\"live-setupBootloader3.png\" align=\"center\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:87
-msgid "Using an existing bootloader"
-msgstr "Existitzen den abio kargatzaile bat erabiliz"
 
-#. 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 ""
-"Zure Mageia sistema erabilea existitzen den abiarazlera gehitzeko prozedura "
-"zehatza eskuliburu honen esparrutik kanpo dago, baina normalean abio "
-"kargatzaile instalazioak antzeman eta gehitu beharko luke. Ikusi kasuko "
-"sistema eragilearen dokumentazioa."
+"<guilabel>Pasahitza</guilabel>: Testu-koadro honetan benetako pasahitza "
+"jartzen  da"
 
-#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:95
-msgid "Using chain loading"
-msgstr "Katearen karga erabiltzen"
+#. 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\">Partizioaren tamaina:</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>Pasahitza (berriz)</guilabel>: Idatzi berriro pasahitza eta DrakX "
+"lehen ezarritakoarekin bat etortzea egiaztatuko du."
 
-#. 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\">Aurreratua</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:99
+#, fuzzy
+msgid "<emphasis>Enable ACPI</emphasis>"
+msgstr "<emphasis>Generikoa</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-"
-"setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-setupBootloader4.png\" align="
-"\"center\"/> </imageobject>"
 
-#. type: Content of: <section><section><para>
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
 #: en/setupBootloader.xml:108
-msgid ""
-"You will get a warning that the bootloader is missing, ignore it by clicking "
-"<guibutton>OK</guibutton>."
-msgstr ""
+#, fuzzy
+msgid "<emphasis>Enable SMP</emphasis>"
+msgstr "<emphasis>Generikoa</emphasis>"
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:111
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:109
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
-"imageobject>"
+"This option enables/disables symmetric multiprocessing for multi-core "
+"processors"
 msgstr ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
-"imageobject>"
+"<guilabel>SMP gaitu</guilabel>: Aukera honek prozesu anitzeko prozesadore "
+"simetrikoak gaitzen / desgaitzen ditu."
 
-#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:117
-msgid "Options"
-msgstr "Aukerak"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:113
+#, fuzzy
+msgid "<emphasis>Enable APIC</emphasis>"
+msgstr "<emphasis>Generikoa</emphasis>"
 
-#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:119
-msgid "First page"
-msgstr "Lehen orria"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:114
+msgid ""
+"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 ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
 #: en/setupBootloader.xml:120
+#, fuzzy
+msgid "<emphasis>Enable Local APIC</emphasis>"
+msgstr "<emphasis>Generikoa</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:121
 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."
+"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><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:122
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:127
+#, fuzzy
+msgid "Bootloader Configuration"
+msgstr "Soinu Konfiguraketa"
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:129
+#, fuzzy
 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."
+"<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 align=\"center\" fileref="
+"\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata fileref=\"live-setupBootloader3.png\" align=\"center\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:125
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:139
 #, fuzzy
-msgid "<guilabel>Password</guilabel>: Choose a password for the bootloader."
-msgstr ""
-"<guilabel>Pasahitza</guilabel>: Testu-koadro honetan benetako pasahitza "
-"jartzen  da"
+msgid "<emphasis role=\"bold\">Default</emphasis>"
+msgstr "<emphasis role=\"bold\">Aurreratua</emphasis>"
 
-#. 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:140
 #, fuzzy
-msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the password and DrakX will "
-"check that it matches with the one above."
+msgid "The operating system to started up by default"
 msgstr ""
-"<guilabel>Pasahitza (berriz)</guilabel>: Idatzi berriro pasahitza eta DrakX "
-"lehen ezarritakoarekin bat etortzea egiaztatuko du."
+"<guilabel>Lehenetsia:</guilabel> Sistema eragilea modu lehenetsian hasi da"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:127 en/setupBootloader.xml:159
-msgid "<guilabel>Advanced</guilabel>"
-msgstr "<guilabel>Aurreratu</guilabel>"
+#: en/setupBootloader.xml:143
+#, fuzzy
+msgid "<emphasis role=\"bold\">Append</emphasis>"
+msgstr "<emphasis role=\"bold\">Aurreratua</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:144
+#, fuzzy
 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)."
+"This option lets you pass information to the kernel or tell the kernel to "
+"give you more information as it boots"
 msgstr ""
+"<guilabel>Erantsi:</guilabel> Aukera honek kernelaren informazioa pasatzera "
+"edo kernelak informazio gehiago emateko esaten dio abioan."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:133
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:148
 #, fuzzy
+msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
+msgstr "<emphasis role=\"bold\">Aurreratua</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:149
 msgid ""
-"<guilabel>Enable SMP</guilabel>: This option enables/disables symmetric "
-"multiprocessing for multi core processors."
+"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 ""
-"<guilabel>SMP gaitu</guilabel>: Aukera honek prozesu anitzeko prozesadore "
-"simetrikoak gaitzen / desgaitzen ditu."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:135
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:156
+#, fuzzy
 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."
+"<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 align=\"center\" fileref="
+"\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata fileref=\"live-setupBootloader3.png\" align=\"center\"/> </"
+"imageobject>"
 
-#. 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:166
+#, fuzzy
+msgid "<emphasis>Video mode</emphasis>"
+msgstr "<emphasis>Hornitzailea</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:167
 msgid ""
-"<guilabel>Enable Local APIC</guilabel>: Local APIC manages all external "
-"interrupts for a specific processor in an SMP system."
+"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><title>
-#: en/setupBootloader.xml:143
-msgid "Next page"
-msgstr "Hurrengo orria"
+#. 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>Hornitzailea</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:146
-msgid "<guilabel>Default:</guilabel> Operating system started up by default"
+#: en/setupBootloader.xml:173
+msgid ""
+"Select this option if you don't want a bootable Mageia, but would rather "
+"chain-load it from another OS. You will get a warning that the bootloader is "
+"missing. Click<emphasis> Ok</emphasis> if you are sure you understand the "
+"implications, and wish to proceed."
 msgstr ""
-"<guilabel>Lehenetsia:</guilabel> Sistema eragilea modu lehenetsian hasi da"
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:150
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:181
+#, 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."
+"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align=\"center"
+"\"/> </imageobject>"
 msgstr ""
-"<guilabel>Erantsi:</guilabel> Aukera honek kernelaren informazioa pasatzera "
-"edo kernelak informazio gehiago emateko esaten dio abioan."
+"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:155
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:188
+#, fuzzy
+msgid "Other Options"
+msgstr "Aukerak"
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:190
+msgid "Using an existing bootloader"
+msgstr "Existitzen den abio kargatzaile bat erabiliz"
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:191
+#, fuzzy
 msgid ""
-"<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
-"\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
+"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 ""
+"Zure Mageia sistema erabilea existitzen den abiarazlera gehitzeko prozedura "
+"zehatza eskuliburu honen esparrutik kanpo dago, baina normalean abio "
+"kargatzaile instalazioak antzeman eta gehitu beharko luke. Ikusi kasuko "
+"sistema eragilearen dokumentazioa."
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:159
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:199
+#, fuzzy
+msgid "Installing Without a Bootloader"
+msgstr "Mageia abio kargatzailea erabiliz"
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:200
+msgid ""
+"While you can opt to install Mageia without a bootloader (see section 2.1 "
+"Advanced), this is not recommended unless you absolutely know what you are "
+"doing, as without some form of bootloader your operating system will be "
+"unable to start."
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:207
+#, fuzzy
 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 ""
+"Horretarako, editatu /boot/grub2/custom.cfg eskuz edo erabili grub-"
+"customizer softwarea (eskuragarri Mageia biltegietan)."
 
-#. 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 ""
-"<emphasis role=\"bold\">Ez ikutu ESP edo MBR</emphasis>: ikus goian <link "
-"linkend=\"setupChainLoading\">Katearen karga erabiliz</link>"
+"Informazio gehiago lortzeko, ikus gure wikia: <link ns2:href=\"https://wiki."
+"mageia.org/en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-"
+"efi_and_Mageia</link>"
 
 #. type: Content of: <section><info><title>
-#: en/setupSCSI.xml:3
+#: en/setupSCSI.xml:10
 msgid "Setup SCSI"
 msgstr "SCSI konfiguratu"
 
@@ -4872,18 +5169,20 @@ msgstr "SCSI konfiguratu"
 #.  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 "
@@ -4895,105 +5194,60 @@ msgstr ""
 "detektatu eta huts egin dezake disko gogorra aitortu nahian."
 
 #. 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 ""
 "Horrela bada, eskuz kontatu behar izango dituzu DrakX-ekin dituzun SCSI "
 "disko(ak)."
 
-#. type: Content of: <section><para>
-#: en/setupSCSI.xml:35
-msgid "DrakX should then be able to configure the drive(s) correctly."
-msgstr ""
-"Orduan DrakX kontrolatzile zuzena konfiguratzeko gai izan beharko litzateke."
-
 #. type: Content of: <section><info><title>
-#: en/soundConfig.xml:3
+#: en/soundConfig.xml:10
 msgid "Sound Configuration"
 msgstr "Soinu Konfiguraketa"
 
 #.  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
-msgid ""
-"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
-"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
-"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
-
-#. type: Content of: <section><para>
-#: en/soundConfig.xml:14
+#: en/soundConfig.xml:20
 #, 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."
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-soundConfig.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"soundConfig-im1\"/> </imageobject>"
 msgstr ""
-"Pantaila honetan zure soinu txarteleko gidari Instalatzailearen izena ematen "
-"da, eta hau kontrolatzaile lehenetsia izango da lehenetsitako bat baduzu."
+"<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 ""
-"Gidari lehenetsia ongi ibili beharko luke. Hala ere, instalazioa egin "
-"ondoren arazoak badaude, exekutatu <command>draksound</command> edo tresna "
-"hau abiarazi MCC-tik (Mageia Kontrol Gunea), <guilabel>Hardware</guilabel> "
-"etiketea auketatzen eta <guilabel>Soinua Konfiguratu</guilabel>n klik egiten "
-"pantailaren goiko eskuineko izkinan."
 
 #. 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 ""
-"Orduan, draksound-en  \"Soinua Konfiguratu\" tresnaren pantailan, egin klik "
-"<guibutton>Aurreratua</guibutton> eta <guibutton>Arazoen konponketa</"
-"guibutton>n arazoa nola konpondu buruzko aholku lagungarria aurkitzeko."
 
 #. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:30
+#: en/soundConfig.xml:43
 msgid "Advanced"
 msgstr "Aurreratua"
 
-#. 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 ""
-"Klik egin <guibutton>Aurreratua</guibutton> pantaila honetan, instalazioan "
-"zehar, oso erabilgarria da han gidari lehenetsia ez bada, eta hainbat gidari "
-"eskuragarri badira, edo instalatzaileak okerreko kontrolatzailea aukeratu "
-"duela uste baduzu."
-
-#. 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 ""
-"Kasu horretan beste kontrolatzaile bat <guibutton>Edozein gidari hautatu</"
-"guibutton>-n klik egin ondoren hautatu dezakezu."
-
 #. type: Content of: <section><info><title>
-#: en/takeOverHdConfirm.xml:3
+#: en/takeOverHdConfirm.xml:10
 msgid "Confirm hard disk to be formatted"
 msgstr "Baieztatzeko formateatu beharreko disko gogorra"
 
@@ -5003,162 +5257,170 @@ msgstr "Baieztatzeko formateatu beharreko disko gogorra"
 #.     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 condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><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 "Klik <guibutton>Aurreko</guibutton> ziur ez bazaude zure aukeraz."
 
-#. 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 ""
 "Klik <guibutton>Hurrengoa</guibutton> ziur bazaude eta partizio guztiak, "
 "sistema eragilea eta disko gogor horretako datu guztiak ezabatu nahi "
 "dituzula."
 
 #. type: Content of: <section><info><title>
-#: en/testing.xml:9
+#: en/testing.xml:3
 msgid "Testing Mageia as Live system"
 msgstr "Mageia Live sistema gisa probatzen"
 
 #. type: Content of: <section><section><info><title>
-#: en/testing.xml:14
+#: en/testing.xml:8
 msgid "Live mode"
 msgstr "Live modua"
 
+#. 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 ""
-"Pantaila hau lortuko duzu  \"Mageia Abiarazi\" hautatu baduzu. Ezezkoa bada, "
-"\"<link linkend=\"doPartitionDisks\">Partizio</link> urratsa\" lortuko duzu"
-
 #. type: Content of: <section><section><section><info><title>
-#: en/testing.xml:28
+#: en/testing.xml:21
 msgid "Testing hardware"
 msgstr "Hardwarea probatzen "
 
 #. 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 ""
 "Live moduaren helburuetako bat Mageian hardware-a ondo kudeatuko dela "
 "probatzea da. Gailu guztiak gidari bat dutela egiazta dezakezu Mageia "
 "Kontrol Guneko Hardware atalean. Gailurik gaurkoagoak proba ditzakezu:"
 
 #. 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 "sareko interfazea: konfiguratu net_applet-ekin"
 
 #. 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 ""
 "txartel grafikoa: aurreko pantaila ikusten baduzu, dagoeneko dena ongi dago."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:47
+#: en/testing.xml:40
 msgid "webcam:"
 msgstr "Web 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 "Soinua: doinu bat dagoeneko jokatu da"
 
 #. 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 "inprimagailua: konfiguratu eta probako orria inprimatu"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:59
+#: en/testing.xml:52
 msgid "scanner: scan a document from ..."
 msgstr "eskaner: dokumentu bat eskaneatu ..."
 
 #. 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 ""
 "Guztia da zuretzat ona bada, instalaziora prozesa dezakezu. Hala ez bada, "
 "irten botoia sakatu dezakezu."
 
-#. 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 ""
 "Hemen egin dituzun konfigurazio ezarpenak instalaziorako mantenduko dira."
 
 #. type: Content of: <section><section><section><info><title>
-#: en/testing.xml:72
+#: en/testing.xml:68
 msgid "Launch installation"
 msgstr "Instalaketa abiarazi"
 
-#. 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 ""
 "Mageia LiveCD edo Live disko gogorrean edo SSD disko DVD instalazioa "
 "abiarazteko, egin klik ikonoan \"Hard Disk instalatu\" on. Pantaila honetan, "
 "eta, ondoren, \"<link linkend=\"doPartitionDisks\">Partizio</link> urratsa\" "
 "zuzeneko instalatzeko gisa jasoko duzu."
 
+#. 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 "Mageia desinstalatzen"
 
 #. 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 "
@@ -5170,13 +5432,13 @@ msgstr ""
 "ematen dizu ezabatzeko. Hau ez da egia sistema eragile guztietan."
 
 #. 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 ""
 "Datuen babeskopiaren ondoren, berrabiatu zure Mageia DVD instalazioa eta "
 "hautatu Erreskate sistema, orduan, Leheneratu Windows abioko kargatzailea. "
@@ -5184,15 +5446,18 @@ msgstr ""
 "eragilea aukeratzeko."
 
 #. 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 ""
 "Windows-en Mageiak erabilitako partizio espazioa berreskuratzeko, sakatu "
 "<code>Hasi -> Kontrol-panela -> Administrazio-tresnak -> Ordenagailu "
@@ -5203,16 +5468,17 @@ msgstr ""
 "eta hautatu <guibutton>Ezabatu</guibutton>. Espazioa libratuko da."
 
 #. 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 ""
 "Windows XP erabiltzen ari bazara, partizio berri bat sor dezakezu eta (FAT32 "
 "edo NTFS)  formatua eman. Partizioa letra bat jasoko du."
 
 #. 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 "
@@ -5228,34 +5494,50 @@ msgstr ""
 "ibili, eta ziurtatu gauza garrantzitsu guztiak babestuta edukitzea."
 
 #. type: Content of: <section><info><title>
-#: en/unused.xml:9
+#: en/unused.xml:3
 msgid "Keep or delete unused material"
 msgstr "Gorde edo ezabatu erabiltzen ez den materiala"
 
+#. 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=\"reboot-im1\" fileref=\"live-"
+"reboot.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 ""
 "Urrats honetan, instalatzailearekin tokiko erabili gabeko paketeak eta "
 "erabili gabeko hardware paketeak bilatzen ditu. Gero proposatzen dizu "
 "ezabatzeko. Ideia ona da onartzeko, hardware ezberdinean instalazio bat "
 "exekutatzea pentsatu ezik."
 
+#. 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>"
@@ -5264,15 +5546,773 @@ 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 ""
 "Hurrengo pausoa disko gogorrean fitxategiak kopiatzea da. Honek minutu "
 "batzuk hartzen ditu. Bukaeran, pantaila huts bat daukazu aldi baterako, "
 "normala da."
 
+#~ msgid "User and Superuser Management"
+#~ msgstr "Erabiltzaile eta Supererabiltzaileen Kudeaketa"
+
+#, fuzzy
+#~ msgid ""
+#~ "Every partition is shown to the left as: <emphasis role=\"bold\">Device "
+#~ "(capacity, mount point, type).</emphasis>"
+#~ msgstr ""
+#~ "Partizio bakoitza honela erakutsiko da: \"Gailua\" (\"Tamaina\", "
+#~ "\"Muntatze puntua\", \"Mota\")."
+
+#~ msgid "In advanced tab, you will find more options about clock settings."
+#~ msgstr ""
+#~ "Fitxa aurreratuan, erloju ezarpenei buruzko aukera gehiago aurkituko duzu."
+
+#~ msgid "From a disc"
+#~ msgstr "Diskotik"
+
+#~ 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 ""
+#~ "Zuzenean abiarazi dezakezu irudia erre duzun (CD-ROM, DVD-ROM ...) "
+#~ "baliabidetik. Normalean zure CD/DVD unitatean txertatzea besterik ez da "
+#~ "behar instalazioa automatikoki abiarazteko ordenagailua berrabiarazi "
+#~ "ondoren. Hori gertatzen ez bada BIOS-a konfiguratu beharko zenuke edo "
+#~ "zeinetatik ordenagailua martxan jarriko den periferikoa aukeratzea "
+#~ "eskainiko zaituen tekla bati zapaldu."
+
+#~ msgid ""
+#~ "According to which hardware you have, and how it is configured, you get "
+#~ "either one or another of the two screens below."
+#~ msgstr ""
+#~ "Hardwarea eta konfiguratuta arabera nola dagoen, hurrengo bat edo bi "
+#~ "pantailetako beste bat lortzen da."
+
+#~ msgid "From a USB device"
+#~ msgstr "USB gailu batetik"
+
+#~ 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 ""
+#~ "Zure irudia ISO irauli duzun USB gailu horretatik abia dezakezu. Zure "
+#~ "BIOS ezarpenen arabera, abiarazketa agian zuzenean USB gailua dagoeneko "
+#~ "portu batean sartuta dagoela. Hori gertatzen ez bada BIOS-a konfiguratu "
+#~ "beharko zenuke edo zeinetatik ordenagailua martxan jarriko den "
+#~ "periferikoa aukeratzea eskainiko zaituen tekla bati zapaldu."
+
+#~ 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 "Erdiko menuan, hiru ekintzen artean erabaki behar duzu:"
+
+#~ 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 ""
+#~ "Disko gogorretik abiarazi: aukera honek aukera ematen du disko gogorretik "
+#~ "abiarazteko, ohikoa den bezala, (CD/DVD edo USB) baliabidea konektatuta "
+#~ "ez dagoenean. (Mageia 5-ean ez du funtzionatzen)."
+
+#~ msgid "In the bottom menu, are the Boot Options:"
+#~ msgstr "Menuaren azpikaldean, Abio Aukerak daude:"
+
+#~ msgid ""
+#~ "F1 - Help. Explain the options \"splash\", \"apm\", \"acpi\" and \"Ide\""
+#~ msgstr ""
+#~ "F1 - Laguntza. Azaldu aukerak \"splash\", \"APM\", \"acpi\" eta \"Ide\""
+
+#~ msgid "F2 - Language. Choose the display language of the screens."
+#~ msgstr "F2 - Hizkuntza. Aukeratu pantailen hizkuntza."
+
+#~ msgid ""
+#~ "F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728"
+#~ msgstr ""
+#~ "F3 - Pantailaren bereizmena. Aukeratu testua, 640x400, 800x600, 1024x728 "
+#~ "artean"
+
+#~ 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 - Driver. Bai edo Ez. Sistemak disko optikoak ontrolatzailea "
+#~ "eguneraketarik duen jakitun da eta instalazio prozesuan zehar txertatzeko "
+#~ "eskatzen du."
+
+#~ msgid ""
+#~ "F6 - Kernel options. This is a way to specify options according to your "
+#~ "hardware and the drivers to use."
+#~ msgstr ""
+#~ "F6 - Kernel aukera. Hau zure hardware eta gidarien erabileraren araberako "
+#~ "aukerak zehazteko modu bat da."
+
+#~ msgid "First screen while booting on UEFI system from disk"
+#~ msgstr "Lehen pantaila diskotik UEFI sistema abiaraztean"
+
+#~ msgid ""
+#~ "You have only the choice to run Mageia in Live mode (first choice)  or to "
+#~ "process the installation (second choice)."
+#~ msgstr ""
+#~ "Aukera bakarra duzu Mageia Live moduan exekutatzeko (lehenengo aukera) "
+#~ "edo instalazioa prozesatzeko (bigarren aukera)."
+
+#~ 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 ""
+#~ "Kasu bakoitzean, lehen urrats bera aukeratu hizkuntza, ordu-eremua\n"
+#~ "eta teklatua, ondoren, prozesu ezberina da, <link linkend=\"testing"
+#~ "\">Live moduan urrats osagarriekin</link>."
+
+#, fuzzy
+#~ msgid ""
+#~ "Depending on your selection here, you may be offered further screens to "
+#~ "fine-tune your choice."
+#~ msgstr ""
+#~ "Zure hautapena arabera hemen, pantaila gehiago eskaini ahal izango duzu "
+#~ "zure aukera doitzeko."
+
+#, fuzzy
+#~ msgid "The settings DrakX chose are usually good."
+#~ msgstr "Aukeratutako DrakX ezarpenak onak izaten dira."
+
+#, 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=\"summaryBottom-im1\" "
+#~ "align=\"center\" fileref=\"dx2-summaryBottom.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 ""
+#~ "Nonfree biltegia esplizituki gaituta egon behar da sartzeko. Ez baduzu "
+#~ "hura aurretik hautatu, hau egin beharko duzu berrabiarazi ondoren "
+#~ "lehenengoz."
+
+#, 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=\"reboot-im1\" fileref="
+#~ "\"live-reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<emphasis><guibutton>Graphic card</guibutton></emphasis>: Choose your "
+#~ "card from the list if needed."
+#~ msgstr ""
+#~ "<emphasis><guibutton>Txartel Grafikoa</guibutton></emphasis>: Aukeratu "
+#~ "zure txartela zerrendatik behar izanez gero."
+
+#~ msgid "Incorrect refresh rates may damage your monitor"
+#~ msgstr "Freskatze tasa okerra zure pantaila kaltetu dezake"
+
+#, 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=\"reboot-im1\" fileref="
+#~ "\"live-reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
+
+#~ msgid "<emphasis>Custom</emphasis>"
+#~ msgstr "<emphasis>Pertsonalizatua</emphasis>"
+
+#~ msgid "<emphasis>Plug 'n Play</emphasis>"
+#~ msgstr "<emphasis>Plug 'n Play</emphasis>"
+
+#~ msgid "the monitor manufacturers name"
+#~ msgstr "pantailaren fabrikatzailearen izena"
+
+#~ msgid "the monitor description"
+#~ msgstr "pantailaren deskribapena"
+
+#~ 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 "Klik <guibutton>Eginda</guibutton> prest zaudenean."
+
+#~ 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-"
+#~ "doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" "
+#~ "align=\"center\"/> </imageobject>"
+
+#~ msgid "Use Free Space"
+#~ msgstr "Erabili Espazio Hutsa"
+
+#~ msgid "Use Free Space on a Windows Partition"
+#~ msgstr "Erabili Espazio Librea Windows-en Partizioan"
+
+#~ msgid ""
+#~ "If you have unused space on an existing Windows partition, the installer "
+#~ "may offer to use it."
+#~ msgstr ""
+#~ "Lehendik dauden Windows partiziotik erabili gabeko espazioa baduzu, "
+#~ "instalatzaileak, erabili ahal izateko eskainiko dizu."
+
+#, 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-"
+#~ "doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" "
+#~ "align=\"center\"/> </imageobject>"
+
+#~ msgid "Erase and use Entire Disk."
+#~ msgstr "Ezabatu eta erabili disko osoa."
+
+#~ msgid ""
+#~ "Note! This will erase ALL data on the selected hard drive. Take care!"
+#~ msgstr ""
+#~ "Oharra! Aukeratutako disko gogorraren datu guztiak ezabatuko dira. Kontuz "
+#~ "ibili!"
+
+#~ msgid "Custom disk partitioning"
+#~ msgstr "Disko-partizio pertsonalizatua"
+
+#, 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 ""
+#~ "Horrek esan nahi du 160 GB-tik eta gehiago eskuragarri, instalatzaileak "
+#~ "hiru partizio sortuko dituela: 50GB /-rako , 4 GB swap-rako eta "
+#~ "gainontzekoa /home-entzako."
+
+#~ 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 align=\"center\" fileref="
+#~ "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition="
+#~ "\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid "January 2015"
+#~ msgstr "2015eko Urtarrila"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+
+#~ msgid "Using a Mageia DVD"
+#~ msgstr "Mageia DVDa erabiliz"
+
+#, 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 ""
+#~ "Hemen lehenetsitako ongietorri pantaila, Lehenean UEFI sistema batekin "
+#~ "eta bigarrenean Legacy sistema duen Mageia DVD bat erabiliz:"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
+
+#~ msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "Use the arrow keys to select the language then press <emphasis role=\"bold"
+#~ "\">Enter</emphasis>."
+#~ msgstr "Erabili geziak hizkuntza aukeratzeko eta sakatu Sartu."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid "Default: It doesn't alter anything in the default options."
+#~ msgstr "- Berez, ez du lehenetsitako aukeretan ezer aldatzen."
+
+#~ msgid ""
+#~ "When you select one of these entries, it modifies the default options "
+#~ "displayed in the <guilabel>Boot Options</guilabel> line."
+#~ msgstr ""
+#~ "Sarrera horietako bat hautatzean, <guilabel>Abio aukera</guilabel> "
+#~ "lerroan erakutsitako jatorrizko aukerak aldatzen dira."
+
+#, 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 ""
+#~ "Maegia bertsio batzuetan, hautatutako F6 gakoarekin hautatutako aukerak "
+#~ "ez direla <guilabel>Abio aukerak</guilabel> lerroan agertzen gerta "
+#~ "daiteke. Hala ere, kontuan izango dira."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata 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 ""
+#~ "F1 Sakatuz aukera berrien leihoa irekitzen da. Bat aukera ezazu gezi-"
+#~ "teklekin eta ENTER-a saka ezazu xehetasun gehiago izateko edo Esc tekla "
+#~ "saka ezazu ongietorri-pantailara itzultzeko."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </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 ""
+#~ "Aukeren pantailaren ikuspegi zehatza. Sakatu Esc edo hautatu "
+#~ "<guilabel>Abioko aukeretara Itzultzea</guilabel> aukeren zerrendara "
+#~ "itzultzeko. Aukera hauek eskuz gehitu daitezke <guilabel>Abioko Aukera</"
+#~ "guilabel> lerroan."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "The help is translated in the chosen language with <emphasis role=\"bold"
+#~ "\">F2</emphasis>."
+#~ msgstr "Laguntzak F2 teklaz aukeratutako hizkuntza emaitza du."
+
+#~ 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 ""
+#~ "Kernel ondare eta UEFI sistemtako aukerei buruzko informazio gehiago "
+#~ "lortzeko, ikus:<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 "Baliabide Aukeraketa (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=\"selectCountry-im1\" "
+#~ "align=\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </"
+#~ "imageobject>"
+
+#~ msgid "Summary of miscellaneous parameters"
+#~ msgstr "Hainbat parametroen laburpena"
+
+#~ msgid "<guilabel>Timezone</guilabel>"
+#~ msgstr "<guilabel>Denbora-Eremua</guilabel>"
+
+#~ msgid "<guilabel>Country / Region</guilabel>"
+#~ msgstr "<guilabel>Herrialde/Eskualde</guilabel>"
+
+#~ msgid "<guilabel>Bootloader</guilabel>"
+#~ msgstr "<guilabel>Abio kargatzailea</guilabel>"
+
+#~ msgid "For more information, see <xref linkend=\"setupBootloader\"/>"
+#~ msgstr "Informazio gehiagorako, ikus <xref linkend=\"setupBootloader\"/>"
+
+#~ msgid "<guilabel>User management</guilabel>"
+#~ msgstr "<guilabel>Erabiltzaile kudeaketa</guilabel>"
+
+#~ msgid "<guilabel>Services</guilabel>:"
+#~ msgstr "<guilabel>Zerbitzuak</guilabel>:"
+
+#~ msgid "For more information, see <xref linkend=\"configureServices\"/>"
+#~ msgstr "For more information, see <xref linkend=\"configureServices\"/>"
+
+#~ msgid "<guilabel>Keyboard</guilabel>:"
+#~ msgstr "<guilabel>Teklatua</guilabel>:"
+
+#~ msgid "<guilabel>Mouse</guilabel>:"
+#~ msgstr "<guilabel>Sagua</guilabel>:"
+
+#~ msgid "<guilabel>Sound card</guilabel>:"
+#~ msgstr "<guilabel>Soinu txartela</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 ""
+#~ "Instalatzaileak gidari lehenetsia erabiltzen du, baldin badago. Gidari "
+#~ "bat baino gehiago dagoenean agertzen da beste bat aukeratzeko aukera "
+#~ "soilik, baina bat ere ez dator lehenetsita."
+
+#~ msgid "<guilabel>Graphical interface</guilabel>:"
+#~ msgstr "<guilabel>Interfaze grafikoa</guilabel>:"
+
+#~ msgid "<guilabel>Network</guilabel>:"
+#~ msgstr "<guilabel>Sarea</guilabel>:"
+
+#~ msgid "<guilabel>Proxies</guilabel>:"
+#~ msgstr "<guilabel>Proxiak</guilabel>:"
+
+#~ msgid "<guilabel>Security Level</guilabel>:"
+#~ msgstr "<guilabel>Segurtasun Maila</guilabel>:"
+
+#~ msgid "Check the option which best suits your usage."
+#~ msgstr "Begiratu zure erabilerara hoberen egokitzen den aukera."
+
+#~ msgid "<guilabel>Firewall</guilabel>:"
+#~ msgstr "<guilabel>Suebakia</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 ""
+#~ "Suebaki baten asmoa, zure artxibo garrantzitsuen eta Internetetik "
+#~ "dabiltzan asmo txarreko jende ugariren, lapurtzen saia daitezkeen edo "
+#~ "zure artxiboak arriskuan jarri dezaketenen artean hesi bat jartzea da."
+
+#~ 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 ""
+#~ "Aukera itzazu zure sisteman sartu nahi dituzun zerbitzuak. Zure "
+#~ "aukeraketa zure ordenagailuan egiten duzun erabileraren mende egongo da. "
+#~ "Informazio gehiago lortzeko, ikus<xref linkend=\"firewall\"/> ."
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata format=\"PNG\" xml:id=\"securityLevel-im1\" "
+#~ "align=\"center\" fileref=\"dx2-securityLevel.png\" revision=\"1\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" "
+#~ "align=\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </"
+#~ "imageobject>"
+
+#~ msgid "64 bit architecture only."
+#~ msgstr "64 bit arkitektura soilik."
+
+#, 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 eta sha1sum ISOaren osotasuna egiaztatzeko tresnak dira. Erabili "
+#~ "horietako bat bakarrik. Gorde bat <link linkend=\"integrity\">geroago "
+#~ "erabiltzeko</link>. Ondoren leiho hau agertuko da:"
+
+#~ msgid ""
+#~ "To recover the original capacity, you must redo partitioning and re-"
+#~ "format the USB stick."
+#~ msgstr ""
+#~ "Jatorrizko ahalmena berreskuratzeko, berriro formateatu eta zatitu behar "
+#~ "duzu USB makila."
+
+#~ msgid "Install"
+#~ msgstr "Instalatu"
+
+#~ msgid "Upgrade"
+#~ msgstr "Berritu"
+
+#, 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 ""
+#~ "Instalazioan zehar instalazioa gelditzea erabakitzen baduzu, berrastea "
+#~ "posiblea da, baina bi aldiz pentsa ezazu. Behin partizio bat formateatu "
+#~ "denez gero edo behin eguneratzeak jartzen hasi direnean, zure "
+#~ "ordenagailua ez da egoera berean izango eta berrabiarazteak sistema "
+#~ "erabilezinarekin utz dezake. Hala ere, berrastea erabakitzen baduzu, "
+#~ "terminalera sar zaitez <guilabel>Alt Ctrl F2</guilabel> aldi berean "
+#~ "sakatuz. Gero, <guilabel>Alt Ctrl Delete</guilabel> saka ezazu aldi "
+#~ "berean berrasteko."
+
+#~ 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 ""
+#~ "Beharrezkoa izango da Mageian erabili nahi duzun teklatu-diseinua "
+#~ "ezartzea. Lehenetsi bat zuk aurretik aukeratutako hizkuntzaren eta ordu-"
+#~ "eremuaren arabera hautatzen da."
+
+#~ msgid "Mageia uses UTF-8 (Unicode) support by default."
+#~ msgstr "Mageia UTF-8 (Unicode) laguntza erabiltzen du lehenespenez."
+
+#~ 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>"
+
+#~ msgid "By default, Mageia uses exclusively:"
+#~ msgstr "Lehenespenez, Mageia-k soilik darabil:"
+
+#, fuzzy
+#~ msgid "GRUB2-efi for a UEFI system."
+#~ msgstr "Grub2-efi UEFI sistementzat."
+
+#~ msgid "The Mageia graphical menus are nice :)"
+#~ msgstr "The mageia menuak grafikoa politak ditu :)"
+
+#~ 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 fileref=\"dx2-"
+#~ "setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata xml:id=\"setupBootloader-im1\" 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 "Ez aldatu \"Abio Gailua\" zer egiten duzun benetan jakin gabe."
+
+#, 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 ""
+#~ "UEFI sistema batekin, erabiltzaile interfazearen zertxobait ezberdinak "
+#~ "dira, ezin duzu abioko kargatzailea aukeratu, Grub2-efi soilik dagoelako"
+
+#~ 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-"
+#~ "setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "By default, and according to your system, Mageia writes one of the "
+#~ "following:"
+#~ msgstr ""
+#~ "Lehenespenez, zure sistemaren arabera, Mageia-k berri bat idazten du:"
+
+#~ msgid "Using chain loading"
+#~ msgstr "Katearen karga erabiltzen"
+
+#~ 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-"
+#~ "setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-setupBootloader4.png\" "
+#~ "align=\"center\"/> </imageobject>"
+
+#~ msgid "First page"
+#~ msgstr "Lehen orria"
+
+#~ msgid "<guilabel>Advanced</guilabel>"
+#~ msgstr "<guilabel>Aurreratu</guilabel>"
+
+#~ msgid "Next page"
+#~ msgstr "Hurrengo orria"
+
+#~ msgid ""
+#~ "<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above "
+#~ "<link linkend=\"setupChainLoading\">Using the chain loading</link>"
+#~ msgstr ""
+#~ "<emphasis role=\"bold\">Ez ikutu ESP edo MBR</emphasis>: ikus goian <link "
+#~ "linkend=\"setupChainLoading\">Katearen karga erabiliz</link>"
+
+#, 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 ""
+#~ "Orduan DrakX kontrolatzile zuzena konfiguratzeko gai izan beharko "
+#~ "litzateke."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" "
+#~ "xml:id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" "
+#~ "xml:id=\"soundConfig-im1\" revision=\"1\"/> </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 ""
+#~ "Pantaila honetan zure soinu txarteleko gidari Instalatzailearen izena "
+#~ "ematen da, eta hau kontrolatzaile lehenetsia izango da lehenetsitako bat "
+#~ "baduzu."
+
+#~ 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 ""
+#~ "Gidari lehenetsia ongi ibili beharko luke. Hala ere, instalazioa egin "
+#~ "ondoren arazoak badaude, exekutatu <command>draksound</command> edo "
+#~ "tresna hau abiarazi MCC-tik (Mageia Kontrol Gunea), <guilabel>Hardware</"
+#~ "guilabel> etiketea auketatzen eta <guilabel>Soinua Konfiguratu</"
+#~ "guilabel>n klik egiten pantailaren goiko eskuineko izkinan."
+
+#, 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 ""
+#~ "Orduan, draksound-en  \"Soinua Konfiguratu\" tresnaren pantailan, egin "
+#~ "klik <guibutton>Aurreratua</guibutton> eta <guibutton>Arazoen konponketa</"
+#~ "guibutton>n arazoa nola konpondu buruzko aholku lagungarria aurkitzeko."
+
+#, 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 ""
+#~ "Klik egin <guibutton>Aurreratua</guibutton> pantaila honetan, "
+#~ "instalazioan zehar, oso erabilgarria da han gidari lehenetsia ez bada, "
+#~ "eta hainbat gidari eskuragarri badira, edo instalatzaileak okerreko "
+#~ "kontrolatzailea aukeratu duela uste baduzu."
+
+#, 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 ""
+#~ "Kasu horretan beste kontrolatzaile bat <guibutton>Edozein gidari hautatu</"
+#~ "guibutton>-n klik egin ondoren hautatu dezakezu."
+
+#, 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 ""
+#~ "Pantaila hau lortuko duzu  \"Mageia Abiarazi\" hautatu baduzu. Ezezkoa "
+#~ "bada, \"<link linkend=\"doPartitionDisks\">Partizio</link> urratsa\" "
+#~ "lortuko duzu"
+
 #~ 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 "
@@ -5383,23 +6423,6 @@ msgstr ""
 #~ "</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 ""
-#~ "Erlaitz bat dago disko gogor bakoitzerako edo antzemandako biltegiratze-"
-#~ "sistemarako, USB unitatea bezala. Adibidez, sda, sdb eta sdc hiru "
-#~ "aurkitzen badira."
-
-#~ msgid ""
 #~ "<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
 #~ "doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
 #~ "condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" "
@@ -5510,15 +6533,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 "\"X-ekin\" hautatzen bada, IceWM idazmahai arin gisa egongo da."
@@ -5578,13 +6592,6 @@ msgstr ""
 #~ "\"center\" format=\"PNG\"></imagedata> </imageobject>"
 
 #~ msgid ""
-#~ "Use this option for a fresh <application>Mageia</application> "
-#~ "installation."
-#~ msgstr ""
-#~ "Aukera hau erabili ezazu <application>Mageia</application> instalazio "
-#~ "fresko baterako."
-
-#~ 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."
diff --git a/docs/docs/stable/installer/fr.po b/docs/docs/stable/installer/fr.po
index 8842d55f..097fc5cd 100644
--- a/docs/docs/stable/installer/fr.po
+++ b/docs/docs/stable/installer/fr.po
@@ -28,7 +28,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: 2018-10-12 17:33+0000\n"
 "Last-Translator: stroibe974 <sebsweb@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -40,12 +40,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. type: Content of: <section><info><title>
-#: en/acceptLicense.xml:25
+#: en/acceptLicense.xml:31
 msgid "License and Release Notes"
 msgstr "Licence et Notes de version"
 
 #. type: Content of: <section><mediaobject>
-#: en/acceptLicense.xml:29
+#: en/acceptLicense.xml:35
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
 "\"acceptLicense-im1\" fileref=\"dx2-license.png\" align=\"center\" revision="
@@ -60,81 +60,89 @@ msgstr ""
 "\"center\" condition=\"live\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/acceptLicense.xml:40
+#: en/acceptLicense.xml:46
 msgid "License Agreement"
 msgstr "Contrat de Licence"
 
-#. 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 ""
 "Avant d'installer <application>Mageia,</application> veuillez lire les "
 "termes et conditions de la licence avec attention.<application></application>"
 
-#. 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 ""
 "Ces termes et conditions s'appliquent à toute la distribution "
 "<application>Mageia </application>et doivent être acceptés avant de pouvoir "
 "continuer."
 
-#. 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 ""
 "Pour continuer, sélectionnez <guilabel>Accepter</guilabel> puis cliquez sur "
 "<guibutton>Suivant</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 ""
 "Si vous décidez de ne pas accepter ces conditions, alors nous vous "
 "remercions de l'intérêt porté. Cliquer sur <guibutton>Quitter</guibutton> "
 "redémarrera votre ordinateur."
 
 #. type: Content of: <section><section><info><title>
-#: en/acceptLicense.xml:63
+#: en/acceptLicense.xml:76
 msgid "Release Notes"
 msgstr "Notes de version"
 
 #. 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 ""
 "Des informations importantes concernant cette version de "
 "<application>Mageia</application> peuvent être consultées en cliquant sur le "
 "boutton <guibutton>Notes de version</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 "fr"
 
 #. 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 ""
 "Sélection de média (Configurer l'installation de média supplémentaires)"
 
 #.  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
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-add_supplemental_media."
 "png\" xml:id=\"dx2-add_supplemental_media-im1\" align=\"center\" revision="
@@ -145,12 +153,13 @@ msgstr ""
 "\"1\"/> </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 ""
 "Cet écran liste toutes les sources déjà disponibles. Il est possible "
 "d'ajouter des sources supplémentaires de paquetages, comme un disque optique "
@@ -158,24 +167,25 @@ msgstr ""
 "seront disponibles à l'installation lors des étapes suivantes."
 
 #. 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 "Pour une source sur le réseau, deux étapes sont nécessaires :"
 
 #. 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 "Choix et activation du réseau, s'il ne l'est pas déjà."
 
 #. 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 ""
 "Sélectionner un miroir ou spécifier une URL (toute première entrée). "
 "Sélectionner un miroir vous donne la possibilité de choisir parmi tous les "
@@ -185,14 +195,15 @@ msgstr ""
 "spécifique de votre propre réseau NFS."
 
 #. 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 ""
 "Si vous mettez à jour un système 64 bits susceptible de contenir des "
 "paquetages 32 bits, il est recommandé d'utiliser cet écran pour ajouter un "
@@ -203,18 +214,25 @@ msgstr ""
 "bits nécessaires."
 
 #. type: Content of: <section><info><title>
-#: en/addUser.xml:3
-msgid "User and Superuser Management"
-msgstr "Gestion de l'Utilisateur et du Superutilisateur"
+#: en/addUser.xml:9
+#, fuzzy
+msgid "User Management"
+msgstr "Gestion avancée de l'Utilisateur"
 
 #.  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 format=\"PNG\" fileref="
 "\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -222,20 +240,21 @@ msgstr ""
 "\"PNG\" 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 "Définir le mot de passe Administrateur (Root) :"
 
 #. 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 ""
 "Pour chaque installation de <application>Mageia</application>, il est "
 "conseillé de définir un mot de passe <emphasis role=\"bold"
@@ -247,9 +266,10 @@ msgstr ""
 "en-dessous afin de vérifier qu'il n'y a pas d'erreur de saisie."
 
 #. 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 ""
 "Tous les mots de passe sont sensibles à la casse, et il est recommandé "
@@ -257,17 +277,18 @@ msgstr ""
 "autres caractères dans votre mot de passe."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:42
+#: en/addUser.xml:57
 msgid "Enter a user"
 msgstr "Indiquer un utilisateur"
 
 #. 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 ""
 "Ajoutez ici un utilisateur. Un simple utilisateur a moins de droits que le "
 "<emphasis role=\"bold\">superutilisateur</emphasis> (root), mais "
@@ -276,65 +297,90 @@ msgstr ""
 "par un utilisateur ordinaire avec son ordinateur."
 
 #. 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\">Avancé</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>Icône </guibutton>: en cliquant sur ce bouton, vous changerez "
 "l'icône de l'utilisateur."
 
 #. 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\">Serveur</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>Nom et prénom </guilabel>: inscrire ici le nom réel de "
 "l'utilisateur."
 
 #. 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\">Avancé</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>Identifiant de connexion</guilabel> : indiquez ici un identifiant "
 "de connexion ou bien DrakX transposera les nom et prénom pour en créer un. "
 "<emphasis>L'identifiant de connexion est sensible à la casse.</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\">Avancé</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>Mot de passe </guilabel>: Indiquez dans ce champ le mot de passe "
 "utilisateur. On retrouve à droite le bouclier qui indique la force du mot de "
 "passe. (voir aussi <xref linkend=\"givePassword\"/>)"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml: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>Mot de passe (vérification)</guilabel> : Entrer à nouveau le mot "
 "de passe et Drakx va vérifier qu'il est bien identique au précédent."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml: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 ""
 "Tout utilisateur ajouté lors de l'installation de Mageia disposera d'un "
 "répertoire /home protégé en lecture et en écriture (umask=0027)."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:82
+#: en/addUser.xml:104
 msgid ""
 "You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
@@ -345,32 +391,34 @@ msgstr ""
 "emphasis>. Choisir <emphasis>Gestion des utilisateurs</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 ""
 "Les permissions d'accès peuvent aussi être changées après l'installation."
 
 #. 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 "Gestion avancée de l'Utilisateur"
 
 #. 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 ""
 "L'option <guibutton>Avancé</guibutton> vous permettra de modifier davantage "
 "les paramètres pour l'utilisateur que vous avez ajouté."
 
 #. 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>Shell de démarrage </guilabel>: cette liste déroulante permet de "
 "choisir le shell utilisé par l'utilisateur créé dans l'écran précédent. Les "
@@ -378,27 +426,29 @@ msgstr ""
 "\"bold\">Dash</emphasis> et <emphasis role=\"bold\">Sh</emphasis>"
 
 #. 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 de l'Utilisateur </guilabel>: Indiquer ici <emphasis role=\"bold"
 "\">l'ID de l'utilisateur</emphasis> créé dans l'écran précédent. Laissez "
 "vide en cas de doute."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:113
+#: en/addUser.xml:136
+#, fuzzy
 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 ""
 "<guilabel>ID de groupe</guilabel>: Vous permet de spécifier un <emphasis "
 "role=\"bold\">ID de groupe</emphasis>. Laissez vide en cas de doute."
 
 #. type: Content of: <section><info><title>
-#: en/ask_mntpoint_s.xml:3
+#: en/ask_mntpoint_s.xml:10
 msgid "Choose the mount points"
 msgstr "Choix des points de montage"
 
@@ -413,15 +463,17 @@ msgstr "Choix des points de montage"
 #.        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 format=\"PNG\" xml:id="
 "\"chooseMountPoints-im1\" align=\"center\" fileref=\"dx2-chooseMountpoints."
@@ -431,58 +483,38 @@ msgstr ""
 "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 ""
 "Sont présentées ici les partitions Linux qui ont été trouvées sur votre "
 "ordinateur. Si vous n'êtes pas d'accord avec les suggestions de "
 "<application>DrakX</application>, il est possible de modifier les points de "
 "montage."
 
-#. type: Content of: <section><note><para>
-#: en/ask_mntpoint_s.xml:41
-msgid ""
-"If you change anything, make sure you still have a <emphasis role=\"bold"
-"\"><literal>/</literal></emphasis> (root) partition."
-msgstr ""
-"Quoi que vous changiez, assurez-vous de toujours avoir au moins UNE "
-"partition <literal>/</literal> (appelée la Racine)."
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:46
-msgid ""
-"Every partition is shown to the left as: <emphasis role=\"bold\">Device "
-"(capacity, mount point, type).</emphasis>"
-msgstr ""
-"Chaque partition est présentée comme suit : <emphasis role=\"bold\">"
-"\"Périphérique\" (\"Capacité\", \"Point de montage\", \"Type\").</emphasis>"
-
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:50
+#: en/ask_mntpoint_s.xml:55
 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 ""
-"<emphasis role=\"bold\">Périphérique</emphasis>, est constitué de : "
-"<emphasis role=\"bold\">disque dur</emphasis>, [<emphasis role=\"bold\">nom "
-"du disque dur</emphasis> (lettre)], <emphasis role=\"bold\">numéro de "
-"partition</emphasis> (par exemple, <emphasis role=\"bold\">sda5</emphasis>)."
 
 #. 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 ""
 "Si vous avez plusieurs partitions, vous pouvez choisir différents points de "
 "montage dans la liste déroulante, tels que <literal>/</literal>, <literal>/"
@@ -492,7 +524,7 @@ msgstr ""
 "la partition <literal>/home</literal> d'une installation de cauldron."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:63
+#: en/ask_mntpoint_s.xml:73
 msgid ""
 "For any partitions that you don't need to make use of, you can leave the "
 "mount point field blank."
@@ -501,11 +533,22 @@ msgstr ""
 "vide le champ point de montage."
 
 #. 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 ""
+"Quoi que vous changiez, assurez-vous de toujours avoir au moins UNE "
+"partition <literal>/</literal> (appelée la Racine)."
+
+#. 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 ""
 "Si vous ne savez pas quoi choisir, cliquez sur <guibutton>Précédent</"
 "guibutton> et cochez <guilabel>Partitionnement personnalisé du disque</"
@@ -513,194 +556,245 @@ msgstr ""
 "connaître son type et sa taille."
 
 #. 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 ""
 "Vous êtes sûr que les points de montage sont corrects ? Alors cliquez sur "
 "<guibutton>Suivant</guibutton>, et décidez si vous désirez seulement "
 "formater la(es) partition(s) suggérée(s) par DrakX, ou plus."
 
 #. type: Content of: <section><info><title>
-#: en/bestTime.xml:10
-msgid "Clock settings"
+#: en/bestTime.xml:5
+#, fuzzy
+msgid "Clock Settings"
 msgstr "Réglages de l'heure"
 
 #. 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 ""
 "Dans cette étape, vous devez choisir sur quelle heure l'horloge interne doit "
 "être reglée, l'heure locale ou l'heure UTC."
 
 #. type: Content of: <section><para>
-#: en/bestTime.xml:23
-msgid "In advanced tab, you will find more options about clock settings."
+#: en/bestTime.xml:14
+msgid ""
+"In the <emphasis>Advanced</emphasis> tab, you can enable automatic time "
+"synchronization and specify an NTP server."
 msgstr ""
-"Dans l'onglet Avancé, vous trouverez plus d'options sur le réglage de "
-"l'heure."
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:1
+#: en/bootLive.xml:6
 msgid "Boot Mageia as Live system"
 msgstr "Démarrer Mageia comme système Live"
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:1
+#: en/bootLive.xml:10
 msgid "Booting the medium"
 msgstr "Démarrer"
 
-#. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:1
-msgid "From a disc"
-msgstr "À partir d'un disque dur"
-
-#. 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 ""
-"Vous pouvez démarrer directement depuis le média habituellement utilisé pour "
-"graver vos images (CD-ROM, DVD-ROM...). Vous avez juste besoin de l'insérer "
-"dans votre lecteur CD/DVD pour que le chargeur d'amorçage démarre "
-"l'installation automatiquement après le redémarrage de l'ordinateur. Si cela "
-"n'arrive pas, vous devrez peut-être reconfigurer votre BIOS ou appuyer sur "
-"une touche (ex : F8) afin de choisir le périphérique sur lequel l'ordinateur "
-"devra démarrer."
+#. 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 ""
-"En fonction du matériel dont vous disposez, et de la manière dont il est "
-"configuré, vous obtenez l'un ou l'autre des deux écrans ci-dessous."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:7
-msgid "From a USB device"
-msgstr "A partir d'un périphérique USB"
+#. 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 ""
-"Vous pouvez démarrer depuis le périphérique USB sur lequel se trouve votre "
-"image ISO. Selon les paramètres de votre BIOS, l'ordinateur démarrera peut-"
-"être directement sur le périphérique USB déjà inséré dans le port. Si cela "
-"n'arrive pas, vous devrez peut-être reconfigurer votre BIOS ou appuyer sur "
-"une touche (ex : F8) afin de choisir le périphérique sur lequel l'ordinateur "
-"devra démarrer."
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:12
+#: en/bootLive.xml:35
 msgid "In BIOS/CSM/Legacy mode"
 msgstr "Dans le mode Bios, csm ou legacy"
 
+#. 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\">Poste de travail</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 ""
+"La configuration que vous avez réalisée est conservée pour l'installation."
+
+#. 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\">Veuillez choisir le niveau de sécurité souhaité</"
+"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\">Poste de travail</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 ""
+"Installer Mageia : ce choix installera Mageia directement sur votre disque "
+"dur."
+
+#. 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=\"dx2-selectKeyboard.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 "Premier écran lors du démarrage en mode BIOS"
 
-#. type: Content of: <section><section><para>
-#: en/bootLive.xml:12
-msgid "In the middle menu, you have the choice between three actions:"
-msgstr "Dans le menu du milieu, vous avez le choix entre trois actions : "
+#. 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 ""
-"Démarrer Mageia : cela signifie que Mageia 5 se lancera à partir du media "
-"connecté (CD/DVD ou clé USB), sans copier quoi que ce soit sur le disque "
-"dur, ce qui se traduira par un système très lent. Une fois le démarrage "
-"réalisé, vous pourrez procéder à l'installation sur le disque dur."
+#: en/bootLive.xml:75
+#, fuzzy
+msgid "<keycap>F1</keycap> <emphasis role=\"bold\">Help</emphasis>"
+msgstr "<emphasis role=\"bold\">Serveur</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:16
+#: en/bootLive.xml:76
+#, fuzzy
 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 ""
-"Installer Mageia : ce choix installera Mageia directement sur votre disque "
-"dur."
+"Pour chacune des options <emphasis role=\"bold\">F2</emphasis> à <emphasis "
+"role=\"bold\">F6</emphasis>, une aide est disponible par la touche <emphasis "
+"role=\"bold\">F1</emphasis>"
 
 #. 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\">Avancé</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 ""
-"Démarrer à partir du disque dur : ce choix vous permet de démarrer sur le "
-"disque dur, comme habituellement, lorsque aucun media (CD/DVD ou clé USB) "
-"n'est connecté. (Ne fonctionne pas avec Mageia 5)."
 
-#. type: Content of: <section><section><para>
-#: en/bootLive.xml:19
-msgid "In the bottom menu, are the Boot Options:"
-msgstr "Dans le menu inférieur, vous disposez des options de démarrage :"
+#. 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\">Avancé</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 - Aide. Explique les options \"splash\", \"apm\", \"acpi\" et \"Ide\""
+"Modifiez la résolution de l'écran en pressant la touche <emphasis role=\"bold"
+"\">F3</emphasis> (mode Legacy uniquement)"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:20
-msgid "F2 - Language. Choose the display language of the screens."
-msgstr "F2 - Langue. Sélectionner la langue à afficher sur les écrans."
+#: en/bootLive.xml:93
+#, fuzzy
+msgid "<keycap>F4</keycap> <emphasis role=\"bold\">Source</emphasis>"
+msgstr "<emphasis role=\"bold\">Serveur</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 - Résolution de l'écran. Sélectionner entre texte, 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 ou autre. Normalement, l'installation se déroule à "
 "partir du medium inséré. Vous pouvez sélectionner d'autres sources "
@@ -709,122 +803,178 @@ msgstr ""
 "disponible sur le serveur avec cette option."
 
 #. 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\">Serveur</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 - Pilote. Oui ou Non. Le système sait si un disque supplémentaire "
-"contient une mise à jour de pilote et demandera son insertion lors du "
-"processus d'installation."
 
 #. 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\">Poste de travail</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:106
+#, fuzzy
 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 ""
+"Si vous rencontrez des problèmes pour l'installation, vous pouvez tenter de "
+"modifier les options d'amorçage par défaut avec la touche <emphasis role="
+"\"bold\">F6 Kernel Options</emphasis> ou la touche <emphasis role=\"bold"
+"\">e</emphasis> pour les systèmes UEFI."
+
+#. 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\">Alignement </emphasis> = Mo"
+
+#. 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 ""
+"No ACPI : (Advanced Configuration and Power Interface), la gestion de "
+"l'alimentation n'est pas prise en compte."
+
+#. 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 ""
+"No Local APIC (Local Advanced Programmable Interrupt Controller) "
+"Interruptions de l'unité centrale. Sélectionnez cette option si vous "
+"rencontrez des problèmes tels qu'un \"kernel panic\" en lien avec l'APIC."
+
+#. 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 - Options du Noyau. C'est un moyen pour préciser les options liées à "
-"votre matériel et aux pilotes à utiliser."
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:29
+#: en/bootLive.xml:139
 msgid "In UEFI mode"
 msgstr "En mode UEFI"
 
 #. 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 ""
-"Premier écran lors du démarrage à partir du disque dur sur les systèmes UEFI"
+#: en/bootLive.xml:146
+#, fuzzy
+msgid "First screen while booting in UEFI mode"
+msgstr "Premier écran lors du démarrage en mode BIOS"
 
 #. 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 ""
-"Vous avez le choix entre lancer Mageia en mode Live (premier choix) ou "
-"effectuer son installation (second choix)."
 
-#. 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 ""
-"Si vous avez démarré à partrir d'une clé USB, vous disposez de deux lignes "
-"supplémentaires qui sont des copies des lignes précédentes, suffixées par "
-"\"USB\". Vous devez les sélectionner."
+"Démarrer Mageia : cela signifie que Mageia 5 se lancera à partir du media "
+"connecté (CD/DVD ou clé USB), sans copier quoi que ce soit sur le disque "
+"dur, ce qui se traduira par un système très lent. Une fois le démarrage "
+"réalisé, vous pourrez procéder à l'installation sur le disque dur."
 
-#. 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 ""
-"Dans chaque cas, les premières étapes seront les mêmes pour sélectionner la "
-"langue, le fuseau horaire et le clavier, puis le processus diffère ensuite, "
-"avec <link linkend=\"testing\">des étapes complémentaires en mode Live</"
-"link>."
 
 #. type: Content of: <section><info><title>
-#: en/chooseDesktop.xml:3
+#: en/chooseDesktop.xml:16
 msgid "Desktop Selection"
 msgstr "Sélection du bureau"
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:8
-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 ""
-"En fonction des sélections faites ici, des écrans supplémentaires peuvent "
-"apparaître pour préciser vos choix."
 
 #. 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 ""
 "Après l'(es) étape(s) de sélection, un diaporama s'affiche pendant "
 "l'installation des paquetages. Il peut être désactivé en cliquant sur le "
 "bouton <guilabel>Détails</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 format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
 "align=\"center\"/> </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 <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."
+"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 ""
+"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 ""
 "Choisissez entre les bureaux <application>KDE</application><emphasis role="
 "\"bold\">Plasma</emphasis> ou <application>GNOME</application>. Tous deux "
@@ -841,8 +991,9 @@ msgid "Package Group Selection"
 msgstr "Sélection du groupe de paquetages"
 
 #. 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
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
 "\" align=\"center\"/> </imageobject>"
@@ -851,7 +1002,7 @@ msgstr ""
 "\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:14
+#: en/choosePackageGroups.xml:16
 msgid ""
 "Packages are arranged into common groups, to make choosing what you need on "
 "your system a lot easier. The groups are fairly self explanatory, however "
@@ -864,22 +1015,22 @@ msgstr ""
 "disponibles dans l'info-bulle qui apparaît au survol de la souris."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:21
+#: en/choosePackageGroups.xml:23
 msgid "<emphasis role=\"bold\">Workstation</emphasis>"
 msgstr "<emphasis role=\"bold\">Poste de travail</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:25
+#: en/choosePackageGroups.xml:27
 msgid "<emphasis role=\"bold\">Server</emphasis>"
 msgstr "<emphasis role=\"bold\">Serveur</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:29
+#: en/choosePackageGroups.xml:31
 msgid "<emphasis role=\"bold\">Graphical Environment</emphasis>"
 msgstr "<emphasis role=\"bold\">Environnement graphique</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:33
+#: en/choosePackageGroups.xml:35
 msgid ""
 "<emphasis role=\"bold\">Individual Package Selection</emphasis>: you can use "
 "this option to manually add or remove packages"
@@ -888,7 +1039,7 @@ msgstr ""
 "Utiliser cette option pour ajouter ou retirer manuellement des paquetages."
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:38
+#: en/choosePackageGroups.xml:40
 msgid ""
 "See <xref linkend=\"minimal-install\"/> for instructions on how to do a "
 "minimal install (without or with X &amp; IceWM)."
@@ -903,8 +1054,10 @@ msgid "Choose Individual Packages"
 msgstr "Choisir individuellement des paquetages"
 
 #. 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
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackagesTree.png"
 "\" align=\"center\"/> </imageobject>"
@@ -913,7 +1066,7 @@ msgstr ""
 "\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:14
+#: en/choosePackagesTree.xml:18
 msgid ""
 "Here you can add or remove any extra packages to customize your installation."
 msgstr ""
@@ -921,13 +1074,14 @@ msgstr ""
 "personnaliser l'installation."
 
 #. 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 ""
 "Après avoir fait son choix, cliquer sur <guibutton>l'icône de la disquette</"
 "guibutton> en bas de la page pour enregistrer le choix des paquetages (il "
@@ -943,8 +1097,10 @@ msgstr "Configurer les Services"
 
 #.  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
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-configureServices.png"
 "\" xml:id=\"configureServices-im1\" align=\"center\" revision=\"1\"/> </"
@@ -955,27 +1111,25 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:16
+#: en/configureServices.xml:20
 msgid ""
 "Here you can choose which services should start when you boot your system."
 msgstr ""
 "Sélectionnez ici les services à démarrer automatiquement lors du démarrage "
 "du système."
 
-#. 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
+#, fuzzy
+msgid ""
+"Click on a triangle to expand a group to all the relevant services. The "
+"settings DrakX chose are usually good."
 msgstr ""
 "Cliquez sur un triangle pour étendre un groupe à tous les services "
 "pertinents."
 
-#. type: Content of: <section><para>
-#: en/configureServices.xml:22
-msgid "The settings DrakX chose are usually good."
-msgstr "Les paramètres choisis par DrakX sont généralement corrects."
-
-#. 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."
@@ -984,7 +1138,7 @@ msgstr ""
 "disponibles dans l'infobulle en dessous."
 
 #. 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 "Ne modifier quelque chose qu'avec la certitude de bien faire."
 
@@ -995,14 +1149,17 @@ msgstr "Configurer le fuseau horaire"
 
 #.  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 format=\"PNG\" xml:id="
 "\"configureTimezoneUTC-im1\" align=\"center\" fileref=\"dx2-"
@@ -1010,17 +1167,18 @@ msgstr ""
 "<imagedata format=\"PNG\" fileref=\"live-timeZone.png\" condition=\"live\"/> "
 "</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 ""
 "Indiquez votre fuseau horaire en choisissant le pays ou la ville la plus "
 "proche dans le même fuseau."
 
 #. type: Content of: <section><para>
-#: en/configureTimezoneUTC.xml:24
+#: en/configureTimezoneUTC.xml:32
 msgid ""
 "In the next screen you can choose to set your hardware clock to local time "
 "or to GMT, also known as UTC."
@@ -1029,7 +1187,7 @@ msgstr ""
 "l'heure locale ou sur GMT, aussi appelée 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,23 +1196,23 @@ msgstr ""
 "tous être réglés sur la même heure (heure locale ou GMT/UTC)."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:13
+#: en/configureX_card_list.xml:24
 msgid "Choose an X Server (Configure your Graphic Card)"
 msgstr "Choisissez un serveur d'affichage (serveur X)"
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_card_list.xml: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=\"configureX_card_list-im1\" "
-"align=\"center\" fileref=\"dx2-configureX_card_list.png\" 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/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."
@@ -1063,7 +1221,7 @@ msgstr ""
 "graphiques et identifie en général correctement votre matériel."
 
 #. 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:"
@@ -1071,30 +1229,34 @@ msgstr ""
 "Si l'installateur n'a pas détecté correctement votre carte graphique et si "
 "vous connaissez celle-ci, vous pouvez le sélectionner dans l'arborescence :"
 
-#. 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 "le vendeur"
 
 #. 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 "nom de la carte graphique"
 
 #. 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 "et le type de carte."
 
 #. 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 ""
 "Si vous ne trouvez pas votre carte dans la liste des fabricants (parce "
 "qu'elle n'est pas encore dans la base, ou qu'elle est trop ancienne), vous "
@@ -1102,66 +1264,63 @@ msgstr ""
 "\"bold\">Xorg</emphasis>, utilisez <emphasis role=\"bold\">vesa</emphasis>, "
 "qui fournit les fonctionnalités de base."
 
-#. 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 ""
 "Soyez conscient que vous n'aurez accès qu'à la <emphasis role=\"bold\">ligne "
 "de commande</emphasis>si vous choisissez un pilote incompatible."
 
 #. 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 ""
 "Certains fabricants de carte vidéo fournissent des pilotes propriétaires "
 "pour Linux, qui ne peuvent être disponibles que dans le dépôt <emphasis role="
 "\"bold\">Nonfree</emphasis>, ou même parfois uniquement sur leur site "
 "internet."
 
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:56
-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 ""
-"Le dépôt <emphasis role=\"bold\">Nonfree</emphasis> doit être explicitement "
-"activé pour y accéder. Si vous ne l'avez pas activé lors de l'installation, "
-"vous pourrez le faire après votre premier redémarrage."
-
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:3
+#: en/configureX_chooser.xml:11
 msgid "Graphic Card and Monitor Configuration"
 msgstr "Configuration de X, de la carte graphique et du moniteur"
 
 #.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
+#. 2018/02/15 apb: Some text and typography.
+#. 2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.
+#. 2018/02/23 apb: Typo.
 #. 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=\"configureX_chooser-im1\" "
-"fileref=\"dx2-configureX_chooser.png\" align=\"center\" 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/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 ""
 "Quel que soit l'environnement graphique (aussi nommé Bureau) choisi pour "
 "cette installation de <application>Mageia</application>, tous sont basés sur "
@@ -1174,22 +1333,33 @@ msgstr ""
 "vous semblent incorrects."
 
 #. 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\">Environnement graphique</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>Carte Graphique </guibutton></emphasis>: Si besoin, "
-"choisir la carte dans la liste."
 
 #. 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\">Serveur</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>Moniteur</guibutton></emphasis>: Choisissez "
 "<guilabel>Plug'n Play</guilabel> lorsque c'est possible, ou dans la liste "
@@ -1198,31 +1368,37 @@ msgstr ""
 "spécifier les taux de rafraîchissement horizontaux et verticaux de votre "
 "moniteur."
 
-#. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/configureX_chooser.xml:41
-msgid "Incorrect refresh rates may damage your monitor"
-msgstr ""
-"Le moniteur peut être endommagé par des taux de rafraîchissement incorrects."
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_chooser.xml:60
+#, fuzzy
+msgid "<emphasis role=\"bold\">Resolution</emphasis>"
+msgstr "<emphasis role=\"bold\">Poste de travail</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:47
-msgid ""
-"<emphasis><guibutton>Resolution</guibutton></emphasis>: The resolution and "
-"color depth of your monitor can be set here."
+#: en/configureX_chooser.xml:63
+#, fuzzy
+msgid "The resolution and color depth of your monitor can be set here"
 msgstr ""
 "<emphasis><guibutton>Résolution</guibutton></emphasis>: Indiquez ici la "
 "résolution et la profondeur de couleurs de votre moniteur."
 
 #. 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\">Serveur</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>: Ce bouton test n'apparaît "
 "pas toujours pendant l'installation. S'il est présent, et que vous testez "
@@ -1234,21 +1410,35 @@ msgstr ""
 "précautions dans le choix des paramètres."
 
 #. 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\">Poste de travail</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>Options</guibutton></emphasis>: Choisir ici de valider "
 "ou d'invalider différentes options."
 
+#. 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 "Choisissez un moniteur"
 
 #. 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."
@@ -1257,7 +1447,7 @@ msgstr ""
 "votre matériel est bien identifié."
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:19
+#: en/configureX_monitor.xml:30
 msgid ""
 "<emphasis role=\"bold\">Selecting a monitor with different characteristics "
 "could damage your monitor or video hardware. Please don't try something "
@@ -1270,25 +1460,26 @@ msgstr ""
 "doute, consultez la documentation de votre moniteur. "
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:26
+#: en/configureX_monitor.xml:38
+#, fuzzy
 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=\"configureX_monitor-im1\" "
-"fileref=\"dx2-configureX_monitor.png\" align=\"center\" 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/configureX_monitor.xml:31
-msgid "<emphasis>Custom</emphasis>"
-msgstr "<emphasis>Personnalisé</emphasis>"
+#. type: Content of: <section><variablelist><varlistentry><term>
+#: en/configureX_monitor.xml:46
+msgid "Custom"
+msgstr ""
 
-#. 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."
@@ -1299,8 +1490,8 @@ msgstr ""
 "fréquence l'écran est rafraîchi, tandis que la fréquence de synchronisation "
 "horizontale détermine la fréquence à laquelle les lignes sont affichées."
 
-#. 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 "
@@ -1313,27 +1504,23 @@ msgstr ""
 "devez choisir une configuration conservatrice et consulter la documentation "
 "de votre matériel."
 
-#. 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 ""
 "C'est l'option par défaut. Le système essaye de déterminer le type de "
 "moniteur à partir de la base de données."
 
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:51
-msgid "<emphasis>Vendor</emphasis>"
-msgstr "<emphasis>Vendeur</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:"
@@ -1342,30 +1529,30 @@ msgstr ""
 "connaissez ses références, vous pouvez le sélectionner dans l'arborescence "
 "en sélectionnant dans l'ordre :"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:61
-msgid "the monitor manufacturers name"
-msgstr "le nom du fabricant du moniteur"
+#. 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 "la description du moniteur."
+#. 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>Générique</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 ""
 "La sélection de ce groupe permet de choisir parmi 30 configurations "
 "d'affichage telles que le 1024x768 @ 60Hz et comprend les écrans plats tels "
@@ -1375,78 +1562,57 @@ msgstr ""
 "soyez prudent dans vos choix."
 
 #. 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 "Partitionnement personnalisé du disque avec 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"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.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
-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 ""
-"Si vous souhaitez chiffrer la partition <emphasis role=\"bold\">/</emphasis> "
-"il faut d'abord s'assurer que la partition <emphasis role=\"bold\">/boot</"
-"emphasis> est séparée des autres. La partition <emphasis role=\"bold\">/"
-"boot</emphasis> NE doit PAS être chiffrée, sinon le système ne pourra pas "
-"s'amorcer."
+"<imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/> </imageobject>"
 
-#. 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 ""
 "Ajuster la structure de votre disque dur ici. Vous pouvez supprimer ou créer "
 "des partitions, modifier le système de fichiers d'une partition, sa taille "
 "et même visualiser ce qu'il y a à l'intérieur avant de commencer les "
 "modifications."
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:34
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/diskdrake.xml:45
+#, fuzzy
 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>."
+"device, like a USB key). In the screenshot above there are two available "
+"devices: <filename>sda </filename>and <filename>sdb</filename>."
 msgstr ""
 "En haut, il y a un onglet pour chaque disque dur détecté (ou d'autres "
 "supports de stockage comme une clé USB). Sur la capture d'écran ci-dessus, "
 "il y a deux disques disponibles : <emphasis role=\"bold\">sda</emphasis> et "
 "<emphasis role=\"bold\">dsb</emphasis>."
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:39
-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."
-msgstr ""
-"Soyez prudent avec l'option <guibutton>Efacez tout</guibutton>, ne "
-"l'utilisez que si vous êtes sûr que vous voulez effacer TOUTES les "
-"partitions sur le périphérique sélectionné."
-
-#. 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 ""
 "Pour toutes les autres actions : Cliquer d'abord sur la partition "
 "souhaitée.. Ensuite, l'explorer, choisir un type de système de fichiers et "
@@ -1454,54 +1620,93 @@ msgstr ""
 "expert</guibutton>) fournit d'autres options telles l'ajout d'un nom de "
 "partition ou le choix d'un type."
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:49
-msgid "Continue until you have adjusted everything to your satisfaction."
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/diskdrake.xml:60
+#, fuzzy
+msgid ""
+"Continue until you have adjusted everything to your satisfaction, then click "
+"<emphasis>Done</emphasis> when you're ready."
 msgstr "Continuer jusqu'à ce que tout soit satisfaisant."
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:52
-msgid "Click <guibutton>Done</guibutton> when you're ready."
-msgstr "Cliquer sur <guibutton>Terminer</guibutton> quand tout est correct.."
+#. 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 ""
+"Soyez prudent avec l'option <guibutton>Efacez tout</guibutton>, ne "
+"l'utilisez que si vous êtes sûr que vous voulez effacer TOUTES les "
+"partitions sur le périphérique sélectionné."
 
-#. 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 ""
+"Si vous souhaitez chiffrer la partition <emphasis role=\"bold\">/</emphasis> "
+"il faut d'abord s'assurer que la partition <emphasis role=\"bold\">/boot</"
+"emphasis> est séparée des autres. La partition <emphasis role=\"bold\">/"
+"boot</emphasis> NE doit PAS être chiffrée, sinon le système ne pourra pas "
+"s'amorcer."
+
+#. 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 ""
 "Si vous installez Mageia sur un système UEFI, vérifiez qu'une partition "
 "système EFI  (ESP pour EFI System Partition) est présente et correctement "
 "montée sur /boot/EFI (voir ci-dessous) "
 
-#. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:61
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/diskdrake.xml:93
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
-"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"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 ""
+"Si vous installez Mageia sur un système Legacy/GPT, vérifiez qu'une "
+"partition d'amorçage en mode BIOS (BIOS boot partition) est présente et "
+"possède le type requis."
+
+#. type: Content of: <section><figure><title>
+#: en/diskdrake.xml:101
+#, fuzzy
+msgid "EFI System Partition"
+msgstr "Utiliser les partitions existantes"
+
+#. type: Content of: <section><figure><mediaobject>
+#: en/diskdrake.xml:104
+#, fuzzy
+msgid ""
+"<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-diskdrake2.png"
 "\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/> </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
-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 ""
-"Si vous installez Mageia sur un système Legacy/GPT, vérifiez qu'une "
-"partition d'amorçage en mode BIOS (BIOS boot partition) est présente et "
-"possède le type requis."
 
-#. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:76
+#. type: Content of: <section><mediaobject>
+#: en/diskdrake.xml:118 en/doPartitionDisks.xml:200
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1514,50 +1719,60 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:9
-msgid "Partitioning"
+#: en/doPartitionDisks.xml:25
+#, fuzzy
+msgid "Suggested Partitioning"
 msgstr "Partitionnement"
 
 #. 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 ""
 "Cet écran présente le contenu du(des) disque(s) dur(s) et les propositions "
 "faites par DrakX pour l'endroit où installer <application>Mageia</"
 "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 ""
 "Les options proposées dans la liste ci-dessous varient en fonction  de "
 "l'agencement  et du contenu de chaque disque dur en particulier."
 
 #. 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-"
-"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
-"\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:32
-msgid "Use Existing Partitions"
-msgstr "Utiliser les partitions existantes"
+#. type: Content of: <section><itemizedlist><title>
+#: en/doPartitionDisks.xml:47
+#, fuzzy
+msgid "Main Options"
+msgstr "Options"
 
-#. 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\">Dimensionnement de partition :</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."
@@ -1565,13 +1780,14 @@ msgstr ""
 "Si cette option est disponible, alors des partitions compatibles avec Linux "
 "ont été trouvées et sont utilisables pour l'installation de Mageia."
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:41
-msgid "Use Free Space"
-msgstr "Utiliser l'espace libre"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:59
+#, fuzzy
+msgid "<emphasis role=\"bold\">Use Free Space</emphasis>"
+msgstr "<emphasis role=\"bold\">Serveur</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."
@@ -1579,57 +1795,35 @@ msgstr ""
 "Si le disque dur comporte de l'espace inutilisé, alors cette option "
 "l'utilisera pour l'installation de Mageia."
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:49
-msgid "Use Free Space on a Windows Partition"
-msgstr "Utiliser l'espace libre sur une partition Microsoft Windows"
-
-#. 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 ""
-"Si une partition Windows existante comporte de l'espace inutilisé, "
-"l'installateur propose de l'utiliser."
+"<emphasis role=\"bold\">Use Free Space on a Windows Partition</emphasis>"
+msgstr "<emphasis role=\"bold\">Poste de travail</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 ""
 "Cela peut être une façon pratique de faire de la place pour l'installation "
 "de Mageia, mais il s'agit d'une opération risquée, vous devriez donc vous "
 "assurer de posséder une sauvegarde de tous les fichiers importants."
 
-#. 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 ""
-"Noter que cela impose de rétrécir la partition Windows. La partition doit "
-"être \"intègre\", signifiant que Windows doit s'être correctement arrêté "
-"lors de sa dernière utilisation. La partition doit avoir été défragmentée "
-"également, bien que ce ne soit pas une garantie que tous les fichiers de la "
-"partition aient été déplacés en dehors de la zone à utiliser. Il est "
-"fortement recommandé de sauvegarder ses données personnelles importantes au "
-"préalable."
-
-#. type: Content of: <section><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 ""
 "Avec cette option, l'installateur affiche la partition Windows restante en "
 "bleu clair et la future partition Mageia en bleu foncé, avec leurs tailles "
@@ -1637,54 +1831,56 @@ msgstr ""
 "cliquant et en déplaçant la limite entre les deux partitions. Voir la "
 "capture d'écran ci-dessous."
 
-#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:76
-msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/> </imageobject>"
-msgstr ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/> </imageobject>"
-
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:87
-msgid "Erase and use Entire Disk."
-msgstr "Effacer et utiliser le disque tout entier"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:85
+#, fuzzy
+msgid "<emphasis role=\"bold\">Erase and use Entire Disk</emphasis>"
+msgstr "<emphasis role=\"bold\">Environnement graphique</emphasis>"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:90
-msgid "This option will allocate the entire drive for Mageia."
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:88
+#, fuzzy
+msgid "This option will allocate the entire drive for Mageia"
 msgstr "Cette option attribue tout l'espace disque à Mageia."
 
-#. 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 ""
-"Attention ! Cela effacera TOUTES les données sur le disque sélectionné. "
-"Faites attention !"
-
-#. 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 ""
 "Si vous avez l'intention d'utiliser une partie du disque pour autre chose, "
 "ou bien des données déjà présentes sur le disque ne doivent pas être "
 "perdues, alors ne pas utiliser cette option."
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:103
-msgid "Custom disk partitioning"
-msgstr "Partitionnement de disque personnalisé"
+#. 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 ""
+"Noter que cela impose de rétrécir la partition Windows. La partition doit "
+"être \"intègre\", signifiant que Windows doit s'être correctement arrêté "
+"lors de sa dernière utilisation. La partition doit avoir été défragmentée "
+"également, bien que ce ne soit pas une garantie que tous les fichiers de la "
+"partition aient été déplacés en dehors de la zone à utiliser. Il est "
+"fortement recommandé de sauvegarder ses données personnelles importantes au "
+"préalable."
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:106
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:110
+#, fuzzy
+msgid "<emphasis role=\"bold\">Custom Disk Partitioning</emphasis>"
+msgstr "<emphasis role=\"bold\">Dimensionnement de partition :</emphasis>"
+
+#. 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)."
@@ -1692,34 +1888,44 @@ msgstr ""
 "Ceci vous donne le contrôle complet sur la localisation de votre "
 "installation sur le(s)  disque(s)."
 
-#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:112
-msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
-msgstr "<emphasis role=\"bold\">Dimensionnement de partition :</emphasis>"
+#. type: Content of: <section><mediaobject>
+#: en/doPartitionDisks.xml:120
+#, fuzzy
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:114
+#: en/doPartitionDisks.xml:129
+#, fuzzy
 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 ""
 "Si vous n'utilisez pas l'option <emphasis role=\"bold\">Partitionnement de "
 "disque personnalisé</emphasis>, l'installateur allouera l'espace disponible "
 "selon les règles suivantes :"
 
-#. 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 ""
 "Si l'espace total disponible est inférieur à 50 Go, une seule partition est "
 "créée. Ce sera le répertoire <emphasis role=\"bold\">/</emphasis> (racine)."
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:125
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:141
 msgid ""
 "If the total available space is greater than 50 GB, then three partitions "
 "are created"
@@ -1727,50 +1933,63 @@ msgstr ""
 "Si l'espace total disponible est supérieur à 50 Go, alors trois partitions "
 "sont créées. "
 
-#. 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ème de l'espace total disponible est alloué au répertoire <emphasis role="
 "\"bold\">/</emphasis> (root), jusqu'à un maximum de 50 Go."
 
-#. 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ème est alloué au SWAP avec un maximum de 4 Go."
 
-#. 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 ""
 "le reste (au moins 12/19) est alloué à la partition <emphasis role=\"bold\">/"
 "home</emphasis>."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:144
+#: 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 ""
-"Cela signifie que pour un espace disponible de 160 Go et plus, l'installeur "
-"créera trois partitions : 50 Go pour <emphasis role=\"bold\">/</emphasis>, 4 "
-"Go pour le <emphasis role=\"bold\">SWAP</emphasis> et le reste pour "
-"<emphasis role=\"bold\">/home</emphasis>."
 
 #. 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 ""
 "Si vous utilisez un système UEFI, l'ESP (partition système EFI) sera "
 "détectée automatiquement, ou créée si elle n'existe pas encore, et montée "
@@ -1779,13 +1998,15 @@ msgstr ""
 "été effectuée correctement "
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:158
+#: en/doPartitionDisks.xml:188
+#, fuzzy
 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 ""
 "Si vous utilisez un système en mode Legacy (parfois nommé CSM ou BIOS) avec "
 "un disque GPT, vous devez créer une partition d'amorçage BIOS (Bios boot "
@@ -1795,36 +2016,29 @@ msgstr ""
 "sélectionner <emphasis role=\"bold\">BIOS boot partition</emphasis> comme "
 "type de système de fichiers."
 
-#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:165
-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 align=\"center\" fileref="
-"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </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-doPartitionDisks4.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 ""
 "Certains nouveaux disques utilisent maintenant des secteurs logiques de 4096 "
 "octets, au lieu des traditionnels 512 octets.  En raison d'un manque de "
@@ -1835,18 +2049,38 @@ msgstr ""
 "partitionnement tiers tel que <emphasis role=\"bold\">gparted</emphasis>, et "
 "d'utiliser la configuration suivante :"
 
-#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:189
-msgid "<emphasis role=\"bold\">Align to</emphasis> = MiB"
+#. type: Content of: <section><important><para>
+#: en/doPartitionDisks.xml:221
+#, fuzzy
+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 ""
+"Certains nouveaux disques utilisent maintenant des secteurs logiques de 4096 "
+"octets, au lieu des traditionnels 512 octets.  En raison d'un manque de "
+"matériel disponible, l'outil de partitionnement utilisé par l'installateur "
+"n'a pas pu être testé avec de tels disques.  Des disques SSD utilisent aussi "
+"maintenant des blocs d'effacement de plus de 1Mo.  Nous vous suggérons de "
+"partitionner votre disque au préalable à l'aide d'un outil de "
+"partitionnement tiers tel que <emphasis role=\"bold\">gparted</emphasis>, et "
+"d'utiliser la configuration suivante :"
+
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:228
+#, fuzzy
+msgid "<emphasis>Align to</emphasis> = MiB"
 msgstr "<emphasis role=\"bold\">Alignement </emphasis> = Mo"
 
-#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:191
-msgid "<emphasis role=\"bold\">Free space preceding (MiB)</emphasis> = 2"
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:232
+#, fuzzy
+msgid "<emphasis>Free space preceding (MiB)</emphasis> = 2"
 msgstr "<emphasis role=\"bold\">Espace disque initial (Mo)</emphasis> = 2"
 
-#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:194
+#. type: Content of: <section><important><para>
+#: en/doPartitionDisks.xml:236
 msgid ""
 "Also make sure all partitions are created using an even number of megabytes."
 msgstr ""
@@ -1854,39 +2088,40 @@ msgstr ""
 "de Mo."
 
 #. 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 "Installation à partir du médium LIVE"
 
 #. 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 "Janvier 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 "La documentation officielle de Mageia"
 
 #. 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
+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/"
@@ -1897,8 +2132,8 @@ msgstr ""
 "sa/3.0/\">http://creativecommons.org/licenses/by-sa/3.0/</link>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml: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."
@@ -1909,8 +2144,7 @@ msgstr ""
 "\">NeoDoc</link>"
 
 #. 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</"
@@ -1920,15 +2154,15 @@ msgstr ""
 "à l'amélioration de ce manuel, veuillez contacter <link ns6:href=\"https://"
 "wiki.mageia.org/en/Documentation_team\">l'Equipe de documentation</link>."
 
-#. 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 "
@@ -1938,42 +2172,49 @@ msgstr ""
 "apparaissent, en fonction de votre matériel et des choix d'installation que "
 "vous faites."
 
-#. 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 ""
+"Il est rédigé par des bénévoles sur leur temps libre. Si vous désirez aider "
+"à l'amélioration de ce manuel, veuillez contacter <link ns6:href=\"https://"
+"wiki.mageia.org/en/Documentation_team\">l'Equipe de documentation</link>."
+
 #. 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 "Installation avec DrakX"
 
 #. type: Content of: <book><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:9
+#: en/DrakX-cover.xml:20
 msgid "February 2014"
 msgstr "Février 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
-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 "Félicitations"
 
 #.  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
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
@@ -1982,28 +2223,29 @@ msgstr ""
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </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 ""
 "L'installation et la configuration de <application>Mageia</application> sont "
 "terminées et il est maintenant possible d'enlever le medium d'installation "
 "et de redémarrer l'ordinateur."
 
 #. 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 ""
 "Après le redémarrage, vous pourrez choisir entre plusieurs systèmes "
 "d'exploitations (s'il y en a plusieurs installés) sur l'écran du chargeur de "
 "démarrage."
 
 #. 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."
@@ -2012,26 +2254,27 @@ msgstr ""
 "l'installation de Mageia sera automatiquement sélectionnée et démarrée."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:26
+#: en/exitInstall.xml:30
 msgid "Enjoy!"
 msgstr "Prenez plaisir !"
 
 #. 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 ""
 "Visitez www.mageia.org pour toute question ou si vous désirez contribuer à "
 "Mageia."
 
 #. type: Content of: <section><info><title>
-#: en/firewall.xml:3
+#: en/firewall.xml:7
 msgid "Firewall"
 msgstr "Pare-feu"
 
 #. 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,16 +2287,17 @@ msgstr ""
 "correspondant d'être accessibles depuis Internet."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:12
+#: en/firewall.xml:16
+#, fuzzy
 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 ""
 "Dans la configuration par défaut, aucune case n'est cochée et aucun service "
 "n'est accessible de l'extérieur. Le bouton <emphasis>Tout (pas de pare-feu)</"
@@ -2065,26 +2309,28 @@ msgstr ""
 "de débogage."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:21
+#: en/firewall.xml:25
+#, fuzzy
 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 ""
 "Toutes les autres options se comprennent directement. Comme exemple, vous "
 "cocherez <emphasis role=\"bold\">Serveur CUPS</emphasis> si vous souhaitez "
 "que les imprimantes de votre machine soient accessibles depuis le réseau."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:25
+#: en/firewall.xml:29
 msgid "<emphasis role=\"bold\">Advanced</emphasis>"
 msgstr "<emphasis role=\"bold\">Avancé</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:27
+#: en/firewall.xml:31
+#, fuzzy
 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 ""
 " Le bouton <emphasis>Avancé</emphasis> ouvre une fenêtre où vous pouvez "
@@ -2092,12 +2338,12 @@ msgstr ""
 "par des espaces."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:31
+#: en/firewall.xml:35
 msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
 msgstr "<emphasis>&lt;port-number>/&lt;protocol></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 "
@@ -2108,7 +2354,7 @@ msgstr ""
 "défini dans la spécification <emphasis>RFC-433</emphasis>;"
 
 #. 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."
@@ -2118,7 +2364,7 @@ msgstr ""
 "service."
 
 #. 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>."
@@ -2127,7 +2373,7 @@ msgstr ""
 "<emphasis>873/tcp</emphasis>."
 
 #. 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."
@@ -2136,7 +2382,7 @@ msgstr ""
 "indiquer deux couples pour le même port."
 
 #. type: Content of: <section><info><title>
-#: en/formatPartitions.xml:3
+#: en/formatPartitions.xml:10
 msgid "Formatting"
 msgstr "Formatage"
 
@@ -2144,14 +2390,16 @@ msgstr "Formatage"
 #.  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\" fileref="
 "\"dx2-formatPartitions.png\" xml:id=\"formatPartitions-im1\" align=\"center"
@@ -2160,7 +2408,7 @@ msgstr ""
 "\" fileref=\"live-formatPartitions.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:24
+#: en/formatPartitions.xml:35
 msgid ""
 "Here you can choose which partition(s) you wish to format. Any data on "
 "partitions <emphasis>not</emphasis> marked for formatting will be preserved."
@@ -2170,29 +2418,33 @@ msgstr ""
 "préservées."
 
 #. 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 ""
 "Habituellement, au moins les partitions sélectionnées par DrakX doivent être "
 "formatées."
 
 #. 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 ""
 "Cliquer sur <guibutton>Avancé</guibutton> pour désigner les partitions où "
 "l'on souhaite que soient recherchés les <emphasis> blocs défectueux.</"
 "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 ""
 "Si vous n'êtes pas encore sûr de votre choix, cliquer sur "
 "<guibutton>Précédent</guibutton>, à nouveau sur <guibutton>Précédent</"
@@ -2201,21 +2453,22 @@ msgstr ""
 "des partitions."
 
 #. 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 ""
 "Lorsque la sélection est faites avec certitude, cliquer sur "
 "<guibutton>Suivant</guibutton> pour continuer."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:10
+#: en/installer.xml:14
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, l'installateur de Mageia"
 
 #. 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 "
@@ -2225,334 +2478,238 @@ msgstr ""
 "l'installateur de Mageia est conçu pour vous rendre l'installation ou la "
 "mise à jour aussi aisée que possible."
 
-#. 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 ""
-"L'écran du menu initial présente plusieurs options, cependant l'option par "
-"défaut démarre l'installation, ce qui correspondra à ce qui est souhaité la "
-"plupart du temps ."
-
 #. type: Content of: <section><section><title>
-#: en/installer.xml:22
-msgid "Installation Welcome Screen"
-msgstr "Ecran d'accueil de l'installation"
-
-#. type: Content of: <section><section><section><title>
-#: en/installer.xml:25
-msgid "Using a Mageia DVD"
-msgstr "Utilisation d'un DVD Mageia"
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:27
-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 ""
-"Voici les écrans d'accueil par défaut lors de l'utilisation du DVD Mageia, "
-"le premier pour un système UEFI, le second pour un système avec avec le mode "
-"Legacy :"
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:32
-msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
+#: en/installer.xml:20
+msgid "The installation steps"
+msgstr "Les étapes de l'installation"
 
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:37
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/installer.xml:23
+#, fuzzy
 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."
+"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 ""
-"A partir de cet écran, vous pouvez accéder à des options en pressant la "
-"lettre <emphasis role=\"bold\">e</emphasis> pour entrer dans le mode "
-"d'édition. Pour revenir à cet écran, presser soit la touche <emphasis role="
-"\"bold\">Echap</emphasis> pour quitter sans sauvegarder ou presser <emphasis "
-"role=\"bold\">Ctrl</emphasis> ou <emphasis role=\"bold\">F10</emphasis> pour "
-"quitter en sauvegardant. "
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:45
-msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
+"Le processus d'installation se divise en étapes successives qui peuvent être "
+"suivies dans le panneau latéral à gauche de l'écran."
 
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:50
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/installer.xml:28
+#, fuzzy
 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):"
+"Each step has one or more screens, which may also have <emphasis>Advanced</"
+"emphasis> sections with extra, less commonly required options."
 msgstr ""
-"Depuis cet écran, il est possible paramétrer des préférences (notez que les "
-"options <emphasis role=\"bold\">F1</emphasis> à <emphasis role=\"bold\">F6</"
-"emphasis> ne sont disponibles que pour les systèmes Legacy) :"
+"Chaque étape contient un ou plusieurs écrans qui peuvent à leur tour "
+"présenter une section <guibutton>Avancé</guibutton> qui offre des options "
+"supplémentaires moins communes."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:55
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/installer.xml:33
+#, 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>"
+"Most screens have <emphasis>Help</emphasis> buttons for further details "
+"about the particular step."
 msgstr ""
-"Pour chacune des options <emphasis role=\"bold\">F2</emphasis> à <emphasis "
-"role=\"bold\">F6</emphasis>, une aide est disponible par la touche <emphasis "
-"role=\"bold\">F1</emphasis>"
+"La plupart des écrans présentent un bouton d'<guibutton>Aide</guibutton> qui "
+"apporte davantage d'explications au sujet de l'étape particulière."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:63
+#. type: Content of: <section><section><caution><para>
+#: en/installer.xml:38
+#, fuzzy
 msgid ""
-"Press <emphasis role=\"bold\">F2</emphasis> to have the installer use a "
-"specific language for the installation."
+"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 ""
-"L'option <emphasis role=\"bold\">F2</emphasis> permet de choisir une langue "
-"pour l'installation."
+"Si vous décidez d'arrêter l'installation à un moment donné de son "
+"déroulement, il est possible de redémarrer, mais bien y réfléchir avant. "
+"Lorsqu'une partition a été formatée ou lorsque des mises à jour ont commencé "
+"à être écrites, l'ordinateur n'est plus dans le même état et le redémarrage "
+"peut très bien rendre le système inutilisable. Si malgré tout, vous êtes "
+"sûrs de vouloir redémarrer, ouvrir une console en appuyant simultanément sur "
+"les trois touches <guibutton>alt ctrl F2</guibutton>. Ensuite appuyer "
+"simultanément sur les trois touches <guibutton>alt ctrl suppr</guibutton> "
+"pour redémarrer."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:67
+#. type: Content of: <section><section><caution><para>
+#: en/installer.xml:43
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+"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 ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:72
-msgid ""
-"Use the arrow keys to select the language then press <emphasis role=\"bold"
-"\">Enter</emphasis>."
-msgstr ""
-"Utilisez les flèches haut et bas pour sélectionner la langue puis <emphasis "
-"role=\"bold\">Entrée</emphasis>"
+#. type: Content of: <section><section><title>
+#: en/installer.xml:48
+msgid "Installation Welcome Screen"
+msgstr "Ecran d'accueil de l'installation"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:77
+#. type: Content of: <section><section><para>
+#: en/installer.xml:49
 msgid ""
-"If needed, change the screen resolution by pressing <emphasis role=\"bold"
-"\">F3</emphasis> (Legacy mode only)."
+"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 ""
-"Modifiez la résolution de l'écran en pressant la touche <emphasis role=\"bold"
-"\">F3</emphasis> (mode Legacy uniquement)"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:81
+#. type: Content of: <section><section><para>
+#: en/installer.xml:52
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+"The welcome menu screen has various options, however the default option will "
+"start the installer, and is normally all that you will need."
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+"L'écran du menu initial présente plusieurs options, cependant l'option par "
+"défaut démarre l'installation, ce qui correspondra à ce qui est souhaité la "
+"plupart du temps ."
 
-#. 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)."
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:56
+msgid "Legacy (BIOS) Systems"
 msgstr ""
-"Si vous rencontrez des problèmes pour l'installation, vous pouvez tenter de "
-"modifier les options d'amorçage par défaut avec la touche <emphasis role="
-"\"bold\">F6 Kernel Options</emphasis> ou la touche <emphasis role=\"bold"
-"\">e</emphasis> pour les systèmes UEFI."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/installer.xml:96
-msgid "Default: It doesn't alter anything in the default options."
-msgstr "Default. Cela ne modifie rien dans les options par défaut."
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/installer.xml:101
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:58
+#, fuzzy
 msgid ""
-"Safe Settings: Priority is given to the safer options at the price of a "
-"performance detriment."
+"<imageobject> <imagedata fileref=\"dx-welcome.png\" align=\"center\"/> </"
+"imageobject>"
 msgstr ""
-"Safe Settings: la priorité est donnée à la sécurité au détriment des "
-"performances."
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\"/"
+"> </imageobject>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/installer.xml:106
-msgid ""
-"No ACPI: (Advanced Configuration and Power Interface): Power management "
-"features are not used."
+#. type: Content of: <section><section><section><itemizedlist><title>
+#: en/installer.xml:63
+msgid "Menu"
 msgstr ""
-"No ACPI : (Advanced Configuration and Power Interface), la gestion de "
-"l'alimentation n'est pas prise en compte."
 
-#. 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:66
 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."
+"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 ""
-"No Local APIC (Local Advanced Programmable Interrupt Controller) "
-"Interruptions de l'unité centrale. Sélectionnez cette option si vous "
-"rencontrez des problèmes tels qu'un \"kernel panic\" en lien avec l'APIC."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:120
-msgid ""
-"When you select one of these entries, it modifies the default options "
-"displayed in the <guilabel>Boot Options</guilabel> line."
-msgstr ""
-"Si vous sélectionnez l'une de ces entrées, cela modifie les options par "
-"défaut affichées dans la ligne <guilabel>Options de démarrage</guilabel>."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:69
+#, fuzzy
+msgid "<emphasis role=\"bold\">Rescue System</emphasis>"
+msgstr "<emphasis role=\"bold\">Serveur</emphasis>"
 
-#. 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:70
 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."
+"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 ""
-"Dans certaines versions de Mageia, il peut arriver que les entrées "
-"sélectionnées avec la touche <emphasis role=\"bold\">F6</emphasis> "
-"n'apparaissent pas dans la ligne <guilabel>Options de démarrage</guilabel>, "
-"cependant elles sont bien prises en compte."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:132
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:75
+#, fuzzy
+msgid "<emphasis role=\"bold\">Memory Test</emphasis>"
+msgstr "<emphasis role=\"bold\">Serveur</emphasis>"
 
-#. 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:76
 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."
+"Test the installed RAM by performing multiple read and write operations. "
+"Reboot to end the test."
 msgstr ""
-"Presser la touche <emphasis role=\"bold\">F1</emphasis> ouvre une fenêtre "
-"d'aide avec diverses options d'amorçage. Sélectionnez-en une avec les "
-"touches directionnelles, puis pressez <emphasis role=\"bold\">Entrée</"
-"emphasis> pour obtenir plus de détails ou la touche d'échappement "
-"<emphasis>Esc</emphasis> pour revenir vers l'écran d'accueil."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:146
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:80
+#, fuzzy
+msgid "<emphasis role=\"bold\">F2: Language</emphasis>"
+msgstr "<emphasis role=\"bold\">Avancé</emphasis>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:151
-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><itemizedlist><listitem><para>
+#: en/installer.xml:81
+msgid "Press F2 for alternative languages."
 msgstr ""
-"Vue détaillée de l'option Splash. Appuyez sur <emphasis role=\"bold\">Esc</"
-"emphasis> ou sélectionnez <guilabel>Retour aux options de démarrage</"
-"guilabel> pour revenir à la liste des options. Ces options peuvent être "
-"ajoutées à la main à la ligne <guilabel>Options de démarrage</guilabel>."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:158
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:86
+msgid "UEFI Systems"
 msgstr ""
-"<imageobject> <imagedata 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><para>
+#: en/installer.xml:87
+#, fuzzy
 msgid ""
-"The help is translated in the chosen language with <emphasis role=\"bold"
-"\">F2</emphasis>."
+"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 ""
-"L'aide est traduite dans la langue sélectionnée en pressant la touche "
-"<emphasis role=\"bold\">F2</emphasis>."
+"A partir de cet écran, vous pouvez accéder à des options en pressant la "
+"lettre <emphasis role=\"bold\">e</emphasis> pour entrer dans le mode "
+"d'édition. Pour revenir à cet écran, presser soit la touche <emphasis role="
+"\"bold\">Echap</emphasis> pour quitter sans sauvegarder ou presser <emphasis "
+"role=\"bold\">Ctrl</emphasis> ou <emphasis role=\"bold\">F10</emphasis> pour "
+"quitter en sauvegardant. "
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:168
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:92
+#, fuzzy
 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 ""
-"Pour plus d'information sur les options du noyau sur les systèmes en mode "
-"Legacy ou avec UEFI, consulter : <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 "Les étapes de l'installation"
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\"/"
+"> </imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/installer.xml:179
-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 ""
-"Le processus d'installation se divise en étapes successives qui peuvent être "
-"suivies dans le panneau latéral à gauche de l'écran."
 
-#. type: Content of: <section><section><para>
-#: en/installer.xml:182
-msgid ""
-"Each step has one or more screens which may also have <guibutton>Advanced</"
-"guibutton> sections with extra, less commonly required, options."
-msgstr ""
-"Chaque étape contient un ou plusieurs écrans qui peuvent à leur tour "
-"présenter une section <guibutton>Avancé</guibutton> qui offre des options "
-"supplémentaires moins communes."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:99
+#, fuzzy
+msgid "<emphasis role=\"bold\">Install:</emphasis> Start the Install process"
+msgstr "<emphasis role=\"bold\">Alignement </emphasis> = Mo"
 
-#. type: Content of: <section><section><para>
-#: en/installer.xml:186
+#. 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 ""
-"La plupart des écrans présentent un bouton d'<guibutton>Aide</guibutton> qui "
-"apporte davantage d'explications au sujet de l'étape particulière."
 
-#. 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 ""
-"Si vous décidez d'arrêter l'installation à un moment donné de son "
-"déroulement, il est possible de redémarrer, mais bien y réfléchir avant. "
-"Lorsqu'une partition a été formatée ou lorsque des mises à jour ont commencé "
-"à être écrites, l'ordinateur n'est plus dans le même état et le redémarrage "
-"peut très bien rendre le système inutilisable. Si malgré tout, vous êtes "
-"sûrs de vouloir redémarrer, ouvrir une console en appuyant simultanément sur "
-"les trois touches <guibutton>alt ctrl F2</guibutton>. Ensuite appuyer "
-"simultanément sur les trois touches <guibutton>alt ctrl suppr</guibutton> "
-"pour redémarrer."
+"Si vous avez démarré à partrir d'une clé USB, vous disposez de deux lignes "
+"supplémentaires qui sont des copies des lignes précédentes, suffixées par "
+"\"USB\". Vous devez les sélectionner."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:203
+#: en/installer.xml:115
 msgid "Installation Problems and Possible Solutions"
 msgstr "Problèmes d'installation et solutions possibles"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:206
+#: en/installer.xml:117
 msgid "No Graphical Interface"
 msgstr "Pas d'interface graphique"
 
 #. 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 ""
 "Après l'écran initial, vous n'obtenez pas l'écran de sélection de la langue. "
 "Cela peut arriver avec certaines cartes graphiques et vieux systèmes. "
@@ -2560,15 +2717,15 @@ msgstr ""
 "l'invite."
 
 #. 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 ""
 "Si le matériel est très vieux, une installation graphique peut être "
 "impossible. Dans ce cas il est nécessaire de tenter une installation en mode "
@@ -2579,18 +2736,19 @@ msgstr ""
 "\">Entrée</emphasis>. Continuer ensuite avec l'installation en mode texte."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:230
+#: en/installer.xml:138
 msgid "The Install Freezes"
 msgstr "L'installation se fige"
 
 #. 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 ""
 "Si le système semble se figer pendant l'installation, cela peut provenir "
 "d'un problème de détection du matériel. Dans ce cas, la détection "
@@ -2599,17 +2757,19 @@ msgstr ""
 "avec les précédentes si nécessaire.."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:240
+#: en/installer.xml:146
 msgid "RAM problem"
 msgstr "Problème de mémoire vive"
 
 #. 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 ""
 "Cela sera rarement nécessaire, mais dans certains cas, le matériel peut "
 "détecter la mémoire vive (RAM) disponible de manière incorrecte. Pour la "
@@ -2618,19 +2778,20 @@ msgstr ""
 "spécifier 256Mo de RAM."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:249
+#: en/installer.xml:154
 msgid "Dynamic partitions"
 msgstr "Partitions dynamiques"
 
 #. 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 ""
 "Si vous avez converti votre disque dur d'un format <emphasis role=\"bold"
 "\">primaire</emphasis> vers un format <emphasis role=\"bold\">dynamique</"
@@ -2641,18 +2802,15 @@ msgstr ""
 "msdn.microsoft.com/en-us/library/cc776315.aspx</link>."
 
 #. type: Content of: <section><info><title>
-#: en/installUpdates.xml:3
+#: en/installUpdates.xml:16
 msgid "Updates"
 msgstr "Mises à jour"
 
-#.  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 ""
@@ -2661,60 +2819,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 ""
 "Depuis la publication de cette version de <application>Mageia</application>, "
 "un certain nombre de paquets ont été mis à jour ou améliorés."
 
-#. 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 ""
 "Choisissez <guilabel>oui</guilabel> si vous souhaitez les télécharger et les "
 "installer, sélectionnez <guilabel>non</guilabel> si vous ne le souhaitez "
 "pas, ou si vous n'êtes pas connecté à Internet"
 
-#. type: Content of: <section><para>
-#: en/installUpdates.xml:29
-msgid "Press <guibutton>Next</guibutton> to continue"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installUpdates.xml:40
+#, fuzzy
+msgid "Press <emphasis>Next</emphasis> to continue"
 msgstr "Cliquer sur <guibutton>Suivant</guibutton> pour continuer"
 
 #. type: Content of: <section><info><title>
-#: en/login.xml:1
-msgid "Login screen"
+#: en/login.xml:4
+#, fuzzy
+msgid "Login Screen"
 msgstr "Ecran de connexion"
 
 #. 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 "Ecran de connexion KDM"
 
 #. 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 "Au final, vous arrivez sur l'écran de connexion."
 
 #. 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 ""
 "Entrer votre nom d'utilisateur ainsi que votre mot de passe utilisateur, et "
 "dans quelques secondes, vous vous trouverez face à un environnement de "
@@ -2722,37 +2894,39 @@ msgstr ""
 "dès maintenant commencer à utiliser votre installation de Mageia."
 
 #. 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 ""
 "Vous pouvez trouver une autre partie de notre documentation dans <link "
 "linkend=\"https://wiki.mageia.org/en/Documentation-fr\">le wiki Mageia</"
 "link>."
 
 #. type: Content of: <section><info><title>
-#: en/media_selection.xml:3
-msgid "Media Selection (Nonfree)"
-msgstr "Sélection des média (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
+#: en/media_selection.xml:24
+#, fuzzy
 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=\"media_selection-im1\" align="
-"\"center\" revision=\"1\" fileref=\"dx2-media_selection.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-bestTime.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"bestTime-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 "
@@ -2765,7 +2939,7 @@ msgstr ""
 "suivantes."
 
 #. 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."
@@ -2774,12 +2948,13 @@ msgstr ""
 "de la distribution."
 
 #. 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 ""
 "Le dépôt <emphasis>Nonfree</emphasis> comprend les paquetages qui sont "
@@ -2789,7 +2964,7 @@ msgstr ""
 "graphiques nVidia et ATI, les firmwares de diverses cartes Wifi, etc."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:40
+#: en/media_selection.xml:50
 msgid ""
 "The <emphasis>Tainted</emphasis> repository includes packages released under "
 "a free license. The main criteria for placing packages in this repository is "
@@ -2810,33 +2985,14 @@ msgid "Minimal Install"
 msgstr "Installation minimale"
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:11
-msgid ""
-"You can choose a Minimal Installation by de-selecting everything in the "
-"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"/>."
-msgstr ""
-"Il est possible de choisir une installation minimale en dé-sélectionnant "
-"tout dans l'écran Sélection du groupe de paquetages, voir <xref linkend="
-"\"choosePackageGroups\"/>."
-
-#. type: Content of: <section><para>
-#: en/minimal-install.xml:14
-msgid ""
-"If desired, you can additionally tick the <emphasis role=\"bold\">Individual "
-"package selection</emphasis> option in the same screen."
-msgstr ""
-"Si vous le souhaitez, vous pouvez également cocher l'option <emphasis role="
-"\"bold\">Sélection individuelle des paquetages</emphasis> sur le même écran."
-
-#. 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 ""
 "L'installation minimale est destinée à ceux qui utilisent "
 "<application>Mageia</application> pour des cas spécifiques, tels qu'un "
@@ -2846,33 +3002,59 @@ msgstr ""
 "finement votre installation. Pour plus de détails, consultez <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 ""
+"Il est possible de choisir une installation minimale en dé-sélectionnant "
+"tout dans l'écran Sélection du groupe de paquetages, voir <xref linkend="
+"\"choosePackageGroups\"/>."
+
+#. 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 ""
+"Si vous le souhaitez, vous pouvez également cocher l'option <emphasis role="
+"\"bold\">Sélection individuelle des paquetages</emphasis> sur le même écran."
+
+#. 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 ""
 "Si vous choisissez cette méthode d'installation, l'écran correspondant vous "
 "proposera d'installer quelques outils utiles, tels que de la documentation "
 "et le serveur graphique X."
 
-#. type: Content of: <section><para>
-#: en/minimal-install.xml:26
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/minimal-install.xml:37
+#, fuzzy
 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 ""
 "Si vous choisissez <emphasis role=\"bold\">Avec serveur X</emphasis>, alors "
 "IceWM (un environnement de bureau très léger) sera également installé."
 
 #. 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 ""
 "La documentation de base est fournie sous la forme de pages man ou de pages "
 "info. Elle contient les pages man du <link xlink:href=\"http://www.tldp.org/"
@@ -2881,7 +3063,7 @@ msgstr ""
 "\">utilitaires GNU</link>."
 
 #. type: Content of: <section><mediaobject>
-#: en/minimal-install.xml:35
+#: en/minimal-install.xml:48
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"minimal-install-im1\" align="
 "\"center\" fileref=\"dx2-minimal-install.png\" revision=\"1\"/> </"
@@ -2893,24 +3075,33 @@ msgstr ""
 
 #. type: Content of: <section><info><title>
 #: en/misc-params.xml:3
-msgid "Summary of miscellaneous parameters"
-msgstr "Résumé des différents paramètres"
+#, fuzzy
+msgid "Configuration Summary"
+msgstr "Configuration du son"
 
 #.  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=\"dx2-summaryTop.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 suggère des réglages judicieux pour la configuration du système en "
 "tenant compte des choix faits par vous-même et du matériel détecté. Il est "
@@ -2918,7 +3109,7 @@ msgstr ""
 "cliquant sur <guibutton>Configurer</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:"
@@ -2927,37 +3118,39 @@ msgstr ""
 "sauf si :"
 
 #. 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 "Il existe un problème connu avec le paramètre par défault"
 
 #. 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 "le paramètre par défault a déjà été essayé avec échec"
 
 #. 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
+#, fuzzy
+msgid "some other factor mentioned in the detailed sections below is an issue"
 msgstr ""
 "une autre élément mentionné dans les sections détaillées ci-dessous pose "
 "problème."
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:40
+#: en/misc-params.xml:49
 msgid "System parameters"
 msgstr "Paramètres du système"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:45
-msgid "<guilabel>Timezone</guilabel>"
-msgstr "<guilabel>Fuseau horaire :</guilabel>"
+#: en/misc-params.xml:54
+#, fuzzy
+msgid "<emphasis role=\"bold\">Timezone</emphasis>"
+msgstr "<emphasis role=\"bold\">Serveur</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 sélectionne un fuseau horaire en fonction de la langue choisie. Vous "
@@ -2965,12 +3158,13 @@ msgstr ""
 "\"configureTimezoneUTC\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:53
-msgid "<guilabel>Country / Region</guilabel>"
-msgstr "<guilabel>Pays / Région :</guilabel>"
+#: en/misc-params.xml:62
+#, fuzzy
+msgid "<emphasis role=\"bold\">Country / Region</emphasis>"
+msgstr "<emphasis role=\"bold\">Poste de travail</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:56
+#: en/misc-params.xml:64
 msgid ""
 "If the selected country is wrong, it is very important that you correct the "
 "setting.  See <xref linkend=\"selectCountry\"/>"
@@ -2979,47 +3173,50 @@ msgstr ""
 "paramètre. Voir <xref linkend=\"selectCountry\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:62
-msgid "<guilabel>Bootloader</guilabel>"
-msgstr "<guilabel>Chargeur de démarrage : </guilabel>"
+#: en/misc-params.xml:70
+#, fuzzy
+msgid "<emphasis role=\"bold\">Bootloader</emphasis>"
+msgstr "<emphasis role=\"bold\">Serveur</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 a fait les bons choix pour le paramétrage du chargeur de démarrage."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:67
-msgid "Do not change anything, unless you know how to configure GRUB2"
+#: en/misc-params.xml:75
+#, fuzzy
+msgid ""
+"Do not change anything, unless you know how to configure GRUB2. For more "
+"information, see <xref linkend=\"setupBootloader\"/>"
 msgstr "Ne changez rien à moins de savoir configurer GRUB2."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:70
-msgid "For more information, see <xref linkend=\"setupBootloader\"/>"
-msgstr "Pour plus d'informations, voir <xref linkend=\"setupBootloader\"/>"
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:75
-msgid "<guilabel>User management</guilabel>"
-msgstr "<guilabel>Gestion de l'utilisateur :</guilabel>"
+#: en/misc-params.xml:83
+#, fuzzy
+msgid "<emphasis role=\"bold\">User management</emphasis>"
+msgstr "<emphasis role=\"bold\">Serveur</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 ""
 "Il est possible d'ajouter des utilisateurs supplémentaires ici. Chacun se "
 "verra attribuer son propre répertoire <literal>/home</literal>."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:84
-msgid "<guilabel>Services</guilabel>:"
-msgstr "<guilabel>Services :</guilabel>"
+#: en/misc-params.xml:91
+#, fuzzy
+msgid "<emphasis role=\"bold\">Services</emphasis>"
+msgstr "<emphasis role=\"bold\">Serveur</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:86
+#: en/misc-params.xml:93
 msgid ""
 "System services refer to those small programs which run in the background "
 "(daemons).  This tool allows you to enable or disable certain processes."
@@ -3029,31 +3226,29 @@ msgstr ""
 "processus."
 
 #. 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 ""
 "Soyez sûrs de ce que vous faîtes avant de changer quoi que ce soit ici - une "
 "erreur peut empêcher le fonctionnement correct de l'ordinateur."
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:94
-msgid "For more information, see <xref linkend=\"configureServices\"/>"
-msgstr "Pour plus d'informations, voir <xref linkend=\"configureServices\"/>"
-
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:101
+#: en/misc-params.xml:106
 msgid "Hardware parameters"
 msgstr "Paramètres du matériel"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:106
-msgid "<guilabel>Keyboard</guilabel>:"
-msgstr "<guilabel>Clavier </guilabel>:"
+#: en/misc-params.xml:111
+#, fuzzy
+msgid "<emphasis role=\"bold\">Keyboard</emphasis>"
+msgstr "<emphasis role=\"bold\">Serveur</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:108
+#: en/misc-params.xml:113
 msgid ""
 "Configure your keyboard layout according to your location, language and type "
 "of keyboard."
@@ -3062,7 +3257,7 @@ msgstr ""
 "localisation, de votre langue et de votre type de clavier."
 
 #. 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."
@@ -3071,12 +3266,13 @@ msgstr ""
 "perdez pas de vue que vos mots de passe changeront aussi."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:119
-msgid "<guilabel>Mouse</guilabel>:"
-msgstr "<guilabel>Souris :</guilabel>"
+#: en/misc-params.xml:124
+#, fuzzy
+msgid "<emphasis role=\"bold\">Mouse</emphasis>"
+msgstr "<emphasis role=\"bold\">Serveur</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."
@@ -3085,41 +3281,43 @@ msgstr ""
 "trackballs etc."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:126
-msgid "<guilabel>Sound card</guilabel>:"
-msgstr "<guilabel>Carte son :</guilabel>"
+#: en/misc-params.xml:131
+#, fuzzy
+msgid "<emphasis role=\"bold\">Sound card</emphasis>"
+msgstr "<emphasis role=\"bold\">Avancé</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:129
+#: 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 ""
-"L'installeur sélectionne le pilote par défaut, s'il en existe un. La "
-"possibilité de sélectionner un pilote différent n'est donnée que s'il existe "
-"plus d'un pilote pour votre carte, mais qu'aucun d'entre eux n'est celui par "
-"défaut."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:137
-msgid "<guilabel>Graphical interface</guilabel>:"
-msgstr "<guilabel>Interface graphique : </guilabel>"
+#: en/misc-params.xml:144
+#, fuzzy
+msgid "<emphasis role=\"bold\">Graphical interface</emphasis>"
+msgstr "<emphasis role=\"bold\">Environnement graphique</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 ""
 "Cette partie permet la configuration de la(des) carte(s) graphique(s) et de "
 "l'affichage."
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:143
-msgid "For more information, see <xref linkend=\"configureX_chooser\"/>."
-msgstr "Pour plus d'informations voir <xref linkend=\"configureX_chooser\"/>."
-
 #. type: Content of: <section><section><mediaobject>
-#: en/misc-params.xml:149
+#: en/misc-params.xml:155
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
 "\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
@@ -3128,21 +3326,23 @@ msgstr ""
 "\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"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 "Paramètres réseau et internet"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:163
-msgid "<guilabel>Network</guilabel>:"
-msgstr "<guilabel>Réseau :</guilabel>"
+#: en/misc-params.xml:169
+#, fuzzy
+msgid "<emphasis role=\"bold\">Network</emphasis>"
+msgstr "<emphasis role=\"bold\">Serveur</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 ""
 "Il est possible de configurer le réseau ici, mais pour les cartes réseau "
@@ -3152,7 +3352,7 @@ msgstr ""
 "libres (nonfree)."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:172
+#: en/misc-params.xml:178
 msgid ""
 "When you add a network card, do not forget to set your firewall to monitor "
 "that interface as well."
@@ -3161,15 +3361,17 @@ msgstr ""
 "pare-feu pour qu'il surveille aussi cette interface."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:179
-msgid "<guilabel>Proxies</guilabel>:"
-msgstr "<guilabel>Proxies</guilabel>:"
+#: en/misc-params.xml:185
+#, fuzzy
+msgid "<emphasis role=\"bold\">Proxies</emphasis>"
+msgstr "<emphasis role=\"bold\">Serveur</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 ""
 "Un serveur Proxy (aussi appelé serveur mandataire) se comporte en "
@@ -3177,68 +3379,73 @@ msgstr ""
 "configurer votre ordinateur pour qu'il utilise un service proxy."
 
 #. 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 ""
 "Peut-être sera t-il utile de consulter l'administrateur système pour obtenir "
 "les valeurs des paramètres à entrer ici."
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:195
+#: en/misc-params.xml:201
 msgid "Security"
 msgstr "Sécurité"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:200
-msgid "<guilabel>Security Level</guilabel>:"
-msgstr "<guilabel>Niveau de sécurité</guilabel> :"
+#: en/misc-params.xml:206
+#, fuzzy
+msgid "<emphasis role=\"bold\">Security Level</emphasis>"
+msgstr "<emphasis role=\"bold\">Serveur</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 ""
 "Régler ici le niveau de sécurité choisi pour l'ordinateur, le plus souvent "
 "les valeurs par défaut (Standard) conviennent pour un usage général."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:207
-msgid "Check the option which best suits your usage."
-msgstr ""
-"Cocher l'option qui convient le mieux à votre utilisation de l'ordinateur."
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:212
-msgid "<guilabel>Firewall</guilabel>:"
-msgstr "<guilabel>Pare-feu</guilabel> :"
+#: en/misc-params.xml:215
+#, fuzzy
+msgid "<emphasis role=\"bold\">Firewall</emphasis>"
+msgstr "<emphasis role=\"bold\">Serveur</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:214
+#: en/misc-params.xml:217
 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."
+"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 ""
-"Un pare-feu tente de se dresser en barrière entre les données importantes "
-"sur l'ordinateur et les voyous qui tournent autour, depuis internet, et qui "
-"cherchent à les compromettre ou à les voler."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:218
+#: en/misc-params.xml:223
 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\"/>."
+"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 ""
-"Selectionnez les services que vous souhaitez voir accéder à votre système. "
-"Votre choix dépend de l'utilisation envisagée de l'ordinateur. Pour plus "
-"d'informations, voir <xref linkend=\"firewall\"/>."
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/misc-params.xml:229
+#, fuzzy
+msgid "For more information, see <xref linkend=\"firewall\"/>."
+msgstr "Pour plus d'informations voir <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 ""
 "Garder à l'esprit que tout autoriser (pas de pare-feu) est très risqué."
 
@@ -3248,36 +3455,51 @@ msgid "Reboot"
 msgstr "Redémarrage"
 
 #. 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 ""
 "Une fois le chargeur de boot installé, vous serez invité à arrêter votre "
 "ordinateur, enlever le Live CD et redémarrer l'ordinateur, cliquez sur "
 "<emphasis role=\"bold\"><guibutton>Terminé</guibutton></emphasis> et faites "
 "ce qui est demandé<emphasis role=\"bold\"> dans cet ordre !</emphasis>"
 
+#. 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
-msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
+#: en/reboot.xml:12
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot2.png\"/> </"
+"imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"live-reboot2.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 ""
 "Après le redémarrage, vous verrez une succession de barres de progression du "
 "téléchargement. Elles indiquent que les listes des media logiciels sont en "
 "cours de téléchargement (voir Gestion des logiciels)."
 
 #. type: Content of: <section><mediaobject>
-#: en/reboot.xml:17
+#: en/reboot.xml:19
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
 "reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
@@ -3306,23 +3528,25 @@ msgstr ""
 "taille afin de pouvoir installer <application>Mageia</application>."
 
 #. type: Content of: <section><info><title>
-#: en/securityLevel.xml:3
+#: en/securityLevel.xml:10
 msgid "Security Level"
 msgstr "Niveau de Sécurité"
 
 #.  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=\"securityLevel-im1\" align="
-"\"center\" fileref=\"dx2-securityLevel.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
 msgid ""
 "<emphasis role=\"bold\">Please choose the desired security level</emphasis>"
 msgstr ""
@@ -3330,12 +3554,18 @@ msgstr ""
 "emphasis>"
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:19
+#: en/securityLevel.xml:29
+msgid ""
+"<emphasis>Standard</emphasis> is the default, and recommended setting for "
+"the average user."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:32
+#, fuzzy
 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>Secure</emphasis> will create a highly protected system - for "
+"instance if the system is to be used as a public server."
 msgstr ""
 "Le paramètre par défaut est <emphasis role=\"bold\">Standard</emphasis>, et "
 "il est recommandé pour l'utilisateur moyen. <emphasis role=\"bold"
@@ -3344,12 +3574,12 @@ msgstr ""
 "par exemple."
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:24
+#: en/securityLevel.xml:36
 msgid "<emphasis role=\"bold\">Security Administrator</emphasis>"
 msgstr "Administrateur de sécurité"
 
 #. 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 "
@@ -3361,17 +3591,18 @@ msgstr ""
 "administrateur système."
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:31
+#: en/securityLevel.xml:43
+#, fuzzy
 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 ""
 "Un choix valide et facile à mettre en œuvre consiste à entrer &lt;"
 "user>@localhost -- où &lt;user> est l'identifiant de l'utilisateur qui sera "
 "le destinataire de ces messages."
 
 #. 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 "
@@ -3383,27 +3614,28 @@ msgstr ""
 "de ce type."
 
 #. 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 ""
 "Après l'installation, il sera toujours possible de régler les paramètres de "
 "sécurité dans le volet <guilabel>Sécurité </guilabel>dans le Centre de "
 "Contrôle de Mageia."
 
 #. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:6
+#: en/SelectAndUseISOs2.xml:15
 msgid "Select and use ISOs"
 msgstr "Sélectionner et utiliser les ISOs"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:9
+#: en/SelectAndUseISOs2.xml:18
 msgid "Introduction"
 msgstr "Introduction"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:10
+#: en/SelectAndUseISOs2.xml:19
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
 "which image best suits your needs."
@@ -3412,62 +3644,114 @@ msgstr ""
 "quelle image correspond le mieux à vos besoins."
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:12
-msgid "There are two families of media:"
+#: en/SelectAndUseISOs2.xml:21
+#, fuzzy
+msgid "There are three types of installation media:"
 msgstr "Il existe deux familles de media :"
 
 #. 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 ""
 "Installation classique : l'utilisation de ce média vous donne le maximum de "
 "flexibilité pour ce qui est à installer et à configurer. En particulier vous "
 "pouvez choisir quel environnement de bureau vous souhaitez installer. "
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:21
+#: en/SelectAndUseISOs2.xml:31
+#, 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"
+"<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 ""
 "Média Live : cette option vous permet d'observer Mageia sans avoir à "
 "l'installer ni faire de modification à votre ordinateur. L'installation "
 "reste possible, mais avec beaucoup moins de choix que ce qu'offre "
 "l'installation classique"
 
+#. 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\">Les ISO Live ne peuvent être utilisées que pour "
+"faire de nouvelles installations ; elles ne permettent pas pas de mettre à "
+"niveau une installation Mageia antérieure.</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 ""
+"Ce sont des images ISO minimalistes ne contenant que ce qui est nécessaire "
+"pour démarrer l'installeur drakx, trouver drakx-installer-stage2 et d'autres "
+"paquets indispensables pour continuer et terminer l'installation. Ces "
+"paquets peuvent se trouver sur le disque dur de l'ordinateur, sur un "
+"périphérique de stockage, un réseau local ou sur Internet. "
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:53
+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 ""
+"Ces médias sont très légers (moins de 100 Mo) et sont adaptés lorsque le "
+"débit est trop faible pour télécharger un DVD complet, si l'ordinateur n'a "
+"pas de lecteur de DVD ou s'il ne peut pas démarrer sur une clé USB."
+
 #. 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 "Des précisions sont fournies dans les sections suivantes."
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:30
+#: en/SelectAndUseISOs2.xml:61
 msgid "Media"
 msgstr "Média"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:32
+#: en/SelectAndUseISOs2.xml:63
 msgid "Definition"
 msgstr "Définition"
 
 #. 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 ""
 "Ici, un médium (pluriel : média) est un fichier image ISO qui vous permet "
 "d'installer et/ou de mettre à jour Mageia, et par extension tout support "
 "physique (DVD, clé USB, ...) sur lequel le fichier ISO est copié."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:36
+#: en/SelectAndUseISOs2.xml:67
 msgid ""
 "You can find Mageia ISO's <link ns4:href=\"http://www.mageia.org/en/"
 "downloads/\">here</link>."
@@ -3476,227 +3760,210 @@ msgstr ""
 "downloads/\">ici</link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:39
+#: en/SelectAndUseISOs2.xml:70
 msgid "Classical installation media"
 msgstr "Média d'installation classique"
 
 #. 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 "Caractéristiques communes"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:44
-msgid "These ISOs use the Classical installer called drakx."
+#: en/SelectAndUseISOs2.xml:75
+#, fuzzy
+msgid "These ISOs use the Classical installer called DrakX"
 msgstr "Ces images ISOs utilisent l'installeur classique appelé 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 ""
 "Ils sont utilisés pour réaliser une nouvelle installation ou une mise à jour "
 "à partir d\"une version installée précédemment."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:51 en/SelectAndUseISOs2.xml:83
-#: en/SelectAndUseISOs2.xml:158
-msgid "Different media for 32 and 64 bit architectures."
+#: en/SelectAndUseISOs2.xml:82 en/SelectAndUseISOs2.xml:118
+#: en/SelectAndUseISOs2.xml:174
+#, fuzzy
+msgid "Different media for 32 and 64-bit architectures"
 msgstr "Des média différents pour les architectures 32 ou 64 bits."
 
 #. 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 ""
 "Certains outils sont disponibles dans l'écran d'accueil : système de "
 "secours, test de mémoire, outil de détection de matériel."
 
 #. 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 ""
 "Chaque DVD contient plusieurs environnements de bureau et plusieurs langues."
 
 #. 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 ""
 "Vous aurez la possibilité durant l'installation d'ajouter des logiciels non-"
 "libres."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:69
+#: en/SelectAndUseISOs2.xml:102
 msgid "Live media"
 msgstr "Média \"Live\""
 
 #. 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 ""
 "Peut être utilisé pour tester le système d'exploitation Mageia sans avoir à "
 "l'installer. Peut être aussi utilisé pour une installation de Mageia."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:79
-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 ""
-"Chaque image ISO contient un seul environnement de bureau (Plasma, GNOME ou "
-"Xfce)."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:86
-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>"
+#: en/SelectAndUseISOs2.xml:114
+#, fuzzy
+msgid "Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)"
 msgstr ""
-"<emphasis role=\"bold\">Les ISO Live ne peuvent être utilisées que pour "
-"faire de nouvelles installations ; elles ne permettent pas pas de mettre à "
-"niveau une installation Mageia antérieure.</emphasis>"
+"Chaque image ISO contient un seul environnement de bureau (Plasma, GNOME ou "
+"Xfce)."
 
 #. 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 "Ils contiennent des logiciels non-libres."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:96
+#: en/SelectAndUseISOs2.xml:126
 msgid "Live DVD Plasma"
 msgstr "DVD Live Plasma"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:99
-msgid "Plasma desktop environment only."
+#: en/SelectAndUseISOs2.xml:129
+#, fuzzy
+msgid "Plasma desktop environment only"
 msgstr "Environnement de bureau Plasma uniquement"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:102 en/SelectAndUseISOs2.xml:116
-#: en/SelectAndUseISOs2.xml:130
-msgid "All available languages are present."
+#: en/SelectAndUseISOs2.xml:132 en/SelectAndUseISOs2.xml:146
+#: en/SelectAndUseISOs2.xml:160
+#, fuzzy
+msgid "All available languages are present"
 msgstr "Toutes les langues disponibles sont présentes."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:105
-msgid "64 bit architecture only."
+#: en/SelectAndUseISOs2.xml:135 en/SelectAndUseISOs2.xml:149
+#, fuzzy
+msgid "64-bit architecture only"
 msgstr "Architecture 64 bits uniquement."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:110
+#: en/SelectAndUseISOs2.xml:140
 msgid "Live DVD GNOME"
 msgstr "DVD Live 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 "Environnement de bureau GNOME uniquement."
 
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:119
-msgid "64 bit architecture only"
-msgstr "Architecture 64 bits uniquement."
-
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:124
+#: en/SelectAndUseISOs2.xml:154
 msgid "Live DVD Xfce"
 msgstr "DVD Live Xfce"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:127
-msgid "Xfce desktop environment only."
+#: en/SelectAndUseISOs2.xml:157
+#, fuzzy
+msgid "Xfce desktop environment only"
 msgstr "Environnement de bureau Xfce uniquement."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:133
-msgid "32 or 64 bit architectures."
+#: en/SelectAndUseISOs2.xml:163
+#, fuzzy
+msgid "32 or 64-bit architectures"
 msgstr "Architecture 32 bits et 64 bits."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:139
+#: en/SelectAndUseISOs2.xml:169
 msgid "Net install media"
 msgstr "Média d'installation par réseau"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:144
-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 ""
-"Ce sont des images ISO minimalistes ne contenant que ce qui est nécessaire "
-"pour démarrer l'installeur drakx, trouver drakx-installer-stage2 et d'autres "
-"paquets indispensables pour continuer et terminer l'installation. Ces "
-"paquets peuvent se trouver sur le disque dur de l'ordinateur, sur un "
-"périphérique de stockage, un réseau local ou sur Internet. "
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:152
-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 ""
-"Ces médias sont très légers (moins de 100 Mo) et sont adaptés lorsque le "
-"débit est trop faible pour télécharger un DVD complet, si l'ordinateur n'a "
-"pas de lecteur de DVD ou s'il ne peut pas démarrer sur une clé USB."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:161
-msgid "First steps are English language only."
+#: en/SelectAndUseISOs2.xml:177
+#, fuzzy
+msgid "First steps are English language only"
 msgstr "Les premières étapes sont en anglais uniquement."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:166
+#: en/SelectAndUseISOs2.xml:182
 msgid "netinstall.iso"
 msgstr "netinstall.iso"
 
 #. 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 ""
 "Contient uniquement des logiciels libres, pour les personnes qui préfèrent "
 "ne pas utiliser de logiciels non-libres."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:175
+#: en/SelectAndUseISOs2.xml:191
 msgid "netinstall-nonfree.iso"
 msgstr "netinstall-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 ""
 "Contient des logiciels non-libres (essentiellement des pilotes, des "
 "codecs,...) pour les personnes qui en ont besoin."
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:186
+#: en/SelectAndUseISOs2.xml:202
 msgid "Downloading and Checking Media"
 msgstr "Télécharger et vérifier les média"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:188
+#: en/SelectAndUseISOs2.xml:204
 msgid "Downloading"
 msgstr "Téléchargement"
 
 #. 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 ""
 "Une fois choisi votre fichier ISO, vous pouvez le télécharger en utilisant "
 "un lien direct HTTP soit BitTorrent. Dans les deux cas, on vous fournira des "
@@ -3704,47 +3971,63 @@ msgstr ""
 "le débit est trop faible. Si vous choisissez le lien direct HTTP, vous "
 "pouvez également voir des explications relatives aux sommes de contrôle."
 
+#. 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: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:191
-msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
+#: en/SelectAndUseISOs2.xml:217
+#, fuzzy
+msgid ""
+"<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:195
-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:"
+#: en/SelectAndUseISOs2.xml:222
+msgid "In the meantime, a window to download the actual ISO will open:"
 msgstr ""
-"md5sum, sha1sum et sha512 sont des outils pour vérifier l'intégrité des "
-"images ISO. Utiliser uniquement l'un de ces outils. Conserver l'un d'entre "
-"eux <link linkend=\"integrity\">pour un usage à venir</link>. La fenêtre "
-"suivante apparaît alors :"
 
 #. 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."
-msgstr "Choisissez l'option Enregistrer le fichier, puis cliquez sur 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
 msgid "Checking the integrity of the downloaded media"
 msgstr "Vérification de l'intégrité du média téléchargé"
 
 #. 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 ""
 "Les sommes de contrôle mentionnées ci-dessus sont des empreintes numériques "
 "générées par un algorithme à partir du fichier à télécharger. Vous pouvez "
@@ -3755,7 +4038,7 @@ msgstr ""
 "BitTorrent."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:214
+#: en/SelectAndUseISOs2.xml:241
 msgid ""
 "To generate the checksum for your downloaded ISO, open a console, (no need "
 "to be root), and:"
@@ -3764,71 +4047,87 @@ msgstr ""
 "(pas besoin d'être super-utilisateur), puis :"
 
 #. 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 ""
 "Pour utiliser md5sum, tapez : <userinput>md5sum chemin/vers/le/fichier/image."
 "iso</userinput>."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:222
+#: en/SelectAndUseISOs2.xml:249
+#, fuzzy
+msgid ""
+"To use the sha1sum, type: <command>sha1sum path/to/the/image/file.iso</"
+"command>"
+msgstr ""
+"Pour utiliser sha1sum, tapez : <userinput>sha1sum chemin/vers/le/fichier/"
+"image.iso</userinput>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:254
+#, fuzzy
 msgid ""
-"To use sha1sum, type: <userinput>sha1sum path/to/the/image/file.iso</"
-"userinput>"
+"To use the sha512sum, type: <command>sha512sum path/to/the/image/file.iso</"
+"command>"
 msgstr ""
 "Pour utiliser sha1sum, tapez : <userinput>sha1sum chemin/vers/le/fichier/"
 "image.iso</userinput>"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:226
+#: en/SelectAndUseISOs2.xml:258
 msgid "Example:"
 msgstr "Exemple :"
 
 #. 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 ""
 "puis comparez le résultat (cela peut prendre un certain temps) avec la somme "
 "de contrôle fournie par Mageia."
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:237
+#: en/SelectAndUseISOs2.xml:270
 msgid "Burn or dump the ISO"
 msgstr "Graver ou copier l'ISO"
 
 #. 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 ""
 "L'image ISO peut maintenant être gravée sur un CD/DVD ou copiée sur une clé "
 "USB. Il ne s'agit pas d'une copie de fichier ordinaire puisque c'est en fait "
 "un support de démarrage qui sera créé. "
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:275
 msgid "Burning the ISO to a CD/DVD"
 msgstr "Graver l'image ISO sur un 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 ""
 "Quel que soit le logiciel que vous utiliserez, assurez-vous que vous "
 "utilisez l'option <emphasis role=\"bold\">graver une image</emphasis> : "
@@ -3838,47 +4137,55 @@ msgstr ""
 "link> pour plus d'information."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:248
+#: en/SelectAndUseISOs2.xml:282
 msgid "Dump the ISO to a USB stick"
 msgstr "Copier l'image ISO sur une clé USB"
 
 #. 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 ""
 "Toutes les images ISO Mageia sont hybrides, ce qui signifie que vous pouvez "
 "les copier sur une clé USB puis utiliser celle-ci pour démarrer et installer "
 "le système."
 
 #. 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 ""
 "«Copier» une image sur un périphérique Flash détruira tout système de "
 "fichier déjà présent ; toutes les données seront détruites et la taille "
 "totale du périphérique sera réduite à la taille de l'image ISO."
 
-#. 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 ""
-"Afin de récupérer la capacité originelle de la clé USB, vous devez supprimer "
-"le partitionnement et reformater la clé."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:259
+#: en/SelectAndUseISOs2.xml:299
 msgid "Using a graphical tool within Mageia"
 msgstr "Utiliser un outil graphique dans Mageia"
 
 #. 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>"
@@ -3888,26 +4195,27 @@ msgstr ""
 "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 "Utiliser un outil graphique dans Windows"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:304
 msgid "You could try:"
 msgstr "Vous pouvez essayer :"
 
 #. 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=en_US\">Rufus</link> utilisant "
 "l'option « image ISO » ;"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:271
+#: en/SelectAndUseISOs2.xml:311
 msgid ""
 "<link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
@@ -3916,12 +4224,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 "Utiliser la ligne de commande avec le système GNU/Linux"
 
 #. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:279
+#: en/SelectAndUseISOs2.xml:319
 msgid ""
 "It is potentially *dangerous* to do this by hand. You risk overwriting "
 "potentially valuable existing data if you specify the wrong target device."
@@ -3931,60 +4240,71 @@ msgstr ""
 "support cible."
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:325
 msgid "Open a console"
 msgstr "Ouvrir une console"
 
 #. 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 ""
 "Devenez Administrateur avec la commande <userinput>su -</userinput> "
 "(n'oubliez pas le - final)"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:291
-msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
+#: en/SelectAndUseISOs2.xml:332
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"Root.png\"/> </"
+"imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Root.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 ""
 "Brancher votre clé USB (ne pas la monter, ce qui veut également dire ne pas "
 "ouvrir une application ou un gestionnaire de fichiers qui pourrait y accéder "
 "ou la lire)."
 
 #. 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 "Saisissez la commande <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>"
+#: en/SelectAndUseISOs2.xml:345
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"Fdisk.png\"/> </"
+"imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Fdisk.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 ""
 "Trouvez le nom de votre clé USB (par sa taille) ; par exemple, sur la "
 "capture d'écran ci-dessus, <code>/dev/sdb</code> désigne une clé USB de 8Go."
 
 #. 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 ""
 "Vous pouvez également trouver le nom de votre clé USB à l'aide de la "
 "commande <code>dmesg</code> : vers la fin de cet exemple, le nom du "
@@ -3992,7 +4312,7 @@ msgstr ""
 "s'agit en fait de <emphasis>sdd</emphasis>. Sa taille est de 2Go."
 
 #. 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"
@@ -4034,40 +4354,47 @@ 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
 msgid "<placeholder type=\"screen\" id=\"0\"/>"
 msgstr "<placeholder type=\"screen\" 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 ""
 "Saisissez la commande : <emphasis role=\"bold\">#<userinput>dd if=path/to/"
 "the/ISO/file of=/dev/sdX bs=1M</userinput></emphasis>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:340
-msgid "Where X=your device name eg: /dev/sdd"
+#: en/SelectAndUseISOs2.xml:382
+#, fuzzy
+msgid ""
+"Where <replaceable>X</replaceable>=your device name eg: <filename>/dev/sdd</"
+"filename>"
 msgstr "Où X=le nom de votre périphérique, par exemple : /dev/sdd"
 
 #. 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 ""
 "Exemple :<emphasis role=\"bold\"> # <userinput>dd if=/home/user/Downloads/"
 "Mageia-6-x86_64-DVD.iso of=/dev/sdd bs=1M</userinput></emphasis>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><tip><para>
-#: en/SelectAndUseISOs2.xml:345
+#: en/SelectAndUseISOs2.xml:388
+#, fuzzy
 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 ""
 "Il peut être utile de savoir que <emphasis role=\"bold\">if</emphasis> "
 "signifie <emphasis role=\"bold\">i</emphasis>nput <emphasis role=\"bold\">f</"
@@ -4076,12 +4403,13 @@ msgstr ""
 "\">f</emphasis>ile (fichier sortant)"
 
 #. 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 "Saisissez la commande : # <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 ""
 "Le processus est terminé, vous pouvez à présent débrancher votre clé USB."
@@ -4092,8 +4420,10 @@ msgid "Select your Country / Region"
 msgstr "Sélection du Pays / Région"
 
 #.  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
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
 "\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
@@ -4101,34 +4431,36 @@ msgstr ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
 "\"center\" fileref=\"dx2-selectCountry.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 ""
 "Sélectionnez votre pays ou région. Cela impacte toutes sortes de "
 "paramétrages importants, comme la monnaie et le domaine réglementaire du wi-"
 "fi.  Choisir un pays erroné peut conduire à ne pas pouvoir utiliser un "
 "réseau sans fil."
 
-#. 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 ""
 "Si votre pays n'est pas dans la liste, cliquez sur <guilabel>Autres pays</"
 "guilabel> et choisissez-y votre pays/région."
 
 #. 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 ""
 "Si votre pays se trouve uniquement dans la liste <guilabel>Autres pays</"
 "guilabel>, après avoir cliqué sur <guibutton>OK</guibutton> il peut sembler "
@@ -4136,14 +4468,15 @@ msgstr ""
 "DrakX respectera votre choix. "
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:33
+#: en/selectCountry.xml:42
 msgid "Input method"
 msgstr "Méthode de saisie"
 
 #. 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. "
@@ -4160,12 +4493,13 @@ msgstr ""
 "sélection du paquetage."
 
 #. 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 ""
 "Si vous avez manqué la configuration de la méthode de saisie pendant "
 "l'installation, vous pourrez y accéder après le redémarrage de votre "
@@ -4174,57 +4508,64 @@ msgstr ""
 "\" en tant que super-utilisateur."
 
 #. type: Content of: <section><info><title>
-#: en/selectInstallClass.xml:14
+#: en/selectInstallClass.xml:29
 msgid "Install or Upgrade"
 msgstr "Installation ou Mise à jour"
 
 #. 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 format=\"PNG\" align=\"center\" fileref=\"dx2-"
 "selectInstallClass.png\"/> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:25
-msgid "Install"
-msgstr "Installation"
+#: en/selectInstallClass.xml:41
+#, fuzzy
+msgid "<emphasis role=\"bold\">Install</emphasis>"
+msgstr "<emphasis role=\"bold\">Poste de travail</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:27
+#: en/selectInstallClass.xml:43
+#, fuzzy
 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 ""
 "Utilisez cette option pour réaliser une installation à neuf de "
 "<application>Mageia</application>. Elle formatera la partition root (/) tout "
 "en conservant intacte la partition /home séparée."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:33
-msgid "Upgrade"
-msgstr "Mise à jour"
+#: en/selectInstallClass.xml:50
+#, fuzzy
+msgid "<emphasis role=\"bold\">Upgrade</emphasis>"
+msgstr "<emphasis role=\"bold\">Serveur</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 ""
 "Ceci peut être utilisé pour faire une mise à jour d'une version de "
 "<application>Mageia</application> préalablement installée."
 
-#. 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 ""
 "Seule la mise à jour d'une version précédente de Mageia, et "
 "<emphasis>toujours supportée</emphasis> à la sortie de cet installateur, a "
@@ -4232,35 +4573,15 @@ msgstr ""
 "n'est plus supportée, alors il est préférable de faire une installation "
 "propre en conservant votre partition <literal>/home</literal>."
 
-#. type: Content of: <section><note><para>
-#: en/selectInstallClass.xml:50
-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 ""
-"Si vous décidez d'interrompre l'installation en cours de route, il est "
-"possible de redémarrer, mais réfléchissez bien avant de le faire. Une fois "
-"que la partition aura été formatée, ou que les mises à jour ont commencé à "
-"être installées, votre ordinateur n'est plus dans le même état, et le "
-"redémarrer peut très bien rendre le système inutilisable. Si malgré tout, "
-"vous êtes sûr de vouloir redémarrer, ouvrez une console en appuyant "
-"simultanément sur <guilabel>Alt+Ctrl+F2</guilabel>. Ensuite, appuyez sur "
-"<guilabel>Alt+Ctrl+Suppr</guilabel> simultanément pour redémarrer."
-
 #. 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 ""
 "Si vous vous rendez compte que vous avez oublié de sélectionner une langue "
 "supplémentaire, il est possible de revenir de l'écran <emphasis role=\"bold"
@@ -4269,39 +4590,41 @@ msgstr ""
 "role=\"bold\">Ne faites pas cela</emphasis> plus loin dans l'installation."
 
 #. type: Content of: <section><info><title>
-#: en/selectKeyboardLive.xml:3
-msgid "Select keyboard"
+#: en/selectKeyboardLive.xml:14
+#, fuzzy
+msgid "Select Keyboard"
 msgstr "Sélectionner le clavier"
 
 #. 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:24
+msgid "Here you can set the keyboard layout you wish to use with Mageia​​."
+msgstr ""
 
 #. type: Content of: <section><para>
-#: en/selectKeyboardLive.xml:12
+#: 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 ""
-"On vous demandera de régler le clavier que vous désirez utiliser dans "
-"Mageia. Celui par défaut est sélectionné en fonction de votre langue et de "
-"votre fuseau hoaraire précédemment choisis."
 
 #. type: Content of: <section><info><title>
-#: en/selectKeyboard.xml:7
+#: en/selectKeyboard.xml:20
 msgid "Keyboard"
 msgstr "Clavier"
 
 #. 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."
@@ -4311,16 +4634,17 @@ msgstr ""
 "clavier US."
 
 #. 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=\"dx2-selectKeyboard.png\" align=\"center\"/"
-"> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" align=\"center\" fileref=\"dx2-"
+"selectInstallClass.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 "
@@ -4339,23 +4663,25 @@ msgstr ""
 "Disposition_des_touches_des_claviers_informatiques</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 ""
 "Si votre clavier n'apparaît pas dans la liste, cliquez sur "
 "<guibutton>Davantage</guibutton> pour obtenir une liste complète et y "
 "choisir votre clavier."
 
-#. 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 ""
 "Après avoir choisi un clavier dans la liste obtenue en cliquant sur "
 "<guibutton>Davantage</guibutton>, vous reviendrez à la première liste, et il "
@@ -4364,7 +4690,7 @@ msgstr ""
 "la liste complète sera bien pris en compte."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:46
+#: en/selectKeyboard.xml:60
 msgid ""
 "If you choose a keyboard based on non-Latin characters, you will see an "
 "extra dialogue screen asking how you would prefer to switch between the "
@@ -4375,36 +4701,39 @@ msgstr ""
 "disposition latine à la disposition non-latine."
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:15
+#: en/selectLanguage.xml:34
 msgid "Please choose a language to use"
 msgstr "Veuillez choisir la langue à utiliser"
 
-#. 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 ""
 "Sélectionner la langue désirée en déployant d'abord le continent concerné. "
 "<application>Mageia</application> utilisera cette sélection pendant "
 "l'installation et pour le système une fois installé."
 
-#. 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 ""
 "Sélectionner la langue désirée. <application>Mageia</application> utilisera "
 "cette sélection pendant l'installation et pour le système une fois installé."
 
-#. 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 ""
 "S'il est probable que vous (ou d'autres utilisateurs) ayiez besoin que "
@@ -4414,66 +4743,69 @@ msgstr ""
 "supplémentaires après l'installation."
 
 #. 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 format=\"PNG\" fileref="
 "\"dx2-selectLanguage.png\" align=\"center\"/> </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 ""
 "Même si vous souhaitez installer plusieurs langues, vous devez au préalable "
 "en désigner une comme langue préférée sur le premier écran des langues. Elle "
 "sera marquée comme choisie sur l'écran des langues multiples."
 
 #. 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 ""
 "Si la langue du clavier ne correspond pas à la langue préférée, alors il est "
 "conseillé d'installer également la langue du clavier correspondante."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:56
-msgid "Mageia uses UTF-8 (Unicode) support by default."
-msgstr "Mageia utilise par défaut le codage UTF-8 (Unicode)"
-
-#. 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 ""
 "Ceci peut être désactivé sur l'écran <emphasis role=\"bold\">Langues "
 "multiples</emphasis> si vous savez que c'est contre-indiqué pour votre "
 "langue. Désactiver UTF-8 s'applique à toutes les langues installées."
 
 #. 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 ""
 "Vous pouvez modifier la langue de votre système après l'installation dans le "
 "Centre de Contrôle Mageia > Système > Gérer les paramètres locaux de votre "
 "système."
 
 #. type: Content of: <section><info><title>
-#: en/selectMouse.xml:4
+#: en/selectMouse.xml:10
 msgid "Select mouse"
 msgstr "Sélection de la souris"
 
@@ -4481,18 +4813,19 @@ msgstr "Sélection de la souris"
 #.  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 revision=\"1\" fileref=\"dx2-selectMouse.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"selectMouse-im1\"></imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" align=\"center\" fileref=\"dx2-"
+"selectInstallClass.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."
@@ -4501,26 +4834,29 @@ msgstr ""
 "ici."
 
 #. 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 ""
 "Le plus souvent, <guilabel>Universelle</guilabel> - <guilabel>N'importe "
 "quelle souris PS/2 ou USB </guilabel> est un bon choix."
 
 #. 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 ""
 "Sélectionner <guilabel>Universelle</guilabel> - <guilabel>Force evdev</"
 "guilabel> pour configurer les boutons qui ne fonctionnent pas sur une souris "
 "à six boutons ou plus."
 
-#. 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 "Ajouter ou Modifier une Entrée de Menu de Démarrage"
 
@@ -4546,103 +4882,68 @@ msgstr ""
 "fr</link>"
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:7
-msgid "Bootloader main options"
-msgstr "Principales options du chargeur de démarrage"
-
-#. type: Content of: <section><section><title>
 #: en/setupBootloader.xml:10
-msgid "Bootloader interface"
+#, fuzzy
+msgid "Bootloader"
 msgstr "Interface du programme d'amorçage"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:11
-msgid "By default, Mageia uses exclusively:"
-msgstr "Par défaut, Mageia utilise exclusivement :"
-
-#. 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><title>
+#: en/setupBootloader.xml:13
+msgid "Grub2"
 msgstr ""
-"GRUB2 (avec ou sans menu graphique) pour un système MBR/Legacy ou GPT/Legacy"
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:18
-msgid "GRUB2-efi for a UEFI system."
-msgstr "GRUB2-efi pour un système UEFI."
-
-#. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:22
-msgid "The Mageia graphical menus are nice :)"
-msgstr "Les menus graphiques de Mageia sont superbes :) "
-
-#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:25
-msgid "GRUB2 on Legacy/MBR and Legacy/GPT systems"
+#. type: Content of: <section><section><itemizedlist><title>
+#: en/setupBootloader.xml:15
+#, fuzzy
+msgid "Grub2 on Legacy MBR/GPT systems"
 msgstr "GRUB2 sur des systèmes MBR/Legacy et GPT/Legacy "
 
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:27
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:17
+#, 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>"
+"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 fileref=\"dx2-"
-"setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
-"setupBootloader.png\"/> </imageobject>"
+"GRUB2 (avec ou sans menu graphique) pour un système MBR/Legacy ou GPT/Legacy"
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:34 en/setupBootloader.xml:56
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:21
+#, fuzzy
 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 ""
-"Ne modifiez le <emphasis role=\"bold\">Périphérique de démarrage</emphasis> "
-"que si vous savez vraiment ce que vous faites."
+"un chargeur de démarrage GRUB2, soit dans le MBR (Master Boot Record) de "
+"votre premier disque dur, soit dans la partition  de démarrage BIOS."
 
-#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:38
-msgid "GRUB2-efi on UEFI systems"
+#. type: Content of: <section><section><itemizedlist><title>
+#: en/setupBootloader.xml:27
+#, fuzzy
+msgid "Grub2-efi on UEFI systems"
 msgstr "GRUB2-efi sur les systèmes UEFI"
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:39
-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 ""
-"Sur un système UEFI, l'interface utilisateur est légèrement différente, car "
-"vous ne pouvez pas choisir entre les options <emphasis role=\"bold\">avec</"
-"emphasis> ou <emphasis role=\"bold\">sans</emphasis> menu graphique."
 
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:42
+#. 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-"
-"setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
-"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 ""
 "Si Mageia est le seul système installé sur votre ordinateur, l'installeur "
 "crée une partition ESP (EFI System Partition) pour recueillir le chargeur de "
@@ -4652,152 +4953,91 @@ msgstr ""
 "soit possible d'avoir plusieurs ESP, une seule est suffisante (et "
 "conseillée), quel que soit le nombre de systèmes d'exploitation installés."
 
-#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:61
-msgid "Using a Mageia bootloader"
-msgstr "Utiliser un chargeur de démarrage Mageia"
-
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:62
-msgid ""
-"By default, and according to your system, Mageia writes one of the following:"
-msgstr "Par défaut, et en fonction de votre système, Mageia écrit soit :"
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:66
-msgid ""
-"a GRUB2 bootloader either into the MBR (Master Boot Record) of your first "
-"hard drive or in the BIOS boot partition."
-msgstr ""
-"un chargeur de démarrage GRUB2, soit dans le MBR (Master Boot Record) de "
-"votre premier disque dur, soit dans la partition  de démarrage BIOS."
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:70
-msgid "a GRUB2-efi bootloader into the ESP"
-msgstr "un chargeur de démarrage GRUB2-efi dans la partition ESP."
+#. type: Content of: <section><section><info><title>
+#: en/setupBootloader.xml:46
+#, fuzzy
+msgid "Bootloader Setup"
+msgstr "Interface du programme d'amorçage"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:73
-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."
-msgstr ""
-"Si vous avez déjà d'autres systèmes d'exploitation installés, Mageia tente "
-"de les ajouter à votre nouveau menu de démarrage. Si vous ne le voulez pas, "
-"cliquez sur <guibutton>Suivant</guibutton>, puis décochez l'option <emphasis "
-"role=\"bold\">Détecter les autres OS</emphasis>."
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:49
+msgid "Bootloader main options"
+msgstr "Principales options du chargeur de démarrage"
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:78
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:51
+#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata fileref=\"live-setupBootloader3.png\" align=\"center\"/> </"
-"imageobject>"
+"\"dx2-setupBootloader.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata fileref=\"live-setupBootloader.png\" xml:id=\"setupBootloader-"
+"im1\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
 "\"> <imagedata fileref=\"live-setupBootloader3.png\" align=\"center\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:87
-msgid "Using an existing bootloader"
-msgstr "Utiliser un chargeur de démarrage existant.  "
-
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:88
-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."
-msgstr ""
-"La procédure correcte pour ajouter votre système Mageia dans un chargeur de "
-"démarrage existant dépasse le cadre de cette documentation, néanmoins, dans "
-"la plupart des cas, cela impliquera d'exécuter le programme d'installation "
-"du chargeur de démarrage concerné, qui devrait le détecter et l'ajouter "
-"automatiquement. Voir la documentation du système d'exploitation en question."
-
-#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:95
-msgid "Using chain loading"
-msgstr "Utilisation du chargement en chaîne"
+#. 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\">Serveur</emphasis>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:96
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:63
 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>."
+"This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI "
+"systems will not see this option here."
 msgstr ""
-"Si vous ne souhaitez pas avoir une Mageia bootable, mais la chaîner depuis "
-"un autre SE, cliquez sur <guibutton>Suivant</guibutton>, puis sur "
-"<guibutton>Avancé</guibutton> et cochez la case <guilabel>Ne pas toucher à "
-"l'ESP ou au MBR</guilabel>."
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:101
-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-"
-"setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-setupBootloader4.png\" align="
-"\"center\"/> </imageobject>"
+#. 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\">Avancé</emphasis>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:108
-msgid ""
-"You will get a warning that the bootloader is missing, ignore it by clicking "
-"<guibutton>OK</guibutton>."
-msgstr ""
-"Vous allez avoir un avertissement disant que le chargeur de boot est "
-"manquant, ignorez le en cliquant sur <guibutton>OK</guibutton>."
+#. 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 "Ne modifier quelque chose qu'avec la certitude de bien faire."
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:111
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:72
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
-"imageobject>"
+"<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:117
-msgid "Options"
-msgstr "Options"
-
-#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:119
-msgid "First page"
-msgstr "Première page"
+"<emphasis role=\"bold\">Veuillez choisir le niveau de sécurité souhaité</"
+"emphasis>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:120
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:74
+#, 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."
+"This text box lets you set a delay, in seconds, before the default operating "
+"system is started up."
 msgstr ""
 "<guilabel>Délai avant l'activation du choix par défaut</guilabel> : cela "
 "vous permet de définir le délai, en secondes, avant le démarrage du système "
 "d'exploitation par défaut."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:122
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:78
+#, fuzzy
+msgid "<emphasis role=\"bold\">Security</emphasis>"
+msgstr "<emphasis role=\"bold\">Serveur</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:79
+#, fuzzy
 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."
+"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 ""
 "<guilabel>Sécurité</guilabel> : Il est possible ici d'établir un mot de "
 "passe pour le chargeur de démarrage. Dans ce cas, un nom d'utilisateur et un "
@@ -4805,35 +5045,51 @@ msgstr ""
 "modifier sa configuration. Le nom d’utilisateur est <emphasis role=\"bold"
 "\">root</emphasis> et le mot de passe est celui défini ci-après."
 
-#. 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:88
+#, fuzzy
+msgid "Choose a password for the bootloader (optional)"
 msgstr ""
 "<guilabel>Mot de passe</guilabel> : Indiquez un mot de passe pour le "
 "chargeur de démarrage."
 
-#. 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:91
+#, fuzzy
+msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
+msgstr "<emphasis role=\"bold\">Poste de travail</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:92
+#, fuzzy
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the password and DrakX will "
-"check that it matches with the one above."
+"Retype the password and DrakX will check that it matches with the one set "
+"above"
 msgstr ""
 "<guilabel>Mot de passe (vérification)</guilabel> : Entrez à nouveau le mot "
 "de passe et Drakx vérifiera qu'il est identique au précédent."
 
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:96 en/setupBootloader.xml:154
+#, fuzzy
+msgid "<emphasis>Advanced</emphasis>"
+msgstr "<emphasis role=\"bold\">Avancé</emphasis>"
+
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:127 en/setupBootloader.xml:159
-msgid "<guilabel>Advanced</guilabel>"
-msgstr "<guilabel>Avancé</guilabel>"
+#: en/setupBootloader.xml:99
+#, fuzzy
+msgid "<emphasis>Enable ACPI</emphasis>"
+msgstr "<emphasis>Générique</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:100
+#, fuzzy
 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)."
+"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 ""
 "<guilabel>Activer l'ACPI:</guilabel> ACPI (Advanced Configuration and Power "
 "Interface) est un standard de gestion de l'énergie. Il permet d'économiser "
@@ -4842,21 +5098,35 @@ msgstr ""
 "si vous pensez que l'ACPI peut être source de problèmes (comme des "
 "redémarrages aléatoires ou des blocages)."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:133
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:108
+#, fuzzy
+msgid "<emphasis>Enable SMP</emphasis>"
+msgstr "<emphasis>Générique</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:109
+#, fuzzy
 msgid ""
-"<guilabel>Enable SMP</guilabel>: This option enables/disables symmetric "
-"multiprocessing for multi core processors."
+"This option enables/disables symmetric multiprocessing for multi-core "
+"processors"
 msgstr ""
 "<guilabel>Activer le SMP</guilabel> : Cette option active/désactive le multi-"
 "processing symétique pour les processeurs multi-cœurs."
 
-#. 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:113
+#, fuzzy
+msgid "<emphasis>Enable APIC</emphasis>"
+msgstr "<emphasis>Générique</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:114
+#, fuzzy
 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."
+"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 ""
 "<guilabel>Enable APIC</guilabel> : Donne au système d'exploitation l'accès "
 "au Contrôleur Programmable Avancé des interruptions (Advanced Programmable "
@@ -4864,70 +5134,217 @@ msgstr ""
 "prioritaires plus complexes et la gestion des IRQ (Interrupt Request, "
 "Requête d'interruption) avancés."
 
-#. 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:120
+#, fuzzy
+msgid "<emphasis>Enable Local APIC</emphasis>"
+msgstr "<emphasis>Générique</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:121
+#, fuzzy
 msgid ""
-"<guilabel>Enable Local APIC</guilabel>: Local APIC manages all external "
-"interrupts for a specific processor in an SMP system."
+"Here you can set Local APIC, which manages all external interrupts for a "
+"specific processor in an SMP system"
 msgstr ""
 "<guilabel>Enable Local APIC</guilabel> : L'APIC local gère toutes les "
 "interruptions externes pour un processeur spécifique d'un système SMP."
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:143
-msgid "Next page"
-msgstr "Page suivante"
+#: en/setupBootloader.xml:127
+#, fuzzy
+msgid "Bootloader Configuration"
+msgstr "Configuration du son"
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:129
+#, fuzzy
+msgid ""
+"<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 align=\"center\" fileref="
+"\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata fileref=\"live-setupBootloader3.png\" align=\"center\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:139
+#, fuzzy
+msgid "<emphasis role=\"bold\">Default</emphasis>"
+msgstr "<emphasis role=\"bold\">Serveur</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:146
-msgid "<guilabel>Default:</guilabel> Operating system started up by default"
+#: en/setupBootloader.xml:140
+#, fuzzy
+msgid "The operating system to started up by default"
 msgstr ""
 "<guilabel>Choix par défaut</guilabel> Système d'exploitation démarré par "
 "défaut. "
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:150
+#: en/setupBootloader.xml:143
+#, fuzzy
+msgid "<emphasis role=\"bold\">Append</emphasis>"
+msgstr "<emphasis role=\"bold\">Avancé</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:144
+#, 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."
+"This option lets you pass information to the kernel or tell the kernel to "
+"give you more information as it boots"
 msgstr ""
 "<guilabel>Options passées au noyau</guilabel> Cette option permet de passer "
 "des informations au noyau ou de lui demander plus d'informations lors du "
 "démarrage. "
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:155
+#: en/setupBootloader.xml:148
+#, fuzzy
+msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
+msgstr "<emphasis role=\"bold\">Serveur</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:149
+#, fuzzy
 msgid ""
-"<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
-"\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
+"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 ""
-"<guilabel>Détecter les autres OS</guilabel> : Voir ci-dessus  <link linkend="
-"\"setupMageiaBootloader\">Utiliser un chargeur de démarrage Mageia</link>"
+"Si vous avez déjà d'autres systèmes d'exploitation installés, Mageia tente "
+"de les ajouter à votre nouveau menu de démarrage. Si vous ne le voulez pas, "
+"cliquez sur <guibutton>Suivant</guibutton>, puis décochez l'option <emphasis "
+"role=\"bold\">Détecter les autres OS</emphasis>."
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:159
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:156
+#, fuzzy
 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."
+"<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 align=\"center\" fileref="
+"\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata fileref=\"live-setupBootloader3.png\" align=\"center\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:166
+#, fuzzy
+msgid "<emphasis>Video mode</emphasis>"
+msgstr "<emphasis>Vendeur</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:167
+#, fuzzy
+msgid ""
+"This sets the screen size and colour depth to be used by the boot menu. If "
+"you click the down-triangle you will be offered other size and colour depth "
+"options."
 msgstr ""
 "<guilabel>Mode vidéo</guilabel> Définir ici la taille de l'écran et la "
 "profondeur de couleurs qui seront utilisés par le menu de démarrage. Si vous "
 "cliquez sur le triangle, des options supplémentaires de taille d'écran et de "
 "profondeur de couleurs vous seront proposées."
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:162
+#. 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>Vendeur</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:173
+msgid ""
+"Select this option if you don't want a bootable Mageia, but would rather "
+"chain-load it from another OS. You will get a warning that the bootloader is "
+"missing. Click<emphasis> Ok</emphasis> if you are sure you understand the "
+"implications, and wish to proceed."
+msgstr ""
+
+#. 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=\"live-setupBootloader5.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:188
+#, fuzzy
+msgid "Other Options"
+msgstr "Options"
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:190
+msgid "Using an existing bootloader"
+msgstr "Utiliser un chargeur de démarrage existant.  "
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:191
+#, fuzzy
+msgid ""
+"The exact procedure for adding Mageia to an existing bootloader is beyond "
+"the scope of this documentation. However in most cases it will involve "
+"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 ""
+"La procédure correcte pour ajouter votre système Mageia dans un chargeur de "
+"démarrage existant dépasse le cadre de cette documentation, néanmoins, dans "
+"la plupart des cas, cela impliquera d'exécuter le programme d'installation "
+"du chargeur de démarrage concerné, qui devrait le détecter et l'ajouter "
+"automatiquement. Voir la documentation du système d'exploitation en question."
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:199
+#, fuzzy
+msgid "Installing Without a Bootloader"
+msgstr "Utiliser un chargeur de démarrage Mageia"
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:200
+msgid ""
+"While you can opt to install Mageia without a bootloader (see section 2.1 "
+"Advanced), this is not recommended unless you absolutely know what you are "
+"doing, as without some form of bootloader your operating system will be "
+"unable to start."
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:207
+#, fuzzy
+msgid ""
+"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 ""
+"Pour cela, vous devez modifier manuellement le fichier /boot/grub2/custom."
+"cfg ou bien utiliser le logiciel <emphasis role=\"bold\">grub-customizer</"
+"emphasis> (disponible dans les dépôts Mageia)."
+
+#. 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 ""
-"<emphasis role=\"bold\">Ne pas toucher à l'ESP ni au MBR</emphasis> :  Voir "
-"ci-dessus <link linkend=\"setupChainLoading\">Utilisation du chargement en "
-"chaîne</link>"
+"Pour en savoir plus, consultez <link ns2:href=\"https://wiki.mageia.org/en/"
+"Grub2-efi_and_Mageia-fr\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia-"
+"fr</link>"
 
 #. type: Content of: <section><info><title>
-#: en/setupSCSI.xml:3
+#: en/setupSCSI.xml:10
 msgid "Setup SCSI"
 msgstr "Configuration du SCSI"
 
@@ -4939,17 +5356,20 @@ msgstr "Configuration du 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=\"dx2-setupSCSI.png\" align="
-"\"center\" xml:id=\"setupSCSI-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
 msgid ""
 "DrakX will normally detect hard disks correctly. However, with some older "
 "SCSI controllers it may be unable to determine the correct drivers to use "
@@ -4960,102 +5380,60 @@ msgstr ""
 "déterminer les bons pilotes et ne pas réussir à reconnaître le disque."
 
 #. 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 ""
 "Si cela se produit, vous devrez indiquer manuellement à DrakX quels disques "
 "SCSI sont présents."
 
-#. type: Content of: <section><para>
-#: en/setupSCSI.xml:35
-msgid "DrakX should then be able to configure the drive(s) correctly."
-msgstr "DrakX pourra alors les configurer correctement."
-
 #. type: Content of: <section><info><title>
-#: en/soundConfig.xml:3
+#: en/soundConfig.xml:10
 msgid "Sound Configuration"
 msgstr "Configuration du son"
 
 #.  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
-msgid ""
-"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
-"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
-"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
-
-#. type: Content of: <section><para>
-#: en/soundConfig.xml:14
+#: en/soundConfig.xml:20
+#, 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."
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-soundConfig.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"soundConfig-im1\"/> </imageobject>"
 msgstr ""
-"Cet écran affiche le nom du pilote que l'installeur a choisi pour votre "
-"carte son. Ce sera le pilote par défaut, s'il existe."
+"<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 ""
-"Le pilote par défaut devrait fontionner sans problème. Cependant, si après "
-"l'installation vous rencontrez des soucis, lancez la commande "
-"<command>draksound</command> ou bien démarrez cet outil via le CCM (Centre "
-"de Contrôle de Mageia), en sélectionnant l'onglet <guilabel>Matériel</"
-"guilabel> puis en cliquant sur <guilabel>Configuration du son</guilabel> en "
-"haut à droite de l'écran."
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:24
+#: 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 ""
-"Ensuite, dans l'écran de <emphasis role=\"bold\">draksound</emphasis>, ou de "
-"<emphasis role=\"bold\">Configuration du son</emphasis>, cliquez sur "
-"<guibutton>Dépannage</guibutton> pour obtenir des conseils utiles qui vous "
-"aideront à résoudre le problème."
 
 #. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:30
+#: en/soundConfig.xml:43
 msgid "Advanced"
 msgstr "Avancé"
 
-#. type: Content of: <section><section><para>
-#: en/soundConfig.xml:33
-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 ""
-"Cliquer sur <emphasis role=\"bold\"><guibutton>Avancé</guibutton></emphasis> "
-"sur cet écran, lors de l'installation, peut être utile s'il n'y a aucun "
-"pilote par défaut, que plusieurs pilotes sont disponibles mais que selon "
-"vous l'installeur a choisi le mauvais."
-
-#. type: Content of: <section><section><para>
-#: en/soundConfig.xml:38
-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 ""
-"Dans ce cas vous pouvez sélectionner un pilote différent après avoir cliqué "
-"sur <emphasis role=\"bold\"><guibutton>Choix d'un pilote</guibutton></"
-"emphasis>."
-
 #. type: Content of: <section><info><title>
-#: en/takeOverHdConfirm.xml:3
+#: en/takeOverHdConfirm.xml:10
 msgid "Confirm hard disk to be formatted"
 msgstr "Confirmer le disque dur à formater"
 
@@ -5065,75 +5443,79 @@ msgstr "Confirmer le disque dur à formater"
 #.     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 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-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"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 ""
 "Cliquez sur <guibutton>Précédent</guibutton> en cas de doute sur votre choix."
 
-#. 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 ""
 "Cliquez sur <guibutton>Suivant</guibutton> pour continuer si vous êtes sûr "
 "de vouloir effacer toutes les partitions, tout système d'exploitation et "
 "toutes les données présents sur ce disque dur."
 
 #. type: Content of: <section><info><title>
-#: en/testing.xml:9
+#: en/testing.xml:3
 msgid "Testing Mageia as Live system"
 msgstr "Tester Mageia comme système \"Live\""
 
 #. type: Content of: <section><section><info><title>
-#: en/testing.xml:14
+#: en/testing.xml:8
 msgid "Live mode"
 msgstr "Mode LIVE"
 
+#. 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 ""
-"Vous obtenez cet écran si vous sélectionnez \"Démarrer Mageia\". Sinon, vous "
-"obtenez l'étape de \"<link linkend=\"doPartitionDisks\">Partitionnement</"
-"link>\""
-
 #. type: Content of: <section><section><section><info><title>
-#: en/testing.xml:28
+#: en/testing.xml:21
 msgid "Testing hardware"
 msgstr "Contrôle du matériel"
 
 #. 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 ""
 "L'un des objectifs du mode Live est de tester le matériel afin de savoir si "
 "Mageia le gère correctement. Vous pouvez vérifier si tous les périphériques "
@@ -5141,84 +5523,91 @@ msgstr ""
 "pouvez tester la plupart des périphériques actuels :"
 
 #. 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 "interface réseau : configurez-la avec 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 "carte grahique : si vous voyez l'écran précédent, c'est déjà correct."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:47
+#: en/testing.xml:40
 msgid "webcam:"
 msgstr "webcam :"
 
 #. 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 "son : un jingle a déjà été joué"
 
 #. 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 "imprimante : la configuer et imprimer une page de test"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:59
+#: en/testing.xml:52
 msgid "scanner: scan a document from ..."
 msgstr "scanner : numériser un document à partir de ..."
 
 #. 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 ""
 "Si tout vous semble correct, vous pouvez lancer l'installation. Sinon, vous "
 "pouvez sortir du programme avec le bouton Quitter."
 
-#. 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 ""
 "La configuration que vous avez réalisée est conservée pour l'installation."
 
 #. type: Content of: <section><section><section><info><title>
-#: en/testing.xml:72
+#: en/testing.xml:68
 msgid "Launch installation"
 msgstr "Lancer l'installation"
 
-#. 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 ""
 "Pour lancer l'installation de Mageia LiveCD ou LiveDVD sur le disque dur "
 "(mécanique ou SSD), cliquez simplement sur l'icône \"Installer sur le disque "
 "dur\". Vous obtiendrez cet écran, et ensuite l'étape \"<link linkend="
 "\"doPartitionDisks\">Partitioning</link>\" pour l'installation directe."
 
+#. 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 "Désinstaller Mageia"
 
 #. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:9
+#: en/uninstall-Mageia.xml:18
 msgid ""
 "If Mageia didn't convince you or you can't install it correctly - in short "
 "you want get rid of it - that is your right and Mageia also gives you the "
@@ -5230,12 +5619,13 @@ msgstr ""
 "le cas de tous les systèmes d'exploitation."
 
 #. 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 ""
 "Après avoir sauvegardé vos données, redémarrez sur votre DVD d'installation "
 "de Mageia et sélectionnez <emphasis role=\"bold\">Système de secours</"
@@ -5244,14 +5634,18 @@ msgstr ""
 "sans menu pour choisir un autre système d'exploitation. "
 
 #. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:19
-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."
+#: en/uninstall-Mageia.xml:28
+#, fuzzy
+msgid ""
+"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 ""
 "Pour récupérer l'espace utilisé par les partitions Mageia avec Windows, "
 "cliquez sur <code>Démarrer -> Panneau de configuration -> Outils "
@@ -5262,17 +5656,18 @@ msgstr ""
 "sélectionnez <guibutton>Supprimer</guibutton>pour libérer l'espace disque."
 
 #. 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 ""
 "Si vous utilisez Windows XP, vous pouvez créer une nouvelle partition et la "
 "formater (en FAT32 ou en NTFS). Vous obtiendrez alors une lettre de "
 "partition."
 
 #. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:30
+#: en/uninstall-Mageia.xml:49
 msgid ""
 "If you have Vista or 7, you have one more possibility, you can extend the "
 "existing partition that is at the left of the freed space. There are other "
@@ -5289,34 +5684,50 @@ msgstr ""
 "sauvegardées."
 
 #. type: Content of: <section><info><title>
-#: en/unused.xml:9
+#: en/unused.xml:3
 msgid "Keep or delete unused material"
 msgstr "Conserver ou supprimer le matériel inutilisé"
 
+#. 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=\"reboot-im1\" fileref=\"live-"
+"reboot.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 ""
 "Pendant cette étape, l'installateur recherche les paquetages inutilisés "
 "(matériel, langues). Il vous propose ensuite de les supprimer. Il est "
 "judicieux d'accepter, excepté si vous préparez une installation s'exécutant "
 "sur des configurations matériel différentes."
 
+#. 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>"
@@ -5325,11 +5736,835 @@ 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 ""
 "La prochaine étape consistera à copier les fichiers sur le disque dur. Ceci "
 "peut prendre quelques minutes. A la fin, vous verrez s'afficher un écran "
 "vide pendant un certain temps, c'est normal."
+
+#~ msgid "User and Superuser Management"
+#~ msgstr "Gestion de l'Utilisateur et du Superutilisateur"
+
+#~ msgid ""
+#~ "Every partition is shown to the left as: <emphasis role=\"bold\">Device "
+#~ "(capacity, mount point, type).</emphasis>"
+#~ msgstr ""
+#~ "Chaque partition est présentée comme suit : <emphasis role=\"bold\">"
+#~ "\"Périphérique\" (\"Capacité\", \"Point de montage\", \"Type\").</"
+#~ "emphasis>"
+
+#~ 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>)."
+#~ msgstr ""
+#~ "<emphasis role=\"bold\">Périphérique</emphasis>, est constitué de : "
+#~ "<emphasis role=\"bold\">disque dur</emphasis>, [<emphasis role=\"bold"
+#~ "\">nom du disque dur</emphasis> (lettre)], <emphasis role=\"bold\">numéro "
+#~ "de partition</emphasis> (par exemple, <emphasis role=\"bold\">sda5</"
+#~ "emphasis>)."
+
+#~ msgid "In advanced tab, you will find more options about clock settings."
+#~ msgstr ""
+#~ "Dans l'onglet Avancé, vous trouverez plus d'options sur le réglage de "
+#~ "l'heure."
+
+#~ msgid "From a disc"
+#~ msgstr "À partir d'un disque dur"
+
+#~ 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 ""
+#~ "Vous pouvez démarrer directement depuis le média habituellement utilisé "
+#~ "pour graver vos images (CD-ROM, DVD-ROM...). Vous avez juste besoin de "
+#~ "l'insérer dans votre lecteur CD/DVD pour que le chargeur d'amorçage "
+#~ "démarre l'installation automatiquement après le redémarrage de "
+#~ "l'ordinateur. Si cela n'arrive pas, vous devrez peut-être reconfigurer "
+#~ "votre BIOS ou appuyer sur une touche (ex : F8) afin de choisir le "
+#~ "périphérique sur lequel l'ordinateur devra démarrer."
+
+#~ msgid ""
+#~ "According to which hardware you have, and how it is configured, you get "
+#~ "either one or another of the two screens below."
+#~ msgstr ""
+#~ "En fonction du matériel dont vous disposez, et de la manière dont il est "
+#~ "configuré, vous obtenez l'un ou l'autre des deux écrans ci-dessous."
+
+#~ msgid "From a USB device"
+#~ msgstr "A partir d'un périphérique USB"
+
+#~ 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 ""
+#~ "Vous pouvez démarrer depuis le périphérique USB sur lequel se trouve "
+#~ "votre image ISO. Selon les paramètres de votre BIOS, l'ordinateur "
+#~ "démarrera peut-être directement sur le périphérique USB déjà inséré dans "
+#~ "le port. Si cela n'arrive pas, vous devrez peut-être reconfigurer votre "
+#~ "BIOS ou appuyer sur une touche (ex : F8) afin de choisir le périphérique "
+#~ "sur lequel l'ordinateur devra démarrer."
+
+#~ 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 "Dans le menu du milieu, vous avez le choix entre trois actions : "
+
+#~ 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 ""
+#~ "Démarrer à partir du disque dur : ce choix vous permet de démarrer sur le "
+#~ "disque dur, comme habituellement, lorsque aucun media (CD/DVD ou clé USB) "
+#~ "n'est connecté. (Ne fonctionne pas avec Mageia 5)."
+
+#~ msgid "In the bottom menu, are the Boot Options:"
+#~ msgstr "Dans le menu inférieur, vous disposez des options de démarrage :"
+
+#~ msgid ""
+#~ "F1 - Help. Explain the options \"splash\", \"apm\", \"acpi\" and \"Ide\""
+#~ msgstr ""
+#~ "F1 - Aide. Explique les options \"splash\", \"apm\", \"acpi\" et \"Ide\""
+
+#~ msgid "F2 - Language. Choose the display language of the screens."
+#~ msgstr "F2 - Langue. Sélectionner la langue à afficher sur les écrans."
+
+#~ msgid ""
+#~ "F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728"
+#~ msgstr ""
+#~ "F3 - Résolution de l'écran. Sélectionner entre texte, 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 - Pilote. Oui ou Non. Le système sait si un disque supplémentaire "
+#~ "contient une mise à jour de pilote et demandera son insertion lors du "
+#~ "processus d'installation."
+
+#~ msgid ""
+#~ "F6 - Kernel options. This is a way to specify options according to your "
+#~ "hardware and the drivers to use."
+#~ msgstr ""
+#~ "F6 - Options du Noyau. C'est un moyen pour préciser les options liées à "
+#~ "votre matériel et aux pilotes à utiliser."
+
+#~ msgid "First screen while booting on UEFI system from disk"
+#~ msgstr ""
+#~ "Premier écran lors du démarrage à partir du disque dur sur les systèmes "
+#~ "UEFI"
+
+#~ msgid ""
+#~ "You have only the choice to run Mageia in Live mode (first choice)  or to "
+#~ "process the installation (second choice)."
+#~ msgstr ""
+#~ "Vous avez le choix entre lancer Mageia en mode Live (premier choix) ou "
+#~ "effectuer son installation (second choix)."
+
+#~ 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 ""
+#~ "Dans chaque cas, les premières étapes seront les mêmes pour sélectionner "
+#~ "la langue, le fuseau horaire et le clavier, puis le processus diffère "
+#~ "ensuite, avec <link linkend=\"testing\">des étapes complémentaires en "
+#~ "mode Live</link>."
+
+#~ msgid ""
+#~ "Depending on your selection here, you may be offered further screens to "
+#~ "fine-tune your choice."
+#~ msgstr ""
+#~ "En fonction des sélections faites ici, des écrans supplémentaires peuvent "
+#~ "apparaître pour préciser vos choix."
+
+#~ msgid "The settings DrakX chose are usually good."
+#~ msgstr "Les paramètres choisis par DrakX sont généralement corrects."
+
+#~ 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=\"configureX_card_list-"
+#~ "im1\" align=\"center\" fileref=\"dx2-configureX_card_list.png\" revision="
+#~ "\"1\"/> </imageobject>"
+
+#~ 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 ""
+#~ "Le dépôt <emphasis role=\"bold\">Nonfree</emphasis> doit être "
+#~ "explicitement activé pour y accéder. Si vous ne l'avez pas activé lors de "
+#~ "l'installation, vous pourrez le faire après votre premier redémarrage."
+
+#~ 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=\"configureX_chooser-im1\" "
+#~ "fileref=\"dx2-configureX_chooser.png\" align=\"center\" revision=\"1\"/> "
+#~ "</imageobject>"
+
+#~ msgid ""
+#~ "<emphasis><guibutton>Graphic card</guibutton></emphasis>: Choose your "
+#~ "card from the list if needed."
+#~ msgstr ""
+#~ "<emphasis><guibutton>Carte Graphique </guibutton></emphasis>: Si besoin, "
+#~ "choisir la carte dans la liste."
+
+#~ msgid "Incorrect refresh rates may damage your monitor"
+#~ msgstr ""
+#~ "Le moniteur peut être endommagé par des taux de rafraîchissement "
+#~ "incorrects."
+
+#~ 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=\"configureX_monitor-im1\" "
+#~ "fileref=\"dx2-configureX_monitor.png\" align=\"center\" revision=\"1\"/> "
+#~ "</imageobject>"
+
+#~ msgid "<emphasis>Custom</emphasis>"
+#~ msgstr "<emphasis>Personnalisé</emphasis>"
+
+#~ msgid "<emphasis>Plug 'n Play</emphasis>"
+#~ msgstr "<emphasis>Plug 'n Play</emphasis>"
+
+#~ msgid "the monitor manufacturers name"
+#~ msgstr "le nom du fabricant du moniteur"
+
+#~ msgid "the monitor description"
+#~ msgstr "la description du moniteur."
+
+#~ 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 ""
+#~ "Cliquer sur <guibutton>Terminer</guibutton> quand tout est correct.."
+
+#~ 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-"
+#~ "doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" "
+#~ "align=\"center\"/> </imageobject>"
+
+#~ msgid "Use Free Space"
+#~ msgstr "Utiliser l'espace libre"
+
+#~ msgid "Use Free Space on a Windows Partition"
+#~ msgstr "Utiliser l'espace libre sur une partition Microsoft Windows"
+
+#~ msgid ""
+#~ "If you have unused space on an existing Windows partition, the installer "
+#~ "may offer to use it."
+#~ msgstr ""
+#~ "Si une partition Windows existante comporte de l'espace inutilisé, "
+#~ "l'installateur propose de l'utiliser."
+
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" "
+#~ "align=\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" "
+#~ "align=\"center\"/> </imageobject>"
+
+#~ msgid "Erase and use Entire Disk."
+#~ msgstr "Effacer et utiliser le disque tout entier"
+
+#~ msgid ""
+#~ "Note! This will erase ALL data on the selected hard drive. Take care!"
+#~ msgstr ""
+#~ "Attention ! Cela effacera TOUTES les données sur le disque sélectionné. "
+#~ "Faites attention !"
+
+#~ msgid "Custom disk partitioning"
+#~ msgstr "Partitionnement de disque personnalisé"
+
+#~ 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 ""
+#~ "Cela signifie que pour un espace disponible de 160 Go et plus, "
+#~ "l'installeur créera trois partitions : 50 Go pour <emphasis role=\"bold"
+#~ "\">/</emphasis>, 4 Go pour le <emphasis role=\"bold\">SWAP</emphasis> et "
+#~ "le reste pour <emphasis role=\"bold\">/home</emphasis>."
+
+#~ 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 align=\"center\" fileref="
+#~ "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition="
+#~ "\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid "January 2015"
+#~ msgstr "Janvier 2015"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+
+#~ msgid "Using a Mageia DVD"
+#~ msgstr "Utilisation d'un DVD Mageia"
+
+#~ 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 ""
+#~ "Voici les écrans d'accueil par défaut lors de l'utilisation du DVD "
+#~ "Mageia, le premier pour un système UEFI, le second pour un système avec "
+#~ "avec le mode Legacy :"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
+
+#~ msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
+
+#~ 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):"
+#~ msgstr ""
+#~ "Depuis cet écran, il est possible paramétrer des préférences (notez que "
+#~ "les options <emphasis role=\"bold\">F1</emphasis> à <emphasis role=\"bold"
+#~ "\">F6</emphasis> ne sont disponibles que pour les systèmes Legacy) :"
+
+#~ msgid ""
+#~ "Press <emphasis role=\"bold\">F2</emphasis> to have the installer use a "
+#~ "specific language for the installation."
+#~ msgstr ""
+#~ "L'option <emphasis role=\"bold\">F2</emphasis> permet de choisir une "
+#~ "langue pour l'installation."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "Use the arrow keys to select the language then press <emphasis role=\"bold"
+#~ "\">Enter</emphasis>."
+#~ msgstr ""
+#~ "Utilisez les flèches haut et bas pour sélectionner la langue puis "
+#~ "<emphasis role=\"bold\">Entrée</emphasis>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+
+#~ msgid "Default: It doesn't alter anything in the default options."
+#~ msgstr "Default. Cela ne modifie rien dans les options par défaut."
+
+#~ msgid ""
+#~ "Safe Settings: Priority is given to the safer options at the price of a "
+#~ "performance detriment."
+#~ msgstr ""
+#~ "Safe Settings: la priorité est donnée à la sécurité au détriment des "
+#~ "performances."
+
+#~ msgid ""
+#~ "When you select one of these entries, it modifies the default options "
+#~ "displayed in the <guilabel>Boot Options</guilabel> line."
+#~ msgstr ""
+#~ "Si vous sélectionnez l'une de ces entrées, cela modifie les options par "
+#~ "défaut affichées dans la ligne <guilabel>Options de démarrage</guilabel>."
+
+#~ 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 ""
+#~ "Dans certaines versions de Mageia, il peut arriver que les entrées "
+#~ "sélectionnées avec la touche <emphasis role=\"bold\">F6</emphasis> "
+#~ "n'apparaissent pas dans la ligne <guilabel>Options de démarrage</"
+#~ "guilabel>, cependant elles sont bien prises en compte."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+
+#~ 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 ""
+#~ "Presser la touche <emphasis role=\"bold\">F1</emphasis> ouvre une fenêtre "
+#~ "d'aide avec diverses options d'amorçage. Sélectionnez-en une avec les "
+#~ "touches directionnelles, puis pressez <emphasis role=\"bold\">Entrée</"
+#~ "emphasis> pour obtenir plus de détails ou la touche d'échappement "
+#~ "<emphasis>Esc</emphasis> pour revenir vers l'écran d'accueil."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+
+#~ 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 ""
+#~ "Vue détaillée de l'option Splash. Appuyez sur <emphasis role=\"bold"
+#~ "\">Esc</emphasis> ou sélectionnez <guilabel>Retour aux options de "
+#~ "démarrage</guilabel> pour revenir à la liste des options. Ces options "
+#~ "peuvent être ajoutées à la main à la ligne <guilabel>Options de "
+#~ "démarrage</guilabel>."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "The help is translated in the chosen language with <emphasis role=\"bold"
+#~ "\">F2</emphasis>."
+#~ msgstr ""
+#~ "L'aide est traduite dans la langue sélectionnée en pressant la touche "
+#~ "<emphasis role=\"bold\">F2</emphasis>."
+
+#~ 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 ""
+#~ "Pour plus d'information sur les options du noyau sur les systèmes en mode "
+#~ "Legacy ou avec UEFI, consulter : <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 "Sélection des média (Nonfree)"
+
+#~ 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=\"media_selection-im1\" "
+#~ "align=\"center\" revision=\"1\" fileref=\"dx2-media_selection.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid "Summary of miscellaneous parameters"
+#~ msgstr "Résumé des différents paramètres"
+
+#~ msgid "<guilabel>Timezone</guilabel>"
+#~ msgstr "<guilabel>Fuseau horaire :</guilabel>"
+
+#~ msgid "<guilabel>Country / Region</guilabel>"
+#~ msgstr "<guilabel>Pays / Région :</guilabel>"
+
+#~ msgid "<guilabel>Bootloader</guilabel>"
+#~ msgstr "<guilabel>Chargeur de démarrage : </guilabel>"
+
+#~ msgid "For more information, see <xref linkend=\"setupBootloader\"/>"
+#~ msgstr "Pour plus d'informations, voir <xref linkend=\"setupBootloader\"/>"
+
+#~ msgid "<guilabel>User management</guilabel>"
+#~ msgstr "<guilabel>Gestion de l'utilisateur :</guilabel>"
+
+#~ msgid "<guilabel>Services</guilabel>:"
+#~ msgstr "<guilabel>Services :</guilabel>"
+
+#~ msgid "For more information, see <xref linkend=\"configureServices\"/>"
+#~ msgstr ""
+#~ "Pour plus d'informations, voir <xref linkend=\"configureServices\"/>"
+
+#~ msgid "<guilabel>Keyboard</guilabel>:"
+#~ msgstr "<guilabel>Clavier </guilabel>:"
+
+#~ msgid "<guilabel>Mouse</guilabel>:"
+#~ msgstr "<guilabel>Souris :</guilabel>"
+
+#~ msgid "<guilabel>Sound card</guilabel>:"
+#~ msgstr "<guilabel>Carte son :</guilabel>"
+
+#~ 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 ""
+#~ "L'installeur sélectionne le pilote par défaut, s'il en existe un. La "
+#~ "possibilité de sélectionner un pilote différent n'est donnée que s'il "
+#~ "existe plus d'un pilote pour votre carte, mais qu'aucun d'entre eux n'est "
+#~ "celui par défaut."
+
+#~ msgid "<guilabel>Graphical interface</guilabel>:"
+#~ msgstr "<guilabel>Interface graphique : </guilabel>"
+
+#~ msgid "<guilabel>Network</guilabel>:"
+#~ msgstr "<guilabel>Réseau :</guilabel>"
+
+#~ msgid "<guilabel>Proxies</guilabel>:"
+#~ msgstr "<guilabel>Proxies</guilabel>:"
+
+#~ msgid "<guilabel>Security Level</guilabel>:"
+#~ msgstr "<guilabel>Niveau de sécurité</guilabel> :"
+
+#~ msgid "Check the option which best suits your usage."
+#~ msgstr ""
+#~ "Cocher l'option qui convient le mieux à votre utilisation de l'ordinateur."
+
+#~ msgid "<guilabel>Firewall</guilabel>:"
+#~ msgstr "<guilabel>Pare-feu</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 ""
+#~ "Un pare-feu tente de se dresser en barrière entre les données importantes "
+#~ "sur l'ordinateur et les voyous qui tournent autour, depuis internet, et "
+#~ "qui cherchent à les compromettre ou à les voler."
+
+#~ 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 ""
+#~ "Selectionnez les services que vous souhaitez voir accéder à votre "
+#~ "système. Votre choix dépend de l'utilisation envisagée de l'ordinateur. "
+#~ "Pour plus d'informations, voir <xref linkend=\"firewall\"/>."
+
+#~ 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=\"securityLevel-im1\" "
+#~ "align=\"center\" fileref=\"dx2-securityLevel.png\" revision=\"1\"/> </"
+#~ "imageobject>"
+
+#~ msgid "64 bit architecture only."
+#~ msgstr "Architecture 64 bits uniquement."
+
+#~ 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, sha1sum et sha512 sont des outils pour vérifier l'intégrité des "
+#~ "images ISO. Utiliser uniquement l'un de ces outils. Conserver l'un "
+#~ "d'entre eux <link linkend=\"integrity\">pour un usage à venir</link>. La "
+#~ "fenêtre suivante apparaît alors :"
+
+#~ msgid "Select the Save File option, then, click OK."
+#~ msgstr "Choisissez l'option Enregistrer le fichier, puis cliquez sur OK."
+
+#~ msgid ""
+#~ "To recover the original capacity, you must redo partitioning and re-"
+#~ "format the USB stick."
+#~ msgstr ""
+#~ "Afin de récupérer la capacité originelle de la clé USB, vous devez "
+#~ "supprimer le partitionnement et reformater la clé."
+
+#~ msgid "Install"
+#~ msgstr "Installation"
+
+#~ msgid "Upgrade"
+#~ msgstr "Mise à jour"
+
+#~ 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 ""
+#~ "Si vous décidez d'interrompre l'installation en cours de route, il est "
+#~ "possible de redémarrer, mais réfléchissez bien avant de le faire. Une "
+#~ "fois que la partition aura été formatée, ou que les mises à jour ont "
+#~ "commencé à être installées, votre ordinateur n'est plus dans le même "
+#~ "état, et le redémarrer peut très bien rendre le système inutilisable. Si "
+#~ "malgré tout, vous êtes sûr de vouloir redémarrer, ouvrez une console en "
+#~ "appuyant simultanément sur <guilabel>Alt+Ctrl+F2</guilabel>. Ensuite, "
+#~ "appuyez sur <guilabel>Alt+Ctrl+Suppr</guilabel> simultanément pour "
+#~ "redémarrer."
+
+#~ 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 ""
+#~ "On vous demandera de régler le clavier que vous désirez utiliser dans "
+#~ "Mageia. Celui par défaut est sélectionné en fonction de votre langue et "
+#~ "de votre fuseau hoaraire précédemment choisis."
+
+#~ msgid "Mageia uses UTF-8 (Unicode) support by default."
+#~ msgstr "Mageia utilise par défaut le codage UTF-8 (Unicode)"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-selectMouse.png\" align=\"center\" "
+#~ "format=\"PNG\" > </imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectMouse.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"selectMouse-im1\"></imagedata> </"
+#~ "imageobject>"
+
+#~ msgid "By default, Mageia uses exclusively:"
+#~ msgstr "Par défaut, Mageia utilise exclusivement :"
+
+#~ msgid "GRUB2-efi for a UEFI system."
+#~ msgstr "GRUB2-efi pour un système UEFI."
+
+#~ msgid "The Mageia graphical menus are nice :)"
+#~ msgstr "Les menus graphiques de Mageia sont superbes :) "
+
+#~ 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 fileref=\"dx2-"
+#~ "setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata xml:id=\"setupBootloader-im1\" fileref="
+#~ "\"live-setupBootloader.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "Don't modify the <emphasis role=\"bold\">Boot Device</emphasis> unless "
+#~ "you really know what you are doing."
+#~ msgstr ""
+#~ "Ne modifiez le <emphasis role=\"bold\">Périphérique de démarrage</"
+#~ "emphasis> que si vous savez vraiment ce que vous faites."
+
+#~ 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 ""
+#~ "Sur un système UEFI, l'interface utilisateur est légèrement différente, "
+#~ "car vous ne pouvez pas choisir entre les options <emphasis role=\"bold"
+#~ "\">avec</emphasis> ou <emphasis role=\"bold\">sans</emphasis> menu "
+#~ "graphique."
+
+#~ 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-"
+#~ "setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "By default, and according to your system, Mageia writes one of the "
+#~ "following:"
+#~ msgstr "Par défaut, et en fonction de votre système, Mageia écrit soit :"
+
+#~ msgid "a GRUB2-efi bootloader into the ESP"
+#~ msgstr "un chargeur de démarrage GRUB2-efi dans la partition ESP."
+
+#~ msgid "Using chain loading"
+#~ msgstr "Utilisation du chargement en chaîne"
+
+#~ 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>."
+#~ msgstr ""
+#~ "Si vous ne souhaitez pas avoir une Mageia bootable, mais la chaîner "
+#~ "depuis un autre SE, cliquez sur <guibutton>Suivant</guibutton>, puis sur "
+#~ "<guibutton>Avancé</guibutton> et cochez la case <guilabel>Ne pas toucher "
+#~ "à l'ESP ou au MBR</guilabel>."
+
+#~ 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-"
+#~ "setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-setupBootloader4.png\" "
+#~ "align=\"center\"/> </imageobject>"
+
+#~ msgid ""
+#~ "You will get a warning that the bootloader is missing, ignore it by "
+#~ "clicking <guibutton>OK</guibutton>."
+#~ msgstr ""
+#~ "Vous allez avoir un avertissement disant que le chargeur de boot est "
+#~ "manquant, ignorez le en cliquant sur <guibutton>OK</guibutton>."
+
+#~ msgid "First page"
+#~ msgstr "Première page"
+
+#~ msgid "<guilabel>Advanced</guilabel>"
+#~ msgstr "<guilabel>Avancé</guilabel>"
+
+#~ msgid "Next page"
+#~ msgstr "Page suivante"
+
+#~ msgid ""
+#~ "<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
+#~ "\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
+#~ msgstr ""
+#~ "<guilabel>Détecter les autres OS</guilabel> : Voir ci-dessus  <link "
+#~ "linkend=\"setupMageiaBootloader\">Utiliser un chargeur de démarrage "
+#~ "Mageia</link>"
+
+#~ msgid ""
+#~ "<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above "
+#~ "<link linkend=\"setupChainLoading\">Using the chain loading</link>"
+#~ msgstr ""
+#~ "<emphasis role=\"bold\">Ne pas toucher à l'ESP ni au MBR</emphasis> :  "
+#~ "Voir ci-dessus <link linkend=\"setupChainLoading\">Utilisation du "
+#~ "chargement en chaîne</link>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-setupSCSI.png\" "
+#~ "align=\"center\" xml:id=\"setupSCSI-im1\" revision=\"1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-setupSCSI.png\" "
+#~ "align=\"center\" xml:id=\"setupSCSI-im1\" revision=\"1\"/> </imageobject>"
+
+#~ msgid "DrakX should then be able to configure the drive(s) correctly."
+#~ msgstr "DrakX pourra alors les configurer correctement."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" "
+#~ "xml:id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" "
+#~ "xml:id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
+
+#~ 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 ""
+#~ "Cet écran affiche le nom du pilote que l'installeur a choisi pour votre "
+#~ "carte son. Ce sera le pilote par défaut, s'il existe."
+
+#~ 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 ""
+#~ "Le pilote par défaut devrait fontionner sans problème. Cependant, si "
+#~ "après l'installation vous rencontrez des soucis, lancez la commande "
+#~ "<command>draksound</command> ou bien démarrez cet outil via le CCM "
+#~ "(Centre de Contrôle de Mageia), en sélectionnant l'onglet "
+#~ "<guilabel>Matériel</guilabel> puis en cliquant sur "
+#~ "<guilabel>Configuration du son</guilabel> en haut à droite de l'écran."
+
+#~ 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 ""
+#~ "Ensuite, dans l'écran de <emphasis role=\"bold\">draksound</emphasis>, ou "
+#~ "de <emphasis role=\"bold\">Configuration du son</emphasis>, cliquez sur "
+#~ "<guibutton>Dépannage</guibutton> pour obtenir des conseils utiles qui "
+#~ "vous aideront à résoudre le problème."
+
+#~ 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 ""
+#~ "Cliquer sur <emphasis role=\"bold\"><guibutton>Avancé</guibutton></"
+#~ "emphasis> sur cet écran, lors de l'installation, peut être utile s'il n'y "
+#~ "a aucun pilote par défaut, que plusieurs pilotes sont disponibles mais "
+#~ "que selon vous l'installeur a choisi le mauvais."
+
+#~ 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 ""
+#~ "Dans ce cas vous pouvez sélectionner un pilote différent après avoir "
+#~ "cliqué sur <emphasis role=\"bold\"><guibutton>Choix d'un pilote</"
+#~ "guibutton></emphasis>."
+
+#~ 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 format=\"PNG\" fileref=\"live-"
+#~ "takeOverHdConfirm.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"classical\"> <imagedata format=\"PNG\" fileref=\"dx2-"
+#~ "takeOverHdConfirm.png\" align=\"center\"/> </imageobject>"
+
+#~ msgid ""
+#~ "You get this screen if you selected \"Boot Mageia\". If not, you get the "
+#~ "\"<link linkend=\"doPartitionDisks\">Partitioning</link> step\""
+#~ msgstr ""
+#~ "Vous obtenez cet écran si vous sélectionnez \"Démarrer Mageia\". Sinon, "
+#~ "vous obtenez l'étape de \"<link linkend=\"doPartitionDisks"
+#~ "\">Partitionnement</link>\""
diff --git a/docs/docs/stable/installer/hi.po b/docs/docs/stable/installer/hi.po
index 9eedbc6e..98f585db 100644
--- a/docs/docs/stable/installer/hi.po
+++ b/docs/docs/stable/installer/hi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2018-04-19 16:32+0300\n"
+"POT-Creation-Date: 2019-01-06 12:43+0200\n"
 "PO-Revision-Date: 2018-05-17 17:40+0000\n"
 "Last-Translator: Panwar108 <caspian7pena@gmail.com>\n"
 "Language-Team: Hindi (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -20,12 +20,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Content of: <section><info><title>
-#: en/acceptLicense.xml:25
+#: en/acceptLicense.xml:31
 msgid "License and Release Notes"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/acceptLicense.xml:29
+#: en/acceptLicense.xml:35
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
 "\"acceptLicense-im1\" fileref=\"dx2-license.png\" align=\"center\" revision="
@@ -40,67 +40,69 @@ msgstr ""
 "\"center\" condition=\"live\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/acceptLicense.xml:40
+#: en/acceptLicense.xml:46
 msgid "License Agreement"
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/acceptLicense.xml:43
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/acceptLicense.xml:51
 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 ""
 
-#. type: Content of: <section><section><para>
-#: en/acceptLicense.xml:46
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/acceptLicense.xml:56
 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 ""
 
-#. type: Content of: <section><section><para>
-#: en/acceptLicense.xml:50
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/acceptLicense.xml:61
 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 ""
 
 #. type: Content of: <section><section><para>
-#: en/acceptLicense.xml:53
+#: en/acceptLicense.xml:66
 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 ""
 
 #. type: Content of: <section><section><info><title>
-#: en/acceptLicense.xml:63
+#: en/acceptLicense.xml:76
 msgid "Release Notes"
 msgstr "रिलीज़ नोट्स"
 
 #. type: Content of: <section><section><para>
-#: en/acceptLicense.xml:70
+#: en/acceptLicense.xml:83
 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 ""
 
 #. 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 "hi"
 
 #. type: Content of: <section><info><title>
 #: en/add_supplemental_media.xml:3
-msgid "Media Selection (Configure Supplemental Installation Media)"
+msgid "Supplemental Installation Media"
 msgstr ""
 
 #.  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
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-add_supplemental_media."
 "png\" xml:id=\"dx2-add_supplemental_media-im1\" align=\"center\" revision="
@@ -108,59 +110,64 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:19
+#: en/add_supplemental_media.xml:23
 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 ""
 
 #. 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 ""
 
 #. 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
+msgid "Choosing and activating the network, if not already up."
 msgstr ""
 
 #. type: Content of: <section><orderedlist><listitem><para>
-#: en/add_supplemental_media.xml:32
+#: en/add_supplemental_media.xml:36
 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 ""
 
 #. type: Content of: <section><note><para>
-#: en/add_supplemental_media.xml:42
+#: en/add_supplemental_media.xml:46
 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/addUser.xml:3
-msgid "User and Superuser Management"
+#: en/addUser.xml:9
+msgid "User Management"
 msgstr ""
 
 #.  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 format=\"PNG\" fileref="
 "\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -168,89 +175,104 @@ msgstr ""
 "\"PNG\" 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 ""
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:24
+#: en/addUser.xml:40
 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 ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:34
+#: en/addUser.xml:49
 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 ""
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:42
+#: en/addUser.xml:57
 msgid "Enter a user"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:45
+#: en/addUser.xml:60
 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 ""
 
 #. 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
+msgid "<emphasis role=\"bold\">Icon</emphasis>"
 msgstr ""
 
 #. 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:69
+msgid "Click on this button if you want to change the user's icon"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/addUser.xml:74
+msgid "<emphasis role=\"bold\">Real Name</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/addUser.xml:76
+msgid "Insert the user's real name into this text box"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/addUser.xml:80
+msgid "<emphasis role=\"bold\">Login Name</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:62
+#: en/addUser.xml:82
 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 ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/addUser.xml:88 en/setupBootloader.xml:87
+msgid "<emphasis role=\"bold\">Password</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:67
+#: en/addUser.xml:90
 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 ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:73
+#: en/addUser.xml:94
 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 ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:79
+#: en/addUser.xml:101
 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 ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:82
+#: en/addUser.xml:104
 msgid ""
 "You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
@@ -258,48 +280,47 @@ msgid ""
 msgstr ""
 
 #. 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 ""
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:93
-msgid "Advanced User Management"
+#: en/addUser.xml:115
+msgid "User Management (advanced)"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:96
+#: en/addUser.xml:118
 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 ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:101
+#: en/addUser.xml:123
 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 ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:107
+#: en/addUser.xml:130
 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 ""
 
 #. 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 "माउंट बिंदु चुनें"
 
@@ -314,15 +335,17 @@ msgstr "माउंट बिंदु चुनें"
 #.        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 format=\"PNG\" xml:id="
 "\"chooseMountPoints-im1\" align=\"center\" fileref=\"dx2-chooseMountpoints."
@@ -332,317 +355,414 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:36
+#: en/ask_mntpoint_s.xml:49
 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."
-msgstr ""
-
-#. type: Content of: <section><note><para>
-#: en/ask_mntpoint_s.xml:41
-msgid ""
-"If you change anything, make sure you still have a <emphasis role=\"bold"
-"\"><literal>/</literal></emphasis> (root) partition."
+"you don't agree with the DrakX suggestions, you can change the mount points "
+"yourself."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:46
+#: 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 ""
-
-#. 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
 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 ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:63
+#: en/ask_mntpoint_s.xml:73
 msgid ""
 "For any partitions that you don't need to make use of, you can leave the "
 "mount point field blank."
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/ask_mntpoint_s.xml:69
+#: en/ask_mntpoint_s.xml:79
 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 ""
+
+#. type: Content of: <section><tip><para>
+#: en/ask_mntpoint_s.xml:84
+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 ""
 
 #. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:74
+#: en/ask_mntpoint_s.xml:90
 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/bestTime.xml:10
-msgid "Clock settings"
+#: en/bestTime.xml:5
+msgid "Clock Settings"
 msgstr ""
 
 #. 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
 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 ""
 
 #. type: Content of: <section><para>
-#: en/bestTime.xml:23
-msgid "In advanced tab, you will find more options about clock settings."
+#: 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 ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:1
+#: en/bootLive.xml:10
 msgid "Booting the medium"
 msgstr ""
 
-#. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:1
-msgid "From a disc"
-msgstr "डिस्क द्वारा"
-
-#. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:1
+#. type: Content of: <section><section><para>
+#: en/bootLive.xml:12
 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."
+"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 ""
 
-#. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:7
-msgid "From a USB device"
-msgstr "यूएसबी डिवाइस द्वारा"
+#. 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 ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:12
+#: en/bootLive.xml:35
 msgid "In BIOS/CSM/Legacy mode"
 msgstr ""
 
+#. 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
+msgid "<emphasis role=\"bold\">Boot Mageia</emphasis>"
+msgstr ""
+
+#. 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
+msgid "Once the boot is done, you can proceed to the installation."
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/bootLive.xml:45 en/bootLive.xml:57
+msgid ""
+"<emphasis role=\"bold\">+ use non-free video drivers (slower to boot)</"
+"emphasis>"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/bootLive.xml: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
+msgid "<emphasis role=\"bold\">Install Mageia</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:54 en/bootLive.xml:157
+msgid "This option will install Mageia to a hard disk."
+msgstr ""
+
+#. 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>"
 
 #. 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 ""
 
-#. type: Content of: <section><section><para>
-#: en/bootLive.xml:12
-msgid "In the middle menu, you have the choice between three actions:"
+#. 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:75
+msgid "<keycap>F1</keycap> <emphasis role=\"bold\">Help</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:13
+#: en/bootLive.xml:76
 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."
+"Within any of the <keycap>F2</keycap> to <keycap>F6</keycap> options, you "
+"can view relevant help by pressing <keycap>F1</keycap>."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:16
+#: en/bootLive.xml:81
+msgid "<keycap>F2</keycap> <emphasis role=\"bold\">Language</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:82
 msgid ""
-"Install Mageia: This choice will directly install Mageia on a hard disk."
+"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 ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:87
+msgid "<keycap>F3</keycap> <emphasis role=\"bold\">Video Mode</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:17
+#: en/bootLive.xml:89
 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)."
+"If needed, change the screen resolution by pressing <keycap>F3</keycap>. "
+"Options are: 640x480, 800x600, 1024x768."
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/bootLive.xml:19
-msgid "In the bottom menu, are the Boot Options:"
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:93
+msgid "<keycap>F4</keycap> <emphasis role=\"bold\">Source</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:19
+#: en/bootLive.xml:94
 msgid ""
-"F1 - Help. Explain the options \"splash\", \"apm\", \"acpi\" and \"Ide\""
+"Normally, the installation is performed from the inserted installation "
+"medium. Here, you may select other sources, like FTP or NFS servers."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:20
-msgid "F2 - Language. Choose the display language of the screens."
+#: en/bootLive.xml:95
+msgid ""
+"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 ""
 
 #. 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:98
+msgid "<keycap>F5</keycap> <emphasis role=\"bold\">Driver</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:22
+#: en/bootLive.xml:99
 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 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 ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:104
+msgid "<keycap>F6</keycap> <emphasis role=\"bold\">Kernel Options</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:26
+#: en/bootLive.xml:106
 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 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
+msgid ""
+"<emphasis role=\"bold\">Default:</emphasis> splash quiet noiswmd resume "
+"audit=0"
+msgstr ""
+
+#. 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
+msgid ""
+"<emphasis role=\"bold\">No ACPI:</emphasis> (Advanced Configuration and "
+"Power Interface): Power management features are not used."
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/bootLive.xml:125
+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 ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:28
+#: en/bootLive.xml:131
 msgid ""
-"F6 - Kernel options. This is a way to specify options according to your "
-"hardware and the drivers to use."
+"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 ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:29
+#: en/bootLive.xml:139
 msgid "In UEFI mode"
 msgstr ""
 
 #. 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"
+#: en/bootLive.xml:146
+msgid "First screen while booting in UEFI mode"
 msgstr ""
 
 #. 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 ""
 
-#. type: Content of: <section><section><para>
-#: en/bootLive.xml:30
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:153
 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 ""
 
-#. 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/chooseDesktop.xml:3
+#: en/chooseDesktop.xml:16
 msgid "Desktop Selection"
 msgstr "डेस्कटॉप चयन"
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:8
-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 ""
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:11
+#: en/chooseDesktop.xml:26
 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 ""
 
 #. 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 format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
 "align=\"center\"/> </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
 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 ""
 
 #. type: Content of: <section><info><title>
@@ -651,8 +771,9 @@ msgid "Package Group Selection"
 msgstr "पैकेज समूह चयन"
 
 #. 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
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
 "\" align=\"center\"/> </imageobject>"
@@ -661,7 +782,7 @@ msgstr ""
 "\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:14
+#: en/choosePackageGroups.xml:16
 msgid ""
 "Packages are arranged into common groups, to make choosing what you need on "
 "your system a lot easier. The groups are fairly self explanatory, however "
@@ -670,29 +791,29 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:21
+#: en/choosePackageGroups.xml:23
 msgid "<emphasis role=\"bold\">Workstation</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:25
+#: en/choosePackageGroups.xml:27
 msgid "<emphasis role=\"bold\">Server</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:29
+#: en/choosePackageGroups.xml:31
 msgid "<emphasis role=\"bold\">Graphical Environment</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:33
+#: en/choosePackageGroups.xml:35
 msgid ""
 "<emphasis role=\"bold\">Individual Package Selection</emphasis>: you can use "
 "this option to manually add or remove packages"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:38
+#: en/choosePackageGroups.xml:40
 msgid ""
 "See <xref linkend=\"minimal-install\"/> for instructions on how to do a "
 "minimal install (without or with X &amp; IceWM)."
@@ -704,8 +825,10 @@ msgid "Choose Individual Packages"
 msgstr ""
 
 #. 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
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackagesTree.png"
 "\" align=\"center\"/> </imageobject>"
@@ -714,19 +837,19 @@ msgstr ""
 "\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:14
+#: en/choosePackagesTree.xml:18
 msgid ""
 "Here you can add or remove any extra packages to customize your installation."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:17
+#: en/choosePackagesTree.xml:21
 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 ""
 
 #. type: Content of: <section><info><title>
@@ -736,8 +859,10 @@ msgstr "सेवाएँ विन्यस्त करें"
 
 #.  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
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-configureServices.png"
 "\" xml:id=\"configureServices-im1\" align=\"center\" revision=\"1\"/> </"
@@ -748,30 +873,27 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:16
+#: en/configureServices.xml:20
 msgid ""
 "Here you can choose which services should start when you boot your system."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/configureServices.xml:19
-msgid "Click on a triangle to expand a group to all the relevant services."
-msgstr ""
-
-#. type: Content of: <section><para>
-#: en/configureServices.xml:22
-msgid "The settings DrakX chose are usually good."
+#. 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: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."
 msgstr ""
 
 #. 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 ""
 
@@ -782,14 +904,17 @@ msgstr "समयक्षेत्र विन्यस्त करें"
 
 #.  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 format=\"PNG\" xml:id="
 "\"configureTimezoneUTC-im1\" align=\"center\" fileref=\"dx2-"
@@ -797,192 +922,220 @@ msgstr ""
 "<imagedata format=\"PNG\" fileref=\"live-timeZone.png\" condition=\"live\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><para>
-#: en/configureTimezoneUTC.xml:20
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureTimezoneUTC.xml:26
 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 ""
 
 #. type: Content of: <section><para>
-#: en/configureTimezoneUTC.xml:24
+#: en/configureTimezoneUTC.xml:32
 msgid ""
 "In the next screen you can choose to set your hardware clock to local time "
 "or to GMT, also known as UTC."
 msgstr ""
 
 #. 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."
 msgstr ""
 
 #. 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 ""
 
 #. 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 align=\"center\" fileref=\"live-bestTime.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"bestTime-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."
 msgstr ""
 
 #. 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:"
 msgstr ""
 
-#. 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
+msgid "Vendor"
 msgstr ""
 
 #. 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
+msgid "then the make of your card"
 msgstr ""
 
 #. 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
+msgid "and the model of card"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:41
+#: en/configureX_card_list.xml:53
 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 ""
 
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:47
+#. type: Content of: <section><caution><para>
+#: en/configureX_card_list.xml:61
 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 ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:51
+#: en/configureX_card_list.xml:65
 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."
-msgstr ""
-
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:56
-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."
+"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 ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:3
+#: en/configureX_chooser.xml:11
 msgid "Graphic Card and Monitor Configuration"
 msgstr ""
 
 #.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
+#. 2018/02/15 apb: Some text and typography.
+#. 2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.
+#. 2018/02/23 apb: Typo.
 #. 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 align=\"center\" fileref=\"live-bestTime.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"bestTime-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:15
+#: en/configureX_chooser.xml:30
 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 ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:27
-msgid ""
-"<emphasis><guibutton>Graphic card</guibutton></emphasis>: Choose your card "
-"from the list if needed."
+#: en/configureX_chooser.xml:41
+msgid "<emphasis role=\"bold\">Graphic Card</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:33
+#: en/configureX_chooser.xml:44
 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."
+"If you need to, you can select a specific card from this expandable list. "
+"See <xref linkend=\"configureX_card_list\"/>."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/configureX_chooser.xml:41
-msgid "Incorrect refresh rates may damage your monitor"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_chooser.xml:49
+msgid "<emphasis role=\"bold\">Monitor</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:47
+#: en/configureX_chooser.xml:52
 msgid ""
-"<emphasis><guibutton>Resolution</guibutton></emphasis>: The resolution and "
-"color depth of your monitor can be set here."
+"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 ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:52
-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."
+#: en/configureX_chooser.xml:60
+msgid "<emphasis role=\"bold\">Resolution</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/configureX_chooser.xml:63
+msgid "The resolution and color depth of your monitor can be set here"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_chooser.xml:68
+msgid "<emphasis role=\"bold\">Test</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_chooser.xml:71
 msgid ""
-"<emphasis><guibutton>Options</guibutton></emphasis>: Here you can choose to "
-"enable or disable various options."
+"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 ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_chooser.xml:81
+msgid "<emphasis role=\"bold\">Options</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_chooser.xml:84
+msgid "Here you can choose to enable or disable various options"
+msgstr ""
+
+#. 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 ""
 
 #. 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."
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:19
+#: en/configureX_monitor.xml:30
 msgid ""
 "<emphasis role=\"bold\">Selecting a monitor with different characteristics "
 "could damage your monitor or video hardware. Please don't try something "
@@ -991,29 +1144,32 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:26
+#: en/configureX_monitor.xml:38
+#, fuzzy
 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 align=\"center\" fileref=\"live-bestTime.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"bestTime-im1\"/> </imageobject>"
 
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:31
-msgid "<emphasis>Custom</emphasis>"
+#. type: Content of: <section><variablelist><varlistentry><term>
+#: en/configureX_monitor.xml:46
+msgid "Custom"
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:33
+#. type: Content of: <section><variablelist><varlistentry><listitem><para>
+#: en/configureX_monitor.xml:49
 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."
 msgstr ""
 
-#. 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 "
@@ -1021,151 +1177,164 @@ msgid ""
 "consult your monitor documentation."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:44
-msgid "<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
 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 ""
 
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:51
-msgid "<emphasis>Vendor</emphasis>"
-msgstr ""
-
-#. 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:"
 msgstr ""
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:61
-msgid "the monitor manufacturers name"
+#. 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"
+#. 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>"
+#. 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
 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:7
-msgid "Custom disk partitioning with DiskDrake"
-msgstr ""
+#: en/diskdrake.xml:22
+#, fuzzy
+msgid "Custom Disk Partitioning with DiskDrake"
+msgstr "ऐच्छिक डिस्क विभाजनीकरण"
 
 #. 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 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>"
 
-#. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:22
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/diskdrake.xml:38
 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."
+"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 ""
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:29
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/diskdrake.xml:45
 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."
+"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 ""
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:34
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/diskdrake.xml:52
 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>."
+"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. "
+"<emphasis>Expert mode</emphasis> provides more options such as to label "
+"(name) a partition, or to choose a partition type."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:39
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/diskdrake.xml:60
 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."
+"Continue until you have adjusted everything to your satisfaction, then click "
+"<emphasis>Done</emphasis> when you're ready."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:43
+#. type: Content of: <section><warning><orderedlist><listitem><para>
+#: en/diskdrake.xml:69
 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."
+"Take care with the <emphasis>Clear all</emphasis> option, use it only if you "
+"are sure you want to wipe all partitions on the selected storage device."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:49
-msgid "Continue until you have adjusted everything to your satisfaction."
+#. type: Content of: <section><warning><orderedlist><listitem><para>
+#: en/diskdrake.xml:75
+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 ""
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:52
-msgid "Click <guibutton>Done</guibutton> when you're ready."
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/diskdrake.xml:87
+msgid ""
+"If you are installing Mageia on a UEFI system, check that an ESP (EFI System "
+"Partition) is present and correctly mounted on <filename>/boot/EFI</"
+"filename>. See Figure 1 below."
 msgstr ""
 
-#. type: Content of: <section><note><para>
-#: en/diskdrake.xml:56
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/diskdrake.xml:93
 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)"
+"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
+"partition is present and of the correct type. See Figure 2 below."
 msgstr ""
 
-#. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:61
+#. type: Content of: <section><figure><title>
+#: en/diskdrake.xml:101
+msgid "EFI System Partition"
+msgstr ""
+
+#. 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 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>"
 
-#. 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 ""
 
-#. type: Content of: <section><note><para>
-#: en/diskdrake.xml:72
-msgid ""
-"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
-"partition is present and of the correct type"
+#. type: Content of: <section><figure><title>
+#: en/diskdrake.xml:115
+msgid "BIOS boot partition"
 msgstr ""
 
-#. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:76
+#. type: Content of: <section><mediaobject>
+#: en/diskdrake.xml:118 en/doPartitionDisks.xml:200
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1174,295 +1343,316 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:9
-msgid "Partitioning"
+#: en/doPartitionDisks.xml:25
+#, fuzzy
+msgid "Suggested Partitioning"
 msgstr "विभाजनीकरण"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:12
+#: en/doPartitionDisks.xml:28
 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 ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:16
+#: en/doPartitionDisks.xml:32
 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 ""
 
 #. 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 format=\"PNG\" fileref="
+"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
+"\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata format="
+"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:32
-msgid "Use Existing Partitions"
+#. type: Content of: <section><itemizedlist><title>
+#: en/doPartitionDisks.xml:47
+#, fuzzy
+msgid "Main Options"
+msgstr "विकल्पों"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:50
+msgid "<emphasis role=\"bold\">Use Existing Partitions</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:35
+#. 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."
 msgstr ""
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:41
-msgid "Use Free Space"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:59
+msgid "<emphasis role=\"bold\">Use Free Space</emphasis>"
 msgstr ""
 
-#. 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."
 msgstr ""
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:49
-msgid "Use Free Space on a Windows Partition"
-msgstr ""
-
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
-msgid ""
-"If you have unused space on an existing Windows partition, the installer may "
-"offer to use it."
-msgstr ""
-
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:56
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:68
 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!"
+"<emphasis role=\"bold\">Use Free Space on a Windows Partition</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:61
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:71
 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."
+"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 ""
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:69
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:77
 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."
-msgstr ""
-
-#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:76
-msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/> </imageobject>"
+"clicking and dragging the gap between both partitions.  See the following "
+"screenshot:"
 msgstr ""
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:87
-msgid "Erase and use Entire Disk."
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:85
+msgid "<emphasis role=\"bold\">Erase and use Entire Disk</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:90
-msgid "This option will allocate the entire drive for Mageia."
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:88
+msgid "This option will allocate the entire drive for Mageia"
 msgstr ""
 
-#. 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!"
+#. type: Content of: <section><itemizedlist><listitem><warning><para>
+#: en/doPartitionDisks.xml:92
+msgid ""
+"This will erase ALL data on the selected hard drive. Take care! If you "
+"intend to use part of the disk for something else, or you already have data "
+"on the drive that you are not prepared to lose, then do not use this option."
 msgstr ""
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:96
+#. type: Content of: <section><itemizedlist><listitem><important><para>
+#: en/doPartitionDisks.xml:99
 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."
+"Note that this involves shrinking the size of the Windows partition. The "
+"partition must be \"clean\", meaning that Windows must have closed down "
+"correctly the last time it was used. It must also have been defragmented, "
+"although this is not a guarantee that all files in the partition have been "
+"moved out of the area that is about to be used. It is highly recommended to "
+"back up your personal files."
 msgstr ""
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:103
-msgid "Custom disk partitioning"
-msgstr "ऐच्छिक डिस्क विभाजनीकरण"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:110
+msgid "<emphasis role=\"bold\">Custom Disk Partitioning</emphasis>"
+msgstr ""
 
-#. 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)."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:112
-msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
+#. type: Content of: <section><mediaobject>
+#: en/doPartitionDisks.xml:120
+#, fuzzy
+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 format=\"PNG\" fileref="
+"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
+"\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata format="
+"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><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
 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 ""
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:125
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:141
 msgid ""
 "If the total available space is greater than 50 GB, then three partitions "
 "are created"
 msgstr ""
 
-#. 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
 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 ""
 
-#. 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
+msgid "1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB"
 msgstr ""
 
-#. 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
 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 ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:144
+#: 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 ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:150
+#: en/doPartitionDisks.xml:182
 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 ""
 
 #. 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
-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 ""
 
-#. 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 format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+"align=\"center\"/> </imageobject>"
 
-#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:182
+#. type: Content of: <section><important><para>
+#: en/doPartitionDisks.xml:216
 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 ""
 
-#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:189
-msgid "<emphasis role=\"bold\">Align to</emphasis> = MiB"
+#. type: Content of: <section><important><para>
+#: en/doPartitionDisks.xml:221
+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 ""
 
-#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:191
-msgid "<emphasis role=\"bold\">Free space preceding (MiB)</emphasis> = 2"
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:228
+msgid "<emphasis>Align to</emphasis> = MiB"
 msgstr ""
 
-#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:194
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:232
+msgid "<emphasis>Free space preceding (MiB)</emphasis> = 2"
+msgstr ""
+
+#. type: Content of: <section><important><para>
+#: en/doPartitionDisks.xml:236
 msgid ""
 "Also make sure all partitions are created using an even number of megabytes."
 msgstr ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. type: Content of: <book><info><revhistory><revision><date>
-#: en/DrakLive-cover.xml:10
-msgid "January 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 ""
 
 #. 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 ""
 
 #. 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
+msgid ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
 msgstr ""
 
 #. 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/"
@@ -1470,8 +1660,8 @@ msgid ""
 msgstr ""
 
 #. 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."
@@ -1479,110 +1669,112 @@ msgid ""
 msgstr ""
 
 #. 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</"
 "link>, if you would like to help improve this manual."
 msgstr ""
 
-#. 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 ""
 
 #. 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 "
 "while installing."
 msgstr ""
 
-#. 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 ""
 
+#. type: Content of: <article><info><cover><para>
+#: en/DrakLive.xml:33
+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 ""
+
 #. 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 ""
 
 #. type: Content of: <book><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:9
+#: en/DrakX-cover.xml:20
 msgid "February 2014"
 msgstr ""
 
 #. type: Content of: <book><info><revhistory><revision><revremark>
-#: en/DrakX-cover.xml:10
+#: en/DrakX-cover.xml:22
 msgid "Mageia 4"
 msgstr ""
 
-#. type: Content of: <book><info><cover><mediaobject>
-#: en/DrakX-cover.xml:16
-msgid ""
-"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
-msgstr ""
-
 #. type: Content of: <section><info><title>
 #: en/exitInstall.xml:3
 msgid "Congratulations"
 msgstr "बधाई हो"
 
 #.  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
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:18
 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 ""
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:18
+#: en/exitInstall.xml:22
 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 ""
 
 #. 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."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:26
+#: en/exitInstall.xml:30
 msgid "Enjoy!"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:28
+#: en/exitInstall.xml:32
 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 ""
 
 #. 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 "
@@ -1591,46 +1783,46 @@ 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
 msgid "<emphasis role=\"bold\">Advanced</emphasis>"
 msgstr ""
 
 #. 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
 msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
 msgstr ""
 
 #. 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 "
@@ -1638,28 +1830,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 ""
 
@@ -1667,467 +1859,429 @@ msgstr ""
 #.  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="
+"\"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>"
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:24
+#: en/formatPartitions.xml:35
 msgid ""
 "Here you can choose which partition(s) you wish to format. Any data on "
 "partitions <emphasis>not</emphasis> marked for formatting will be preserved."
 msgstr ""
 
 #. 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
+msgid ""
+"Usually, at least the partitions that DrakX selected need to be formatted."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:31
+#: en/formatPartitions.xml:42
 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 ""
 
 #. type: Content of: <section><tip><para>
-#: en/formatPartitions.xml:36
+#: en/formatPartitions.xml:47
 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 ""
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:43
+#: en/formatPartitions.xml:54
 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:10
+#: en/installer.xml:14
 msgid "DrakX, the Mageia Installer"
 msgstr ""
 
 #. 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 "
 "possible."
 msgstr ""
 
-#. 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 ""
-
 #. type: Content of: <section><section><title>
-#: en/installer.xml:22
-msgid "Installation Welcome Screen"
-msgstr ""
-
-#. type: Content of: <section><section><section><title>
-#: en/installer.xml:25
-msgid "Using a Mageia DVD"
-msgstr ""
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:27
-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 ""
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:32
-msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
-msgstr ""
-
-#. 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."
-msgstr ""
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:45
-msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
+#: en/installer.xml:20
+msgid "The installation steps"
 msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:50
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/installer.xml:23
 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):"
+"The install process is divided into a number of steps - the status of which "
+"is indicated in a panel to the left of the screen."
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:55
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/installer.xml:28
 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>"
+"Each step has one or more screens, which may also have <emphasis>Advanced</"
+"emphasis> sections with extra, less commonly required options."
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:63
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/installer.xml:33
 msgid ""
-"Press <emphasis role=\"bold\">F2</emphasis> to have the installer use a "
-"specific language for the installation."
+"Most screens have <emphasis>Help</emphasis> buttons for further details "
+"about the particular step."
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:67
+#. type: Content of: <section><section><caution><para>
+#: en/installer.xml:38
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+"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 ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:72
+#. type: Content of: <section><section><caution><para>
+#: en/installer.xml:43
 msgid ""
-"Use the arrow keys to select the language then press <emphasis role=\"bold"
-"\">Enter</emphasis>."
+"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><para>
-#: en/installer.xml:77
-msgid ""
-"If needed, change the screen resolution by pressing <emphasis role=\"bold"
-"\">F3</emphasis> (Legacy mode only)."
+#. type: Content of: <section><section><title>
+#: en/installer.xml:48
+msgid "Installation Welcome Screen"
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:81
+#. type: Content of: <section><section><para>
+#: en/installer.xml:49
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome5def.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 ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:88
+#. type: Content of: <section><section><para>
+#: en/installer.xml:52
 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)."
+"The welcome menu screen has various options, however the default option will "
+"start the installer, and is normally all that you will need."
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/installer.xml:96
-msgid "Default: It doesn't alter anything in the default options."
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:56
+msgid "Legacy (BIOS) Systems"
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/installer.xml:101
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:58
+#, fuzzy
 msgid ""
-"Safe Settings: Priority is given to the safer options at the price of a "
-"performance detriment."
+"<imageobject> <imagedata fileref=\"dx-welcome.png\" align=\"center\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+"align=\"center\"/> </imageobject>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/installer.xml:106
-msgid ""
-"No ACPI: (Advanced Configuration and Power Interface): Power management "
-"features are not used."
+#. type: Content of: <section><section><section><itemizedlist><title>
+#: en/installer.xml:63
+msgid "Menu"
 msgstr ""
 
-#. 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:66
 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."
+"Install Mageia to a hard disk. This is the default option, and will "
+"automatically start after a short while unless another option is selected."
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:120
-msgid ""
-"When you select one of these entries, it modifies the default options "
-"displayed in the <guilabel>Boot Options</guilabel> line."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:69
+msgid "<emphasis role=\"bold\">Rescue System</emphasis>"
 msgstr ""
 
-#. 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:70
 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."
+"This option allows you to either re-install the bootloader for an existing "
+"Mageia installation or you can use it to restore a Windows bootloader."
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:132
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:75
+msgid "<emphasis role=\"bold\">Memory Test</emphasis>"
 msgstr ""
 
-#. 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:76
 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."
+"Test the installed RAM by performing multiple read and write operations. "
+"Reboot to end the test."
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:146
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:80
+msgid "<emphasis role=\"bold\">F2: Language</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:151
-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><itemizedlist><listitem><para>
+#: en/installer.xml:81
+msgid "Press F2 for alternative languages."
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:158
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:86
+msgid "UEFI Systems"
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:164
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:87
 msgid ""
-"The help is translated in the chosen language with <emphasis role=\"bold"
-"\">F2</emphasis>."
+"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 ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:168
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:92
+#, fuzzy
 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 ""
-
-#. type: Content of: <section><section><title>
-#: en/installer.xml:177
-msgid "The installation steps"
+"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+"align=\"center\"/> </imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/installer.xml:179
-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 ""
 
-#. type: Content of: <section><section><para>
-#: en/installer.xml:182
-msgid ""
-"Each step has one or more screens which may also have <guibutton>Advanced</"
-"guibutton> sections with extra, less commonly required, options."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:99
+msgid "<emphasis role=\"bold\">Install:</emphasis> Start the Install process"
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/installer.xml:186
+#. 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 ""
 
-#. type: Content of: <section><section><note><para>
-#: en/installer.xml:190
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:109
 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 ""
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:203
+#: en/installer.xml:115
 msgid "Installation Problems and Possible Solutions"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:206
+#: en/installer.xml:117
 msgid "No Graphical Interface"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:210
+#: en/installer.xml:120
 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 ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:217
+#: en/installer.xml:126
 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 ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:230
+#: en/installer.xml:138
 msgid "The Install Freezes"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:232
+#: en/installer.xml:139
 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 ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:240
+#: en/installer.xml:146
 msgid "RAM problem"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:242
+#: en/installer.xml:147
 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 ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:249
+#: en/installer.xml:154
 msgid "Dynamic partitions"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:251
+#: en/installer.xml:155
 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/installUpdates.xml:3
+#: en/installUpdates.xml:16
 msgid "Updates"
 msgstr "उन्नयन"
 
-#.  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 ""
+"<imageobject> <imagedata align=\"center\" fileref=\"live-bestTime.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"bestTime-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:20
+#: en/installUpdates.xml:25
 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 ""
 
-#. 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
 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 ""
 
-#. type: Content of: <section><para>
-#: en/installUpdates.xml:29
-msgid "Press <guibutton>Next</guibutton> to continue"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installUpdates.xml:40
+msgid "Press <emphasis>Next</emphasis> to continue"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/login.xml:1
-msgid "Login screen"
+#: en/login.xml:4
+msgid "Login Screen"
 msgstr ""
 
 #. 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\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><mediaobject><caption><para>
-#: en/login.xml:1
-msgid "KDM login screen"
+#: en/login.xml:11
+msgid "SDDM login screen"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/login.xml:1
-msgid "Finally, you will come to the login screen."
+#: en/login.xml:14
+msgid "Finally, you will come to the desktop login screen."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/login.xml:1
+#: en/login.xml:15
 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 ""
 
 #. type: Content of: <section><para>
-#: en/login.xml:3
+#: en/login.xml:16
 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/media_selection.xml:3
-msgid "Media Selection (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
+#: en/media_selection.xml:24
+#, fuzzy
 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 align=\"center\" fileref=\"live-bestTime.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"bestTime-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 "
@@ -2136,24 +2290,24 @@ msgid ""
 msgstr ""
 
 #. 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."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:32
+#: en/media_selection.xml:42
 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 ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:40
+#: en/media_selection.xml:50
 msgid ""
 "The <emphasis>Tainted</emphasis> repository includes packages released under "
 "a free license. The main criteria for placing packages in this repository is "
@@ -2168,56 +2322,57 @@ msgid "Minimal Install"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:11
+#: en/minimal-install.xml:17
 msgid ""
-"You can choose a Minimal Installation by de-selecting everything in the "
-"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"/>."
+"Minimal Installation is intended for those with specific uses in mind for "
+"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 ""
 
-#. type: Content of: <section><para>
-#: en/minimal-install.xml:14
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/minimal-install.xml:24
 msgid ""
-"If desired, you can additionally tick the <emphasis role=\"bold\">Individual "
-"package selection</emphasis> option in the same screen."
+"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 ""
 
-#. type: Content of: <section><para>
-#: en/minimal-install.xml:17
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/minimal-install.xml:28
 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"
-"\"/>."
+"If desired, you can additionally tick the <emphasis>Individual package "
+"selection</emphasis> option in the same screen."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/minimal-install.xml:22
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/minimal-install.xml:33
 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."
+"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 ""
 
-#. 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
 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 ""
 
 #. type: Content of: <section><mediaobject>
-#: en/minimal-install.xml:35
+#: en/minimal-install.xml:48
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"minimal-install-im1\" align="
 "\"center\" fileref=\"dx2-minimal-install.png\" revision=\"1\"/> </"
@@ -2226,295 +2381,305 @@ msgstr ""
 
 #. type: Content of: <section><info><title>
 #: en/misc-params.xml:3
-msgid "Summary of miscellaneous parameters"
+msgid "Configuration Summary"
 msgstr ""
 
 #.  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 format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+"align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/misc-params.xml:15
+#: en/misc-params.xml:24
 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 ""
 
 #. 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 ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:45
-msgid "<guilabel>Timezone</guilabel>"
+#: en/misc-params.xml:54
+msgid "<emphasis role=\"bold\">Timezone</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:47
+#: en/misc-params.xml:56
 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 ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:53
-msgid "<guilabel>Country / Region</guilabel>"
+#: en/misc-params.xml:62
+msgid "<emphasis role=\"bold\">Country / Region</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:56
+#: en/misc-params.xml:64
 msgid ""
 "If the selected country is wrong, it is very important that you correct the "
 "setting.  See <xref linkend=\"selectCountry\"/>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:62
-msgid "<guilabel>Bootloader</guilabel>"
-msgstr ""
-
-#. 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:70
+msgid "<emphasis role=\"bold\">Bootloader</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:67
-msgid "Do not change anything, unless you know how to configure GRUB2"
+#: en/misc-params.xml:72
+msgid "DrakX proposal for the bootloader setting"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:70
-msgid "For more information, see <xref linkend=\"setupBootloader\"/>"
+#: en/misc-params.xml:75
+msgid ""
+"Do not change anything, unless you know how to configure GRUB2. For more "
+"information, see <xref linkend=\"setupBootloader\"/>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:75
-msgid "<guilabel>User management</guilabel>"
+#: en/misc-params.xml:83
+msgid "<emphasis role=\"bold\">User management</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:78
+#: en/misc-params.xml:85
 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 ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:84
-msgid "<guilabel>Services</guilabel>:"
+#: en/misc-params.xml:91
+msgid "<emphasis role=\"bold\">Services</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:86
+#: en/misc-params.xml:93
 msgid ""
 "System services refer to those small programs which run in the background "
 "(daemons).  This tool allows you to enable or disable certain processes."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:90
+#: en/misc-params.xml:97
 msgid ""
 "You should check carefully before changing anything here - a mistake may "
-"prevent your computer from operating correctly."
-msgstr ""
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:94
-msgid "For more information, see <xref linkend=\"configureServices\"/>"
+"prevent your computer from operating correctly. For more information, see "
+"<xref linkend=\"configureServices\"/>"
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:101
+#: en/misc-params.xml:106
 msgid "Hardware parameters"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:106
-msgid "<guilabel>Keyboard</guilabel>:"
+#: en/misc-params.xml:111
+msgid "<emphasis role=\"bold\">Keyboard</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:108
+#: en/misc-params.xml:113
 msgid ""
 "Configure your keyboard layout according to your location, language and type "
 "of keyboard."
 msgstr ""
 
 #. 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>:"
+#: en/misc-params.xml:124
+msgid "<emphasis role=\"bold\">Mouse</emphasis>"
 msgstr ""
 
 #. 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."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:126
-msgid "<guilabel>Sound card</guilabel>:"
+#: en/misc-params.xml:131
+msgid "<emphasis role=\"bold\">Sound card</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:129
-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."
+#: en/misc-params.xml:133
+msgid "The installer will use the default driver if one is available."
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:137
-msgid "<guilabel>Graphical interface</guilabel>:"
+#. type: Content of: <section><section><para>
+#: en/misc-params.xml:136 en/soundConfig.xml:46
+msgid ""
+"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 ""
 
 #. 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:144
+msgid "<emphasis role=\"bold\">Graphical interface</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:143
-msgid "For more information, see <xref linkend=\"configureX_chooser\"/>."
+#: en/misc-params.xml:146
+msgid ""
+"This section allows you to configure your graphics card(s) and displays. For "
+"more information, see <xref linkend=\"configureX_chooser\"/>"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/misc-params.xml:149
+#: en/misc-params.xml:155
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
 "\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:157
+#: en/misc-params.xml:163
 msgid "Network and Internet parameters"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:163
-msgid "<guilabel>Network</guilabel>:"
+#: en/misc-params.xml:169
+msgid "<emphasis role=\"bold\">Network</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:165
+#: en/misc-params.xml:171
 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 ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:172
+#: en/misc-params.xml:178
 msgid ""
 "When you add a network card, do not forget to set your firewall to monitor "
 "that interface as well."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:179
-msgid "<guilabel>Proxies</guilabel>:"
+#: en/misc-params.xml:185
+msgid "<emphasis role=\"bold\">Proxies</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:181
+#: en/misc-params.xml:187
 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 ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:186
+#: en/misc-params.xml:192
 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 ""
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:195
+#: en/misc-params.xml:201
 msgid "Security"
 msgstr "सुरक्षा"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:200
-msgid "<guilabel>Security Level</guilabel>:"
+#: en/misc-params.xml:206
+msgid "<emphasis role=\"bold\">Security Level</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:203
+#: en/misc-params.xml:208
 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 ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:207
-msgid "Check the option which best suits your usage."
+#: en/misc-params.xml:215
+msgid "<emphasis role=\"bold\">Firewall</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:212
-msgid "<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 ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:218
-msgid ""
-"Select the services that you wish to have access to your system. Your "
-"selections will depend on what you use your computer for. For more "
-"information, see <xref linkend=\"firewall\"/>."
+#: en/misc-params.xml:229
+msgid "For more information, see <xref linkend=\"firewall\"/>."
 msgstr ""
 
 #. 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
+msgid ""
+"Bear in mind that allowing <emphasis>everything</emphasis> (no firewall) may "
+"be very risky."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -2523,29 +2688,43 @@ msgid "Reboot"
 msgstr "रीबूट"
 
 #. type: Content of: <section><para>
-#: en/reboot.xml:6
+#: en/reboot.xml:7
 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 ""
+
+#. 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
-msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
+#: en/reboot.xml:12
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot2.png\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject><imagedata fileref=\"../live-bootCSM.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
 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 ""
 
 #. type: Content of: <section><mediaobject>
-#: en/reboot.xml:17
+#: en/reboot.xml:19
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
 "reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
@@ -2567,41 +2746,50 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/securityLevel.xml:3
+#: en/securityLevel.xml:10
 msgid "Security Level"
 msgstr "सुरक्षा स्तर"
 
 #.  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 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
 msgid ""
 "<emphasis role=\"bold\">Please choose the desired security level</emphasis>"
 msgstr ""
 
 #. 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
 msgid "<emphasis role=\"bold\">Security Administrator</emphasis>"
 msgstr ""
 
 #. 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 "
@@ -2609,14 +2797,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 "
@@ -2624,511 +2812,566 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:41
+#: en/securityLevel.xml:53
 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:6
+#: en/SelectAndUseISOs2.xml:15
 msgid "Select and use ISOs"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:9
+#: en/SelectAndUseISOs2.xml:18
 msgid "Introduction"
 msgstr "भूमिका"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:10
+#: en/SelectAndUseISOs2.xml:19
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
 "which image best suits your needs."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:12
-msgid "There are two families of media:"
+#: en/SelectAndUseISOs2.xml:21
+msgid "There are three types of installation media:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:15
+#: en/SelectAndUseISOs2.xml:24
 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 ""
 
 #. 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
 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"
+"Live ISOs can only be used to create <quote>clean</quote> installations, "
+"they cannot be used to upgrade previously installed Mageia releases."
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:47
+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 ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:53
+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 ""
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:27
-msgid "Details are given in the next sections."
+#: en/SelectAndUseISOs2.xml:58
+msgid "More details are given in the next sections."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:30
+#: en/SelectAndUseISOs2.xml:61
 msgid "Media"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:32
+#: en/SelectAndUseISOs2.xml:63
 msgid "Definition"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:33
+#: en/SelectAndUseISOs2.xml:64
 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 ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:36
+#: en/SelectAndUseISOs2.xml:67
 msgid ""
 "You can find Mageia ISO's <link ns4:href=\"http://www.mageia.org/en/"
 "downloads/\">here</link>."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:39
+#: en/SelectAndUseISOs2.xml:70
 msgid "Classical installation media"
 msgstr ""
 
 #. 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 ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:44
-msgid "These ISOs use the Classical installer called drakx."
+#: en/SelectAndUseISOs2.xml:75
+msgid "These ISOs use the Classical installer called DrakX"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:47
+#: en/SelectAndUseISOs2.xml:78
 msgid ""
 "They are used for performing clean installs or to upgrade a previously "
-"installed version of Mageia."
+"installed version of Mageia"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:51 en/SelectAndUseISOs2.xml:83
-#: en/SelectAndUseISOs2.xml:158
-msgid "Different media for 32 and 64 bit architectures."
+#: en/SelectAndUseISOs2.xml:82 en/SelectAndUseISOs2.xml:118
+#: en/SelectAndUseISOs2.xml:174
+msgid "Different media for 32 and 64-bit architectures"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:54
+#: en/SelectAndUseISOs2.xml:85
 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 ""
 
 #. 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
+msgid "Each DVD contains many available desktop environments and languages"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:62
+#: en/SelectAndUseISOs2.xml:95
 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 ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:69
+#: en/SelectAndUseISOs2.xml:102
 msgid "Live media"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:74
+#: en/SelectAndUseISOs2.xml:107
 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 ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:79
-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 ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:86
-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>"
+#: en/SelectAndUseISOs2.xml:114
+msgid "Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:91
-msgid "They contain non free software."
+#: en/SelectAndUseISOs2.xml:121
+msgid "They contain non-free software"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:96
+#: en/SelectAndUseISOs2.xml:126
 msgid "Live DVD Plasma"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:99
-msgid "Plasma desktop environment only."
+#: en/SelectAndUseISOs2.xml:129
+msgid "Plasma desktop environment only"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:102 en/SelectAndUseISOs2.xml:116
-#: en/SelectAndUseISOs2.xml:130
-msgid "All available languages are present."
+#: en/SelectAndUseISOs2.xml:132 en/SelectAndUseISOs2.xml:146
+#: en/SelectAndUseISOs2.xml:160
+msgid "All available languages are present"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:105
-msgid "64 bit architecture only."
+#: en/SelectAndUseISOs2.xml:135 en/SelectAndUseISOs2.xml:149
+msgid "64-bit architecture only"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:110
+#: en/SelectAndUseISOs2.xml:140
 msgid "Live DVD GNOME"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:113
-msgid "GNOME desktop environment only."
-msgstr ""
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:119
-msgid "64 bit architecture only"
+#: en/SelectAndUseISOs2.xml:143
+msgid "GNOME desktop environment only"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:124
+#: en/SelectAndUseISOs2.xml:154
 msgid "Live DVD Xfce"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:127
-msgid "Xfce desktop environment only."
+#: en/SelectAndUseISOs2.xml:157
+msgid "Xfce desktop environment only"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:133
-msgid "32 or 64 bit architectures."
+#: en/SelectAndUseISOs2.xml:163
+msgid "32 or 64-bit architectures"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:139
+#: en/SelectAndUseISOs2.xml:169
 msgid "Net install media"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:144
-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 ""
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:152
-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 ""
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:161
-msgid "First steps are English language only."
+#: en/SelectAndUseISOs2.xml:177
+msgid "First steps are English language only"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:166
+#: en/SelectAndUseISOs2.xml:182
 msgid "netinstall.iso"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:169
+#: en/SelectAndUseISOs2.xml:185
 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 ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:175
+#: en/SelectAndUseISOs2.xml:191
 msgid "netinstall-nonfree.iso"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:178
+#: en/SelectAndUseISOs2.xml:194
 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 ""
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:186
+#: en/SelectAndUseISOs2.xml:202
 msgid "Downloading and Checking Media"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:188
+#: en/SelectAndUseISOs2.xml:204
 msgid "Downloading"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:189
+#: en/SelectAndUseISOs2.xml:205
 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 ""
 
-#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:191
-msgid "<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 ""
-"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:"
+"<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:199
-msgid "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+#: en/SelectAndUseISOs2.xml:217
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"Checking.png\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject><imagedata fileref=\"../live-bootCSM.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:222
+msgid "In the meantime, a window to download the actual ISO will open:"
+msgstr ""
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/SelectAndUseISOs2.xml:225
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"Download.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
+
+#. type: Content of: <section><section><section><para>
+#: 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
 msgid "Checking the integrity of the downloaded media"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:208
+#: en/SelectAndUseISOs2.xml:235
 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 ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:214
+#: en/SelectAndUseISOs2.xml:241
 msgid ""
 "To generate the checksum for your downloaded ISO, open a console, (no need "
 "to be root), and:"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:218
+#: en/SelectAndUseISOs2.xml:245
 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 ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:222
+#: en/SelectAndUseISOs2.xml:249
+msgid ""
+"To use the sha1sum, type: <command>sha1sum path/to/the/image/file.iso</"
+"command>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:254
 msgid ""
-"To use sha1sum, type: <userinput>sha1sum path/to/the/image/file.iso</"
-"userinput>"
+"To use the sha512sum, type: <command>sha512sum path/to/the/image/file.iso</"
+"command>"
 msgstr ""
 
 #. 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=\"../live-bootCSM.png\"/></imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:232
+#: en/SelectAndUseISOs2.xml:265
 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 ""
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:237
+#: en/SelectAndUseISOs2.xml:270
 msgid "Burn or dump the ISO"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:238
+#: en/SelectAndUseISOs2.xml:271
 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 ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:275
 msgid "Burning the ISO to a CD/DVD"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:243
+#: en/SelectAndUseISOs2.xml:276
 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 ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:248
+#: en/SelectAndUseISOs2.xml:282
 msgid "Dump the ISO to a USB stick"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:249
+#: en/SelectAndUseISOs2.xml:283
 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 ""
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:252
+#: en/SelectAndUseISOs2.xml:286
 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 ""
 
-#. 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 ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:259
+#: en/SelectAndUseISOs2.xml:299
 msgid "Using a graphical tool within Mageia"
 msgstr ""
 
 #. 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>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:263
+#: en/SelectAndUseISOs2.xml:303
 msgid "Using a graphical tool within Windows"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:304
 msgid "You could try:"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:267
+#: en/SelectAndUseISOs2.xml:307
 msgid ""
 "<link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using the "
-"\"ISO image\" option;"
+"\"ISO image\" option"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:271
+#: en/SelectAndUseISOs2.xml:311
 msgid ""
 "<link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:277
-msgid "Using Command line within a GNU/Linux system"
+#: en/SelectAndUseISOs2.xml:317
+msgid "Using the Command line within a GNU/Linux system"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:279
+#: en/SelectAndUseISOs2.xml:319
 msgid ""
 "It is potentially *dangerous* to do this by hand. You risk overwriting "
 "potentially valuable existing data if you specify the wrong target device."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:325
 msgid "Open a console"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:288
+#: en/SelectAndUseISOs2.xml:328
 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 ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:291
-msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
+#: en/SelectAndUseISOs2.xml:332
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"Root.png\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:297
+#: en/SelectAndUseISOs2.xml:338
 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 ""
 
 #. 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
+msgid "Enter the command <command>fdisk -l</command>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:304
-msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
+#: en/SelectAndUseISOs2.xml:345
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"Fdisk.png\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:310
+#: en/SelectAndUseISOs2.xml:351
 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 ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:312
+#: en/SelectAndUseISOs2.xml:354
 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 ""
 
 #. 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"
@@ -3152,45 +3395,48 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:317
+#: en/SelectAndUseISOs2.xml:360
 msgid "<placeholder type=\"screen\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:337
+#: en/SelectAndUseISOs2.xml:380
 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 ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:340
-msgid "Where X=your device name eg: /dev/sdd"
+#: en/SelectAndUseISOs2.xml:382
+msgid ""
+"Where <replaceable>X</replaceable>=your device name eg: <filename>/dev/sdd</"
+"filename>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:341
+#: en/SelectAndUseISOs2.xml:384
 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 ""
 
 #. 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
+msgid "Enter the command: <command>sync</command>"
 msgstr ""
 
 #. 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 ""
 
@@ -3200,46 +3446,47 @@ msgid "Select your Country / Region"
 msgstr ""
 
 #.  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
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
 "\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/selectCountry.xml:14
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectCountry.xml:20
 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 ""
 
-#. type: Content of: <section><para>
-#: en/selectCountry.xml:19
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectCountry.xml:27
 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 ""
 
 #. type: Content of: <section><note><para>
-#: en/selectCountry.xml:24
+#: en/selectCountry.xml:34
 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 ""
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:33
+#: en/selectCountry.xml:42
 msgid "Input method"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/selectCountry.xml:36
+#: en/selectCountry.xml:45
 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. "
@@ -3248,126 +3495,128 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/selectCountry.xml:45
+#: en/selectCountry.xml:54
 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/selectInstallClass.xml:14
+#: en/selectInstallClass.xml:29
 msgid "Install or Upgrade"
 msgstr ""
 
 #. 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=\"live-bestTime.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"bestTime-im1\"/> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:25
-msgid "Install"
-msgstr "संसाधन"
+#: en/selectInstallClass.xml:41
+msgid "<emphasis role=\"bold\">Install</emphasis>"
+msgstr ""
 
 #. 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"
+#: en/selectInstallClass.xml:50
+msgid "<emphasis role=\"bold\">Upgrade</emphasis>"
 msgstr ""
 
 #. 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
+msgid "Use this option to upgrade an existing installation of Mageia."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/selectInstallClass.xml:39
+#. type: Content of: <section><important><para>
+#: en/selectInstallClass.xml:58
 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."
-msgstr ""
-
-#. type: Content of: <section><note><para>
-#: en/selectInstallClass.xml:50
-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."
+"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 ""
 
 #. type: Content of: <section><tip><para>
-#: en/selectInstallClass.xml:62
+#: en/selectInstallClass.xml:67
 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/selectKeyboardLive.xml:3
-msgid "Select keyboard"
-msgstr ""
+#: en/selectKeyboardLive.xml:14
+#, fuzzy
+msgid "Select Keyboard"
+msgstr "कीबोर्ड"
 
 #. 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 align=\"center\" fileref=\"live-bestTime.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"bestTime-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 ""
 
 #. type: Content of: <section><info><title>
-#: en/selectKeyboard.xml:7
+#: en/selectKeyboard.xml:20
 msgid "Keyboard"
 msgstr "कीबोर्ड"
 
 #. 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."
 msgstr ""
 
 #. 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 format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+"align=\"center\"/> </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 "
@@ -3378,24 +3627,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:31
+#: en/selectKeyboard.xml:45
 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 ""
 
-#. 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
 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 ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:46
+#: en/selectKeyboard.xml:60
 msgid ""
 "If you choose a keyboard based on non-Latin characters, you will see an "
 "extra dialogue screen asking how you would prefer to switch between the "
@@ -3403,80 +3652,84 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:15
+#: en/selectLanguage.xml:34
 msgid "Please choose a language to use"
 msgstr "कृपया उपयोग में लायी जाने वाली एक भाषा का चयन करें ।"
 
-#. type: Content of: <section><para>
-#: en/selectLanguage.xml:18
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectLanguage.xml:39
 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 ""
 
-#. type: Content of: <section><para>
-#: en/selectLanguage.xml:23
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectLanguage.xml:45
 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 ""
 
-#. type: Content of: <section><para>
-#: en/selectLanguage.xml:27
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectLanguage.xml:50
 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 ""
 
 #. 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 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>"
 
-#. type: Content of: <section><warning><para>
-#: en/selectLanguage.xml:43
+#. type: Content of: <section><important><para>
+#: en/selectLanguage.xml:68
 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 ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:50
+#: en/selectLanguage.xml:76
 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."
-msgstr ""
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:56
-msgid "Mageia uses UTF-8 (Unicode) support by default."
+"it is advisable to install the required language for your keyboard as well"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:58
+#: en/selectLanguage.xml:82
 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 ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:64
+#: en/selectLanguage.xml:89
 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/selectMouse.xml:4
+#: en/selectMouse.xml:10
 msgid "Select mouse"
 msgstr ""
 
@@ -3484,36 +3737,41 @@ msgstr ""
 #.  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 align=\"center\" fileref=\"live-bestTime.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"bestTime-im1\"/> </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."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/selectMouse.xml:25
+#: en/selectMouse.xml:32
 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 ""
 
 #. type: Content of: <section><para>
-#: en/selectMouse.xml:27
+#: en/selectMouse.xml:38
 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 ""
 
-#. 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 ""
 
@@ -3533,299 +3791,371 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:7
-msgid "Bootloader main options"
+#: en/setupBootloader.xml:10
+#, fuzzy
+msgid "Bootloader"
 msgstr "बूटलोडर के मुख्य विकल्प"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:10
-msgid "Bootloader interface"
+#: en/setupBootloader.xml:13
+msgid "Grub2"
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:11
-msgid "By default, Mageia uses exclusively:"
+#. 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:14
+#: en/setupBootloader.xml:17
 msgid ""
-"GRUB2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
+"GRUB2 (with or without graphical menu) will be used exclusively as the "
+"bootloader for a Legacy/MBR or Legacy/GPT system."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:18
-msgid "GRUB2-efi for a UEFI system."
+#: en/setupBootloader.xml:21
+msgid ""
+"By default, a new bootloader will be written into either the MBR (Master "
+"Boot Record) of your first hard drive or in the BIOS boot partition."
 msgstr ""
 
-#. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:22
-msgid "The Mageia graphical menus are nice :)"
+#. type: Content of: <section><section><itemizedlist><title>
+#: en/setupBootloader.xml:27
+msgid "Grub2-efi on UEFI systems"
 msgstr ""
 
-#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:25
-msgid "GRUB2 on Legacy/MBR and Legacy/GPT systems"
+#. 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 ""
 
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:27
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:33
 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>"
+"By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI "
+"System Partition)."
 msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:34 en/setupBootloader.xml:56
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:35
 msgid ""
-"Don't modify the <emphasis role=\"bold\">Boot Device</emphasis> unless you "
-"really know what you are doing."
+"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 ""
 
-#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:38
-msgid "GRUB2-efi on UEFI systems"
-msgstr ""
+#. type: Content of: <section><section><info><title>
+#: en/setupBootloader.xml:46
+#, fuzzy
+msgid "Bootloader Setup"
+msgstr "बूटलोडर के मुख्य विकल्प"
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:39
-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 ""
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:49
+msgid "Bootloader main options"
+msgstr "बूटलोडर के मुख्य विकल्प"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:42
+#: en/setupBootloader.xml:51
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+"<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 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>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:62
+msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:49
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:63
 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."
+"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><title>
-#: en/setupBootloader.xml:61
-msgid "Using a Mageia bootloader"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:67
+msgid "<emphasis role=\"bold\">Boot device</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:62
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:68
+msgid "Don't change this unless you really know what you are doing"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:72
 msgid ""
-"By default, and according to your system, Mageia writes one of the following:"
+"<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:66
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:74
 msgid ""
-"a GRUB2 bootloader either into the MBR (Master Boot Record) of your first "
-"hard drive or in the BIOS boot partition."
+"This text box lets you set a delay, in seconds, before the default operating "
+"system is started up."
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:70
-msgid "a GRUB2-efi bootloader into the ESP"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:78
+msgid "<emphasis role=\"bold\">Security</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:73
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:79
 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."
+"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 ""
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:78
-msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata fileref=\"live-setupBootloader3.png\" align=\"center\"/> </"
-"imageobject>"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:88
+msgid "Choose a password for the bootloader (optional)"
 msgstr ""
 
-#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:87
-msgid "Using an existing bootloader"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:91
+msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:88
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:92
 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."
+"Retype the password and DrakX will check that it matches with the one set "
+"above"
 msgstr ""
 
-#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:95
-msgid "Using chain loading"
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:96 en/setupBootloader.xml:154
+msgid "<emphasis>Advanced</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:96
-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>."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:99
+msgid "<emphasis>Enable ACPI</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:101
+#. 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 ""
 
-#. type: Content of: <section><section><para>
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
 #: en/setupBootloader.xml:108
-msgid ""
-"You will get a warning that the bootloader is missing, ignore it by clicking "
-"<guibutton>OK</guibutton>."
+msgid "<emphasis>Enable SMP</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:111
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:109
 msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
-"imageobject>"
+"This option enables/disables symmetric multiprocessing for multi-core "
+"processors"
 msgstr ""
 
-#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:117
-msgid "Options"
-msgstr "विकल्पों"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:113
+msgid "<emphasis>Enable APIC</emphasis>"
+msgstr ""
 
-#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:119
-msgid "First page"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:114
+msgid ""
+"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 ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
 #: en/setupBootloader.xml:120
+msgid "<emphasis>Enable Local APIC</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:121
 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."
+"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><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:122
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:127
+#, fuzzy
+msgid "Bootloader Configuration"
+msgstr "बूटलोडर के मुख्य विकल्प"
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:129
+#, fuzzy
 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."
+"<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 format=\"PNG\" fileref="
+"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
+"\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata format="
+"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><section><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:139
+msgid "<emphasis role=\"bold\">Default</emphasis>"
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:126
-msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the password and DrakX will "
-"check that it matches with the one above."
+#. 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><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:127 en/setupBootloader.xml:159
-msgid "<guilabel>Advanced</guilabel>"
+#: en/setupBootloader.xml:143
+msgid "<emphasis role=\"bold\">Append</emphasis>"
 msgstr ""
 
-#. 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:144
 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)."
+"This option lets you pass information to the kernel or tell the kernel to "
+"give you more information as it boots"
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:133
-msgid ""
-"<guilabel>Enable SMP</guilabel>: This option enables/disables symmetric "
-"multiprocessing for multi core processors."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:148
+msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
 msgstr ""
 
-#. 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:149
 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."
+"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:138
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:156
+#, fuzzy
 msgid ""
-"<guilabel>Enable Local APIC</guilabel>: Local APIC manages all external "
-"interrupts for a specific processor in an SMP system."
+"<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 format=\"PNG\" fileref="
+"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
+"\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata format="
+"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:143
-msgid "Next page"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:166
+msgid "<emphasis>Video mode</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:146
-msgid "<guilabel>Default:</guilabel> Operating system started up by default"
+#: en/setupBootloader.xml:167
+msgid ""
+"This sets the screen size and colour depth to be used by the boot menu. If "
+"you click the down-triangle you will be offered other size and colour depth "
+"options."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:150
-msgid ""
-"<guilabel>Append:</guilabel> This option lets you pass the kernel "
-"information or tell the kernel to give you more information as it boots."
+#: en/setupBootloader.xml:172
+msgid "<emphasis>Do not touch ESP or MBR</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:155
+#: en/setupBootloader.xml:173
 msgid ""
-"<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
-"\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
+"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><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:159
+#. 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 format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+"align=\"center\"/> </imageobject>"
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:188
+#, fuzzy
+msgid "Other Options"
+msgstr "विकल्पों"
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:190
+msgid "Using an existing bootloader"
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:191
+msgid ""
+"The exact procedure for adding Mageia to an existing bootloader is beyond "
+"the scope of this documentation. However in most cases it will involve "
+"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 ""
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:199
+msgid "Installing Without a Bootloader"
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:200
 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."
+"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:162
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:207
 msgid ""
-"<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
-"linkend=\"setupChainLoading\">Using the chain loading</link>"
+"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><note><para>
+#: en/setupBootloader.xml:212
+msgid ""
+"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 ""
 
 #. type: Content of: <section><info><title>
-#: en/setupSCSI.xml:3
+#: en/setupSCSI.xml:10
 msgid "Setup SCSI"
 msgstr ""
 
@@ -3837,15 +4167,20 @@ msgstr ""
 #.  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 align=\"center\" fileref=\"live-bestTime.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"bestTime-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:27
+#: en/setupSCSI.xml:39
 msgid ""
 "DrakX will normally detect hard disks correctly. However, with some older "
 "SCSI controllers it may be unable to determine the correct drivers to use "
@@ -3853,79 +4188,57 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:32
+#: en/setupSCSI.xml:44
 msgid ""
-"If this happens, you will need to manually tell DrakX which SCSI drive(s) "
-"you have."
-msgstr ""
-
-#. type: Content of: <section><para>
-#: en/setupSCSI.xml:35
-msgid "DrakX should then be able to configure the drive(s) correctly."
+"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 ""
 
 #. type: Content of: <section><info><title>
-#: en/soundConfig.xml:3
+#: en/soundConfig.xml:10
 msgid "Sound Configuration"
 msgstr ""
 
 #.  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
-msgid ""
-"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
-"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
-msgstr ""
-
-#. type: Content of: <section><para>
-#: en/soundConfig.xml:14
+#: en/soundConfig.xml:20
+#, 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."
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-soundConfig.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"soundConfig-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/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 ""
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:24
+#: 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 ""
 
 #. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:30
+#: en/soundConfig.xml:43
 msgid "Advanced"
 msgstr "उन्नत"
 
-#. type: Content of: <section><section><para>
-#: en/soundConfig.xml:33
-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 ""
-
-#. type: Content of: <section><section><para>
-#: en/soundConfig.xml:38
-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 ""
-
 #. type: Content of: <section><info><title>
-#: en/takeOverHdConfirm.xml:3
+#: en/takeOverHdConfirm.xml:10
 msgid "Confirm hard disk to be formatted"
 msgstr ""
 
@@ -3935,135 +4248,146 @@ msgstr ""
 #.     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=\"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>"
 
-#. type: Content of: <section><para>
-#: en/takeOverHdConfirm.xml:27
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/takeOverHdConfirm.xml:42
 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 ""
 
-#. type: Content of: <section><para>
-#: en/takeOverHdConfirm.xml:31
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/takeOverHdConfirm.xml:48
 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/testing.xml:9
+#: en/testing.xml:3
 msgid "Testing Mageia as Live system"
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/testing.xml:14
+#: en/testing.xml:8
 msgid "Live mode"
 msgstr ""
 
-#. type: Content of: <section><section><mediaobject>
-#: en/testing.xml:18
-msgid "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
-msgstr ""
-
 #. type: Content of: <section><section><para>
-#: en/testing.xml:23
+#: en/testing.xml:11
 msgid ""
-"You get this screen if you selected \"Boot Mageia\". If not, you get the "
-"\"<link linkend=\"doPartitionDisks\">Partitioning</link> step\""
+"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:14
+msgid "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><info><title>
-#: en/testing.xml:28
+#: en/testing.xml:21
 msgid "Testing hardware"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/testing.xml:31
+#: en/testing.xml:24
 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 ""
 
 #. 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 ""
 
 #. 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
+msgid "graphics card: if you see the previous screen, it's already OK."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:47
+#: en/testing.xml:40
 msgid "webcam:"
 msgstr ""
 
 #. 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 ""
 
 #. 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
+msgid "printer: configure your printer/s and print a test page"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:59
+#: en/testing.xml:52
 msgid "scanner: scan a document from ..."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/testing.xml:63
+#: en/testing.xml:56
 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 ""
 
-#. 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
+msgid ""
+"The configuration settings you apply here are carried over if you decide to "
+"proceed with the installation."
 msgstr ""
 
 #. type: Content of: <section><section><section><info><title>
-#: en/testing.xml:72
+#: en/testing.xml:68
 msgid "Launch installation"
 msgstr ""
 
-#. type: Content of: <section><section><section><mediaobject>
-#: en/testing.xml:76
+#. type: Content of: <section><section><section><para>
+#: en/testing.xml:71
 msgid ""
-"<imageobject> <imagedata fileref=\"live-liveMode-install.png\"/> </"
-"imageobject>"
+"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 ""
 
-#. type: Content of: <section><section><section><para>
-#: en/testing.xml:81
+#. type: Content of: <section><section><section><mediaobject>
+#: en/testing.xml:77
 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."
+"<imageobject> <imagedata fileref=\"live-liveMode-install.png\"/> </"
+"imageobject>"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/uninstall-Mageia.xml:3
+#: en/uninstall-Mageia.xml:10
 msgid "Uninstalling Mageia"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:9
+#: en/uninstall-Mageia.xml:18
 msgid ""
 "If Mageia didn't convince you or you can't install it correctly - in short "
 "you want get rid of it - that is your right and Mageia also gives you the "
@@ -4071,34 +4395,37 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:14
+#: en/uninstall-Mageia.xml:23
 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 ""
 
 #. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:19
+#: en/uninstall-Mageia.xml:28
 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 ""
 
 #. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:27
+#: en/uninstall-Mageia.xml:46
 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 ""
 
 #. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:30
+#: en/uninstall-Mageia.xml:49
 msgid ""
 "If you have Vista or 7, you have one more possibility, you can extend the "
 "existing partition that is at the left of the freed space. There are other "
@@ -4108,36 +4435,63 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/unused.xml:9
+#: en/unused.xml:3
 msgid "Keep or delete unused material"
 msgstr ""
 
+#. 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 format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><para>
-#: en/unused.xml:19
+#: en/unused.xml:14
 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 ""
+
+#. 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>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/unused.xml:30
+#: en/unused.xml:31
 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 ""
+
+#~ msgid "From a disc"
+#~ msgstr "डिस्क द्वारा"
+
+#~ msgid "From a USB device"
+#~ msgstr "यूएसबी डिवाइस द्वारा"
+
+#~ msgid "Install"
+#~ msgstr "संसाधन"
diff --git a/docs/docs/stable/installer/hr.po b/docs/docs/stable/installer/hr.po
index 36e634a7..6a057c36 100644
--- a/docs/docs/stable/installer/hr.po
+++ b/docs/docs/stable/installer/hr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2018-04-19 16:32+0300\n"
+"POT-Creation-Date: 2019-01-06 12:43+0200\n"
 "PO-Revision-Date: 2018-03-03 17:14+0000\n"
 "Last-Translator: Ivica  Kolić <ikoli@yahoo.com>\n"
 "Language-Team: Croatian (http://www.transifex.com/MageiaLinux/mageia/"
@@ -24,12 +24,12 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 #. type: Content of: <section><info><title>
-#: en/acceptLicense.xml:25
+#: en/acceptLicense.xml:31
 msgid "License and Release Notes"
 msgstr "Licenca i bilješka o izdanju"
 
 #. type: Content of: <section><mediaobject>
-#: en/acceptLicense.xml:29
+#: en/acceptLicense.xml:35
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
@@ -45,80 +45,86 @@ msgstr ""
 "\"live-license.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/acceptLicense.xml:40
+#: en/acceptLicense.xml:46
 msgid "License Agreement"
 msgstr "Ugovor o licenci"
 
-#. 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 ""
 "Prijew instalacije <application>Mageie</application>, molim pročitajte "
 "pažljivo uvjete licence."
 
-#. 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 ""
 "Ovi se uvjeti primjenjuju na cijelu <application>Mageia</application> "
 "distribuciju i moraju biti prihvaćeni prije nego što nastavite."
 
-#. 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 ""
 "Za prihvaćanje jednostavno odaberite <guilabel>Prihvaćam</guilabel> i zatim "
 "kliknite na <guibutton>Slijedeće</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 ""
 "Ako odlučite ne prihvatiti ove uvjete, zahvaljujemo vam pto ste pogledali. "
 "Klikom na  <guibutton>Isključi</guibutton> ponovno ćete pokrenuti vaše "
 "računalo."
 
 #. type: Content of: <section><section><info><title>
-#: en/acceptLicense.xml:63
+#: en/acceptLicense.xml:76
 msgid "Release Notes"
 msgstr "Bilješke o izdanju"
 
 #. 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 ""
 "Da biste vidjeli što je novo u <application>Mageii</application>, kliknite "
 "na <guibutton>Bilješka o izdanju</guibutton> dugme."
 
 #. 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 "hr"
 
 #. 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 "Odabir Medija (Konfiguracija dopunskog instalacijskog medija)"
 
 #.  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."
@@ -130,38 +136,38 @@ 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 ""
 "Ovaj zaslon daje vam listu već prepoznatih repozitorija. MOžewte dodati "
 "ostale izvore za pakete, poput optičkoga diska ili udaljenog izvora. Odabir "
 "izvora određuje koji paketi će biti dostupni za odabir tijekom idućih koraka."
 
 #. 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 "Za mrežni izvor, postoje dva koraka koja trba slijediti:"
 
 #. 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 "Odabir aktivacije mreže, ako već nije aktivna."
 
 #. 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 ""
 "Odabir ogledala ili određenog URL (prvi unos). Odabirom ogledala imate "
 "pristup odabiru svih repozitorija uprave Mageia, poput Nonfree, sa Tainted "
@@ -169,15 +175,15 @@ msgstr ""
 "vlastitu NFS instalaciju."
 
 #. 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 ""
 "Ako ažurirate 64 bitnu instalaciju koja može sadržavati 32 bitne pakete, "
 "preporučuje se da koristite ovaj zaslon za dodavanje mrežnog zrcala "
@@ -187,18 +193,25 @@ msgstr ""
 "potrebne 32 bitne pakete."
 
 #. type: Content of: <section><info><title>
-#: en/addUser.xml:3
-msgid "User and Superuser Management"
-msgstr "Upravljanje korisnikom i superkorisnikom"
+#: en/addUser.xml:9
+#, fuzzy
+msgid "User Management"
+msgstr "Napredno korisničko upravljanje"
 
 #.  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 format=\"PNG\" fileref="
 "\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -206,21 +219,21 @@ msgstr ""
 "\"PNG\" 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 "Poostavi administratorsku (root) lozinku:"
 
 #. 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 ""
 "Preporučljivo je za sve <application>Mageia</application> instalacije "
 "postavit isuperkorisničku ili administrativnu lozinku, koju obično nazivamo "
@@ -231,98 +244,119 @@ msgstr ""
 "lozinku uspoređujući ih."
 
 #. 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 ""
 "Sve su lozinke osjetljive n avelika i mala slova, pa je najbolje koristiti "
 "mješavinu slova (velikih i malih), brojeva i ostalih znakova u lozinki."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:42
+#: en/addUser.xml:57
 msgid "Enter a user"
 msgstr "Unesite korisnika"
 
 #. 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 ""
 "Dodajte korisnika ovdje. korisnik ima manje ovlasti od superkorisnika "
 "(root), ali dovoljno da koristi internet,uredske programe ili igra igre i "
 "sve ostalo što prosječan korisnik radi sa svojim računalom."
 
 #. 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>Generički</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>: ako kliknete na ovo dugme promjeniti će ikonu "
 "korisnika."
 
 #. 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>Generički</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>Pravo ime</guilabel>: Umetni korisničko pravo ime u ovo tekstualno "
 "polje."
 
 #. 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>Generički</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>Ime prijave</guilabel>: Ovdje unesite korisnikovo ie prijave ili "
 "dopustite da drakx koristi verziju korisničkih pravih imena. <emphasis>Ime "
 "prijave je osjetljivo na mala i velika slova.</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>Generički</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>Lozinka</guilabel>: U tekstualno polje trebate uppisati korisničku "
 "lozinku. Na kraju tekstualnog polja nalazi se štit koji pokazuje snagu "
 "lozinke.(Također vidi <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>Lozinka (ponovno)</guilabel>: Ponovno upišite korisničku lozinku u "
 "ovo tekstualno polje i drakx će provjeriti imate li istu lozinku u svakom "
 "tekstualnom polju."
 
 #. 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 ""
 "Bilo koji korisnik kojeg dodate tijekom instalacije Mageie, imati će imati "
 "će osobni direktorij zaštićen za pisanje i čitanje (umask=0027)."
 
 #. 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</"
@@ -334,51 +368,51 @@ msgstr ""
 "korisnicima</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 "Dozvole pristupa također se mogu promjeniti nakon instlacije."
 
 #. 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 "Napredno korisničko upravljanje"
 
 #. 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 ""
 "Ako je  kliknuto na <guibutton>napredno</guibutton> dugme nudi vam se zaslon "
 "gdje možete urediti postavke korisnika kojega dodajete."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:101
+#: en/addUser.xml:123
 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 ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:107
+#: en/addUser.xml:130
 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 ""
 
 #. 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 "Odaberite mjesta montiranja"
 
@@ -393,16 +427,17 @@ msgstr "Odaberite mjesta montiranja"
 #.        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="
@@ -412,56 +447,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 ""
 "Ovdje možete vidjeti linux particije kje su nađene na vašem računalu. Ako se "
 "ne slažete sa <application>DrakX</application> sugerstijama, možete "
 "promjeniti točke montiranja."
 
-#. 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 ""
-"Ako išta promjenite, budite sigurni da još uvijek imate <literal>/</literal> "
-"(root) particiju."
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:46
-#, fuzzy
-msgid ""
-"Every partition is shown to the left as: <emphasis role=\"bold\">Device "
-"(capacity, mount point, type).</emphasis>"
-msgstr ""
-"Svaka particija je prikazana kao što slijedi:\n"
-"\"Uređaj\" (\"Kapacitet\", \"Točka montiranja\", \"Vrsta\")."
-
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:50
+#: en/ask_mntpoint_s.xml:55
 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 ""
 "Ako imate puno particija, možete izabrati mnogo različitih točaka montiranja "
 "iz padajućeg izbornika, kao što su  <literal>/</literal>, <literal>/home</"
@@ -471,7 +487,7 @@ msgstr ""
 "literal> particiju cauldron instalacije."
 
 #. 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 "
@@ -481,286 +497,407 @@ msgstr ""
 "montiranja."
 
 #. 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 ""
+"Ako išta promjenite, budite sigurni da još uvijek imate <literal>/</literal> "
+"(root) particiju."
+
+#. 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 ""
 "Izaberite  <guibutton>Prethodno</guibutton> ako niste sigurni što odabrati, "
 "i zatim označite <guilabel>Prilagođeno particioniranje diska</guilabel>. Na "
 "zalonu koji će uslijediti, kliknite na particiju da vidite vrstu i veličinu."
 
 #. 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 ""
 "Ako ste sigurni da su točke montiranja ispravne, kliknite na "
 "<guibutton>Slijedeće</guibutton>, i izaberite želite li formatirati samo "
 "particiju(e) koje sugerira DrakX, ili više."
 
 #. type: Content of: <section><info><title>
-#: en/bestTime.xml:10
-msgid "Clock settings"
+#: en/bestTime.xml:5
+#, fuzzy
+msgid "Clock Settings"
 msgstr "Postavke sata"
 
 #. 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 ""
 "U ovom koraku morate odrediti na koje će vrijeme vaš interni sat biti "
 "postavljen. Lokalno iti UTC vrijeme."
 
 #. type: Content of: <section><para>
-#: en/bestTime.xml:23
-msgid "In advanced tab, you will find more options about clock settings."
-msgstr "U naprednoj kartici naći ćete još opcija o postavkama sata."
+#: 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 "Podigni Mageia kao živi sustav"
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:1
+#: en/bootLive.xml:10
 msgid "Booting the medium"
 msgstr "Podižem medij"
 
-#. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:1
-msgid "From a disc"
-msgstr "Sa diska"
-
-#. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:1
+#. type: Content of: <section><section><para>
+#: en/bootLive.xml:12
 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."
+"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 ""
 
-#. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:7
-msgid "From a USB device"
-msgstr "Sa USB uređaja"
+#. 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 ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:12
+#: en/bootLive.xml:35
 msgid "In BIOS/CSM/Legacy mode"
 msgstr ""
 
+#. 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>Prilagođeno</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
+msgid "Once the boot is done, you can proceed to the installation."
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/bootLive.xml:45 en/bootLive.xml:57
+#, fuzzy
+msgid ""
+"<emphasis role=\"bold\">+ use non-free video drivers (slower to boot)</"
+"emphasis>"
+msgstr "<emphasis>Generički</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>Prilagođeno</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 ""
+"Instaliraj Mageia: Ovaj izbor će direktno instalirati Mageiu na tvrdi 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 format=\"PNG\" fileref=\"dx2-chooseDesktop.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 ""
 
-#. type: Content of: <section><section><para>
-#: en/bootLive.xml:12
-msgid "In the middle menu, you have the choice between three actions:"
+#. 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
+#: en/bootLive.xml:75
+#, fuzzy
+msgid "<keycap>F1</keycap> <emphasis role=\"bold\">Help</emphasis>"
+msgstr "<emphasis>Generički</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:76
 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."
+"Within any of the <keycap>F2</keycap> to <keycap>F6</keycap> options, you "
+"can view relevant help by pressing <keycap>F1</keycap>."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:16
+#: en/bootLive.xml:81
+#, fuzzy
+msgid "<keycap>F2</keycap> <emphasis role=\"bold\">Language</emphasis>"
+msgstr "<emphasis>Generički</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:82
 msgid ""
-"Install Mageia: This choice will directly install Mageia on a hard disk."
+"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 ""
-"Instaliraj Mageia: Ovaj izbor će direktno instalirati Mageiu na tvrdi disk."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:17
+#: en/bootLive.xml:87
+#, fuzzy
+msgid "<keycap>F3</keycap> <emphasis role=\"bold\">Video Mode</emphasis>"
+msgstr "<emphasis>Generički</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:89
 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)."
+"If needed, change the screen resolution by pressing <keycap>F3</keycap>. "
+"Options are: 640x480, 800x600, 1024x768."
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/bootLive.xml:19
-msgid "In the bottom menu, are the Boot Options:"
-msgstr ""
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:93
+#, fuzzy
+msgid "<keycap>F4</keycap> <emphasis role=\"bold\">Source</emphasis>"
+msgstr "<emphasis>Generički</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:19
+#: en/bootLive.xml:94
 msgid ""
-"F1 - Help. Explain the options \"splash\", \"apm\", \"acpi\" and \"Ide\""
-msgstr "F1 - Pomoć. Objasni opcije \"splash\", \"apm\", \"acpi\" and \"Ide\""
+"Normally, the installation is performed from the inserted installation "
+"medium. Here, you may select other sources, like FTP or NFS servers."
+msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:20
-msgid "F2 - Language. Choose the display language of the screens."
-msgstr "F2 - Jezik. Odaberite jezik koji će biti prikazan na zaslonima."
+#: en/bootLive.xml:95
+msgid ""
+"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 ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:21
-msgid "F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728"
-msgstr "F3 - Razlučivost zaslona. Birajte između, 640x400, 800x600, 1024x728"
+#: en/bootLive.xml:98
+#, fuzzy
+msgid "<keycap>F5</keycap> <emphasis role=\"bold\">Driver</emphasis>"
+msgstr "<emphasis>Generički</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:22
+#: en/bootLive.xml:99
 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 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 ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:26
+#: en/bootLive.xml:104
+#, fuzzy
+msgid "<keycap>F6</keycap> <emphasis role=\"bold\">Kernel Options</emphasis>"
+msgstr "<emphasis>Prilagođeno</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:106
 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 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>Plug 'n Play</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
+msgid ""
+"<emphasis role=\"bold\">No ACPI:</emphasis> (Advanced Configuration and "
+"Power Interface): Power management features are not used."
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/bootLive.xml:125
+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 ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:28
+#: en/bootLive.xml:131
 msgid ""
-"F6 - Kernel options. This is a way to specify options according to your "
-"hardware and the drivers to use."
+"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 ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:29
+#: en/bootLive.xml:139
 msgid "In UEFI mode"
 msgstr "U UEFI načinu rada"
 
 #. 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"
+#: en/bootLive.xml:146
+msgid "First screen while booting in UEFI mode"
 msgstr ""
 
 #. 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 ""
-"Imate samo izbor između pokretanja Mageie u Live načinu rada (prvi izbor) "
-"ili instalacijski proces (drugi izbor)."
 
-#. type: Content of: <section><section><para>
-#: en/bootLive.xml:30
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:153
 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 ""
 
-#. 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 ""
-"U svakom slučaju, prvi koraci će biti izbor jezika, vremenska zona i "
-"tipkovnica, tada se proces razlikuje, sa <link linkend=\"testing\">dodatnim "
-"koracima u Live načinu rada</link>."
 
 #. type: Content of: <section><info><title>
-#: en/chooseDesktop.xml:3
+#: en/chooseDesktop.xml:16
 msgid "Desktop Selection"
 msgstr "Odabir radnog okruženja"
 
 #. 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 ""
-"Ovisno o vašem odabiru, možda vam budu ponuđeni daljnji zasloni za fino "
-"ugađanje vašega izbora."
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:11
+#: en/chooseDesktop.xml:26
 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 ""
 
 #. 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 format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
 "align=\"center\"/> </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 ""
 "Odaberite želite li upotrebljavati <application>KDE</application> ili "
 "<application>Gnome</application> radno okruženje.Oba dolaze sa korisnim "
@@ -776,8 +913,9 @@ msgid "Package Group Selection"
 msgstr "Odabir grupe paketa"
 
 #. 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
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
 "\" align=\"center\"/> </imageobject>"
@@ -786,7 +924,7 @@ msgstr ""
 "\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:14
+#: en/choosePackageGroups.xml:16
 msgid ""
 "Packages are arranged into common groups, to make choosing what you need on "
 "your system a lot easier. The groups are fairly self explanatory, however "
@@ -795,25 +933,25 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:21
+#: en/choosePackageGroups.xml:23
 #, fuzzy
 msgid "<emphasis role=\"bold\">Workstation</emphasis>"
 msgstr "<emphasis>Prilagođeno</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>Generički</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>Generički</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 "
@@ -823,7 +961,7 @@ msgstr ""
 "ili uklanajnje paketa."
 
 #. 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 "
@@ -838,8 +976,10 @@ msgid "Choose Individual Packages"
 msgstr "Izaberi pojedinačne pakete"
 
 #. 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"
@@ -849,7 +989,7 @@ msgstr ""
 "\" align=\"center\"/> </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."
@@ -858,13 +998,13 @@ msgstr ""
 "instalacije."
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:17
+#: en/choosePackagesTree.xml:21
 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 ""
 
 #. type: Content of: <section><info><title>
@@ -874,8 +1014,10 @@ msgstr "Konfigurirajte vaše servise"
 
 #.  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"
@@ -887,32 +1029,29 @@ msgstr ""
 "imagedata> </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 ""
 "Ovdje možete postaviti koje servise (ne) pokrenuti kada podignete vaš sustav."
 
-#. type: Content of: <section><para>
-#: en/configureServices.xml:19
-msgid "Click on a triangle to expand a group to all the relevant services."
-msgstr ""
-
-#. type: Content of: <section><para>
-#: en/configureServices.xml:22
-msgid "The settings DrakX chose are usually good."
+#. 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: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."
 msgstr ""
 
 #. 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 ""
 
@@ -923,15 +1062,17 @@ msgstr "Konfigurirajte vremensku zonu"
 
 #.  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-"
@@ -939,18 +1080,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 ""
 "Odaberite vašu vremensku zonu birajući vašu državu ili grad blizu vas u "
 "istoj vremenskoj zoni."
 
 #. 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 "
@@ -960,7 +1101,7 @@ msgstr ""
 "vrijeme ili na GMT, također poznat kao 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."
@@ -969,114 +1110,115 @@ msgstr ""
 "svi postavljeni na lokalno vrijeme ili na "
 
 #. 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 ""
 
 #. 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 revision=\"1\" align=\"center\" xml:id="
-"\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" format="
-"\"PNG\"/> </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."
 msgstr ""
 
 #. 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:"
 msgstr ""
 
-#. 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 "proizvođač"
 
 #. 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 "ime vaše kartice"
 
 #. 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 "vrsta kartice"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:41
+#: en/configureX_card_list.xml:53
 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 ""
 
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:47
+#. type: Content of: <section><caution><para>
+#: en/configureX_card_list.xml:61
 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 ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:51
+#: en/configureX_card_list.xml:65
 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."
-msgstr ""
-
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:56
-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."
+"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 ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:3
+#: en/configureX_chooser.xml:11
 msgid "Graphic Card and Monitor Configuration"
 msgstr "Konfiguracija grafičke kartice i monitora"
 
 #.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
+#. 2018/02/15 apb: Some text and typography.
+#. 2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.
+#. 2018/02/23 apb: Typo.
 #. 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 obzira koje grafičko okruženje ( također poznato i kao desktop "
 "okruženje) izaberete za prvu instalaciju<application>Mageie</application>, "
@@ -1089,67 +1231,96 @@ msgstr ""
 "izbor neispravan."
 
 #. 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>Generički</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>Grafička kartica</guibutton></emphasis>: Izaberite vašu "
-"grafičku karticu sa liste ako je potrebno."
 
 #. 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>Generički</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_chooser.xml:52
 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 ""
 
-#. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/configureX_chooser.xml:41
-msgid "Incorrect refresh rates may damage your monitor"
-msgstr ""
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_chooser.xml:60
+#, fuzzy
+msgid "<emphasis role=\"bold\">Resolution</emphasis>"
+msgstr "<emphasis>Prilagođeno</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>Razlučivost</guibutton></emphasis>: Ovdje postavite "
 "željenu razlučivost i dubinu boja."
 
 #. 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>Generički</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_chooser.xml:71
 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 ""
 
 #. 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>Prilagođeno</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>Opcije</guibutton></emphasis>: Ovdje možete izabrati "
 "omogućavanje ili onemogućavanje raznih opcija."
 
+#. 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 "Izaberite vaš monitor"
 
 #. 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."
@@ -1158,7 +1329,7 @@ msgstr ""
 "identificirati vaš."
 
 #. 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 "
@@ -1172,32 +1343,32 @@ msgstr ""
 "svoga monitora"
 
 #. 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>Prilagođeno</emphasis>"
+#. type: Content of: <section><variablelist><varlistentry><term>
+#: en/configureX_monitor.xml:46
+msgid "Custom"
+msgstr ""
 
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:33
+#. type: Content of: <section><variablelist><varlistentry><listitem><para>
+#: en/configureX_monitor.xml:49
 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."
 msgstr ""
 
-#. 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 "
@@ -1205,145 +1376,155 @@ msgid ""
 "consult your monitor documentation."
 msgstr ""
 
-#. 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 ""
 "Ovo je zadana opcija i pokušava odrediti vrstu monitora iz baze podataka "
 "monitora."
 
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:51
-msgid "<emphasis>Vendor</emphasis>"
-msgstr "<emphasis>Proizvođač</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:"
 msgstr ""
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:61
-msgid "the monitor manufacturers name"
-msgstr "ime proizvođača 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 "opis 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>Generički</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
 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 ""
 
 #. 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 "Prilagođeno particioniranje diska pomoću DiskDrakea"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:12
-msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
-"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
-msgstr ""
-
-#. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:22
+#: en/diskdrake.xml:27
+#, 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."
+"<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-diskdrake2.png"
+"\" align=\"center\"/></imageobject><imageobject condition=\"live"
+"\"><imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/></"
+"imageobject>"
 
-#. 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 ""
 "Ovdje prilagodite raspored svojih disk(ova). Možete ukloniti ili napraviti "
 "particije, promijeniti datotečni sustav particije ili promijeniti njenu "
 "veličinu i čak i vidjeti što je na njima prije nego počnete."
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:34
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/diskdrake.xml:45
 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>."
+"device, like a USB key). In the screenshot above there are two available "
+"devices: <filename>sda </filename>and <filename>sdb</filename>."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:39
-#, 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."
-msgstr ""
-"Pritisnite <guibutton>Očisti sve</guibutton> za brisanje svih particija na "
-"odabranom uređaju za pohranu"
-
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:43
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/diskdrake.xml:52
 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 ""
 
-#. 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 "Nastavite dok ne prilagodite sve sukladno svojim željama."
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:52
-msgid "Click <guibutton>Done</guibutton> when you're ready."
-msgstr "Kliknite na <guibutton>Učinjeno</guibutton> kada ste spremni."
+#. 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 ""
+"Pritisnite <guibutton>Očisti sve</guibutton> za brisanje svih particija na "
+"odabranom uređaju za pohranu"
 
-#. type: Content of: <section><note><para>
-#: en/diskdrake.xml:56
+#. type: Content of: <section><warning><orderedlist><listitem><para>
+#: en/diskdrake.xml:75
+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 ""
+
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/diskdrake.xml:87
 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 ""
+
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/diskdrake.xml:93
+msgid ""
+"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
+"partition is present and of the correct type. See Figure 2 below."
 msgstr ""
 
-#. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:61
+#. type: Content of: <section><figure><title>
+#: en/diskdrake.xml:101
+#, fuzzy
+msgid "EFI System Partition"
+msgstr "Koristi postojeće particije"
+
+#. 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-diskdrake2.png"
@@ -1351,20 +1532,18 @@ msgstr ""
 "\"><imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/></"
 "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
-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 ""
 
-#. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:76
+#. type: Content of: <section><mediaobject>
+#: en/diskdrake.xml:118 en/doPartitionDisks.xml:200
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1377,302 +1556,326 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:9
-msgid "Partitioning"
+#: en/doPartitionDisks.xml:25
+#, fuzzy
+msgid "Suggested Partitioning"
 msgstr "Particioniranje"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:12
+#: en/doPartitionDisks.xml:28
 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 ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:16
+#: en/doPartitionDisks.xml:32
 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 ""
 
 #. 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 align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:32
-msgid "Use Existing Partitions"
-msgstr "Koristi postojeće particije"
+#. type: Content of: <section><itemizedlist><title>
+#: en/doPartitionDisks.xml:47
+#, fuzzy
+msgid "Main Options"
+msgstr "Opcije"
 
-#. 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>Prilagođeno</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."
 msgstr ""
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:41
-msgid "Use Free Space"
-msgstr "Koristi slobodni prostor"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:59
+#, fuzzy
+msgid "<emphasis role=\"bold\">Use Free Space</emphasis>"
+msgstr "<emphasis>Generički</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."
 msgstr ""
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:49
-msgid "Use Free Space on a Windows Partition"
-msgstr ""
-
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
-msgid ""
-"If you have unused space on an existing Windows partition, the installer may "
-"offer to use it."
-msgstr ""
-
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:56
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:68
+#, 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!"
-msgstr ""
+"<emphasis role=\"bold\">Use Free Space on a Windows Partition</emphasis>"
+msgstr "<emphasis>Prilagođeno</emphasis>"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:61
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:71
 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."
+"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 ""
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:69
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:77
 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 ""
 
-#. 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 align=\"center\" fileref="
-"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:87
-msgid "Erase and use Entire Disk."
-msgstr "Izbriši i koristi cijeli disk."
+msgid "<emphasis role=\"bold\">Erase and use Entire Disk</emphasis>"
+msgstr "<emphasis>Generički</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 "Ova će opcija koristiti cijeli pogon za 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!"
+#. type: Content of: <section><itemizedlist><listitem><warning><para>
+#: en/doPartitionDisks.xml:92
+msgid ""
+"This will erase ALL data on the selected hard drive. Take care! If you "
+"intend to use part of the disk for something else, or you already have data "
+"on the drive that you are not prepared to lose, then do not use this option."
 msgstr ""
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:96
+#. type: Content of: <section><itemizedlist><listitem><important><para>
+#: en/doPartitionDisks.xml:99
 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."
+"Note that this involves shrinking the size of the Windows partition. The "
+"partition must be \"clean\", meaning that Windows must have closed down "
+"correctly the last time it was used. It must also have been defragmented, "
+"although this is not a guarantee that all files in the partition have been "
+"moved out of the area that is about to be used. It is highly recommended to "
+"back up your personal files."
 msgstr ""
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:103
-msgid "Custom disk partitioning"
-msgstr "Proizvoljno particioniranje diska"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:110
+#, fuzzy
+msgid "<emphasis role=\"bold\">Custom Disk Partitioning</emphasis>"
+msgstr "<emphasis>Prilagođeno</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)."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:112
-msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
+#. type: Content of: <section><mediaobject>
+#: en/doPartitionDisks.xml:120
+#, fuzzy
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"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
 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 ""
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:125
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:141
 msgid ""
 "If the total available space is greater than 50 GB, then three partitions "
 "are created"
 msgstr ""
 
-#. 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
 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 ""
 
-#. 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
+msgid "1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB"
 msgstr ""
 
-#. 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
 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 ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:144
+#: 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 ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:150
+#: en/doPartitionDisks.xml:182
 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 ""
 
 #. 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
-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 ""
 
-#. 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 format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+"align=\"center\"/> </imageobject>"
 
-#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:182
+#. type: Content of: <section><important><para>
+#: en/doPartitionDisks.xml:216
 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 ""
 
-#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:189
+#. type: Content of: <section><important><para>
+#: en/doPartitionDisks.xml:221
+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 ""
+
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:228
 #, fuzzy
-msgid "<emphasis role=\"bold\">Align to</emphasis> = MiB"
+msgid "<emphasis>Align to</emphasis> = MiB"
 msgstr "<emphasis>Plug 'n Play</emphasis>"
 
-#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:191
-msgid "<emphasis role=\"bold\">Free space preceding (MiB)</emphasis> = 2"
-msgstr ""
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:232
+#, fuzzy
+msgid "<emphasis>Free space preceding (MiB)</emphasis> = 2"
+msgstr "<emphasis>Generički</emphasis>"
 
-#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:194
+#. type: Content of: <section><important><para>
+#: en/doPartitionDisks.xml:236
 msgid ""
 "Also make sure all partitions are created using an even number of megabytes."
 msgstr ""
 
 #. 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 ""
 
 #. 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 "Veljača 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 "Službena dokumentacija za 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=\"../live-bootCSM.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/"
@@ -1680,8 +1883,8 @@ msgid ""
 msgstr ""
 
 #. 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."
@@ -1689,114 +1892,115 @@ msgid ""
 msgstr ""
 
 #. 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</"
 "link>, if you would like to help improve this manual."
 msgstr ""
 
-#. 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 ""
 
 #. 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 "
 "while installing."
 msgstr ""
 
-#. 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 ""
 
+#. type: Content of: <article><info><cover><para>
+#: en/DrakLive.xml:33
+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 ""
+
 #. 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 "Instalacija pomoću "
 
 #. type: Content of: <book><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:9
+#: en/DrakX-cover.xml:20
 msgid "February 2014"
 msgstr "Veljača 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=\"../live-bootCSM.png\"/></imageobject>"
-
 #. type: Content of: <section><info><title>
 #: en/exitInstall.xml:3
 msgid "Congratulations"
 msgstr "Čestitamo"
 
 #.  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
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 msgstr ""
 
 #. 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 ""
 "Završili ste instaliranje i konfiguriranje <application>Mageie</application> "
 "i sada je sigurno ukloniti instalcijski medij i napraviti reboot računala."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:18
+#: en/exitInstall.xml:22
 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 ""
 
 #. 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."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:26
+#: en/exitInstall.xml:30
 msgid "Enjoy!"
 msgstr "Uživajte!"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:28
+#: en/exitInstall.xml:32
 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/firewall.xml:3
+#: en/firewall.xml:7
 msgid "Firewall"
 msgstr "Vatrozid"
 
 #. 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 "
@@ -1805,46 +2009,46 @@ 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
 msgid "<emphasis role=\"bold\">Advanced</emphasis>"
 msgstr ""
 
 #. 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
 msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
 msgstr ""
 
 #. 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 "
@@ -1852,28 +2056,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 "Formatiram"
 
@@ -1881,15 +2085,16 @@ msgstr "Formatiram"
 #.  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 align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1897,379 +2102,322 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:24
+#: en/formatPartitions.xml:35
 msgid ""
 "Here you can choose which partition(s) you wish to format. Any data on "
 "partitions <emphasis>not</emphasis> marked for formatting will be preserved."
 msgstr ""
 
 #. 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 ""
 "Uobičajeno je da barem particije koje je odabrao DrakX moraju biti "
 "formatirane."
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:31
+#: en/formatPartitions.xml:42
 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 ""
 
 #. type: Content of: <section><tip><para>
-#: en/formatPartitions.xml:36
+#: en/formatPartitions.xml:47
 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 ""
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:43
+#: en/formatPartitions.xml:54
 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:10
+#: en/installer.xml:14
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, Mageia instalacijski program"
 
 #. 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 "
 "possible."
 msgstr ""
 
-#. 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 ""
-
 #. type: Content of: <section><section><title>
-#: en/installer.xml:22
-msgid "Installation Welcome Screen"
-msgstr "Instalacijski zaslon dobrodošlice"
-
-#. type: Content of: <section><section><section><title>
-#: en/installer.xml:25
-msgid "Using a Mageia DVD"
-msgstr ""
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:27
-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 ""
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:32
-msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
-msgstr ""
-
-#. 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."
-msgstr ""
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:45
-msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
+#: en/installer.xml:20
+msgid "The installation steps"
 msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:50
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/installer.xml:23
 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):"
+"The install process is divided into a number of steps - the status of which "
+"is indicated in a panel to the left of the screen."
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:55
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/installer.xml:28
 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>"
+"Each step has one or more screens, which may also have <emphasis>Advanced</"
+"emphasis> sections with extra, less commonly required options."
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:63
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/installer.xml:33
 msgid ""
-"Press <emphasis role=\"bold\">F2</emphasis> to have the installer use a "
-"specific language for the installation."
+"Most screens have <emphasis>Help</emphasis> buttons for further details "
+"about the particular step."
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:67
+#. type: Content of: <section><section><caution><para>
+#: en/installer.xml:38
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+"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 ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:72
+#. type: Content of: <section><section><caution><para>
+#: en/installer.xml:43
 msgid ""
-"Use the arrow keys to select the language then press <emphasis role=\"bold"
-"\">Enter</emphasis>."
+"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><para>
-#: en/installer.xml:77
-msgid ""
-"If needed, change the screen resolution by pressing <emphasis role=\"bold"
-"\">F3</emphasis> (Legacy mode only)."
-msgstr ""
+#. type: Content of: <section><section><title>
+#: en/installer.xml:48
+msgid "Installation Welcome Screen"
+msgstr "Instalacijski zaslon dobrodošlice"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:81
+#. type: Content of: <section><section><para>
+#: en/installer.xml:49
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome5def.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 ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:88
+#. type: Content of: <section><section><para>
+#: en/installer.xml:52
 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)."
+"The welcome menu screen has various options, however the default option will "
+"start the installer, and is normally all that you will need."
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/installer.xml:96
-msgid "Default: It doesn't alter anything in the default options."
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:56
+msgid "Legacy (BIOS) Systems"
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/installer.xml:101
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:58
+#, fuzzy
 msgid ""
-"Safe Settings: Priority is given to the safer options at the price of a "
-"performance detriment."
+"<imageobject> <imagedata fileref=\"dx-welcome.png\" align=\"center\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+"align=\"center\"/> </imageobject>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/installer.xml:106
-msgid ""
-"No ACPI: (Advanced Configuration and Power Interface): Power management "
-"features are not used."
+#. type: Content of: <section><section><section><itemizedlist><title>
+#: en/installer.xml:63
+msgid "Menu"
 msgstr ""
 
-#. 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:66
 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."
+"Install Mageia to a hard disk. This is the default option, and will "
+"automatically start after a short while unless another option is selected."
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:120
-msgid ""
-"When you select one of these entries, it modifies the default options "
-"displayed in the <guilabel>Boot Options</guilabel> line."
-msgstr ""
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:69
+#, fuzzy
+msgid "<emphasis role=\"bold\">Rescue System</emphasis>"
+msgstr "<emphasis>Generički</emphasis>"
 
-#. 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:70
 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."
+"This option allows you to either re-install the bootloader for an existing "
+"Mageia installation or you can use it to restore a Windows bootloader."
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:132
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
-msgstr ""
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:75
+#, fuzzy
+msgid "<emphasis role=\"bold\">Memory Test</emphasis>"
+msgstr "<emphasis>Generički</emphasis>"
 
-#. 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:76
 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."
+"Test the installed RAM by performing multiple read and write operations. "
+"Reboot to end the test."
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:146
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
-msgstr ""
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:80
+#, fuzzy
+msgid "<emphasis role=\"bold\">F2: Language</emphasis>"
+msgstr "<emphasis>Generički</emphasis>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:151
-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><itemizedlist><listitem><para>
+#: en/installer.xml:81
+msgid "Press F2 for alternative languages."
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:158
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:86
+msgid "UEFI Systems"
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:164
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:87
 msgid ""
-"The help is translated in the chosen language with <emphasis role=\"bold"
-"\">F2</emphasis>."
+"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 ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:168
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:92
+#, fuzzy
 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 ""
-
-#. type: Content of: <section><section><title>
-#: en/installer.xml:177
-msgid "The installation steps"
+"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+"align=\"center\"/> </imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/installer.xml:179
-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 ""
 
-#. type: Content of: <section><section><para>
-#: en/installer.xml:182
-msgid ""
-"Each step has one or more screens which may also have <guibutton>Advanced</"
-"guibutton> sections with extra, less commonly required, options."
-msgstr ""
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:99
+#, fuzzy
+msgid "<emphasis role=\"bold\">Install:</emphasis> Start the Install process"
+msgstr "<emphasis>Plug 'n Play</emphasis>"
 
-#. type: Content of: <section><section><para>
-#: en/installer.xml:186
+#. 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 ""
 
-#. type: Content of: <section><section><note><para>
-#: en/installer.xml:190
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:109
 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 ""
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:203
+#: en/installer.xml:115
 msgid "Installation Problems and Possible Solutions"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:206
+#: en/installer.xml:117
 msgid "No Graphical Interface"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:210
+#: en/installer.xml:120
 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 ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:217
+#: en/installer.xml:126
 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 ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:230
+#: en/installer.xml:138
 msgid "The Install Freezes"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:232
+#: en/installer.xml:139
 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 ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:240
+#: en/installer.xml:146
 msgid "RAM problem"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:242
+#: en/installer.xml:147
 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 ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:249
+#: en/installer.xml:154
 msgid "Dynamic partitions"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:251
+#: en/installer.xml:155
 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/installUpdates.xml:3
+#: en/installUpdates.xml:16
 msgid "Updates"
 msgstr "Nadogradnje"
 
-#.  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 ""
@@ -2277,87 +2425,95 @@ msgstr ""
 "align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:20
+#: en/installUpdates.xml:25
 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 ""
 
-#. 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
 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 ""
 
-#. 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 "Kliknite na <guibutton>Učinjeno</guibutton> kada ste spremni."
 
 #. type: Content of: <section><info><title>
-#: en/login.xml:1
-msgid "Login screen"
+#: en/login.xml:4
+msgid "Login Screen"
 msgstr ""
 
 #. 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
+msgid "SDDM login screen"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/login.xml:1
-msgid "Finally, you will come to the login screen."
+#: en/login.xml:14
+msgid "Finally, you will come to the desktop login screen."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/login.xml:1
+#: en/login.xml:15
 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 ""
 
 #. type: Content of: <section><para>
-#: en/login.xml:3
+#: en/login.xml:16
 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/media_selection.xml:3
-msgid "Media Selection (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
+#: en/media_selection.xml:24
 #, fuzzy
 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=\"login-im1\" fileref=\"live-"
-"login.png\" align=\"center\" 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/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 "
@@ -2366,24 +2522,24 @@ msgid ""
 msgstr ""
 
 #. 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."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:32
+#: en/media_selection.xml:42
 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 ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:40
+#: en/media_selection.xml:50
 msgid ""
 "The <emphasis>Tainted</emphasis> repository includes packages released under "
 "a free license. The main criteria for placing packages in this repository is "
@@ -2398,56 +2554,57 @@ msgid "Minimal Install"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:11
+#: en/minimal-install.xml:17
 msgid ""
-"You can choose a Minimal Installation by de-selecting everything in the "
-"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"/>."
+"Minimal Installation is intended for those with specific uses in mind for "
+"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 ""
 
-#. type: Content of: <section><para>
-#: en/minimal-install.xml:14
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/minimal-install.xml:24
 msgid ""
-"If desired, you can additionally tick the <emphasis role=\"bold\">Individual "
-"package selection</emphasis> option in the same screen."
+"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 ""
 
-#. type: Content of: <section><para>
-#: en/minimal-install.xml:17
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/minimal-install.xml:28
 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"
-"\"/>."
+"If desired, you can additionally tick the <emphasis>Individual package "
+"selection</emphasis> option in the same screen."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/minimal-install.xml:22
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/minimal-install.xml:33
 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."
+"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 ""
 
-#. 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
 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 ""
 
 #. 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="
@@ -2459,295 +2616,319 @@ msgstr ""
 
 #. type: Content of: <section><info><title>
 #: en/misc-params.xml:3
-msgid "Summary of miscellaneous parameters"
-msgstr ""
+#, fuzzy
+msgid "Configuration Summary"
+msgstr "Konfiguracija zvuka"
 
 #.  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 format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+"align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/misc-params.xml:15
+#: en/misc-params.xml:24
 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 ""
 
 #. 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 ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:45
-msgid "<guilabel>Timezone</guilabel>"
-msgstr ""
+#: en/misc-params.xml:54
+#, fuzzy
+msgid "<emphasis role=\"bold\">Timezone</emphasis>"
+msgstr "<emphasis>Generički</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:47
+#: en/misc-params.xml:56
 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 ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:53
-msgid "<guilabel>Country / Region</guilabel>"
-msgstr ""
+#: en/misc-params.xml:62
+#, fuzzy
+msgid "<emphasis role=\"bold\">Country / Region</emphasis>"
+msgstr "<emphasis>Prilagođeno</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:56
+#: en/misc-params.xml:64
 msgid ""
 "If the selected country is wrong, it is very important that you correct the "
 "setting.  See <xref linkend=\"selectCountry\"/>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:62
-msgid "<guilabel>Bootloader</guilabel>"
-msgstr ""
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:64
-msgid "DrakX has made good choices for the bootloader setting."
-msgstr ""
+#: en/misc-params.xml:70
+#, fuzzy
+msgid "<emphasis role=\"bold\">Bootloader</emphasis>"
+msgstr "<emphasis>Generički</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:67
-msgid "Do not change anything, unless you know how to configure GRUB2"
+#: en/misc-params.xml:72
+msgid "DrakX proposal for the bootloader setting"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:70
-msgid "For more information, see <xref linkend=\"setupBootloader\"/>"
+#: en/misc-params.xml:75
+msgid ""
+"Do not change anything, unless you know how to configure GRUB2. For more "
+"information, see <xref linkend=\"setupBootloader\"/>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:75
-msgid "<guilabel>User management</guilabel>"
-msgstr ""
+#: en/misc-params.xml:83
+#, fuzzy
+msgid "<emphasis role=\"bold\">User management</emphasis>"
+msgstr "<emphasis>Generički</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:78
+#: en/misc-params.xml:85
 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 ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:84
-msgid "<guilabel>Services</guilabel>:"
-msgstr ""
+#: en/misc-params.xml:91
+#, fuzzy
+msgid "<emphasis role=\"bold\">Services</emphasis>"
+msgstr "<emphasis>Generički</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:86
+#: en/misc-params.xml:93
 msgid ""
 "System services refer to those small programs which run in the background "
 "(daemons).  This tool allows you to enable or disable certain processes."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:90
+#: en/misc-params.xml:97
 msgid ""
 "You should check carefully before changing anything here - a mistake may "
-"prevent your computer from operating correctly."
-msgstr ""
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:94
-msgid "For more information, see <xref linkend=\"configureServices\"/>"
+"prevent your computer from operating correctly. For more information, see "
+"<xref linkend=\"configureServices\"/>"
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:101
+#: en/misc-params.xml:106
 msgid "Hardware parameters"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:106
-msgid "<guilabel>Keyboard</guilabel>:"
-msgstr ""
+#: en/misc-params.xml:111
+#, fuzzy
+msgid "<emphasis role=\"bold\">Keyboard</emphasis>"
+msgstr "<emphasis>Generički</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:108
+#: en/misc-params.xml:113
 msgid ""
 "Configure your keyboard layout according to your location, language and type "
 "of keyboard."
 msgstr ""
 
 #. 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 ""
+#: en/misc-params.xml:124
+#, fuzzy
+msgid "<emphasis role=\"bold\">Mouse</emphasis>"
+msgstr "<emphasis>Generički</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."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:126
-msgid "<guilabel>Sound card</guilabel>:"
-msgstr ""
+#: en/misc-params.xml:131
+#, fuzzy
+msgid "<emphasis role=\"bold\">Sound card</emphasis>"
+msgstr "<emphasis>Generički</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:129
-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."
+#: en/misc-params.xml:133
+msgid "The installer will use the default driver if one is available."
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:137
-msgid "<guilabel>Graphical interface</guilabel>:"
+#. type: Content of: <section><section><para>
+#: en/misc-params.xml:136 en/soundConfig.xml:46
+msgid ""
+"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 ""
 
 #. 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."
-msgstr ""
+#: en/misc-params.xml:144
+#, fuzzy
+msgid "<emphasis role=\"bold\">Graphical interface</emphasis>"
+msgstr "<emphasis>Generički</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:143
-msgid "For more information, see <xref linkend=\"configureX_chooser\"/>."
+#: en/misc-params.xml:146
+msgid ""
+"This section allows you to configure your graphics card(s) and displays. For "
+"more information, see <xref linkend=\"configureX_chooser\"/>"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/misc-params.xml:149
+#: en/misc-params.xml:155
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
 "\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:157
+#: en/misc-params.xml:163
 msgid "Network and Internet parameters"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:163
-msgid "<guilabel>Network</guilabel>:"
-msgstr ""
+#: en/misc-params.xml:169
+#, fuzzy
+msgid "<emphasis role=\"bold\">Network</emphasis>"
+msgstr "<emphasis>Generički</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:165
+#: en/misc-params.xml:171
 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 ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:172
+#: en/misc-params.xml:178
 msgid ""
 "When you add a network card, do not forget to set your firewall to monitor "
 "that interface as well."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:179
-msgid "<guilabel>Proxies</guilabel>:"
-msgstr ""
+#: en/misc-params.xml:185
+#, fuzzy
+msgid "<emphasis role=\"bold\">Proxies</emphasis>"
+msgstr "<emphasis>Generički</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:181
+#: en/misc-params.xml:187
 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 ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:186
+#: en/misc-params.xml:192
 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 ""
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:195
+#: en/misc-params.xml:201
 msgid "Security"
 msgstr "Sigurnost"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:200
-msgid "<guilabel>Security Level</guilabel>:"
-msgstr ""
+#: en/misc-params.xml:206
+#, fuzzy
+msgid "<emphasis role=\"bold\">Security Level</emphasis>"
+msgstr "<emphasis>Generički</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:203
+#: en/misc-params.xml:208
 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 ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:207
-msgid "Check the option which best suits your usage."
-msgstr ""
+#: en/misc-params.xml:215
+#, fuzzy
+msgid "<emphasis role=\"bold\">Firewall</emphasis>"
+msgstr "<emphasis>Generički</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:212
-msgid "<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 ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:218
-msgid ""
-"Select the services that you wish to have access to your system. Your "
-"selections will depend on what you use your computer for. For more "
-"information, see <xref linkend=\"firewall\"/>."
+#: en/misc-params.xml:229
+msgid "For more information, see <xref linkend=\"firewall\"/>."
 msgstr ""
 
 #. 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
+msgid ""
+"Bear in mind that allowing <emphasis>everything</emphasis> (no firewall) may "
+"be very risky."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -2756,29 +2937,43 @@ msgid "Reboot"
 msgstr "Ponovno pokretanje sustava"
 
 #. type: Content of: <section><para>
-#: en/reboot.xml:6
+#: en/reboot.xml:7
 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 ""
+
+#. 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
-msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
+#: en/reboot.xml:12
+#, fuzzy
+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
 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 ""
 
 #. type: Content of: <section><mediaobject>
-#: en/reboot.xml:17
+#: en/reboot.xml:19
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
 "reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
@@ -2800,45 +2995,51 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/securityLevel.xml:3
+#: en/securityLevel.xml:10
 msgid "Security Level"
 msgstr "Sigurnosna Razina"
 
 #.  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=\"login-im1\" fileref=\"live-"
-"login.png\" align=\"center\" 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
 msgid ""
 "<emphasis role=\"bold\">Please choose the desired security level</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:19
+#: en/securityLevel.xml:29
+msgid ""
+"<emphasis>Standard</emphasis> is the default, and recommended setting for "
+"the average user."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:32
 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>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:24
+#: en/securityLevel.xml:36
 #, fuzzy
 msgid "<emphasis role=\"bold\">Security Administrator</emphasis>"
 msgstr "<emphasis>Proizvođač</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 "
@@ -2846,14 +3047,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 "
@@ -2861,511 +3062,571 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:41
+#: en/securityLevel.xml:53
 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:6
+#: en/SelectAndUseISOs2.xml:15
 msgid "Select and use ISOs"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:9
+#: en/SelectAndUseISOs2.xml:18
 msgid "Introduction"
 msgstr "Uvod"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:10
+#: en/SelectAndUseISOs2.xml:19
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
 "which image best suits your needs."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:12
-msgid "There are two families of media:"
+#: en/SelectAndUseISOs2.xml:21
+msgid "There are three types of installation media:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:15
+#: en/SelectAndUseISOs2.xml:24
 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 ""
 
 #. 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
+msgid ""
+"Live ISOs can only be used to create <quote>clean</quote> installations, "
+"they cannot be used to upgrade previously installed Mageia releases."
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:47
+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 ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:53
 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 ""
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:27
-msgid "Details are given in the next sections."
+#: en/SelectAndUseISOs2.xml:58
+msgid "More details are given in the next sections."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:30
+#: en/SelectAndUseISOs2.xml:61
 msgid "Media"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:32
+#: en/SelectAndUseISOs2.xml:63
 msgid "Definition"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:33
+#: en/SelectAndUseISOs2.xml:64
 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 ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:36
+#: en/SelectAndUseISOs2.xml:67
 msgid ""
 "You can find Mageia ISO's <link ns4:href=\"http://www.mageia.org/en/"
 "downloads/\">here</link>."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:39
+#: en/SelectAndUseISOs2.xml:70
 msgid "Classical installation media"
 msgstr ""
 
 #. 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 ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:44
-msgid "These ISOs use the Classical installer called drakx."
+#: en/SelectAndUseISOs2.xml:75
+msgid "These ISOs use the Classical installer called DrakX"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:47
+#: en/SelectAndUseISOs2.xml:78
 msgid ""
 "They are used for performing clean installs or to upgrade a previously "
-"installed version of Mageia."
+"installed version of Mageia"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:51 en/SelectAndUseISOs2.xml:83
-#: en/SelectAndUseISOs2.xml:158
-msgid "Different media for 32 and 64 bit architectures."
+#: en/SelectAndUseISOs2.xml:82 en/SelectAndUseISOs2.xml:118
+#: en/SelectAndUseISOs2.xml:174
+msgid "Different media for 32 and 64-bit architectures"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:54
+#: en/SelectAndUseISOs2.xml:85
 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 ""
 
 #. 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
+msgid "Each DVD contains many available desktop environments and languages"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:62
+#: en/SelectAndUseISOs2.xml:95
 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 ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:69
+#: en/SelectAndUseISOs2.xml:102
 msgid "Live media"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:74
+#: en/SelectAndUseISOs2.xml:107
 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 ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:79
-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 ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:86
-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>"
+#: en/SelectAndUseISOs2.xml:114
+msgid "Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:91
-msgid "They contain non free software."
+#: en/SelectAndUseISOs2.xml:121
+msgid "They contain non-free software"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:96
+#: en/SelectAndUseISOs2.xml:126
 msgid "Live DVD Plasma"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:99
-msgid "Plasma desktop environment only."
+#: en/SelectAndUseISOs2.xml:129
+msgid "Plasma desktop environment only"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:102 en/SelectAndUseISOs2.xml:116
-#: en/SelectAndUseISOs2.xml:130
-msgid "All available languages are present."
+#: en/SelectAndUseISOs2.xml:132 en/SelectAndUseISOs2.xml:146
+#: en/SelectAndUseISOs2.xml:160
+msgid "All available languages are present"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:105
-msgid "64 bit architecture only."
+#: en/SelectAndUseISOs2.xml:135 en/SelectAndUseISOs2.xml:149
+msgid "64-bit architecture only"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:110
+#: en/SelectAndUseISOs2.xml:140
 msgid "Live DVD GNOME"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:113
-msgid "GNOME desktop environment only."
-msgstr ""
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:119
-msgid "64 bit architecture only"
+#: en/SelectAndUseISOs2.xml:143
+msgid "GNOME desktop environment only"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:124
+#: en/SelectAndUseISOs2.xml:154
 msgid "Live DVD Xfce"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:127
-msgid "Xfce desktop environment only."
+#: en/SelectAndUseISOs2.xml:157
+msgid "Xfce desktop environment only"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:133
-msgid "32 or 64 bit architectures."
+#: en/SelectAndUseISOs2.xml:163
+msgid "32 or 64-bit architectures"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:139
+#: en/SelectAndUseISOs2.xml:169
 msgid "Net install media"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:144
-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 ""
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:152
-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 ""
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:161
-msgid "First steps are English language only."
+#: en/SelectAndUseISOs2.xml:177
+msgid "First steps are English language only"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:166
+#: en/SelectAndUseISOs2.xml:182
 msgid "netinstall.iso"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:169
+#: en/SelectAndUseISOs2.xml:185
 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 ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:175
+#: en/SelectAndUseISOs2.xml:191
 msgid "netinstall-nonfree.iso"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:178
+#: en/SelectAndUseISOs2.xml:194
 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 ""
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:186
+#: en/SelectAndUseISOs2.xml:202
 msgid "Downloading and Checking Media"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:188
+#: en/SelectAndUseISOs2.xml:204
 msgid "Downloading"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:189
+#: en/SelectAndUseISOs2.xml:205
 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 ""
 
-#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:191
-msgid "<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 ""
-"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:"
+"<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:199
-msgid "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+#: en/SelectAndUseISOs2.xml:217
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"Checking.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+"align=\"center\"/> </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 ""
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/SelectAndUseISOs2.xml:225
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"Download.png\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+"align=\"center\"/> </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
 msgid "Checking the integrity of the downloaded media"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:208
+#: en/SelectAndUseISOs2.xml:235
 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 ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:214
+#: en/SelectAndUseISOs2.xml:241
 msgid ""
 "To generate the checksum for your downloaded ISO, open a console, (no need "
 "to be root), and:"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:218
+#: en/SelectAndUseISOs2.xml:245
 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 ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:222
+#: en/SelectAndUseISOs2.xml:249
 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 ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:254
+msgid ""
+"To use the sha512sum, type: <command>sha512sum path/to/the/image/file.iso</"
+"command>"
 msgstr ""
 
 #. 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 format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+"align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:232
+#: en/SelectAndUseISOs2.xml:265
 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 ""
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:237
+#: en/SelectAndUseISOs2.xml:270
 msgid "Burn or dump the ISO"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:238
+#: en/SelectAndUseISOs2.xml:271
 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 ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:275
 msgid "Burning the ISO to a CD/DVD"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:243
+#: en/SelectAndUseISOs2.xml:276
 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 ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:248
+#: en/SelectAndUseISOs2.xml:282
 msgid "Dump the ISO to a USB stick"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:249
+#: en/SelectAndUseISOs2.xml:283
 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 ""
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:252
+#: en/SelectAndUseISOs2.xml:286
 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 ""
 
-#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:256
+#. type: Content of: <section><section><section><note><para>
+#: en/SelectAndUseISOs2.xml:290
+msgid ""
+"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 ""
-"To recover the original capacity, you must redo partitioning and re-format "
-"the USB stick."
+"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 ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:259
+#: en/SelectAndUseISOs2.xml:299
 msgid "Using a graphical tool within Mageia"
 msgstr ""
 
 #. 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>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:263
+#: en/SelectAndUseISOs2.xml:303
 msgid "Using a graphical tool within Windows"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:304
 msgid "You could try:"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:267
+#: en/SelectAndUseISOs2.xml:307
 msgid ""
 "<link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using the "
-"\"ISO image\" option;"
+"\"ISO image\" option"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:271
+#: en/SelectAndUseISOs2.xml:311
 msgid ""
 "<link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:277
-msgid "Using Command line within a GNU/Linux system"
+#: en/SelectAndUseISOs2.xml:317
+msgid "Using the Command line within a GNU/Linux system"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:279
+#: en/SelectAndUseISOs2.xml:319
 msgid ""
 "It is potentially *dangerous* to do this by hand. You risk overwriting "
 "potentially valuable existing data if you specify the wrong target device."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:325
 msgid "Open a console"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:288
+#: en/SelectAndUseISOs2.xml:328
 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 ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:291
-msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
+#: en/SelectAndUseISOs2.xml:332
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"Root.png\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+"align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:297
+#: en/SelectAndUseISOs2.xml:338
 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 ""
 
 #. 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
+msgid "Enter the command <command>fdisk -l</command>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:304
-msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
+#: en/SelectAndUseISOs2.xml:345
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"Fdisk.png\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+"align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:310
+#: en/SelectAndUseISOs2.xml:351
 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 ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:312
+#: en/SelectAndUseISOs2.xml:354
 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 ""
 
 #. 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"
@@ -3389,46 +3650,49 @@ msgid ""
 msgstr ""
 
 #. 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=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:337
+#: en/SelectAndUseISOs2.xml:380
 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 ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:340
-msgid "Where X=your device name eg: /dev/sdd"
+#: en/SelectAndUseISOs2.xml:382
+msgid ""
+"Where <replaceable>X</replaceable>=your device name eg: <filename>/dev/sdd</"
+"filename>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:341
+#: en/SelectAndUseISOs2.xml:384
 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 ""
 
 #. 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
+msgid "Enter the command: <command>sync</command>"
 msgstr ""
 
 #. 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 ""
 
@@ -3438,46 +3702,47 @@ msgid "Select your Country / Region"
 msgstr ""
 
 #.  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
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
 "\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/selectCountry.xml:14
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectCountry.xml:20
 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 ""
 
-#. type: Content of: <section><para>
-#: en/selectCountry.xml:19
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectCountry.xml:27
 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 ""
 
 #. type: Content of: <section><note><para>
-#: en/selectCountry.xml:24
+#: en/selectCountry.xml:34
 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 ""
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:33
+#: en/selectCountry.xml:42
 msgid "Input method"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/selectCountry.xml:36
+#: en/selectCountry.xml:45
 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. "
@@ -3486,135 +3751,130 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/selectCountry.xml:45
+#: en/selectCountry.xml:54
 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/selectInstallClass.xml:14
+#: en/selectInstallClass.xml:29
 msgid "Install or Upgrade"
 msgstr ""
 
 #. 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 format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
 "align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:25
-msgid "Install"
-msgstr "Instaliraj"
+#: en/selectInstallClass.xml:41
+#, fuzzy
+msgid "<emphasis role=\"bold\">Install</emphasis>"
+msgstr "<emphasis>Prilagođeno</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 ""
+#: en/selectInstallClass.xml:50
+#, fuzzy
+msgid "<emphasis role=\"bold\">Upgrade</emphasis>"
+msgstr "<emphasis>Generički</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
+msgid "Use this option to upgrade an existing installation of Mageia."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/selectInstallClass.xml:39
+#. type: Content of: <section><important><para>
+#: en/selectInstallClass.xml:58
 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."
-msgstr ""
-
-#. type: Content of: <section><note><para>
-#: en/selectInstallClass.xml:50
-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."
+"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 ""
 
 #. type: Content of: <section><tip><para>
-#: en/selectInstallClass.xml:62
+#: en/selectInstallClass.xml:67
 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/selectKeyboardLive.xml:3
-msgid "Select keyboard"
-msgstr ""
+#: en/selectKeyboardLive.xml:14
+#, fuzzy
+msgid "Select Keyboard"
+msgstr "Tipkovnica"
 
 #. 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/selectKeyboard.xml:7
+#: en/selectKeyboard.xml:20
 msgid "Keyboard"
 msgstr "Tipkovnica"
 
 #. 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."
 msgstr ""
 
 #. 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 format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
 "align=\"center\"/> </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 "
@@ -3625,24 +3885,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:31
+#: en/selectKeyboard.xml:45
 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 ""
 
-#. 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
 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 ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:46
+#: en/selectKeyboard.xml:60
 msgid ""
 "If you choose a keyboard based on non-Latin characters, you will see an "
 "extra dialogue screen asking how you would prefer to switch between the "
@@ -3650,80 +3910,83 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:15
+#: en/selectLanguage.xml:34
 msgid "Please choose a language to use"
 msgstr "Molim izaberite jezik koji želite koristiti"
 
-#. type: Content of: <section><para>
-#: en/selectLanguage.xml:18
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectLanguage.xml:39
 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 ""
 
-#. type: Content of: <section><para>
-#: en/selectLanguage.xml:23
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectLanguage.xml:45
 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 ""
 
-#. type: Content of: <section><para>
-#: en/selectLanguage.xml:27
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectLanguage.xml:50
 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 ""
 
 #. 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-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><warning><para>
-#: en/selectLanguage.xml:43
+#. type: Content of: <section><important><para>
+#: en/selectLanguage.xml:68
 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 ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:50
+#: en/selectLanguage.xml:76
 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 ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:56
-msgid "Mageia uses UTF-8 (Unicode) support by default."
-msgstr ""
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:58
+#: en/selectLanguage.xml:82
 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 ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:64
+#: en/selectLanguage.xml:89
 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/selectMouse.xml:4
+#: en/selectMouse.xml:10
 msgid "Select mouse"
 msgstr ""
 
@@ -3731,36 +3994,41 @@ msgstr ""
 #.  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 format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+"align=\"center\"/> </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."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/selectMouse.xml:25
+#: en/selectMouse.xml:32
 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 ""
 
 #. type: Content of: <section><para>
-#: en/selectMouse.xml:27
+#: en/selectMouse.xml:38
 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 ""
 
-#. 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 ""
 
@@ -3780,303 +4048,388 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:7
-msgid "Bootloader main options"
+#: en/setupBootloader.xml:10
+#, fuzzy
+msgid "Bootloader"
 msgstr "Glavne postavke bootloadera"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:10
-msgid "Bootloader interface"
+#: en/setupBootloader.xml:13
+msgid "Grub2"
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:11
-msgid "By default, Mageia uses exclusively:"
+#. 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:14
+#: en/setupBootloader.xml:17
 msgid ""
-"GRUB2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
+"GRUB2 (with or without graphical menu) will be used exclusively as the "
+"bootloader for a Legacy/MBR or Legacy/GPT system."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:18
-msgid "GRUB2-efi for a UEFI system."
+#: en/setupBootloader.xml:21
+msgid ""
+"By default, a new bootloader will be written into either the MBR (Master "
+"Boot Record) of your first hard drive or in the BIOS boot partition."
 msgstr ""
 
-#. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:22
-msgid "The Mageia graphical menus are nice :)"
+#. type: Content of: <section><section><itemizedlist><title>
+#: en/setupBootloader.xml:27
+msgid "Grub2-efi on UEFI systems"
 msgstr ""
 
-#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:25
-msgid "GRUB2 on Legacy/MBR and Legacy/GPT systems"
+#. 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 ""
 
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:27
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:33
 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>"
+"By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI "
+"System Partition)."
 msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:34 en/setupBootloader.xml:56
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:35
 msgid ""
-"Don't modify the <emphasis role=\"bold\">Boot Device</emphasis> unless you "
-"really know what you are doing."
+"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 ""
 
-#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:38
-msgid "GRUB2-efi on UEFI systems"
-msgstr ""
+#. type: Content of: <section><section><info><title>
+#: en/setupBootloader.xml:46
+#, fuzzy
+msgid "Bootloader Setup"
+msgstr "Glavne postavke bootloadera"
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:39
-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 ""
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:49
+msgid "Bootloader main options"
+msgstr "Glavne postavke bootloadera"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:42
+#: en/setupBootloader.xml:51
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
-"imageobject>"
+"<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 align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:49
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:62
+#, fuzzy
+msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
+msgstr "<emphasis>Generički</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:63
 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."
+"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><title>
-#: en/setupBootloader.xml:61
-msgid "Using a Mageia bootloader"
-msgstr ""
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:67
+#, fuzzy
+msgid "<emphasis role=\"bold\">Boot device</emphasis>"
+msgstr "<emphasis>Generički</emphasis>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:62
-msgid ""
-"By default, and according to your system, Mageia writes one of the following:"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:68
+msgid "Don't change this unless you really know what you are doing"
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:66
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:72
+#, fuzzy
 msgid ""
-"a GRUB2 bootloader either into the MBR (Master Boot Record) of your first "
-"hard drive or in the BIOS boot partition."
-msgstr ""
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:70
-msgid "a GRUB2-efi bootloader into the ESP"
-msgstr ""
+"<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
+msgstr "<emphasis>Prilagođeno</emphasis>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:73
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:74
 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."
+"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
-msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata fileref=\"live-setupBootloader3.png\" align=\"center\"/> </"
-"imageobject>"
-msgstr ""
+#, fuzzy
+msgid "<emphasis role=\"bold\">Security</emphasis>"
+msgstr "<emphasis>Generički</emphasis>"
 
-#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:87
-msgid "Using an existing bootloader"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:79
+msgid ""
+"This allows you to set a password for the bootloader. This means a username "
+"and password will be required when booting in order to select a booting "
+"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 ""
 
-#. type: Content of: <section><section><para>
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
 #: en/setupBootloader.xml:88
-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 ""
 
-#. 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>Prilagođeno</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>Lozinka (ponovno)</guilabel>: Ponovno upišite korisničku lozinku u "
+"ovo tekstualno polje i drakx će provjeriti imate li istu lozinku u svakom "
+"tekstualnom polju."
 
-#. 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>Proizvođač</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:99
+#, fuzzy
+msgid "<emphasis>Enable ACPI</emphasis>"
+msgstr "<emphasis>Generički</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 ""
 
-#. type: Content of: <section><section><para>
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
 #: en/setupBootloader.xml:108
-msgid ""
-"You will get a warning that the bootloader is missing, ignore it by clicking "
-"<guibutton>OK</guibutton>."
-msgstr ""
+#, fuzzy
+msgid "<emphasis>Enable SMP</emphasis>"
+msgstr "<emphasis>Generički</emphasis>"
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:111
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:109
 msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
-"imageobject>"
+"This option enables/disables symmetric multiprocessing for multi-core "
+"processors"
 msgstr ""
 
-#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:117
-msgid "Options"
-msgstr "Opcije"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:113
+#, fuzzy
+msgid "<emphasis>Enable APIC</emphasis>"
+msgstr "<emphasis>Generički</emphasis>"
 
-#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:119
-msgid "First page"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:114
+msgid ""
+"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 ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
 #: en/setupBootloader.xml:120
+#, fuzzy
+msgid "<emphasis>Enable Local APIC</emphasis>"
+msgstr "<emphasis>Generički</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:121
 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."
+"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><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:122
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:127
+#, fuzzy
+msgid "Bootloader Configuration"
+msgstr "Konfiguracija zvuka"
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:129
+#, fuzzy
 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."
+"<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 align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:139
+#, fuzzy
+msgid "<emphasis role=\"bold\">Default</emphasis>"
+msgstr "<emphasis>Generički</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>Generički</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>Lozinka (ponovno)</guilabel>: Ponovno upišite korisničku lozinku u "
-"ovo tekstualno polje i drakx će provjeriti imate li istu lozinku u svakom "
-"tekstualnom polju."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:127 en/setupBootloader.xml:159
-msgid "<guilabel>Advanced</guilabel>"
+#: en/setupBootloader.xml:148
+#, fuzzy
+msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
+msgstr "<emphasis>Generički</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:149
+msgid ""
+"If you already have other operating systems installed, Mageia attempts to "
+"add them to your new Mageia boot menu. If you don't want this behaviour, "
+"then untick the Probe Foreign OS option."
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:127
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:156
+#, fuzzy
 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)."
+"<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 align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:133
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:166
+#, fuzzy
+msgid "<emphasis>Video mode</emphasis>"
+msgstr "<emphasis>Proizvođač</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:167
 msgid ""
-"<guilabel>Enable SMP</guilabel>: This option enables/disables symmetric "
-"multiprocessing for multi core processors."
+"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:135
+#. 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>Proizvođač</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:173
 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."
+"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><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:138
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:181
+#, fuzzy
 msgid ""
-"<guilabel>Enable Local APIC</guilabel>: Local APIC manages all external "
-"interrupts for a specific processor in an SMP system."
+"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align=\"center"
+"\"/> </imageobject>"
 msgstr ""
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+"align=\"center\"/> </imageobject>"
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:188
+#, fuzzy
+msgid "Other Options"
+msgstr "Opcije"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:143
-msgid "Next page"
+#: en/setupBootloader.xml:190
+msgid "Using an existing bootloader"
 msgstr ""
 
-#. 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><section><para>
+#: en/setupBootloader.xml:191
+msgid ""
+"The exact procedure for adding Mageia to an existing bootloader is beyond "
+"the scope of this documentation. However in most cases it will involve "
+"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 ""
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:150
-msgid ""
-"<guilabel>Append:</guilabel> This option lets you pass the kernel "
-"information or tell the kernel to give you more information as it boots."
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:199
+msgid "Installing Without a Bootloader"
 msgstr ""
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:155
+#. 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
 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/setupSCSI.xml:3
+#: en/setupSCSI.xml:10
 msgid "Setup SCSI"
 msgstr ""
 
@@ -4088,18 +4441,20 @@ msgstr ""
 #.  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
 msgid ""
 "DrakX will normally detect hard disks correctly. However, with some older "
 "SCSI controllers it may be unable to determine the correct drivers to use "
@@ -4107,79 +4462,57 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:32
+#: en/setupSCSI.xml:44
 msgid ""
-"If this happens, you will need to manually tell DrakX which SCSI drive(s) "
-"you have."
-msgstr ""
-
-#. type: Content of: <section><para>
-#: en/setupSCSI.xml:35
-msgid "DrakX should then be able to configure the drive(s) correctly."
+"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 ""
 
 #. type: Content of: <section><info><title>
-#: en/soundConfig.xml:3
+#: en/soundConfig.xml:10
 msgid "Sound Configuration"
 msgstr "Konfiguracija zvuka"
 
 #.  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
-msgid ""
-"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
-"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
-msgstr ""
-
-#. type: Content of: <section><para>
-#: en/soundConfig.xml:14
+#: en/soundConfig.xml:20
+#, 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."
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-soundConfig.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"soundConfig-im1\"/> </imageobject>"
 msgstr ""
+"<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 ""
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:24
+#: 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 ""
 
 #. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:30
+#: en/soundConfig.xml:43
 msgid "Advanced"
 msgstr "Napredno"
 
-#. type: Content of: <section><section><para>
-#: en/soundConfig.xml:33
-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 ""
-
-#. type: Content of: <section><section><para>
-#: en/soundConfig.xml:38
-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 ""
-
 #. type: Content of: <section><info><title>
-#: en/takeOverHdConfirm.xml:3
+#: en/takeOverHdConfirm.xml:10
 msgid "Confirm hard disk to be formatted"
 msgstr ""
 
@@ -4189,121 +4522,135 @@ msgstr ""
 #.     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=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
-"\" align=\"center\"/></imageobject><imageobject condition=\"live"
-"\"><imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/></"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><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>Učinjeno</guibutton> kada ste spremni."
 
-#. type: Content of: <section><para>
-#: en/takeOverHdConfirm.xml:31
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/takeOverHdConfirm.xml:48
 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/testing.xml:9
+#: en/testing.xml:3
 msgid "Testing Mageia as Live system"
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/testing.xml:14
+#: en/testing.xml:8
 msgid "Live mode"
 msgstr ""
 
+#. 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 ""
-
 #. type: Content of: <section><section><section><info><title>
-#: en/testing.xml:28
+#: en/testing.xml:21
 msgid "Testing hardware"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/testing.xml:31
+#: en/testing.xml:24
 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 ""
 
 #. 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 ""
 
 #. 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
+msgid "graphics card: if you see the previous screen, it's already OK."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:47
+#: en/testing.xml:40
 msgid "webcam:"
 msgstr ""
 
 #. 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 ""
 
 #. 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
+msgid "printer: configure your printer/s and print a test page"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:59
+#: en/testing.xml:52
 msgid "scanner: scan a document from ..."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/testing.xml:63
+#: en/testing.xml:56
 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 ""
 
-#. 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
+msgid ""
+"The configuration settings you apply here are carried over if you decide to "
+"proceed with the installation."
 msgstr ""
 
 #. type: Content of: <section><section><section><info><title>
-#: en/testing.xml:72
+#: en/testing.xml:68
 msgid "Launch installation"
 msgstr ""
 
+#. type: Content of: <section><section><section><para>
+#: en/testing.xml:71
+msgid ""
+"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 ""
+
 #. type: Content of: <section><section><section><mediaobject>
-#: en/testing.xml:76
+#: en/testing.xml:77
 msgid ""
 "<imageobject> <imagedata fileref=\"live-liveMode-install.png\"/> </"
 "imageobject>"
@@ -4311,22 +4658,13 @@ msgstr ""
 "<imageobject> <imagedata fileref=\"live-liveMode-install.png\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><section><section><para>
-#: en/testing.xml:81
-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."
-msgstr ""
-
 #. type: Content of: <section><info><title>
-#: en/uninstall-Mageia.xml:3
+#: en/uninstall-Mageia.xml:10
 msgid "Uninstalling Mageia"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:9
+#: en/uninstall-Mageia.xml:18
 msgid ""
 "If Mageia didn't convince you or you can't install it correctly - in short "
 "you want get rid of it - that is your right and Mageia also gives you the "
@@ -4334,34 +4672,37 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:14
+#: en/uninstall-Mageia.xml:23
 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 ""
 
 #. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:19
+#: en/uninstall-Mageia.xml:28
 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 ""
 
 #. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:27
+#: en/uninstall-Mageia.xml:46
 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 ""
 
 #. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:30
+#: en/uninstall-Mageia.xml:49
 msgid ""
 "If you have Vista or 7, you have one more possibility, you can extend the "
 "existing partition that is at the left of the freed space. There are other "
@@ -4371,30 +4712,45 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/unused.xml:9
+#: en/unused.xml:3
 msgid "Keep or delete unused material"
 msgstr ""
 
+#. 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
 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 ""
+
+#. 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>"
@@ -4403,12 +4759,199 @@ msgstr ""
 "> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/unused.xml:30
+#: en/unused.xml:31
 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 ""
 
+#~ msgid "User and Superuser Management"
+#~ msgstr "Upravljanje korisnikom i superkorisnikom"
+
+#, fuzzy
+#~ msgid ""
+#~ "Every partition is shown to the left as: <emphasis role=\"bold\">Device "
+#~ "(capacity, mount point, type).</emphasis>"
+#~ msgstr ""
+#~ "Svaka particija je prikazana kao što slijedi:\n"
+#~ "\"Uređaj\" (\"Kapacitet\", \"Točka montiranja\", \"Vrsta\")."
+
+#~ msgid "In advanced tab, you will find more options about clock settings."
+#~ msgstr "U naprednoj kartici naći ćete još opcija o postavkama sata."
+
+#~ msgid "From a disc"
+#~ msgstr "Sa diska"
+
+#~ msgid "From a USB device"
+#~ msgstr "Sa USB uređaja"
+
+#~ msgid ""
+#~ "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
+#~ msgstr ""
+#~ "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
+
+#~ msgid ""
+#~ "F1 - Help. Explain the options \"splash\", \"apm\", \"acpi\" and \"Ide\""
+#~ msgstr ""
+#~ "F1 - Pomoć. Objasni opcije \"splash\", \"apm\", \"acpi\" and \"Ide\""
+
+#~ msgid "F2 - Language. Choose the display language of the screens."
+#~ msgstr "F2 - Jezik. Odaberite jezik koji će biti prikazan na zaslonima."
+
+#~ msgid ""
+#~ "F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728"
+#~ msgstr ""
+#~ "F3 - Razlučivost zaslona. Birajte između, 640x400, 800x600, 1024x728"
+
+#~ msgid ""
+#~ "You have only the choice to run Mageia in Live mode (first choice)  or to "
+#~ "process the installation (second choice)."
+#~ msgstr ""
+#~ "Imate samo izbor između pokretanja Mageie u Live načinu rada (prvi izbor) "
+#~ "ili instalacijski proces (drugi izbor)."
+
+#~ 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 ""
+#~ "U svakom slučaju, prvi koraci će biti izbor jezika, vremenska zona i "
+#~ "tipkovnica, tada se proces razlikuje, sa <link linkend=\"testing"
+#~ "\">dodatnim koracima u Live načinu rada</link>."
+
+#, fuzzy
+#~ msgid ""
+#~ "Depending on your selection here, you may be offered further screens to "
+#~ "fine-tune your choice."
+#~ msgstr ""
+#~ "Ovisno o vašem odabiru, možda vam budu ponuđeni daljnji zasloni za fino "
+#~ "ugađanje vašega izbora."
+
+#, 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 revision=\"1\" align=\"center\" xml:id="
+#~ "\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" "
+#~ "format=\"PNG\"/> </imageobject>"
+
+#, 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>Grafička kartica</guibutton></emphasis>: Izaberite "
+#~ "vašu grafičku karticu sa liste ako je potrebno."
+
+#, 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>Prilagođeno</emphasis>"
+
+#~ msgid "<emphasis>Plug 'n Play</emphasis>"
+#~ msgstr "<emphasis>Plug 'n Play</emphasis>"
+
+#~ msgid "the monitor manufacturers name"
+#~ msgstr "ime proizvođača monitora"
+
+#~ msgid "the monitor description"
+#~ msgstr "opis monitora"
+
+#~ msgid "Click <guibutton>Done</guibutton> when you're ready."
+#~ msgstr "Kliknite na <guibutton>Učinjeno</guibutton> kada ste spremni."
+
+#~ msgid "Use Free Space"
+#~ msgstr "Koristi slobodni prostor"
+
+#, 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 align=\"center\" fileref="
+#~ "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition="
+#~ "\"live\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png"
+#~ "\"/> </imageobject>"
+
+#~ msgid "Erase and use Entire Disk."
+#~ msgstr "Izbriši i koristi cijeli disk."
+
+#~ msgid "Custom disk partitioning"
+#~ msgstr "Proizvoljno particioniranje diska"
+
+#~ msgid "January 2015"
+#~ msgstr "Veljača 2015"
+
+#, 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=\"login-im1\" fileref="
+#~ "\"live-login.png\" align=\"center\" revision=\"1\"/></imageobject>"
+
+#, 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=\"login-im1\" fileref="
+#~ "\"live-login.png\" align=\"center\" revision=\"1\"/></imageobject>"
+
+#~ msgid "Install"
+#~ msgstr "Instaliraj"
+
+#~ 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>"
+
+#, 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>"
+
+#, 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=\"classical\"><imagedata fileref=\"dx2-diskdrake2."
+#~ "png\" align=\"center\"/></imageobject><imageobject condition=\"live"
+#~ "\"><imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/></"
+#~ "imageobject>"
+
 #~ msgid "Additionally, you can disable or enable a guest account."
 #~ msgstr "Dodatno, možete onemogućiti ili omogućiti račun gosta."
 
@@ -4459,12 +5002,3 @@ msgstr ""
 #~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser."
 #~ "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>"
diff --git a/docs/docs/stable/installer/hu.po b/docs/docs/stable/installer/hu.po
index a675afbb..b6345bf8 100644
--- a/docs/docs/stable/installer/hu.po
+++ b/docs/docs/stable/installer/hu.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2018-04-19 16:32+0300\n"
+"POT-Creation-Date: 2019-01-06 12:43+0200\n"
 "PO-Revision-Date: 2018-01-06 13:51+0000\n"
 "Last-Translator: Ferenc Teknős <teknos.ferenc@gmail.com>\n"
 "Language-Team: Hungarian (http://www.transifex.com/MageiaLinux/mageia/"
@@ -34,12 +34,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Content of: <section><info><title>
-#: en/acceptLicense.xml:25
+#: en/acceptLicense.xml:31
 msgid "License and Release Notes"
 msgstr "Licenc és kiadási megjegyzések"
 
 #. type: Content of: <section><mediaobject>
-#: en/acceptLicense.xml:29
+#: en/acceptLicense.xml:35
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
@@ -55,78 +55,84 @@ msgstr ""
 "\"live-license.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/acceptLicense.xml:40
+#: en/acceptLicense.xml:46
 msgid "License Agreement"
 msgstr "Licencmegállapodás"
 
-#. 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 "Mielőtt telepítené a Mageiát kérjük olvassa el a licencfeltételeket."
 
-#. 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 ""
 "A feltételek a <application>Mageia</application> rendszerre vonatkoznak "
 "folytatás előtt kattintson az alkalmaz gombra."
 
-#. 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 ""
 "Az elfogadáshoz válassza az <guilabel>elfogadom</guilabel> lehetőséget és "
 "kattintson a <guibutton>tovább</guibutton> gombra. "
 
 #. 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 ""
 "Ha még is úgy dönt, hogy ezeket a feltételeket nem fogadja el  akkor "
 "kattintson a <guibutton>kilépés</guibutton> gombra és a számítógép újraindul."
 
 #. type: Content of: <section><section><info><title>
-#: en/acceptLicense.xml:63
+#: en/acceptLicense.xml:76
 msgid "Release Notes"
 msgstr "Kiadási megjegyzések"
 
 #. 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 ""
 "A <application>Mageiáról</application> Fontos információk érhetők el ha "
 "rákattint a <guibutton>megjegyzések</guibutton> gombra."
 
 #. 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 "hu"
 
 #. 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 ""
 "Média kiválasztás (Kiegészítő media csomagok telepítése és konfigurálása)"
 
 #.  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."
@@ -138,13 +144,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 ""
 "Ez az ablak megjeleníti a mostani szoftvercomagokat mutatja. Ha hozzá kíván "
 "adni szoftvercsomagokat más forrásból akkor megteheti lemezről vagy más "
@@ -152,25 +158,25 @@ msgstr ""
 "milyen csomagok állnak a rendelkezésére."
 
 #. 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 "Hálózati forrás esetén két lépésre lesz szükség."
 
 #. 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 "Először is a hálózati kapcsolat kiválasztása és aktiválása."
 
 #. 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 ""
 "Válasszuk ki a nekünk megfelelő tükört vagy a kívánt URL -t (első "
 "bejegyzésként).  A tükör kiválasztásásval hozzáférhet a Mageia összes "
@@ -179,15 +185,15 @@ msgstr ""
 "saját NFS -t telepíthetünk."
 
 #. 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 ""
 "Ha frissít egy 64 bites csomagot akkor a frissítés tartalmazhat 32 bites "
 "csomagokat is. Ezért javasoljuk, hogy online tükörhozzá adásával frissítsen, "
@@ -196,18 +202,25 @@ msgstr ""
 "tükörrel 32 bites csomagokat is tudd telepíteni,"
 
 #. type: Content of: <section><info><title>
-#: en/addUser.xml:3
-msgid "User and Superuser Management"
-msgstr "Felhasználó és rendszergazda útmutató."
+#: en/addUser.xml:9
+#, fuzzy
+msgid "User Management"
+msgstr "Speciális Felhasználókezelés"
 
 #.  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 format=\"PNG\" fileref="
 "\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -215,21 +228,21 @@ msgstr ""
 "\"PNG\" 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 "A rendszergazdai (root) jelszó beállítása"
 
 #. 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 ""
 "Fontos, hogy a <application>Mageiánkba</application>magasabb szintű  "
 "felhasználó vagy egy rendszergazda legyen. A Mageiában telepítéskor "
@@ -240,28 +253,28 @@ msgstr ""
 "az alsó mezőbe azért, hogy biztossan nem tévesztettünk el egy karaktert se."
 
 #. 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 ""
 "Minden jelszónál megkülönbözteti a kis és nagybetűket, a legjobb, ha a  "
 "betűk (kis- és nagybetűk), számok és egyéb karakterek keverednek a jelszóban."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:42
+#: en/addUser.xml:57
 msgid "Enter a user"
 msgstr "Adjon meg egy felhasználót"
 
 #. 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 ""
 "Adjon hozzá egy felhasználót itt. A felhasználó kevesebb joggal rendelkezik, "
 "mint a rendszergazdai  felhasználó (root), de elég ahhoz, hogy az "
@@ -269,69 +282,90 @@ msgstr ""
 "amit az átlagos felhasználó a számítógépével használ"
 
 #. 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\">Partíció méret:</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>Ikon</guibutton>: Ha erre a gombra kattint akkor a felhasználók "
 "ikonja megváltozik."
 
 #. 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\">Partíció méret:</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>Igazi Név</guilabel>: Adja meg a felhasználó igazi nevét."
 
 #. 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\">Partíció méret:</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>Bejelentkezési név</guilabel>: Itt adja meg a felhasználói "
 "bejelentkezési nevet, vagy hagyja, hogy a drakx használja a felhasználó "
 "valódi nevének verzióját. <emphasis>A bejelentkezési név kis- és nagybetűkre "
 "érzékeny.</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\">Partíció méret:</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>Jelszó</guilabel>: Ebben a szövegmezőben írja be a felhasználói "
 "jelszót. A szöveg doboz végén van egy pajzs, amely jelzi a jelszó erejét. "
 "(Lásd még <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>Jelszó (újra)</guilabel>: Írja be újra a felhasználói jelszót erre "
 "a szövegmezőbe, és a drakx ellenőrzi, hogy ugyanaz a jelszó van-e a "
 "felhasználói jelszó szövegdobozaiban."
 
 #. 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 ""
 "Bármely felhasználó, akinek a Mageia telepítése közben hozzá van rendelve, "
 "rendelkezni fog olvasási és írási védett könyvtárral (umask = 0027)."
 
 #. 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</"
@@ -343,60 +377,60 @@ msgstr ""
 "Felhasználó kezelés </emphasis> lehetőséget."
 
 #. 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 "A hozzáférési jogosultságok a telepítés után is módosíthatók."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:93
-msgid "Advanced User Management"
+#: en/addUser.xml:115
+#, fuzzy
+msgid "User Management (advanced)"
 msgstr "Speciális Felhasználókezelés"
 
 #. 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 ""
 "Ha a <guibutton>haladó</guibutton> gombra rákattintva megjelenik egy "
 "képernyő, amely lehetővé teszi a hozzáadni kívánt felhasználó beállításainak "
 "módosítását"
 
 #. 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>Parancssor </guilabel>: Ez a legördülő lista lehetővé teszi az "
 "előző képernyőhöz hozzáadott felhasználó által használt héj módosítását, a "
 "Bash, Dash és 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>Felhasználó azonosító</guilabel>:Itt állíthatja be a felhasználói "
 "azonosítót a felhasználót hozzá adva, hogy  vissza térjen az előző "
 "képernyőre.Ez egy szám. Hagyja üresen, hacsak nem tudja, mit csinál."
 
 #. 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 "Válassza ki a csatolási pontokat"
 
@@ -411,16 +445,17 @@ msgstr "Válassza ki a csatolási pontokat"
 #.        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="
@@ -430,53 +465,40 @@ 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 ""
 "Itt láthatja a számítógépen talált Linux partíciókat.Ha nem ért egyet a "
 "<application>DrakX</application>  javaslataival, megváltoztathatja a "
 "csatolási pontokat."
 
-#. type: Content of: <section><note><para>
-#: en/ask_mntpoint_s.xml:41
-msgid ""
-"If you change anything, make sure you still have a <emphasis role=\"bold"
-"\"><literal>/</literal></emphasis> (root) partition."
-msgstr ""
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:46
-msgid ""
-"Every partition is shown to the left as: <emphasis role=\"bold\">Device "
-"(capacity, mount point, type).</emphasis>"
-msgstr ""
-
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:50
+#: en/ask_mntpoint_s.xml:55
 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
 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 ""
 
 #. 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 "
@@ -486,181 +508,244 @@ msgstr ""
 "üresen hagyhatja."
 
 #. type: Content of: <section><warning><para>
-#: en/ask_mntpoint_s.xml:69
+#: en/ask_mntpoint_s.xml:79
 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 ""
+
+#. type: Content of: <section><tip><para>
+#: en/ask_mntpoint_s.xml:84
+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 ""
 
 #. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:74
+#: en/ask_mntpoint_s.xml:90
 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/bestTime.xml:10
-msgid "Clock settings"
+#: en/bestTime.xml:5
+#, fuzzy
+msgid "Clock Settings"
 msgstr "Az óra beállítása"
 
 #. 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 ""
 "Ebben a lépésben be kell állítania, hogy a belső óra milyen időpontban "
 "legyen, akár helyi idő, akár UTC idő."
 
 #. type: Content of: <section><para>
-#: en/bestTime.xml:23
-msgid "In advanced tab, you will find more options about clock settings."
+#: en/bestTime.xml:14
+msgid ""
+"In the <emphasis>Advanced</emphasis> tab, you can enable automatic time "
+"synchronization and specify an NTP server."
 msgstr ""
-"A Speciális lapon további lehetőségek találhatók az órabeállításokkal "
-"kapcsolatban."
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:1
+#: en/bootLive.xml:6
 msgid "Boot Mageia as Live system"
 msgstr "Mageia indítása mint Live rendszer"
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:1
+#: en/bootLive.xml:10
 msgid "Booting the medium"
 msgstr "Betöltés az adathordozóról"
 
-#. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:1
-msgid "From a disc"
-msgstr "Betöltés lemezről"
-
-#. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:1
+#. type: Content of: <section><section><para>
+#: en/bootLive.xml:12
 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."
+"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 ""
 
-#. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:7
-msgid "From a USB device"
-msgstr "Betöltés USB eszközről"
+#. 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 ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:12
+#: en/bootLive.xml:35
 msgid "In BIOS/CSM/Legacy mode"
 msgstr "BIOS/CSM/Legacy módban"
 
+#. 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\">Partíció méret:</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
+msgid "Once the boot is done, you can proceed to the installation."
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/bootLive.xml:45 en/bootLive.xml:57
+#, fuzzy
+msgid ""
+"<emphasis role=\"bold\">+ use non-free video drivers (slower to boot)</"
+"emphasis>"
+msgstr "<emphasis role=\"bold\">Partíció méret:</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\">Partíció méret:</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 ""
+"Mageia telepítése: Közvetlenül telepíti a Mageia rendszert a merevlemezre."
+
+#. 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 format=\"PNG\" fileref=\"dx2-chooseDesktop.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 "Az első képernyő a BIOS módban történő indítás során"
 
-#. type: Content of: <section><section><para>
-#: en/bootLive.xml:12
-msgid "In the middle menu, you have the choice between three actions:"
-msgstr "A középső menüben három művelet közül választhat:"
+#. 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 ""
-"Boot Mageia: Ez azt jelenti, hogy a Mageia 5 a csatlakoztatott "
-"adathordozóról (CD / DVD vagy Pendriverról) elindul anélkül, hogy bármit "
-"írna a lemezre, ezért nagyon lassú rendszerre számíthat. A rendszerindítás "
-"után a merevlemezre telepíthető."
+#: en/bootLive.xml:75
+#, fuzzy
+msgid "<keycap>F1</keycap> <emphasis role=\"bold\">Help</emphasis>"
+msgstr "<emphasis role=\"bold\">Partíció méret:</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 ""
-"Mageia telepítése: Közvetlenül telepíti a Mageia rendszert a merevlemezre."
 
 #. 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\">Partíció méret:</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 ""
 
-#. type: Content of: <section><section><para>
-#: en/bootLive.xml:19
-msgid "In the bottom menu, are the Boot Options:"
-msgstr "Az alsó menü a Boot lehetőségek"
+#. 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\">Partíció méret:</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:19
+#: en/bootLive.xml:89
 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 - Segítés. Magyarázat a lehetőségekhez \"splash\", \"apm\", \"acpi\" és "
-"\"Ide\""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:20
-msgid "F2 - Language. Choose the display language of the screens."
-msgstr "F2 - Nyelvek. Válasszon megjelenítési nyelvet."
+#: en/bootLive.xml:93
+#, fuzzy
+msgid "<keycap>F4</keycap> <emphasis role=\"bold\">Source</emphasis>"
+msgstr "<emphasis role=\"bold\">Partíció méret:</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 - Képernyő felbontás. Válasszon a szöveges, 640x400, 800x600, 1024x728 "
-"megjelenítések között."
 
 #. 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 vagy Más. Általában a telepítés a behelyezett telepítő médiumról "
 "hajtódík végbe. Itt ki lehet választani más forrásokat is, mint FTP vagy NFS "
@@ -668,107 +753,161 @@ msgstr ""
 "válasszon egyet a kiszolgálón elérhető telepítési forrásokból."
 
 #. 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\">Partíció méret:</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 - Illesztőprogram. Igen vagy Nem. A rendszer tisztában van egy opcionális "
-"lemez jelenlétével az illesztőprogram frissítésével, és a telepítés során be "
-"kell helyezni."
 
 #. 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\">Partíció méret:</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:106
+msgid ""
+"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\">Partíció méret:</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
 msgid ""
-"F6 - Kernel options. This is a way to specify options according to your "
-"hardware and the drivers to use."
+"<emphasis role=\"bold\">No ACPI:</emphasis> (Advanced Configuration and "
+"Power Interface): Power management features are not used."
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/bootLive.xml:125
+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 ""
+
+#. 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 - Kernel beállítások. Ez a lehetőség a hardver és a használni kívánt "
-"illesztőprogramok opcióinak megadása."
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:29
+#: en/bootLive.xml:139
 msgid "In UEFI mode"
 msgstr "UEFI módal"
 
 #. 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 "Az első képernyő az UEFI rendszerről történő indításkor a lemezről"
+#: en/bootLive.xml:146
+#, fuzzy
+msgid "First screen while booting in UEFI mode"
+msgstr "Az első képernyő a BIOS módban történő indítás során"
 
 #. 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 ""
 
-#. 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 ""
+"Boot Mageia: Ez azt jelenti, hogy a Mageia 5 a csatlakoztatott "
+"adathordozóról (CD / DVD vagy Pendriverról) elindul anélkül, hogy bármit "
+"írna a lemezre, ezért nagyon lassú rendszerre számíthat. A rendszerindítás "
+"után a merevlemezre telepíthető."
 
-#. 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/chooseDesktop.xml:3
+#: en/chooseDesktop.xml:16
 msgid "Desktop Selection"
 msgstr "Munkaasztal kiválasztása"
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:8
-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 ""
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:11
+#: en/chooseDesktop.xml:26
 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 ""
 
 #. 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 format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
 "align=\"center\"/> </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 <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."
+"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
+msgid ""
+"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 ""
 
 #. type: Content of: <section><info><title>
@@ -777,8 +916,9 @@ msgid "Package Group Selection"
 msgstr "Csomagcsoportok kiválasztása"
 
 #. 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
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
 "\" align=\"center\"/> </imageobject>"
@@ -787,7 +927,7 @@ msgstr ""
 "\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:14
+#: en/choosePackageGroups.xml:16
 msgid ""
 "Packages are arranged into common groups, to make choosing what you need on "
 "your system a lot easier. The groups are fairly self explanatory, however "
@@ -796,25 +936,25 @@ msgid ""
 msgstr ""
 
 #. 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\">Partíció méret:</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\">Partíció méret:</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\">Partíció méret:</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 "
@@ -824,7 +964,7 @@ msgstr ""
 "eltávolítandó csomagokat."
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:38
+#: en/choosePackageGroups.xml:40
 msgid ""
 "See <xref linkend=\"minimal-install\"/> for instructions on how to do a "
 "minimal install (without or with X &amp; IceWM)."
@@ -836,8 +976,10 @@ msgid "Choose Individual Packages"
 msgstr "Válasszon ki egy egyedi csomagot"
 
 #. 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"
@@ -847,19 +989,19 @@ msgstr ""
 "\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:14
+#: en/choosePackagesTree.xml:18
 msgid ""
 "Here you can add or remove any extra packages to customize your installation."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:17
+#: en/choosePackagesTree.xml:21
 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 ""
 
 #. type: Content of: <section><info><title>
@@ -869,8 +1011,10 @@ msgstr "Szolgáltatások beállítása"
 
 #.  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"
@@ -881,30 +1025,27 @@ msgstr ""
 "id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:16
+#: en/configureServices.xml:20
 msgid ""
 "Here you can choose which services should start when you boot your system."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/configureServices.xml:19
-msgid "Click on a triangle to expand a group to all the relevant services."
-msgstr ""
-
-#. type: Content of: <section><para>
-#: en/configureServices.xml:22
-msgid "The settings DrakX chose are usually good."
+#. 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: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."
 msgstr ""
 
 #. 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 ""
 
@@ -915,15 +1056,17 @@ msgstr "Időzóna beállítása"
 
 #.  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-"
@@ -931,203 +1074,233 @@ 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
 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 ""
 
 #. type: Content of: <section><para>
-#: en/configureTimezoneUTC.xml:24
+#: en/configureTimezoneUTC.xml:32
 msgid ""
 "In the next screen you can choose to set your hardware clock to local time "
 "or to GMT, also known as UTC."
 msgstr ""
 
 #. 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."
 msgstr ""
 
 #. 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 ""
 
 #. 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=\"summaryBottom-im1\" align="
-"\"center\" fileref=\"dx2-summaryBottom.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."
 msgstr ""
 
 #. 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:"
 msgstr ""
 
-#. 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 "gyártó"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:33
-msgid "then the name of your card"
-msgstr ""
+#: en/configureX_card_list.xml:45
+#, fuzzy
+msgid "then the make of your card"
+msgstr "és a kártya típusa"
 
 #. 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 "és a kártya típusa"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:41
+#: en/configureX_card_list.xml:53
 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 ""
 
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:47
+#. type: Content of: <section><caution><para>
+#: en/configureX_card_list.xml:61
 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 ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:51
+#: en/configureX_card_list.xml:65
 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."
-msgstr ""
-
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:56
-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."
+"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 ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:3
+#: en/configureX_chooser.xml:11
 msgid "Graphic Card and Monitor Configuration"
 msgstr "Videó-kártya és Monitor beállítások"
 
 #.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
+#. 2018/02/15 apb: Some text and typography.
+#. 2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.
+#. 2018/02/23 apb: Typo.
 #. 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=\"reboot-im1\" fileref=\"live-"
-"reboot.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
 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 ""
 
 #. 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\">Partíció méret:</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>Videókártya</guibutton></emphasis>: Ha szükséges, "
-"válassza ki a kártyát a listából."
 
 #. 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\">Partíció méret:</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_chooser.xml:52
 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 ""
 
-#. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/configureX_chooser.xml:41
-msgid "Incorrect refresh rates may damage your monitor"
-msgstr ""
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_chooser.xml:60
+#, fuzzy
+msgid "<emphasis role=\"bold\">Resolution</emphasis>"
+msgstr "<emphasis role=\"bold\">Partíció méret:</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>Videókártya</guibutton></emphasis>: Ha szükséges, "
 "válassza ki a kártyát a listából."
 
 #. 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\">Partíció méret:</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_chooser.xml:71
 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 ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:63
+#: en/configureX_chooser.xml:81
+#, fuzzy
+msgid "<emphasis role=\"bold\">Options</emphasis>"
+msgstr "<emphasis role=\"bold\">Partíció méret:</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_chooser.xml:84
+msgid "Here you can choose to enable or disable various options"
+msgstr ""
+
+#. type: Content of: <section><warning><para>
+#: en/configureX_chooser.xml:89
 msgid ""
-"<emphasis><guibutton>Options</guibutton></emphasis>: Here you can choose to "
-"enable or disable various options."
+"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 "Monitor kiválasztása"
 
 #. 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."
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:19
+#: en/configureX_monitor.xml:30
 msgid ""
 "<emphasis role=\"bold\">Selecting a monitor with different characteristics "
 "could damage your monitor or video hardware. Please don't try something "
@@ -1136,32 +1309,32 @@ msgid ""
 msgstr ""
 
 #. 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=\"reboot-im1\" fileref=\"live-"
-"reboot.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>Egyéni</emphasis>"
+#. type: Content of: <section><variablelist><varlistentry><term>
+#: en/configureX_monitor.xml:46
+msgid "Custom"
+msgstr ""
 
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:33
+#. type: Content of: <section><variablelist><varlistentry><listitem><para>
+#: en/configureX_monitor.xml:49
 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."
 msgstr ""
 
-#. 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 "
@@ -1169,138 +1342,144 @@ msgid ""
 "consult your monitor documentation."
 msgstr ""
 
-#. 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
 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 ""
 
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:51
-msgid "<emphasis>Vendor</emphasis>"
-msgstr "<emphasis>Gyártó</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:"
 msgstr ""
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:61
-msgid "the monitor manufacturers name"
-msgstr "a monitor gyártó neve"
+#. 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 "a monitor leírása"
+#. 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>Általános</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
 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 ""
 
 #. 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 "Egyedi lemezparticionálás a DiskDrake segítségével"
 
 #. 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>"
+"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/></imageobject><imageobject condition=\"live"
+"\"><imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/></"
+"imageobject>"
 
-#. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:22
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/diskdrake.xml:38
 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."
+"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 ""
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:29
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/diskdrake.xml:45
 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."
+"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 ""
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:34
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/diskdrake.xml:52
 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>."
+"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. "
+"<emphasis>Expert mode</emphasis> provides more options such as to label "
+"(name) a partition, or to choose a partition type."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:39
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/diskdrake.xml:60
 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."
+"Continue until you have adjusted everything to your satisfaction, then click "
+"<emphasis>Done</emphasis> when you're ready."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:43
+#. type: Content of: <section><warning><orderedlist><listitem><para>
+#: en/diskdrake.xml:69
 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."
+"Take care with the <emphasis>Clear all</emphasis> option, use it only if you "
+"are sure you want to wipe all partitions on the selected storage device."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:49
-msgid "Continue until you have adjusted everything to your satisfaction."
+#. type: Content of: <section><warning><orderedlist><listitem><para>
+#: en/diskdrake.xml:75
+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 ""
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:52
-msgid "Click <guibutton>Done</guibutton> when you're ready."
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/diskdrake.xml:87
+msgid ""
+"If you are installing Mageia on a UEFI system, check that an ESP (EFI System "
+"Partition) is present and correctly mounted on <filename>/boot/EFI</"
+"filename>. See Figure 1 below."
 msgstr ""
 
-#. type: Content of: <section><note><para>
-#: en/diskdrake.xml:56
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/diskdrake.xml:93
 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)"
+"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
+"partition is present and of the correct type. See Figure 2 below."
 msgstr ""
 
-#. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:61
+#. type: Content of: <section><figure><title>
+#: en/diskdrake.xml:101
+#, fuzzy
+msgid "EFI System Partition"
+msgstr "Létező partíciók használata"
+
+#. 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-diskdrake2.png"
@@ -1308,20 +1487,18 @@ msgstr ""
 "\"><imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/></"
 "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
-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 ""
 
-#. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:76
+#. type: Content of: <section><mediaobject>
+#: en/diskdrake.xml:118 en/doPartitionDisks.xml:200
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1334,311 +1511,324 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:9
-msgid "Partitioning"
+#: en/doPartitionDisks.xml:25
+#, fuzzy
+msgid "Suggested Partitioning"
 msgstr "Partícionálás"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:12
+#: en/doPartitionDisks.xml:28
 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 ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:16
+#: en/doPartitionDisks.xml:32
 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 ""
 
 #. 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-"
-"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
-"\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:32
-msgid "Use Existing Partitions"
-msgstr "Létező partíciók használata"
+#. type: Content of: <section><itemizedlist><title>
+#: en/doPartitionDisks.xml:47
+#, fuzzy
+msgid "Main Options"
+msgstr "Beállítások"
 
-#. 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\">Partíció méret:</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."
 msgstr ""
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:41
-msgid "Use Free Space"
-msgstr "Szabad hely használata"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:59
+#, fuzzy
+msgid "<emphasis role=\"bold\">Use Free Space</emphasis>"
+msgstr "<emphasis role=\"bold\">Partíció méret:</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."
 msgstr ""
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:49
-msgid "Use Free Space on a Windows Partition"
-msgstr "Szabad hely használata a Windows Partíción"
-
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
-msgid ""
-"If you have unused space on an existing Windows partition, the installer may "
-"offer to use it."
-msgstr ""
-
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:56
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:68
+#, 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!"
-msgstr ""
+"<emphasis role=\"bold\">Use Free Space on a Windows Partition</emphasis>"
+msgstr "<emphasis role=\"bold\">Partíció méret:</emphasis>"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:61
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:71
 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."
+"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 ""
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:69
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:77
 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 ""
 
-#. 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-"
-"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
-"\"center\"/> </imageobject>"
-
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:87
-msgid "Erase and use Entire Disk."
-msgstr "Az egész lemez törlése és használata."
+msgid "<emphasis role=\"bold\">Erase and use Entire Disk</emphasis>"
+msgstr "<emphasis role=\"bold\">Partíció méret:</emphasis>"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:90
-msgid "This option will allocate the entire drive for Mageia."
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:88
+msgid "This option will allocate the entire drive for Mageia"
 msgstr ""
 
-#. 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!"
+#. type: Content of: <section><itemizedlist><listitem><warning><para>
+#: en/doPartitionDisks.xml:92
+msgid ""
+"This will erase ALL data on the selected hard drive. Take care! If you "
+"intend to use part of the disk for something else, or you already have data "
+"on the drive that you are not prepared to lose, then do not use this option."
 msgstr ""
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:96
+#. type: Content of: <section><itemizedlist><listitem><important><para>
+#: en/doPartitionDisks.xml:99
 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."
+"Note that this involves shrinking the size of the Windows partition. The "
+"partition must be \"clean\", meaning that Windows must have closed down "
+"correctly the last time it was used. It must also have been defragmented, "
+"although this is not a guarantee that all files in the partition have been "
+"moved out of the area that is about to be used. It is highly recommended to "
+"back up your personal files."
 msgstr ""
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:103
-msgid "Custom disk partitioning"
-msgstr "Egyéni lemezpartícionálás"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:110
+#, fuzzy
+msgid "<emphasis role=\"bold\">Custom Disk Partitioning</emphasis>"
+msgstr "<emphasis role=\"bold\">Partíció méret:</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)."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:112
-msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
-msgstr "<emphasis role=\"bold\">Partíció méret:</emphasis>"
+#. type: Content of: <section><mediaobject>
+#: en/doPartitionDisks.xml:120
+#, fuzzy
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"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
 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 ""
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:125
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:141
 msgid ""
 "If the total available space is greater than 50 GB, then three partitions "
 "are created"
 msgstr ""
 
-#. 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
 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 ""
 
-#. 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
+msgid "1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB"
 msgstr ""
 
-#. 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
 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 ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:144
+#: 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 ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:150
+#: en/doPartitionDisks.xml:182
 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 ""
 
 #. 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
-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 align=\"center\" fileref="
-"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </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-doPartitionDisks4.png\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:182
+#. type: Content of: <section><important><para>
+#: en/doPartitionDisks.xml:216
 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 ""
 
-#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:189
+#. type: Content of: <section><important><para>
+#: en/doPartitionDisks.xml:221
+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 ""
+
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:228
 #, fuzzy
-msgid "<emphasis role=\"bold\">Align to</emphasis> = MiB"
+msgid "<emphasis>Align to</emphasis> = MiB"
 msgstr "<emphasis role=\"bold\">Partíció méret:</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\">Partíció méret:</emphasis>"
 
-#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:194
+#. type: Content of: <section><important><para>
+#: en/doPartitionDisks.xml:236
 msgid ""
 "Also make sure all partitions are created using an even number of megabytes."
 msgstr ""
 
 #. 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 "Telepítés a LIVE médiumról"
 
 #. 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 "2015 Január"
+#: 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 "Mageia Hivatalos dokumentáció"
 
 #. 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/"
@@ -1649,8 +1839,8 @@ msgstr ""
 "sa/3.0/\">http://creativecommons.org/licenses/by-sa/3.0/</link>."
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml: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."
@@ -1661,8 +1851,7 @@ msgstr ""
 "link> segítségével készült."
 
 #. 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</"
@@ -1672,15 +1861,15 @@ msgstr ""
 "href=\"https://wiki.mageia.org/en/Documentation_team\">Dokumentációs "
 "csapattal</link>, ha segíteni szeretné a kézikönyv javítását."
 
-#. 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 "
@@ -1690,42 +1879,49 @@ msgstr ""
 "kézikönyvben látható. Mely képernyők láthatók, a hardvertől és a telepítés "
 "során végrehajtott döntéstől függ."
 
-#. 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 ""
+"Az önkéntesek szabadidejükben írták. Kérjük, lépjen kapcsolatba a <link ns6:"
+"href=\"https://wiki.mageia.org/en/Documentation_team\">Dokumentációs "
+"csapattal</link>, ha segíteni szeretné a kézikönyv javítását."
+
 #. 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 "Telepítés a DarkX használatával"
 
 #. type: Content of: <book><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:9
+#: en/DrakX-cover.xml:20
 msgid "February 2014"
 msgstr "2014 Február"
 
 #. 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 "Gratulálunk"
 
 #.  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
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
@@ -1734,46 +1930,45 @@ msgstr ""
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:18
 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 ""
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:18
+#: en/exitInstall.xml:22
 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 ""
 
 #. 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."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:26
+#: en/exitInstall.xml:30
 msgid "Enjoy!"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:28
+#: en/exitInstall.xml:32
 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/firewall.xml:3
+#: en/firewall.xml:7
 msgid "Firewall"
 msgstr "Tűzfal"
 
 #. 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 "
@@ -1782,46 +1977,46 @@ 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
 msgid "<emphasis role=\"bold\">Advanced</emphasis>"
 msgstr ""
 
 #. 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
 msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
 msgstr "<emphasis>&lt;port-number>/&lt;protocol></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 "
@@ -1829,28 +2024,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 ""
 
@@ -1858,15 +2053,16 @@ msgstr ""
 #.  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 revision=\"1\" fileref=\"dx2-"
 "formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id="
@@ -1876,382 +2072,319 @@ msgstr ""
 "</imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:24
+#: en/formatPartitions.xml:35
 msgid ""
 "Here you can choose which partition(s) you wish to format. Any data on "
 "partitions <emphasis>not</emphasis> marked for formatting will be preserved."
 msgstr ""
 
 #. 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
+msgid ""
+"Usually, at least the partitions that DrakX selected need to be formatted."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:31
+#: en/formatPartitions.xml:42
 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 ""
 
 #. type: Content of: <section><tip><para>
-#: en/formatPartitions.xml:36
+#: en/formatPartitions.xml:47
 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 ""
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:43
+#: en/formatPartitions.xml:54
 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:10
+#: en/installer.xml:14
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, a Mageia telepítő"
 
 #. 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 "
 "possible."
 msgstr ""
 
-#. 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 ""
-
 #. type: Content of: <section><section><title>
-#: en/installer.xml:22
-msgid "Installation Welcome Screen"
-msgstr ""
-
-#. type: Content of: <section><section><section><title>
-#: en/installer.xml:25
-msgid "Using a Mageia DVD"
-msgstr ""
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:27
-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 ""
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:32
-msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml: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."
-msgstr ""
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:45
-msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
+#: en/installer.xml:20
+msgid "The installation steps"
+msgstr "Telepítési lépések"
 
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:50
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/installer.xml:23
 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):"
+"The install process is divided into a number of steps - the status of which "
+"is indicated in a panel to the left of the screen."
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:55
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/installer.xml:28
 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>"
+"Each step has one or more screens, which may also have <emphasis>Advanced</"
+"emphasis> sections with extra, less commonly required options."
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:63
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/installer.xml:33
 msgid ""
-"Press <emphasis role=\"bold\">F2</emphasis> to have the installer use a "
-"specific language for the installation."
+"Most screens have <emphasis>Help</emphasis> buttons for further details "
+"about the particular step."
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:67
+#. type: Content of: <section><section><caution><para>
+#: en/installer.xml:38
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+"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 ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:72
+#. type: Content of: <section><section><caution><para>
+#: en/installer.xml:43
 msgid ""
-"Use the arrow keys to select the language then press <emphasis role=\"bold"
-"\">Enter</emphasis>."
+"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><para>
-#: en/installer.xml:77
-msgid ""
-"If needed, change the screen resolution by pressing <emphasis role=\"bold"
-"\">F3</emphasis> (Legacy mode only)."
+#. type: Content of: <section><section><title>
+#: en/installer.xml:48
+msgid "Installation Welcome Screen"
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:81
+#. type: Content of: <section><section><para>
+#: en/installer.xml:49
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome5def.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-welcome5def.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:88
+#. type: Content of: <section><section><para>
+#: en/installer.xml:52
 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)."
+"The welcome menu screen has various options, however the default option will "
+"start the installer, and is normally all that you will need."
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/installer.xml:96
-msgid "Default: It doesn't alter anything in the default options."
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:56
+msgid "Legacy (BIOS) Systems"
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/installer.xml:101
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:58
+#, fuzzy
 msgid ""
-"Safe Settings: Priority is given to the safer options at the price of a "
-"performance detriment."
+"<imageobject> <imagedata fileref=\"dx-welcome.png\" align=\"center\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+"align=\"center\"/> </imageobject>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/installer.xml:106
-msgid ""
-"No ACPI: (Advanced Configuration and Power Interface): Power management "
-"features are not used."
+#. type: Content of: <section><section><section><itemizedlist><title>
+#: en/installer.xml:63
+msgid "Menu"
 msgstr ""
 
-#. 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:66
 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."
+"Install Mageia to a hard disk. This is the default option, and will "
+"automatically start after a short while unless another option is selected."
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:120
-msgid ""
-"When you select one of these entries, it modifies the default options "
-"displayed in the <guilabel>Boot Options</guilabel> line."
-msgstr ""
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:69
+#, fuzzy
+msgid "<emphasis role=\"bold\">Rescue System</emphasis>"
+msgstr "<emphasis role=\"bold\">Partíció méret:</emphasis>"
 
-#. 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:70
 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."
+"This option allows you to either re-install the bootloader for an existing "
+"Mageia installation or you can use it to restore a Windows bootloader."
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:132
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:75
+#, fuzzy
+msgid "<emphasis role=\"bold\">Memory Test</emphasis>"
+msgstr "<emphasis role=\"bold\">Partíció méret:</emphasis>"
 
-#. 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:76
 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."
+"Test the installed RAM by performing multiple read and write operations. "
+"Reboot to end the test."
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:146
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:80
+#, fuzzy
+msgid "<emphasis role=\"bold\">F2: Language</emphasis>"
+msgstr "<emphasis role=\"bold\">Partíció méret:</emphasis>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:151
-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><itemizedlist><listitem><para>
+#: en/installer.xml:81
+msgid "Press F2 for alternative languages."
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:158
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:86
+msgid "UEFI Systems"
 msgstr ""
-"<imageobject> <imagedata 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><para>
+#: en/installer.xml:87
 msgid ""
-"The help is translated in the chosen language with <emphasis role=\"bold"
-"\">F2</emphasis>."
+"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 ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:168
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:92
+#, fuzzy
 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 ""
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+"align=\"center\"/> </imageobject>"
 
-#. type: Content of: <section><section><title>
-#: en/installer.xml:177
-msgid "The installation steps"
-msgstr "Telepítési lépések"
-
-#. type: Content of: <section><section><para>
-#: en/installer.xml:179
-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 ""
 
-#. type: Content of: <section><section><para>
-#: en/installer.xml:182
-msgid ""
-"Each step has one or more screens which may also have <guibutton>Advanced</"
-"guibutton> sections with extra, less commonly required, options."
-msgstr ""
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:99
+#, fuzzy
+msgid "<emphasis role=\"bold\">Install:</emphasis> Start the Install process"
+msgstr "<emphasis role=\"bold\">Partíció méret:</emphasis>"
 
-#. type: Content of: <section><section><para>
-#: en/installer.xml:186
+#. 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 ""
 
-#. type: Content of: <section><section><note><para>
-#: en/installer.xml:190
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:109
 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 ""
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:203
+#: en/installer.xml:115
 msgid "Installation Problems and Possible Solutions"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:206
+#: en/installer.xml:117
 msgid "No Graphical Interface"
 msgstr "Nincs grafikus felület"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:210
+#: en/installer.xml:120
 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 ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:217
+#: en/installer.xml:126
 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 ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:230
+#: en/installer.xml:138
 msgid "The Install Freezes"
 msgstr "A telepítés lefagy"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:232
+#: en/installer.xml:139
 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 ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:240
+#: en/installer.xml:146
 msgid "RAM problem"
 msgstr "RAM hiba"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:242
+#: en/installer.xml:147
 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 ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:249
+#: en/installer.xml:154
 msgid "Dynamic partitions"
 msgstr "Dinamikus partíciók"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:251
+#: en/installer.xml:155
 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/installUpdates.xml:3
+#: en/installUpdates.xml:16
 msgid "Updates"
 msgstr "Frissítések"
 
-#.  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 ""
@@ -2259,86 +2392,97 @@ msgstr ""
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:20
+#: en/installUpdates.xml:25
 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 ""
 
-#. type: Content of: <section><para>
-#: en/installUpdates.xml:24
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installUpdates.xml:30
 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 "
-"aren't connected to the Internet"
+"Select <emphasis>Yes</emphasis> if you wish to download and install them"
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/installUpdates.xml:29
-msgid "Press <guibutton>Next</guibutton> to continue"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installUpdates.xml:35
+msgid ""
+"Select <emphasis>No</emphasis> if you don't want to do this now, or if you "
+"aren't connected to the Internet"
 msgstr ""
 
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installUpdates.xml:40
+#, fuzzy
+msgid "Press <emphasis>Next</emphasis> to continue"
+msgstr "<emphasis>Egyéni</emphasis>"
+
 #. type: Content of: <section><info><title>
-#: en/login.xml:1
-msgid "Login screen"
+#: en/login.xml:4
+#, fuzzy
+msgid "Login Screen"
 msgstr "Bejelentkező képernyő"
 
 #. 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 bejelentkező képernyő"
 
 #. type: Content of: <section><para>
-#: en/login.xml:1
-msgid "Finally, you will come to the login screen."
+#: en/login.xml:14
+msgid "Finally, you will come to the desktop login screen."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/login.xml:1
+#: en/login.xml:15
 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 ""
 
 #. type: Content of: <section><para>
-#: en/login.xml:3
+#: en/login.xml:16
 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/media_selection.xml:3
-msgid "Media Selection (Nonfree)"
-msgstr "Média kiválasztása (Zárt csomagok)"
+#: 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=\"selectCountry-im1\" align="
-"\"center\" fileref=\"dx2-selectCountry.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 "
@@ -2347,24 +2491,24 @@ msgid ""
 msgstr ""
 
 #. 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."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:32
+#: en/media_selection.xml:42
 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 ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:40
+#: en/media_selection.xml:50
 msgid ""
 "The <emphasis>Tainted</emphasis> repository includes packages released under "
 "a free license. The main criteria for placing packages in this repository is "
@@ -2379,56 +2523,57 @@ msgid "Minimal Install"
 msgstr "Minimális telepítő"
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:11
+#: en/minimal-install.xml:17
 msgid ""
-"You can choose a Minimal Installation by de-selecting everything in the "
-"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"/>."
+"Minimal Installation is intended for those with specific uses in mind for "
+"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 ""
 
-#. type: Content of: <section><para>
-#: en/minimal-install.xml:14
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/minimal-install.xml:24
 msgid ""
-"If desired, you can additionally tick the <emphasis role=\"bold\">Individual "
-"package selection</emphasis> option in the same screen."
+"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 ""
 
-#. type: Content of: <section><para>
-#: en/minimal-install.xml:17
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/minimal-install.xml:28
 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"
-"\"/>."
+"If desired, you can additionally tick the <emphasis>Individual package "
+"selection</emphasis> option in the same screen."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/minimal-install.xml:22
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/minimal-install.xml:33
 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."
+"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 ""
 
-#. 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
 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 ""
 
 #. 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="
@@ -2440,200 +2585,212 @@ msgstr ""
 
 #. type: Content of: <section><info><title>
 #: en/misc-params.xml:3
-msgid "Summary of miscellaneous parameters"
-msgstr ""
+#, fuzzy
+msgid "Configuration Summary"
+msgstr "Hang beállítása"
 
 #.  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=\"dx2-summaryTop.png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/misc-params.xml:15
+#: en/misc-params.xml:24
 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 ""
 
 #. 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 "Rendszer paraméterek"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:45
-msgid "<guilabel>Timezone</guilabel>"
-msgstr "<guilabel>Időzóna</guilabel>"
+#: en/misc-params.xml:54
+#, fuzzy
+msgid "<emphasis role=\"bold\">Timezone</emphasis>"
+msgstr "<emphasis role=\"bold\">Partíció méret:</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:47
+#: en/misc-params.xml:56
 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 ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:53
-msgid "<guilabel>Country / Region</guilabel>"
-msgstr "<guilabel>Ország / Régió</guilabel>"
+#: en/misc-params.xml:62
+#, fuzzy
+msgid "<emphasis role=\"bold\">Country / Region</emphasis>"
+msgstr "<emphasis role=\"bold\">Partíció méret:</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:56
+#: en/misc-params.xml:64
 msgid ""
 "If the selected country is wrong, it is very important that you correct the "
 "setting.  See <xref linkend=\"selectCountry\"/>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:62
-msgid "<guilabel>Bootloader</guilabel>"
-msgstr "<guilabel>Rendszerbetöltő</guilabel>"
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:64
-msgid "DrakX has made good choices for the bootloader setting."
-msgstr ""
+#: en/misc-params.xml:70
+#, fuzzy
+msgid "<emphasis role=\"bold\">Bootloader</emphasis>"
+msgstr "<emphasis role=\"bold\">Partíció méret:</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:67
-msgid "Do not change anything, unless you know how to configure GRUB2"
+#: en/misc-params.xml:72
+msgid "DrakX proposal for the bootloader setting"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:70
-msgid "For more information, see <xref linkend=\"setupBootloader\"/>"
+#: en/misc-params.xml:75
+msgid ""
+"Do not change anything, unless you know how to configure GRUB2. For more "
+"information, see <xref linkend=\"setupBootloader\"/>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:75
-msgid "<guilabel>User management</guilabel>"
-msgstr "<guilabel>Felhasználókezelő</guilabel>"
+#: en/misc-params.xml:83
+#, fuzzy
+msgid "<emphasis role=\"bold\">User management</emphasis>"
+msgstr "<emphasis role=\"bold\">Partíció méret:</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:78
+#: en/misc-params.xml:85
 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 ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:84
-msgid "<guilabel>Services</guilabel>:"
-msgstr "<guilabel>Szolgálatások</guilabel>:"
+#: en/misc-params.xml:91
+#, fuzzy
+msgid "<emphasis role=\"bold\">Services</emphasis>"
+msgstr "<emphasis role=\"bold\">Partíció méret:</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:86
+#: en/misc-params.xml:93
 msgid ""
 "System services refer to those small programs which run in the background "
 "(daemons).  This tool allows you to enable or disable certain processes."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:90
+#: en/misc-params.xml:97
 msgid ""
 "You should check carefully before changing anything here - a mistake may "
-"prevent your computer from operating correctly."
-msgstr ""
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:94
-msgid "For more information, see <xref linkend=\"configureServices\"/>"
+"prevent your computer from operating correctly. For more information, see "
+"<xref linkend=\"configureServices\"/>"
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:101
+#: en/misc-params.xml:106
 msgid "Hardware parameters"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:106
-msgid "<guilabel>Keyboard</guilabel>:"
-msgstr "<guilabel>Billentyűzet</guilabel>:"
+#: en/misc-params.xml:111
+#, fuzzy
+msgid "<emphasis role=\"bold\">Keyboard</emphasis>"
+msgstr "<emphasis role=\"bold\">Partíció méret:</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:108
+#: en/misc-params.xml:113
 msgid ""
 "Configure your keyboard layout according to your location, language and type "
 "of keyboard."
 msgstr ""
 
 #. 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>Egér</guilabel>:"
+#: en/misc-params.xml:124
+#, fuzzy
+msgid "<emphasis role=\"bold\">Mouse</emphasis>"
+msgstr "<emphasis role=\"bold\">Partíció méret:</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."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:126
-msgid "<guilabel>Sound card</guilabel>:"
-msgstr "<guilabel>Hangkártya</guilabel>:"
+#: en/misc-params.xml:131
+#, fuzzy
+msgid "<emphasis role=\"bold\">Sound card</emphasis>"
+msgstr "<emphasis role=\"bold\">Partíció méret:</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:129
-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."
+#: en/misc-params.xml:133
+msgid "The installer will use the default driver if one is available."
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:137
-msgid "<guilabel>Graphical interface</guilabel>:"
+#. type: Content of: <section><section><para>
+#: en/misc-params.xml:136 en/soundConfig.xml:46
+msgid ""
+"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 ""
 
 #. 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."
-msgstr ""
+#: en/misc-params.xml:144
+#, fuzzy
+msgid "<emphasis role=\"bold\">Graphical interface</emphasis>"
+msgstr "<emphasis role=\"bold\">Partíció méret:</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:143
-msgid "For more information, see <xref linkend=\"configureX_chooser\"/>."
+#: en/misc-params.xml:146
+msgid ""
+"This section allows you to configure your graphics card(s) and displays. For "
+"more information, see <xref linkend=\"configureX_chooser\"/>"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/misc-params.xml:149
+#: en/misc-params.xml:155
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
 "\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
@@ -2642,96 +2799,106 @@ msgstr ""
 "\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"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 ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:163
-msgid "<guilabel>Network</guilabel>:"
-msgstr "<guilabel>Hálózat</guilabel>:"
+#: en/misc-params.xml:169
+#, fuzzy
+msgid "<emphasis role=\"bold\">Network</emphasis>"
+msgstr "<emphasis role=\"bold\">Partíció méret:</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:165
+#: en/misc-params.xml:171
 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 ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:172
+#: en/misc-params.xml:178
 msgid ""
 "When you add a network card, do not forget to set your firewall to monitor "
 "that interface as well."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:179
-msgid "<guilabel>Proxies</guilabel>:"
-msgstr ""
+#: en/misc-params.xml:185
+#, fuzzy
+msgid "<emphasis role=\"bold\">Proxies</emphasis>"
+msgstr "<emphasis role=\"bold\">Partíció méret:</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:181
+#: en/misc-params.xml:187
 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 ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:186
+#: en/misc-params.xml:192
 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 ""
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:195
+#: en/misc-params.xml:201
 msgid "Security"
 msgstr "Biztonság"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:200
-msgid "<guilabel>Security Level</guilabel>:"
-msgstr "<guilabel>Biztonsági szint</guilabel>:"
+#: en/misc-params.xml:206
+#, fuzzy
+msgid "<emphasis role=\"bold\">Security Level</emphasis>"
+msgstr "<emphasis role=\"bold\">Partíció méret:</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:203
+#: en/misc-params.xml:208
 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 ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:207
-msgid "Check the option which best suits your usage."
-msgstr ""
+#: en/misc-params.xml:215
+#, fuzzy
+msgid "<emphasis role=\"bold\">Firewall</emphasis>"
+msgstr "<emphasis role=\"bold\">Partíció méret:</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:212
-msgid "<guilabel>Firewall</guilabel>:"
-msgstr "<guilabel>Tűzfal</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 ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:218
-msgid ""
-"Select the services that you wish to have access to your system. Your "
-"selections will depend on what you use your computer for. For more "
-"information, see <xref linkend=\"firewall\"/>."
+#: en/misc-params.xml:229
+msgid "For more information, see <xref linkend=\"firewall\"/>."
 msgstr ""
 
 #. 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
+msgid ""
+"Bear in mind that allowing <emphasis>everything</emphasis> (no firewall) may "
+"be very risky."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -2740,29 +2907,42 @@ msgid "Reboot"
 msgstr "Újraindítás"
 
 #. type: Content of: <section><para>
-#: en/reboot.xml:6
+#: en/reboot.xml:7
 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 ""
+
+#. 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
-msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
+#: en/reboot.xml:12
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot2.png\"/> </"
+"imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"live-reboot2.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
 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 ""
 
 #. type: Content of: <section><mediaobject>
-#: en/reboot.xml:17
+#: en/reboot.xml:19
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
 "reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
@@ -2788,46 +2968,52 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/securityLevel.xml:3
+#: en/securityLevel.xml:10
 msgid "Security Level"
 msgstr "Biztonsági szint"
 
 #.  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=\"selectCountry-im1\" align="
-"\"center\" fileref=\"dx2-selectCountry.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\">Partíció méret:</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\">Partíció méret:</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 "
@@ -2835,14 +3021,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 "
@@ -2850,514 +3036,569 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:41
+#: en/securityLevel.xml:53
 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:6
+#: en/SelectAndUseISOs2.xml:15
 msgid "Select and use ISOs"
 msgstr "ISO kiválasztás és használat"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:9
+#: en/SelectAndUseISOs2.xml:18
 msgid "Introduction"
 msgstr "Bevezetés"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:10
+#: en/SelectAndUseISOs2.xml:19
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
 "which image best suits your needs."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:12
-msgid "There are two families of media:"
+#: en/SelectAndUseISOs2.xml:21
+msgid "There are three types of installation media:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:15
+#: en/SelectAndUseISOs2.xml:24
 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 ""
 
 #. 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 ""
-"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"
+"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
+msgid ""
+"Live ISOs can only be used to create <quote>clean</quote> installations, "
+"they cannot be used to upgrade previously installed Mageia releases."
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:47
+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 ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:53
+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 ""
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:27
-msgid "Details are given in the next sections."
+#: en/SelectAndUseISOs2.xml:58
+msgid "More details are given in the next sections."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:30
+#: en/SelectAndUseISOs2.xml:61
 msgid "Media"
 msgstr "Media"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:32
+#: en/SelectAndUseISOs2.xml:63
 msgid "Definition"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:33
+#: en/SelectAndUseISOs2.xml:64
 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 ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:36
+#: en/SelectAndUseISOs2.xml:67
 msgid ""
 "You can find Mageia ISO's <link ns4:href=\"http://www.mageia.org/en/"
 "downloads/\">here</link>."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:39
+#: en/SelectAndUseISOs2.xml:70
 msgid "Classical installation media"
 msgstr "Klasszikus telepítőmédia"
 
 #. 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 ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:44
-msgid "These ISOs use the Classical installer called drakx."
+#: en/SelectAndUseISOs2.xml:75
+msgid "These ISOs use the Classical installer called DrakX"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:47
+#: en/SelectAndUseISOs2.xml:78
 msgid ""
 "They are used for performing clean installs or to upgrade a previously "
-"installed version of Mageia."
+"installed version of Mageia"
 msgstr ""
 
 #. 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 "32 vagy 64 bites architektúrák."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:54
+#: en/SelectAndUseISOs2.xml:85
 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 ""
 
 #. 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
+msgid "Each DVD contains many available desktop environments and languages"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:62
+#: en/SelectAndUseISOs2.xml:95
 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 ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:69
+#: en/SelectAndUseISOs2.xml:102
 msgid "Live media"
 msgstr "Élő lemezkép"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:74
+#: en/SelectAndUseISOs2.xml:107
 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 ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:79
-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 ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:86
-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>"
+#: en/SelectAndUseISOs2.xml:114
+msgid "Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:91
-msgid "They contain non free software."
+#: en/SelectAndUseISOs2.xml:121
+msgid "They contain non-free software"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:96
+#: en/SelectAndUseISOs2.xml:126
 msgid "Live DVD Plasma"
 msgstr "Élő Plasma DVD"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:99
-msgid "Plasma desktop environment only."
-msgstr ""
+#: en/SelectAndUseISOs2.xml:129
+#, fuzzy
+msgid "Plasma desktop environment only"
+msgstr "Csak Xfce ablakkezelő."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:102 en/SelectAndUseISOs2.xml:116
-#: en/SelectAndUseISOs2.xml:130
-msgid "All available languages are present."
+#: en/SelectAndUseISOs2.xml:132 en/SelectAndUseISOs2.xml:146
+#: en/SelectAndUseISOs2.xml:160
+msgid "All available languages are present"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:105
-msgid "64 bit architecture only."
+#: en/SelectAndUseISOs2.xml:135 en/SelectAndUseISOs2.xml:149
+#, fuzzy
+msgid "64-bit architecture only"
 msgstr "Csak 64 bites architektúra"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:110
+#: en/SelectAndUseISOs2.xml:140
 msgid "Live DVD GNOME"
 msgstr "Élő GNOME DVD"
 
 #. 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 "Csak GNOME ablakkezelő."
 
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:119
-msgid "64 bit architecture only"
-msgstr "Csak 64 bites architektúra"
-
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:124
+#: en/SelectAndUseISOs2.xml:154
 msgid "Live DVD Xfce"
 msgstr "Élő Xfce DVD"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:127
-msgid "Xfce desktop environment only."
+#: en/SelectAndUseISOs2.xml:157
+#, fuzzy
+msgid "Xfce desktop environment only"
 msgstr "Csak Xfce ablakkezelő."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:133
-msgid "32 or 64 bit architectures."
+#: en/SelectAndUseISOs2.xml:163
+#, fuzzy
+msgid "32 or 64-bit architectures"
 msgstr "32 vagy 64 bites architektúrák."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:139
+#: en/SelectAndUseISOs2.xml:169
 #, fuzzy
 msgid "Net install media"
 msgstr "netinstall.iso"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:144
-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 ""
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:152
-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 ""
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:161
+#: en/SelectAndUseISOs2.xml:177
 #, fuzzy
-msgid "First steps are English language only."
+msgid "First steps are English language only"
 msgstr "Csak Angol nyelv."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:166
+#: en/SelectAndUseISOs2.xml:182
 msgid "netinstall.iso"
 msgstr "netinstall.iso"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:169
+#: en/SelectAndUseISOs2.xml:185
 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 ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:175
+#: en/SelectAndUseISOs2.xml:191
 msgid "netinstall-nonfree.iso"
 msgstr "netinstall-nonfree.iso"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:178
+#: en/SelectAndUseISOs2.xml:194
 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 ""
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:186
+#: en/SelectAndUseISOs2.xml:202
 msgid "Downloading and Checking Media"
 msgstr "Mageia letöltése és ellenőrzése"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:188
+#: en/SelectAndUseISOs2.xml:204
 msgid "Downloading"
 msgstr "Letöltés"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:189
+#: en/SelectAndUseISOs2.xml:205
 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 ""
+
+#. 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: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:191
-msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
+#: en/SelectAndUseISOs2.xml:217
+#, fuzzy
+msgid ""
+"<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:195
-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:"
+#: en/SelectAndUseISOs2.xml:222
+msgid "In the meantime, a window to download the actual ISO will open:"
 msgstr ""
 
 #. 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
 msgid "Checking the integrity of the downloaded media"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:208
+#: en/SelectAndUseISOs2.xml:235
 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 ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:214
+#: en/SelectAndUseISOs2.xml:241
 msgid ""
 "To generate the checksum for your downloaded ISO, open a console, (no need "
 "to be root), and:"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:218
+#: en/SelectAndUseISOs2.xml:245
 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 ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:222
+#: en/SelectAndUseISOs2.xml:249
+msgid ""
+"To use the sha1sum, type: <command>sha1sum path/to/the/image/file.iso</"
+"command>"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:254
 msgid ""
-"To use sha1sum, type: <userinput>sha1sum path/to/the/image/file.iso</"
-"userinput>"
+"To use the sha512sum, type: <command>sha512sum path/to/the/image/file.iso</"
+"command>"
 msgstr ""
 
 #. 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
 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 ""
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:237
+#: en/SelectAndUseISOs2.xml:270
 msgid "Burn or dump the ISO"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:238
+#: en/SelectAndUseISOs2.xml:271
 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 ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:275
 msgid "Burning the ISO to a CD/DVD"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:243
+#: en/SelectAndUseISOs2.xml:276
 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 ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:248
+#: en/SelectAndUseISOs2.xml:282
 msgid "Dump the ISO to a USB stick"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:249
+#: en/SelectAndUseISOs2.xml:283
 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 ""
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:252
+#: en/SelectAndUseISOs2.xml:286
 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 ""
 
-#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:256
+#. type: Content of: <section><section><section><note><para>
+#: en/SelectAndUseISOs2.xml:290
+msgid ""
+"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 ""
-"To recover the original capacity, you must redo partitioning and re-format "
-"the USB stick."
+"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 ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:259
+#: en/SelectAndUseISOs2.xml:299
 msgid "Using a graphical tool within Mageia"
 msgstr ""
 
 #. 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>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:263
+#: en/SelectAndUseISOs2.xml:303
 msgid "Using a graphical tool within Windows"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:304
 msgid "You could try:"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:267
+#: en/SelectAndUseISOs2.xml:307
 msgid ""
 "<link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using the "
-"\"ISO image\" option;"
+"\"ISO image\" option"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:271
+#: en/SelectAndUseISOs2.xml:311
 msgid ""
 "<link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:277
-msgid "Using Command line within a GNU/Linux system"
+#: en/SelectAndUseISOs2.xml:317
+msgid "Using the Command line within a GNU/Linux system"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:279
+#: en/SelectAndUseISOs2.xml:319
 msgid ""
 "It is potentially *dangerous* to do this by hand. You risk overwriting "
 "potentially valuable existing data if you specify the wrong target device."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:325
 msgid "Open a console"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:288
+#: en/SelectAndUseISOs2.xml:328
 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 ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:291
-msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
+#: en/SelectAndUseISOs2.xml:332
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"Root.png\"/> </"
+"imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:297
+#: en/SelectAndUseISOs2.xml:338
 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 ""
 
 #. 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
+msgid "Enter the command <command>fdisk -l</command>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:304
-msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
+#: en/SelectAndUseISOs2.xml:345
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"Fdisk.png\"/> </"
+"imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:310
+#: en/SelectAndUseISOs2.xml:351
 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 ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:312
+#: en/SelectAndUseISOs2.xml:354
 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 ""
 
 #. 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"
@@ -3381,46 +3622,49 @@ msgid ""
 msgstr ""
 
 #. 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=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:337
+#: en/SelectAndUseISOs2.xml:380
 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 ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:340
-msgid "Where X=your device name eg: /dev/sdd"
+#: en/SelectAndUseISOs2.xml:382
+msgid ""
+"Where <replaceable>X</replaceable>=your device name eg: <filename>/dev/sdd</"
+"filename>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:341
+#: en/SelectAndUseISOs2.xml:384
 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 ""
 
 #. 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
+msgid "Enter the command: <command>sync</command>"
 msgstr ""
 
 #. 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 ""
 
@@ -3430,8 +3674,10 @@ msgid "Select your Country / Region"
 msgstr "Ország / Régió kiválasztása"
 
 #.  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
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
 "\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
@@ -3439,39 +3685,38 @@ msgstr ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
 "\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
 
-#. type: Content of: <section><para>
-#: en/selectCountry.xml:14
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectCountry.xml:20
 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 ""
 
-#. type: Content of: <section><para>
-#: en/selectCountry.xml:19
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectCountry.xml:27
 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 ""
 
 #. type: Content of: <section><note><para>
-#: en/selectCountry.xml:24
+#: en/selectCountry.xml:34
 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 ""
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:33
+#: en/selectCountry.xml:42
 msgid "Input method"
 msgstr "Beviteli mód"
 
 #. type: Content of: <section><section><para>
-#: en/selectCountry.xml:36
+#: en/selectCountry.xml:45
 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. "
@@ -3480,135 +3725,130 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/selectCountry.xml:45
+#: en/selectCountry.xml:54
 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/selectInstallClass.xml:14
+#: en/selectInstallClass.xml:29
 msgid "Install or Upgrade"
 msgstr "Telepítés vagy Frissítés"
 
 #. 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 "Telepítés"
+#: en/selectInstallClass.xml:41
+#, fuzzy
+msgid "<emphasis role=\"bold\">Install</emphasis>"
+msgstr "<emphasis role=\"bold\">Partíció méret:</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 "Frissítés"
+#: en/selectInstallClass.xml:50
+#, fuzzy
+msgid "<emphasis role=\"bold\">Upgrade</emphasis>"
+msgstr "<emphasis role=\"bold\">Partíció méret:</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
+msgid "Use this option to upgrade an existing installation of Mageia."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/selectInstallClass.xml:39
+#. type: Content of: <section><important><para>
+#: en/selectInstallClass.xml:58
 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."
-msgstr ""
-
-#. type: Content of: <section><note><para>
-#: en/selectInstallClass.xml:50
-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."
+"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 ""
 
 #. type: Content of: <section><tip><para>
-#: en/selectInstallClass.xml:62
+#: en/selectInstallClass.xml:67
 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/selectKeyboardLive.xml:3
-msgid "Select keyboard"
+#: en/selectKeyboardLive.xml:14
+#, fuzzy
+msgid "Select Keyboard"
 msgstr "Billentyűzet kiválasztás"
 
 #. 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/selectKeyboard.xml:7
+#: en/selectKeyboard.xml:20
 msgid "Keyboard"
 msgstr "Billentyűzet"
 
 #. 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."
 msgstr ""
 
 #. 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 format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
-"align=\"center\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.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 "
@@ -3619,24 +3859,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:31
+#: en/selectKeyboard.xml:45
 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 ""
 
-#. 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
 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 ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:46
+#: en/selectKeyboard.xml:60
 msgid ""
 "If you choose a keyboard based on non-Latin characters, you will see an "
 "extra dialogue screen asking how you would prefer to switch between the "
@@ -3644,84 +3884,83 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:15
+#: en/selectLanguage.xml:34
 msgid "Please choose a language to use"
 msgstr "Válasszon nyelvet"
 
-#. type: Content of: <section><para>
-#: en/selectLanguage.xml:18
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectLanguage.xml:39
 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 ""
 
-#. type: Content of: <section><para>
-#: en/selectLanguage.xml:23
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectLanguage.xml:45
 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 ""
 
-#. type: Content of: <section><para>
-#: en/selectLanguage.xml:27
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectLanguage.xml:50
 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 ""
 
 #. 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 format=\"PNG\" fileref="
 "\"dx2-selectLanguage.png\" align=\"center\"/> </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
 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 ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:50
+#: en/selectLanguage.xml:76
 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."
-msgstr ""
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:56
-msgid "Mageia uses UTF-8 (Unicode) support by default."
+"it is advisable to install the required language for your keyboard as well"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:58
+#: en/selectLanguage.xml:82
 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 ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:64
+#: en/selectLanguage.xml:89
 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/selectMouse.xml:4
+#: en/selectMouse.xml:10
 msgid "Select mouse"
 msgstr "Egér kiválasztás"
 
@@ -3729,38 +3968,41 @@ msgstr "Egér kiválasztás"
 #.  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-selectKeyboard.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."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/selectMouse.xml:25
+#: en/selectMouse.xml:32
 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 ""
 
 #. type: Content of: <section><para>
-#: en/selectMouse.xml:27
+#: en/selectMouse.xml:38
 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 ""
 
-#. 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 ""
 
@@ -3780,321 +4022,388 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:7
-msgid "Bootloader main options"
+#: en/setupBootloader.xml:10
+#, fuzzy
+msgid "Bootloader"
 msgstr "Rendszerindítási beállítások"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:10
-msgid "Bootloader interface"
+#: en/setupBootloader.xml:13
+msgid "Grub2"
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:11
-msgid "By default, Mageia uses exclusively:"
+#. 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:14
+#: en/setupBootloader.xml:17
 msgid ""
-"GRUB2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
+"GRUB2 (with or without graphical menu) will be used exclusively as the "
+"bootloader for a Legacy/MBR or Legacy/GPT system."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:18
-msgid "GRUB2-efi for a UEFI system."
+#: en/setupBootloader.xml:21
+msgid ""
+"By default, a new bootloader will be written into either the MBR (Master "
+"Boot Record) of your first hard drive or in the BIOS boot partition."
 msgstr ""
 
-#. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:22
-msgid "The Mageia graphical menus are nice :)"
+#. type: Content of: <section><section><itemizedlist><title>
+#: en/setupBootloader.xml:27
+msgid "Grub2-efi on UEFI systems"
 msgstr ""
 
-#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:25
-msgid "GRUB2 on Legacy/MBR and Legacy/GPT systems"
+#. 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 ""
 
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:27
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:33
 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>"
+"By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI "
+"System Partition)."
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
-"setupBootloader.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:34 en/setupBootloader.xml:56
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:35
 msgid ""
-"Don't modify the <emphasis role=\"bold\">Boot Device</emphasis> unless you "
-"really know what you are doing."
+"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 ""
 
-#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:38
-msgid "GRUB2-efi on UEFI systems"
-msgstr ""
+#. type: Content of: <section><section><info><title>
+#: en/setupBootloader.xml:46
+#, fuzzy
+msgid "Bootloader Setup"
+msgstr "Rendszerindítási beállítások"
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:39
-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 ""
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:49
+msgid "Bootloader main options"
+msgstr "Rendszerindítási beállítások"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:42
+#: en/setupBootloader.xml:51
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
-"imageobject>"
+"<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-"
-"setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata fileref=\"live-setupBootloader3.png\" align=\"center\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:49
+#. 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\">Partíció méret:</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:63
 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."
+"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><title>
-#: en/setupBootloader.xml:61
-msgid "Using a Mageia bootloader"
-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\">Partíció méret:</emphasis>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:62
-msgid ""
-"By default, and according to your system, Mageia writes one of the following:"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:68
+msgid "Don't change this unless you really know what you are doing"
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:66
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:72
+#, fuzzy
 msgid ""
-"a GRUB2 bootloader either into the MBR (Master Boot Record) of your first "
-"hard drive or in the BIOS boot partition."
-msgstr ""
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:70
-msgid "a GRUB2-efi bootloader into the ESP"
-msgstr ""
+"<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
+msgstr "<emphasis role=\"bold\">Partíció méret:</emphasis>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:73
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:74
 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."
+"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
-msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata fileref=\"live-setupBootloader3.png\" align=\"center\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata fileref=\"live-setupBootloader3.png\" align=\"center\"/> </"
-"imageobject>"
+#, fuzzy
+msgid "<emphasis role=\"bold\">Security</emphasis>"
+msgstr "<emphasis role=\"bold\">Partíció méret:</emphasis>"
 
-#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:87
-msgid "Using an existing bootloader"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:79
+msgid ""
+"This allows you to set a password for the bootloader. This means a username "
+"and password will be required when booting in order to select a booting "
+"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 ""
 
-#. type: Content of: <section><section><para>
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
 #: en/setupBootloader.xml:88
-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 ""
 
-#. 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\">Partíció méret:</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>Jelszó (újra)</guilabel>: Írja be újra a felhasználói jelszót erre "
+"a szövegmezőbe, és a drakx ellenőrzi, hogy ugyanaz a jelszó van-e a "
+"felhasználói jelszó szövegdobozaiban."
 
-#. 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>Gyártó</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:99
+#, fuzzy
+msgid "<emphasis>Enable ACPI</emphasis>"
+msgstr "<emphasis>Általános</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-"
-"setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-setupBootloader4.png\" align="
-"\"center\"/> </imageobject>"
 
-#. type: Content of: <section><section><para>
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
 #: en/setupBootloader.xml:108
-msgid ""
-"You will get a warning that the bootloader is missing, ignore it by clicking "
-"<guibutton>OK</guibutton>."
-msgstr ""
+#, fuzzy
+msgid "<emphasis>Enable SMP</emphasis>"
+msgstr "<emphasis>Általános</emphasis>"
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:111
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:109
 msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
-"imageobject>"
+"This option enables/disables symmetric multiprocessing for multi-core "
+"processors"
 msgstr ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
-"imageobject>"
 
-#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:117
-msgid "Options"
-msgstr "Beállítások"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:113
+#, fuzzy
+msgid "<emphasis>Enable APIC</emphasis>"
+msgstr "<emphasis>Általános</emphasis>"
 
-#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:119
-msgid "First page"
-msgstr "Előző oldal"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:114
+msgid ""
+"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 ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
 #: en/setupBootloader.xml:120
+#, fuzzy
+msgid "<emphasis>Enable Local APIC</emphasis>"
+msgstr "<emphasis>Általános</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:121
 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."
+"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><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:122
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:127
+#, fuzzy
+msgid "Bootloader Configuration"
+msgstr "Hang beállítása"
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:129
+#, fuzzy
 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."
+"<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 align=\"center\" fileref="
+"\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata fileref=\"live-setupBootloader3.png\" align=\"center\"/> </"
+"imageobject>"
 
-#. 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:139
+#, fuzzy
+msgid "<emphasis role=\"bold\">Default</emphasis>"
+msgstr "<emphasis role=\"bold\">Partíció méret:</emphasis>"
+
+#. 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\">Partíció méret:</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>Jelszó (újra)</guilabel>: Írja be újra a felhasználói jelszót erre "
-"a szövegmezőbe, és a drakx ellenőrzi, hogy ugyanaz a jelszó van-e a "
-"felhasználói jelszó szövegdobozaiban."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:127 en/setupBootloader.xml:159
-msgid "<guilabel>Advanced</guilabel>"
+#: en/setupBootloader.xml:148
+#, fuzzy
+msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
+msgstr "<emphasis role=\"bold\">Partíció méret:</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:149
+msgid ""
+"If you already have other operating systems installed, Mageia attempts to "
+"add them to your new Mageia boot menu. If you don't want this behaviour, "
+"then untick the Probe Foreign OS option."
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:127
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:156
+#, fuzzy
 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)."
+"<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 align=\"center\" fileref="
+"\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata fileref=\"live-setupBootloader3.png\" align=\"center\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:133
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:166
+#, fuzzy
+msgid "<emphasis>Video mode</emphasis>"
+msgstr "<emphasis>Gyártó</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:167
 msgid ""
-"<guilabel>Enable SMP</guilabel>: This option enables/disables symmetric "
-"multiprocessing for multi core processors."
+"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:135
+#. 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>Gyártó</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:173
 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."
+"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><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:138
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:181
+#, fuzzy
 msgid ""
-"<guilabel>Enable Local APIC</guilabel>: Local APIC manages all external "
-"interrupts for a specific processor in an SMP system."
+"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align=\"center"
+"\"/> </imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:143
-msgid "Next page"
-msgstr "Következő oldal"
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:188
+#, fuzzy
+msgid "Other Options"
+msgstr "Beállítások"
 
-#. 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><section><title>
+#: en/setupBootloader.xml:190
+msgid "Using an existing bootloader"
 msgstr ""
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:150
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:191
 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 ""
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:155
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:199
+msgid "Installing Without a Bootloader"
+msgstr ""
+
+#. 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
 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/setupSCSI.xml:3
+#: en/setupSCSI.xml:10
 msgid "Setup SCSI"
 msgstr "SCSI beállítás"
 
@@ -4106,18 +4415,20 @@ msgstr "SCSI beállítás"
 #.  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
 msgid ""
 "DrakX will normally detect hard disks correctly. However, with some older "
 "SCSI controllers it may be unable to determine the correct drivers to use "
@@ -4125,81 +4436,57 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:32
+#: en/setupSCSI.xml:44
 msgid ""
-"If this happens, you will need to manually tell DrakX which SCSI drive(s) "
-"you have."
-msgstr ""
-
-#. type: Content of: <section><para>
-#: en/setupSCSI.xml:35
-msgid "DrakX should then be able to configure the drive(s) correctly."
+"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 ""
 
 #. type: Content of: <section><info><title>
-#: en/soundConfig.xml:3
+#: en/soundConfig.xml:10
 msgid "Sound Configuration"
 msgstr "Hang beállítása"
 
 #.  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
-msgid ""
-"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
-"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
-"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
-
-#. type: Content of: <section><para>
-#: en/soundConfig.xml:14
+#: en/soundConfig.xml:20
+#, 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."
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-soundConfig.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"soundConfig-im1\"/> </imageobject>"
 msgstr ""
+"<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 ""
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:24
+#: 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 ""
 
 #. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:30
+#: en/soundConfig.xml:43
 msgid "Advanced"
 msgstr "Speciális"
 
-#. type: Content of: <section><section><para>
-#: en/soundConfig.xml:33
-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 ""
-
-#. type: Content of: <section><section><para>
-#: en/soundConfig.xml:38
-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 ""
-
 #. type: Content of: <section><info><title>
-#: en/takeOverHdConfirm.xml:3
+#: en/takeOverHdConfirm.xml:10
 msgid "Confirm hard disk to be formatted"
 msgstr ""
 
@@ -4209,121 +4496,134 @@ msgstr ""
 #.     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 condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><para>
-#: en/takeOverHdConfirm.xml:27
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/takeOverHdConfirm.xml:42
 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 ""
 
-#. type: Content of: <section><para>
-#: en/takeOverHdConfirm.xml:31
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/takeOverHdConfirm.xml:48
 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/testing.xml:9
+#: en/testing.xml:3
 msgid "Testing Mageia as Live system"
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/testing.xml:14
+#: en/testing.xml:8
 msgid "Live mode"
 msgstr "Élő mód"
 
+#. 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 ""
-
 #. type: Content of: <section><section><section><info><title>
-#: en/testing.xml:28
+#: en/testing.xml:21
 msgid "Testing hardware"
 msgstr "Hardver tesztelése"
 
 #. type: Content of: <section><section><section><para>
-#: en/testing.xml:31
+#: en/testing.xml:24
 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 ""
 
 #. 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 ""
 
 #. 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
+msgid "graphics card: if you see the previous screen, it's already OK."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:47
+#: en/testing.xml:40
 msgid "webcam:"
 msgstr "webkamera:"
 
 #. 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 ""
 
 #. 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
+msgid "printer: configure your printer/s and print a test page"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:59
+#: en/testing.xml:52
 msgid "scanner: scan a document from ..."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/testing.xml:63
+#: en/testing.xml:56
 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 ""
 
-#. 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
+msgid ""
+"The configuration settings you apply here are carried over if you decide to "
+"proceed with the installation."
 msgstr ""
 
 #. type: Content of: <section><section><section><info><title>
-#: en/testing.xml:72
+#: en/testing.xml:68
 msgid "Launch installation"
 msgstr "Telepítés indítása"
 
+#. type: Content of: <section><section><section><para>
+#: en/testing.xml:71
+msgid ""
+"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 ""
+
 #. type: Content of: <section><section><section><mediaobject>
-#: en/testing.xml:76
+#: en/testing.xml:77
 msgid ""
 "<imageobject> <imagedata fileref=\"live-liveMode-install.png\"/> </"
 "imageobject>"
@@ -4331,22 +4631,13 @@ msgstr ""
 "<imageobject> <imagedata fileref=\"live-liveMode-install.png\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><section><section><para>
-#: en/testing.xml:81
-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."
-msgstr ""
-
 #. type: Content of: <section><info><title>
-#: en/uninstall-Mageia.xml:3
+#: en/uninstall-Mageia.xml:10
 msgid "Uninstalling Mageia"
 msgstr "Mageia eltávolítás"
 
 #. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:9
+#: en/uninstall-Mageia.xml:18
 msgid ""
 "If Mageia didn't convince you or you can't install it correctly - in short "
 "you want get rid of it - that is your right and Mageia also gives you the "
@@ -4354,34 +4645,37 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:14
+#: en/uninstall-Mageia.xml:23
 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 ""
 
 #. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:19
+#: en/uninstall-Mageia.xml:28
 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 ""
 
 #. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:27
+#: en/uninstall-Mageia.xml:46
 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 ""
 
 #. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:30
+#: en/uninstall-Mageia.xml:49
 msgid ""
 "If you have Vista or 7, you have one more possibility, you can extend the "
 "existing partition that is at the left of the freed space. There are other "
@@ -4391,34 +4685,50 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/unused.xml:9
+#: en/unused.xml:3
 msgid "Keep or delete unused material"
 msgstr "Nem használt fájlok megtartása vagy törlése"
 
+#. 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=\"reboot-im1\" fileref=\"live-"
+"reboot.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 ""
 "Ebben a lépésben a Telepítő nem használt nyelvi fájlokat és hardver "
 "csomagokat keres. Ezután felajánlja a törlésüket. Jó ötlet elfogadni a "
 "törlést, kivéve, ha olyan telepítést készít, amelyet másik hardveren tervez "
 "használni."
 
+#. 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>"
@@ -4427,14 +4737,366 @@ 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 ""
 "A következő lépés a fájlok lemezre másolása. Ez több percet vehet igénybe. A "
 "végén a képernyő rövid időre elsötétülhet, ez normális."
 
+#~ msgid "User and Superuser Management"
+#~ msgstr "Felhasználó és rendszergazda útmutató."
+
+#~ msgid "In advanced tab, you will find more options about clock settings."
+#~ msgstr ""
+#~ "A Speciális lapon további lehetőségek találhatók az órabeállításokkal "
+#~ "kapcsolatban."
+
+#~ msgid "From a disc"
+#~ msgstr "Betöltés lemezről"
+
+#~ msgid "From a USB device"
+#~ msgstr "Betöltés USB eszközről"
+
+#~ 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 "A középső menüben három művelet közül választhat:"
+
+#~ msgid "In the bottom menu, are the Boot Options:"
+#~ msgstr "Az alsó menü a Boot lehetőségek"
+
+#~ msgid ""
+#~ "F1 - Help. Explain the options \"splash\", \"apm\", \"acpi\" and \"Ide\""
+#~ msgstr ""
+#~ "F1 - Segítés. Magyarázat a lehetőségekhez \"splash\", \"apm\", \"acpi\" "
+#~ "és \"Ide\""
+
+#~ msgid "F2 - Language. Choose the display language of the screens."
+#~ msgstr "F2 - Nyelvek. Válasszon megjelenítési nyelvet."
+
+#~ msgid ""
+#~ "F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728"
+#~ msgstr ""
+#~ "F3 - Képernyő felbontás. Válasszon a szöveges, 640x400, 800x600, 1024x728 "
+#~ "megjelenítések között."
+
+#~ 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 - Illesztőprogram. Igen vagy Nem. A rendszer tisztában van egy "
+#~ "opcionális lemez jelenlétével az illesztőprogram frissítésével, és a "
+#~ "telepítés során be kell helyezni."
+
+#~ msgid ""
+#~ "F6 - Kernel options. This is a way to specify options according to your "
+#~ "hardware and the drivers to use."
+#~ msgstr ""
+#~ "F6 - Kernel beállítások. Ez a lehetőség a hardver és a használni kívánt "
+#~ "illesztőprogramok opcióinak megadása."
+
+#~ msgid "First screen while booting on UEFI system from disk"
+#~ msgstr "Az első képernyő az UEFI rendszerről történő indításkor a lemezről"
+
+#, 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=\"summaryBottom-im1\" "
+#~ "align=\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </"
+#~ "imageobject>"
+
+#, 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=\"reboot-im1\" fileref="
+#~ "\"live-reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<emphasis><guibutton>Graphic card</guibutton></emphasis>: Choose your "
+#~ "card from the list if needed."
+#~ msgstr ""
+#~ "<emphasis><guibutton>Videókártya</guibutton></emphasis>: Ha szükséges, "
+#~ "válassza ki a kártyát a listából."
+
+#, 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=\"reboot-im1\" fileref="
+#~ "\"live-reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
+
+#~ msgid "<emphasis>Plug 'n Play</emphasis>"
+#~ msgstr "<emphasis>Plug 'n Play</emphasis>"
+
+#~ msgid "the monitor manufacturers name"
+#~ msgstr "a monitor gyártó neve"
+
+#~ msgid "the monitor description"
+#~ msgstr "a monitor leírása"
+
+#~ 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 ""
+#~ "<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-"
+#~ "doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" "
+#~ "align=\"center\"/> </imageobject>"
+
+#~ msgid "Use Free Space"
+#~ msgstr "Szabad hely használata"
+
+#~ msgid "Use Free Space on a Windows Partition"
+#~ msgstr "Szabad hely használata a Windows Partíción"
+
+#, 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-"
+#~ "doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" "
+#~ "align=\"center\"/> </imageobject>"
+
+#~ msgid "Erase and use Entire Disk."
+#~ msgstr "Az egész lemez törlése és használata."
+
+#~ msgid "Custom disk partitioning"
+#~ msgstr "Egyéni lemezpartícionálás"
+
+#~ 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 align=\"center\" fileref="
+#~ "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition="
+#~ "\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid "January 2015"
+#~ msgstr "2015 Január"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
+
+#~ msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+
+#~ msgid "Media Selection (Nonfree)"
+#~ msgstr "Média kiválasztása (Zárt csomagok)"
+
+#, 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=\"selectCountry-im1\" "
+#~ "align=\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </"
+#~ "imageobject>"
+
+#~ msgid "<guilabel>Timezone</guilabel>"
+#~ msgstr "<guilabel>Időzóna</guilabel>"
+
+#~ msgid "<guilabel>Country / Region</guilabel>"
+#~ msgstr "<guilabel>Ország / Régió</guilabel>"
+
+#~ msgid "<guilabel>Bootloader</guilabel>"
+#~ msgstr "<guilabel>Rendszerbetöltő</guilabel>"
+
+#~ msgid "<guilabel>User management</guilabel>"
+#~ msgstr "<guilabel>Felhasználókezelő</guilabel>"
+
+#~ msgid "<guilabel>Services</guilabel>:"
+#~ msgstr "<guilabel>Szolgálatások</guilabel>:"
+
+#~ msgid "<guilabel>Keyboard</guilabel>:"
+#~ msgstr "<guilabel>Billentyűzet</guilabel>:"
+
+#~ msgid "<guilabel>Mouse</guilabel>:"
+#~ msgstr "<guilabel>Egér</guilabel>:"
+
+#~ msgid "<guilabel>Sound card</guilabel>:"
+#~ msgstr "<guilabel>Hangkártya</guilabel>:"
+
+#~ msgid "<guilabel>Network</guilabel>:"
+#~ msgstr "<guilabel>Hálózat</guilabel>:"
+
+#~ msgid "<guilabel>Security Level</guilabel>:"
+#~ msgstr "<guilabel>Biztonsági szint</guilabel>:"
+
+#~ msgid "<guilabel>Firewall</guilabel>:"
+#~ msgstr "<guilabel>Tűzfal</guilabel>:"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata format=\"PNG\" xml:id=\"securityLevel-im1\" "
+#~ "align=\"center\" fileref=\"dx2-securityLevel.png\" revision=\"1\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" "
+#~ "align=\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </"
+#~ "imageobject>"
+
+#~ msgid "64 bit architecture only."
+#~ msgstr "Csak 64 bites architektúra"
+
+#~ msgid "Install"
+#~ msgstr "Telepítés"
+
+#~ msgid "Upgrade"
+#~ msgstr "Frissítés"
+
+#~ 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 ""
+#~ "<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>"
+
+#~ 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 fileref=\"dx2-"
+#~ "setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata xml:id=\"setupBootloader-im1\" fileref="
+#~ "\"live-setupBootloader.png\"/> </imageobject>"
+
+#~ 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-"
+#~ "setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#~ 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-"
+#~ "setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-setupBootloader4.png\" "
+#~ "align=\"center\"/> </imageobject>"
+
+#~ msgid "First page"
+#~ msgstr "Előző oldal"
+
+#~ msgid "Next page"
+#~ msgstr "Következő oldal"
+
+#, 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 ""
+#~ "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" "
+#~ "xml:id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" "
+#~ "xml:id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
+
+#, 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 "Additionally, you can disable or enable a guest account."
 #~ msgstr "Ezenkívül letilthatja vagy engedélyezheti a vendégfiókot."
 
@@ -4518,15 +5180,6 @@ msgstr ""
 #~ "</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 ""
 #~ "<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
 #~ "doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
 #~ "condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" "
@@ -4559,15 +5212,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 ""
 #~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png"
 #~ "\" align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></"
 #~ "imagedata> </imageobject>"
diff --git a/docs/docs/stable/installer/id.po b/docs/docs/stable/installer/id.po
index f176dd9e..95d9661b 100644
--- a/docs/docs/stable/installer/id.po
+++ b/docs/docs/stable/installer/id.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2018-04-19 16:32+0300\n"
+"POT-Creation-Date: 2019-01-06 12:43+0200\n"
 "PO-Revision-Date: 2016-07-17 09:04+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Indonesian (http://www.transifex.com/MageiaLinux/mageia/"
@@ -23,12 +23,12 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. type: Content of: <section><info><title>
-#: en/acceptLicense.xml:25
+#: en/acceptLicense.xml:31
 msgid "License and Release Notes"
 msgstr "Lisensi dan Catatan Rilis"
 
 #. type: Content of: <section><mediaobject>
-#: en/acceptLicense.xml:29
+#: en/acceptLicense.xml:35
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
@@ -45,80 +45,86 @@ msgstr ""
 "> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/acceptLicense.xml:40
+#: en/acceptLicense.xml:46
 msgid "License Agreement"
 msgstr "Perjanjian Lisensi"
 
-#. 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 ""
 "Sebelum menginstall <application>Mageia</application>, silakan baca syarat "
 "dan ketentuan lisensi dengan seksama."
 
-#. 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 ""
 "Syarat dan ketentuan ini berlaku ke seluruh distribusi <application>Mageia</"
 "application> dan harus diterima sebelum Anda melanjutkan."
 
-#. 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 ""
 "Untuk menerima, pilih <guilabel>Terima</guilabel> lalu klik "
 "<guibutton>Selanjutnya</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 ""
 "Jika Anda memutuskan untuk tidak menerima ketentuan ini, maka terima kasih "
 "karena telah melihat-lihat. Mengklik <guibutton>Keluar</guibutton> akan "
 "menyalakan ulang komputer Anda."
 
 #. type: Content of: <section><section><info><title>
-#: en/acceptLicense.xml:63
+#: en/acceptLicense.xml:76
 msgid "Release Notes"
 msgstr "Catatan Rilis"
 
 #. 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 ""
 "Untuk melihat apa yang baru di rilis <application>Mageia</application> ini, "
 "klik pada tombol <guibutton>Catatan Rilis</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 "id"
 
 #. 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 "Pemilihan Media (Konfigurasi Media Instalasi Pelengkap)"
 
 #.  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."
@@ -130,13 +136,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 ""
 "Layar ini memberi Anda daftar repositori yang telah dikenali. Anda bisa "
 "menambahkan sumber lain, seperti disk optik atau sumber remote. Pemilihan "
@@ -144,25 +150,25 @@ msgstr ""
 "langkah-langkah berikutnya."
 
 #. 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 "Untuk sumber jaringan, ada dua langkah yang harus diikuti:"
 
 #. 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 "Memilih dan mengaktifkan jaringan, jika belum terhubung."
 
 #. 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 ""
 "Memilih mirror atau menentukan URL (entri paling awal). Dengan memilih "
 "mirror,  Anda memiliki akses ke semua repositori terpilih yang dikelola oleh "
@@ -170,15 +176,15 @@ msgstr ""
 "bisa menentukan repositori tertentu atau instalasi NFS Anda."
 
 #. 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 ""
 "Jika Anda mengupdate instalasi 64 bit yang mungkin berisi beberapa paket 32 "
 "bit, maka disarankan untuk menggunakan layar ini untuk menambahkan mirror "
@@ -188,19 +194,25 @@ msgstr ""
 "menemukan paket-paket 32 bit di sana."
 
 #. type: Content of: <section><info><title>
-#: en/addUser.xml:3
-msgid "User and Superuser Management"
-msgstr "Pengelolaan Pengguna dan Pengguna Super"
+#: en/addUser.xml:9
+#, fuzzy
+msgid "User Management"
+msgstr "Pengelolaan Pengguna Lanjutan"
 
 #.  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 "Atur Sandi Administrator (root):"
 
 #. 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 ""
 "Disarankan untuk semua instalasi <application>Mageia</application> agar "
 "mengatur sandi superuser atau administrator, biasanya di Linux disebut "
@@ -234,28 +246,28 @@ msgstr ""
 "sandi pada sandi pertama dengan membandingkannya."
 
 #. 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 ""
 "Semua sandi berlaku sensitif, akan sangat baik untuk menggunakan "
 "penggabungan huruf (besar dan kecil), nomor dan karakter lain sebagai sandi."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:42
+#: en/addUser.xml:57
 msgid "Enter a user"
 msgstr "Masukkan pengguna"
 
 #. 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 ""
 "Tambahkan pengguna di sini. Pengguna memiliki hak yang lebih sedikit "
 "dibanding superuser (root), tapi cukup untuk menjelajah internet, "
@@ -263,70 +275,91 @@ msgstr ""
 "biasa dilakukan pengguna dengan komputernya"
 
 #. 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>Pabrikan</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>Ikon</guibutton>: jika Anda mengklik tombol ini akan mengubah "
 "ikon pengguna."
 
 #. 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>Pabrikan</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>Nama Asli</guilabel>: Masukkan nama asli pengguna pada kotak teks "
 "ini."
 
 #. 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>Pabrikan</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>Nama Login</guilabel>: Di sini Anda memasukkan nama login pengguna "
 "atau biarkan drakx menggunakan versi dari nama asli pengguna. <emphasis>Nama "
 "login berlaku sensitif.</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>Pabrikan</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>Sandi</guilabel>: Pada kotak teks ini Anda perlu mengetikkan sandi "
 "pengguna. Terdapat pelindung pada ujung dari kotak teks yang menandakan "
 "kekuatan sandi. (Lihat juga <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>Sandi (lagi)</guilabel>: Ketik ulang sandi pengguna pada kotak "
 "teks ini, drakx akan memeriksa bahwa Anda memiliki sandi yang sama pada tiap-"
 "tiap kotak teks."
 
 #. 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 ""
 "Setiap pengguna yang Anda tambahkan saat menginstall Mageia akan memiliki "
 "direktori home yang terbaca oleh semua (tapi terlindungi dari penulisan)."
 
 #. 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</"
@@ -339,46 +372,46 @@ msgstr ""
 "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 "Perizinan hak akses juga bisa diubah setelah instalasi."
 
 #. 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 "Pengelolaan Pengguna Lanjutan"
 
 #. 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 ""
 "Jika tombol <guibutton>lanjutan</guibutton> diklik, akan ditampilkan sebuah "
 "layar yang memungkinkan Anda mengedit pengaturan pengguna yang Anda "
 "tambahkan."
 
 #. 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>Shell</guilabel>: Daftar drop down ini memungkinkan Anda mengubah "
 "shell yang akan digunakan oleh pengguna yang telah ditambahkan pada layar "
 "sebelumnya, pilihannya adalah Bash, Dash dan 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 pengguna</guilabel>: Di sini Anda bisa mengatur ID untuk "
 "pengguna yang Anda tambahkan pada layar sebelumnya. Ini adalah nomor.  "
@@ -386,14 +419,14 @@ msgstr ""
 "sini."
 
 #. 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 "Pilih titik kait"
 
@@ -408,16 +441,17 @@ msgstr "Pilih titik kait"
 #.        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 ""
 "Di sini Anda melihat partisi Linux yang ditemukan di komputer. Jika Anda "
 "tidak setuju dengan saran <application>DrakX</application>, Anda bisa "
 "mengubah titik kaitnya."
 
-#. 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 ""
-"Jika Anda mengubah apapun, pastikan Anda tetap memiliki partisi <literal>/</"
-"literal> (root)."
-
 #. 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 ""
-"Setiap partisi ditampilkan sebagai berikut: \"Perangkat\" (\"Kapasitas\", "
-"\"Titik kait\", \"Tipe\")."
-
-#. 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 ""
 "Jika Anda memiliki banyak partisi, Anda bisa memilih banyak titik kait yang "
 "berbeda dari menu drop down, seperti <literal>/</literal>, <literal>/home</"
@@ -486,7 +501,7 @@ msgstr ""
 "<literal>/home</literal> instalasi cauldron."
 
 #. 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,283 +511,412 @@ msgstr ""
 "kait kosong."
 
 #. 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 ""
+"Jika Anda mengubah apapun, pastikan Anda tetap memiliki partisi <literal>/</"
+"literal> (root)."
+
+#. 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 ""
 "Pilih <guibutton>Sebelumnya</guibutton> jika Anda tidak yakin akan memilih "
 "apa, lalu pilih <guilabel>Pemartisian disk sesuaian</guilabel>. Di layar "
 "berikutnya, Anda bisa mengklik partisi untuk melihat tipe dan ukurannya."
 
 #. 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 ""
 "Jika Anda yakin titik kait sudah benar, klik <guibutton>Selanjutnya</"
 "guibutton>, lalu pilih apakah Anda hanya akan memformat partisi yang "
 "disarankan Drakx atau yang lainnya juga."
 
 #. type: Content of: <section><info><title>
-#: en/bestTime.xml:10
-msgid "Clock settings"
+#: en/bestTime.xml:5
+msgid "Clock Settings"
 msgstr ""
 
 #. 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
 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 ""
 
 #. type: Content of: <section><para>
-#: en/bestTime.xml:23
-msgid "In advanced tab, you will find more options about clock settings."
+#: 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 ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:1
+#: en/bootLive.xml:10
 msgid "Booting the medium"
 msgstr ""
 
-#. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:1
-msgid "From a disc"
-msgstr ""
-
-#. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:1
+#. type: Content of: <section><section><para>
+#: en/bootLive.xml:12
 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."
+"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 ""
 
-#. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:7
-msgid "From a USB device"
+#. 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 ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:12
+#: en/bootLive.xml:35
 msgid "In BIOS/CSM/Legacy mode"
 msgstr ""
 
+#. 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>Pabrikan</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
+msgid "Once the boot is done, you can proceed to the installation."
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/bootLive.xml:45 en/bootLive.xml:57
+#, fuzzy
+msgid ""
+"<emphasis role=\"bold\">+ use non-free video drivers (slower to boot)</"
+"emphasis>"
+msgstr "<emphasis>Pabrikan</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>Pabrikan</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:54 en/bootLive.xml:157
+msgid "This option will install Mageia to a hard disk."
+msgstr ""
+
+#. 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 ""
 
-#. type: Content of: <section><section><para>
-#: en/bootLive.xml:12
-msgid "In the middle menu, you have the choice between three actions:"
+#. 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
+#: en/bootLive.xml:75
+#, fuzzy
+msgid "<keycap>F1</keycap> <emphasis role=\"bold\">Help</emphasis>"
+msgstr "<emphasis>Pabrikan</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:76
 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."
+"Within any of the <keycap>F2</keycap> to <keycap>F6</keycap> options, you "
+"can view relevant help by pressing <keycap>F1</keycap>."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:16
+#: en/bootLive.xml:81
+#, fuzzy
+msgid "<keycap>F2</keycap> <emphasis role=\"bold\">Language</emphasis>"
+msgstr "<emphasis>Pabrikan</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:82
 msgid ""
-"Install Mageia: This choice will directly install Mageia on a hard disk."
+"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 ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:17
+#: en/bootLive.xml:87
+#, fuzzy
+msgid "<keycap>F3</keycap> <emphasis role=\"bold\">Video Mode</emphasis>"
+msgstr "<emphasis>Pabrikan</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:89
+#, fuzzy
 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 ""
+"If needed, change the screen resolution by pressing <keycap>F3</keycap>. "
+"Options are: 640x480, 800x600, 1024x768."
+msgstr "Ubah resolusi layar dengan menekan tombol F3 (hanya mode Legacy)."
 
-#. type: Content of: <section><section><para>
-#: en/bootLive.xml:19
-msgid "In the bottom menu, are the Boot Options:"
-msgstr ""
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:93
+#, fuzzy
+msgid "<keycap>F4</keycap> <emphasis role=\"bold\">Source</emphasis>"
+msgstr "<emphasis>Pabrikan</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:19
+#: en/bootLive.xml:94
 msgid ""
-"F1 - Help. Explain the options \"splash\", \"apm\", \"acpi\" and \"Ide\""
+"Normally, the installation is performed from the inserted installation "
+"medium. Here, you may select other sources, like FTP or NFS servers."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:20
-msgid "F2 - Language. Choose the display language of the screens."
+#: en/bootLive.xml:95
+msgid ""
+"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 ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:21
-msgid "F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728"
-msgstr ""
+#: en/bootLive.xml:98
+#, fuzzy
+msgid "<keycap>F5</keycap> <emphasis role=\"bold\">Driver</emphasis>"
+msgstr "<emphasis>Pabrikan</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:22
+#: en/bootLive.xml:99
 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 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 ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:26
+#: en/bootLive.xml:104
+#, fuzzy
+msgid "<keycap>F6</keycap> <emphasis role=\"bold\">Kernel Options</emphasis>"
+msgstr "<emphasis>Pabrikan</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:106
 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 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>Pabrikan</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 ""
+"- Tanpa ACPI (Advanced Configuration and Power Interface), manajemen daya "
+"tidak diterapkan."
+
+#. 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 ""
+"- Tanpa APIC Lokal (Local Advanced Programmable Interrupt Controller), ini "
+"untuk interupsi CPU, pilih opsi ini jika diminta."
+
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:28
+#: en/bootLive.xml:131
 msgid ""
-"F6 - Kernel options. This is a way to specify options according to your "
-"hardware and the drivers to use."
+"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 ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:29
+#: en/bootLive.xml:139
 msgid "In UEFI mode"
 msgstr ""
 
 #. 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"
+#: en/bootLive.xml:146
+msgid "First screen while booting in UEFI mode"
 msgstr ""
 
 #. 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 ""
 
-#. type: Content of: <section><section><para>
-#: en/bootLive.xml:30
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:153
 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 ""
 
-#. 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/chooseDesktop.xml:3
+#: en/chooseDesktop.xml:16
 msgid "Desktop Selection"
 msgstr "Pemilihan Desktop"
 
 #. 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 ""
-"Tergantung pada apa yang dipilih di sini, Anda mungkin akan ditawarkan layar "
-"lanjutan untuk menyesuaikan pilihan."
 
 #. 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 ""
 "Setelah pemilihan langkah, Anda akan melihat tampilan slide selama instalasi "
 "paket. Tampilan slide bisa dimatikan dengan menekan tombol "
 "<guilabel>Rincian</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 ""
 "Pilih apakah Anda lebih suka menggunakan lingkungan desktop "
 "<application>KDE</application> atau <application>Gnome</application>. "
@@ -789,8 +933,9 @@ msgid "Package Group Selection"
 msgstr "Pemilihan Grup Paket"
 
 #. 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"
@@ -800,7 +945,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 "
@@ -814,25 +959,25 @@ msgstr ""
 "saat mouse di arahkan ke grup-grup tersebut."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:21
+#: en/choosePackageGroups.xml:23
 #, fuzzy
 msgid "<emphasis role=\"bold\">Workstation</emphasis>"
 msgstr "<emphasis>Pabrikan</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>Pabrikan</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>Pabrikan</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 "
@@ -842,7 +987,7 @@ msgstr ""
 "atau menghapus paket secara manual."
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:38
+#: en/choosePackageGroups.xml:40
 msgid ""
 "See <xref linkend=\"minimal-install\"/> for instructions on how to do a "
 "minimal install (without or with X &amp; IceWM)."
@@ -854,8 +999,10 @@ msgid "Choose Individual Packages"
 msgstr "Pilih Paket Individual"
 
 #. 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"
@@ -865,7 +1012,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."
@@ -874,13 +1021,14 @@ msgstr ""
 "menyesuaikan instalasi."
 
 #. 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 ""
 "Setelah selesai memilih, Anda bisa mengklik <guibutton>ikon floppy</"
 "guibutton> di bawah halaman untuk menyimpan pilihan paket (bisa juga "
@@ -895,8 +1043,10 @@ msgstr "Konfigurasikan Layanan Anda"
 
 #.  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"
@@ -907,7 +1057,7 @@ 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."
@@ -915,19 +1065,15 @@ msgstr ""
 "Di sini Anda bisa mengatur layanan mana yang (tidak) harus dijalankan saat "
 "komputer dinyalakan."
 
-#. 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 "Pengaturan pilihan DrakX biasanya sudah bagus."
-
-#. 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."
@@ -936,7 +1082,7 @@ msgstr ""
 "dalam kotak informasi di bawah."
 
 #. 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 "Hanya ubah sesuatu jika Anda sangat mengetahui hal tersebut."
 
@@ -947,15 +1093,17 @@ msgstr "Konfigurasi Zona Waktu Anda"
 
 #.  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-"
@@ -963,18 +1111,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 ""
 "Pilih zona waktu Anda dengan memilih negara Anda atau sebuah kota yang dekat "
 "dengan Anda dengan zona waktu yang sama."
 
 #. 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 "
@@ -984,7 +1132,7 @@ msgstr ""
 "waktu lokal atau GMT, atau disebut juga 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."
@@ -993,24 +1141,24 @@ msgstr ""
 "semua diatur ke waktu lokal, atau semua ke 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 "Pilih Server X (Konfigurasi Perangkat Grafis Anda)"
 
 #. 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."
@@ -1019,7 +1167,7 @@ msgstr ""
 "mengidentifikasi perangkat video Anda dengan benar."
 
 #. 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:"
@@ -1027,99 +1175,96 @@ msgstr ""
 "Jika installer tidak mendeteksi perangkat grafis Anda dengan benar dan Anda "
 "mengetahui mana yang Anda punya, Anda bisa memilihnya dari pohon dengan:"
 
-#. 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 "pabrikan"
 
 #. 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 "lalu nama perangkat"
 
 #. 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 "dan tipe perangkat"
 
 #. 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 ""
 "Daftaran Xorg menyediakan lebih dari 40 driver perangkat video umum dan open "
 "source. Jika masih tidak menemukan driver untuk perangkat Anda, masih ada "
 "pilihan untuk menggunakan driver vesa yang menyediakan kemampuan dasar."
 
-#. 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 ""
 "Perhatikan bahwa jika Anda memilih driver yang tidak cocok, Anda mungkin "
 "hanya akan bisa mengakses Antarmuka Baris Perintah."
 
 #. 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 ""
 "Beberapa pabrikan perangkat video menyediakan driver proprietary untuk Linux "
 "yang mungkin hanya tersedia dalam repository Nonfree dan mungkin juga hanya "
 "tersedia di website mereka."
 
-#. 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 ""
-"Repository Nonfree harus dihidupkan secara eksplisit untuk mengaksesnya. "
-"Jika Anda tidak memilih itu sebelumnya, Anda harus melakukan ini setelah "
-"komputer dinyalakan ulang."
-
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:3
+#: en/configureX_chooser.xml:11
 msgid "Graphic Card and Monitor Configuration"
 msgstr "Konfigurasi Perangkat Grafis dan Monitor"
 
 #.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
+#. 2018/02/15 apb: Some text and typography.
+#. 2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.
+#. 2018/02/23 apb: Typo.
 #. 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 ""
 "Apapun lingkungan grafis (disebut juga lingkungan desktop) yang Anda pilih "
 "dalam menginstall <application>Mageia</application>, semua bersandar pada "
@@ -1131,23 +1276,33 @@ msgstr ""
 "membuat pilihan, atau jika pilihan salah."
 
 #. 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>Pabrikan</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>Perangkat Grafis</guibutton></emphasis>: Pilih "
-"perangkat Anda dari daftar berikut jika diperlukan."
 
 #. 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>Pabrikan</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>: Anda bisa memilih "
 "<guilabel>Plug'n Play</guilabel> jika bisa diterapkan, atau pilih monitor "
@@ -1155,32 +1310,37 @@ msgstr ""
 "Pilih <guilabel>Sesuaian</guilabel> jika Anda lebih suka untuk mengatur "
 "refresh rate monitor horisontal dan vertikal secara manual."
 
-#. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/configureX_chooser.xml:41
-msgid "Incorrect refresh rates may damage your monitor"
-msgstr "Refresh rate yang tidak tepat bisa merusak monitor Anda"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_chooser.xml:60
+#, fuzzy
+msgid "<emphasis role=\"bold\">Resolution</emphasis>"
+msgstr "<emphasis>Pabrikan</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>Resolusi</guibutton></emphasis>: Atur resolusi dan "
 "kedalaman warna monitor yang diinginkan di sini."
 
 #. 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>Pabrikan</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>Coba</guibutton></emphasis>: Tombol untuk mencoba tidak "
 "selalu muncul saat instalasi. Jika tombolnya ada, Anda bisa mengendalikan "
@@ -1192,21 +1352,35 @@ msgstr ""
 "tersedia</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>Pabrikan</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>Pilihan</guibutton></emphasis>: Di sini Anda bisa "
 "memilih untuk menghidupkan atau mematikan berbagai pilihan."
 
+#. 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 "Pemilihan Monitor"
 
 #. 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."
@@ -1215,7 +1389,7 @@ msgstr ""
 "monitor Anda dengan tepat."
 
 #. 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 "
@@ -1229,25 +1403,26 @@ msgstr ""
 "monitor yang Anda miliki"
 
 #. 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>Sesuaian</emphasis>"
+#. type: Content of: <section><variablelist><varlistentry><term>
+#: en/configureX_monitor.xml:46
+msgid "Custom"
+msgstr "Sesuaian"
 
-#. 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."
@@ -1257,8 +1432,8 @@ msgstr ""
 "sering layar disegarkan dan sync horisontal adalah kecepatan di mana scan "
 "line ditampilkan."
 
-#. 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 "
@@ -1270,27 +1445,23 @@ msgstr ""
 "ragu, pilih pengaturan sederhana dan baca dokumentasi monitor yang Anda "
 "miliki."
 
-#. 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 ""
 "Ini adalah pilihan bawaan dan mencoba untuk menentukan tipe monitor dari "
 "basis data."
 
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:51
-msgid "<emphasis>Vendor</emphasis>"
-msgstr "<emphasis>Pabrikan</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:"
@@ -1299,31 +1470,30 @@ msgstr ""
 "mengetahui jenis monitor yang Anda miliki, Anda bisa memilihnya dari pohon "
 "dengan memilih:"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:61
-msgid "the monitor manufacturers name"
-msgstr "nama pembuat monitor"
+#. 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 "keterangan monitor"
+#. 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>Umum</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 ""
 "memilih grup ini menampilkan hampir 30 konfigurasi seperti 1024x768 @ 60 Hz "
 "dan termasuk layar datar seperti yang digunakan pada laptop. Ini seringkali "
@@ -1332,130 +1502,141 @@ msgstr ""
 "sangat bijaksana jika Anda memilih yang sederhana."
 
 #. 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 "Menyesuaikan pemartisian disk dengan 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-"
 "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </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 ""
-"Jika ingin menggunakan enkripsi untuk partisi <literal>/</literal> Anda, "
-"pastikan Anda memiliki partisi <literal>/boot</literal> terpisah. Pilihan "
-"enkripsi untuk partisi <literal>/boot</literal> JANGAT diatur, atau sistem "
-"Anda tidak akan bisa berjalan."
-
-#. 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 ""
 "Sesuaikan layout diks Anda di sini. Anda bisa menghapus atau membuat "
 "partisi, mengubah sistem file partisi atau mengubah ukurannya dan bahkan "
 "melihat apa di dalamnya sebelum Anda memulai."
 
-#. 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 ""
-"Tekan <guibutton>Bersihkan semua</guibutton> untuk membersihkan semua "
-"partisi pada perangkat penyimpanan terpilih"
+"Ada tab untuk setiap hard disk yang terdeteksi atau perangkat penyimpanan "
+"lainnya, seperti flashdisk. Contohnya sda, sdb dan sdc jika ada tiga."
 
-#. 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 ""
 "Untuk aksi lainnya: klik pada partisi yang diinginkan terlebih dahulu. Lalu "
 "tampilkan, atau pilih filesystem dan titik kait, ubah ukuran atau bersihkan."
 
-#. 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 "Lanjutkan hingga Anda mengatur semua yang Anda inginkan."
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:52
-msgid "Click <guibutton>Done</guibutton> when you're ready."
-msgstr "Klik <guibutton>Selesai</guibutton> jika sudah siap."
+#. 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 ""
+"Tekan <guibutton>Bersihkan semua</guibutton> untuk membersihkan semua "
+"partisi pada perangkat penyimpanan terpilih"
 
-#. 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 ""
+"Jika ingin menggunakan enkripsi untuk partisi <literal>/</literal> Anda, "
+"pastikan Anda memiliki partisi <literal>/boot</literal> terpisah. Pilihan "
+"enkripsi untuk partisi <literal>/boot</literal> JANGAT diatur, atau sistem "
+"Anda tidak akan bisa berjalan."
+
+#. 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 ""
+"Jika Anda menginstall Mageia pada sistem UEFI, periksa bahwa ESP (EFI System "
+"Partition) tersedia dan dimount dengan benar pada /boot/EFI (lihat di atas)"
+
+#. 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 ""
 "Jika Anda menginstall Mageia pada sistem UEFI, periksa bahwa ESP (EFI System "
 "Partition) tersedia dan dimount dengan benar pada /boot/EFI (lihat di atas)"
 
-#. 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 "Gunakan Partisi yang Tersedia"
+
+#. 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-"
 "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </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 ""
-"Jika Anda menginstall Mageia pada sistem UEFI, periksa bahwa ESP (EFI System "
-"Partition) tersedia dan dimount dengan benar pada /boot/EFI (lihat di atas)"
 
-#. 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="
@@ -1468,52 +1649,59 @@ msgstr ""
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:9
-msgid "Partitioning"
+#: en/doPartitionDisks.xml:25
+#, fuzzy
+msgid "Suggested Partitioning"
 msgstr "Pemartisian"
 
 #. 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 ""
 "Di layar ini Anda bisa melihat isi perangkat disk dan lihat solusi yang "
 "ditemukan pemandu pemartisian DrakX di mana <application>Mageia</"
 "application> akan diinstall."
 
 #. 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 ""
 "Pilihan yang tersedia dari daftar di bawah akan beragam tergantung pada "
 "tampilan dan isi perangkat disk Anda."
 
 #. 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-"
 "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:32
-msgid "Use Existing Partitions"
-msgstr "Gunakan Partisi yang Tersedia"
+#. type: Content of: <section><itemizedlist><title>
+#: en/doPartitionDisks.xml:47
+#, fuzzy
+msgid "Main Options"
+msgstr "Partisi dinamis"
 
-#. 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>Pabrikan</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."
@@ -1521,13 +1709,14 @@ msgstr ""
 "Jika pilihan ini tersedia, artinya partisi yang cocok untuk Linux telah "
 "ditemukan dan mungkin bisa digunakan untuk instalasi."
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:41
-msgid "Use Free Space"
-msgstr "Gunakan Ruang Kosong"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:59
+#, fuzzy
+msgid "<emphasis role=\"bold\">Use Free Space</emphasis>"
+msgstr "<emphasis>Pabrikan</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."
@@ -1535,55 +1724,34 @@ msgstr ""
 "Jika Anda memiliki ruang tak terpakai pada perangkat disk Anda, maka pilihan "
 "ini akan menggunakannya untuk menginstall Mageia."
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:49
-msgid "Use Free Space on a Windows Partition"
-msgstr "Gunakan Ruang Kosong pada Partisi Windows"
-
-#. 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 ""
-"Jika Anda memiliki ruang tak terpakai pada partisi Windows yang ada, "
-"installer akan menawarkan untuk menggunakannya."
+"<emphasis role=\"bold\">Use Free Space on a Windows Partition</emphasis>"
+msgstr "<emphasis>Pabrikan</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 ""
 "Ini cara yang berguna untuk membuat ruang untuk instalasi Mageia, tapi "
 "beresiko sehingga Anda harus membuat cadangan file penting Anda!"
 
-#. 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 ""
-"Perhatikan bahwa ini akan mengurangi ukuran dari partisi Windows. Partisi "
-"harus \"bersih\", maksudnya, Windows harus dimatikan dengan benar saat "
-"terakhir kali digunakan. Juga harus sudah didefrag, walaupun tidak ada "
-"jaminan bahwa semua file telah dipindahkan dari area yang akan digunakan. "
-"Sangat disarankan untuk membuat cadangan semua file pribadi."
-
-#. 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 ""
 "Dengan opsi ini, installer menampilkan partisi Windows yang tersisa dalam "
 "warna biru cerah dan partisi Mageia nantinya dalam warna biru gelap dengan "
@@ -1591,171 +1759,180 @@ msgstr ""
 "menyesuaikan ukuran ini dengan mengklik dan menyeret pada jarak di antara "
 "kedua partisi. Lihat gambar di bawah."
 
-#. 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-"
-"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
-
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:87
-msgid "Erase and use Entire Disk."
-msgstr "Hapus dan gunakan Seluruh Disk."
+msgid "<emphasis role=\"bold\">Erase and use Entire Disk</emphasis>"
+msgstr "<emphasis>Pabrikan</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 "Pilihan ini akan menggunakan seluruh perangkat untuk Mageia."
 
-#. 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 ""
-"Perhatikan! Ini akan menghapus SEMUA data pada harddisk yang dipilih. Hati-"
-"hati!"
-
-#. 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 ""
 "Jika Anda bermaksud untuk menggunakan sebagian dari disk untuk yang lain, "
 "atau Anda memiliki data pada perangkat yang tidak boleh hilang, jangan "
 "gunakan pilihan ini."
 
-#. 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 ""
+"Perhatikan bahwa ini akan mengurangi ukuran dari partisi Windows. Partisi "
+"harus \"bersih\", maksudnya, Windows harus dimatikan dengan benar saat "
+"terakhir kali digunakan. Juga harus sudah didefrag, walaupun tidak ada "
+"jaminan bahwa semua file telah dipindahkan dari area yang akan digunakan. "
+"Sangat disarankan untuk membuat cadangan semua file pribadi."
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:110
 #, fuzzy
-msgid "Custom disk partitioning"
-msgstr "Menyesuaikan pemartisian disk dengan DiskDrake"
+msgid "<emphasis role=\"bold\">Custom Disk Partitioning</emphasis>"
+msgstr "<emphasis>Pabrikan</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)."
 msgstr ""
 "Ini memberi Anda kendali penuh untuk menempatkan instalasi pada harddisk."
 
-#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:112
-msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
+#. type: Content of: <section><mediaobject>
+#: en/doPartitionDisks.xml:120
+#, fuzzy
+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-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </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
 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 ""
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:125
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:141
 msgid ""
 "If the total available space is greater than 50 GB, then three partitions "
 "are created"
 msgstr ""
 
-#. 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
 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 ""
 
-#. 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
+msgid "1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB"
 msgstr ""
 
-#. 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
 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 ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:144
+#: 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 ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:150
+#: en/doPartitionDisks.xml:182
 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 ""
 
 #. 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-"
-"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-setupBootloader2.png\"/> </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 ""
 "Beberapa perangkat baru sekarang menggunakan sektor logis 4096 bit, daripada "
 "standar sebelumnya 512 bit. Karena keterbatasan hardware, alat pemartisian "
@@ -1765,59 +1942,78 @@ msgstr ""
 "alternatif seperti gparted jika Anda memilikinya, dan menggunakan pengaturan "
 "berikut:"
 
-#. 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 ""
+"Beberapa perangkat baru sekarang menggunakan sektor logis 4096 bit, daripada "
+"standar sebelumnya 512 bit. Karena keterbatasan hardware, alat pemartisian "
+"yang digunakan pada installer belum teruji pada perangkat tersebut. Beberapa "
+"perangkat ssd juga menggunakan ukuran blok penghapusan melebihi 1 MB. "
+"Disarankan untuk melakukan pemartisian awal menggunakan alat pemartisian "
+"alternatif seperti gparted jika Anda memilikinya, dan menggunakan pengaturan "
+"berikut:"
+
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:228
+#, fuzzy
+msgid "<emphasis>Align to</emphasis> = MiB"
 msgstr "<emphasis>Pabrikan</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>Pabrikan</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."
 msgstr "Juga pastikan semua partisi dibuat dengan penomoran megabite."
 
 #. 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 ""
 
 #. 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 "January 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 "Dokumentasi Resmi Mageia"
 
 #. 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/"
@@ -1828,8 +2024,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."
@@ -1840,8 +2036,7 @@ msgstr ""
 "biz\">NeoDoc</link>."
 
 #. 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</"
@@ -1851,15 +2046,15 @@ msgstr ""
 "ns6:href=\"https://wiki.mageia.org/en/Documentation_team\">Tim Dokumentasi</"
 "link>, jika Anda ingin membantu memperbaiki manual ini."
 
-#. 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 "
@@ -1869,43 +2064,49 @@ msgstr ""
 "manual ini. Layar mana yang akan Anda lihat, tergantung pada hardware dan "
 "pilihan yang Anda buat saat menginstall."
 
-#. 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 ""
+"Ini ditulis oleh sukarelawan di waktu senggang mereka. Silakan hubungi <link "
+"ns6:href=\"https://wiki.mageia.org/en/Documentation_team\">Tim Dokumentasi</"
+"link>, jika Anda ingin membantu memperbaiki manual ini."
+
 #. 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 "Instalasi dengan DrakX"
 
 #. type: Content of: <book><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:9
+#: en/DrakX-cover.xml:20
 msgid "February 2014"
 msgstr "Februari 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 "Selamat"
 
 #.  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\" "
@@ -1916,28 +2117,28 @@ 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 ""
 "Anda telah selesai menginstall dan mengkonfigurasi <application>Mageia</"
 "application> dan sekarang Anda bisa mengeluarkan media instalasi dan "
 "menjalankan ulang komputer."
 
 #. 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 ""
 "Setelah komputer dijalankan ulang, pada layar bootloader, Anda bisa memilih "
 "sistem operasi pada komputer Anda (jika ada lebih dari satu)."
 
 #. 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."
@@ -1946,26 +2147,27 @@ msgstr ""
 "otomatis terpilih dan dijalankan."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:26
+#: en/exitInstall.xml:30
 msgid "Enjoy!"
 msgstr "Nikmatilah!"
 
 #. 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 ""
 "Kunjungi www.mageia.org jika Anda memiliki pertanyaan atau ingin "
 "berkontribusi untuk Mageia"
 
 #. 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 "
@@ -1974,48 +2176,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>Pabrikan</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>Umum</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 "
@@ -2023,28 +2225,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 "Pemformatan"
 
@@ -2052,25 +2254,26 @@ msgstr "Pemformatan"
 #.  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 "
@@ -2081,27 +2284,30 @@ msgstr ""
 "tetap tersimpan."
 
 #. 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 "Biasanya, setidaknya partisi yang dipilih oleh DrakX perlu diformat"
 
 #. 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 ""
 "Klik pada <guibutton>Lanjutan</guibutton> untuk memilih partisi yang ingin "
 "Anda periksa dari yang disebut <emphasis>blok rusak</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 ""
 "Jika Anda tidak yakin telah membuat pilihan yang benar, Anda bisa mengklik "
 "<guibutton>Sebelumnya</guibutton>, lalu <guibutton>Sebelumnya</guibutton> "
@@ -2110,21 +2316,22 @@ msgstr ""
 "partisi Anda."
 
 #. 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 ""
 "Jika Anda cukup yakin dengan pilihan Anda, klik pada <guibutton>Selanjutnya</"
 "guibutton> untuk melanjutkan."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:10
+#: en/installer.xml:14
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, Installer Mageia"
 
 #. 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 "
@@ -2134,332 +2341,226 @@ msgstr ""
 "Installer Mageia dibuat untuk membantu instalasi atau upgrade semudah "
 "mungkin."
 
-#. 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 ""
-"Layar menu awal memiliki berbagai pilihan, akan tetapi bawaannya akan "
-"memulai installer, yang normalnya adalah yang Anda inginkan."
-
 #. type: Content of: <section><section><title>
-#: en/installer.xml:22
-msgid "Installation Welcome Screen"
-msgstr "Layar Selamat Datang untuk Instalasi"
-
-#. type: Content of: <section><section><section><title>
-#: en/installer.xml:25
-#, fuzzy
-msgid "Using a Mageia DVD"
-msgstr "Gunakan bootloader Mageia"
+#: en/installer.xml:20
+msgid "The installation steps"
+msgstr "Langkah-langkah instalasi"
 
-#. 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 ""
-"Ini adalah layar sambutan baku ketika menggunakan DVD Mageia, yang pertama "
-"dengan sistem legacy dan yang kedua dengan sistem UEFI:"
+"Proses instalasi terbagi ke dalam beberapa langkah, yang bisa diikuti pada "
+"panel samping dari layar."
 
-#. 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 ""
+"Setiap langkah memiliki satu layar atau lebih yang mungkin juga memiliki "
+"tombol <guibutton>Lanjutan</guibutton> dengan pilihan tambahan yang tidak "
+"terlalu dibutuhkan."
 
-#. 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 ""
+"Kebanyakan layar memiliki tombol <guibutton>Bantuan</guibutton> yang memberi "
+"penjelasan lebih tentang langkah yang sedang dijalani."
 
-#. 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 ""
+"Jika di manapun saat menginstall Anda memutuskan untuk menghentikan "
+"instalasi, komputer bisa dijalankan ulang, tapi harap dipikir dua kali "
+"sebelum melakukannya.  Setelah partisi diformat atau update telah dijalankan "
+"atau diinstall, komputer Anda sudah tidak lagi dalam kondisi yang sama dan "
+"menjalankan ulang komputer bisa membuat sistem komputer Anda tidak stabil. "
+"Jika Anda benar-benar ingin menjalankan ulang komputer, jalankan terminal "
+"teks dengan menekan tiga tombol <guibutton>Alt Ctrl F2</guibutton> secara "
+"bersamaan. Setelahnya, tekan <guibutton>Alt Ctrl Delete</guibutton> secara "
+"bersamaan untuk menjalankan ulang."
 
-#. 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 "Layar Selamat Datang untuk Instalasi"
+
+#. 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 "Gunakan tombol panah untuk memilih bahasa, lalu tekan tombol 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 ""
+"Layar menu awal memiliki berbagai pilihan, akan tetapi bawaannya akan "
+"memulai installer, yang normalnya adalah yang Anda inginkan."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:77
-#, fuzzy
-msgid ""
-"If needed, change the screen resolution by pressing <emphasis role=\"bold"
-"\">F3</emphasis> (Legacy mode only)."
-msgstr "Ubah resolusi layar dengan menekan tombol F3 (hanya mode Legacy)."
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:56
+msgid "Legacy (BIOS) Systems"
+msgstr ""
 
-#. 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 "- Baku, dia tidak mengubah apapun dalam opsi baku."
-
-#. 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 ""
-"- Pengaturan Aman, prioritas diberikan pada opsi aman untuk mengorbankan "
-"kinerja."
 
-#. 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 ""
-"- Tanpa ACPI (Advanced Configuration and Power Interface), manajemen daya "
-"tidak diterapkan."
 
-#. 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 ""
-"- Tanpa APIC Lokal (Local Advanced Programmable Interrupt Controller), ini "
-"untuk interupsi CPU, pilih opsi ini jika diminta."
+msgid "<emphasis role=\"bold\">Rescue System</emphasis>"
+msgstr "<emphasis>Pabrikan</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 ""
-"Ketika Anda memilih salah satu entri ini, dia akan mengubah opsi baku yang "
-"ditampilkan pada <guilabel>Opsi Boot</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 ""
-"Pada beberapa rilis Mageia, mungkin entri yang dipilih dengan tombol F6 "
-"tidak muncul pada baris <guilabel>Opsi Boot</guilabel>, tetapi, sebenarnya "
-"mereka telah diterapkan."
+msgid "<emphasis role=\"bold\">Memory Test</emphasis>"
+msgstr "<emphasis>Pabrikan</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 ""
-"Menekan F1 membukan jendela baru dengan lebih banyak opsi yang tersedia. "
-"Pilih dengan tombol panah, lalu tekan Enter untuk melihat detil, atau tekan "
-"tombol Esc untuk kembali ke layar sambutan."
+msgid "<emphasis role=\"bold\">F2: Language</emphasis>"
+msgstr "<emphasis>Pabrikan</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 ""
-"Tampilan detil tentang pilihan splash. Tekan Esc atau pilih "
-"<guilabel>Kembali ke Opsi Boot</guilabel> untuk kembali ke daftar pilihan. "
-"Pilihan ini bisa ditambahkan secara manual di baris <guilabel>Opsi boot</"
-"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 "Bantuan diterjemahkan ke dalam bahasa yang dipilih dengan tombol 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 ""
-"Untuk informasi lebih banyak tentang opsi kernel pada sistem legacy dan "
-"UEFI, lihat: <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 "Langkah-langkah instalasi"
+"<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 ""
-"Proses instalasi terbagi ke dalam beberapa langkah, yang bisa diikuti pada "
-"panel samping dari layar."
 
-#. 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 ""
-"Setiap langkah memiliki satu layar atau lebih yang mungkin juga memiliki "
-"tombol <guibutton>Lanjutan</guibutton> dengan pilihan tambahan yang tidak "
-"terlalu dibutuhkan."
+msgid "<emphasis role=\"bold\">Install:</emphasis> Start the Install process"
+msgstr "<emphasis>Pabrikan</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 ""
-"Kebanyakan layar memiliki tombol <guibutton>Bantuan</guibutton> yang memberi "
-"penjelasan lebih tentang langkah yang sedang dijalani."
 
-#. type: Content of: <section><section><note><para>
-#: en/installer.xml:190
-#, fuzzy
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:109
 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 ""
-"Jika di manapun saat menginstall Anda memutuskan untuk menghentikan "
-"instalasi, komputer bisa dijalankan ulang, tapi harap dipikir dua kali "
-"sebelum melakukannya.  Setelah partisi diformat atau update telah dijalankan "
-"atau diinstall, komputer Anda sudah tidak lagi dalam kondisi yang sama dan "
-"menjalankan ulang komputer bisa membuat sistem komputer Anda tidak stabil. "
-"Jika Anda benar-benar ingin menjalankan ulang komputer, jalankan terminal "
-"teks dengan menekan tiga tombol <guibutton>Alt Ctrl F2</guibutton> secara "
-"bersamaan. Setelahnya, tekan <guibutton>Alt Ctrl Delete</guibutton> secara "
-"bersamaan untuk menjalankan ulang."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:203
+#: en/installer.xml:115
 msgid "Installation Problems and Possible Solutions"
 msgstr "Masalah Instalasi dan Kemungkinan Solusinya"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:206
+#: en/installer.xml:117
 msgid "No Graphical Interface"
 msgstr "Tidak Ada Antarmuka Grafis"
 
 #. 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 ""
 "Setelah layar awal, Anda tidak pernah sampai pada layar pemilihan bahasa. "
 "Ini bisa terjadi dengan beberapa perangkat grafis dan komputer lama. Coba "
@@ -2467,16 +2568,15 @@ msgstr ""
 "pada baris perintah."
 
 #. 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 ""
 "Jika perangkat keras sudah tua, instalasi grafis mungkin tidak bisa. Jika "
 "demikian, akan lebih baik untuk mencoba instalasi dengan mode teks. Untuk "
@@ -2485,18 +2585,19 @@ msgstr ""
 "\"text\" lalu tekan ENTER. Lalu lanjutkan dengan instalasi dalam mode teks."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:230
+#: en/installer.xml:138
 msgid "The Install Freezes"
 msgstr "Instalasi Membeku"
 
 #. 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 ""
 "Jika sistem membeku saat instalasi, mungkin ada masalah dengan pendeteksian "
 "hardware. Pada kasus seperti ini, pendeteksian otomatis mungkin perlu "
@@ -2505,18 +2606,19 @@ msgstr ""
 "pilihan lain seperlunya."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:240
+#: en/installer.xml:146
 msgid "RAM problem"
 msgstr "Masalah 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 ""
 "Ini jarang diperlukan, tapi dalam beberapa kasus, hardware menginformasikan "
 "RAM yang tersedia tidak benar. Untuk menentukan ini secara manual, Anda bisa "
@@ -2524,20 +2626,20 @@ msgstr ""
 "yang benar. Misalnya <code>mem=256M</code> untuk menentukan RAM 256MB."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:249
+#: en/installer.xml:154
 msgid "Dynamic partitions"
 msgstr "Partisi dinamis"
 
 #. 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 ""
 "Jika Anda mengubah harddisk dari format \"basic\" ke format \"dynamic\" pada "
 "Microsoft Windows, Anda harus tahu bahwa tidak mungkin menginstall Mageia "
@@ -2546,19 +2648,15 @@ msgstr ""
 "aspx\">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>."
 
 #. type: Content of: <section><info><title>
-#: en/installUpdates.xml:3
+#: en/installUpdates.xml:16
 msgid "Updates"
 msgstr "Update"
 
-#.  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 ""
@@ -2567,96 +2665,105 @@ 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 ""
 "Mulai sejak dirilis <application>Mageia</application> versi ini, beberapa "
 "paket akan terus diupdate atau ditingkatkan."
 
-#. 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 ""
 "Pilih <guilabel>ya</guilabel> jika Anda ingin mendownload dan "
 "menginstallnya, pilih <guilabel>tidak</guilabel> jika tidak ingin "
 "melakukannya sekarang, atau jika Anda tidak terhubung ke internet"
 
-#. 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 "Lalu tekan <guibutton>Selanjutnya</guibutton> untuk melanjutkan"
 
 #. type: Content of: <section><info><title>
-#: en/login.xml:1
-msgid "Login screen"
+#: en/login.xml:4
+msgid "Login Screen"
 msgstr ""
 
 #. 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
+msgid "SDDM login screen"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/login.xml:1
-msgid "Finally, you will come to the login screen."
+#: en/login.xml:14
+msgid "Finally, you will come to the desktop login screen."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/login.xml:1
+#: en/login.xml:15
 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 ""
 
 #. 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 ""
 "Informasi lebih lengkap ada di <link ns4:href=\"https://wiki.mageia.org/en/"
 "Category:Documentation\">wiki Mageia</link>."
 
 #. type: Content of: <section><info><title>
-#: en/media_selection.xml:3
-msgid "Media Selection (Nonfree)"
-msgstr "Pemilihan Media (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 "
@@ -2669,7 +2776,7 @@ msgstr ""
 "tersedia untuk dipilih pada langkah selanjutnya."
 
 #. 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."
@@ -2678,12 +2785,13 @@ msgstr ""
 "dasar dari distribusi."
 
 #. 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 ""
 "Repository <emphasis>Nonfree</emphasis> menyediakan paket-paket yang gratis, "
@@ -2693,7 +2801,7 @@ msgstr ""
 "firmware untuk berbagai perangkat WiFi, dsb."
 
 #. 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 "
@@ -2715,62 +2823,63 @@ msgid "Minimal Install"
 msgstr "Instalasi Minimal"
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:11
-#, fuzzy
+#: en/minimal-install.xml:17
 msgid ""
-"You can choose a Minimal Installation by de-selecting everything in the "
-"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"/>."
+"Minimal Installation is intended for those with specific uses in mind for "
+"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 ""
-"Anda bisa memilih Instalasi Minimal dengan tidak memilih semua pada layar "
-"Pemilihan Grup Paket, lihat <xref linkend=\"choosePackageGroups\"></xref>."
 
-#. type: Content of: <section><para>
-#: en/minimal-install.xml:14
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/minimal-install.xml:24
+#, fuzzy
 msgid ""
-"If desired, you can additionally tick the <emphasis role=\"bold\">Individual "
-"package selection</emphasis> option in the same screen."
+"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 ""
+"Anda bisa memilih Instalasi Minimal dengan tidak memilih semua pada layar "
+"Pemilihan Grup Paket, lihat <xref linkend=\"choosePackageGroups\"></xref>."
 
-#. type: Content of: <section><para>
-#: en/minimal-install.xml:17
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/minimal-install.xml:28
 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"
-"\"/>."
+"If desired, you can additionally tick the <emphasis>Individual package "
+"selection</emphasis> option in the same screen."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/minimal-install.xml:22
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/minimal-install.xml:33
 #, 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."
+"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 ""
 "Jika Anda memilih instalasi ini, maka layar yang berhubungan akan menawarkan "
 "Anda sedikit tambahan untuk diinstall, seperti dokumentasi dan X."
 
-#. 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
 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 ""
 
 #. 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="
@@ -2783,25 +2892,32 @@ msgstr ""
 
 #. type: Content of: <section><info><title>
 #: en/misc-params.xml:3
-msgid "Summary of miscellaneous parameters"
-msgstr "Ringkasan dari berbagai parameter"
+#, fuzzy
+msgid "Configuration Summary"
+msgstr "Konfigurasi Suara"
 
 #.  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 membuat pilihan pintar untuk konfigurasi sistem Anda tergantung pada "
 "pilihan yang telah Anda buat dan pada hardware yang terdeteksi oleh DrakX. "
@@ -2809,55 +2925,56 @@ msgstr ""
 "<guibutton>Konfigurasi</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 "Parameter sistem"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:45
-msgid "<guilabel>Timezone</guilabel>"
-msgstr "<guilabel>Zona Waktu</guilabel>"
+#: en/misc-params.xml:54
+#, fuzzy
+msgid "<emphasis role=\"bold\">Timezone</emphasis>"
+msgstr "<emphasis>Pabrikan</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 memilih zona waktu tergantung pada bahasa yang Anda pilih. Anda bisa "
 "mengubahnya jika perlu. Lihat juga <xref linkend=\"configureTimezoneUTC\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:53
-msgid "<guilabel>Country / Region</guilabel>"
-msgstr "<guilabel>Negara / Wilayah</guilabel>"
+#: en/misc-params.xml:62
+#, fuzzy
+msgid "<emphasis role=\"bold\">Country / Region</emphasis>"
+msgstr "<emphasis>Pabrikan</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 "
@@ -2867,49 +2984,51 @@ msgstr ""
 "memperbaiki pengaturan. Lihat <xref linkend=\"selectCountry\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:62
-msgid "<guilabel>Bootloader</guilabel>"
-msgstr "<guilabel>Bootloader</guilabel>"
+#: en/misc-params.xml:70
+#, fuzzy
+msgid "<emphasis role=\"bold\">Bootloader</emphasis>"
+msgstr "<emphasis>Pabrikan</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 telah membuat pilihan yang bagus untuk pengaturan bootloader."
 
 #. 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 ""
 "Jangan mengubah apapun, kecuali Anda mengetahui bagaimana cara "
 "mengkonfigurasi Grub dan/atau Lilo"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:70
-msgid "For more information, see <xref linkend=\"setupBootloader\"/>"
-msgstr "Untuk informasi lebih, lihat <xref linkend=\"setupBootloader\"/>"
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:75
-msgid "<guilabel>User management</guilabel>"
-msgstr "<guilabel>Pengelolaan pengguna</guilabel>"
+#: en/misc-params.xml:83
+#, fuzzy
+msgid "<emphasis role=\"bold\">User management</emphasis>"
+msgstr "<emphasis>Pabrikan</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 ""
 "Anda bisa menambah pengguna tambahan di sini. Mereka akan mendapatkan "
 "direktori <literal>/home</literal> masing-masing."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:84
-msgid "<guilabel>Services</guilabel>:"
-msgstr "<guilabel>Layanan</guilabel>:"
+#: en/misc-params.xml:91
+#, fuzzy
+msgid "<emphasis role=\"bold\">Services</emphasis>"
+msgstr "<emphasis>Pabrikan</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 "
@@ -2920,31 +3039,29 @@ msgstr ""
 "tugas-tugas tertentu."
 
 #. 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 ""
 "Anda harus memeriksa dengan hati-hati sebelum mengubah apapun di sini - "
 "sebuah kesalahan bisa menghalangi komputer untuk berjalan dengan semestinya."
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:94
-msgid "For more information, see <xref linkend=\"configureServices\"/>"
-msgstr "Untuk informasi lebih, lihat <xref linkend=\"configureServices\"/>"
-
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:101
+#: en/misc-params.xml:106
 msgid "Hardware parameters"
 msgstr "Parameter hardware"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:106
-msgid "<guilabel>Keyboard</guilabel>:"
-msgstr "<guilabel>Keyboard</guilabel>:"
+#: en/misc-params.xml:111
+#, fuzzy
+msgid "<emphasis role=\"bold\">Keyboard</emphasis>"
+msgstr "<emphasis>Pabrikan</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 "
@@ -2954,19 +3071,20 @@ msgstr ""
 "tergantung pada lokasi, bahasa atau tipe keyboard Anda."
 
 #. 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>Mouse</guilabel>:"
+#: en/misc-params.xml:124
+#, fuzzy
+msgid "<emphasis role=\"bold\">Mouse</emphasis>"
+msgstr "<emphasis>Pabrikan</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."
@@ -2975,40 +3093,42 @@ msgstr ""
 "tablet, trackball, dsb."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:126
-msgid "<guilabel>Sound card</guilabel>:"
-msgstr "<guilabel>Perangkat suara</guilabel>:"
+#: en/misc-params.xml:131
+#, fuzzy
+msgid "<emphasis role=\"bold\">Sound card</emphasis>"
+msgstr "<emphasis>Pabrikan</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 ""
-"Installer menggunakan driver baku, jika ada. Opsi untuk memilih driver "
-"berbeda hanya diberikan ketika ada lebih dari satu driver untuk perangkat "
-"Anda, tapi tidak satupun merupakan pilihan baku."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:137
-msgid "<guilabel>Graphical interface</guilabel>:"
-msgstr "<guilabel>Antarmuka grafis</guilabel>:"
+#: en/misc-params.xml:144
+#, fuzzy
+msgid "<emphasis role=\"bold\">Graphical interface</emphasis>"
+msgstr "<emphasis>Pabrikan</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 ""
 "Bagian ini memungkinkan Anda mengkonfigurasi perangkat grafis dan tampilan."
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:143
-msgid "For more information, see <xref linkend=\"configureX_chooser\"/>."
-msgstr "Untuk informasi lebih, lebih <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="
@@ -3019,22 +3139,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 "Parameter Jaringan dan Internet"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:163
-msgid "<guilabel>Network</guilabel>:"
-msgstr "<guilabel>Jaringan</guilabel>:"
+#: en/misc-params.xml:169
+#, fuzzy
+msgid "<emphasis role=\"bold\">Network</emphasis>"
+msgstr "<emphasis>Pabrikan</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 ""
 "Anda bisa mengkonfigurasi jaringan di sini, tapi untuk perangkat jaringan "
@@ -3043,7 +3164,7 @@ msgstr ""
 "Anda belum menghidupkan reporitory media Nonfree."
 
 #. 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 "
@@ -3053,15 +3174,17 @@ msgstr ""
 "firewall untuk melihat antarmuka jaringan tersebut."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:179
-msgid "<guilabel>Proxies</guilabel>:"
-msgstr "<guilabel>Proxy</guilabel>:"
+#: en/misc-params.xml:185
+#, fuzzy
+msgid "<emphasis role=\"bold\">Proxies</emphasis>"
+msgstr "<emphasis>Pabrikan</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 ""
 "Server Proxy berfungsi sebagai perantara antara komputer Anda dengan "
@@ -3069,67 +3192,73 @@ msgstr ""
 "komputer untuk memanfaatkan layanan proxy."
 
 #. 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 ""
 "Anda mungkin perlu bertanya pada administrator sistem untuk mendapatkan "
 "parameter yang diperlukan untuk dimasukkan di sini"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:195
+#: en/misc-params.xml:201
 msgid "Security"
 msgstr "Keamanan"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:200
-msgid "<guilabel>Security Level</guilabel>:"
-msgstr "<guilabel>Tingkat Keamanan</guilabel>:"
+#: en/misc-params.xml:206
+#, fuzzy
+msgid "<emphasis role=\"bold\">Security Level</emphasis>"
+msgstr "<emphasis>Pabrikan</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 ""
 "Di sini Anda mengatur tingkat keamanan komputer, biasanya pengaturan bawaan "
 "(Standar) adalah yang paling memadai untuk penggunaan umum."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:207
-msgid "Check the option which best suits your usage."
-msgstr "Lihat pilihan yang sesuai dengan penggunaan komputer Anda."
+#: en/misc-params.xml:215
+#, fuzzy
+msgid "<emphasis role=\"bold\">Firewall</emphasis>"
+msgstr "<emphasis>Pabrikan</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 dimaksudkan untuk menjadi pembatas antara data penting Anda dengan "
-"para penjahat di internet yang bermaksud untuk membahayakan atau mencurinya."
 
 #. 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 ""
-"Pilih layanan yang ingin bisa diakses ke sistem komputer Anda. Pilihan akan "
-"tergantung pada komputer Anda akan digunakan untuk apa."
+msgid "For more information, see <xref linkend=\"firewall\"/>."
+msgstr "Untuk informasi lebih, lebih <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 "Ingat bahwa membiarkan semua (tanpa firewall) akan sangat beresiko."
 
 #. type: Content of: <section><info><title>
@@ -3138,31 +3267,43 @@ msgid "Reboot"
 msgstr "Boot Ulang"
 
 #. type: Content of: <section><para>
-#: en/reboot.xml:6
+#: en/reboot.xml:7
 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 ""
+
+#. 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
 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 ""
 
 #. 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-"
@@ -3192,47 +3333,52 @@ msgstr ""
 "menginstall <application>Mageia</application>."
 
 #. type: Content of: <section><info><title>
-#: en/securityLevel.xml:3
+#: en/securityLevel.xml:10
 msgid "Security Level"
 msgstr "Tingkat Keamanan"
 
 #.  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>Pabrikan</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:19
+#: en/securityLevel.xml:29
+msgid ""
+"<emphasis>Standard</emphasis> is the default, and recommended setting for "
+"the average user."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:32
 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>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:24
+#: en/securityLevel.xml:36
 #, fuzzy
 msgid "<emphasis role=\"bold\">Security Administrator</emphasis>"
 msgstr "<emphasis>Pabrikan</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 "
@@ -3240,14 +3386,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 "
@@ -3255,83 +3401,131 @@ 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 ""
 "Setelah instalasi, mengatur penyesuaian keamanan tetap bisa dilakukan di "
 "bagian <guilabel>Keamanan</guilabel> pada Pusat Kendali Mageia."
 
 #. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:6
+#: en/SelectAndUseISOs2.xml:15
 msgid "Select and use ISOs"
 msgstr "Pilih dan gunakan ISO"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:9
+#: en/SelectAndUseISOs2.xml:18
 msgid "Introduction"
 msgstr "Pengantar"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:10
+#: en/SelectAndUseISOs2.xml:19
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
 "which image best suits your needs."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:12
-msgid "There are two families of media:"
+#: en/SelectAndUseISOs2.xml:21
+msgid "There are three types of installation media:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:15
+#: en/SelectAndUseISOs2.xml:24
 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 ""
 
 #. 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\">ISO Live hanya bisa digunakan untuk membuat "
+"instalasi baru, mereka tidak bisa digunakan untuk upgrade dari rilis "
+"sebelumnya.</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 ""
+"Masing-masing adalah image kecil yang berisi tidak lebih dari apa yang "
+"diperlukan untuk menjalankan installer drakx dan menemukan drakx-installer-"
+"stage2 dan paket-paket lain yang dibutuhkan untuk melanjutkan dan "
+"menyelesaikan instalasi. Paket-paket ini mungkin berada dalam harddisk PC, "
+"drive lokal, jaringan lokal atau Internet."
+
+#. 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 ""
+"Media ini sangat ringan (kurang dari 100 MB) dan cocok ketika bandwidth "
+"sangat lambat untuk mendownload DVD, PC tanpa drive DVD atau PC yang tidak "
+"bisa boot dari USB."
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:27
-msgid "Details are given in the next sections."
+#: en/SelectAndUseISOs2.xml:58
+msgid "More details are given in the next sections."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:30
+#: en/SelectAndUseISOs2.xml:61
 msgid "Media"
 msgstr "Media"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:32
+#: en/SelectAndUseISOs2.xml:63
 msgid "Definition"
 msgstr "Definisi"
 
 #. 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 ""
 "Di sini, medium (jamak: media) adalah berkas image ISO yang memungkinkan "
 "Anda menginstall dan/atau mengupdate Mageia dan dengan perluasan dukungan "
 "fisik ke mana berkas ISO disalin."
 
 #. 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/"
@@ -3341,288 +3535,275 @@ msgstr ""
 "\">di sini</link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:39
+#: en/SelectAndUseISOs2.xml:70
 msgid "Classical installation media"
 msgstr "Media instalasi klasik"
 
 #. 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 "Fitur umum"
 
 #. 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 "ISO ini menggunakan installer tradisional yang disebut 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 "Mereka bisa membuat instalasi baru atau update dari rilis sebelumnya."
 
 #. 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 "Media berbeda untuk arsitektur 32 atau 64 bit."
 
 #. 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 ""
 "Beberapa peralatan tersedia pada Layar sambutan: Sistem Penyelamat, "
 "Pengujian Memori, Peralatan Pendeteksi Perangkat Keras."
 
 #. 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 "Setiap DVD berisi banyak lingkungan desktop dan bahasa yang tersedia."
 
 #. 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 ""
 "Anda akan diberikan untuk memilih perangkat lunak non free saat instalasi."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:69
+#: en/SelectAndUseISOs2.xml:102
 msgid "Live media"
 msgstr "Media live"
 
 #. 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 ""
 "Bisa digunakan untuk melihat distribusi tanpa menginstallnya pada HDD, dan "
 "opsi untuk menginstall Mageia pada HDD Anda."
 
 #. 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)."
-msgstr "Setiap ISO hanya berisi satu lingkungan desktop (KDE atau GNOME)."
+#: en/SelectAndUseISOs2.xml:111
+msgid "The Live media also includes an Installer."
+msgstr ""
 
 #. 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>"
-msgstr ""
-"<emphasis role=\"bold\">ISO Live hanya bisa digunakan untuk membuat "
-"instalasi baru, mereka tidak bisa digunakan untuk upgrade dari rilis "
-"sebelumnya.</emphasis>"
+msgid "Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)"
+msgstr "Setiap ISO hanya berisi satu lingkungan desktop (KDE atau 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 "Mereka berisi perangkat lunak non free."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:96
+#: en/SelectAndUseISOs2.xml:126
 #, fuzzy
 msgid "Live DVD Plasma"
 msgstr "Live 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 "Hanya lingkungan desktop KDE."
 
 #. 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 "Menyediakan semua bahasa."
 
 #. 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 "Media berbeda untuk arsitektur 32 atau 64 bit."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:110
+#: en/SelectAndUseISOs2.xml:140
 msgid "Live DVD GNOME"
 msgstr "Live 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 "Hanya lingkungan desktop GNOME."
 
-#. 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 "Live 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 "Hanya lingkungan desktop KDE."
 
 #. 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 "Media berbeda untuk arsitektur 32 atau 64 bit."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:139
+#: en/SelectAndUseISOs2.xml:169
 #, fuzzy
 msgid "Net install media"
 msgstr "Media instalasi klasik"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:144
-#, 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 ""
-"Masing-masing adalah image kecil yang berisi tidak lebih dari apa yang "
-"diperlukan untuk menjalankan installer drakx dan menemukan drakx-installer-"
-"stage2 dan paket-paket lain yang dibutuhkan untuk melanjutkan dan "
-"menyelesaikan instalasi. Paket-paket ini mungkin berada dalam harddisk PC, "
-"drive lokal, jaringan lokal atau Internet."
-
-#. 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 ""
-"Media ini sangat ringan (kurang dari 100 MB) dan cocok ketika bandwidth "
-"sangat lambat untuk mendownload DVD, PC tanpa drive DVD atau PC yang tidak "
-"bisa boot dari USB."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:161
+#: en/SelectAndUseISOs2.xml:177
 #, fuzzy
-msgid "First steps are English language only."
+msgid "First steps are English language only"
 msgstr "Hanya bahasa Inggris."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:166
+#: en/SelectAndUseISOs2.xml:182
 msgid "netinstall.iso"
 msgstr ""
 
 #. 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 ""
 "Hanya berisi perangkat lunak bebas, untuk orang-orang yang tidak ingin "
 "menggunakan perangkat lunak tidak bebas."
 
 #. 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 ""
 "Berisi perangkat lunak tidak bebas (kebanyakan adalah driver, kodek...) "
 "untuk orang-orang yang membutuhkannya."
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:186
+#: en/SelectAndUseISOs2.xml:202
 msgid "Downloading and Checking Media"
 msgstr "Mengunduh dan Memeriksa Media"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:188
+#: en/SelectAndUseISOs2.xml:204
 msgid "Downloading"
 msgstr "Mengunduh"
 
 #. 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 ""
 "Setelah Anda memilih berkas ISO, Anda bisa mengunduhnya menggunakan http "
 "atau BitTorrent. Pada keduanya, sebuah jendela memberi Anda informasi, "
 "seperti mirror yang digunakan dan kemungkinan untuk mengubah jika bandwidth "
 "terlalu lambat. Jika http dipilih, Anda juga mungkin melihat"
 
+#. 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: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:191
-msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
+#: en/SelectAndUseISOs2.xml:217
+#, fuzzy
+msgid ""
+"<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:195
-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:"
+#: en/SelectAndUseISOs2.xml:222
+msgid "In the meantime, a window to download the actual ISO will open:"
 msgstr ""
 
 #. 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 "Memeriksa keabsahan media yang diunduh"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:208
+#: en/SelectAndUseISOs2.xml:235
 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 ""
 
 #. 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 "
@@ -3630,76 +3811,87 @@ msgid ""
 msgstr "Buka konsol, tidak perlu menjadi root, dan:"
 
 #. 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 ""
 "- Untuk menggunakan md5sum, ketik: [sam@localhost]$ <userinput>md5sum path/"
 "to/the/image/file.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 ""
+"- Untuk menggunakan sha1sum, ketik: [sam@localhost]$ <userinput>sha1sum path/"
+"to/the/image/file.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 ""
 "- Untuk menggunakan sha1sum, ketik: [sam@localhost]$ <userinput>sha1sum path/"
 "to/the/image/file.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 ""
 "lalu bandingkan nomor yang diperoleh dari komputer (Anda mungkin harus "
 "menunggu beberapa saat) dengan nomor yang diberikan oleh Mageia. Contoh:"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:237
+#: en/SelectAndUseISOs2.xml:270
 msgid "Burn or dump the ISO"
 msgstr "Bakar atau salin ISO"
 
 #. 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 ""
 "ISO yang telah diperiksa sekarang bisa dibakar ke sebuah CD atau DVD atau "
 "disalin ke sebuah flashdisk. Pekerjaan ini bukan penyalinan sederhana dan "
 "bertujuan untuk membuat media yang dapat diboot."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:275
 msgid "Burning the ISO to a CD/DVD"
 msgstr "Membakar ISO ke 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 ""
 "Gunakan burner apapun yang Anda inginkan tapi pastikan perangkat burning "
 "diatur dengan benar ke <emphasis role=\"bold\">burn image</emphasis>, burn "
@@ -3707,45 +3899,54 @@ msgstr ""
 "\"https://wiki.mageia.org/en/Writing_CD_and_DVD_images\">wiki Mageia</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 "Salin ISO ke flashdisk"
 
 #. 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 ""
 "Semua ISO Mageia adalah hibrid, yang berarti bisa Anda bisa 'menyalin' ke "
 "flashdisk lalu menggunakannya untuk memboot dan menginstall sistem."
 
 #. 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 ""
 "\"menyalin\" image ke dalam flashdisk akan merusak sistem file pada "
 "perangkat; data apapun akan hilang dan kapasitas partisi akan berkurang "
 "menjadi sebesar ukuran image."
 
-#. 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 ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:259
+#: en/SelectAndUseISOs2.xml:299
 msgid "Using a graphical tool within Mageia"
 msgstr ""
 
 #. 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>"
@@ -3754,24 +3955,24 @@ 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 ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:304
 msgid "You could try:"
 msgstr "Anda bisa mencoba:"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:267
+#: en/SelectAndUseISOs2.xml:307
 msgid ""
 "<link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using the "
-"\"ISO image\" option;"
+"\"ISO image\" option"
 msgstr ""
 
 #. 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 "
@@ -3781,74 +3982,86 @@ 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
+msgid "Using the Command line within a GNU/Linux system"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:279
+#: en/SelectAndUseISOs2.xml:319
 msgid ""
 "It is potentially *dangerous* to do this by hand. You risk overwriting "
 "potentially valuable existing data if you specify the wrong target device."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:325
 msgid "Open a console"
 msgstr "Buka konsol"
 
 #. 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 ""
 "Menjadi root dengan perintah <userinput>su -</userinput> (jangan lupa tanda "
 "'-' di akhir)"
 
 #. 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 ""
 "Pasang flashdisk (jangan dimount, artinya juga jangan buka aplikasi atau "
 "manajer berkas apapun yang bisa membuka atau membacanya)"
 
 #. 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 "Masukkan perintah <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
 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 ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:312
+#: en/SelectAndUseISOs2.xml:354
 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 ""
 
 #. 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"
@@ -3872,53 +4085,57 @@ msgid ""
 msgstr ""
 
 #. 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 ""
 "Masukkan perintah: # <userinput>dd if=path/to/the/ISO/file 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 "Dimana X=nama perangkat Anda misal: /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 ""
 "Contoh: # <userinput>dd if=/home/user/Downloads/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 "Masukkan perintah: # <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 ""
 
@@ -3928,8 +4145,10 @@ msgid "Select your Country / Region"
 msgstr "Pilih Negara / Wilayah Anda"
 
 #.  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="
@@ -3939,36 +4158,35 @@ 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 ""
 "Pilih negara atau wilayah Anda. Ini akan penting untuk semua jenis "
 "pengaturan, seperti mata uang dan regulasi domain nirkabel. Mengatur negara "
 "yang salah akan membawa pada tidak bisa digunakannya jaringan Nirkabel."
 
-#. 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 ""
 "Jika negara Anda tidak ada di dalam daftar, klik tombol <guilabel>Negara "
 "Lainnya</guilabel> lalu pilih negara / wilayah Anda di sana."
 
 #. 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 ""
 "Jika negara Anda hanya dalam daftar <guilabel>Negara Lainnya</guilabel>, "
 "setelah mengklik <guibutton>OK</guibutton> mungkin sebuah negara dari daftar "
@@ -3976,15 +4194,15 @@ msgstr ""
 "sebenarnya."
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:33
+#: en/selectCountry.xml:42
 msgid "Input method"
 msgstr "Metode masukan"
 
 #. 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. "
@@ -4002,13 +4220,13 @@ msgstr ""
 "paket."
 
 #. 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 ""
 "Jika Anda melewatkan pengaturan metode input saat instalasi, Anda bisa "
 "mengaksesnya setelah menjalankan ulang komputer melalui \"Konfigurasi "
@@ -4016,54 +4234,59 @@ msgstr ""
 "sebagai root."
 
 #. type: Content of: <section><info><title>
-#: en/selectInstallClass.xml:14
+#: en/selectInstallClass.xml:29
 msgid "Install or Upgrade"
 msgstr "Install atau Upgrade"
 
 #. 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 "Install"
+#: en/selectInstallClass.xml:41
+#, fuzzy
+msgid "<emphasis role=\"bold\">Install</emphasis>"
+msgstr "<emphasis>Pabrikan</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 "Upgrade"
+#: en/selectInstallClass.xml:50
+#, fuzzy
+msgid "<emphasis role=\"bold\">Upgrade</emphasis>"
+msgstr "<emphasis>Pabrikan</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 ""
+"Gunakan pilihan ini untuk instalasi <application>Mageia</application> baru."
 
-#. 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 ""
 "Hanya upgrade dari versi Mageia yang <emphasis>masih didukung</emphasis> "
 "saat versi installer ini dirilis, yang telah sepenuhnya diuji. Jika Anda "
@@ -4071,37 +4294,15 @@ msgstr ""
 "ketika yang ini dirilis, akan lebih baik untuk melakukan instalasi baru dan "
 "membiarkan partisi <literal>/home</literal> Anda."
 
-#. 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 ""
-"Jika selama instalasi Anda memutuskan untuk menghentikannya, Anda bisa "
-"menjalankan ulang komputer, tapi pikir dua kali sebelum melakukannya. "
-"Setelah partisi diformat atau update telah mulai diinstall, kondisi komputer "
-"Anda sudah tidak sama lagi dan menjalankan ulang komputer bisa membuat "
-"komputer Anda tidak bisa digunakan lagi. Jika Anda benar-benar ingin "
-"menjalankan ulang komputer, jalankan terminal dengan menekan tiga tombol "
-"<guilabel>Alt Ctrl F2</guilabel> secara bersamaan. Lalu tekan <guilabel>Alt "
-"Ctrl Delete</guilabel> secara bersamaan untuk menjalankan ulang."
-
 #. 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 ""
 "Jika Anda terlupa untuk memilih bahasa tambahan, Anda bisa kembali dari "
 "layar \"Install atau Upgrade\" ke layar pemilihan bahasa dengan menekan "
@@ -4109,36 +4310,41 @@ msgstr ""
 "ini saat sedang menginstall."
 
 #. type: Content of: <section><info><title>
-#: en/selectKeyboardLive.xml:3
-msgid "Select keyboard"
-msgstr ""
+#: en/selectKeyboardLive.xml:14
+#, fuzzy
+msgid "Select Keyboard"
+msgstr "Keyboard"
 
 #. 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/selectKeyboard.xml:7
+#: en/selectKeyboard.xml:20
 msgid "Keyboard"
 msgstr "Keyboard"
 
 #. 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."
@@ -4147,17 +4353,17 @@ msgstr ""
 "yang cocok maka layout keyboard US akan digunakan."
 
 #. 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 "
@@ -4174,25 +4380,25 @@ msgstr ""
 "Keyboard_layout</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 ""
 "Jika keyboard Anda tidak ada di daftar yang ditampilkan, klik pada "
 "<guibutton>Lainnya</guibutton> untuk mendapatkan daftar lengkap, lalu pilih "
 "keyboard Anda di sana."
 
-#. 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 ""
 "Setelah memilih keyboard dari dialog <guibutton>Lainnya</guibutton>, Anda "
 "akan kembali ke dialog pilihan keyboard pertama dan walaupun sepertinya "
@@ -4201,7 +4407,7 @@ msgstr ""
 "daftar lengkap."
 
 #. 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 "
@@ -4213,39 +4419,40 @@ msgstr ""
 "pergantian layout keyboard di antara Latin dan bukan Latin"
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:15
+#: en/selectLanguage.xml:34
 msgid "Please choose a language to use"
 msgstr "Silakan pilih bahasa yang akan digunakan"
 
-#. 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 ""
 "Pilih bahasa yang Anda sukai dengan membentangkan daftar dari benua Anda. "
 "<application>Mageia</application> akan menggunakan pilihan ini selama "
 "instalasi dan pada sistem yang sudah terinstall."
 
-#. 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 ""
 "Pilih bahasa yang Anda sukai dengan membentangkan daftar dari benua Anda. "
 "<application>Mageia</application> akan menggunakan pilihan ini selama "
 "instalasi dan pada sistem yang sudah terinstall."
 
-#. 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 ""
 "Jika sepertinya Anda akan memerlukan beberapa bahasa untuk komputer Anda, "
@@ -4254,68 +4461,68 @@ msgstr ""
 "menambahkan dukungan bahasa tambahan setelah instalasi selesai."
 
 #. 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 ""
 "Bahkan jika Anda akan memilih lebih dari satu bahasa, Anda harus memilih "
 "salah satu sebagai bahasa yang lebih disukai di layar bahasa pertama. Bahasa "
 "tersebut juga akan ditandai sudah dipilih di layar banyak bahasa."
 
 #. 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 ""
 "Jika bahasa keyboard tidak sama dengan bahasa yang akan dipilih, maka "
 "disarankan untuk menginstall bahasa dari keyboard yang digunakan juga."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:56
-msgid "Mageia uses UTF-8 (Unicode) support by default."
-msgstr ""
-
-#. 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 ""
 "Ini bisa dimatikan di layar \"banyak bahasa\" jika tidak sesuai dengan "
 "bahasa Anda. Mematikan UTF-8 akan berpengaruh pada bahasa-bahasa yang "
 "diinstall."
 
 #. 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 ""
 "Anda bisa mengubah bahasa komputer Anda setelah instalasi selesai di Pusat "
 "Kendali Mageia -> Sistem -> Kelola lokalisasi untuk sistem Anda."
 
 #. type: Content of: <section><info><title>
-#: en/selectMouse.xml:4
+#: en/selectMouse.xml:10
 msgid "Select mouse"
 msgstr "Pilih mouse"
 
@@ -4323,17 +4530,19 @@ msgstr "Pilih mouse"
 #.  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."
@@ -4342,26 +4551,29 @@ msgstr ""
 "yang berbeda di sini."
 
 #. 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 ""
 "Biasanya, <guilabel>Universal</guilabel> - <guilabel>Semua mouse PS/2 dan "
 "USB</guilabel> adalah pilihan bagus."
 
 #. 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 ""
 "Pilih <guilabel>Universal</guilabel> - <guilabel>Paksa evdev</guilabel> "
 "untuk mengkonfigurasi tombol yang tidak bekerja pada mouse dengan enam "
 "tombol atau lebih."
 
-#. 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 "Tambah atau Modifikasi Entri Menu Boot"
 
@@ -4386,331 +4598,395 @@ msgstr ""
 "How_to_set_up_kernel_options</link>"
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:7
-msgid "Bootloader main options"
-msgstr "Pilihan utama Bootloader"
-
-#. type: Content of: <section><section><title>
 #: en/setupBootloader.xml:10
 #, fuzzy
-msgid "Bootloader interface"
+msgid "Bootloader"
 msgstr "Pilihan utama Bootloader"
 
-#. 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><title>
+#: en/setupBootloader.xml:15
+msgid "Grub2 on Legacy MBR/GPT systems"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:14
+#: en/setupBootloader.xml:17
 msgid ""
-"GRUB2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
+"GRUB2 (with or without graphical menu) will be used exclusively as the "
+"bootloader for a Legacy/MBR or Legacy/GPT system."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:18
-msgid "GRUB2-efi for a UEFI system."
+#: en/setupBootloader.xml:21
+msgid ""
+"By default, a new bootloader will be written into either the MBR (Master "
+"Boot Record) of your first hard drive or in the BIOS boot partition."
 msgstr ""
 
-#. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:22
-#, fuzzy
-msgid "The Mageia graphical menus are nice :)"
-msgstr "Menu grafis Mageia sangat cantik :"
+#. type: Content of: <section><section><itemizedlist><title>
+#: en/setupBootloader.xml:27
+msgid "Grub2-efi on UEFI systems"
+msgstr ""
 
-#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:25
-msgid "GRUB2 on Legacy/MBR and Legacy/GPT systems"
+#. 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 ""
 
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:27
-#, fuzzy
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:33
 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>"
+"By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI "
+"System Partition)."
 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
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:35
 msgid ""
-"Don't modify the <emphasis role=\"bold\">Boot Device</emphasis> unless you "
-"really know what you are doing."
+"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 ""
 
-#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:38
-msgid "GRUB2-efi on UEFI systems"
-msgstr ""
+#. type: Content of: <section><section><info><title>
+#: en/setupBootloader.xml:46
+#, fuzzy
+msgid "Bootloader Setup"
+msgstr "Pilihan utama Bootloader"
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:39
-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 ""
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:49
+msgid "Bootloader main options"
+msgstr "Pilihan utama Bootloader"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:42
+#: en/setupBootloader.xml:51
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
-"imageobject>"
+"<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-"
 "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:49
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:62
+#, fuzzy
+msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
+msgstr "<emphasis>Pabrikan</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:63
 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."
+"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><title>
-#: en/setupBootloader.xml:61
-msgid "Using a Mageia bootloader"
-msgstr "Gunakan bootloader Mageia"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:67
+#, fuzzy
+msgid "<emphasis role=\"bold\">Boot device</emphasis>"
+msgstr "<emphasis>Pabrikan</emphasis>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:62
-msgid ""
-"By default, and according to your system, Mageia writes one of the following:"
-msgstr ""
+#. 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 "Hanya ubah sesuatu jika Anda sangat mengetahui hal tersebut."
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:66
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:72
+#, fuzzy
 msgid ""
-"a GRUB2 bootloader either into the MBR (Master Boot Record) of your first "
-"hard drive or in the BIOS boot partition."
-msgstr ""
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:70
-msgid "a GRUB2-efi bootloader into the ESP"
-msgstr ""
+"<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
+msgstr "<emphasis>Pabrikan</emphasis>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:73
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:74
 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."
+"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>Pabrikan</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-"
-"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:87
-msgid "Using an existing bootloader"
-msgstr "Gunakan bootloader yang ada"
-
-#. 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 ""
-"Prosedur yang sebenarnya untuk menambahkan Mageia ke bootloader yang sudah "
-"ada diluar ruang lingkup bantuan ini, tapi dalam kebanyakan kasus akan harus "
-"menjalankan program intalasi bootloader yang sesuai yang akan mendeteksi dan "
-"menambahkan secara otomatis. Lihat pada dokumentasi sistem operasi."
 
-#. 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>Pabrikan</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>Sandi (lagi)</guilabel>: Ketik ulang sandi pengguna pada kotak "
+"teks ini, drakx akan memeriksa bahwa Anda memiliki sandi yang sama pada tiap-"
+"tiap kotak teks."
 
-#. 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>Pabrikan</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:99
+#, fuzzy
+msgid "<emphasis>Enable ACPI</emphasis>"
+msgstr "<emphasis>Umum</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-"
-"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-setupBootloader2.png\"/> </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>Umum</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>Umum</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=\"live-liveMode.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>Umum</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 "Konfigurasi Suara"
 
-#. 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-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </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>Pabrikan</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>Pabrikan</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>Sandi (lagi)</guilabel>: Ketik ulang sandi pengguna pada kotak "
-"teks ini, drakx akan memeriksa bahwa Anda memiliki sandi yang sama pada tiap-"
-"tiap kotak teks."
 
 #. 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>Layanan</guilabel>:"
+msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
+msgstr "<emphasis>Pabrikan</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-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:166
+#, fuzzy
+msgid "<emphasis>Video mode</emphasis>"
+msgstr "<emphasis>Pabrikan</emphasis>"
 
-#. 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: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>Pabrikan</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=\"live-liveMode.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 "Gunakan bootloader yang ada"
+
+#. 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 ""
+"Prosedur yang sebenarnya untuk menambahkan Mageia ke bootloader yang sudah "
+"ada diluar ruang lingkup bantuan ini, tapi dalam kebanyakan kasus akan harus "
+"menjalankan program intalasi bootloader yang sesuai yang akan mendeteksi dan "
+"menambahkan secara otomatis. Lihat pada dokumentasi sistem operasi."
 
-#. 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 "Gunakan bootloader Mageia"
+
+#. 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 ""
+"Untuk informasi lebih banyak tentang opsi kernel pada sistem legacy dan "
+"UEFI, lihat: <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 "Pengaturan SCSI"
 
@@ -4722,18 +4998,20 @@ msgstr "Pengaturan 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 "
@@ -4745,105 +5023,60 @@ msgstr ""
 "menyebabkan gagal mengenali perangkat."
 
 #. 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 ""
 "Jika ini terjadi, Anda harus menentukan secara manual perangkat SCSI mana "
 "yang Anda miliki pada Drakx."
 
-#. type: Content of: <section><para>
-#: en/setupSCSI.xml:35
-msgid "DrakX should then be able to configure the drive(s) correctly."
-msgstr "DrakX lalu akan bisa mengkonfigurasi perangkat yang tepat."
-
 #. type: Content of: <section><info><title>
-#: en/soundConfig.xml:3
+#: en/soundConfig.xml:10
 msgid "Sound Configuration"
 msgstr "Konfigurasi Suara"
 
 #.  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
-#, 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>"
-
-#. type: Content of: <section><para>
-#: en/soundConfig.xml:14
+#: en/soundConfig.xml:20
 #, 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."
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-soundConfig.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"soundConfig-im1\"/> </imageobject>"
 msgstr ""
-"Di layar ini, nama driver yang dipilih oleh insaller untuk perangkat suara "
-"Anda diberikan, yang akan jadi driver baku jika ada."
+"<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 ""
-"Driver baku seharusnya bekerja tanpa masalah. Tetapi, jika setelah instalasi "
-"Anda menemukan masalah, jalankan  <command>draksound</command> atau jalankan "
-"alat ini melalui MCC (Pusat Konfigurasi Mageia), dengan memilih tab "
-"<guilabel>Hardware</guilabel> lalu mengklik <guilabel>Konfigurasi Suara</"
-"guilabel> di kanan atas layar."
 
 #. 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 ""
-"Lalu, pada draksound atau layar alat \"Konfigurasi Suara\", klik "
-"<guibutton>Lanjutan</guibutton> lalu <guibutton>Pemecahan masalah</"
-"guibutton> untuk menemukan saran berguna tentang bagaimana cara mengatasi "
-"masalah."
 
 #. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:30
+#: en/soundConfig.xml:43
 msgid "Advanced"
 msgstr "Lanjutan"
 
-#. 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 ""
-"Mengklik <guibutton>Lanjutan</guibutton> di layar ini, selama instalasi, "
-"berguna jika tidak ada driver baku dan ada beberapa driver yang tersedia, "
-"tapi Anda pikir installer memilih yang salah."
-
-#. 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 ""
-"Jika seperti itu, Anda bisa memilih driver yang berbeda setelah mengklik "
-"<guibutton>Biarkan saya memilih driver</guibutton>."
-
 #. type: Content of: <section><info><title>
-#: en/takeOverHdConfirm.xml:3
+#: en/takeOverHdConfirm.xml:10
 msgid "Confirm hard disk to be formatted"
 msgstr "Konfirmasi harddisk yang akan diformat"
 
@@ -4853,126 +5086,140 @@ msgstr "Konfirmasi harddisk yang akan diformat"
 #.     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=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </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 ""
 "Klik <guibutton>Sebelumnya</guibutton> jika Anda tidak yakin dengan pilihan "
 "Anda."
 
-#. 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 ""
 "Klik pada <guibutton>Selanjutnya</guibutton> jika Anda yakin dan ingin "
 "menghapus semua partisi, semua sistem operasi dan semua data pada harddisk "
 "tersebut."
 
 #. type: Content of: <section><info><title>
-#: en/testing.xml:9
+#: en/testing.xml:3
 msgid "Testing Mageia as Live system"
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/testing.xml:14
+#: en/testing.xml:8
 msgid "Live mode"
 msgstr ""
 
+#. 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 ""
-
 #. type: Content of: <section><section><section><info><title>
-#: en/testing.xml:28
+#: en/testing.xml:21
 msgid "Testing hardware"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/testing.xml:31
+#: en/testing.xml:24
 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 ""
 
 #. 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 ""
 
 #. 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
+msgid "graphics card: if you see the previous screen, it's already OK."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:47
+#: en/testing.xml:40
 msgid "webcam:"
 msgstr ""
 
 #. 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 ""
 
 #. 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
+msgid "printer: configure your printer/s and print a test page"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:59
+#: en/testing.xml:52
 msgid "scanner: scan a document from ..."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/testing.xml:63
+#: en/testing.xml:56
 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 ""
 
-#. 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
+msgid ""
+"The configuration settings you apply here are carried over if you decide to "
+"proceed with the installation."
 msgstr ""
 
 #. type: Content of: <section><section><section><info><title>
-#: en/testing.xml:72
+#: en/testing.xml:68
 msgid "Launch installation"
 msgstr ""
 
+#. type: Content of: <section><section><section><para>
+#: en/testing.xml:71
+msgid ""
+"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 ""
+
 #. type: Content of: <section><section><section><mediaobject>
-#: en/testing.xml:76
+#: en/testing.xml:77
 msgid ""
 "<imageobject> <imagedata fileref=\"live-liveMode-install.png\"/> </"
 "imageobject>"
@@ -4980,22 +5227,13 @@ msgstr ""
 "<imageobject> <imagedata fileref=\"live-liveMode-install.png\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><section><section><para>
-#: en/testing.xml:81
-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."
-msgstr ""
-
 #. type: Content of: <section><info><title>
-#: en/uninstall-Mageia.xml:3
+#: en/uninstall-Mageia.xml:10
 msgid "Uninstalling Mageia"
 msgstr "Uninstall Mageia"
 
 #. 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 "
@@ -5008,13 +5246,13 @@ msgstr ""
 "sistem operasi."
 
 #. 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 ""
 "Setelah backup data Anda, jalankan ulang DVD instalasi Mageia, lalu pilih "
 "sistem Penyelamat, lalu, Kembalikan boot loader Windows. Pada boot "
@@ -5022,15 +5260,18 @@ msgstr ""
 "operasi."
 
 #. 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 ""
 "Untuk mengembalikan ruang yang digunakan oleh Mageia pada Windows, klik pada "
 "<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
@@ -5041,16 +5282,17 @@ msgstr ""
 "Ruang akan dibebaskan."
 
 #. 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 ""
 "Jika Anda menggunakan Windows XP, Anda bisa membuat partisi baru lalu format "
 "(FAT32 atau NTFS). Dia akan mendapatkan huruf partisi."
 
 #. 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 "
@@ -5066,30 +5308,45 @@ msgstr ""
 "dan pastikan semua yang penting telah dibackup."
 
 #. type: Content of: <section><info><title>
-#: en/unused.xml:9
+#: en/unused.xml:3
 msgid "Keep or delete unused material"
 msgstr ""
 
+#. 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
 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 ""
+
+#. 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>"
@@ -5098,12 +5355,623 @@ msgstr ""
 "> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/unused.xml:30
+#: en/unused.xml:31
 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 ""
 
+#~ msgid "User and Superuser Management"
+#~ msgstr "Pengelolaan Pengguna dan Pengguna Super"
+
+#, fuzzy
+#~ msgid ""
+#~ "Every partition is shown to the left as: <emphasis role=\"bold\">Device "
+#~ "(capacity, mount point, type).</emphasis>"
+#~ msgstr ""
+#~ "Setiap partisi ditampilkan sebagai berikut: \"Perangkat\" (\"Kapasitas\", "
+#~ "\"Titik kait\", \"Tipe\")."
+
+#~ msgid ""
+#~ "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
+#~ msgstr ""
+#~ "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "Depending on your selection here, you may be offered further screens to "
+#~ "fine-tune your choice."
+#~ msgstr ""
+#~ "Tergantung pada apa yang dipilih di sini, Anda mungkin akan ditawarkan "
+#~ "layar lanjutan untuk menyesuaikan pilihan."
+
+#, 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 "Pengaturan pilihan DrakX biasanya sudah bagus."
+
+#, 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 ""
+#~ "Repository Nonfree harus dihidupkan secara eksplisit untuk mengaksesnya. "
+#~ "Jika Anda tidak memilih itu sebelumnya, Anda harus melakukan ini setelah "
+#~ "komputer dinyalakan ulang."
+
+#, 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>Perangkat Grafis</guibutton></emphasis>: Pilih "
+#~ "perangkat Anda dari daftar berikut jika diperlukan."
+
+#~ msgid "Incorrect refresh rates may damage your monitor"
+#~ msgstr "Refresh rate yang tidak tepat bisa merusak monitor Anda"
+
+#, 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>Sesuaian</emphasis>"
+
+#~ msgid "<emphasis>Plug 'n Play</emphasis>"
+#~ msgstr "<emphasis>Plug 'n Play</emphasis>"
+
+#~ msgid "the monitor manufacturers name"
+#~ msgstr "nama pembuat monitor"
+
+#~ msgid "the monitor description"
+#~ msgstr "keterangan monitor"
+
+#, 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-"
+#~ "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+
+#~ msgid "Click <guibutton>Done</guibutton> when you're ready."
+#~ msgstr "Klik <guibutton>Selesai</guibutton> jika sudah siap."
+
+#, 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-"
+#~ "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+
+#~ msgid "Use Free Space"
+#~ msgstr "Gunakan Ruang Kosong"
+
+#~ msgid "Use Free Space on a Windows Partition"
+#~ msgstr "Gunakan Ruang Kosong pada Partisi Windows"
+
+#~ msgid ""
+#~ "If you have unused space on an existing Windows partition, the installer "
+#~ "may offer to use it."
+#~ msgstr ""
+#~ "Jika Anda memiliki ruang tak terpakai pada partisi Windows yang ada, "
+#~ "installer akan menawarkan untuk menggunakannya."
+
+#, 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-"
+#~ "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+
+#~ msgid "Erase and use Entire Disk."
+#~ msgstr "Hapus dan gunakan Seluruh Disk."
+
+#~ msgid ""
+#~ "Note! This will erase ALL data on the selected hard drive. Take care!"
+#~ msgstr ""
+#~ "Perhatikan! Ini akan menghapus SEMUA data pada harddisk yang dipilih. "
+#~ "Hati-hati!"
+
+#, fuzzy
+#~ msgid "Custom disk partitioning"
+#~ msgstr "Menyesuaikan pemartisian disk dengan DiskDrake"
+
+#, 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-"
+#~ "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid "January 2015"
+#~ msgstr "January 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 "Gunakan bootloader Mageia"
+
+#, 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 ""
+#~ "Ini adalah layar sambutan baku ketika menggunakan DVD Mageia, yang "
+#~ "pertama dengan sistem legacy dan yang kedua dengan sistem UEFI:"
+
+#, 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 "Gunakan tombol panah untuk memilih bahasa, lalu tekan tombol 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 "- Baku, dia tidak mengubah apapun dalam opsi baku."
+
+#, fuzzy
+#~ msgid ""
+#~ "Safe Settings: Priority is given to the safer options at the price of a "
+#~ "performance detriment."
+#~ msgstr ""
+#~ "- Pengaturan Aman, prioritas diberikan pada opsi aman untuk mengorbankan "
+#~ "kinerja."
+
+#~ msgid ""
+#~ "When you select one of these entries, it modifies the default options "
+#~ "displayed in the <guilabel>Boot Options</guilabel> line."
+#~ msgstr ""
+#~ "Ketika Anda memilih salah satu entri ini, dia akan mengubah opsi baku "
+#~ "yang ditampilkan pada <guilabel>Opsi Boot</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 ""
+#~ "Pada beberapa rilis Mageia, mungkin entri yang dipilih dengan tombol F6 "
+#~ "tidak muncul pada baris <guilabel>Opsi Boot</guilabel>, tetapi, "
+#~ "sebenarnya mereka telah diterapkan."
+
+#, 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 ""
+#~ "Menekan F1 membukan jendela baru dengan lebih banyak opsi yang tersedia. "
+#~ "Pilih dengan tombol panah, lalu tekan Enter untuk melihat detil, atau "
+#~ "tekan tombol Esc untuk kembali ke layar sambutan."
+
+#, 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 ""
+#~ "Tampilan detil tentang pilihan splash. Tekan Esc atau pilih "
+#~ "<guilabel>Kembali ke Opsi Boot</guilabel> untuk kembali ke daftar "
+#~ "pilihan. Pilihan ini bisa ditambahkan secara manual di baris "
+#~ "<guilabel>Opsi boot</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 ""
+#~ "Bantuan diterjemahkan ke dalam bahasa yang dipilih dengan tombol 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 ""
+#~ "Untuk informasi lebih banyak tentang opsi kernel pada sistem legacy dan "
+#~ "UEFI, lihat: <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 "Pemilihan Media (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 "Ringkasan dari berbagai parameter"
+
+#~ msgid "<guilabel>Timezone</guilabel>"
+#~ msgstr "<guilabel>Zona Waktu</guilabel>"
+
+#~ msgid "<guilabel>Country / Region</guilabel>"
+#~ msgstr "<guilabel>Negara / Wilayah</guilabel>"
+
+#~ msgid "<guilabel>Bootloader</guilabel>"
+#~ msgstr "<guilabel>Bootloader</guilabel>"
+
+#~ msgid "For more information, see <xref linkend=\"setupBootloader\"/>"
+#~ msgstr "Untuk informasi lebih, lihat <xref linkend=\"setupBootloader\"/>"
+
+#~ msgid "<guilabel>User management</guilabel>"
+#~ msgstr "<guilabel>Pengelolaan pengguna</guilabel>"
+
+#~ msgid "<guilabel>Services</guilabel>:"
+#~ msgstr "<guilabel>Layanan</guilabel>:"
+
+#~ msgid "For more information, see <xref linkend=\"configureServices\"/>"
+#~ msgstr "Untuk informasi lebih, lihat <xref linkend=\"configureServices\"/>"
+
+#~ msgid "<guilabel>Keyboard</guilabel>:"
+#~ msgstr "<guilabel>Keyboard</guilabel>:"
+
+#~ msgid "<guilabel>Mouse</guilabel>:"
+#~ msgstr "<guilabel>Mouse</guilabel>:"
+
+#~ msgid "<guilabel>Sound card</guilabel>:"
+#~ msgstr "<guilabel>Perangkat suara</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 ""
+#~ "Installer menggunakan driver baku, jika ada. Opsi untuk memilih driver "
+#~ "berbeda hanya diberikan ketika ada lebih dari satu driver untuk perangkat "
+#~ "Anda, tapi tidak satupun merupakan pilihan baku."
+
+#~ msgid "<guilabel>Graphical interface</guilabel>:"
+#~ msgstr "<guilabel>Antarmuka grafis</guilabel>:"
+
+#~ msgid "<guilabel>Network</guilabel>:"
+#~ msgstr "<guilabel>Jaringan</guilabel>:"
+
+#~ msgid "<guilabel>Proxies</guilabel>:"
+#~ msgstr "<guilabel>Proxy</guilabel>:"
+
+#~ msgid "<guilabel>Security Level</guilabel>:"
+#~ msgstr "<guilabel>Tingkat Keamanan</guilabel>:"
+
+#~ msgid "Check the option which best suits your usage."
+#~ msgstr "Lihat pilihan yang sesuai dengan penggunaan komputer Anda."
+
+#~ 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 dimaksudkan untuk menjadi pembatas antara data penting Anda "
+#~ "dengan para penjahat di internet yang bermaksud untuk membahayakan atau "
+#~ "mencurinya."
+
+#, 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 ""
+#~ "Pilih layanan yang ingin bisa diakses ke sistem komputer Anda. Pilihan "
+#~ "akan tergantung pada komputer Anda akan digunakan untuk apa."
+
+#, 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>"
+
+#~ 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 "Install"
+
+#~ msgid "Upgrade"
+#~ msgstr "Upgrade"
+
+#, 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 ""
+#~ "Jika selama instalasi Anda memutuskan untuk menghentikannya, Anda bisa "
+#~ "menjalankan ulang komputer, tapi pikir dua kali sebelum melakukannya. "
+#~ "Setelah partisi diformat atau update telah mulai diinstall, kondisi "
+#~ "komputer Anda sudah tidak sama lagi dan menjalankan ulang komputer bisa "
+#~ "membuat komputer Anda tidak bisa digunakan lagi. Jika Anda benar-benar "
+#~ "ingin menjalankan ulang komputer, jalankan terminal dengan menekan tiga "
+#~ "tombol <guilabel>Alt Ctrl F2</guilabel> secara bersamaan. Lalu tekan "
+#~ "<guilabel>Alt Ctrl Delete</guilabel> secara bersamaan untuk menjalankan "
+#~ "ulang."
+
+#~ 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 ""
+#~ "<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 "The Mageia graphical menus are nice :)"
+#~ msgstr "Menu grafis Mageia sangat cantik :"
+
+#, 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 ""
+#~ "<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-"
+#~ "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata fileref=\"live-setupBootloader2.png\"/> </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-"
+#~ "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid "<guilabel>Advanced</guilabel>"
+#~ msgstr "<guilabel>Layanan</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 lalu akan bisa mengkonfigurasi perangkat yang tepat."
+
+#, 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 ""
+#~ "Di layar ini, nama driver yang dipilih oleh insaller untuk perangkat "
+#~ "suara Anda diberikan, yang akan jadi driver baku jika ada."
+
+#~ 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 ""
+#~ "Driver baku seharusnya bekerja tanpa masalah. Tetapi, jika setelah "
+#~ "instalasi Anda menemukan masalah, jalankan  <command>draksound</command> "
+#~ "atau jalankan alat ini melalui MCC (Pusat Konfigurasi Mageia), dengan "
+#~ "memilih tab <guilabel>Hardware</guilabel> lalu mengklik "
+#~ "<guilabel>Konfigurasi Suara</guilabel> di kanan atas layar."
+
+#, 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 ""
+#~ "Lalu, pada draksound atau layar alat \"Konfigurasi Suara\", klik "
+#~ "<guibutton>Lanjutan</guibutton> lalu <guibutton>Pemecahan masalah</"
+#~ "guibutton> untuk menemukan saran berguna tentang bagaimana cara mengatasi "
+#~ "masalah."
+
+#, 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 ""
+#~ "Mengklik <guibutton>Lanjutan</guibutton> di layar ini, selama instalasi, "
+#~ "berguna jika tidak ada driver baku dan ada beberapa driver yang tersedia, "
+#~ "tapi Anda pikir installer memilih yang salah."
+
+#, 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 ""
+#~ "Jika seperti itu, Anda bisa memilih driver yang berbeda setelah mengklik "
+#~ "<guibutton>Biarkan saya memilih driver</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=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+
 #~ 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 "
@@ -5207,22 +6075,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 ""
-#~ "Ada tab untuk setiap hard disk yang terdeteksi atau perangkat penyimpanan "
-#~ "lainnya, seperti flashdisk. Contohnya sda, sdb dan sdc jika ada tiga."
-
 #, fuzzy
 #~ msgid ""
 #~ "<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
@@ -5240,21 +6092,6 @@ msgstr ""
 #~ msgid "\"Free space preceding (MiB)\" \"2\""
 #~ msgstr "\"Ruang kosong di awal (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 ""
@@ -5346,15 +6183,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 ""
 #~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png"
 #~ "\" align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></"
 #~ "imagedata> </imageobject>"
@@ -5401,13 +6229,6 @@ msgstr ""
 #~ "\"center\" format=\"PNG\"></imagedata> </imageobject>"
 
 #~ msgid ""
-#~ "Use this option for a fresh <application>Mageia</application> "
-#~ "installation."
-#~ msgstr ""
-#~ "Gunakan pilihan ini untuk instalasi <application>Mageia</application> "
-#~ "baru."
-
-#~ 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."
@@ -5439,9 +6260,6 @@ msgstr ""
 #~ "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
 #~ "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
-#~ msgid "Custom"
-#~ msgstr "Sesuaian"
-
 #~ msgid ""
 #~ "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" "
 #~ "align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </"
@@ -5619,13 +6437,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 ""
diff --git a/docs/docs/stable/installer/it.po b/docs/docs/stable/installer/it.po
index 45b27fa7..618dfc40 100644
--- a/docs/docs/stable/installer/it.po
+++ b/docs/docs/stable/installer/it.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2018-04-19 16:32+0300\n"
+"POT-Creation-Date: 2019-01-06 12:43+0200\n"
 "PO-Revision-Date: 2016-07-17 11:45+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
@@ -28,12 +28,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 "Note di rilascio"
 
 #. type: Content of: <section><mediaobject>
-#: en/acceptLicense.xml:29
+#: en/acceptLicense.xml:35
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
@@ -47,81 +47,87 @@ msgstr ""
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/acceptLicense.xml:40
+#: en/acceptLicense.xml:46
 msgid "License Agreement"
 msgstr "Accordo di licenza"
 
-#. 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 ""
 "Prima di installare <application>Mageia</application>, per favore leggi con "
 "cautela i termini e le condizioni della licenza."
 
-#. 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 ""
 "Questi termini e condizioni si applicano all'intera distribuzione "
 "<application>Mageia</application> e devono essere accettati per poter "
 "proseguire."
 
-#. 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 ""
 "Per accettare, seleziona semplicemente <guilabel>Accetta</guilabel> e quindi "
 "clicca su <guibutton>Avanti</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 ""
 "Se decidi di non accettare queste condizioni, ti ringraziamo per averci "
 "provato. Cliccando <guibutton>Esci</guibutton> riavvierà il tuo computer."
 
 #. type: Content of: <section><section><info><title>
-#: en/acceptLicense.xml:63
+#: en/acceptLicense.xml:76
 msgid "Release Notes"
 msgstr "Note di rilascio"
 
 #. 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 ""
 "Vengono date informazioni importanti riguardo al rilascio di "
 "<application>Mageia</application> e sono accessibili cliccando sul bottone "
 "<guibutton>Rilascia Note</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 "it"
 
 #. 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 "Selezione dei Media (Configura Media di Installazione Supplementari)"
 
 #.  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."
@@ -133,13 +139,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 ""
 "Questa schermata vi dà la lista degli archivi già riconosciuti. È possibile "
 "aggiungere altre fonti per i pacchetti, come un disco ottico o una sorgente "
@@ -147,25 +153,25 @@ msgstr ""
 "disponibili per la selezione durante i passaggi successivi."
 
 #. 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 "Per le risorse di rete, ci sono due passi da seguire:"
 
 #. 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 "Scelta e attivazione della rete, in caso non sia già attiva."
 
 #. 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 ""
 "Seleziona uno specchio o specifica un URL (il primo ingresso). Selezionando "
 "uno specchio, hai accesso alla selezione di tutti i depositi gestiti da "
@@ -173,57 +179,63 @@ msgstr ""
 "designare un deposito specifico o la tua stessa installazione NFS."
 
 #. type: Content of: <section><note><para>
-#: en/add_supplemental_media.xml:42
+#: en/add_supplemental_media.xml:46
 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/addUser.xml:3
-msgid "User and Superuser Management"
-msgstr "Gestione dell'utente e del superuser"
+#: en/addUser.xml:9
+#, fuzzy
+msgid "User Management"
+msgstr "Gestione Avanzata Utenti"
 
 #.  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 fileref=\"dx2-"
 "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:20
+#: en/addUser.xml:36
 msgid "Set Administrator (root)  Password:"
 msgstr "Imposta la password dell'amministratore (root):"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:24
+#: en/addUser.xml:40
 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 ""
 
 #. 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 ""
 "Tutte le passwords sono sensibili alle maiuscole, la cosa migliore in una "
@@ -231,69 +243,90 @@ msgstr ""
 "e altri caratteri."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:42
+#: en/addUser.xml:57
 msgid "Enter a user"
 msgstr "Inserisci un utente"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:45
+#: en/addUser.xml:60
 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 ""
 
 #. 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>Venditore</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>Icon</guibutton>: se premi su questo bottone cambierà l'icona "
 "utente."
 
 #. 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>Venditore</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>Vero nome</guilabel>: Inserisci il vero nome dell'utente in questo "
 "spazio."
 
 #. 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>Venditore</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/addUser.xml:82
 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 ""
 
+#. 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>Venditore</emphasis>"
+
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:67
+#: en/addUser.xml:90
 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 ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:73
+#: en/addUser.xml:94
 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 ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:79
+#: en/addUser.xml:101
 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 ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:82
+#: en/addUser.xml:104
 msgid ""
 "You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
@@ -301,53 +334,53 @@ msgid ""
 msgstr ""
 
 #. 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 ""
 "I permessi di accesso possono anche essere cambiati dopo l'installazione."
 
 #. 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 "Gestione Avanzata Utenti"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:96
+#: en/addUser.xml:118
 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 ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:101
+#: en/addUser.xml:123
 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 ""
 
 #. 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>User ID</guilabel>: Qua puoi impostare l'user ID per gli utenti "
 "che hai aggiunto nella schermata precedente. Questo è un numero. Lasciarlo "
 "vuoto nel caso in cui tu non sappia cosa fare."
 
 #. 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 "Scegli i punti di mount"
 
@@ -362,72 +395,53 @@ msgstr "Scegli i punti di mount"
 #.        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 fileref=\"dx2-"
 "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:36
+#: en/ask_mntpoint_s.xml:49
 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."
-msgstr ""
-
-#. 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 ""
-"Se cambi qualcosa assicurati di avere ancora una partizione <literal>/</"
-"literal> (root)."
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:46
-#, fuzzy
-msgid ""
-"Every partition is shown to the left as: <emphasis role=\"bold\">Device "
-"(capacity, mount point, type).</emphasis>"
+"you don't agree with the DrakX suggestions, you can change the mount points "
+"yourself."
 msgstr ""
-"Ogni partizione è mostrata come segue: \"Dispositivo\" (\"Capacità\", "
-"\"Mount point\", \"Tipo\")"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:50
+#: en/ask_mntpoint_s.xml:55
 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
 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 ""
 
 #. 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 "
@@ -437,266 +451,394 @@ msgstr ""
 "vuoto nel punto di mount."
 
 #. 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 ""
+"Se cambi qualcosa assicurati di avere ancora una partizione <literal>/</"
+"literal> (root)."
+
+#. type: Content of: <section><tip><para>
+#: en/ask_mntpoint_s.xml:84
+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 ""
 
 #. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:74
+#: en/ask_mntpoint_s.xml:90
 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/bestTime.xml:10
-msgid "Clock settings"
+#: en/bestTime.xml:5
+msgid "Clock Settings"
 msgstr ""
 
 #. 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=\"dx2-media_selection.png"
+"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><para>
-#: en/bestTime.xml:20
+#: en/bestTime.xml:12
 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 ""
 
 #. type: Content of: <section><para>
-#: en/bestTime.xml:23
-msgid "In advanced tab, you will find more options about clock settings."
+#: 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 ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:1
+#: en/bootLive.xml:10
 msgid "Booting the medium"
 msgstr ""
 
-#. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:1
-msgid "From a disc"
-msgstr ""
-
-#. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:1
+#. type: Content of: <section><section><para>
+#: en/bootLive.xml:12
 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."
+"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 ""
 
-#. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:7
-msgid "From a USB device"
+#. 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 ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:12
+#: en/bootLive.xml:35
 msgid "In BIOS/CSM/Legacy mode"
 msgstr ""
 
+#. 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>Venditore</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
+msgid "Once the boot is done, you can proceed to the installation."
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/bootLive.xml:45 en/bootLive.xml:57
+#, fuzzy
+msgid ""
+"<emphasis role=\"bold\">+ use non-free video drivers (slower to boot)</"
+"emphasis>"
+msgstr "<emphasis>Venditore</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>Venditore</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:54 en/bootLive.xml:157
+msgid "This option will install Mageia to a hard disk."
+msgstr ""
+
+#. 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 ""
 
-#. type: Content of: <section><section><para>
-#: en/bootLive.xml:12
-msgid "In the middle menu, you have the choice between three actions:"
+#. 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
+#: en/bootLive.xml:75
+#, fuzzy
+msgid "<keycap>F1</keycap> <emphasis role=\"bold\">Help</emphasis>"
+msgstr "<emphasis>Venditore</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:76
 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."
+"Within any of the <keycap>F2</keycap> to <keycap>F6</keycap> options, you "
+"can view relevant help by pressing <keycap>F1</keycap>."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:16
+#: en/bootLive.xml:81
+#, fuzzy
+msgid "<keycap>F2</keycap> <emphasis role=\"bold\">Language</emphasis>"
+msgstr "<emphasis>Venditore</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:82
 msgid ""
-"Install Mageia: This choice will directly install Mageia on a hard disk."
+"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 ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:17
+#: en/bootLive.xml:87
+#, fuzzy
+msgid "<keycap>F3</keycap> <emphasis role=\"bold\">Video Mode</emphasis>"
+msgstr "<emphasis>Venditore</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:89
+#, fuzzy
 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 ""
+"If needed, change the screen resolution by pressing <keycap>F3</keycap>. "
+"Options are: 640x480, 800x600, 1024x768."
+msgstr "Cambia la risoluzione premendo F3 (solo nella modalità Legacy)."
 
-#. type: Content of: <section><section><para>
-#: en/bootLive.xml:19
-msgid "In the bottom menu, are the Boot Options:"
-msgstr ""
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:93
+#, fuzzy
+msgid "<keycap>F4</keycap> <emphasis role=\"bold\">Source</emphasis>"
+msgstr "<emphasis>Venditore</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:19
+#: en/bootLive.xml:94
 msgid ""
-"F1 - Help. Explain the options \"splash\", \"apm\", \"acpi\" and \"Ide\""
+"Normally, the installation is performed from the inserted installation "
+"medium. Here, you may select other sources, like FTP or NFS servers."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:20
-msgid "F2 - Language. Choose the display language of the screens."
+#: en/bootLive.xml:95
+msgid ""
+"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 ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:21
-msgid "F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728"
-msgstr ""
+#: en/bootLive.xml:98
+#, fuzzy
+msgid "<keycap>F5</keycap> <emphasis role=\"bold\">Driver</emphasis>"
+msgstr "<emphasis>Venditore</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:22
+#: en/bootLive.xml:99
 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 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 ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:26
+#: en/bootLive.xml:104
+#, fuzzy
+msgid "<keycap>F6</keycap> <emphasis role=\"bold\">Kernel Options</emphasis>"
+msgstr "<emphasis>Venditore</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:106
+msgid ""
+"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>Venditore</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
 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."
+"<emphasis role=\"bold\">No ACPI:</emphasis> (Advanced Configuration and "
+"Power Interface): Power management features are not used."
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/bootLive.xml:125
+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 ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:28
+#: en/bootLive.xml:131
 msgid ""
-"F6 - Kernel options. This is a way to specify options according to your "
-"hardware and the drivers to use."
+"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 ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:29
+#: en/bootLive.xml:139
 msgid "In UEFI mode"
 msgstr ""
 
 #. 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"
+#: en/bootLive.xml:146
+msgid "First screen while booting in UEFI mode"
 msgstr ""
 
 #. 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 ""
 
-#. type: Content of: <section><section><para>
-#: en/bootLive.xml:30
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:153
 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 ""
 
-#. 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/chooseDesktop.xml:3
+#: en/chooseDesktop.xml:16
 msgid "Desktop Selection"
 msgstr "Selezione Desktop"
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:8
-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 ""
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:11
+#: en/chooseDesktop.xml:26
 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 ""
 
 #. 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>"
 
-#. 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
 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 ""
 
 #. type: Content of: <section><info><title>
@@ -705,8 +847,9 @@ msgid "Package Group Selection"
 msgstr "Selezione per gruppi di pacchetti"
 
 #. 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"
@@ -716,7 +859,7 @@ msgstr ""
 "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:14
+#: en/choosePackageGroups.xml:16
 msgid ""
 "Packages are arranged into common groups, to make choosing what you need on "
 "your system a lot easier. The groups are fairly self explanatory, however "
@@ -725,32 +868,32 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:21
+#: en/choosePackageGroups.xml:23
 #, fuzzy
 msgid "<emphasis role=\"bold\">Workstation</emphasis>"
 msgstr "<emphasis>Venditore</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>Venditore</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>Venditore</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:33
+#: en/choosePackageGroups.xml:35
 msgid ""
 "<emphasis role=\"bold\">Individual Package Selection</emphasis>: you can use "
 "this option to manually add or remove packages"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:38
+#: en/choosePackageGroups.xml:40
 msgid ""
 "See <xref linkend=\"minimal-install\"/> for instructions on how to do a "
 "minimal install (without or with X &amp; IceWM)."
@@ -762,8 +905,10 @@ msgid "Choose Individual Packages"
 msgstr "Scegli dei pacchetti individuali"
 
 #. 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"
@@ -773,7 +918,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."
@@ -782,13 +927,13 @@ msgstr ""
 "personalizzare la tua installazione"
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:17
+#: en/choosePackagesTree.xml:21
 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 ""
 
 #. type: Content of: <section><info><title>
@@ -798,8 +943,10 @@ msgstr "Configura i tuoi servizi"
 
 #.  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"
@@ -810,7 +957,7 @@ 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."
@@ -818,26 +965,22 @@ msgstr ""
 "Qua puoi scegliere quali servizi (non) devono essere avviati al boot del "
 "sistema."
 
-#. 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 "Le impostazioni che sceglie DrakX sono generalmente buone."
-
-#. 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."
 msgstr ""
 
 #. 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 "Cambia le cose solo quando sai veramente bene cosa stai facendo."
 
@@ -848,32 +991,34 @@ msgstr "Configura il tuo fuso orario"
 
 #.  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 fileref=\"dx2-"
 "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-setupBootloader2.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 ""
 "Scegli la tua time zone selezionando il tuo Paese o una città vicino alla "
 "tua nella stessa zone."
 
 #. 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 "
@@ -883,7 +1028,7 @@ msgstr ""
 "hardware con l'ora locale o GMT (anche conosciuto come 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."
@@ -892,24 +1037,24 @@ msgstr ""
 "tutti impostati sull'ora locale o tutti con 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 "Scegli un server X (configura la tua scheda video)"
 
 #. 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."
@@ -918,7 +1063,7 @@ msgstr ""
 "correttamente il dispositivo video."
 
 #. 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:"
@@ -926,148 +1071,177 @@ msgstr ""
 "Se l'installer non ha identificato correttamente la tua scheda video e tu "
 "sai di quale si trtta puoi selezionarla dall'elenco:"
 
-#. type: Content of: <section><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 "venditore"
 
 #. 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 "poi il nome della tua scheda"
 
 #. 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 "e il tipo di scheda"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:41
+#: en/configureX_card_list.xml:53
 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 ""
 
-#. 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 ""
 "Attento che selezionando un driver incompatibile potresti avere accesso alla "
 "sola interfaccia da linea di comando."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:51
+#: en/configureX_card_list.xml:65
 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."
-msgstr ""
-
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:56
-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."
+"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 ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:3
+#: en/configureX_chooser.xml:11
 msgid "Graphic Card and Monitor Configuration"
 msgstr "Scheda video e configurazione del monitor"
 
 #.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
+#. 2018/02/15 apb: Some text and typography.
+#. 2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.
+#. 2018/02/23 apb: Typo.
 #. 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
 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 ""
 
 #. 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>Venditore</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>Scheda video</guibutton></emphasis>: Scegli la tua "
-"scheda video dalla lista se necessario."
 
 #. 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>Venditore</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_chooser.xml:52
 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 ""
 
-#. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/configureX_chooser.xml:41
-msgid "Incorrect refresh rates may damage your monitor"
-msgstr "Una refresh rate scorretta potrebbe danneggiare il monitor."
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_chooser.xml:60
+#, fuzzy
+msgid "<emphasis role=\"bold\">Resolution</emphasis>"
+msgstr "<emphasis>Venditore</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>Risoluzione</guibutton></emphasis>: Imposta la "
 "risoluzione desiderata e la profondità di colore."
 
 #. 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>Venditore</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_chooser.xml:71
 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 ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:63
+#: en/configureX_chooser.xml:81
+#, fuzzy
+msgid "<emphasis role=\"bold\">Options</emphasis>"
+msgstr "<emphasis>Venditore</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_chooser.xml:84
+msgid "Here you can choose to enable or disable various options"
+msgstr ""
+
+#. type: Content of: <section><warning><para>
+#: en/configureX_chooser.xml:89
 msgid ""
-"<emphasis><guibutton>Options</guibutton></emphasis>: Here you can choose to "
-"enable or disable various options."
+"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 "Scegliere proprio monitor"
 
 #. 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."
@@ -1076,7 +1250,7 @@ msgstr ""
 "identificherà correttamente il tuo."
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:19
+#: en/configureX_monitor.xml:30
 msgid ""
 "<emphasis role=\"bold\">Selecting a monitor with different characteristics "
 "could damage your monitor or video hardware. Please don't try something "
@@ -1085,32 +1259,32 @@ msgid ""
 msgstr ""
 
 #. 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>Personalizzatp</emphasis>"
+#. type: Content of: <section><variablelist><varlistentry><term>
+#: en/configureX_monitor.xml:46
+msgid "Custom"
+msgstr "Personalizzato"
 
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:33
+#. type: Content of: <section><variablelist><varlistentry><listitem><para>
+#: en/configureX_monitor.xml:49
 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."
 msgstr ""
 
-#. 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 "
@@ -1118,174 +1292,181 @@ msgid ""
 "consult your monitor documentation."
 msgstr ""
 
-#. 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 ""
 "Questa è l'opzione di default e prova a determinare il monitor in base al "
 "database dei monitor."
 
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:51
-msgid "<emphasis>Vendor</emphasis>"
-msgstr "<emphasis>Venditore</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:"
 msgstr ""
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:61
-msgid "the monitor manufacturers name"
-msgstr "Il nome del produttore del monitor"
+#. 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 "la descrizione del monitor"
+#. 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>Generico</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
 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 ""
 
 #. 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 "Partizionamento personalizzato con 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-"
 "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </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 ""
-"Se desideri utilizzare una criptazione per la tua partizione <literal>/</"
-"literal> devi prima assicurarti di avere una partizione <literal>/boot</"
-"literal> separata. L'opzione di criptazione per la partizion <literal>/boot</"
-"literal> NON deve essere impostata, altrimenti il sistema non sarà avviabile."
-
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:29
-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."
-msgstr ""
-
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:34
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/diskdrake.xml:38
 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>."
+"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 ""
 
-#. 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 ""
-"Premi <guibutton>Cancella tutto</guibutton> per cancellare tutte le "
-"partizioni sul dispositivo di storage selezionato."
+"C'è una tab per ogni hard disk individuato o altro dispositivo di storage "
+"(come, per esempio, una chiavetta usb). Per esempio sda, sdb e sdc se ce ne "
+"sono tre."
 
-#. 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 ""
 "Per tutte le altre azioni: premere anzitutto sulla partizione desiderata. "
 "Quindi visualizza o scegli il filesystem e il punto di mount, ridimensionala "
 "oppure cancellala."
 
-#. 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 "Continua sino a quando non avrai impostato tutto come desideri."
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:52
-msgid "Click <guibutton>Done</guibutton> when you're ready."
-msgstr "Quando hai completato premi <guibutton>Finito</guibutton> "
+#. 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 ""
+"Premi <guibutton>Cancella tutto</guibutton> per cancellare tutte le "
+"partizioni sul dispositivo di storage selezionato."
 
-#. 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 ""
+"Se desideri utilizzare una criptazione per la tua partizione <literal>/</"
+"literal> devi prima assicurarti di avere una partizione <literal>/boot</"
+"literal> separata. L'opzione di criptazione per la partizion <literal>/boot</"
+"literal> NON deve essere impostata, altrimenti il sistema non sarà avviabile."
+
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/diskdrake.xml:87
 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 ""
+
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/diskdrake.xml:93
+msgid ""
+"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
+"partition is present and of the correct type. See Figure 2 below."
 msgstr ""
 
-#. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:61
+#. type: Content of: <section><figure><title>
+#: en/diskdrake.xml:101
+#, fuzzy
+msgid "EFI System Partition"
+msgstr "Utilizza le partizioni esistenti"
+
+#. 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-"
 "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </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
-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 ""
 
-#. 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="
@@ -1298,45 +1479,52 @@ msgstr ""
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:9
-msgid "Partitioning"
+#: en/doPartitionDisks.xml:25
+#, fuzzy
+msgid "Suggested Partitioning"
 msgstr "Partizionamento"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:12
+#: en/doPartitionDisks.xml:28
 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 ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:16
+#: en/doPartitionDisks.xml:32
 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 ""
 
 #. 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-"
 "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:32
-msgid "Use Existing Partitions"
-msgstr "Utilizza le partizioni esistenti"
+#. type: Content of: <section><itemizedlist><title>
+#: en/doPartitionDisks.xml:47
+#, fuzzy
+msgid "Main Options"
+msgstr "Partizioni dinamiche"
 
-#. 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>Venditore</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."
@@ -1344,13 +1532,14 @@ msgstr ""
 "Se questa opzione è disponibile allora saranno trovate partizioni esistenti "
 "Linux compatibili e potrebbero essere usate per l'installazione."
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:41
-msgid "Use Free Space"
-msgstr "Utilizza lo spazio libero"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:59
+#, fuzzy
+msgid "<emphasis role=\"bold\">Use Free Space</emphasis>"
+msgstr "<emphasis>Venditore</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."
@@ -1358,225 +1547,220 @@ msgstr ""
 "Se hai dello spazio libero sul tuo hard drive questa opzione lo utilizzerà "
 "per la tua nuova installazione di Mageia."
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:49
-msgid "Use Free Space on a Windows Partition"
-msgstr "Usa lo spazio libero di una partizione Windows"
-
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
-msgid ""
-"If you have unused space on an existing Windows partition, the installer may "
-"offer to use it."
-msgstr ""
-"Se hai dello spazio libero su di una partizione Windows esistente "
-"l'installer potrebbe offrirti di utilizzarla."
-
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:56
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:68
+#, 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!"
-msgstr ""
+"<emphasis role=\"bold\">Use Free Space on a Windows Partition</emphasis>"
+msgstr "<emphasis>Venditore</emphasis>"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:61
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:71
 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."
+"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 ""
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:69
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:77
 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 ""
 
-#. 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-"
-"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
-
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:87
-msgid "Erase and use Entire Disk."
-msgstr "Formatta e utilizza tutto il disco"
+msgid "<emphasis role=\"bold\">Erase and use Entire Disk</emphasis>"
+msgstr "<emphasis>Venditore</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 "Questa opzione userà l'intero disco per Mageia."
 
-#. 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!"
+#. type: Content of: <section><itemizedlist><listitem><warning><para>
+#: en/doPartitionDisks.xml:92
+msgid ""
+"This will erase ALL data on the selected hard drive. Take care! If you "
+"intend to use part of the disk for something else, or you already have data "
+"on the drive that you are not prepared to lose, then do not use this option."
 msgstr ""
-"Nota bene! Questo cancellerà TUTTI i dati sull'hard drive selezionato. Fai "
-"attenzione!"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:96
+#. type: Content of: <section><itemizedlist><listitem><important><para>
+#: en/doPartitionDisks.xml:99
 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."
+"Note that this involves shrinking the size of the Windows partition. The "
+"partition must be \"clean\", meaning that Windows must have closed down "
+"correctly the last time it was used. It must also have been defragmented, "
+"although this is not a guarantee that all files in the partition have been "
+"moved out of the area that is about to be used. It is highly recommended to "
+"back up your personal files."
 msgstr ""
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:103
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:110
 #, fuzzy
-msgid "Custom disk partitioning"
-msgstr "Partizionamento personalizzato con DiskDrake"
+msgid "<emphasis role=\"bold\">Custom Disk Partitioning</emphasis>"
+msgstr "<emphasis>Venditore</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)."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:112
-msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
+#. type: Content of: <section><mediaobject>
+#: en/doPartitionDisks.xml:120
+#, fuzzy
+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-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </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
 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 ""
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:125
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:141
 msgid ""
 "If the total available space is greater than 50 GB, then three partitions "
 "are created"
 msgstr ""
 
-#. 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
 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 ""
 
-#. 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
+msgid "1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB"
 msgstr ""
 
-#. 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
 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 ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:144
+#: 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 ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:150
+#: en/doPartitionDisks.xml:182
 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 ""
 
 #. 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-"
-"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-setupBootloader2.png\"/> </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 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
 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 ""
 
-#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:189
+#. type: Content of: <section><important><para>
+#: en/doPartitionDisks.xml:221
+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 ""
+
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:228
 #, fuzzy
-msgid "<emphasis role=\"bold\">Align to</emphasis> = MiB"
+msgid "<emphasis>Align to</emphasis> = MiB"
 msgstr "<emphasis>Venditore</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>Venditore</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."
@@ -1585,39 +1769,41 @@ msgstr ""
 "megabytes."
 
 #. 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 ""
 
 #. 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"
+#: 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 "La documentazione ufficiale di Mageia"
 
 #. 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/"
@@ -1628,8 +1814,8 @@ msgstr ""
 "\">http://creativecommons.org/licenses/by-sa/3.0/</link>."
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml: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."
@@ -1640,8 +1826,7 @@ msgstr ""
 "neodoc.biz\">NeoDoc</link>."
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml: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</"
@@ -1651,58 +1836,64 @@ msgstr ""
 "\"https://wiki.mageia.org/en/Documentation_team\">Team Documentazione</"
 "link>, se vuoi aiutare a migliorare questo manuale."
 
-#. 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 "
 "while installing."
 msgstr ""
 
-#. 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 ""
+"E' stato scritto da volontari nel loro tempo libero. Contatta <link ns6:href="
+"\"https://wiki.mageia.org/en/Documentation_team\">Team Documentazione</"
+"link>, se vuoi aiutare a migliorare questo manuale."
+
 #. 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 "Installazione con DrakX"
 
 #. type: Content of: <book><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:9
+#: en/DrakX-cover.xml:20
 msgid "February 2014"
 msgstr "Febbraio 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 "Complimenti"
 
 #.  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\" "
@@ -1713,25 +1904,24 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:18
 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 ""
 
 #. 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 ""
 "Dopo il riavvio, nella schermata del bootloader, potrai scegliere fra i "
 "diversi sistemi operativi del tuo computer (se ne possiedi più di uno)."
 
 #. 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."
@@ -1740,25 +1930,26 @@ msgstr ""
 "Mageia verrà automaticamente selezionata e avviata."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:26
+#: en/exitInstall.xml:30
 msgid "Enjoy!"
 msgstr "Divertiti!"
 
 #. 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 ""
 "Visita www.mageia.org se hai delle domande o se vuoi contribuire a Mageia"
 
 #. 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 "
@@ -1767,48 +1958,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>Venditore</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>Generico</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 "
@@ -1816,28 +2007,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 "Formattazione in corso"
 
@@ -1845,22 +2036,23 @@ msgstr "Formattazione in corso"
 #.  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 fileref=\"dx2-"
 "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </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 "
@@ -1871,44 +2063,47 @@ msgstr ""
 "verrà salvato."
 
 #. 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
+msgid ""
+"Usually, at least the partitions that DrakX selected need to be formatted."
 msgstr ""
 
 #. 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 ""
 "Clicca su <guibutton>Avanzato</guibutton> per scegliere le partizioni che "
 "desideri controllare per i cosiddetti <emphasis>bad blocks</emphasis>."
 
 #. type: Content of: <section><tip><para>
-#: en/formatPartitions.xml:36
+#: en/formatPartitions.xml:47
 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 ""
 
 #. 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 ""
 "Quando sei sicuro di ciò che hai selezionato clicca su <guibutton>Avanti</"
 "guibutton> per proseguire."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:10
+#: en/installer.xml:14
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, l'assistente all'installazione di Mageia"
 
 #. 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 "
@@ -1918,384 +2113,293 @@ msgstr ""
 "studiato per rendere la tua installazione o aggiornamento il più semplice "
 "possibile."
 
-#. 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 ""
-"Il menù iniziale ha diverse opzioni, in ogni caso quella di default avvierà "
-"l'installer che è normalmente tutto ciò di cui hai bisogno."
-
 #. type: Content of: <section><section><title>
-#: en/installer.xml:22
-msgid "Installation Welcome Screen"
-msgstr "Schermata di benvenuto dell'installazione"
-
-#. type: Content of: <section><section><section><title>
-#: en/installer.xml:25
-#, fuzzy
-msgid "Using a Mageia DVD"
-msgstr "Disinstallare Mageia"
+#: en/installer.xml:20
+msgid "The installation steps"
+msgstr "I passi dell'installazione"
 
-#. 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 ""
-"Ecco le schermate di benvenuto quanddo si utilizza una DVD di Mageia. La "
-"prima è con un sistema legacy, la seconda con un sistema UEFI."
+"Il processo di installazione è diviso in step che possono essere seguiti sul "
+"pannello a lato dello schermo."
 
-#. 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 ""
+"Ogni step ha una o più schermate e può anche avere un pulsate "
+"<guibutton>Avanzate</guibutton>  con degli extra con le opzioni meno "
+"richieste."
 
-#. 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):"
-msgstr ""
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:55
 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>"
+"Most screens have <emphasis>Help</emphasis> buttons for further details "
+"about the particular step."
 msgstr ""
+"Molte schermate hanno un bottone di <guilabel>Aiuto</guilabel> per darti "
+"ulteriori spiegazioni riguardo lo step corrente."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:63
+#. type: Content of: <section><section><caution><para>
+#: en/installer.xml:38
+#, fuzzy
 msgid ""
-"Press <emphasis role=\"bold\">F2</emphasis> to have the installer use a "
-"specific language for the installation."
+"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 ""
+"Se durante l'installazione decidi di terminarla è possibile eseguire un "
+"reboot, ma per favore pensaci due volte prima di farlo. Una volta che una "
+"partizione è stata formattata o l'update ha iniziato a installare il tuo "
+"computer non è più nello stesso stato e riavviarlo può condurre con buone "
+"probabilità ad un sistema inutilizzabile. Nel caso in cui tu sia davvero "
+"sicuro che il riavvio sia ciò che desideri apri un terminale premendo i tre "
+"tasti <guilabel>Alt Ctrl F2</guilabel> contemporaneamente. Dopo, premere "
+"insieme <guilabel>Alt Ctrl Delete</guilabel> per riavviare."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:67
-#, fuzzy
+#. type: Content of: <section><section><caution><para>
+#: en/installer.xml:43
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+"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 ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/> "
-"</imageobject>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:72
-#, fuzzy
-msgid ""
-"Use the arrow keys to select the language then press <emphasis role=\"bold"
-"\">Enter</emphasis>."
-msgstr "Usa le frecce per scegliere la lingua e premi il tasto Invio."
+#. type: Content of: <section><section><title>
+#: en/installer.xml:48
+msgid "Installation Welcome Screen"
+msgstr "Schermata di benvenuto dell'installazione"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:77
-#, fuzzy
+#. type: Content of: <section><section><para>
+#: en/installer.xml:49
 msgid ""
-"If needed, change the screen resolution by pressing <emphasis role=\"bold"
-"\">F3</emphasis> (Legacy mode only)."
-msgstr "Cambia la risoluzione premendo F3 (solo nella modalità Legacy)."
+"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 ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:81
+#. type: Content of: <section><section><para>
+#: en/installer.xml:52
 #, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+"The welcome menu screen has various options, however the default option will "
+"start the installer, and is normally all that you will need."
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/> </"
-"imageobject>"
+"Il menù iniziale ha diverse opzioni, in ogni caso quella di default avvierà "
+"l'installer che è normalmente tutto ciò di cui hai bisogno."
 
-#. 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)."
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:56
+msgid "Legacy (BIOS) Systems"
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/installer.xml:96
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:58
 #, fuzzy
-msgid "Default: It doesn't alter anything in the default options."
-msgstr "- Default, non cambia niente nelle opzioni di default."
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/installer.xml:101
 msgid ""
-"Safe Settings: Priority is given to the safer options at the price of a "
-"performance detriment."
+"<imageobject> <imagedata fileref=\"dx-welcome.png\" align=\"center\"/> </"
+"imageobject>"
 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:106
-msgid ""
-"No ACPI: (Advanced Configuration and Power Interface): Power management "
-"features are not used."
+#. type: Content of: <section><section><section><itemizedlist><title>
+#: en/installer.xml:63
+msgid "Menu"
 msgstr ""
 
-#. 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:66
 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."
+"Install Mageia to a hard disk. This is the default option, and will "
+"automatically start after a short while unless another option is selected."
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:120
-msgid ""
-"When you select one of these entries, it modifies the default options "
-"displayed in the <guilabel>Boot Options</guilabel> line."
-msgstr ""
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:69
+#, fuzzy
+msgid "<emphasis role=\"bold\">Rescue System</emphasis>"
+msgstr "<emphasis>Venditore</emphasis>"
 
-#. 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:70
 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."
+"This option allows you to either re-install the bootloader for an existing "
+"Mageia installation or you can use it to restore a Windows bootloader."
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:132
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:75
 #, fuzzy
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> </"
-"imageobject>"
+msgid "<emphasis role=\"bold\">Memory Test</emphasis>"
+msgstr "<emphasis>Venditore</emphasis>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:139
-#, fuzzy
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:76
 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."
+"Test the installed RAM by performing multiple read and write operations. "
+"Reboot to end the test."
 msgstr ""
-"Premendo F1 si aprirà una finestra con ulteriori opzioni disponibili. "
-"Selezionarne una con le frecce e premere Invio per avere maggiori dettagli o "
-"premere Esc per tornare indietro alla schermata di benvenuto."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:146
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:80
 #, fuzzy
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
-"</imageobject>"
+msgid "<emphasis role=\"bold\">F2: Language</emphasis>"
+msgstr "<emphasis>Venditore</emphasis>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:151
-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><itemizedlist><listitem><para>
+#: en/installer.xml:81
+msgid "Press F2 for alternative languages."
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:158
-#, fuzzy
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:86
+msgid "UEFI Systems"
 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
-#, fuzzy
-msgid ""
-"The help is translated in the chosen language with <emphasis role=\"bold"
-"\">F2</emphasis>."
-msgstr "L'aiuto viene tradotto nella lingua scelta con il tasto F2."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:168
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:87
 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>"
+"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 ""
-"Per maggiori informazioni riguardo le opzioni del kernel su sistemi legacy e "
-"UEFI visitare: <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 "I passi dell'installazione"
 
-#. type: Content of: <section><section><para>
-#: en/installer.xml:179
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:92
 #, 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."
+"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+"imageobject>"
 msgstr ""
-"Il processo di installazione è diviso in step che possono essere seguiti sul "
-"pannello a lato dello schermo."
+"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/installer.xml:182
-#, fuzzy
-msgid ""
-"Each step has one or more screens which may also have <guibutton>Advanced</"
-"guibutton> sections with extra, less commonly required, options."
+#. 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 ""
-"Ogni step ha una o più schermate e può anche avere un pulsate "
-"<guibutton>Avanzate</guibutton>  con degli extra con le opzioni meno "
-"richieste."
 
-#. type: Content of: <section><section><para>
-#: en/installer.xml:186
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:99
 #, fuzzy
+msgid "<emphasis role=\"bold\">Install:</emphasis> Start the Install process"
+msgstr "<emphasis>Venditore</emphasis>"
+
+#. 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 ""
-"Molte schermate hanno un bottone di <guilabel>Aiuto</guilabel> per darti "
-"ulteriori spiegazioni riguardo lo step corrente."
 
-#. type: Content of: <section><section><note><para>
-#: en/installer.xml:190
-#, fuzzy
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:109
 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 ""
-"Se durante l'installazione decidi di terminarla è possibile eseguire un "
-"reboot, ma per favore pensaci due volte prima di farlo. Una volta che una "
-"partizione è stata formattata o l'update ha iniziato a installare il tuo "
-"computer non è più nello stesso stato e riavviarlo può condurre con buone "
-"probabilità ad un sistema inutilizzabile. Nel caso in cui tu sia davvero "
-"sicuro che il riavvio sia ciò che desideri apri un terminale premendo i tre "
-"tasti <guilabel>Alt Ctrl F2</guilabel> contemporaneamente. Dopo, premere "
-"insieme <guilabel>Alt Ctrl Delete</guilabel> per riavviare."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:203
+#: en/installer.xml:115
 msgid "Installation Problems and Possible Solutions"
 msgstr "Problemi relativi all'installazione e soluzioni possibili"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:206
+#: en/installer.xml:117
 msgid "No Graphical Interface"
 msgstr "Nessuna interfaccia grafica"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:210
+#: en/installer.xml:120
 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 ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:217
+#: en/installer.xml:126
 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 ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:230
+#: en/installer.xml:138
 msgid "The Install Freezes"
 msgstr "L'installazione si blocca"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:232
+#: en/installer.xml:139
 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 ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:240
+#: en/installer.xml:146
 msgid "RAM problem"
 msgstr "Problema relativo alla RAM"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:242
+#: en/installer.xml:147
 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 ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:249
+#: en/installer.xml:154
 msgid "Dynamic partitions"
 msgstr "Partizioni dinamiche"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:251
+#: en/installer.xml:155
 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/installUpdates.xml:3
+#: en/installUpdates.xml:16
 msgid "Updates"
 msgstr "Aggiornamenti"
 
-#.  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 ""
@@ -2304,90 +2408,98 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:20
+#: en/installUpdates.xml:25
 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 ""
 
-#. 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
 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 ""
 
-#. 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 "Poi premi <guibutton>Avanti</guibutton> per continuare"
 
 #. type: Content of: <section><info><title>
-#: en/login.xml:1
-msgid "Login screen"
+#: en/login.xml:4
+msgid "Login Screen"
 msgstr ""
 
 #. 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
+msgid "SDDM login screen"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/login.xml:1
-msgid "Finally, you will come to the login screen."
+#: en/login.xml:14
+msgid "Finally, you will come to the desktop login screen."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/login.xml:1
+#: en/login.xml:15
 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 ""
 
 #. 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 ""
 "Puoi trovarli <link linkend=\"https://wiki.mageia.org/en/Category:"
 "Documentation\">qui</link>."
 
 #. type: Content of: <section><info><title>
-#: en/media_selection.xml:3
-msgid "Media Selection (Nonfree)"
-msgstr "Selezione media (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 "
@@ -2396,24 +2508,24 @@ msgid ""
 msgstr ""
 
 #. 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."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:32
+#: en/media_selection.xml:42
 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 ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:40
+#: en/media_selection.xml:50
 msgid ""
 "The <emphasis>Tainted</emphasis> repository includes packages released under "
 "a free license. The main criteria for placing packages in this repository is "
@@ -2428,56 +2540,57 @@ msgid "Minimal Install"
 msgstr "Installazione minimale"
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:11
+#: en/minimal-install.xml:17
 msgid ""
-"You can choose a Minimal Installation by de-selecting everything in the "
-"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"/>."
+"Minimal Installation is intended for those with specific uses in mind for "
+"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 ""
 
-#. type: Content of: <section><para>
-#: en/minimal-install.xml:14
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/minimal-install.xml:24
 msgid ""
-"If desired, you can additionally tick the <emphasis role=\"bold\">Individual "
-"package selection</emphasis> option in the same screen."
+"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 ""
 
-#. type: Content of: <section><para>
-#: en/minimal-install.xml:17
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/minimal-install.xml:28
 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"
-"\"/>."
+"If desired, you can additionally tick the <emphasis>Individual package "
+"selection</emphasis> option in the same screen."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/minimal-install.xml:22
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/minimal-install.xml:33
 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."
+"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 ""
 
-#. 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
 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 ""
 
 #. 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="
@@ -2490,25 +2603,32 @@ msgstr ""
 
 #. type: Content of: <section><info><title>
 #: en/misc-params.xml:3
-msgid "Summary of miscellaneous parameters"
-msgstr "Sommario di vari parametri"
+#, fuzzy
+msgid "Configuration Summary"
+msgstr "Configurazione audio"
 
 #.  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 fa scelte intelligenti per la configurazione del tuo sistema in base "
 "alle scelte da te fatte e dall'hardware che DrakX ha individuto. Puoi "
@@ -2516,43 +2636,43 @@ msgstr ""
 "<guibutton>Configura</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 "Parametri del sistema"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:45
-msgid "<guilabel>Timezone</guilabel>"
-msgstr "<guilabel>Fuso orario</guilabel>"
+#: en/misc-params.xml:54
+#, fuzzy
+msgid "<emphasis role=\"bold\">Timezone</emphasis>"
+msgstr "<emphasis>Venditore</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 ha automaticamente selezionato una time zone in base alla tua lingua. "
@@ -2560,12 +2680,13 @@ msgstr ""
 "\"configureTimezoneUTC\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:53
-msgid "<guilabel>Country / Region</guilabel>"
-msgstr "<guilabel>Paese / Regione</guilabel>"
+#: en/misc-params.xml:62
+#, fuzzy
+msgid "<emphasis role=\"bold\">Country / Region</emphasis>"
+msgstr "<emphasis>Venditore</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 "
@@ -2575,49 +2696,50 @@ msgstr ""
 "impostazioni. Guarda <xref linkend=\"selectCountry\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:62
-msgid "<guilabel>Bootloader</guilabel>"
-msgstr "<guilabel>Bootloader</guilabel>"
+#: en/misc-params.xml:70
+#, fuzzy
+msgid "<emphasis role=\"bold\">Bootloader</emphasis>"
+msgstr "<emphasis>Venditore</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 ha fatto buone scelte per le impostazioni del bootloader."
 
 #. 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 ""
 "Non cambiare nulla, a meno che tu non sappia come configurare Grub e/o Lilo"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:70
-msgid "For more information, see <xref linkend=\"setupBootloader\"/>"
-msgstr ""
-"Per ulteriori informazioni, consulta <xref linkend=\"setupBootloader\"/>"
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:75
-msgid "<guilabel>User management</guilabel>"
-msgstr "<guilabel>Gestione dell'utente</guilabel>"
+#: en/misc-params.xml:83
+#, fuzzy
+msgid "<emphasis role=\"bold\">User management</emphasis>"
+msgstr "<emphasis>Venditore</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 ""
 "Puoi aggiungere ulteriori utenti qua. Ognuno di loro avrà una sua cartella "
 "<literal>/home</literal>."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:84
-msgid "<guilabel>Services</guilabel>:"
-msgstr "<guilabel>Servizi</guilabel>:"
+#: en/misc-params.xml:91
+#, fuzzy
+msgid "<emphasis role=\"bold\">Services</emphasis>"
+msgstr "<emphasis>Venditore</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 "
@@ -2628,87 +2750,91 @@ msgstr ""
 "task."
 
 #. 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 ""
 "Dovresti controllare bene prima di cambiare qualcosa qua - un errore "
 "potrebbe impedire al tuo computer di lavorare correttamente."
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:94
-msgid "For more information, see <xref linkend=\"configureServices\"/>"
-msgstr ""
-"Per ulteriori informazioni, consulta <xref linkend=\"configureServices\"/>"
-
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:101
+#: en/misc-params.xml:106
 msgid "Hardware parameters"
 msgstr "Parametri dell'hardware"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:106
-msgid "<guilabel>Keyboard</guilabel>:"
-msgstr "<guilabel>Tastiera</guilabel>:"
+#: en/misc-params.xml:111
+#, fuzzy
+msgid "<emphasis role=\"bold\">Keyboard</emphasis>"
+msgstr "<emphasis>Venditore</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:108
+#: en/misc-params.xml:113
 msgid ""
 "Configure your keyboard layout according to your location, language and type "
 "of keyboard."
 msgstr ""
 
 #. 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>Mouse</guilabel>:"
+#: en/misc-params.xml:124
+#, fuzzy
+msgid "<emphasis role=\"bold\">Mouse</emphasis>"
+msgstr "<emphasis>Venditore</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."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:126
-msgid "<guilabel>Sound card</guilabel>:"
-msgstr "<guilabel>Scheda audio</guilabel>:"
+#: en/misc-params.xml:131
+#, fuzzy
+msgid "<emphasis role=\"bold\">Sound card</emphasis>"
+msgstr "<emphasis>Venditore</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:129
-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."
+#: en/misc-params.xml:133
+msgid "The installer will use the default driver if one is available."
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:137
-msgid "<guilabel>Graphical interface</guilabel>:"
-msgstr "<guilabel>Interfaccia grafica</guilabel>:"
+#. type: Content of: <section><section><para>
+#: en/misc-params.xml:136 en/soundConfig.xml:46
+msgid ""
+"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 ""
 
 #. 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."
-msgstr ""
+#: en/misc-params.xml:144
+#, fuzzy
+msgid "<emphasis role=\"bold\">Graphical interface</emphasis>"
+msgstr "<emphasis>Venditore</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:143
-msgid "For more information, see <xref linkend=\"configureX_chooser\"/>."
+#: 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 ""
 "Per ulteriori informazioni, consulta <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="
@@ -2719,22 +2845,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 "Parametri di rete e di Internet"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:163
-msgid "<guilabel>Network</guilabel>:"
-msgstr "<guilabel>Rete</guilabel>:"
+#: en/misc-params.xml:169
+#, fuzzy
+msgid "<emphasis role=\"bold\">Network</emphasis>"
+msgstr "<emphasis>Venditore</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 ""
 "Puoi configurare la tua rete qua, ma per le schede di rete con driver "
@@ -2742,22 +2869,24 @@ msgstr ""
 "Center</application> se non hai abilitato i repository Nonfree."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:172
+#: en/misc-params.xml:178
 msgid ""
 "When you add a network card, do not forget to set your firewall to monitor "
 "that interface as well."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:179
-msgid "<guilabel>Proxies</guilabel>:"
-msgstr "<guilabel>Proxy</guilabel>:"
+#: en/misc-params.xml:185
+#, fuzzy
+msgid "<emphasis role=\"bold\">Proxies</emphasis>"
+msgstr "<emphasis>Venditore</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 ""
 "Un Proxy Server si comporta come un intermediario fra il tuo computer e il "
@@ -2765,68 +2894,74 @@ msgstr ""
 "per utilizzare un servizio proxy."
 
 #. 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 ""
 "Potrebbe essere necessario consultare l'amministratore di sistema per "
 "ottenere i parametri che necessiti inserire qua"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:195
+#: en/misc-params.xml:201
 msgid "Security"
 msgstr "Sicurezza"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:200
-msgid "<guilabel>Security Level</guilabel>:"
-msgstr "<guilabel>Livello di sicurezza</guilabel>:"
+#: en/misc-params.xml:206
+#, fuzzy
+msgid "<emphasis role=\"bold\">Security Level</emphasis>"
+msgstr "<emphasis>Venditore</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 ""
 "Qua puoi impostare il livello di sicurezza per il tuo computer. Nella "
 "maggior parte dei casi l'impostazione di default (Standard) è adeguata per "
 "un uso generale."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:207
-msgid "Check the option which best suits your usage."
-msgstr "Spunta l'opzione che meglio si combina al tuo utilizzo."
+#: en/misc-params.xml:215
+#, fuzzy
+msgid "<emphasis role=\"bold\">Firewall</emphasis>"
+msgstr "<emphasis>Venditore</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 ""
-"Un firewall è inteso come una barriera fra i tuoi dati importanti e i "
-"mascalzoni in internet che potrebbero comprometterli o rubarli."
 
 #. 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\"/>."
+msgid "For more information, see <xref linkend=\"firewall\"/>."
 msgstr ""
-"Seleziona i servizi che desideri abbiano accesso al tuo sistema. Le tue "
-"selezioni dipendono dall'uso che fai del tuo computer."
+"Per ulteriori informazioni, consulta <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
+msgid ""
+"Bear in mind that allowing <emphasis>everything</emphasis> (no firewall) may "
+"be very risky."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -2835,31 +2970,43 @@ msgid "Reboot"
 msgstr "Riavvia"
 
 #. type: Content of: <section><para>
-#: en/reboot.xml:6
+#: en/reboot.xml:7
 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 ""
+
+#. 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-bootCSM.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
 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 ""
 
 #. 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-"
@@ -2889,47 +3036,53 @@ msgstr ""
 "installare <application>Mageia</application>."
 
 #. type: Content of: <section><info><title>
-#: en/securityLevel.xml:3
+#: en/securityLevel.xml:10
 msgid "Security Level"
 msgstr "Livello di sicurezza"
 
 #.  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=\"dx2-media_selection.png"
+"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-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>Venditore</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:19
+#: en/securityLevel.xml:29
+msgid ""
+"<emphasis>Standard</emphasis> is the default, and recommended setting for "
+"the average user."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:32
 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>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:24
+#: en/securityLevel.xml:36
 #, fuzzy
 msgid "<emphasis role=\"bold\">Security Administrator</emphasis>"
 msgstr "<emphasis>Venditore</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 "
@@ -2937,14 +3090,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 "
@@ -2952,80 +3105,128 @@ 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 ""
 "Dopo aver installato sarà sempre possibile modificare le tue impostazioni di "
 "sicurezza nella sezione <guilabel>Sicurezza</guilabel> del Mageia Control "
 "Center."
 
 #. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:6
+#: en/SelectAndUseISOs2.xml:15
 msgid "Select and use ISOs"
 msgstr "Seleziona e utilizza dei file ISO"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:9
+#: en/SelectAndUseISOs2.xml:18
 msgid "Introduction"
 msgstr "Introduzione"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:10
+#: en/SelectAndUseISOs2.xml:19
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
 "which image best suits your needs."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:12
-msgid "There are two families of media:"
+#: en/SelectAndUseISOs2.xml:21
+msgid "There are three types of installation media:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:15
+#: en/SelectAndUseISOs2.xml:24
 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 ""
 
 #. 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\">Le Live ISO possono solo essere utilizzate per "
+"un'installazione da zero. Non possono essere usate per aggiornare una "
+"precedente release.</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:47
+#, 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"
+"<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 ""
+"Ognuna è una piccola immagine che contiene non più del necessario per "
+"avviare l'installer Drakx e trovare drakx-installer-stage2 e altri pacchetti "
+"che sono necessari per continuare e completare l'installazione. Questi "
+"pacchetti possono essere nell'hard disk del pc, su di un disco locale, su un "
+"network locale o su internet."
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:53
+#, 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 ""
+"Questi media sono davvero leggeri (meno di 100 MB) e convenienti quando la "
+"connessione è troppo lenta per scaricare un intero DVD, quando si ha un PC "
+"senza DVD o un PC che non può eseguire il boot da una chiavetta USB."
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:27
-msgid "Details are given in the next sections."
+#: en/SelectAndUseISOs2.xml:58
+msgid "More details are given in the next sections."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:30
+#: en/SelectAndUseISOs2.xml:61
 msgid "Media"
 msgstr "Media"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:32
+#: en/SelectAndUseISOs2.xml:63
 msgid "Definition"
 msgstr "Definizione"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:33
+#: en/SelectAndUseISOs2.xml:64
 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 ""
 
 #. 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/"
@@ -3035,291 +3236,278 @@ msgstr ""
 "link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:39
+#: en/SelectAndUseISOs2.xml:70
 msgid "Classical installation media"
 msgstr "Media di installazione classico"
 
 #. 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 "Funzioni comuni"
 
 #. 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 "Queste ISO usano l'installer tradizionale chiamato 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 ""
 "Possono fare sia un'installazione pulita o un update da una release "
 "precedente."
 
 #. 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 "Diversi media per architetture a 32 o 64 bit."
 
 #. 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 ""
 "Alcuni strumenti sono disponibili nella schermata di benvenuto: Recupero di "
 "Sistema, Test della Memoria, Strumento di Identificazione Hardware."
 
 #. 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 "Ogni DVD contiene diversi desktop environments e lingue."
 
 #. 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 ""
 "Ti sarà data la possibilità, durante l'installazione, di aggiungere software "
 "non free."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:69
+#: en/SelectAndUseISOs2.xml:102
 msgid "Live media"
 msgstr "Media live"
 
 #. 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 ""
 "Può essere utilizzato per avere un'anteprima della distribuzione senza "
 "installarla su di un HDD avendo comunque la possibilità di farlo."
 
 #. 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)."
-msgstr "Ogni ISO contiene un solo desktop environment (KDE o GNOME)."
+#: en/SelectAndUseISOs2.xml:111
+msgid "The Live media also includes an Installer."
+msgstr ""
 
 #. 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>"
-msgstr ""
-"<emphasis role=\"bold\">Le Live ISO possono solo essere utilizzate per "
-"un'installazione da zero. Non possono essere usate per aggiornare una "
-"precedente release.</emphasis>"
+msgid "Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)"
+msgstr "Ogni ISO contiene un solo desktop environment (KDE o 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 "Contengono del software non libero."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:96
+#: en/SelectAndUseISOs2.xml:126
 #, fuzzy
 msgid "Live DVD Plasma"
 msgstr "DVD Live con 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 "Solamente l'ambiente KDE."
 
 #. 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 "Sono presenti tutte le lingue."
 
 #. 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 "Diversi media per architetture a 32 o 64 bit."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:110
+#: en/SelectAndUseISOs2.xml:140
 msgid "Live DVD GNOME"
 msgstr "DVD Live con 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 "Solamente l'ambiente GNOME."
 
-#. 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 "DVD Live con 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 "Solamente l'ambiente KDE."
 
 #. 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 "Diversi media per architetture a 32 o 64 bit."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:139
+#: en/SelectAndUseISOs2.xml:169
 #, fuzzy
 msgid "Net install media"
 msgstr "Media di installazione classico"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:144
-#, 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 ""
-"Ognuna è una piccola immagine che contiene non più del necessario per "
-"avviare l'installer Drakx e trovare drakx-installer-stage2 e altri pacchetti "
-"che sono necessari per continuare e completare l'installazione. Questi "
-"pacchetti possono essere nell'hard disk del pc, su di un disco locale, su un "
-"network locale o su internet."
-
-#. 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 ""
-"Questi media sono davvero leggeri (meno di 100 MB) e convenienti quando la "
-"connessione è troppo lenta per scaricare un intero DVD, quando si ha un PC "
-"senza DVD o un PC che non può eseguire il boot da una chiavetta USB."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:161
+#: en/SelectAndUseISOs2.xml:177
 #, fuzzy
-msgid "First steps are English language only."
+msgid "First steps are English language only"
 msgstr "Solamente la lingua inglese."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:166
+#: en/SelectAndUseISOs2.xml:182
 msgid "netinstall.iso"
 msgstr ""
 
 #. 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 ""
 "Contiene solo software libero per quelle persone che non vogliono usare "
 "software proprietario."
 
 #. 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 ""
 "Contiene software proprietario (in gran parte driver, codec...) per le "
 "persone che ne hanno bisogno."
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:186
+#: en/SelectAndUseISOs2.xml:202
 msgid "Downloading and Checking Media"
 msgstr "Scaricando e controllando il media"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:188
+#: en/SelectAndUseISOs2.xml:204
 msgid "Downloading"
 msgstr "Download in corso"
 
 #. 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 ""
 "Una volta che hai selezionato il file ISO puoi scaricarlo usando sia http "
 "che BitTorrent. In entrambi i casi una finestra vi darà le informazioni come "
 "il mirror in uso e la possibilità di cambiarlo se la velocità è troppo "
 "bassa. Se è stato scelto http potreste inoltre vedere qualcosa come"
 
+#. 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: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:191
-msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
+#: en/SelectAndUseISOs2.xml:217
+#, fuzzy
+msgid ""
+"<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:195
-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:"
+#: en/SelectAndUseISOs2.xml:222
+msgid "In the meantime, a window to download the actual ISO will open:"
 msgstr ""
 
 #. 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 "Controllando l'integrità del media scaricato."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:208
+#: en/SelectAndUseISOs2.xml:235
 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 ""
 
 #. 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 "
@@ -3327,76 +3515,87 @@ msgid ""
 msgstr "Aprire la console, senza obbligo di essere root, e:"
 
 #. 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 ""
 "- Per usare md5sum digitare: [sam@localhost]$ <userinput>md5sum path/to/the/"
 "image/file.iso</userinput>."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:222
+#: en/SelectAndUseISOs2.xml:249
+#, fuzzy
+msgid ""
+"To use the sha1sum, type: <command>sha1sum path/to/the/image/file.iso</"
+"command>"
+msgstr ""
+"- Per usare sha1susm digitare: [sam@localhost]$ <userinput>sha1sum path/to/"
+"the/image/file.iso</userinput>."
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:254
 #, fuzzy
 msgid ""
-"To use sha1sum, type: <userinput>sha1sum path/to/the/image/file.iso</"
-"userinput>"
+"To use the sha512sum, type: <command>sha512sum path/to/the/image/file.iso</"
+"command>"
 msgstr ""
 "- Per usare sha1susm digitare: [sam@localhost]$ <userinput>sha1sum path/to/"
 "the/image/file.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 ""
 "e comparate il numero ottenuto a computer (potrebbe essere necessario "
 "attendere un poco) a quello dato da Mageia. Per esempio:"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:237
+#: en/SelectAndUseISOs2.xml:270
 msgid "Burn or dump the ISO"
 msgstr "Masterizza o esegui un dump dell'ISO"
 
 #. 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 ""
 "L'ISO controllata può essere masterizzata su un CD o un DVD o dumpata su di "
 "una chiavetta USB. Queste operazioni non sono una semplice copia e puntano e "
 "creare un media avviabile."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:275
 msgid "Burning the ISO to a CD/DVD"
 msgstr "Masterizzando la ISO su di un 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 ""
 "Usa qualsiasi programma di masterizzazione che desideri, ma assicurati che "
 "il dispositivo sia correttamente impostato in <emphasis role=\"bold"
@@ -3405,45 +3604,54 @@ msgstr ""
 "Writing_CD_and_DVD_images\">wiki di Mageia</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 "Esegui il dump di una ISO su di una chiavetta USB."
 
 #. 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 ""
 "Tutte le ISO di Mageia sono ibride il che significa che puoi 'dumparle' in "
 "una chiavetta USB e usarle per avviare e installare il sistema."
 
 #. 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 ""
 "\"dumpare\" un'immagine in un flash drive distrugge ogni precedente file-"
 "system su quel dispositivo; ogni altro dato verrà perso e la capacità della "
 "partizione ridotta alla grandezza dell'immagine del disco."
 
-#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:256
+#. type: Content of: <section><section><section><note><para>
+#: en/SelectAndUseISOs2.xml:290
+msgid ""
+"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 ""
-"To recover the original capacity, you must redo partitioning and re-format "
-"the USB stick."
+"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 ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:259
+#: en/SelectAndUseISOs2.xml:299
 msgid "Using a graphical tool within Mageia"
 msgstr ""
 
 #. 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>"
@@ -3452,24 +3660,24 @@ 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 ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:304
 msgid "You could try:"
 msgstr "Potresti provare:"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:267
+#: en/SelectAndUseISOs2.xml:307
 msgid ""
 "<link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using the "
-"\"ISO image\" option;"
+"\"ISO image\" option"
 msgstr ""
 
 #. 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 "
@@ -3479,74 +3687,82 @@ 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
+msgid "Using the Command line within a GNU/Linux system"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:279
+#: en/SelectAndUseISOs2.xml:319
 msgid ""
 "It is potentially *dangerous* to do this by hand. You risk overwriting "
 "potentially valuable existing data if you specify the wrong target device."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:325
 msgid "Open a console"
 msgstr "Apri una console"
 
 #. 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 ""
 "Diventa root con il comando <userinput>su -</userinput> (non dimenticare la "
 "'-' finale)"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:291
-msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
+#: en/SelectAndUseISOs2.xml:332
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"Root.png\"/> </"
+"imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Root.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 ""
 "Collega la tua chiavetta USB (non montarla, questo significa anche non "
 "aprire alcuna applicazione o file manager che può averne accesso o leggerla)."
 
 #. 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 "Inserisci il comando <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>"
+#: en/SelectAndUseISOs2.xml:345
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"Fdisk.png\"/> </"
+"imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:310
+#: en/SelectAndUseISOs2.xml:351
 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 ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:312
+#: en/SelectAndUseISOs2.xml:354
 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 ""
 
 #. 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"
@@ -3570,53 +3786,57 @@ msgid ""
 msgstr ""
 
 #. 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 ""
 "Inserisci il comando: # <userinput>dd if=path/to/the/ISO/file 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 "Dove X = nome del tuo dispositivo esempio: /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 ""
 "Esempio: # <userinput>dd if=/home/user/Downloads/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 "Inserire il comando: # <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 ""
 
@@ -3626,8 +3846,10 @@ msgid "Select your Country / Region"
 msgstr "Seleziona il tuo paese/regione"
 
 #.  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="
@@ -3637,32 +3859,31 @@ 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
 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 ""
 
-#. 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 ""
 "Se il tuo Paese non è nella lista premi sul pulsante <guilabel>Altri Paesi</"
 "guilabel> e seleziona il tuo Stato / Regione."
 
 #. 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 ""
 "Se il tuo Paese si trova solo nella lista <guilabel>Altri Paesi</guilabel> "
 "dopo aver cliccato <guilabel>OK</guilabel> potrebbe sembrare che sia stato "
@@ -3670,14 +3891,14 @@ msgstr ""
 "scelta reale."
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:33
+#: en/selectCountry.xml:42
 msgid "Input method"
 msgstr "Metodo di input"
 
 #. type: Content of: <section><section><para>
-#: en/selectCountry.xml:36
+#: en/selectCountry.xml:45
 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. "
@@ -3686,63 +3907,69 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/selectCountry.xml:45
+#: en/selectCountry.xml:54
 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/selectInstallClass.xml:14
+#: en/selectInstallClass.xml:29
 msgid "Install or Upgrade"
 msgstr "Installa o aggiorna"
 
 #. 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 "Installa"
+#: en/selectInstallClass.xml:41
+#, fuzzy
+msgid "<emphasis role=\"bold\">Install</emphasis>"
+msgstr "<emphasis>Venditore</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 "Aggiorna"
+#: en/selectInstallClass.xml:50
+#, fuzzy
+msgid "<emphasis role=\"bold\">Upgrade</emphasis>"
+msgstr "<emphasis>Venditore</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 ""
+"Usa questa opzione per un'installazione pulita di <application>Mageia</"
+"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 ""
 "Solo l'aggiornamento da versioni precedenti di Mageia che erano "
 "<emphasis>ancora supportate</emphasis> quando la versione dell'installer è "
@@ -3751,37 +3978,15 @@ msgstr ""
 "al momento del rilascio è meglio eseguire una nuova installazione "
 "preservando la partizione <literal>/home</literal>"
 
-#. 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 ""
-"Se durante l'installazione decidi di terminarla è possibile eseguire un "
-"reboot, ma per favore pensaci due volte prima di farlo. Una volta che una "
-"partizione è stata formattata o l'update ha iniziato a installare il tuo "
-"computer non è più nello stesso stato e riavviarlo può condurre con buone "
-"probabilità ad un sistema inutilizzabile. Nel caso in cui tu sia davvero "
-"sicuro che il riavvio sia ciò che desideri apri un terminale premendo i tre "
-"tasti <guilabel>Alt Ctrl F2</guilabel> contemporaneamente. Dopo, premere "
-"insieme <guilabel>Alt Ctrl Delete</guilabel> per riavviare."
-
 #. 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 ""
 "Se hai scoperto di aver dimenticato di selezionare una lingua addizionale "
 "puoi tornare dalla schermata \"Installa o aggiorna\" alla scelta della "
@@ -3789,33 +3994,42 @@ msgstr ""
 "farlo successivamente durante l'installazione."
 
 #. type: Content of: <section><info><title>
-#: en/selectKeyboardLive.xml:3
-msgid "Select keyboard"
-msgstr ""
+#: en/selectKeyboardLive.xml:14
+#, fuzzy
+msgid "Select Keyboard"
+msgstr "Tastiera"
 
 #. 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 align=\"center\" fileref=\"dx2-media_selection.png"
+"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><para>
+#: 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:12
+#: 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/selectKeyboard.xml:7
+#: en/selectKeyboard.xml:20
 msgid "Keyboard"
 msgstr "Tastiera"
 
 #. 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."
@@ -3824,17 +4038,17 @@ msgstr ""
 "tastiera adatta non viene trovata verrà impostato di default il layout US."
 
 #. 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-selectKeyboard.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 "
@@ -3851,24 +4065,24 @@ msgstr ""
 "Keyboard_layout\">en.wikipedia.org/wiki/Keyboard_layout</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 ""
 "Se la tua tastiera non è nella lista mostrata premi su <guibutton>Altro</"
 "guibutton> per avere una lista completa e seleziona quindi il tuo layout."
 
-#. 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 ""
 "Dopo aver scelto un layout dalla schermata <guibutton>Altro</guibutton> "
 "tornerai alla prima schermata di dialogo e sembrerà che la tastiera "
@@ -3877,7 +4091,7 @@ msgstr ""
 "completa."
 
 #. 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 "
@@ -3889,84 +4103,82 @@ msgstr ""
 "caratteri latini e non-latini."
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:15
+#: en/selectLanguage.xml:34
 msgid "Please choose a language to use"
 msgstr "Scegli una lingua da utilizzare"
 
-#. type: Content of: <section><para>
-#: en/selectLanguage.xml:18
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectLanguage.xml:39
 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 ""
 
-#. type: Content of: <section><para>
-#: en/selectLanguage.xml:23
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectLanguage.xml:45
 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 ""
 
-#. type: Content of: <section><para>
-#: en/selectLanguage.xml:27
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectLanguage.xml:50
 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 ""
 
 #. 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 fileref=\"dx2-"
 "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
-#. type: Content of: <section><warning><para>
-#: en/selectLanguage.xml:43
+#. type: Content of: <section><important><para>
+#: en/selectLanguage.xml:68
 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 ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:50
+#: en/selectLanguage.xml:76
 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."
-msgstr ""
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:56
-msgid "Mageia uses UTF-8 (Unicode) support by default."
+"it is advisable to install the required language for your keyboard as well"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:58
+#: en/selectLanguage.xml:82
 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 ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:64
+#: en/selectLanguage.xml:89
 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/selectMouse.xml:4
+#: en/selectMouse.xml:10
 msgid "Select mouse"
 msgstr "Seleziona il mouse"
 
@@ -3974,17 +4186,19 @@ msgstr "Seleziona il mouse"
 #.  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-selectKeyboard.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."
@@ -3993,26 +4207,29 @@ msgstr ""
 "diverso qua."
 
 #. 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 ""
 "Di solito, <guilabel>Universal</guilabel> - <guilabel>Ogni PS/2 e USB mouse</"
 "guilabel> è una buona scelta."
 
 #. 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 ""
 "Seleziona <guilabel>Universal</guilabel> - <guilabel>Force evdev</guilabel> "
 "per configurare i pulsanti che non funzionano su un mouse con sei o più "
 "pulsanti."
 
-#. 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 "Aggiungi o modifica una Boot Menu Entry"
 
@@ -4037,318 +4254,384 @@ msgstr ""
 "How_to_set_up_kernel_options</link>"
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:7
-msgid "Bootloader main options"
-msgstr "Opzioni principali del bootloader"
-
-#. type: Content of: <section><section><title>
 #: en/setupBootloader.xml:10
 #, fuzzy
-msgid "Bootloader interface"
+msgid "Bootloader"
 msgstr "Opzioni principali del bootloader"
 
-#. 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><title>
+#: en/setupBootloader.xml:15
+msgid "Grub2 on Legacy MBR/GPT systems"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:14
+#: en/setupBootloader.xml:17
 msgid ""
-"GRUB2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
+"GRUB2 (with or without graphical menu) will be used exclusively as the "
+"bootloader for a Legacy/MBR or Legacy/GPT system."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:18
-msgid "GRUB2-efi for a UEFI system."
+#: en/setupBootloader.xml:21
+msgid ""
+"By default, a new bootloader will be written into either the MBR (Master "
+"Boot Record) of your first hard drive or in the BIOS boot partition."
 msgstr ""
 
-#. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:22
-msgid "The Mageia graphical menus are nice :)"
+#. type: Content of: <section><section><itemizedlist><title>
+#: en/setupBootloader.xml:27
+msgid "Grub2-efi on UEFI systems"
 msgstr ""
 
-#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:25
-msgid "GRUB2 on Legacy/MBR and Legacy/GPT systems"
+#. 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 ""
 
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:27
-#, fuzzy
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:33
 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>"
+"By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI "
+"System Partition)."
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:34 en/setupBootloader.xml:56
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:35
 msgid ""
-"Don't modify the <emphasis role=\"bold\">Boot Device</emphasis> unless you "
-"really know what you are doing."
+"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 ""
 
-#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:38
-msgid "GRUB2-efi on UEFI systems"
-msgstr ""
+#. type: Content of: <section><section><info><title>
+#: en/setupBootloader.xml:46
+#, fuzzy
+msgid "Bootloader Setup"
+msgstr "Opzioni principali del bootloader"
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:39
-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 ""
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:49
+msgid "Bootloader main options"
+msgstr "Opzioni principali del bootloader"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:42
+#: en/setupBootloader.xml:51
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
-"imageobject>"
+"<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-"
 "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:49
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:62
+#, fuzzy
+msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
+msgstr "<emphasis>Venditore</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:63
 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."
+"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><title>
-#: en/setupBootloader.xml:61
-msgid "Using a Mageia bootloader"
-msgstr ""
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:67
+#, fuzzy
+msgid "<emphasis role=\"bold\">Boot device</emphasis>"
+msgstr "<emphasis>Venditore</emphasis>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:62
+#. 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 "Cambia le cose solo quando sai veramente bene cosa stai facendo."
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:72
+#, fuzzy
 msgid ""
-"By default, and according to your system, Mageia writes one of the following:"
+"<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
+msgstr "<emphasis>Venditore</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><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:66
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:78
+#, fuzzy
+msgid "<emphasis role=\"bold\">Security</emphasis>"
+msgstr "<emphasis>Venditore</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:79
 msgid ""
-"a GRUB2 bootloader either into the MBR (Master Boot Record) of your first "
-"hard drive or in the BIOS boot partition."
+"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 ""
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:70
-msgid "a GRUB2-efi bootloader into the ESP"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:88
+msgid "Choose a password for the bootloader (optional)"
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:73
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:91
+#, fuzzy
+msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
+msgstr "<emphasis>Venditore</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:92
 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."
+"Retype the password and DrakX will check that it matches with the one set "
+"above"
 msgstr ""
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:78
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:96 en/setupBootloader.xml:154
+#, fuzzy
+msgid "<emphasis>Advanced</emphasis>"
+msgstr "<emphasis>Venditore</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:99
 #, fuzzy
+msgid "<emphasis>Enable ACPI</emphasis>"
+msgstr "<emphasis>Generico</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:100
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata fileref=\"live-setupBootloader3.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-"
-"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:87
-msgid "Using an existing bootloader"
-msgstr "Usare un bootloader esistente"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:108
+#, fuzzy
+msgid "<emphasis>Enable SMP</emphasis>"
+msgstr "<emphasis>Generico</emphasis>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:88
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:109
 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."
+"This option enables/disables symmetric multiprocessing for multi-core "
+"processors"
 msgstr ""
 
-#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:95
-msgid "Using chain loading"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:113
+#, fuzzy
+msgid "<emphasis>Enable APIC</emphasis>"
+msgstr "<emphasis>Generico</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:114
+msgid ""
+"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 ""
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:96
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:120
+#, fuzzy
+msgid "<emphasis>Enable Local APIC</emphasis>"
+msgstr "<emphasis>Generico</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:121
 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>."
+"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><mediaobject>
-#: en/setupBootloader.xml:101
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:127
+#, fuzzy
+msgid "Bootloader Configuration"
+msgstr "Configurazione audio"
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:129
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-setupBootloader4.png\" align="
-"\"center\"/> </imageobject>"
+"<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-"
 "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:108
-msgid ""
-"You will get a warning that the bootloader is missing, ignore it by clicking "
-"<guibutton>OK</guibutton>."
-msgstr ""
-
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:111
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:139
 #, fuzzy
-msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
-"imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+msgid "<emphasis role=\"bold\">Default</emphasis>"
+msgstr "<emphasis>Venditore</emphasis>"
 
-#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:117
-msgid "Options"
+#. 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><title>
-#: en/setupBootloader.xml:119
-msgid "First page"
-msgstr ""
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:143
+#, fuzzy
+msgid "<emphasis role=\"bold\">Append</emphasis>"
+msgstr "<emphasis>Venditore</emphasis>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:120
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:144
 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."
+"This option lets you pass information to the kernel or tell the kernel to "
+"give you more information as it boots"
 msgstr ""
 
-#. type: Content of: <section><section><section><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:148
+#, fuzzy
+msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
+msgstr "<emphasis>Venditore</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:149
+msgid ""
+"If you already have other operating systems installed, Mageia attempts to "
+"add them to your new Mageia boot menu. If you don't want this behaviour, "
+"then untick the Probe Foreign OS option."
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:126
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:156
+#, fuzzy
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the password and DrakX will "
-"check that it matches with the one above."
+"<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-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:127 en/setupBootloader.xml:159
+#: en/setupBootloader.xml:166
 #, fuzzy
-msgid "<guilabel>Advanced</guilabel>"
-msgstr "<guilabel>Servizi</guilabel>:"
+msgid "<emphasis>Video mode</emphasis>"
+msgstr "<emphasis>Venditore</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:167
 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)."
+"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:133
-msgid ""
-"<guilabel>Enable SMP</guilabel>: This option enables/disables symmetric "
-"multiprocessing for multi core processors."
-msgstr ""
+#. 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>Venditore</emphasis>"
 
-#. 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:173
 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."
+"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><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:138
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:181
+#, fuzzy
 msgid ""
-"<guilabel>Enable Local APIC</guilabel>: Local APIC manages all external "
-"interrupts for a specific processor in an SMP system."
+"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align=\"center"
+"\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:188
+msgid "Other Options"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:143
-msgid "Next page"
-msgstr ""
+#: en/setupBootloader.xml:190
+msgid "Using an existing bootloader"
+msgstr "Usare un bootloader esistente"
 
-#. 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><section><para>
+#: en/setupBootloader.xml:191
+msgid ""
+"The exact procedure for adding Mageia to an existing bootloader is beyond "
+"the scope of this documentation. However in most cases it will involve "
+"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 ""
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:150
-msgid ""
-"<guilabel>Append:</guilabel> This option lets you pass the kernel "
-"information or tell the kernel to give you more information as it boots."
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:199
+msgid "Installing Without a Bootloader"
 msgstr ""
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:155
+#. 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 ""
+"Per maggiori informazioni riguardo le opzioni del kernel su sistemi legacy e "
+"UEFI visitare: <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 "Installa SCSI"
 
@@ -4360,18 +4643,21 @@ msgstr "Installa 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=\"dx2-media_selection.png"
+"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-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 "
@@ -4384,85 +4670,61 @@ msgstr ""
 "l'hard disk."
 
 #. 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 ""
 "Se dovesse accadere, dovrai dire manualmente a Drakx quale SCSI drive "
 "possiedi."
 
-#. type: Content of: <section><para>
-#: en/setupSCSI.xml:35
-msgid "DrakX should then be able to configure the drive(s) correctly."
-msgstr "DrakX dovrebbe essere in grado di configurare il drive correttamente."
-
 #. type: Content of: <section><info><title>
-#: en/soundConfig.xml:3
+#: en/soundConfig.xml:10
 msgid "Sound Configuration"
 msgstr "Configurazione audio"
 
 #.  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>"
-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
-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."
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-soundConfig.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"soundConfig-im1\"/> </imageobject>"
 msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
+"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><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 ""
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:24
+#: 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 ""
 
 #. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:30
+#: en/soundConfig.xml:43
 msgid "Advanced"
 msgstr "Avanzato"
 
-#. type: Content of: <section><section><para>
-#: en/soundConfig.xml:33
-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 ""
-
-#. type: Content of: <section><section><para>
-#: en/soundConfig.xml:38
-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 ""
-
 #. type: Content of: <section><info><title>
-#: en/takeOverHdConfirm.xml:3
+#: en/takeOverHdConfirm.xml:10
 msgid "Confirm hard disk to be formatted"
 msgstr "Conferma l'hard disk per essere formattato."
 
@@ -4472,145 +4734,150 @@ msgstr "Conferma l'hard disk per essere formattato."
 #.     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=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </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 ""
 "Clicca su <guibutton>Precedente</guibutton> se non sei sicuro della tua "
 "scelta."
 
-#. 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 ""
 "Clicca su <guibutton>Sucessivo</guibutton> se sei sicuro e vuoi cancellare "
 "ogni partizione, ogni sistema operativo e ogni file da quell'hard disk."
 
 #. type: Content of: <section><info><title>
-#: en/testing.xml:9
+#: en/testing.xml:3
 msgid "Testing Mageia as Live system"
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/testing.xml:14
+#: en/testing.xml:8
 msgid "Live mode"
 msgstr ""
 
-#. type: Content of: <section><section><mediaobject>
-#: en/testing.xml:18
-msgid "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
-msgstr ""
-
 #. type: Content of: <section><section><para>
-#: en/testing.xml:23
+#: en/testing.xml:11
 msgid ""
-"You get this screen if you selected \"Boot Mageia\". If not, you get the "
-"\"<link linkend=\"doPartitionDisks\">Partitioning</link> step\""
+"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:14
+msgid "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><info><title>
-#: en/testing.xml:28
+#: en/testing.xml:21
 msgid "Testing hardware"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/testing.xml:31
+#: en/testing.xml:24
 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 ""
 
 #. 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 ""
 
 #. 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
+msgid "graphics card: if you see the previous screen, it's already OK."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:47
+#: en/testing.xml:40
 msgid "webcam:"
 msgstr ""
 
 #. 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 ""
 
 #. 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
+msgid "printer: configure your printer/s and print a test page"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:59
+#: en/testing.xml:52
 msgid "scanner: scan a document from ..."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/testing.xml:63
+#: en/testing.xml:56
 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 ""
 
-#. 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
+msgid ""
+"The configuration settings you apply here are carried over if you decide to "
+"proceed with the installation."
 msgstr ""
 
 #. type: Content of: <section><section><section><info><title>
-#: en/testing.xml:72
+#: en/testing.xml:68
 msgid "Launch installation"
 msgstr ""
 
-#. type: Content of: <section><section><section><mediaobject>
-#: en/testing.xml:76
+#. type: Content of: <section><section><section><para>
+#: en/testing.xml:71
 msgid ""
-"<imageobject> <imagedata fileref=\"live-liveMode-install.png\"/> </"
-"imageobject>"
+"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 ""
 
-#. type: Content of: <section><section><section><para>
-#: en/testing.xml:81
+#. type: Content of: <section><section><section><mediaobject>
+#: en/testing.xml:77
 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."
+"<imageobject> <imagedata fileref=\"live-liveMode-install.png\"/> </"
+"imageobject>"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/uninstall-Mageia.xml:3
+#: en/uninstall-Mageia.xml:10
 msgid "Uninstalling Mageia"
 msgstr "Disinstallare Mageia"
 
 #. 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 "
@@ -4623,13 +4890,13 @@ msgstr ""
 "accade per ogni sistema operativo."
 
 #. 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 ""
 "Dopo aver eseguito un backup dei tuoi dati, riavvia il tuo DVD di Mageia e "
 "seleziona Recupero sistema, quindi, Recupera boot loader di Windows. Al "
@@ -4637,25 +4904,28 @@ msgstr ""
 "sistema operativo."
 
 #. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:19
+#: en/uninstall-Mageia.xml:28
 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 ""
 
 #. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:27
+#: en/uninstall-Mageia.xml:46
 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 ""
 
 #. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:30
+#: en/uninstall-Mageia.xml:49
 msgid ""
 "If you have Vista or 7, you have one more possibility, you can extend the "
 "existing partition that is at the left of the freed space. There are other "
@@ -4665,28 +4935,45 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/unused.xml:9
+#: en/unused.xml:3
 msgid "Keep or delete unused material"
 msgstr ""
 
+#. 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 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
 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 ""
+
+#. 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>"
@@ -4695,12 +4982,449 @@ msgstr ""
 "> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/unused.xml:30
+#: en/unused.xml:31
 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 ""
 
+#~ msgid "User and Superuser Management"
+#~ msgstr "Gestione dell'utente e del superuser"
+
+#, fuzzy
+#~ msgid ""
+#~ "Every partition is shown to the left as: <emphasis role=\"bold\">Device "
+#~ "(capacity, mount point, type).</emphasis>"
+#~ msgstr ""
+#~ "Ogni partizione è mostrata come segue: \"Dispositivo\" (\"Capacità\", "
+#~ "\"Mount point\", \"Tipo\")"
+
+#~ msgid ""
+#~ "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
+#~ msgstr ""
+#~ "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
+
+#, fuzzy
+#~ msgid "The settings DrakX chose are usually good."
+#~ msgstr "Le impostazioni che sceglie DrakX sono generalmente buone."
+
+#, 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 ""
+#~ "<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>Scheda video</guibutton></emphasis>: Scegli la tua "
+#~ "scheda video dalla lista se necessario."
+
+#~ msgid "Incorrect refresh rates may damage your monitor"
+#~ msgstr "Una refresh rate scorretta potrebbe danneggiare il 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>Personalizzatp</emphasis>"
+
+#~ msgid "<emphasis>Plug 'n Play</emphasis>"
+#~ msgstr "<emphasis>Plug 'n Play</emphasis>"
+
+#~ msgid "the monitor manufacturers name"
+#~ msgstr "Il nome del produttore del monitor"
+
+#~ msgid "the monitor description"
+#~ msgstr "la descrizione del monitor"
+
+#, 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-"
+#~ "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+
+#~ msgid "Click <guibutton>Done</guibutton> when you're ready."
+#~ msgstr "Quando hai completato premi <guibutton>Finito</guibutton> "
+
+#, 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-"
+#~ "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+
+#~ msgid "Use Free Space"
+#~ msgstr "Utilizza lo spazio libero"
+
+#~ msgid "Use Free Space on a Windows Partition"
+#~ msgstr "Usa lo spazio libero di una partizione Windows"
+
+#~ msgid ""
+#~ "If you have unused space on an existing Windows partition, the installer "
+#~ "may offer to use it."
+#~ msgstr ""
+#~ "Se hai dello spazio libero su di una partizione Windows esistente "
+#~ "l'installer potrebbe offrirti di utilizzarla."
+
+#, 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-"
+#~ "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+
+#~ msgid "Erase and use Entire Disk."
+#~ msgstr "Formatta e utilizza tutto il disco"
+
+#~ msgid ""
+#~ "Note! This will erase ALL data on the selected hard drive. Take care!"
+#~ msgstr ""
+#~ "Nota bene! Questo cancellerà TUTTI i dati sull'hard drive selezionato. "
+#~ "Fai attenzione!"
+
+#, fuzzy
+#~ msgid "Custom disk partitioning"
+#~ msgstr "Partizionamento personalizzato con DiskDrake"
+
+#, 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-"
+#~ "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid "Using a Mageia DVD"
+#~ msgstr "Disinstallare Mageia"
+
+#, 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 ""
+#~ "Ecco le schermate di benvenuto quanddo si utilizza una DVD di Mageia. La "
+#~ "prima è con un sistema legacy, la seconda con un sistema UEFI."
+
+#, 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 "Usa le frecce per scegliere la lingua e premi il tasto Invio."
+
+#, 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 "- Default, non cambia niente nelle opzioni di default."
+
+#, 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 ""
+#~ "Premendo F1 si aprirà una finestra con ulteriori opzioni disponibili. "
+#~ "Selezionarne una con le frecce e premere Invio per avere maggiori "
+#~ "dettagli o premere Esc per tornare indietro alla schermata di benvenuto."
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/"
+#~ "> </imageobject>"
+
+#, 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 "L'aiuto viene tradotto nella lingua scelta con il tasto 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 ""
+#~ "Per maggiori informazioni riguardo le opzioni del kernel su sistemi "
+#~ "legacy e UEFI visitare: <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 "Selezione media (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 "Sommario di vari parametri"
+
+#~ msgid "<guilabel>Timezone</guilabel>"
+#~ msgstr "<guilabel>Fuso orario</guilabel>"
+
+#~ msgid "<guilabel>Country / Region</guilabel>"
+#~ msgstr "<guilabel>Paese / Regione</guilabel>"
+
+#~ msgid "<guilabel>Bootloader</guilabel>"
+#~ msgstr "<guilabel>Bootloader</guilabel>"
+
+#~ msgid "For more information, see <xref linkend=\"setupBootloader\"/>"
+#~ msgstr ""
+#~ "Per ulteriori informazioni, consulta <xref linkend=\"setupBootloader\"/>"
+
+#~ msgid "<guilabel>User management</guilabel>"
+#~ msgstr "<guilabel>Gestione dell'utente</guilabel>"
+
+#~ msgid "<guilabel>Services</guilabel>:"
+#~ msgstr "<guilabel>Servizi</guilabel>:"
+
+#~ msgid "For more information, see <xref linkend=\"configureServices\"/>"
+#~ msgstr ""
+#~ "Per ulteriori informazioni, consulta <xref linkend=\"configureServices\"/>"
+
+#~ msgid "<guilabel>Keyboard</guilabel>:"
+#~ msgstr "<guilabel>Tastiera</guilabel>:"
+
+#~ msgid "<guilabel>Mouse</guilabel>:"
+#~ msgstr "<guilabel>Mouse</guilabel>:"
+
+#~ msgid "<guilabel>Sound card</guilabel>:"
+#~ msgstr "<guilabel>Scheda audio</guilabel>:"
+
+#~ msgid "<guilabel>Graphical interface</guilabel>:"
+#~ msgstr "<guilabel>Interfaccia grafica</guilabel>:"
+
+#~ msgid "<guilabel>Network</guilabel>:"
+#~ msgstr "<guilabel>Rete</guilabel>:"
+
+#~ msgid "<guilabel>Proxies</guilabel>:"
+#~ msgstr "<guilabel>Proxy</guilabel>:"
+
+#~ msgid "<guilabel>Security Level</guilabel>:"
+#~ msgstr "<guilabel>Livello di sicurezza</guilabel>:"
+
+#~ msgid "Check the option which best suits your usage."
+#~ msgstr "Spunta l'opzione che meglio si combina al tuo utilizzo."
+
+#~ 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 ""
+#~ "Un firewall è inteso come una barriera fra i tuoi dati importanti e i "
+#~ "mascalzoni in internet che potrebbero comprometterli o rubarli."
+
+#, 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 ""
+#~ "Seleziona i servizi che desideri abbiano accesso al tuo sistema. Le tue "
+#~ "selezioni dipendono dall'uso che fai del tuo computer."
+
+#, 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>"
+
+#~ msgid "Install"
+#~ msgstr "Installa"
+
+#~ msgid "Upgrade"
+#~ msgstr "Aggiorna"
+
+#, 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 ""
+#~ "Se durante l'installazione decidi di terminarla è possibile eseguire un "
+#~ "reboot, ma per favore pensaci due volte prima di farlo. Una volta che una "
+#~ "partizione è stata formattata o l'update ha iniziato a installare il tuo "
+#~ "computer non è più nello stesso stato e riavviarlo può condurre con buone "
+#~ "probabilità ad un sistema inutilizzabile. Nel caso in cui tu sia davvero "
+#~ "sicuro che il riavvio sia ciò che desideri apri un terminale premendo i "
+#~ "tre tasti <guilabel>Alt Ctrl F2</guilabel> contemporaneamente. Dopo, "
+#~ "premere insieme <guilabel>Alt Ctrl Delete</guilabel> per riavviare."
+
+#~ 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 ""
+#~ "<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 fileref=\"dx2-"
+#~ "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+
+#, 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-"
+#~ "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata fileref=\"live-setupBootloader2.png\"/> </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-"
+#~ "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid "<guilabel>Advanced</guilabel>"
+#~ msgstr "<guilabel>Servizi</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 dovrebbe essere in grado di configurare il drive correttamente."
+
+#, 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 ""
+#~ "<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=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+
 #~ msgid "Additionally, you can disable or enable a guest account."
 #~ msgstr "Inoltre, puoi disattivare o attivare un account speciale."
 
@@ -4766,23 +5490,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 ""
-#~ "C'è una tab per ogni hard disk individuato o altro dispositivo di storage "
-#~ "(come, per esempio, una chiavetta usb). Per esempio sda, sdb e sdc se ce "
-#~ "ne sono tre."
-
 #, fuzzy
 #~ msgid ""
 #~ "<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
@@ -4844,15 +5551,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 ""
 #~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png"
 #~ "\" align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></"
 #~ "imagedata> </imageobject>"
@@ -4895,13 +5593,6 @@ msgstr ""
 #~ "\"center\" format=\"PNG\"></imagedata> </imageobject>"
 
 #~ msgid ""
-#~ "Use this option for a fresh <application>Mageia</application> "
-#~ "installation."
-#~ msgstr ""
-#~ "Usa questa opzione per un'installazione pulita di <application>Mageia</"
-#~ "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."
@@ -4933,9 +5624,6 @@ msgstr ""
 #~ "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
 #~ "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
-#~ msgid "Custom"
-#~ msgstr "Personalizzato"
-
 #~ msgid ""
 #~ "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" "
 #~ "align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </"
diff --git a/docs/docs/stable/installer/ja.po b/docs/docs/stable/installer/ja.po
index ce3e98d6..8a9e5964 100644
--- a/docs/docs/stable/installer/ja.po
+++ b/docs/docs/stable/installer/ja.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2018-04-19 16:32+0300\n"
+"POT-Creation-Date: 2019-01-06 12:43+0200\n"
 "PO-Revision-Date: 2018-06-15 13:37+0000\n"
 "Last-Translator: Masanori Kakura <kakurasan@gmail.com>\n"
 "Language-Team: Japanese (http://www.transifex.com/MageiaLinux/mageia/"
@@ -23,12 +23,12 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. type: Content of: <section><info><title>
-#: en/acceptLicense.xml:25
+#: en/acceptLicense.xml:31
 msgid "License and Release Notes"
 msgstr "使用許諾契約とリリース ノート"
 
 #. type: Content of: <section><mediaobject>
-#: en/acceptLicense.xml:29
+#: en/acceptLicense.xml:35
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
 "\"acceptLicense-im1\" fileref=\"dx2-license.png\" align=\"center\" revision="
@@ -43,80 +43,88 @@ msgstr ""
 "\"center\" condition=\"live\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/acceptLicense.xml:40
+#: en/acceptLicense.xml:46
 msgid "License Agreement"
 msgstr "使用許諾契約の同意"
 
-#. 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 ""
 "<application>Mageia</application> をインストールする前に使用許諾契約の内容を"
 "よくお読みください。"
 
-#. 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 ""
 "これらの使用許諾契約の内容は、<application>Mageia</application> ディストリ"
 "ビューション全体に適用され、あなたは続行する前にこれらに同意しなくてはなりま"
 "せん。"
 
-#. 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 ""
 "続行するには、単純に<guilabel>承諾する</guilabel>を選択して<guibutton>次へ</"
 "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 ""
 "あなたがこれらの条件を承諾しないと決めた場合、私たちはご覧いただいたことに感"
 "謝します。<guibutton>終了</guibutton>をクリックするとコンピュータは再起動しま"
 "す。"
 
 #. type: Content of: <section><section><info><title>
-#: en/acceptLicense.xml:63
+#: en/acceptLicense.xml:76
 msgid "Release Notes"
 msgstr "リリース ノート"
 
 #. 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 ""
 "このリリースの <application>Mageia</application> についての重要な情報は"
 "<guibutton>リリース ノート</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 "ja"
 
 #. 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 "メディアの選択 (追加のインストール メディアを設定する)"
 
 #.  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
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-add_supplemental_media."
 "png\" xml:id=\"dx2-add_supplemental_media-im1\" align=\"center\" revision="
@@ -127,36 +135,38 @@ msgstr ""
 "\"1\"/> </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 ""
 "この画面は認識済みのリポジトリの一覧を示しており、光学ディスクやリモートの"
 "ソースのような他のパッケージ入手先を追加できます。この入手先の選択は、以降の"
 "ステップにおける利用可能パッケージに影響します。"
 
 #. 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 "ネットワーク ソースでは、以下の 2 つのステップが続きます:"
 
 #. 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 "ネットワークが有効化されていなければ、選択および有効化を行います。"
 
 #. 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 ""
 "ミラーを選択するか、URL (一覧の一番上の項目) を指定します。ミラーを選択するこ"
 "とで Mageia に管理されているすべてのリポジトリを選ぶことができ、<emphasis "
@@ -166,14 +176,15 @@ msgstr ""
 "なたの NFS インストールを指し示すことができます。"
 
 #. 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 ""
 "幾つかの 32 ビットのパッケージを含む可能性のある 64 ビット OS を更新する場"
 "合、この画面でいずれかのネットワーク プロトコルを選択してオンライン ミラーを"
@@ -183,18 +194,25 @@ msgstr ""
 "けることができるでしょう。"
 
 #. type: Content of: <section><info><title>
-#: en/addUser.xml:3
-msgid "User and Superuser Management"
-msgstr "ユーザとスーパーユーザの管理"
+#: en/addUser.xml:9
+#, fuzzy
+msgid "User Management"
+msgstr "ユーザの高度な管理"
 
 #.  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 format=\"PNG\" fileref="
 "\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -202,20 +220,21 @@ msgstr ""
 "\"PNG\" 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 "管理者 (root) のパスワードを設定する:"
 
 #. 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 ""
 "<application>Mageia</application> のインストールされたすべての環境で"
 "<emphasis role=\"bold\">スーパーユーザ</emphasis> (管理者) のパスワードを設定"
@@ -227,26 +246,28 @@ msgstr ""
 "力する必要があります。"
 
 #. 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 ""
 "すべてのパスワードは大文字と小文字を区別し、パスワードの中でアルファベット "
 "(大文字と小文字), 数字, 他の文字を混在させて使うのが最適です。"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:42
+#: en/addUser.xml:57
 msgid "Enter a user"
 msgstr "ユーザを入力する"
 
 #. 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 ""
 "ここでユーザを追加します。通常ユーザは<emphasis role=\"bold\">スーパーユーザ"
 "</emphasis> (root) よりも権限が少ないですが、インターネットやオフィス アプリ"
@@ -254,66 +275,91 @@ msgstr ""
 "他のことを行ったりするのには十分です。"
 
 #. 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\">上級</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>アイコン</guibutton>: このボタンをクリックすると、このユーザのアイ"
 "コンを変更します。"
 
 #. 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\">サーバ</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>本名</guilabel>: このテキスト ボックスにこのユーザの本名を入力しま"
 "す。"
 
 #. 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\">上級</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>ログイン名</guilabel>: このユーザのログイン名をここに入力します。も"
 "しくは DrakX がユーザの本名をもとにログイン名を決定します。<emphasis role="
 "\"bold\">このログイン名は大文字と小文字を区別します。</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\">上級</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>パスワード</guilabel>: ユーザのパスワードを入力します。テキスト "
 "ボックスの右端にはパスワードの強度を示す盾が表示されます。(<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>パスワード (再入力)</guilabel>: ユーザのパスワードをこのテキスト "
 "ボックスに再度入力します。DrakX はあなたがパスワードをタイプミスしていないか"
 "をチェックします。"
 
 #. 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 ""
 "Mageia のインストール時に追加したユーザには、読み書きの両方で保護されたホー"
 "ム ディレクトリ (umask=0027) が用意されます。"
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:82
+#: en/addUser.xml:104
 msgid ""
 "You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
@@ -323,31 +369,33 @@ msgstr ""
 "ステップで追加できます。<emphasis>ユーザの管理</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 "アクセス権はインストール後に変更することもできます。"
 
 #. 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 "ユーザの高度な管理"
 
 #. 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 ""
 "<guibutton>上級</guibutton>ボタンでは、追加中のユーザに対する追加の設定を編集"
 "できます。"
 
 #. 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>シェル</guilabel>: このドロップ ダウン リストでは前の画面で追加した"
 "ユーザから使用できるシェルを変更できます。選択肢は <emphasis role=\"bold"
@@ -355,28 +403,30 @@ msgstr ""
 "\"bold\">Sh</emphasis> です。"
 
 #. 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</guilabel>: ここでは前の画面で追加したユーザの<emphasis "
 "role=\"bold\">ユーザ ID</emphasis> を設定できます。これは目的がはっきりしない"
 "場合は空欄のままにしてください。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:113
+#: en/addUser.xml:136
+#, fuzzy
 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 ""
 "<guilabel>グループ ID</guilabel>: <emphasis role=\"bold\">グループ ID</"
 "emphasis> を設定できます。こちらも目的がはっきりしない場合は空欄のままにして"
 "ください。"
 
 #. type: Content of: <section><info><title>
-#: en/ask_mntpoint_s.xml:3
+#: en/ask_mntpoint_s.xml:10
 msgid "Choose the mount points"
 msgstr "マウント ポイントを選択する"
 
@@ -391,15 +441,17 @@ msgstr "マウント ポイントを選択する"
 #.        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 format=\"PNG\" xml:id="
 "\"chooseMountPoints-im1\" align=\"center\" fileref=\"dx2-chooseMountpoints."
@@ -409,57 +461,37 @@ msgstr ""
 "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 ""
 "ここでお使いのコンピュータ上で見つかった Linux パーティションが見られます。"
 "<application>DrakX</application> が提案する内容を承諾しないのであれば、マウン"
 "ト ポイントを変更することができます。"
 
-#. type: Content of: <section><note><para>
-#: en/ask_mntpoint_s.xml:41
-msgid ""
-"If you change anything, make sure you still have a <emphasis role=\"bold"
-"\"><literal>/</literal></emphasis> (root) partition."
-msgstr ""
-"変更を行った場合、<emphasis role=\"bold\"><literal>/</literal></emphasis> "
-"(ルート) パーティションがまだ存在しているかを確認してください。"
-
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:46
+#: 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 ""
-"各パーティションは左側に以下のように表示されます: <emphasis role=\"bold\">デ"
-"バイス (容量, マウント ポイント, 種類)</emphasis>"
-
-#. 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 ""
-"<emphasis role=\"bold\">デバイス</emphasis>は以下で構成されます: <emphasis "
-"role=\"bold\">ハード ドライブ</emphasis>, [<emphasis role=\"bold\">ハード ド"
-"ライブ名</emphasis> (アルファベット)], <emphasis role=\"bold\">パーティション"
-"番号</emphasis> (例 <emphasis role=\"bold\">sda5</emphasis>)"
 
 #. 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 ""
 "幾つかのパーティションがある場合、複数のマウント ポイントをドロップ ダウン メ"
 "ニューから <emphasis role=\"bold\">/</emphasis>, <emphasis role=\"bold"
@@ -470,7 +502,7 @@ msgstr ""
 "は何か他の名前) です。"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:63
+#: en/ask_mntpoint_s.xml:73
 msgid ""
 "For any partitions that you don't need to make use of, you can leave the "
 "mount point field blank."
@@ -479,11 +511,22 @@ msgstr ""
 "ことができます。"
 
 #. type: Content of: <section><warning><para>
-#: en/ask_mntpoint_s.xml:69
+#: en/ask_mntpoint_s.xml:79
+#, fuzzy
+msgid ""
+"If you make any changes here, ensure you still have a <filename>/</filename> "
+"(root) partition."
+msgstr ""
+"変更を行った場合、<emphasis role=\"bold\"><literal>/</literal></emphasis> "
+"(ルート) パーティションがまだ存在しているかを確認してください。"
+
+#. type: Content of: <section><tip><para>
+#: en/ask_mntpoint_s.xml:84
+#, 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 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 ""
 "どれを選択するか分からない場合、<emphasis role=\"bold\">戻る</emphasis>をク"
 "リックして戻り、<guilabel>パーティションを手動で設定</guilabel>クリックしてく"
@@ -491,188 +534,244 @@ msgstr ""
 "す。"
 
 #. 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 ""
 "マウント ポイントが正しいことが確認できたら、<guibutton>次へ</guibutton>をク"
 "リックし、DrakX が提案するパーティションのみをフォーマットするか他のパーティ"
 "ションもフォーマットするかを選択します。"
 
 #. type: Content of: <section><info><title>
-#: en/bestTime.xml:10
-msgid "Clock settings"
+#: en/bestTime.xml:5
+#, fuzzy
+msgid "Clock Settings"
 msgstr "時計の設定"
 
 #. 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 ""
 "このステップでは、内部の時計をどの時間に設定するかと、ローカル時間と UTC 時間"
 "のどちらを使用するかを選択する必要があります。"
 
 #. type: Content of: <section><para>
-#: en/bestTime.xml:23
-msgid "In advanced tab, you will find more options about clock settings."
-msgstr "上級タブでは、時刻設定についての追加の項目が見つかります。"
+#: 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 "Mageia をライブ システムとしてブートする"
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:1
+#: en/bootLive.xml:10
 msgid "Booting the medium"
 msgstr "メディアをブートする"
 
-#. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:1
-msgid "From a disc"
-msgstr "ディスクから"
-
-#. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:1
+#. type: Content of: <section><section><para>
+#: en/bootLive.xml:12
 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."
+"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 ""
-"イメージを焼くのに用いたメディア (CD-ROM, DVD-ROM...) から直接ブートすること"
-"ができます。通常はこれを CD/DVD ドライブに挿入するだけで再起動後にブート ロー"
-"ダが自動的にインストールを開始します。開始しなければ BIOS の設定を変更するか"
-"キーを一つ押してからコンピュータをブートする周辺機器を選択する必要があるかも"
-"しれません。"
 
-#. 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 ""
-"所有するハードウェアやその設定により、下の二つの画面のいずれかが表示されま"
-"す。"
 
-#. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:7
-msgid "From a USB device"
-msgstr "USB デバイスから"
+#. 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 ""
-"ISO イメージを書き込んだ USB デバイスからブートすることができます。BIOS の設"
-"定によっては、コンピュータはポートに接続済みの USB デバイスから直接ブートする"
-"かもしれません。ブートしなければ BIOS の設定を変更するかキーを一つ押してから"
-"コンピュータをブートする周辺機器を選択する必要があるかもしれません。"
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:12
+#: en/bootLive.xml:35
 msgid "In BIOS/CSM/Legacy mode"
 msgstr "BIOS/CSM/レガシー モード"
 
+#. 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\">ワークステーション</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 "ここであなたが行った設定はインストールに進んだ後も保持されます。"
+
+#. 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\">お望みのセキュリティ レベルを選択してください</"
+"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\">ワークステーション</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 ""
+"Install Mageia: この選択肢は Mageia のハード ディスクへのインストールを直接行"
+"います。"
+
+#. 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=\"dx2-selectKeyboard.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 "BIOS モードにおけるブート時の最初の画面"
 
-#. type: Content of: <section><section><para>
-#: en/bootLive.xml:12
-msgid "In the middle menu, you have the choice between three actions:"
-msgstr "中央のメニューで三つの操作から選択を行います:"
+#. 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 ""
-"Boot Mageia: これは Mageia 5 を接続されたメディア (CD/DVD もしくは USB ス"
-"ティック) から開始することを意味します。ディスクには何も書き込まれないため、"
-"システムが非常に遅いということを予期してください。いったんブートが完了すれ"
-"ば、ハード ディスクへのインストールに進むことができます。"
+#: en/bootLive.xml:75
+#, fuzzy
+msgid "<keycap>F1</keycap> <emphasis role=\"bold\">Help</emphasis>"
+msgstr "<emphasis role=\"bold\">サーバ</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:16
+#: en/bootLive.xml:76
+#, fuzzy
 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 ""
-"Install Mageia: この選択肢は Mageia のハード ディスクへのインストールを直接行"
-"います。"
+"<emphasis role=\"bold\">F2</emphasis> から <emphasis role=\"bold\">F6</"
+"emphasis> のいずれかにおいて、<emphasis role=\"bold\">F1</emphasis> を押すこ"
+"とで関連したヘルプが参照できます。"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:81
+#, fuzzy
+msgid "<keycap>F2</keycap> <emphasis role=\"bold\">Language</emphasis>"
+msgstr "<emphasis role=\"bold\">上級</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:17
+#: 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 ""
-"Boot from hard disk: この選択肢ではメディア (CD/DVD もしくは USB スティック) "
-"が接続されていないときに通常通りにハード ディスクからブートできます (Mageia "
-"5 では動作しません)。"
 
-#. type: Content of: <section><section><para>
-#: en/bootLive.xml:19
-msgid "In the bottom menu, are the Boot Options:"
-msgstr "下部のメニューはブート オプションです:"
+#. 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\">上級</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 - ヘルプです。オプション \"splash\", \"apm\", \"acpi\", \"Ide\" の説明を表"
-"示します。"
+"必要であれば、<emphasis role=\"bold\">F3</emphasis> を押して画面の解像度を変"
+"更します (Legacy モードのみ)。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:20
-msgid "F2 - Language. Choose the display language of the screens."
-msgstr "F2 - 言語です。画面に表示される言語を選択します。"
+#: en/bootLive.xml:93
+#, fuzzy
+msgid "<keycap>F4</keycap> <emphasis role=\"bold\">Source</emphasis>"
+msgstr "<emphasis role=\"bold\">サーバ</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 - 画面の解像度です。text, 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 もしくは Other を選択します。通常は、インストールは"
 "挿入されたインストール メディアから行われます。ここでは、FTP や NFS サーバの"
@@ -681,117 +780,178 @@ msgstr ""
 "ます。"
 
 #. 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\">サーバ</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 - ドライバです。Yes もしくは No を選択します。システムはドライバ更新のある"
-"光学ディスクがあれば認識し、ディスクはインストールの間は挿入されている必要が"
-"あります。"
 
 #. 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\">ワークステーション</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:106
+#, fuzzy
 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 ""
+"インストールで問題が起きた場合、<emphasis role=\"bold\">F6</emphasis> の"
+"<emphasis role=\"bold\">カーネルのオプション</emphasis> を用いて既定の設定を"
+"変更してみるといいかもしれません (UEFI システムでは代わりに <emphasis role="
+"\"bold\">e</emphasis> を押します)。"
+
+#. 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\">アラインメント</emphasis> = MiB"
+
+#. 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 ""
+"ACPI なし: (Advanced Configuration and Power Interface): 電源管理機能が使用さ"
+"れません。"
+
+#. 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 ""
+"ローカル APIC なし: (Local Advanced Programmable Interrupt Controller): CPU "
+"割り込みです。APIC 関連のカーネル パニックのようなシステム誤動作を経験した場"
+"合はこの項目を選択します。"
+
+#. 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 - カーネルのオプションです。これは使用するハードウェアやドライバに応じた特"
-"定のオプションを指定する方法です。"
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:29
+#: en/bootLive.xml:139
 msgid "In UEFI mode"
 msgstr "UEFI モード"
 
 #. 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 "UEFI システムでディスクからブートしたときの最初の画面"
+#: en/bootLive.xml:146
+#, fuzzy
+msgid "First screen while booting in UEFI mode"
+msgstr "BIOS モードにおけるブート時の最初の画面"
 
 #. 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 ""
-"Mageia をライブ モード (最初の選択肢) で実行するかインストールを行う (二つめ"
-"の選択肢) かのみが選択できます。"
 
-#. 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 ""
-"USB スティックからブートした場合、二つの \"USB\" で終わる同様の行が追加されま"
-"す。これらから選択を行う必要があります。"
+"Boot Mageia: これは Mageia 5 を接続されたメディア (CD/DVD もしくは USB ス"
+"ティック) から開始することを意味します。ディスクには何も書き込まれないため、"
+"システムが非常に遅いということを予期してください。いったんブートが完了すれ"
+"ば、ハード ディスクへのインストールに進むことができます。"
 
-#. 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 ""
-"いずれの場合も、最初のステップは言語, タイム ゾーン, キーボードの選択で、"
-"<link linkend=\"testing\">ライブ モードには追加のステップがあります</link>。"
 
 #. type: Content of: <section><info><title>
-#: en/chooseDesktop.xml:3
+#: en/chooseDesktop.xml:16
 msgid "Desktop Selection"
 msgstr "デスクトップの選択"
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:8
-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 ""
-"ここでの選択内容により、細かい設定を行う追加の画面に進む場合があります。"
 
 #. 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 ""
 "選択のステップの後、パッケージのインストール中にスライド ショーが流れます。こ"
 "のスライド ショーは<guilabel>詳細</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 format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
 "align=\"center\"/> </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 <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."
+"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 ""
+"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 ""
 "<application>KDE</application> <emphasis role=\"bold\">Plasma</emphasis> か "
 "<application>GNOME</application> デスクトップ環境のどちらがお好みかを選択しま"
@@ -808,8 +968,9 @@ msgid "Package Group Selection"
 msgstr "パッケージ グループの選択"
 
 #. 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
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
 "\" align=\"center\"/> </imageobject>"
@@ -818,7 +979,7 @@ msgstr ""
 "\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:14
+#: en/choosePackageGroups.xml:16
 msgid ""
 "Packages are arranged into common groups, to make choosing what you need on "
 "your system a lot easier. The groups are fairly self explanatory, however "
@@ -830,22 +991,22 @@ msgstr ""
 "に乗せたときに表示されるツール チップにはより詳しい情報が表示されます。"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:21
+#: en/choosePackageGroups.xml:23
 msgid "<emphasis role=\"bold\">Workstation</emphasis>"
 msgstr "<emphasis role=\"bold\">ワークステーション</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:25
+#: en/choosePackageGroups.xml:27
 msgid "<emphasis role=\"bold\">Server</emphasis>"
 msgstr "<emphasis role=\"bold\">サーバ</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:29
+#: en/choosePackageGroups.xml:31
 msgid "<emphasis role=\"bold\">Graphical Environment</emphasis>"
 msgstr "<emphasis role=\"bold\">グラフィカル環境</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:33
+#: en/choosePackageGroups.xml:35
 msgid ""
 "<emphasis role=\"bold\">Individual Package Selection</emphasis>: you can use "
 "this option to manually add or remove packages"
@@ -854,7 +1015,7 @@ msgstr ""
 "追加や削除をするためにこの項目を使用することができます"
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:38
+#: en/choosePackageGroups.xml:40
 msgid ""
 "See <xref linkend=\"minimal-install\"/> for instructions on how to do a "
 "minimal install (without or with X &amp; IceWM)."
@@ -868,8 +1029,10 @@ msgid "Choose Individual Packages"
 msgstr "パッケージを個別に選択する"
 
 #. 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
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackagesTree.png"
 "\" align=\"center\"/> </imageobject>"
@@ -878,7 +1041,7 @@ msgstr ""
 "\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:14
+#: en/choosePackagesTree.xml:18
 msgid ""
 "Here you can add or remove any extra packages to customize your installation."
 msgstr ""
@@ -886,13 +1049,14 @@ msgstr ""
 "たりすることができます。"
 
 #. 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 ""
 "選択を終えた後、ページ下部にある<guibutton>フロッピーのアイコン</guibutton>を"
 "クリックすることで選択したパッケージを保存することができます (USB キーに保存"
@@ -907,8 +1071,10 @@ msgstr "サービスを設定する"
 
 #.  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
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-configureServices.png"
 "\" xml:id=\"configureServices-im1\" align=\"center\" revision=\"1\"/> </"
@@ -919,25 +1085,23 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:16
+#: en/configureServices.xml:20
 msgid ""
 "Here you can choose which services should start when you boot your system."
 msgstr "ここでシステムのブート時に開始するサービスを選択することができます。"
 
-#. 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
+#, fuzzy
+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
-msgid "The settings DrakX chose are usually good."
-msgstr "DrakX が選択した設定は通常は適しています。"
-
-#. 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."
@@ -946,7 +1110,7 @@ msgstr ""
 "情報が表示されます。"
 
 #. 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 "何をしているのかよく分かっている場合にだけ変更を行ってください。"
 
@@ -957,14 +1121,17 @@ msgstr "タイム ゾーンを設定する"
 
 #.  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 format=\"PNG\" xml:id="
 "\"configureTimezoneUTC-im1\" align=\"center\" fileref=\"dx2-"
@@ -972,17 +1139,18 @@ msgstr ""
 "<imagedata format=\"PNG\" fileref=\"live-timeZone.png\" condition=\"live\"/> "
 "</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 ""
 "あなたのいる国と同一タイム ゾーン内の近い都市を選択することでタイム ゾーンを"
 "選択します。"
 
 #. type: Content of: <section><para>
-#: en/configureTimezoneUTC.xml:24
+#: en/configureTimezoneUTC.xml:32
 msgid ""
 "In the next screen you can choose to set your hardware clock to local time "
 "or to GMT, also known as UTC."
@@ -991,7 +1159,7 @@ msgstr ""
 "る) GMT のどちらに設定するかを選択できます。"
 
 #. 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."
@@ -1000,23 +1168,23 @@ msgstr ""
 "に設定するか、もしくはすべてが 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 "X サーバを選択する (グラフィック カードを設定する)"
 
 #. 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=\"configureX_card_list-im1\" "
-"align=\"center\" fileref=\"dx2-configureX_card_list.png\" 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/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."
@@ -1025,7 +1193,7 @@ msgstr ""
 "お使いのビデオ デバイスを正しく識別します。"
 
 #. 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:"
@@ -1034,30 +1202,34 @@ msgstr ""
 "使いのカードを把握しているのであれば、以下によりツリーの一覧から選択すること"
 "ができます:"
 
-#. 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 "ベンダ"
 
 #. 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 "カードの名前"
 
 #. 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 "カードの種類"
 
 #. 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 ""
 "お使いのカードがベンダ一覧にない場合 (データベースに未登録か古いカード) は "
 "<emphasis role=\"bold\">Xorg</emphasis> カテゴリから適したドライバが見つかる"
@@ -1066,65 +1238,62 @@ msgstr ""
 "合は基本的な機能を提供する <emphasis role=\"bold\">vesa</emphasis> ドライバを"
 "使用するという選択肢があります。"
 
-#. 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 ""
 "非互換なドライバを選択した場合は<emphasis role=\"bold\">コマンド ライン</"
 "emphasis> インターフェースしか利用できないという点に留意してください。"
 
 #. 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 ""
 "幾つかのビデオ カードのメーカーは <emphasis role=\"bold\">Nonfree</emphasis> "
 "リポジトリでのみ利用可能な Linux ドライバを提供しており、場合によってはメー"
 "カーの Web サイトからしか入手できません。"
 
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:56
-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 ""
-"これらにアクセスするには、<emphasis role=\"bold\">Nonfree</emphasis> リポジト"
-"リを明示的に有効にする必要があります。以前にこれを有効にしていない場合、最初"
-"の再起動後にこれを行うのがよいでしょう。"
-
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:3
+#: en/configureX_chooser.xml:11
 msgid "Graphic Card and Monitor Configuration"
 msgstr "グラフィック カードとモニタを設定する"
 
 #.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
+#. 2018/02/15 apb: Some text and typography.
+#. 2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.
+#. 2018/02/23 apb: Typo.
 #. 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=\"configureX_chooser-im1\" "
-"fileref=\"dx2-configureX_chooser.png\" align=\"center\" 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/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 ""
 "どのグラフィカル環境 (またはデスクトップ環境) をこの <application>Mageia</"
 "application> のインストールで選択したとしても、これらはすべて <acronym>X "
@@ -1137,22 +1306,33 @@ msgstr ""
 "してください。"
 
 #. 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\">グラフィカル環境</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>グラフィック カード</guibutton></emphasis>: 必要があれば"
-"お使いのカードを一覧から選択します。"
 
 #. 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\">サーバ</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>モニタ</guibutton></emphasis>: お使いのモニタが対応して"
 "いれば<guilabel>プラグ アンド プレイ</guilabel>を選択でき、そうでなければ"
@@ -1160,31 +1340,37 @@ msgstr ""
 "のモニタを選択します。お使いのモニタの水平走査周波数と垂直走査周波数を手動で"
 "設定したいのであれば<guilabel>カスタム</guilabel>を選択します。"
 
-#. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/configureX_chooser.xml:41
-msgid "Incorrect refresh rates may damage your monitor"
-msgstr ""
-"不正なリフレッシュ レートを指定するとモニタを破損する可能性があります。"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_chooser.xml:60
+#, fuzzy
+msgid "<emphasis role=\"bold\">Resolution</emphasis>"
+msgstr "<emphasis role=\"bold\">ワークステーション</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:47
-msgid ""
-"<emphasis><guibutton>Resolution</guibutton></emphasis>: The resolution and "
-"color depth of your monitor can be set here."
+#: en/configureX_chooser.xml:63
+#, fuzzy
+msgid "The resolution and color depth of your monitor can be set here"
 msgstr ""
 "<emphasis><guibutton>解像度</guibutton></emphasis>: お使いのモニタの解像度と"
 "色深度をここで設定できます。"
 
 #. 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\">サーバ</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>テスト</guibutton></emphasis>: このテスト ボタンはインス"
 "トール時に必ず現れるものではありません。ボタンがある場合は設定をテストすると"
@@ -1194,21 +1380,35 @@ msgstr ""
 "設定が安全かを確認してください。"
 
 #. 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\">ワークステーション</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>オプション</guibutton></emphasis>: ここで色々な項目を有"
 "効にしたり無効にしたりできます。"
 
+#. 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 "モニタを選択する"
 
 #. 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."
@@ -1217,7 +1417,7 @@ msgstr ""
 "のモニタを正しく識別します。"
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:19
+#: en/configureX_monitor.xml:30
 msgid ""
 "<emphasis role=\"bold\">Selecting a monitor with different characteristics "
 "could damage your monitor or video hardware. Please don't try something "
@@ -1230,25 +1430,26 @@ msgstr ""
 "ください。"
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:26
+#: en/configureX_monitor.xml:38
+#, fuzzy
 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=\"configureX_monitor-im1\" "
-"fileref=\"dx2-configureX_monitor.png\" align=\"center\" 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/configureX_monitor.xml:31
-msgid "<emphasis>Custom</emphasis>"
-msgstr "<emphasis>カスタム</emphasis>"
+#. type: Content of: <section><variablelist><varlistentry><term>
+#: en/configureX_monitor.xml:46
+msgid "Custom"
+msgstr ""
 
-#. 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."
@@ -1257,8 +1458,8 @@ msgstr ""
 "が行えます。垂直走査周波数は画面の更新頻度を決定し、水平走査周波数は走査線が"
 "表示される速度となります。"
 
-#. 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 "
@@ -1269,26 +1470,22 @@ msgstr ""
 "<emphasis>非常に重要です</emphasis>: モニタを破損する可能性があります。不明な"
 "点があれば、控えめな設定を選択した上でモニタの説明書をご覧ください。"
 
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:44
-msgid "<emphasis>Plug 'n Play</emphasis>"
-msgstr "<emphasis>プラグ アンド プレイ</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 ""
 "これは既定の選択肢で、モニタのデータベースからモニタの種類の決定を試みます。"
 
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:51
-msgid "<emphasis>Vendor</emphasis>"
-msgstr "<emphasis>ベンダ</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:"
@@ -1297,30 +1494,30 @@ msgstr ""
 "を把握しているのであれば、以下を選択することでツリーの一覧から選択することが"
 "できます:"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:61
-msgid "the monitor manufacturers name"
-msgstr "モニタのメーカー名"
+#. 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 "モニタの説明"
+#. 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>一般</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 ""
 "このグループを選択すると 1024x768 @ 60Hz のような約 30 のディスプレイ設定が一"
 "覧表示され、ラップトップで使用されるフラット パネル ディスプレイも含まれま"
@@ -1330,129 +1527,147 @@ msgstr ""
 "う。"
 
 #. 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 "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"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.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
-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 ""
-"<emphasis role=\"bold\">/</emphasis> パーティションを暗号化したい場合、これと"
-"は別に <emphasis role=\"bold\">/boot</emphasis> パーティションがなければなり"
-"ません。<emphasis role=\"bold\">/boot</emphasis> パーティションに対する暗号化"
-"は設定してはならず、設定した場合はお使いのシステムは起動不能になります。"
+"<imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/> </imageobject>"
 
-#. 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 ""
 "ここでお使いのディスクのレイアウトを変更します。パーティションを削除もしくは"
 "作成したり、ファイル システムを変更したりそのサイズを変更したり、開始前に詳細"
 "を見ることさえできます。"
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:34
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/diskdrake.xml:45
+#, fuzzy
 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>."
+"device, like a USB key). In the screenshot above there are two available "
+"devices: <filename>sda </filename>and <filename>sdb</filename>."
 msgstr ""
 "検出された各ハード ディスク (もしくは他の USB キーのようなストレージ デバイ"
 "ス) の上部にタブがあります。上のスクリーンショットでは二つの利用可能なデバイ"
 "スがあります: <emphasis role=\"bold\">sda</emphasis> と <emphasis role=\"bold"
 "\">sdb</emphasis>"
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:39
-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."
-msgstr ""
-"<guibutton>すべてをクリア</guibutton>の項目には注意してください、これは選択さ"
-"れたストレージ デバイス上のすべてのパーティションを削除する場合にのみ使用しま"
-"す。"
-
-#. 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 ""
 "他のすべての操作: はじめにパーティションをクリックします。次に表示, ファイル "
 "システムやマウント ポイントの選択, サイズ変更, 削除を行います。<guibutton>上"
 "級者モード</guibutton> はパーティションにラベル (名前) を付けたりパーティショ"
 "ンの種類を選択したりといった追加の項目を提供します。"
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:49
-msgid "Continue until you have adjusted everything to your satisfaction."
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/diskdrake.xml:60
+#, fuzzy
+msgid ""
+"Continue until you have adjusted everything to your satisfaction, then click "
+"<emphasis>Done</emphasis> when you're ready."
 msgstr "すべてを満足いくまで調整し終えるまで続けます。"
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:52
-msgid "Click <guibutton>Done</guibutton> when you're ready."
-msgstr "準備ができたら<guibutton>完了</guibutton>をクリックします。"
+#. 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 ""
+"<guibutton>すべてをクリア</guibutton>の項目には注意してください、これは選択さ"
+"れたストレージ デバイス上のすべてのパーティションを削除する場合にのみ使用しま"
+"す。"
 
-#. 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 ""
+"<emphasis role=\"bold\">/</emphasis> パーティションを暗号化したい場合、これと"
+"は別に <emphasis role=\"bold\">/boot</emphasis> パーティションがなければなり"
+"ません。<emphasis role=\"bold\">/boot</emphasis> パーティションに対する暗号化"
+"は設定してはならず、設定した場合はお使いのシステムは起動不能になります。"
+
+#. 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 ""
 "Mageia を UEFI システムにインストールしている場合、ESP (EFI システム パーティ"
 "ション) が存在し、/boot/EFI に正しくマウントされているかをチェックしてくださ"
 "い。(下記参照)"
 
-#. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:61
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/diskdrake.xml:93
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
-"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"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 ""
+"Mageia を Legacy/GPT システムにインストールしている場合、BIOS ブート パーティ"
+"ションが存在し、種類が正しいことをチェックしてください"
+
+#. type: Content of: <section><figure><title>
+#: en/diskdrake.xml:101
+#, fuzzy
+msgid "EFI System Partition"
+msgstr "既存のパーティションを使う"
+
+#. type: Content of: <section><figure><mediaobject>
+#: en/diskdrake.xml:104
+#, fuzzy
+msgid ""
+"<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-diskdrake2.png"
 "\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/> </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
-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 ""
-"Mageia を Legacy/GPT システムにインストールしている場合、BIOS ブート パーティ"
-"ションが存在し、種類が正しいことをチェックしてください"
 
-#. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:76
+#. type: Content of: <section><mediaobject>
+#: en/diskdrake.xml:118 en/doPartitionDisks.xml:200
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1465,50 +1680,60 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:9
-msgid "Partitioning"
+#: en/doPartitionDisks.xml:25
+#, fuzzy
+msgid "Suggested Partitioning"
 msgstr "パーティションの設定"
 
 #. 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 ""
 "この画面ではお使いのハード ドライブの内容を DrakX による "
 "<application>Mageia</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 ""
 "下に示された中から利用可能な選択肢はお使いの特定のハード ドライブのレイアウト"
 "や内容によって変化します。"
 
 #. 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-"
-"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
-"\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:32
-msgid "Use Existing Partitions"
-msgstr "既存のパーティションを使う"
+#. type: Content of: <section><itemizedlist><title>
+#: en/doPartitionDisks.xml:47
+#, fuzzy
+msgid "Main Options"
+msgstr "設定項目"
 
-#. 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\">パーティションの自動分割:</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."
@@ -1516,13 +1741,14 @@ msgstr ""
 "この選択肢が利用できる場合、既存の Linux 互換のパーティションが見つかってお"
 "り、インストールに使用できます。"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:41
-msgid "Use Free Space"
-msgstr "空き領域を使う"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:59
+#, fuzzy
+msgid "<emphasis role=\"bold\">Use Free Space</emphasis>"
+msgstr "<emphasis role=\"bold\">サーバ</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."
@@ -1530,110 +1756,90 @@ msgstr ""
 "お使いのハード ドライブに未使用の領域がある場合にこの選択肢はそこを新しい "
 "Mageia のインストールに使用します。"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:49
-msgid "Use Free Space on a Windows Partition"
-msgstr "Windows パーティションの空き領域を使う"
-
-#. 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 ""
-"既存の Windows パーティションに空き領域がある場合、インストーラはそれを使用す"
-"ることを提案するかもしれません。"
+"<emphasis role=\"bold\">Use Free Space on a Windows Partition</emphasis>"
+msgstr "<emphasis role=\"bold\">ワークステーション</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 ""
 "これは新しく Mageia をインストールする領域を作成するための有用な方法になりえ"
 "ますが、リスクのある操作となるため、大事なファイルは事前にバックアップしてお"
 "くのがよいでしょう!"
 
-#. 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 ""
-"これは Windows のパーティションのサイズを縮めることを伴います。パーティション"
-"は \"クリーン\" でなければならず、これは Windows を前回使用したときに正常に終"
-"了していなければならないことを意味します。また、このパーティション内のすべて"
-"のファイルがこれから使用される領域から出ていくという保証ではないもののデフラ"
-"グもされている必要があります。個人的なファイルはバックアップすることを強く推"
-"奨します。"
-
-#. 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 ""
 "この選択肢では、インストーラは残っている Windows パーティションを明るい青色"
 "で、Mageia 用に提案されたパーティションを暗い青色で、それぞれサイズも反映して"
 "下に表示します。これらのサイズは両方のパーティションの隙間のクリックとドラッ"
 "グで変更できます。下のスクリーンショットをご覧ください。"
 
-#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:76
-msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/> </imageobject>"
-msgstr ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/> </imageobject>"
-
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:87
-msgid "Erase and use Entire Disk."
-msgstr "ディスク全体を消去して使用"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:85
+#, fuzzy
+msgid "<emphasis role=\"bold\">Erase and use Entire Disk</emphasis>"
+msgstr "<emphasis role=\"bold\">グラフィカル環境</emphasis>"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:90
-msgid "This option will allocate the entire drive for Mageia."
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:88
+#, fuzzy
+msgid "This option will allocate the entire drive for Mageia"
 msgstr "この選択肢ではドライブの全体を Mageia 用に割り当てます。"
 
-#. 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 ""
-"注意! これは選択されたハード ドライブ上のすべてのデータを削除します。気をつけ"
-"てください!"
-
-#. 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 ""
 "ディスクの一部を他の用途で使用するつもりであるか、もしくは既にドライブ上に"
 "データがあってそれが削除されることに備えていない場合、この選択肢は使用しない"
 "でください。"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:103
-msgid "Custom disk partitioning"
-msgstr "パーティションを手動で設定"
+#. 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 ""
+"これは Windows のパーティションのサイズを縮めることを伴います。パーティション"
+"は \"クリーン\" でなければならず、これは Windows を前回使用したときに正常に終"
+"了していなければならないことを意味します。また、このパーティション内のすべて"
+"のファイルがこれから使用される領域から出ていくという保証ではないもののデフラ"
+"グもされている必要があります。個人的なファイルはバックアップすることを強く推"
+"奨します。"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:106
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:110
+#, fuzzy
+msgid "<emphasis role=\"bold\">Custom Disk Partitioning</emphasis>"
+msgstr "<emphasis role=\"bold\">パーティションの自動分割:</emphasis>"
+
+#. 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)."
@@ -1641,83 +1847,106 @@ msgstr ""
 "これはお使いのハード ドライブ上のインストール場所を完全にコントロールすること"
 "ができます。"
 
-#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:112
-msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
-msgstr "<emphasis role=\"bold\">パーティションの自動分割:</emphasis>"
+#. type: Content of: <section><mediaobject>
+#: en/doPartitionDisks.xml:120
+#, fuzzy
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:114
+#: en/doPartitionDisks.xml:129
+#, fuzzy
 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 ""
 "<emphasis role=\"bold\">パーティションを手動で設定</emphasis>を選択しない場"
 "合、インストーラは利用可能な領域を以下のルールに従って割り当てます:"
 
-#. 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 ""
 "合計空き領域が 50 GB 未満の場合、パーティションが一つだけ作られます。これは "
 "<emphasis role=\"bold\">/</emphasis> (ルート) パーティションになります。"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:125
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:141
 msgid ""
 "If the total available space is greater than 50 GB, then three partitions "
 "are created"
 msgstr ""
 "合計空き領域が 50 GB を超える場合、三つのパーティションが作成されます。"
 
-#. 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 が<emphasis role=\"bold\">/</emphasis> に最大で 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 がスワップに最大で 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 ""
 "残り (最低でも 12/19) が <emphasis role=\"bold\">/home</emphasis> に割り当て"
 "られます。"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:144
+#: 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 ""
-"これは 160 GB を超える空き領域がある場合にインストーラが三つのパーティション"
-"を作成することを意味します: <emphasis role=\"bold\">/</emphasis> 用に 50 GB, "
-"<emphasis role=\"bold\">スワップ</emphasis>用に 4 GB, <emphasis role=\"bold"
-"\">/home</emphasis> 用に残りすべて"
 
 #. 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 ""
 "UEFI システムをお使いの場合、ESP (EFI システム パーティション) が自動的に検出"
 "されます - 存在しなければ作成されて /boot/EFI にマウントされます。これが正常"
@@ -1725,13 +1954,15 @@ msgstr ""
 "を手動で設定</emphasis>を選択することです。"
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:158
+#: en/doPartitionDisks.xml:188
+#, fuzzy
 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 ""
 "GPT ディスクを用いた Legacy (CSM もしくは BIOS) システムをお使いの場合、BIOS "
 "ブート パーティションが存在しなければこれを作成する必要があります。これはマウ"
@@ -1739,36 +1970,29 @@ msgstr ""
 "\"/> を選択してファイル システムの種類を BIOS boot partition にすると、インス"
 "トーラが他のパーティションのようにこれを作成することができます。"
 
-#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:165
-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 align=\"center\" fileref="
-"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </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-doPartitionDisks4.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 ""
 "幾つかの新しいドライブは従来の標準である 512 バイトの論理セクタの代わりに "
 "4096 バイトの論理セクタを現在使用しています。利用可能なハードウェアが不足して"
@@ -1779,18 +2003,38 @@ msgstr ""
 "ツールを用いて事前にドライブのパーティションを設定しておき、以下の設定を用い"
 "ることを提案します:"
 
-#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:189
-msgid "<emphasis role=\"bold\">Align to</emphasis> = MiB"
+#. type: Content of: <section><important><para>
+#: en/doPartitionDisks.xml:221
+#, fuzzy
+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 ""
+"幾つかの新しいドライブは従来の標準である 512 バイトの論理セクタの代わりに "
+"4096 バイトの論理セクタを現在使用しています。利用可能なハードウェアが不足して"
+"いるため、インストーラで用いられるパーティション管理ツールはこのようなドライ"
+"ブをテストしていません。また、幾つかの SSD ドライブは現在 1 MB より大きな削除"
+"ブロック サイズを使用しています。そのようなデバイスをお持ちの場合、私たちは "
+"<emphasis role=\"bold\">gparted</emphasis> のような代替のパーティション管理"
+"ツールを用いて事前にドライブのパーティションを設定しておき、以下の設定を用い"
+"ることを提案します:"
+
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:228
+#, fuzzy
+msgid "<emphasis>Align to</emphasis> = MiB"
 msgstr "<emphasis role=\"bold\">アラインメント</emphasis> = MiB"
 
-#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:191
-msgid "<emphasis role=\"bold\">Free space preceding (MiB)</emphasis> = 2"
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:232
+#, fuzzy
+msgid "<emphasis>Free space preceding (MiB)</emphasis> = 2"
 msgstr "<emphasis role=\"bold\">前方の空き領域 (MiB)</emphasis> = 2"
 
-#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:194
+#. type: Content of: <section><important><para>
+#: en/doPartitionDisks.xml:236
 msgid ""
 "Also make sure all partitions are created using an even number of megabytes."
 msgstr ""
@@ -1798,38 +2042,40 @@ msgstr ""
 "ださい。"
 
 #. 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 "ライブ メディアからのインストール"
 
 #. 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 "2015 年 1 月"
+#: 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 "Mageia の公式ドキュメント"
 
 #. type: Content of: <book><info><cover><mediaobject>
-#: en/DrakLive-cover.xml:17
-msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+#: en/DrakLive-cover.xml:33 en/DrakX-cover.xml:30
+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/"
@@ -1841,8 +2087,8 @@ msgstr ""
 "可能です。"
 
 #. 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."
@@ -1853,8 +2099,7 @@ msgstr ""
 "助けを借りて作られました。"
 
 #. 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</"
@@ -1864,15 +2109,15 @@ msgstr ""
 "アルの改善を手助けしたいのであれば <link ns6:href=\"https://wiki.mageia.org/"
 "en/Documentation_team\">Documentation チーム</link>までご連絡をお願いします。"
 
-#. 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 "
@@ -1882,42 +2127,49 @@ msgstr ""
 "いでしょう。どの画面を見ることになるのかは、あなたのハードウェアとインストー"
 "ル時の選択内容によって変わります。"
 
-#. 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 ""
+"これはボランティアによってその自由な時間の中で書かれたものです。もし本マニュ"
+"アルの改善を手助けしたいのであれば <link ns6:href=\"https://wiki.mageia.org/"
+"en/Documentation_team\">Documentation チーム</link>までご連絡をお願いします。"
+
 #. 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 "DrakX を用いたインストール"
 
 #. type: Content of: <book><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:9
+#: en/DrakX-cover.xml:20
 msgid "February 2014"
 msgstr "2014 年 2 月"
 
 #. 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
-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 "おめでとうございます"
 
 #.  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
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
@@ -1926,26 +2178,27 @@ msgstr ""
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </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 ""
 "<application>Mageia</application> のインストールと設定は完了し、インストール "
 "メディアを取り除いてコンピュータを再起動しても安全です。"
 
 #. 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 ""
 "再起動後にブート ローダの画面でお使いのコンピュータ上のオペレーティング シス"
 "テムからいずれかを選択することができます (複数ある場合)。"
 
 #. 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."
@@ -1954,26 +2207,27 @@ msgstr ""
 "択されて開始します。"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:26
+#: en/exitInstall.xml:30
 msgid "Enjoy!"
 msgstr "お楽しみください!"
 
 #. 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 ""
 "何か質問があるか、もしくは Mageia に貢献したいのであれば www.mageia.org にア"
 "クセスしてください。"
 
 #. 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 "
@@ -1986,16 +2240,17 @@ msgstr ""
 "ターネットからアクセス可能にします。"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:12
+#: en/firewall.xml:16
+#, fuzzy
 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 ""
 "既定の設定 (どのボタンもチェックされていない状態) では、システムのどのサービ"
 "スもネットワークからアクセスできません。<emphasis role=\"bold\">すべて (ファ"
@@ -2006,38 +2261,40 @@ msgstr ""
 "べてのルールを無効化することです。"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:21
+#: en/firewall.xml:25
+#, fuzzy
 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 ""
 "他のすべての項目は多かれ少なかれ分かりやすいものです。例えば、マシン上のプリ"
 "ンタをネットワークからアクセス可能にしたい場合は <emphasis role=\"bold"
 "\">CUPS サーバ</emphasis>を有効にします。"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:25
+#: en/firewall.xml:29
 msgid "<emphasis role=\"bold\">Advanced</emphasis>"
 msgstr "<emphasis role=\"bold\">上級</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:27
+#: en/firewall.xml:31
+#, fuzzy
 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 ""
 "<emphasis role=\"bold\">上級</emphasis>の項目はウィンドウを開き、そこでは対の"
 "一覧 (空白区切り) を入力することで複数のサービスを有効にできます"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:31
+#: en/firewall.xml:35
 msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
 msgstr "<emphasis>&lt;ポート番号>/&lt;プロトコル></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 "
@@ -2048,7 +2305,7 @@ 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."
@@ -2058,7 +2315,7 @@ 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>."
@@ -2067,7 +2324,7 @@ msgstr ""
 "<emphasis>873/tcp</emphasis> となります。"
 
 #. 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."
@@ -2076,7 +2333,7 @@ msgstr ""
 "2 組を指定します。"
 
 #. type: Content of: <section><info><title>
-#: en/formatPartitions.xml:3
+#: en/formatPartitions.xml:10
 msgid "Formatting"
 msgstr "フォーマット"
 
@@ -2084,14 +2341,16 @@ msgstr "フォーマット"
 #.  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\" fileref="
 "\"dx2-formatPartitions.png\" xml:id=\"formatPartitions-im1\" align=\"center"
@@ -2100,7 +2359,7 @@ msgstr ""
 "\" fileref=\"live-formatPartitions.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:24
+#: en/formatPartitions.xml:35
 msgid ""
 "Here you can choose which partition(s) you wish to format. Any data on "
 "partitions <emphasis>not</emphasis> marked for formatting will be preserved."
@@ -2109,28 +2368,32 @@ msgstr ""
 "て<emphasis>いない</emphasis>パーティション内のデータは残ります。"
 
 #. 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 ""
 "通常は少なくとも DrakX が選択したパーティションはフォーマットする必要がありま"
 "す。"
 
 #. 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 ""
 "<guibutton>上級</guibutton>をクリックすると、いわゆる<emphasis>不良ブロック</"
 "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 ""
 "正しい選択をしたか自信がない場合、<guibutton>戻る</guibutton>をクリックして再"
 "度<guibutton>戻る</guibutton>をクリックし、次に<guibutton>カスタム</"
@@ -2138,20 +2401,21 @@ msgstr ""
 "内容を見ることができます。"
 
 #. 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 ""
 "選択に自信があれば、<guibutton>次へ</guibutton>をクリックして先に進みます。"
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:10
+#: en/installer.xml:14
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, Mageia インストーラ"
 
 #. 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 "
@@ -2161,341 +2425,247 @@ msgstr ""
 "ラは可能な限りインストールやアップグレードを容易に行えるよう手助けをするよう"
 "に設計されています。"
 
-#. 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 ""
-"最初のメニュー画面には様々な選択肢がありますが、既定の項目はインストールを開"
-"始するもので、通常必要になるのはこれです。"
-
 #. type: Content of: <section><section><title>
-#: en/installer.xml:22
-msgid "Installation Welcome Screen"
-msgstr "インストールのようこそ画面"
-
-#. type: Content of: <section><section><section><title>
-#: en/installer.xml:25
-msgid "Using a Mageia DVD"
-msgstr "Mageia の DVD を使用する"
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:27
-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 ""
-"以下は Mageia の DVD を使用した場合の既定のようこそ画面となり、一つめが UEFI "
-"システムで表示されるもので、二つめが Legacy システムのものとなります:"
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:32
-msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
+#: en/installer.xml:20
+msgid "The installation steps"
+msgstr "インストールのステップ"
 
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:37
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/installer.xml:23
+#, fuzzy
 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."
+"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 ""
-"この画面では、\"<emphasis role=\"bold\">e</emphasis>\" を押すと編集モードに"
-"入ってオプションを編集することができます。この画面に戻るには、<emphasis role="
-"\"bold\">Esc</emphasis> キーを押して保存せずに終了するか、<emphasis role="
-"\"bold\">Ctrl</emphasis> もしくは <emphasis role=\"bold\">F10</emphasis> を押"
-"して設定を保存して終了します。"
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:45
-msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
+"インストール手順は幾つかのステップに分かれており、その状態は画面の左にあるパ"
+"ネルに示されます。"
 
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:50
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/installer.xml:28
+#, fuzzy
 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):"
+"Each step has one or more screens, which may also have <emphasis>Advanced</"
+"emphasis> sections with extra, less commonly required options."
 msgstr ""
-"この画面では、幾つかの設定 (<emphasis role=\"bold\">F1</emphasis> から "
-"<emphasis role=\"bold\">F6</emphasis> のオプションは Legacy システムでのみ利"
-"用できます) を行うことが可能です:"
+"各ステップには一つ以上の画面があり、画面によっては追加の、あまり使われない項"
+"目のための<guibutton>上級</guibutton>セクションもあります。"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:55
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/installer.xml:33
+#, 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>"
+"Most screens have <emphasis>Help</emphasis> buttons for further details "
+"about the particular step."
 msgstr ""
-"<emphasis role=\"bold\">F2</emphasis> から <emphasis role=\"bold\">F6</"
-"emphasis> のいずれかにおいて、<emphasis role=\"bold\">F1</emphasis> を押すこ"
-"とで関連したヘルプが参照できます。"
+"ほとんどの画面には<guibutton>ヘルプ</guibutton>ボタンがあり、特定のステップに"
+"ついての詳細を見ることができます。"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:63
+#. type: Content of: <section><section><caution><para>
+#: en/installer.xml:38
+#, fuzzy
 msgid ""
-"Press <emphasis role=\"bold\">F2</emphasis> to have the installer use a "
-"specific language for the installation."
+"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 ""
-"<emphasis role=\"bold\">F2</emphasis> を押すとインストールに使用する言語を指"
-"定できます。"
+"インストールのどこかでインストールを中止しようと決めた場合、再起動してもかま"
+"いませんが、その前に二度考えてください。いったんパーティションがフォーマット"
+"されたりインストールのための更新処理が始まったりした場合、お使いのコンピュー"
+"タはもはや同じ状態ではなく、再起動を行うことはシステムを使用不能にするおそれ"
+"が大きいです。それでも再起動を強く望むのであれば、<guibutton>Alt Ctrl F2</"
+"guibutton> の三つのキーを同時に押してテキスト端末に移動します。その後、"
+"<guibutton>Alt Ctrl Delete</guibutton> を同時に押すと再起動します。"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:67
+#. type: Content of: <section><section><caution><para>
+#: en/installer.xml:43
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+"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 ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:72
-msgid ""
-"Use the arrow keys to select the language then press <emphasis role=\"bold"
-"\">Enter</emphasis>."
-msgstr ""
-"矢印キーを用いて言語を選択して <emphasis role=\"bold\">Enter</emphasis> を押"
-"します。"
+#. type: Content of: <section><section><title>
+#: en/installer.xml:48
+msgid "Installation Welcome Screen"
+msgstr "インストールのようこそ画面"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:77
+#. type: Content of: <section><section><para>
+#: en/installer.xml:49
 msgid ""
-"If needed, change the screen resolution by pressing <emphasis role=\"bold"
-"\">F3</emphasis> (Legacy mode only)."
+"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 ""
-"必要であれば、<emphasis role=\"bold\">F3</emphasis> を押して画面の解像度を変"
-"更します (Legacy モードのみ)。"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:81
+#. type: Content of: <section><section><para>
+#: en/installer.xml:52
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+"The welcome menu screen has various options, however the default option will "
+"start the installer, and is normally all that you will need."
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </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)."
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:56
+msgid "Legacy (BIOS) Systems"
 msgstr ""
-"インストールで問題が起きた場合、<emphasis role=\"bold\">F6</emphasis> の"
-"<emphasis role=\"bold\">カーネルのオプション</emphasis> を用いて既定の設定を"
-"変更してみるといいかもしれません (UEFI システムでは代わりに <emphasis role="
-"\"bold\">e</emphasis> を押します)。"
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/installer.xml:96
-msgid "Default: It doesn't alter anything in the default options."
-msgstr "デフォルト: 既定のオプションのまま変更を行いません。"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/installer.xml:101
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:58
+#, fuzzy
 msgid ""
-"Safe Settings: Priority is given to the safer options at the price of a "
-"performance detriment."
+"<imageobject> <imagedata fileref=\"dx-welcome.png\" align=\"center\"/> </"
+"imageobject>"
 msgstr ""
-"安全設定: パフォーマンスの低下と引き換えに、より安全なオプションを優先して指"
-"定します。"
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\"/"
+"> </imageobject>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/installer.xml:106
-msgid ""
-"No ACPI: (Advanced Configuration and Power Interface): Power management "
-"features are not used."
+#. type: Content of: <section><section><section><itemizedlist><title>
+#: en/installer.xml:63
+msgid "Menu"
 msgstr ""
-"ACPI なし: (Advanced Configuration and Power Interface): 電源管理機能が使用さ"
-"れません。"
 
-#. 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:66
 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."
+"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 ""
-"ローカル APIC なし: (Local Advanced Programmable Interrupt Controller): CPU "
-"割り込みです。APIC 関連のカーネル パニックのようなシステム誤動作を経験した場"
-"合はこの項目を選択します。"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:120
-msgid ""
-"When you select one of these entries, it modifies the default options "
-"displayed in the <guilabel>Boot Options</guilabel> line."
-msgstr ""
-"いずれかのエントリを選択すると、<guilabel>Boot Options</guilabel> の行に表示"
-"される既定のオプションを変更します。"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:69
+#, fuzzy
+msgid "<emphasis role=\"bold\">Rescue System</emphasis>"
+msgstr "<emphasis role=\"bold\">サーバ</emphasis>"
 
-#. 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:70
 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."
+"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 ""
-"幾つかの Mageia のリリースにおいて、<emphasis role=\"bold\">F6</emphasis> "
-"キーで選択されたエントリが<guilabel>起動オプション</guilabel>の行に現れないこ"
-"とがありますが、実際は反映されています。"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:132
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:75
+#, fuzzy
+msgid "<emphasis role=\"bold\">Memory Test</emphasis>"
+msgstr "<emphasis role=\"bold\">サーバ</emphasis>"
 
-#. 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:76
 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."
+"Test the installed RAM by performing multiple read and write operations. "
+"Reboot to end the test."
 msgstr ""
-"<emphasis role=\"bold\">F1</emphasis> を押すと様々な起動オプションについての"
-"ヘルプ ウィンドウが開きます。矢印キーで項目を選択して <emphasis role=\"bold"
-"\">Enter</emphasis> を押すと詳細を参照でき、<emphasis role=\"bold\">Esc</"
-"emphasis> キーを押すとようこそ画面に戻ります。"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:146
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:80
+#, fuzzy
+msgid "<emphasis role=\"bold\">F2: Language</emphasis>"
+msgstr "<emphasis role=\"bold\">上級</emphasis>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:151
-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><itemizedlist><listitem><para>
+#: en/installer.xml:81
+msgid "Press F2 for alternative languages."
 msgstr ""
-"splash オプションについての詳細表示です。<emphasis role=\"bold\">Esc</"
-"emphasis> を押すか<guilabel>起動オプションに戻る</guilabel>を選択するとオプ"
-"ション一覧に戻ります。これらのオプションは<guilabel>起動オプション</guilabel>"
-"の行に手動で追加することができます。"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:158
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:86
+msgid "UEFI Systems"
 msgstr ""
-"<imageobject> <imagedata 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><para>
+#: en/installer.xml:87
+#, fuzzy
 msgid ""
-"The help is translated in the chosen language with <emphasis role=\"bold"
-"\">F2</emphasis>."
+"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 ""
-"ヘルプは <emphasis role=\"bold\">F2</emphasis> キーで選択された言語に翻訳され"
-"ています。"
+"この画面では、\"<emphasis role=\"bold\">e</emphasis>\" を押すと編集モードに"
+"入ってオプションを編集することができます。この画面に戻るには、<emphasis role="
+"\"bold\">Esc</emphasis> キーを押して保存せずに終了するか、<emphasis role="
+"\"bold\">Ctrl</emphasis> もしくは <emphasis role=\"bold\">F10</emphasis> を押"
+"して設定を保存して終了します。"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:168
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:92
+#, fuzzy
 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 ""
-"legacy および UEFI システムにおけるカーネル オプションについての詳しい情報"
-"は、以下を参照してください: <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 "インストールのステップ"
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\"/"
+"> </imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/installer.xml:179
-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 ""
-"インストール手順は幾つかのステップに分かれており、その状態は画面の左にあるパ"
-"ネルに示されます。"
 
-#. type: Content of: <section><section><para>
-#: en/installer.xml:182
-msgid ""
-"Each step has one or more screens which may also have <guibutton>Advanced</"
-"guibutton> sections with extra, less commonly required, options."
-msgstr ""
-"各ステップには一つ以上の画面があり、画面によっては追加の、あまり使われない項"
-"目のための<guibutton>上級</guibutton>セクションもあります。"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:99
+#, fuzzy
+msgid "<emphasis role=\"bold\">Install:</emphasis> Start the Install process"
+msgstr "<emphasis role=\"bold\">アラインメント</emphasis> = MiB"
 
-#. type: Content of: <section><section><para>
-#: en/installer.xml:186
+#. 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 ""
-"ほとんどの画面には<guibutton>ヘルプ</guibutton>ボタンがあり、特定のステップに"
-"ついての詳細を見ることができます。"
 
-#. 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 ""
-"インストールのどこかでインストールを中止しようと決めた場合、再起動してもかま"
-"いませんが、その前に二度考えてください。いったんパーティションがフォーマット"
-"されたりインストールのための更新処理が始まったりした場合、お使いのコンピュー"
-"タはもはや同じ状態ではなく、再起動を行うことはシステムを使用不能にするおそれ"
-"が大きいです。それでも再起動を強く望むのであれば、<guibutton>Alt Ctrl F2</"
-"guibutton> の三つのキーを同時に押してテキスト端末に移動します。その後、"
-"<guibutton>Alt Ctrl Delete</guibutton> を同時に押すと再起動します。"
+"USB スティックからブートした場合、二つの \"USB\" で終わる同様の行が追加されま"
+"す。これらから選択を行う必要があります。"
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:203
+#: en/installer.xml:115
 msgid "Installation Problems and Possible Solutions"
 msgstr "インストールの問題と解決法"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:206
+#: en/installer.xml:117
 msgid "No Graphical Interface"
 msgstr "グラフィカル インターフェースが表示されない"
 
 #. 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 ""
 "最初の画面の後に言語選択画面にたどり着きませんでした。これは幾つかのグラ"
 "フィック カードや古いシステムで起こりえます。プロンプトで <code>vgalo</code> "
 "と入力して低い解像度を試してください。"
 
 #. 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 ""
 "ハードウェアが非常に古い場合、グラフィカルなインストールはできない可能性があ"
 "ります。この場合テキスト モード インストールを試してみる価値があります。これ"
@@ -2505,18 +2675,19 @@ msgstr ""
 "\">ENTER</emphasis> を押し、テキスト モードでインストールを続行します。"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:230
+#: en/installer.xml:138
 msgid "The Install Freezes"
 msgstr "インストール時にフリーズする"
 
 #. 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 ""
 "インストールの間にシステムがフリーズしたように思われる場合、ハードウェアの検"
 "出の問題の可能性があります。この場合、ハードウェアの自動検出を避けて後で行う"
@@ -2525,17 +2696,19 @@ msgstr ""
 "ます。"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:240
+#: en/installer.xml:146
 msgid "RAM problem"
 msgstr "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 ""
 "滅多に必要にはなりませんが、場合によってはハードウェアが利用可能な RAM を間"
 "違って報告する可能性があります。これを手動で指定するには、<code>mem=xxxM</"
@@ -2543,19 +2716,20 @@ msgstr ""
 "えば <code>mem=256M</code> は 256MB の RAM を指定します。"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:249
+#: en/installer.xml:154
 msgid "Dynamic partitions"
 msgstr "ダイナミック パーティション"
 
 #. 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 ""
 "Microsoft Windows でハード ディスクを<emphasis role=\"bold\">ベーシック</"
 "emphasis>形式から<emphasis role=\"bold\">ダイナミック</emphasis>形式に変換済"
@@ -2566,18 +2740,15 @@ msgstr ""
 "com/ja-jp/library/cc776315.aspx</link>"
 
 #. type: Content of: <section><info><title>
-#: en/installUpdates.xml:3
+#: en/installUpdates.xml:16
 msgid "Updates"
 msgstr "更新"
 
-#.  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 ""
@@ -2586,96 +2757,112 @@ 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 ""
 "このバージョンの <application>Mageia</application> が公開されたので、幾つかの"
 "パッケージは更新もしくは改善されているでしょう。"
 
-#. type: Content of: <section><para>
-#: en/installUpdates.xml:24
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installUpdates.xml:30
 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>Yes</emphasis> if you wish to download and install them"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installUpdates.xml:35
+#, fuzzy
+msgid ""
+"Select <emphasis>No</emphasis> if you don't want to do this now, or if you "
 "aren't connected to the Internet"
 msgstr ""
 "これらをダウンロードおよびインストールしたい場合は<guilabel>はい</guilabel>"
 "を、すぐにこれを行いたくないか、もしくはインターネットに接続していない場合は"
 "<guilabel>いいえ</guilabel>を選択します。"
 
-#. type: Content of: <section><para>
-#: en/installUpdates.xml:29
-msgid "Press <guibutton>Next</guibutton> to continue"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installUpdates.xml:40
+#, fuzzy
+msgid "Press <emphasis>Next</emphasis> to continue"
 msgstr "<guibutton>次へ</guibutton>を押すと続行します。"
 
 #. type: Content of: <section><info><title>
-#: en/login.xml:1
-msgid "Login screen"
+#: en/login.xml:4
+#, fuzzy
+msgid "Login Screen"
 msgstr "ログイン画面"
 
 #. 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 のログイン画面"
 
 #. 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 "最後に、ログイン画面が表示されます。"
 
 #. 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 ""
 "あなたのユーザ名とユーザ パスワードを入力し、数秒間の内に KDE もしくは GNOME "
 "デスクトップが読み込まれます。これはどのライブ メディアを使用しているかによっ"
 "て異なります。これで、インストールした Mageia を使い始めることができます。"
 
 #. 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 ""
 "私たちの他のドキュメントは <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 "メディアの選択 (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
+#: en/media_selection.xml:24
+#, fuzzy
 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=\"media_selection-im1\" align="
-"\"center\" revision=\"1\" fileref=\"dx2-media_selection.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-bestTime.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"bestTime-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 "
@@ -2687,7 +2874,7 @@ msgstr ""
 "は次のステップからどのパッケージが選択可能となるかに影響します。"
 
 #. 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."
@@ -2696,12 +2883,13 @@ msgstr ""
 "でいるため、無効化できません。"
 
 #. 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 ""
 "<emphasis>Nonfree</emphasis> リポジトリは無料のパッケージを含んでおり、言い換"
@@ -2711,7 +2899,7 @@ msgstr ""
 "色々な WiFi カードなどのファームウェアを含んでいます。"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:40
+#: en/media_selection.xml:50
 msgid ""
 "The <emphasis>Tainted</emphasis> repository includes packages released under "
 "a free license. The main criteria for placing packages in this repository is "
@@ -2731,32 +2919,14 @@ msgid "Minimal Install"
 msgstr "最小構成インストール"
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:11
-msgid ""
-"You can choose a Minimal Installation by de-selecting everything in the "
-"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"/>."
-msgstr ""
-"パッケージ グループの選択画面ですべてを選択解除することで最小構成インストール"
-"を選択できます。<xref linkend=\"choosePackageGroups\"/> をご覧ください。"
-
-#. type: Content of: <section><para>
-#: en/minimal-install.xml:14
-msgid ""
-"If desired, you can additionally tick the <emphasis role=\"bold\">Individual "
-"package selection</emphasis> option in the same screen."
-msgstr ""
-"お望みであれば、同画面の<emphasis role=\"bold\">パッケージを個別に選択</"
-"emphasis>を追加でチェックすることができます。"
-
-#. 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 ""
 "最小構成のインストールは <application>Mageia</application> をサーバや専門の"
 "ワークステーションといった特定の用途を念頭に置いて使用することが意図されま"
@@ -2764,32 +2934,57 @@ msgstr ""
 "選択</emphasis>と組み合わせて行うことになるでしょう。インストールを細かく調整"
 "するには、<xref linkend=\"choosePackagesTree\"/> を参照してください。"
 
-#. type: Content of: <section><para>
-#: en/minimal-install.xml:22
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/minimal-install.xml:24
+#, fuzzy
+msgid ""
+"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 ""
+"パッケージ グループの選択画面ですべてを選択解除することで最小構成インストール"
+"を選択できます。<xref linkend=\"choosePackageGroups\"/> をご覧ください。"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/minimal-install.xml:28
+#, 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."
+"If desired, you can additionally tick the <emphasis>Individual package "
+"selection</emphasis> option in the same screen."
+msgstr ""
+"お望みであれば、同画面の<emphasis role=\"bold\">パッケージを個別に選択</"
+"emphasis>を追加でチェックすることができます。"
+
+#. 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 ""
 "このインストール方法を選択した場合、関連する画面でドキュメントや X のような有"
 "用な追加パッケージを少しインストールすることになるでしょう。"
 
-#. type: Content of: <section><para>
-#: en/minimal-install.xml:26
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/minimal-install.xml:37
+#, fuzzy
 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 ""
 "<emphasis role=\"bold\">X を使う</emphasis>を選択した場合、IceWM (軽量なデス"
 "クトップ環境) も含まれます。"
 
 #. 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 ""
 "基本的なドキュメントは man と info のページとして提供されます。これは <link "
 "xlink:href=\"http://www.tldp.org/manpages/man.html\">Linux Documentation "
@@ -2797,7 +2992,7 @@ msgstr ""
 "software/coreutils/manual/\">GNU coreutils</link> の info ページを含みます。"
 
 #. type: Content of: <section><mediaobject>
-#: en/minimal-install.xml:35
+#: en/minimal-install.xml:48
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"minimal-install-im1\" align="
 "\"center\" fileref=\"dx2-minimal-install.png\" revision=\"1\"/> </"
@@ -2809,31 +3004,40 @@ msgstr ""
 
 #. type: Content of: <section><info><title>
 #: en/misc-params.xml:3
-msgid "Summary of miscellaneous parameters"
-msgstr "雑多なパラメータの概要"
+#, fuzzy
+msgid "Configuration Summary"
+msgstr "サウンドの設定"
 
 #.  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=\"dx2-summaryTop.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 はあなたの行った選択と検出されたハードウェアによってお使いのシステムの"
 "設定を提案します。その設定はここで確認することができ、これらは<guibutton>設定"
 "</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:"
@@ -2841,47 +3045,50 @@ 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
+#, fuzzy
+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 "システムのパラメータ"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:45
-msgid "<guilabel>Timezone</guilabel>"
-msgstr "<guilabel>タイム ゾーン</guilabel>"
+#: en/misc-params.xml:54
+#, fuzzy
+msgid "<emphasis role=\"bold\">Timezone</emphasis>"
+msgstr "<emphasis role=\"bold\">サーバ</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 は指定された言語からタイム ゾーンを選択します。必要があれば変更すること"
 "ができます。<xref linkend=\"configureTimezoneUTC\"/> も参照してください。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:53
-msgid "<guilabel>Country / Region</guilabel>"
-msgstr "<guilabel>国 / 地域</guilabel>"
+#: en/misc-params.xml:62
+#, fuzzy
+msgid "<emphasis role=\"bold\">Country / Region</emphasis>"
+msgstr "<emphasis role=\"bold\">ワークステーション</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:56
+#: en/misc-params.xml:64
 msgid ""
 "If the selected country is wrong, it is very important that you correct the "
 "setting.  See <xref linkend=\"selectCountry\"/>"
@@ -2890,46 +3097,49 @@ msgstr ""
 "す。<xref linkend=\"selectCountry\"/> を参照してください。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:62
-msgid "<guilabel>Bootloader</guilabel>"
-msgstr "<guilabel>ブート ローダ</guilabel>"
+#: en/misc-params.xml:70
+#, fuzzy
+msgid "<emphasis role=\"bold\">Bootloader</emphasis>"
+msgstr "<emphasis role=\"bold\">サーバ</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 はブート ローダの設定に対してよい選択をしました。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:67
-msgid "Do not change anything, unless you know how to configure GRUB2"
+#: en/misc-params.xml:75
+#, fuzzy
+msgid ""
+"Do not change anything, unless you know how to configure GRUB2. For more "
+"information, see <xref linkend=\"setupBootloader\"/>"
 msgstr "GRUB2 の設定方法をご存知でなければ、何も変更しないでください。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:70
-msgid "For more information, see <xref linkend=\"setupBootloader\"/>"
-msgstr "詳しい情報は、<xref linkend=\"setupBootloader\"/> を参照してください。"
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:75
-msgid "<guilabel>User management</guilabel>"
-msgstr "<guilabel>ユーザの管理</guilabel>"
+#: en/misc-params.xml:83
+#, fuzzy
+msgid "<emphasis role=\"bold\">User management</emphasis>"
+msgstr "<emphasis role=\"bold\">サーバ</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 ""
 "ここでユーザを追加することができます。各ユーザには自分の <literal>/home</"
 "literal> ディレクトリが用意されます。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:84
-msgid "<guilabel>Services</guilabel>:"
-msgstr "<guilabel>サービス</guilabel>:"
+#: en/misc-params.xml:91
+#, fuzzy
+msgid "<emphasis role=\"bold\">Services</emphasis>"
+msgstr "<emphasis role=\"bold\">サーバ</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:86
+#: en/misc-params.xml:93
 msgid ""
 "System services refer to those small programs which run in the background "
 "(daemons).  This tool allows you to enable or disable certain processes."
@@ -2938,32 +3148,29 @@ msgstr ""
 "す。このツールでは特定のプロセスを有効化もしくは無効化できます。"
 
 #. 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 ""
 "ここにあるどれを変更するとしても、その前に慎重に確認してください - 間違えると"
 "コンピュータが正しく動作しなくなるかもしれません。"
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:94
-msgid "For more information, see <xref linkend=\"configureServices\"/>"
-msgstr ""
-"詳しい情報は、<xref linkend=\"configureServices\"/> を参照してください。"
-
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:101
+#: en/misc-params.xml:106
 msgid "Hardware parameters"
 msgstr "ハードウェアのパラメータ"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:106
-msgid "<guilabel>Keyboard</guilabel>:"
-msgstr "<guilabel>キーボード</guilabel>:"
+#: en/misc-params.xml:111
+#, fuzzy
+msgid "<emphasis role=\"bold\">Keyboard</emphasis>"
+msgstr "<emphasis role=\"bold\">サーバ</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:108
+#: en/misc-params.xml:113
 msgid ""
 "Configure your keyboard layout according to your location, language and type "
 "of keyboard."
@@ -2971,7 +3178,7 @@ msgstr ""
 "あなたの場所, 言語, キーボード種別に合わせてキーボード配列の設定を行います。"
 
 #. 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."
@@ -2980,12 +3187,13 @@ msgstr ""
 "ワードも変更されることになるということをご留意ください。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:119
-msgid "<guilabel>Mouse</guilabel>:"
-msgstr "<guilabel>マウス</guilabel>:"
+#: en/misc-params.xml:124
+#, fuzzy
+msgid "<emphasis role=\"bold\">Mouse</emphasis>"
+msgstr "<emphasis role=\"bold\">サーバ</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."
@@ -2994,40 +3202,42 @@ msgstr ""
 "り設定したりできます。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:126
-msgid "<guilabel>Sound card</guilabel>:"
-msgstr "<guilabel>サウンド カード</guilabel>:"
+#: en/misc-params.xml:131
+#, fuzzy
+msgid "<emphasis role=\"bold\">Sound card</emphasis>"
+msgstr "<emphasis role=\"bold\">上級</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:129
+#: 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 ""
-"インストーラは既定のドライバが存在する場合にこれを使用します。異なるドライバ"
-"を選択するための項目は、お使いのカードに対して複数のドライバが存在する場合に"
-"のみ利用できますが、そのいずれも既定のドライバとはなりません。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:137
-msgid "<guilabel>Graphical interface</guilabel>:"
-msgstr "<guilabel>グラフィカル インターフェース</guilabel>:"
+#: en/misc-params.xml:144
+#, fuzzy
+msgid "<emphasis role=\"bold\">Graphical interface</emphasis>"
+msgstr "<emphasis role=\"bold\">グラフィカル環境</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 ""
 "このセクションではお使いのグラフィック カードとディスプレイの設定が可能です。"
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:143
-msgid "For more information, see <xref linkend=\"configureX_chooser\"/>."
-msgstr ""
-"詳しい情報は、<xref linkend=\"configureX_chooser\"/> を参照してください。"
-
 #. type: Content of: <section><section><mediaobject>
-#: en/misc-params.xml:149
+#: en/misc-params.xml:155
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
 "\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
@@ -3036,21 +3246,23 @@ msgstr ""
 "\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"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 "ネットワークとインターネットのパラメータ"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:163
-msgid "<guilabel>Network</guilabel>:"
-msgstr "<guilabel>ネットワーク</guilabel>:"
+#: en/misc-params.xml:169
+#, fuzzy
+msgid "<emphasis role=\"bold\">Network</emphasis>"
+msgstr "<emphasis role=\"bold\">サーバ</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 ""
 "ここであなたのネットワークを設定できますが、非フリーなドライバを使用するネッ"
@@ -3059,7 +3271,7 @@ msgstr ""
 "いて設定したほうがよいでしょう。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:172
+#: en/misc-params.xml:178
 msgid ""
 "When you add a network card, do not forget to set your firewall to monitor "
 "that interface as well."
@@ -3068,15 +3280,17 @@ msgstr ""
 "インターフェースを監視するようにしてください。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:179
-msgid "<guilabel>Proxies</guilabel>:"
-msgstr "<guilabel>プロキシ</guilabel>:"
+#: en/misc-params.xml:185
+#, fuzzy
+msgid "<emphasis role=\"bold\">Proxies</emphasis>"
+msgstr "<emphasis role=\"bold\">サーバ</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 ""
 "プロキシ サーバはあなたのコンピュータとより広いインターネットとの間の仲介者の"
@@ -3084,66 +3298,74 @@ msgstr ""
 "るように設定することができます。"
 
 #. 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 ""
 "ここで入力する必要のあるパラメータを得るためにシステム管理者に相談する必要が"
 "あるかもしれません。"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:195
+#: en/misc-params.xml:201
 msgid "Security"
 msgstr "セキュリティ"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:200
-msgid "<guilabel>Security Level</guilabel>:"
-msgstr "<guilabel>セキュリティ レベル</guilabel>:"
+#: en/misc-params.xml:206
+#, fuzzy
+msgid "<emphasis role=\"bold\">Security Level</emphasis>"
+msgstr "<emphasis role=\"bold\">サーバ</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 ""
 "ここではコンピュータのセキュリティ レベルを設定し、ほとんどの場合において既定"
 "の設定 (Standard) が一般的な用途で適切です。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:207
-msgid "Check the option which best suits your usage."
-msgstr "どの選択肢が最もあなたの用途に適しているかを確認してください。"
+#: en/misc-params.xml:215
+#, fuzzy
+msgid "<emphasis role=\"bold\">Firewall</emphasis>"
+msgstr "<emphasis role=\"bold\">サーバ</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:212
-msgid "<guilabel>Firewall</guilabel>:"
-msgstr "<guilabel>ファイアウォール</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 ""
-"ファイアウォールはあなたの大事なデータとこれを危険に晒したり盗んだりするよう"
-"なインターネット上の悪い人たちとの間の防壁であると意図されます。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:218
-msgid ""
-"Select the services that you wish to have access to your system. Your "
-"selections will depend on what you use your computer for. For more "
-"information, see <xref linkend=\"firewall\"/>."
+#: en/misc-params.xml:229
+#, fuzzy
+msgid "For more information, see <xref linkend=\"firewall\"/>."
 msgstr ""
-"システムへのアクセスを許可したいサービスを選択します。どれを選択するかはお使"
-"いのコンピュータの用途次第です。詳しい情報は、<xref linkend=\"firewall\"/> を"
-"参照してください。"
+"詳しい情報は、<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 ""
 "すべてを許可すること (ファイアウォールなし) はとても危険になりうるということ"
 "をご留意ください。"
@@ -3154,36 +3376,51 @@ msgid "Reboot"
 msgstr "再起動"
 
 #. 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 ""
 "ブート ローダがインストールされ次第、コンピュータを停止するように促され、ライ"
 "ブ CD を取り除いてコンピュータを再起動します。<emphasis role=\"bold"
 "\"><guibutton>完了</guibutton></emphasis>をクリックし、指示通りに<emphasis "
 "role=\"bold\">この順番で作業してください!</emphasis>"
 
+#. 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
-msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
+#: en/reboot.xml:12
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot2.png\"/> </"
+"imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"live-reboot2.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 ""
 "再起動の際、ダウンロードのプログレス バーが連続して表示されます。これはソフト"
 "ウェア メディアの一覧がダウンロード中であることを示しています (ソフトウェアの"
 "管理を参照してください)。"
 
 #. type: Content of: <section><mediaobject>
-#: en/reboot.xml:17
+#: en/reboot.xml:19
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
 "reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
@@ -3212,23 +3449,25 @@ msgstr ""
 "めの領域を確保するためにどのパーティションを小さくするかを選択します。"
 
 #. type: Content of: <section><info><title>
-#: en/securityLevel.xml:3
+#: en/securityLevel.xml:10
 msgid "Security Level"
 msgstr "セキュリティ レベル"
 
 #.  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=\"securityLevel-im1\" align="
-"\"center\" fileref=\"dx2-securityLevel.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
 msgid ""
 "<emphasis role=\"bold\">Please choose the desired security level</emphasis>"
 msgstr ""
@@ -3236,12 +3475,18 @@ msgstr ""
 "emphasis>"
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:19
+#: en/securityLevel.xml:29
+msgid ""
+"<emphasis>Standard</emphasis> is the default, and recommended setting for "
+"the average user."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:32
+#, fuzzy
 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>Secure</emphasis> will create a highly protected system - for "
+"instance if the system is to be used as a public server."
 msgstr ""
 "<emphasis role=\"bold\">Standard</emphasis> は既定かつ標準的なユーザ向けに推"
 "奨される設定です。<emphasis role=\"bold\">Secure</emphasis> の設定は高度に保"
@@ -3249,12 +3494,12 @@ msgstr ""
 "です。"
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:24
+#: en/securityLevel.xml:36
 msgid "<emphasis role=\"bold\">Security Administrator</emphasis>"
 msgstr "<emphasis role=\"bold\">セキュリティ管理者</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 "
@@ -3264,16 +3509,17 @@ msgstr ""
 "キュリティ警告メッセージ</emphasis>を送信するメール アドレスを設定できます。"
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:31
+#: en/securityLevel.xml:43
+#, fuzzy
 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 ""
 "&lt;user>@localhost を入力するのが好ましく、かつ簡単な選択です。&lt;user> は"
 "これらのメッセージを受け取るユーザのログイン名です。"
 
 #. 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 "
@@ -3285,26 +3531,27 @@ 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 ""
 "インストール後は、Mageia コントロール センターの<guilabel>セキュリティ</"
 "guilabel> セクション内でセキュリティ設定をいつでも調整できます。"
 
 #. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:6
+#: en/SelectAndUseISOs2.xml:15
 msgid "Select and use ISOs"
 msgstr "ISO の選択と使用"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:9
+#: en/SelectAndUseISOs2.xml:18
 msgid "Introduction"
 msgstr "はじめに"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:10
+#: en/SelectAndUseISOs2.xml:19
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
 "which image best suits your needs."
@@ -3313,62 +3560,113 @@ msgstr ""
 "メージの選択を手助けします。"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:12
-msgid "There are two families of media:"
+#: en/SelectAndUseISOs2.xml:21
+#, fuzzy
+msgid "There are three types of installation media:"
 msgstr "メディアには二つの種類があります:"
 
 #. 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 ""
 "クラシック インストーラ: このメディアで起動すると何をインストールするかやシス"
 "テムの設定に対して最大限柔軟に進めることができます。特に、どのデスクトップ環"
 "境をインストールするかの選択が行えます。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:21
+#: en/SelectAndUseISOs2.xml:31
+#, 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"
+"<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 ""
 "ライブ メディア: この選択では実際にインストールしたりお使いのコンピュータに変"
 "更を加えたりせずに Mageia を試すことが可能です。インストールしようと決めた場"
 "合、そのプロセスはよりシンプルですが、クラシック インストーラが提供するよりも"
 "選択できることは少ないです。"
 
+#. 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\">ライブ ISO はクリーン インストールの際にのみ使用で"
+"き、以前インストールした Mageia のリリースをアップグレードするのに用いること"
+"はできません。</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 ""
+"drakx インストーラを開始したり、drakx-installer-stage2 とインストールの続行お"
+"よび完了に必要な他のパッケージを見つけたりするのに必要なもの以外を含まない最"
+"小限の ISO があります。これらのパッケージは PC のハード ディスク, ローカル ド"
+"ライブ, ローカル ネットワーク, インターネットにあってもかまいません。"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:53
+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 ""
+"これらのメディアは非常に軽量 (100 MB 未満) で、DVD 全体をダウンロードするのに"
+"帯域幅が狭すぎる場合, DVD ドライブのない PC をお持ちの場合, USB スティックか"
+"らブートできない場合に便利です。"
+
 #. 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 "詳細は次のセクションで説明します。"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:30
+#: en/SelectAndUseISOs2.xml:61
 msgid "Media"
 msgstr "メディア"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:32
+#: en/SelectAndUseISOs2.xml:63
 msgid "Definition"
 msgstr "定義"
 
 #. 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 ""
 "ここで、メディアとは Mageia のインストールや更新を行えるようにする ISO イメー"
 "ジ ファイルのことで、延長線上で考えると ISO ファイルの内容を書き込んだ物理的"
 "な媒体 (DVD, USB スティックなど) です。"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:36
+#: en/SelectAndUseISOs2.xml:67
 msgid ""
 "You can find Mageia ISO's <link ns4:href=\"http://www.mageia.org/en/"
 "downloads/\">here</link>."
@@ -3377,269 +3675,270 @@ msgstr ""
 "</link>で見つかります。"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:39
+#: en/SelectAndUseISOs2.xml:70
 msgid "Classical installation media"
 msgstr "クラシック インストール メディア"
 
 #. 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 "共通の機能"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:44
-msgid "These ISOs use the Classical installer called drakx."
+#: en/SelectAndUseISOs2.xml:75
+#, fuzzy
+msgid "These ISOs use the Classical installer called DrakX"
 msgstr "これらの ISO は 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 ""
 "これらはクリーン インストールもしくは以前インストールしたバージョンの Mageia "
 "をアップグレードするために用いられます。"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:51 en/SelectAndUseISOs2.xml:83
-#: en/SelectAndUseISOs2.xml:158
-msgid "Different media for 32 and 64 bit architectures."
+#: en/SelectAndUseISOs2.xml:82 en/SelectAndUseISOs2.xml:118
+#: en/SelectAndUseISOs2.xml:174
+#, fuzzy
+msgid "Different media for 32 and 64-bit architectures"
 msgstr "32 ビットと 64 ビットのアーキテクチャでメディアは異なります。"
 
 #. 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 ""
 "ようこそ画面で幾つかのツールが利用できます: Rescue System, Memory Test, "
 "Hardware Detection Tool"
 
 #. 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 "各 DVD はたくさんの利用可能なデスクトップ環境や言語を含んでいます。"
 
 #. 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 ""
 "インストール時に非フリーのソフトウェアを追加するか選択することになります。"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:69
+#: en/SelectAndUseISOs2.xml:102
 msgid "Live media"
 msgstr "ライブ メディア"
 
 #. 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 ""
 "インストールをせずに Mageia オペレーティング システムを下調べするために使用で"
 "き、お望みであれば Mageia をインストールするために用いることもできます。"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:79
-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 ""
-"各 ISO は一つのデスクトップ環境 (Plasma, GNOME, Xfce) しか含んでいません。"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:86
-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>"
+#: en/SelectAndUseISOs2.xml:114
+#, fuzzy
+msgid "Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)"
 msgstr ""
-"<emphasis role=\"bold\">ライブ ISO はクリーン インストールの際にのみ使用で"
-"き、以前インストールした Mageia のリリースをアップグレードするのに用いること"
-"はできません。</emphasis>"
+"各 ISO は一つのデスクトップ環境 (Plasma, GNOME, Xfce) しか含んでいません。"
 
 #. 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 "これらは非フリーのソフトウェアを含んでいます。"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:96
+#: en/SelectAndUseISOs2.xml:126
 msgid "Live DVD Plasma"
 msgstr "ライブ DVD Plasma"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:99
-msgid "Plasma desktop environment only."
+#: en/SelectAndUseISOs2.xml:129
+#, fuzzy
+msgid "Plasma desktop environment only"
 msgstr "Plasma デスクトップ環境のみとなります。"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:102 en/SelectAndUseISOs2.xml:116
-#: en/SelectAndUseISOs2.xml:130
-msgid "All available languages are present."
+#: en/SelectAndUseISOs2.xml:132 en/SelectAndUseISOs2.xml:146
+#: en/SelectAndUseISOs2.xml:160
+#, fuzzy
+msgid "All available languages are present"
 msgstr "すべての利用可能な言語が含まれます。"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:105
-msgid "64 bit architecture only."
+#: en/SelectAndUseISOs2.xml:135 en/SelectAndUseISOs2.xml:149
+#, fuzzy
+msgid "64-bit architecture only"
 msgstr "64 ビット アーキテクチャ専用です。"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:110
+#: en/SelectAndUseISOs2.xml:140
 msgid "Live DVD GNOME"
 msgstr "ライブ 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 "GNOME デスクトップ環境のみとなります。"
 
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:119
-msgid "64 bit architecture only"
-msgstr "64 ビット アーキテクチャ専用です。"
-
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:124
+#: en/SelectAndUseISOs2.xml:154
 msgid "Live DVD Xfce"
 msgstr "ライブ DVD Xfce"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:127
-msgid "Xfce desktop environment only."
+#: en/SelectAndUseISOs2.xml:157
+#, fuzzy
+msgid "Xfce desktop environment only"
 msgstr "Xfce デスクトップ環境のみとなります。"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:133
-msgid "32 or 64 bit architectures."
+#: en/SelectAndUseISOs2.xml:163
+#, fuzzy
+msgid "32 or 64-bit architectures"
 msgstr "32 ビットと 64 ビットのアーキテクチャに対応しています。"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:139
+#: en/SelectAndUseISOs2.xml:169
 msgid "Net install media"
 msgstr "ネット インストール メディア"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:144
-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 ""
-"drakx インストーラを開始したり、drakx-installer-stage2 とインストールの続行お"
-"よび完了に必要な他のパッケージを見つけたりするのに必要なもの以外を含まない最"
-"小限の ISO があります。これらのパッケージは PC のハード ディスク, ローカル ド"
-"ライブ, ローカル ネットワーク, インターネットにあってもかまいません。"
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:152
-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 ""
-"これらのメディアは非常に軽量 (100 MB 未満) で、DVD 全体をダウンロードするのに"
-"帯域幅が狭すぎる場合, DVD ドライブのない PC をお持ちの場合, USB スティックか"
-"らブートできない場合に便利です。"
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:161
-msgid "First steps are English language only."
+#: en/SelectAndUseISOs2.xml:177
+#, fuzzy
+msgid "First steps are English language only"
 msgstr "最初のステップ群は英語のみとなります。"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:166
+#: en/SelectAndUseISOs2.xml:182
 msgid "netinstall.iso"
 msgstr "netinstall.iso"
 
 #. 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 ""
 "フリー ソフトウェアのみを含んでおり、非フリーのソフトウェアを使用しないことを"
 "好む方々に向けたものとなります。"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:175
+#: en/SelectAndUseISOs2.xml:191
 msgid "netinstall-nonfree.iso"
 msgstr "netinstall-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 ""
 "非フリーのソフトウェア (大部分はドライバやコーデックなど) を含んでおり、これ"
 "を必要とする方々に向けたものです。"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:186
+#: en/SelectAndUseISOs2.xml:202
 msgid "Downloading and Checking Media"
 msgstr "メディアのダウンロードとチェック"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:188
+#: en/SelectAndUseISOs2.xml:204
 msgid "Downloading"
 msgstr "ダウンロード"
 
 #. 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 ""
 "ISO ファイルを選択したら、いつでも http もしくは BitTorrent でダウンロードす"
 "ることができます。いずれの場合においても、使用されるミラーや帯域幅が狭すぎる"
 "場合の変更の機会のような幾つかの情報が提供されます。http が選択された場合、"
 "チェックサムについて表示されます。"
 
+#. 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: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:191
-msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
+#: en/SelectAndUseISOs2.xml:217
+#, fuzzy
+msgid ""
+"<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:195
-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:"
+#: en/SelectAndUseISOs2.xml:222
+msgid "In the meantime, a window to download the actual ISO will open:"
 msgstr ""
-"md5sum と sha1sum は ISO の完全性をチェックするツールです。これらのいずれかを"
-"選び、チェックサムを<link linkend=\"integrity\">後で使用するために</link>コ"
-"ピーしておいてください。次に、これと似たようなウィンドウが現れます:"
 
 #. 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."
-msgstr "ファイルを保存する選択肢を選び、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
 msgid "Checking the integrity of the downloaded media"
 msgstr "ダウンロードしたメディアの完全性をチェックする"
 
 #. 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 ""
 "先述したチェックサムは、ダウンロードするファイルからアルゴリズムにより生成さ"
 "れた電子指紋です。ダウンロードした ISO のチェックサムをオリジナルのソース "
@@ -3648,7 +3947,7 @@ msgstr ""
 "BitTorrent で修復を試みるべきです。"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:214
+#: en/SelectAndUseISOs2.xml:241
 msgid ""
 "To generate the checksum for your downloaded ISO, open a console, (no need "
 "to be root), and:"
@@ -3657,71 +3956,87 @@ msgstr ""
 "る必要はありません)、以下を行います:"
 
 #. 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 ""
 "md5sum を用いるには、以下を入力します: <userinput>md5sum path/to/the/image/"
 "file.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 ""
+"sha1sum を使用するには、以下を入力します: <userinput>sha1sum path/to/the/"
+"image/file.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 ""
 "sha1sum を使用するには、以下を入力します: <userinput>sha1sum path/to/the/"
 "image/file.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 ""
 "その後、結果 (しばらく待つ必要があるかもしれません) を Mageia により提供され"
 "るチェックサムと比較します。"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:237
+#: en/SelectAndUseISOs2.xml:270
 msgid "Burn or dump the ISO"
 msgstr "ISO を焼くか書き込む"
 
 #. 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 ""
 "確認済みの ISO は CD や DVD に焼くか、もしくは USB スティックに書き込むことが"
 "できます。これは単純なコピーではなく、ブート可能なメディアを作成するもので"
 "す。"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:275
 msgid "Burning the ISO to a CD/DVD"
 msgstr "ISO を 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 ""
 "どのソフトウェアを用いる場合も、<emphasis role=\"bold\">イメージ</emphasis>と"
 "して焼くように設定されているかを確認し、<emphasis role=\"bold\">データ</"
@@ -3730,47 +4045,55 @@ msgstr ""
 "\">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 "ISO を USB スティックに書き込む"
 
 #. 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 ""
 "すべての Mageia の ISO はハイブリッドです。これはこれらを USB スティックに "
 "'書き込む' ことができ、かつブートしてシステムをインストールするのに使用できる"
 "ことを意味します。"
 
 #. 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 ""
 "フラッシュ デバイスへのイメージの \"書き込み\" はデバイス上のすべての既存の"
 "ファイル システムを破壊します; 既存のすべてのデータは失われ、パーティションの"
 "容量はイメージのサイズに縮小されます。"
 
-#. 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 ""
-"元の容量に戻すには、パーティション設定をやり直して USB スティックを再フォー"
-"マットしなければなりません。"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:259
+#: en/SelectAndUseISOs2.xml:299
 msgid "Using a graphical tool within Mageia"
 msgstr "Mageia 内でグラフィカル ツールを使用する"
 
 #. 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>"
@@ -3780,26 +4103,27 @@ msgstr ""
 "フィカル ツールを使用できます。"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:263
+#: en/SelectAndUseISOs2.xml:303
 msgid "Using a graphical tool within Windows"
 msgstr "Windows 内でグラフィカル ツールを使用する"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:304
 msgid "You could try:"
 msgstr "以下を試すことができます:"
 
 #. 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=ja_JP\">Rufus</link> では "
 "\"ISO イメージ\" を選択します;"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:271
+#: en/SelectAndUseISOs2.xml:311
 msgid ""
 "<link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
@@ -3808,12 +4132,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 "GNU/Linux システム内でコマンド ラインを使用する"
 
 #. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:279
+#: en/SelectAndUseISOs2.xml:319
 msgid ""
 "It is potentially *dangerous* to do this by hand. You risk overwriting "
 "potentially valuable existing data if you specify the wrong target device."
@@ -3822,61 +4147,72 @@ msgstr ""
 "事な既存のデータを上書きするおそれがあります。"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:325
 msgid "Open a console"
 msgstr "端末を開きます"
 
 #. 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 ""
 "<userinput>su -</userinput> コマンドで root (管理者) ユーザになります (最後"
 "の '-' を忘れないでください)"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:291
-msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
+#: en/SelectAndUseISOs2.xml:332
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"Root.png\"/> </"
+"imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Root.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 ""
 "USB スティックを挿入します (マウントはしないでください、これはアクセスしたり"
 "読み込んだりする可能性のあるアプリケーションやファイル マネージャを開かないと"
 "いうことも意味します)"
 
 #. 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 "コマンド <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>"
+#: en/SelectAndUseISOs2.xml:345
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"Fdisk.png\"/> </"
+"imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Fdisk.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 ""
 "お使いの USB スティックのデバイス名を探します (サイズを参考にします)。例えば"
 "上のスクリーンショットでは <code>/dev/sdb</code> で、8GB の USB スティックで"
 "す。"
 
 #. 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 ""
 "代わりに、<code>dmesg</code> コマンドでデバイス名を探すことができます: この例"
 "の終わり付近には <emphasis>sd</emphasis> で始まるデバイス名があり、この場合 "
@@ -3884,7 +4220,7 @@ msgstr ""
 "ことも分かります:"
 
 #. 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"
@@ -3926,40 +4262,47 @@ 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
 msgid "<placeholder type=\"screen\" id=\"0\"/>"
 msgstr "<placeholder type=\"screen\" 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 ""
 "次のコマンドを入力します: <emphasis role=\"bold\"># <userinput>dd if=path/to/"
 "the/ISO/file of=/dev/sdX bs=1M</userinput></emphasis>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:340
-msgid "Where X=your device name eg: /dev/sdd"
+#: en/SelectAndUseISOs2.xml:382
+#, fuzzy
+msgid ""
+"Where <replaceable>X</replaceable>=your device name eg: <filename>/dev/sdd</"
+"filename>"
 msgstr "X はお使いのデバイス名で、例えば: /dev/sdd です"
 
 #. 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 ""
 "例:<emphasis role=\"bold\"> # <userinput>dd if=/home/user/Downloads/Mageia-6-"
 "x86_64-DVD.iso of=/dev/sdd bs=1M</userinput></emphasis>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><tip><para>
-#: en/SelectAndUseISOs2.xml:345
+#: en/SelectAndUseISOs2.xml:388
+#, fuzzy
 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 ""
 "<emphasis role=\"bold\">if</emphasis> が <emphasis role=\"bold\">i</"
 "emphasis>nput <emphasis role=\"bold\">f</emphasis>ile を、<emphasis role="
@@ -3968,12 +4311,13 @@ 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 "次のコマンドを入力します: # <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 "これが手順の終わりで、お使いの USB スティックを抜くことができます。"
 
@@ -3983,8 +4327,10 @@ msgid "Select your Country / Region"
 msgstr "国や地域を選択する"
 
 #.  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
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
 "\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
@@ -3992,33 +4338,35 @@ msgstr ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
 "\"center\" fileref=\"dx2-selectCountry.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 ""
 "国や地域を選択します。これは通貨や無線の規制ドメインのような様々な設定に対し"
 "て重要です。国の設定を間違えると無線ネットワークが使えなくなる可能性がありま"
 "す。"
 
-#. 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 ""
 "あなたのいる国が一覧にない場合、<guilabel>他の国</guilabel>をクリックしてそこ"
 "で国や地域を選択します。"
 
 #. 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 ""
 "あなたのいる国が<guilabel>他の国</guilabel>の一覧にしかない場合、"
 "<guibutton>OK</guibutton> をクリックした後で最初の一覧の中から国が選択された"
@@ -4026,14 +4374,15 @@ msgstr ""
 "択を適用します。"
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:33
+#: en/selectCountry.xml:42
 msgid "Input method"
 msgstr "入力メソッド"
 
 #. 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. "
@@ -4047,12 +4396,13 @@ msgstr ""
 "の前に HTTP/FTP のメディアを追加した場合にインストールできます。"
 
 #. 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 ""
 "入力メソッドの設定をインストール時にし損ねた場合、インストール済みのシステム"
 "をブート後に<emphasis role=\"bold\">コンピュータを設定</emphasis> -> "
@@ -4060,57 +4410,64 @@ msgstr ""
 "localedrake を実行することでこれを行えます。"
 
 #. type: Content of: <section><info><title>
-#: en/selectInstallClass.xml:14
+#: en/selectInstallClass.xml:29
 msgid "Install or Upgrade"
 msgstr "インストールもしくはアップグレードを行う"
 
 #. 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 format=\"PNG\" align=\"center\" fileref=\"dx2-"
 "selectInstallClass.png\"/> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:25
-msgid "Install"
-msgstr "インストール"
+#: en/selectInstallClass.xml:41
+#, fuzzy
+msgid "<emphasis role=\"bold\">Install</emphasis>"
+msgstr "<emphasis role=\"bold\">ワークステーション</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:27
+#: en/selectInstallClass.xml:43
+#, fuzzy
 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 ""
 "<application>Mageia</application> を一からインストールするにはこの選択肢を使"
 "用します。これは root パーティション (/) をフォーマットしますが、/home パー"
 "ティションが分かれていればこれをそのままにできます。"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:33
-msgid "Upgrade"
-msgstr "アップグレード"
+#: en/selectInstallClass.xml:50
+#, fuzzy
+msgid "<emphasis role=\"bold\">Upgrade</emphasis>"
+msgstr "<emphasis role=\"bold\">サーバ</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 ""
 "これはインストール済みの <application>Mageia</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 ""
 "このインストーラのバージョンが公開された時点で<emphasis>サポートが継続してい"
 "る</emphasis>過去の Mageia のバージョンからのアップグレードのみが十分にテスト"
@@ -4118,34 +4475,15 @@ msgstr ""
 "Mageia をアップグレードしたい場合は、<literal>/home</literal> パーティション"
 "を保持してクリーン インストールを行うのがよりよいでしょう。"
 
-#. type: Content of: <section><note><para>
-#: en/selectInstallClass.xml:50
-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 ""
-"インストール中にこれを中止しようと決めた場合、再起動してもかまいませんが、そ"
-"の前に二度考えてください。いったんパーティションがフォーマットされたりインス"
-"トールのための更新処理が始まったりした場合、お使いのコンピュータはもはや同じ"
-"状態ではなく、再起動を行うことはシステムを使用不能にするおそれが大きいです。"
-"それにも関わらず再起動を強く望む場合にのみ、<guibutton>Alt Ctrl F2</"
-"guibutton> を同時に押してテキスト端末に移動します。その後、<guibutton>Alt "
-"Ctrl Delete</guibutton> を同時に押すと再起動します。"
-
 #. 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 ""
 "追加の言語を選択し忘れたことに気づいた場合、<guilabel>Alt Ctrl Home</"
 "guilabel> を押すことで<emphasis role=\"bold\">インストールもしくはアップグ"
@@ -4154,38 +4492,41 @@ msgstr ""
 "emphasis>でください。"
 
 #. type: Content of: <section><info><title>
-#: en/selectKeyboardLive.xml:3
-msgid "Select keyboard"
+#: en/selectKeyboardLive.xml:14
+#, fuzzy
+msgid "Select Keyboard"
 msgstr "キーボードを選択する"
 
 #. 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 ""
-"Mageia​​ で使用したいキーボード配列を設定するように求められるでしょう。既定の配"
-"列はあなたが以前選択した言語やタイム ゾーンによって選択されます。"
 
 #. type: Content of: <section><info><title>
-#: en/selectKeyboard.xml:7
+#: en/selectKeyboard.xml:20
 msgid "Keyboard"
 msgstr "キーボード"
 
 #. 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."
@@ -4194,16 +4535,17 @@ msgstr ""
 "ボードが見つからない場合はアメリカ式のキーボード配列が既定になります。"
 
 #. 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=\"dx2-selectKeyboard.png\" align=\"center\"/"
-"> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" align=\"center\" fileref=\"dx2-"
+"selectInstallClass.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 "
@@ -4220,22 +4562,24 @@ msgstr ""
 "org/wiki/キー配列</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 ""
 "表示される一覧にお使いのキーボードがない場合、<guibutton>詳細</guibutton>をク"
 "リックしてより完全な一覧を表示し、そこでお使いのキーボードを選択します。"
 
-#. 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 ""
 "<guibutton>詳細</guibutton>ダイアログからキーボードを選択した後、最初のキー"
 "ボード選択に戻り、その画面からキーボードが選択されたように見えます。これは無"
@@ -4243,7 +4587,7 @@ msgstr ""
 "が適用されます。"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:46
+#: en/selectKeyboard.xml:60
 msgid ""
 "If you choose a keyboard based on non-Latin characters, you will see an "
 "extra dialogue screen asking how you would prefer to switch between the "
@@ -4253,36 +4597,39 @@ msgstr ""
 "列をどのように切り替えたいかを質問する追加のダイアログが表示されます。"
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:15
+#: en/selectLanguage.xml:34
 msgid "Please choose a language to use"
 msgstr "使用する言語を選択する"
 
-#. 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 ""
 "はじめに、あなたのいる大陸についての一覧を展開して言語を選択します。"
 "<application>Mageia</application> はインストールの間とインストール後のシステ"
 "ムにこの選択を適用します。"
 
-#. 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 ""
 "お好みの言語を選択します。<application>Mageia</application> はインストールの"
 "間とインストール後のシステムにこの選択を適用します。"
 
-#. 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 ""
 "システムに幾つかの言語がインストールされることをあなた (や他のユーザ) が必要"
@@ -4290,65 +4637,68 @@ msgstr ""
 "るのがよいでしょう。インストール後に言語サポートを追加するのは困難です。"
 
 #. 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 format=\"PNG\" fileref="
 "\"dx2-selectLanguage.png\" align=\"center\"/> </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 ""
 "複数の言語を選択した場合であっても、はじめに最初の言語の画面でいずれかをお好"
 "みの言語として選ばなければなりません。これは複数の言語の画面でも選択済みと"
 "マークされます。"
 
 #. 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 ""
 "お使いのキーボードの言語が選択言語と同じでない場合、キーボードの言語も同様に"
 "インストールするのが望ましいです。"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:56
-msgid "Mageia uses UTF-8 (Unicode) support by default."
-msgstr "Mageia は既定で UTF-8 (Unicode) をサポートしています。"
-
-#. 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 ""
 "これはあなたの言語で適切でないと分かっている場合に<emphasis role=\"bold\">複"
 "数の言語</emphasis>画面で無効にすることができます。UTF-8 を無効にするとすべて"
 "のインストール済みパッケージに適用されます。"
 
 #. 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 ""
 "お使いのシステムの言語はインストール後に Mageia コントロール センター -> シス"
 "テム -> システムの言語を設定 で変更できます。"
 
 #. type: Content of: <section><info><title>
-#: en/selectMouse.xml:4
+#: en/selectMouse.xml:10
 msgid "Select mouse"
 msgstr "マウスを選択する"
 
@@ -4356,17 +4706,19 @@ msgstr "マウスを選択する"
 #.  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 format=\"PNG\" align=\"center\" fileref=\"dx2-"
+"selectInstallClass.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."
@@ -4374,25 +4726,28 @@ msgstr ""
 "お使いのマウスの反応に満足していない場合、ここで異なるマウスを選択できます。"
 
 #. 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 ""
 "通常は、<guilabel>ユニバーサル</guilabel> - <guilabel>PS/2 &amp; USB マウス</"
 "guilabel>がよい選択です。"
 
 #. 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 ""
 "<guilabel>ユニバーサル</guilabel> - <guilabel>evdev の使用を強制</guilabel>を"
 "選択すると、六つ以上のボタンのあるマウスで動作しないボタンを設定します。"
 
-#. 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 "ブート メニュー項目を追加もしくは変更する"
 
@@ -4418,104 +4773,69 @@ msgstr ""
 "efi_and_Mageia</link>"
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:7
-msgid "Bootloader main options"
-msgstr "ブート ローダの主な設定"
-
-#. type: Content of: <section><section><title>
 #: en/setupBootloader.xml:10
-msgid "Bootloader interface"
+#, fuzzy
+msgid "Bootloader"
 msgstr "ブート ローダのインターフェース"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:11
-msgid "By default, Mageia uses exclusively:"
-msgstr "既定では、Mageia は以下のいずれかを排他的に使用します:"
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:13
+msgid "Grub2"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><title>
+#: en/setupBootloader.xml:15
+#, fuzzy
+msgid "Grub2 on Legacy MBR/GPT systems"
+msgstr "Legacy/MBR と Legacy/GPT システム上の GRUB2"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:14
+#: en/setupBootloader.xml:17
+#, fuzzy
 msgid ""
-"GRUB2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
+"GRUB2 (with or without graphical menu) will be used exclusively as the "
+"bootloader for a Legacy/MBR or Legacy/GPT system."
 msgstr ""
 "Legacy/MBR もしくは Legacy/GPT システム用の GRUB2 (グラフィカル メニューあり"
 "となし)"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:18
-msgid "GRUB2-efi for a UEFI system."
-msgstr "UEFI システム用の GRUB2-efi"
-
-#. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:22
-msgid "The Mageia graphical menus are nice :)"
-msgstr "Mageia のグラフィカル メニューは良いですね :)"
-
-#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:25
-msgid "GRUB2 on Legacy/MBR and Legacy/GPT systems"
-msgstr "Legacy/MBR と Legacy/GPT システム上の GRUB2"
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:27
-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 fileref=\"dx2-"
-"setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
-"setupBootloader.png\"/> </imageobject>"
-
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:34 en/setupBootloader.xml:56
+#: en/setupBootloader.xml:21
+#, fuzzy
 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 ""
-"<emphasis role=\"bold\">起動デバイス</emphasis>は何をしているのか本当に分かっ"
-"ているのでなければ変更しないでください。"
+"GRUB2 ブート ローダを最初のハード ドライブの MBR (マスタ ブート レコード) も"
+"しくは BIOS ブート パーティション内に書き込みます。"
 
-#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:38
-msgid "GRUB2-efi on UEFI systems"
+#. type: Content of: <section><section><itemizedlist><title>
+#: en/setupBootloader.xml:27
+#, fuzzy
+msgid "Grub2-efi on UEFI systems"
 msgstr "UEFI システム上の GRUB2-efi"
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:39
-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 ""
-"UEFI システムでは、ユーザ インターフェースはわずかに異なり、グラフィカル メ"
-"ニューの<emphasis role=\"bold\">あり</emphasis>と<emphasis role=\"bold\">なし"
-"</emphasis>を選択することはできません。"
 
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:42
+#. 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-"
-"setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
-"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 ""
 "お使いのコンピュータにインストールされているシステムが Mageia のみとなる場"
 "合、インストーラはブート ローダ (GRUB2-efi) を入れるために ESP (EFI システム "
@@ -4525,185 +4845,140 @@ msgstr ""
 "複数持つこともできますが、オペレーティング システムの数が幾つあっても一つしか"
 "必要ありません (かつ、それが推奨されます)。"
 
-#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:61
-msgid "Using a Mageia bootloader"
-msgstr "Mageia のブート ローダを使用する"
-
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:62
-msgid ""
-"By default, and according to your system, Mageia writes one of the following:"
-msgstr ""
-"既定では、お使いのシステムによって、Mageia は以下のいずれかを書き込みます:"
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:66
-msgid ""
-"a GRUB2 bootloader either into the MBR (Master Boot Record) of your first "
-"hard drive or in the BIOS boot partition."
-msgstr ""
-"GRUB2 ブート ローダを最初のハード ドライブの MBR (マスタ ブート レコード) も"
-"しくは BIOS ブート パーティション内に書き込みます。"
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:70
-msgid "a GRUB2-efi bootloader into the ESP"
-msgstr "GRUB2-efi ブート ローダを ESP に書き込みます。"
+#. type: Content of: <section><section><info><title>
+#: en/setupBootloader.xml:46
+#, fuzzy
+msgid "Bootloader Setup"
+msgstr "ブート ローダのインターフェース"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:73
-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."
-msgstr ""
-"既に他のオペレーティング システムがインストールされている場合、Mageia はこれ"
-"らを新しい Mageia のブート メニューに追加しようとします。この動作を望まない場"
-"合、<guibutton>次へ</guibutton>をクリックして<emphasis role=\"bold\">他の OS "
-"がないか調べる</emphasis>を外します。"
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:49
+msgid "Bootloader main options"
+msgstr "ブート ローダの主な設定"
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:78
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:51
+#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata fileref=\"live-setupBootloader3.png\" align=\"center\"/> </"
-"imageobject>"
+"\"dx2-setupBootloader.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata fileref=\"live-setupBootloader.png\" xml:id=\"setupBootloader-"
+"im1\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
 "\"> <imagedata fileref=\"live-setupBootloader3.png\" align=\"center\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:87
-msgid "Using an existing bootloader"
-msgstr "既存のブート ローダを使用する"
-
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:88
-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."
-msgstr ""
-"お使いの Mageia システムを既存のブート ローダに追加する正確な手順はこのドキュ"
-"メントで扱う範囲外ですが、これはほとんどの場合においてそれの検出と追加を自動"
-"的に行ってブート ローダをインストールする適切なプログラムを実行することになる"
-"でしょう。問題になっているオペレーティング システムのドキュメントを参照してく"
-"ださい。"
-
-#. 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:62
+#, fuzzy
+msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
+msgstr "<emphasis role=\"bold\">サーバ</emphasis>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:96
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:63
 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>."
+"This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI "
+"systems will not see this option here."
 msgstr ""
-"Mageia をブート可能にせず、他の OS からチェイン ロードしたい場合、<guibutton>"
-"次へ</guibutton>をクリックし、次に<guibutton>上級</guibutton>をクリックして "
-"<guilabel>ESP や MBR に書き込まない</guilabel>にチェックします。"
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:101
-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-"
-"setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-setupBootloader4.png\" align="
-"\"center\"/> </imageobject>"
+#. 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\">上級</emphasis>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:108
-msgid ""
-"You will get a warning that the bootloader is missing, ignore it by clicking "
-"<guibutton>OK</guibutton>."
-msgstr ""
-"ブート ローダがないと警告が表示されますが、無視して <guibutton>OK</"
-"guibutton> をクリックします。"
+#. 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 "何をしているのかよく分かっている場合にだけ変更を行ってください。"
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:111
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:72
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
-"imageobject>"
+"<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:117
-msgid "Options"
-msgstr "設定項目"
-
-#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:119
-msgid "First page"
-msgstr "最初のページ"
+"<emphasis role=\"bold\">お望みのセキュリティ レベルを選択してください</"
+"emphasis>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:120
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:74
+#, 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."
+"This text box lets you set a delay, in seconds, before the default operating "
+"system is started up."
 msgstr ""
 "<guilabel>既定のイメージが起動するまでの秒数</guilabel>: 既定のオペレーティン"
 "グ システムが開始する前に空ける秒数を設定します。"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:122
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:78
+#, fuzzy
+msgid "<emphasis role=\"bold\">Security</emphasis>"
+msgstr "<emphasis role=\"bold\">サーバ</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:79
+#, fuzzy
 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."
+"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 ""
 "<guilabel>セキュリティ</guilabel>: ブート ローダ用のパスワードを設定できるよ"
 "うにします。これはブート時に項目を選択したり設定を変更したりする際にユーザ名"
 "とパスワードを訊かれることを意味します。ユーザ名は <emphasis role=\"bold"
 "\">root</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:88
+#, fuzzy
+msgid "Choose a password for the bootloader (optional)"
 msgstr ""
 "<guilabel>パスワード</guilabel>: ブート ローダ用のパスワードを選択します。"
 
-#. 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:91
+#, fuzzy
+msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
+msgstr "<emphasis role=\"bold\">ワークステーション</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:92
+#, fuzzy
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the password and DrakX will "
-"check that it matches with the one above."
+"Retype the password and DrakX will check that it matches with the one set "
+"above"
 msgstr ""
 "<guilabel>パスワード (再入力)</guilabel>: パスワードを再入力し、Drakx は上の"
 "パスワードと一致するかをチェックします。"
 
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:96 en/setupBootloader.xml:154
+#, fuzzy
+msgid "<emphasis>Advanced</emphasis>"
+msgstr "<emphasis role=\"bold\">上級</emphasis>"
+
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:127 en/setupBootloader.xml:159
-msgid "<guilabel>Advanced</guilabel>"
-msgstr "<guilabel>上級</guilabel>"
+#: en/setupBootloader.xml:99
+#, fuzzy
+msgid "<emphasis>Enable ACPI</emphasis>"
+msgstr "<emphasis>一般</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:100
+#, fuzzy
 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)."
+"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 ""
 "<guilabel>ACPI を有効にする</guilabel>: ACPI (Advanced Configuration and "
 "Power Interface) は電源管理の標準です。これは使用されていないデバイスを停止す"
@@ -4712,88 +4987,248 @@ msgstr ""
 "問題を引き起こすとお考えの場合です (例えばランダムに再起動が起こったりシステ"
 "ムが固まったりする場合)。"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:133
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:108
+#, fuzzy
+msgid "<emphasis>Enable SMP</emphasis>"
+msgstr "<emphasis>一般</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:109
+#, fuzzy
 msgid ""
-"<guilabel>Enable SMP</guilabel>: This option enables/disables symmetric "
-"multiprocessing for multi core processors."
+"This option enables/disables symmetric multiprocessing for multi-core "
+"processors"
 msgstr ""
 "<guilabel>SMP を有効にする</guilabel>: この項目はマルチ コア プロセッサで対称"
 "型マルチ プロセッシングを有効化 / 無効化します。"
 
-#. 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:113
+#, fuzzy
+msgid "<emphasis>Enable APIC</emphasis>"
+msgstr "<emphasis>一般</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:114
+#, fuzzy
 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."
+"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 ""
 "<guilabel>APIC を有効にする</guilabel>: Advanced Programmable Interrupt "
 "Controller へのオペレーティング システムのアクセスを提供します。APIC デバイス"
 "はより複雑な優先度モデルや高度な IRQ (割り込み要求) の管理を可能にします。"
 
-#. 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:120
+#, fuzzy
+msgid "<emphasis>Enable Local APIC</emphasis>"
+msgstr "<emphasis>一般</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:121
+#, fuzzy
 msgid ""
-"<guilabel>Enable Local APIC</guilabel>: Local APIC manages all external "
-"interrupts for a specific processor in an SMP system."
+"Here you can set Local APIC, which manages all external interrupts for a "
+"specific processor in an SMP system"
 msgstr ""
 "<guilabel>ローカル APIC を有効にする</guilabel>: ローカル APIC は SMP システ"
 "ムにおいて特定のプロセッサに対するすべての外部割り込みを管理します。"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:143
-msgid "Next page"
-msgstr "次のページ"
+#: en/setupBootloader.xml:127
+#, fuzzy
+msgid "Bootloader Configuration"
+msgstr "サウンドの設定"
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:129
+#, fuzzy
+msgid ""
+"<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 align=\"center\" fileref="
+"\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata fileref=\"live-setupBootloader3.png\" align=\"center\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:146
-msgid "<guilabel>Default:</guilabel> Operating system started up by default"
+#: en/setupBootloader.xml:139
+#, fuzzy
+msgid "<emphasis role=\"bold\">Default</emphasis>"
+msgstr "<emphasis role=\"bold\">サーバ</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:140
+#, fuzzy
+msgid "The operating system to started up by default"
 msgstr ""
 "<guilabel>既定値</guilabel>: 開始する既定のオペレーティング システムです。"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:150
+#: en/setupBootloader.xml:143
+#, fuzzy
+msgid "<emphasis role=\"bold\">Append</emphasis>"
+msgstr "<emphasis role=\"bold\">上級</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:144
+#, 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."
+"This option lets you pass information to the kernel or tell the kernel to "
+"give you more information as it boots"
 msgstr ""
 "<guilabel>追加</guilabel>: この項目は起動の際にカーネルに情報を渡したり、あな"
 "たにより多くの情報を渡すようにカーネルに伝えたりします。"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:155
+#: en/setupBootloader.xml:148
+#, fuzzy
+msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
+msgstr "<emphasis role=\"bold\">サーバ</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:149
+#, fuzzy
 msgid ""
-"<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
-"\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
+"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 ""
-"<guilabel>他の OS がないか調べる</guilabel>: 上の <link linkend="
-"\"setupMageiaBootloader\">Mageia のブート ローダを使用する</link>を参照してく"
-"ださい。"
+"既に他のオペレーティング システムがインストールされている場合、Mageia はこれ"
+"らを新しい Mageia のブート メニューに追加しようとします。この動作を望まない場"
+"合、<guibutton>次へ</guibutton>をクリックして<emphasis role=\"bold\">他の OS "
+"がないか調べる</emphasis>を外します。"
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:156
+#, fuzzy
+msgid ""
+"<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 align=\"center\" fileref="
+"\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata fileref=\"live-setupBootloader3.png\" align=\"center\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:159
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:166
+#, fuzzy
+msgid "<emphasis>Video mode</emphasis>"
+msgstr "<emphasis>ベンダ</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:167
+#, fuzzy
 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."
+"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 ""
 "<guilabel>ビデオ モード</guilabel>: これはブート メニューで用いられる画面サイ"
 "ズと色深度を設定します。下向きの三角形をクリックするとサイズと色深度の他の項"
 "目が表示されます。"
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:162
+#. 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>ベンダ</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:173
 msgid ""
-"<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
-"linkend=\"setupChainLoading\">Using the chain loading</link>"
+"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 ""
-"<emphasis role=\"bold\">ESP や MBR に書き込まない</emphasis>: 上の<link "
-"linkend=\"setupChainLoading\">チェイン ロードを使用する</link>を参照してくだ"
-"さい。"
+
+#. 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=\"live-setupBootloader5.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:188
+#, fuzzy
+msgid "Other Options"
+msgstr "設定項目"
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:190
+msgid "Using an existing bootloader"
+msgstr "既存のブート ローダを使用する"
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:191
+#, fuzzy
+msgid ""
+"The exact procedure for adding Mageia to an existing bootloader is beyond "
+"the scope of this documentation. However in most cases it will involve "
+"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 ""
+"お使いの Mageia システムを既存のブート ローダに追加する正確な手順はこのドキュ"
+"メントで扱う範囲外ですが、これはほとんどの場合においてそれの検出と追加を自動"
+"的に行ってブート ローダをインストールする適切なプログラムを実行することになる"
+"でしょう。問題になっているオペレーティング システムのドキュメントを参照してく"
+"ださい。"
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:199
+#, fuzzy
+msgid "Installing Without a Bootloader"
+msgstr "Mageia のブート ローダを使用する"
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:200
+msgid ""
+"While you can opt to install Mageia without a bootloader (see section 2.1 "
+"Advanced), this is not recommended unless you absolutely know what you are "
+"doing, as without some form of bootloader your operating system will be "
+"unable to start."
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:207
+#, fuzzy
+msgid ""
+"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 ""
+"これを行うためには、/boot/grub2/custom.cfg を手動で編集する必要があります。も"
+"しくはソフトウェア <emphasis role=\"bold\">grub-customizer</emphasis> "
+"(Mageia のリポジトリで利用できます) を代わりに使用します。"
+
+#. type: Content of: <section><section><section><note><para>
+#: en/setupBootloader.xml:212
+#, fuzzy
+msgid ""
+"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 ""
+"詳しい情報は、以下を参照してください: <link ns2:href=\"https://wiki.mageia."
+"org/en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-"
+"efi_and_Mageia</link>"
 
 #. type: Content of: <section><info><title>
-#: en/setupSCSI.xml:3
+#: en/setupSCSI.xml:10
 msgid "Setup SCSI"
 msgstr "SCSI を設定する"
 
@@ -4805,17 +5240,20 @@ msgstr "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=\"dx2-setupSCSI.png\" align="
-"\"center\" xml:id=\"setupSCSI-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
 msgid ""
 "DrakX will normally detect hard disks correctly. However, with some older "
 "SCSI controllers it may be unable to determine the correct drivers to use "
@@ -4826,101 +5264,60 @@ msgstr ""
 "識に失敗するかもしれません。"
 
 #. 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 ""
 "そうなった場合、手動で DrakX にどの SCSI ドライブをお使いかを手動で知らせる必"
 "要があります。"
 
-#. type: Content of: <section><para>
-#: en/setupSCSI.xml:35
-msgid "DrakX should then be able to configure the drive(s) correctly."
-msgstr "そうすれば DrakX はドライブを正しく設定できるはずです。"
-
 #. type: Content of: <section><info><title>
-#: en/soundConfig.xml:3
+#: en/soundConfig.xml:10
 msgid "Sound Configuration"
 msgstr "サウンドの設定"
 
 #.  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 format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
-"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
-
-#. type: Content of: <section><para>
-#: en/soundConfig.xml:14
-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 ""
-"この画面ではお使いのサウンド カード向けにインストーラが選択したドライバの名前"
-"が表示され、これはサウンド カードが存在する場合にその既定のドライバとなりま"
-"す。"
+"<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 ""
-"既定のドライバは問題なく動作するはずです。しかしながら、インストール後に問題"
-"に出くわした場合、<command>draksound</command> を実行するか、このツールを "
-"MCC (Mageia コントロール センター) を通して開始し、後者は<guilabel>ハードウェ"
-"ア</guilabel> タブを選択後に画面右上の<guilabel>サウンドの設定</guilabel>を選"
-"択します。"
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:24
+#: 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 ""
-"次に、<emphasis role=\"bold\">draksound</emphasis> もしくは<emphasis role="
-"\"bold\">サウンドの設定</emphasis>ツールの画面で<guibutton>トラブルシューティ"
-"ング</guibutton>をクリックすると、問題を解決するための有用なアドバイスが見つ"
-"かります。"
 
 #. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:30
+#: en/soundConfig.xml:43
 msgid "Advanced"
 msgstr "上級"
 
-#. type: Content of: <section><section><para>
-#: en/soundConfig.xml:33
-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 ""
-"この画面で<emphasis role=\"bold\"><guibutton>上級</guibutton></emphasis>をク"
-"リックすると、インストール時には、既定のドライバがなく利用可能なドライバが複"
-"数存在する場合に有用ですが、インストーラが間違ったドライバを選択したと考えら"
-"れる場合は除きます。"
-
-#. type: Content of: <section><section><para>
-#: en/soundConfig.xml:38
-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 ""
-"その場合、<emphasis role=\"bold\"><guibutton>任意のドライバを選択</"
-"guibutton></emphasis>をクリック後に異なるドライバを選択することができます。"
-
 #. type: Content of: <section><info><title>
-#: en/takeOverHdConfirm.xml:3
+#: en/takeOverHdConfirm.xml:10
 msgid "Confirm hard disk to be formatted"
 msgstr "ハード ディスクをフォーマットするか確認する"
 
@@ -4930,74 +5327,78 @@ msgstr "ハード ディスクをフォーマットするか確認する"
 #.     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 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-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"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 "選択に全く自信がなければ<guibutton>戻る</guibutton>をクリックします。"
 
-#. 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 ""
 "ハード ディスク上のすべてのパーティション, オペレーティング システム, データ"
 "を削除して構わないのであれば<guibutton>次へ</guibutton>をクリックして続行しま"
 "す。"
 
 #. type: Content of: <section><info><title>
-#: en/testing.xml:9
+#: en/testing.xml:3
 msgid "Testing Mageia as Live system"
 msgstr "Mageia をライブ システムとしてテストする"
 
 #. type: Content of: <section><section><info><title>
-#: en/testing.xml:14
+#: en/testing.xml:8
 msgid "Live mode"
 msgstr "ライブ モード"
 
+#. 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 ""
-"\"Boot Mageia\" を選択するとこの画面が表示されます。そうでなければ、\"<link "
-"linkend=\"doPartitionDisks\">パーティションの設定</link>\" のステップに進みま"
-"す。"
-
 #. type: Content of: <section><section><section><info><title>
-#: en/testing.xml:28
+#: en/testing.xml:21
 msgid "Testing hardware"
 msgstr "ハードウェアをテストする"
 
 #. 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 ""
 "ライブ モードの目的の一つはハードウェアが正しく Mageia によって管理されるかど"
 "うかをテストすることです。すべてのデバイスが Mageia コントロール センターの"
@@ -5005,83 +5406,90 @@ msgstr ""
 "最も最近のデバイスもテストすることができます:"
 
 #. 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 "ネットワーク インターフェース: 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 "グラフィック カード: 前の画面が見えていれば、既に OK です。"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:47
+#: en/testing.xml:40
 msgid "webcam:"
 msgstr "ウェブ カメラ:"
 
 #. 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 "サウンド: ジングルが既に再生されています。"
 
 #. 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 "プリンタ: 設定した上でテスト ページを印刷します。"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:59
+#: en/testing.xml:52
 msgid "scanner: scan a document from ..."
 msgstr "スキャナ: ドキュメントをスキャンします。"
 
 #. 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 ""
 "あなたにとってすべて OK であれば、インストールに進むことができます。そうでな"
 "ければ、終了ボタンで終了することができます。"
 
-#. 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 "ここであなたが行った設定はインストールに進んだ後も保持されます。"
 
 #. type: Content of: <section><section><section><info><title>
-#: en/testing.xml:72
+#: en/testing.xml:68
 msgid "Launch installation"
 msgstr "インストールを実行する"
 
-#. 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 ""
 "Mageia の ライブ CD やライブ DVD をハード ディスクや SSD ドライブにインストー"
 "ルするには、単純に \"Install on Hard Disk\" のアイコンをクリックします。そし"
 "て次に直接インストールする場合の \"<link linkend=\"doPartitionDisks\">パー"
 "ティションの設定</link>\" のステップに続きます。"
 
+#. 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 "Mageia をアンインストールする"
 
 #. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:9
+#: en/uninstall-Mageia.xml:18
 msgid ""
 "If Mageia didn't convince you or you can't install it correctly - in short "
 "you want get rid of it - that is your right and Mageia also gives you the "
@@ -5093,12 +5501,13 @@ msgstr ""
 "べてのオペレーティング システムには当てはまりません。"
 
 #. 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 ""
 "データをバックアップした後、インストール メディア DVD を再起動して<emphasis "
 "role=\"bold\">レスキューシステム</emphasis>を選択し、次に、<emphasis role="
@@ -5107,14 +5516,18 @@ msgstr ""
 "う。"
 
 #. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:19
-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."
+#: en/uninstall-Mageia.xml:28
+#, fuzzy
+msgid ""
+"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 ""
 "Windows で Mageia のパーティションとして使用されていた領域を復旧するには: "
 "<code>スタート -> コントロール パネル -> 管理ツール -> コンピューターの管理 -"
@@ -5124,16 +5537,17 @@ msgstr ""
 "<guibutton>削除</guibutton>を選択すると、その領域は解放されます。"
 
 #. 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 ""
 "Windows XP をお使いの場合、新しいパーティションを作成してそれをフォーマットで"
 "きます (FAT32 もしくは NTFS)。パーティションのドライブ文字が付くでしょう。"
 
 #. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:30
+#: en/uninstall-Mageia.xml:49
 msgid ""
 "If you have Vista or 7, you have one more possibility, you can extend the "
 "existing partition that is at the left of the freed space. There are other "
@@ -5149,34 +5563,50 @@ msgstr ""
 "い。"
 
 #. type: Content of: <section><info><title>
-#: en/unused.xml:9
+#: en/unused.xml:3
 msgid "Keep or delete unused material"
 msgstr "使用されていないものを残すか削除する"
 
+#. 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=\"reboot-im1\" fileref=\"live-"
+"reboot.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 ""
 "この段階では、インストーラは使用されていないロケール パッケージと使用されてい"
 "ないハードウェア パッケージを探します。そしてこれらの削除を提案します。これは"
 "他のハードウェアで動かす必要のあるシステムを準備している場合を除いて受け入れ"
 "るのがよいでしょう。"
 
+#. 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>"
@@ -5185,10 +5615,811 @@ 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 ""
 "次の段階はハード ディスク上のファイルのコピーです。これには数分かかります。最"
 "後に、少しだけ画面が黒くなりますが、これは正常です。"
+
+#~ msgid "User and Superuser Management"
+#~ msgstr "ユーザとスーパーユーザの管理"
+
+#~ msgid ""
+#~ "Every partition is shown to the left as: <emphasis role=\"bold\">Device "
+#~ "(capacity, mount point, type).</emphasis>"
+#~ msgstr ""
+#~ "各パーティションは左側に以下のように表示されます: <emphasis role=\"bold\">"
+#~ "デバイス (容量, マウント ポイント, 種類)</emphasis>"
+
+#~ 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>)."
+#~ msgstr ""
+#~ "<emphasis role=\"bold\">デバイス</emphasis>は以下で構成されます: "
+#~ "<emphasis role=\"bold\">ハード ドライブ</emphasis>, [<emphasis role=\"bold"
+#~ "\">ハード ドライブ名</emphasis> (アルファベット)], <emphasis role=\"bold"
+#~ "\">パーティション番号</emphasis> (例 <emphasis role=\"bold\">sda5</"
+#~ "emphasis>)"
+
+#~ msgid "In advanced tab, you will find more options about clock settings."
+#~ msgstr "上級タブでは、時刻設定についての追加の項目が見つかります。"
+
+#~ msgid "From a disc"
+#~ msgstr "ディスクから"
+
+#~ 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 ""
+#~ "イメージを焼くのに用いたメディア (CD-ROM, DVD-ROM...) から直接ブートするこ"
+#~ "とができます。通常はこれを CD/DVD ドライブに挿入するだけで再起動後にブー"
+#~ "ト ローダが自動的にインストールを開始します。開始しなければ BIOS の設定を"
+#~ "変更するかキーを一つ押してからコンピュータをブートする周辺機器を選択する必"
+#~ "要があるかもしれません。"
+
+#~ msgid ""
+#~ "According to which hardware you have, and how it is configured, you get "
+#~ "either one or another of the two screens below."
+#~ msgstr ""
+#~ "所有するハードウェアやその設定により、下の二つの画面のいずれかが表示されま"
+#~ "す。"
+
+#~ msgid "From a USB device"
+#~ msgstr "USB デバイスから"
+
+#~ 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 ""
+#~ "ISO イメージを書き込んだ USB デバイスからブートすることができます。BIOS の"
+#~ "設定によっては、コンピュータはポートに接続済みの USB デバイスから直接ブー"
+#~ "トするかもしれません。ブートしなければ BIOS の設定を変更するかキーを一つ押"
+#~ "してからコンピュータをブートする周辺機器を選択する必要があるかもしれませ"
+#~ "ん。"
+
+#~ 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 "中央のメニューで三つの操作から選択を行います:"
+
+#~ 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 ""
+#~ "Boot from hard disk: この選択肢ではメディア (CD/DVD もしくは USB スティッ"
+#~ "ク) が接続されていないときに通常通りにハード ディスクからブートできます "
+#~ "(Mageia 5 では動作しません)。"
+
+#~ msgid "In the bottom menu, are the Boot Options:"
+#~ msgstr "下部のメニューはブート オプションです:"
+
+#~ msgid ""
+#~ "F1 - Help. Explain the options \"splash\", \"apm\", \"acpi\" and \"Ide\""
+#~ msgstr ""
+#~ "F1 - ヘルプです。オプション \"splash\", \"apm\", \"acpi\", \"Ide\" の説明"
+#~ "を表示します。"
+
+#~ msgid "F2 - Language. Choose the display language of the screens."
+#~ msgstr "F2 - 言語です。画面に表示される言語を選択します。"
+
+#~ msgid ""
+#~ "F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728"
+#~ msgstr ""
+#~ "F3 - 画面の解像度です。text, 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 - ドライバです。Yes もしくは No を選択します。システムはドライバ更新の"
+#~ "ある光学ディスクがあれば認識し、ディスクはインストールの間は挿入されている"
+#~ "必要があります。"
+
+#~ msgid ""
+#~ "F6 - Kernel options. This is a way to specify options according to your "
+#~ "hardware and the drivers to use."
+#~ msgstr ""
+#~ "F6 - カーネルのオプションです。これは使用するハードウェアやドライバに応じ"
+#~ "た特定のオプションを指定する方法です。"
+
+#~ msgid "First screen while booting on UEFI system from disk"
+#~ msgstr "UEFI システムでディスクからブートしたときの最初の画面"
+
+#~ msgid ""
+#~ "You have only the choice to run Mageia in Live mode (first choice)  or to "
+#~ "process the installation (second choice)."
+#~ msgstr ""
+#~ "Mageia をライブ モード (最初の選択肢) で実行するかインストールを行う (二つ"
+#~ "めの選択肢) かのみが選択できます。"
+
+#~ 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 ""
+#~ "いずれの場合も、最初のステップは言語, タイム ゾーン, キーボードの選択で、"
+#~ "<link linkend=\"testing\">ライブ モードには追加のステップがあります</"
+#~ "link>。"
+
+#~ msgid ""
+#~ "Depending on your selection here, you may be offered further screens to "
+#~ "fine-tune your choice."
+#~ msgstr ""
+#~ "ここでの選択内容により、細かい設定を行う追加の画面に進む場合があります。"
+
+#~ msgid "The settings DrakX chose are usually good."
+#~ msgstr "DrakX が選択した設定は通常は適しています。"
+
+#~ 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=\"configureX_card_list-"
+#~ "im1\" align=\"center\" fileref=\"dx2-configureX_card_list.png\" revision="
+#~ "\"1\"/> </imageobject>"
+
+#~ 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 ""
+#~ "これらにアクセスするには、<emphasis role=\"bold\">Nonfree</emphasis> リポ"
+#~ "ジトリを明示的に有効にする必要があります。以前にこれを有効にしていない場"
+#~ "合、最初の再起動後にこれを行うのがよいでしょう。"
+
+#~ 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=\"configureX_chooser-im1\" "
+#~ "fileref=\"dx2-configureX_chooser.png\" align=\"center\" revision=\"1\"/> "
+#~ "</imageobject>"
+
+#~ msgid ""
+#~ "<emphasis><guibutton>Graphic card</guibutton></emphasis>: Choose your "
+#~ "card from the list if needed."
+#~ msgstr ""
+#~ "<emphasis><guibutton>グラフィック カード</guibutton></emphasis>: 必要があ"
+#~ "ればお使いのカードを一覧から選択します。"
+
+#~ msgid "Incorrect refresh rates may damage your monitor"
+#~ msgstr ""
+#~ "不正なリフレッシュ レートを指定するとモニタを破損する可能性があります。"
+
+#~ 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=\"configureX_monitor-im1\" "
+#~ "fileref=\"dx2-configureX_monitor.png\" align=\"center\" revision=\"1\"/> "
+#~ "</imageobject>"
+
+#~ msgid "<emphasis>Custom</emphasis>"
+#~ msgstr "<emphasis>カスタム</emphasis>"
+
+#~ msgid "<emphasis>Plug 'n Play</emphasis>"
+#~ msgstr "<emphasis>プラグ アンド プレイ</emphasis>"
+
+#~ msgid "the monitor manufacturers name"
+#~ msgstr "モニタのメーカー名"
+
+#~ msgid "the monitor description"
+#~ msgstr "モニタの説明"
+
+#~ 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 "準備ができたら<guibutton>完了</guibutton>をクリックします。"
+
+#~ 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-"
+#~ "doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" "
+#~ "align=\"center\"/> </imageobject>"
+
+#~ msgid "Use Free Space"
+#~ msgstr "空き領域を使う"
+
+#~ msgid "Use Free Space on a Windows Partition"
+#~ msgstr "Windows パーティションの空き領域を使う"
+
+#~ msgid ""
+#~ "If you have unused space on an existing Windows partition, the installer "
+#~ "may offer to use it."
+#~ msgstr ""
+#~ "既存の Windows パーティションに空き領域がある場合、インストーラはそれを使"
+#~ "用することを提案するかもしれません。"
+
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" "
+#~ "align=\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" "
+#~ "align=\"center\"/> </imageobject>"
+
+#~ msgid "Erase and use Entire Disk."
+#~ msgstr "ディスク全体を消去して使用"
+
+#~ msgid ""
+#~ "Note! This will erase ALL data on the selected hard drive. Take care!"
+#~ msgstr ""
+#~ "注意! これは選択されたハード ドライブ上のすべてのデータを削除します。気を"
+#~ "つけてください!"
+
+#~ msgid "Custom disk partitioning"
+#~ msgstr "パーティションを手動で設定"
+
+#~ 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 ""
+#~ "これは 160 GB を超える空き領域がある場合にインストーラが三つのパーティショ"
+#~ "ンを作成することを意味します: <emphasis role=\"bold\">/</emphasis> 用に "
+#~ "50 GB, <emphasis role=\"bold\">スワップ</emphasis>用に 4 GB, <emphasis "
+#~ "role=\"bold\">/home</emphasis> 用に残りすべて"
+
+#~ 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 align=\"center\" fileref="
+#~ "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition="
+#~ "\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid "January 2015"
+#~ msgstr "2015 年 1 月"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+
+#~ msgid "Using a Mageia DVD"
+#~ msgstr "Mageia の DVD を使用する"
+
+#~ 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 ""
+#~ "以下は Mageia の DVD を使用した場合の既定のようこそ画面となり、一つめが "
+#~ "UEFI システムで表示されるもので、二つめが Legacy システムのものとなります:"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
+
+#~ msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
+
+#~ 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):"
+#~ msgstr ""
+#~ "この画面では、幾つかの設定 (<emphasis role=\"bold\">F1</emphasis> から "
+#~ "<emphasis role=\"bold\">F6</emphasis> のオプションは Legacy システムでのみ"
+#~ "利用できます) を行うことが可能です:"
+
+#~ msgid ""
+#~ "Press <emphasis role=\"bold\">F2</emphasis> to have the installer use a "
+#~ "specific language for the installation."
+#~ msgstr ""
+#~ "<emphasis role=\"bold\">F2</emphasis> を押すとインストールに使用する言語を"
+#~ "指定できます。"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "Use the arrow keys to select the language then press <emphasis role=\"bold"
+#~ "\">Enter</emphasis>."
+#~ msgstr ""
+#~ "矢印キーを用いて言語を選択して <emphasis role=\"bold\">Enter</emphasis> を"
+#~ "押します。"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+
+#~ msgid "Default: It doesn't alter anything in the default options."
+#~ msgstr "デフォルト: 既定のオプションのまま変更を行いません。"
+
+#~ msgid ""
+#~ "Safe Settings: Priority is given to the safer options at the price of a "
+#~ "performance detriment."
+#~ msgstr ""
+#~ "安全設定: パフォーマンスの低下と引き換えに、より安全なオプションを優先して"
+#~ "指定します。"
+
+#~ msgid ""
+#~ "When you select one of these entries, it modifies the default options "
+#~ "displayed in the <guilabel>Boot Options</guilabel> line."
+#~ msgstr ""
+#~ "いずれかのエントリを選択すると、<guilabel>Boot Options</guilabel> の行に表"
+#~ "示される既定のオプションを変更します。"
+
+#~ 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 ""
+#~ "幾つかの Mageia のリリースにおいて、<emphasis role=\"bold\">F6</emphasis> "
+#~ "キーで選択されたエントリが<guilabel>起動オプション</guilabel>の行に現れな"
+#~ "いことがありますが、実際は反映されています。"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+
+#~ 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 ""
+#~ "<emphasis role=\"bold\">F1</emphasis> を押すと様々な起動オプションについて"
+#~ "のヘルプ ウィンドウが開きます。矢印キーで項目を選択して <emphasis role="
+#~ "\"bold\">Enter</emphasis> を押すと詳細を参照でき、<emphasis role=\"bold"
+#~ "\">Esc</emphasis> キーを押すとようこそ画面に戻ります。"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+
+#~ 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 ""
+#~ "splash オプションについての詳細表示です。<emphasis role=\"bold\">Esc</"
+#~ "emphasis> を押すか<guilabel>起動オプションに戻る</guilabel>を選択するとオ"
+#~ "プション一覧に戻ります。これらのオプションは<guilabel>起動オプション</"
+#~ "guilabel>の行に手動で追加することができます。"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "The help is translated in the chosen language with <emphasis role=\"bold"
+#~ "\">F2</emphasis>."
+#~ msgstr ""
+#~ "ヘルプは <emphasis role=\"bold\">F2</emphasis> キーで選択された言語に翻訳"
+#~ "されています。"
+
+#~ 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 ""
+#~ "legacy および UEFI システムにおけるカーネル オプションについての詳しい情報"
+#~ "は、以下を参照してください: <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 "メディアの選択 (Nonfree)"
+
+#~ 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=\"media_selection-im1\" "
+#~ "align=\"center\" revision=\"1\" fileref=\"dx2-media_selection.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid "Summary of miscellaneous parameters"
+#~ msgstr "雑多なパラメータの概要"
+
+#~ msgid "<guilabel>Timezone</guilabel>"
+#~ msgstr "<guilabel>タイム ゾーン</guilabel>"
+
+#~ msgid "<guilabel>Country / Region</guilabel>"
+#~ msgstr "<guilabel>国 / 地域</guilabel>"
+
+#~ msgid "<guilabel>Bootloader</guilabel>"
+#~ msgstr "<guilabel>ブート ローダ</guilabel>"
+
+#~ msgid "For more information, see <xref linkend=\"setupBootloader\"/>"
+#~ msgstr ""
+#~ "詳しい情報は、<xref linkend=\"setupBootloader\"/> を参照してください。"
+
+#~ msgid "<guilabel>User management</guilabel>"
+#~ msgstr "<guilabel>ユーザの管理</guilabel>"
+
+#~ msgid "<guilabel>Services</guilabel>:"
+#~ msgstr "<guilabel>サービス</guilabel>:"
+
+#~ msgid "For more information, see <xref linkend=\"configureServices\"/>"
+#~ msgstr ""
+#~ "詳しい情報は、<xref linkend=\"configureServices\"/> を参照してください。"
+
+#~ msgid "<guilabel>Keyboard</guilabel>:"
+#~ msgstr "<guilabel>キーボード</guilabel>:"
+
+#~ msgid "<guilabel>Mouse</guilabel>:"
+#~ msgstr "<guilabel>マウス</guilabel>:"
+
+#~ msgid "<guilabel>Sound card</guilabel>:"
+#~ msgstr "<guilabel>サウンド カード</guilabel>:"
+
+#~ 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 ""
+#~ "インストーラは既定のドライバが存在する場合にこれを使用します。異なるドライ"
+#~ "バを選択するための項目は、お使いのカードに対して複数のドライバが存在する場"
+#~ "合にのみ利用できますが、そのいずれも既定のドライバとはなりません。"
+
+#~ msgid "<guilabel>Graphical interface</guilabel>:"
+#~ msgstr "<guilabel>グラフィカル インターフェース</guilabel>:"
+
+#~ msgid "<guilabel>Network</guilabel>:"
+#~ msgstr "<guilabel>ネットワーク</guilabel>:"
+
+#~ msgid "<guilabel>Proxies</guilabel>:"
+#~ msgstr "<guilabel>プロキシ</guilabel>:"
+
+#~ msgid "<guilabel>Security Level</guilabel>:"
+#~ msgstr "<guilabel>セキュリティ レベル</guilabel>:"
+
+#~ msgid "Check the option which best suits your usage."
+#~ msgstr "どの選択肢が最もあなたの用途に適しているかを確認してください。"
+
+#~ msgid "<guilabel>Firewall</guilabel>:"
+#~ msgstr "<guilabel>ファイアウォール</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 ""
+#~ "ファイアウォールはあなたの大事なデータとこれを危険に晒したり盗んだりするよ"
+#~ "うなインターネット上の悪い人たちとの間の防壁であると意図されます。"
+
+#~ 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 ""
+#~ "システムへのアクセスを許可したいサービスを選択します。どれを選択するかはお"
+#~ "使いのコンピュータの用途次第です。詳しい情報は、<xref linkend=\"firewall"
+#~ "\"/> を参照してください。"
+
+#~ 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=\"securityLevel-im1\" "
+#~ "align=\"center\" fileref=\"dx2-securityLevel.png\" revision=\"1\"/> </"
+#~ "imageobject>"
+
+#~ msgid "64 bit architecture only."
+#~ msgstr "64 ビット アーキテクチャ専用です。"
+
+#~ 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 と sha1sum は ISO の完全性をチェックするツールです。これらのいずれ"
+#~ "かを選び、チェックサムを<link linkend=\"integrity\">後で使用するために</"
+#~ "link>コピーしておいてください。次に、これと似たようなウィンドウが現れます:"
+
+#~ msgid "Select the Save File option, then, click OK."
+#~ msgstr "ファイルを保存する選択肢を選び、OK をクリックします。"
+
+#~ msgid ""
+#~ "To recover the original capacity, you must redo partitioning and re-"
+#~ "format the USB stick."
+#~ msgstr ""
+#~ "元の容量に戻すには、パーティション設定をやり直して USB スティックを再"
+#~ "フォーマットしなければなりません。"
+
+#~ msgid "Install"
+#~ msgstr "インストール"
+
+#~ msgid "Upgrade"
+#~ msgstr "アップグレード"
+
+#~ 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 ""
+#~ "インストール中にこれを中止しようと決めた場合、再起動してもかまいませんが、"
+#~ "その前に二度考えてください。いったんパーティションがフォーマットされたりイ"
+#~ "ンストールのための更新処理が始まったりした場合、お使いのコンピュータはもは"
+#~ "や同じ状態ではなく、再起動を行うことはシステムを使用不能にするおそれが大き"
+#~ "いです。それにも関わらず再起動を強く望む場合にのみ、<guibutton>Alt Ctrl "
+#~ "F2</guibutton> を同時に押してテキスト端末に移動します。その後、"
+#~ "<guibutton>Alt Ctrl Delete</guibutton> を同時に押すと再起動します。"
+
+#~ 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 ""
+#~ "Mageia​​ で使用したいキーボード配列を設定するように求められるでしょう。既定"
+#~ "の配列はあなたが以前選択した言語やタイム ゾーンによって選択されます。"
+
+#~ msgid "Mageia uses UTF-8 (Unicode) support by default."
+#~ msgstr "Mageia は既定で UTF-8 (Unicode) をサポートしています。"
+
+#~ 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>"
+
+#~ msgid "By default, Mageia uses exclusively:"
+#~ msgstr "既定では、Mageia は以下のいずれかを排他的に使用します:"
+
+#~ msgid "GRUB2-efi for a UEFI system."
+#~ msgstr "UEFI システム用の GRUB2-efi"
+
+#~ msgid "The Mageia graphical menus are nice :)"
+#~ msgstr "Mageia のグラフィカル メニューは良いですね :)"
+
+#~ 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 fileref=\"dx2-"
+#~ "setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata xml:id=\"setupBootloader-im1\" fileref="
+#~ "\"live-setupBootloader.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "Don't modify the <emphasis role=\"bold\">Boot Device</emphasis> unless "
+#~ "you really know what you are doing."
+#~ msgstr ""
+#~ "<emphasis role=\"bold\">起動デバイス</emphasis>は何をしているのか本当に分"
+#~ "かっているのでなければ変更しないでください。"
+
+#~ 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 ""
+#~ "UEFI システムでは、ユーザ インターフェースはわずかに異なり、グラフィカル "
+#~ "メニューの<emphasis role=\"bold\">あり</emphasis>と<emphasis role=\"bold"
+#~ "\">なし</emphasis>を選択することはできません。"
+
+#~ 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-"
+#~ "setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "By default, and according to your system, Mageia writes one of the "
+#~ "following:"
+#~ msgstr ""
+#~ "既定では、お使いのシステムによって、Mageia は以下のいずれかを書き込みます:"
+
+#~ msgid "a GRUB2-efi bootloader into the ESP"
+#~ msgstr "GRUB2-efi ブート ローダを ESP に書き込みます。"
+
+#~ msgid "Using chain loading"
+#~ msgstr "チェイン ロードを使用する"
+
+#~ 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>."
+#~ msgstr ""
+#~ "Mageia をブート可能にせず、他の OS からチェイン ロードしたい場合、"
+#~ "<guibutton>次へ</guibutton>をクリックし、次に<guibutton>上級</guibutton>を"
+#~ "クリックして <guilabel>ESP や MBR に書き込まない</guilabel>にチェックしま"
+#~ "す。"
+
+#~ 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-"
+#~ "setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-setupBootloader4.png\" "
+#~ "align=\"center\"/> </imageobject>"
+
+#~ msgid ""
+#~ "You will get a warning that the bootloader is missing, ignore it by "
+#~ "clicking <guibutton>OK</guibutton>."
+#~ msgstr ""
+#~ "ブート ローダがないと警告が表示されますが、無視して <guibutton>OK</"
+#~ "guibutton> をクリックします。"
+
+#~ msgid "First page"
+#~ msgstr "最初のページ"
+
+#~ msgid "<guilabel>Advanced</guilabel>"
+#~ msgstr "<guilabel>上級</guilabel>"
+
+#~ msgid "Next page"
+#~ msgstr "次のページ"
+
+#~ msgid ""
+#~ "<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
+#~ "\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
+#~ msgstr ""
+#~ "<guilabel>他の OS がないか調べる</guilabel>: 上の <link linkend="
+#~ "\"setupMageiaBootloader\">Mageia のブート ローダを使用する</link>を参照し"
+#~ "てください。"
+
+#~ msgid ""
+#~ "<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above "
+#~ "<link linkend=\"setupChainLoading\">Using the chain loading</link>"
+#~ msgstr ""
+#~ "<emphasis role=\"bold\">ESP や MBR に書き込まない</emphasis>: 上の<link "
+#~ "linkend=\"setupChainLoading\">チェイン ロードを使用する</link>を参照してく"
+#~ "ださい。"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-setupSCSI.png\" "
+#~ "align=\"center\" xml:id=\"setupSCSI-im1\" revision=\"1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-setupSCSI.png\" "
+#~ "align=\"center\" xml:id=\"setupSCSI-im1\" revision=\"1\"/> </imageobject>"
+
+#~ msgid "DrakX should then be able to configure the drive(s) correctly."
+#~ msgstr "そうすれば DrakX はドライブを正しく設定できるはずです。"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" "
+#~ "xml:id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" "
+#~ "xml:id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
+
+#~ 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 ""
+#~ "この画面ではお使いのサウンド カード向けにインストーラが選択したドライバの"
+#~ "名前が表示され、これはサウンド カードが存在する場合にその既定のドライバと"
+#~ "なります。"
+
+#~ 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 ""
+#~ "既定のドライバは問題なく動作するはずです。しかしながら、インストール後に問"
+#~ "題に出くわした場合、<command>draksound</command> を実行するか、このツール"
+#~ "を MCC (Mageia コントロール センター) を通して開始し、後者は<guilabel>ハー"
+#~ "ドウェア</guilabel> タブを選択後に画面右上の<guilabel>サウンドの設定</"
+#~ "guilabel>を選択します。"
+
+#~ 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 ""
+#~ "次に、<emphasis role=\"bold\">draksound</emphasis> もしくは<emphasis role="
+#~ "\"bold\">サウンドの設定</emphasis>ツールの画面で<guibutton>トラブルシュー"
+#~ "ティング</guibutton>をクリックすると、問題を解決するための有用なアドバイス"
+#~ "が見つかります。"
+
+#~ 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 ""
+#~ "この画面で<emphasis role=\"bold\"><guibutton>上級</guibutton></emphasis>を"
+#~ "クリックすると、インストール時には、既定のドライバがなく利用可能なドライバ"
+#~ "が複数存在する場合に有用ですが、インストーラが間違ったドライバを選択したと"
+#~ "考えられる場合は除きます。"
+
+#~ 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 ""
+#~ "その場合、<emphasis role=\"bold\"><guibutton>任意のドライバを選択</"
+#~ "guibutton></emphasis>をクリック後に異なるドライバを選択することができま"
+#~ "す。"
+
+#~ 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 format=\"PNG\" fileref=\"live-"
+#~ "takeOverHdConfirm.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"classical\"> <imagedata format=\"PNG\" fileref=\"dx2-"
+#~ "takeOverHdConfirm.png\" align=\"center\"/> </imageobject>"
+
+#~ msgid ""
+#~ "You get this screen if you selected \"Boot Mageia\". If not, you get the "
+#~ "\"<link linkend=\"doPartitionDisks\">Partitioning</link> step\""
+#~ msgstr ""
+#~ "\"Boot Mageia\" を選択するとこの画面が表示されます。そうでなけれ"
+#~ "ば、\"<link linkend=\"doPartitionDisks\">パーティションの設定</link>\" の"
+#~ "ステップに進みます。"
diff --git a/docs/docs/stable/installer/nb.po b/docs/docs/stable/installer/nb.po
index 5bfa2c99..73204909 100644
--- a/docs/docs/stable/installer/nb.po
+++ b/docs/docs/stable/installer/nb.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2018-04-19 16:32+0300\n"
+"POT-Creation-Date: 2019-01-06 12:43+0200\n"
 "PO-Revision-Date: 2018-08-09 18:21+0000\n"
 "Last-Translator: Karl Morten Ramberg <karl.m.ramberg@gmail.com>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/MageiaLinux/mageia/"
@@ -20,12 +20,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Content of: <section><info><title>
-#: en/acceptLicense.xml:25
+#: en/acceptLicense.xml:31
 msgid "License and Release Notes"
 msgstr "Lisens og utgivelsesmerknader"
 
 #. type: Content of: <section><mediaobject>
-#: en/acceptLicense.xml:29
+#: en/acceptLicense.xml:35
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
 "\"acceptLicense-im1\" fileref=\"dx2-license.png\" align=\"center\" revision="
@@ -40,78 +40,86 @@ msgstr ""
 "\"center\" condition=\"live\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/acceptLicense.xml:40
+#: en/acceptLicense.xml:46
 msgid "License Agreement"
 msgstr "Lisensavtale"
 
-#. 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 ""
 "Før installasjonen av <application>Mageia</application> les grundig igjennom "
 "lisensvillkårene. "
 
-#. 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 ""
 "Disse villkårene gjelder for hele <application>Mageia</application> "
 "distribusjonenog må aksepteres før du fortsetter."
 
-#. 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 ""
 "For å fortsette velg <guilabel> Godta </guilabel> og klikk på "
 "<guibutton>Neste</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 ""
 "Hvis du velger å ikke akseptere villkårene, takker vi deg for å ha tatt en "
 "kikk. Klikker du på <guibutton>Avslutt</guibutton> vil Pc'en din startes om."
 
 #. type: Content of: <section><section><info><title>
-#: en/acceptLicense.xml:63
+#: en/acceptLicense.xml:76
 msgid "Release Notes"
 msgstr "Utgivelsesmerknader"
 
 #. 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 ""
 "Viktig informasjon om denne utgivelsen av <application>Mageia</application> "
 "kan leses ved å klikke på  knappen <guibutton>Utgivelsesnotater </"
 "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 "nb"
 
 #. 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 "Mediumvalg (sett opp supplerende installasjonsmedia)"
 
 #.  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
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-add_supplemental_media."
 "png\" xml:id=\"dx2-add_supplemental_media-im1\" align=\"center\" revision="
@@ -122,12 +130,13 @@ msgstr ""
 "\"1\"/> </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 ""
 "Dette skjermbildet viser listen over alle kjente programvarebrønner. Du kan "
 "legge til andre kilder for pakker, som en optisk plate eller en ekstern "
@@ -135,24 +144,25 @@ msgstr ""
 "neste trinnene."
 
 #. 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 "For en nettverkskilde følger det to steg:"
 
 #. 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 "Valg av og aktivering av nettverket hvis det ikke allerede er oppe."
 
 #. 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 ""
 "Velg et speil eller angi en URL (ved aller første oppføring). Ved å velge et "
 "speil har du tilgang til utvalget av alle pakkebrønner som administreres av "
@@ -162,14 +172,15 @@ msgstr ""
 "pakkebrønn eller din egen NFS-installasjon."
 
 #. 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 ""
 "Hvis du oppdaterer en 64-biters installasjon som inneholder noen 32-biters "
 "pakker, anbefales det å bruke dette skjermbildet for å legge til et online-"
@@ -179,18 +190,25 @@ msgstr ""
 "nødvendige 32-biters pakkene der."
 
 #. type: Content of: <section><info><title>
-#: en/addUser.xml:3
-msgid "User and Superuser Management"
-msgstr "Administrasjon av Brukere og superbrukere"
+#: en/addUser.xml:9
+#, fuzzy
+msgid "User Management"
+msgstr "Avansert brukeradministrasjon"
 
 #.  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 format=\"PNG\" fileref="
 "\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -198,20 +216,21 @@ msgstr ""
 "\"PNG\" 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 "Angi Adminstrasjons (root) Passord:"
 
 #. 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 ""
 "Det er tilrådelig for alle <application> Mageia </application> "
 "installasjoner å angi et <emphasis role=\"bold\"> superbruker </emphasis> "
@@ -222,26 +241,28 @@ msgstr ""
 "under, for å kontrollere at den første oppføringen ikke ble stavet feil."
 
 #. 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 ""
 "Alle passord skiller på store og små bokstaver. Du bør bruke en blanding av "
 "bokstaver (store og små bokstaver), tall og andre tegn i et passord."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:42
+#: en/addUser.xml:57
 msgid "Enter a user"
 msgstr "Angi en bruker"
 
 #. 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 ""
 "Legg til en bruker her. En vanlig bruker har færre privilegier enn <emphasis "
 "role=\"bold\"> superbrukeren </emphasis> (root), men nok til å bruke "
@@ -249,65 +270,90 @@ msgstr ""
 "brukeren bruker datamaskinen til."
 
 #. 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\">Avansert</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>Ikon</guibutton>: Hvis du klikker på denne knappen vil "
 "brukerikonet endres."
 
 #. 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\">Tjener</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>Virkelig navn</guilabel>: Skriv inn brukerens virkelige navn i "
 "tekstboksen."
 
 #. 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\">Avansert</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> Brukernavn </guilabel>: Skriv inn brukernavnet eller la DrakX "
 "bruke en versjon av brukerens virkelige navn. <emphasis role=\"bold\"> Tenk "
 "på at innloggingsnavnet er skiller på store og små bokstaver. </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\">Avansert</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> Passord </guilabel>: Skriv inn ønsket passord for brukeren. Det "
 "er et skjold på slutten av tekstboksen som angir styrken til passordet. (Se "
 "også <xref linkend =\"givePassword\" />)"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml: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> Passord (igjen) </guilabel>: Skriv inn brukerpassordet DrakX vil "
 "kontrollere at du ikke har skrevet passordet feil."
 
 #. 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 ""
 "Alle brukere du har lagt til mens du installerer Mageia, vil ha en "
 "hjemmekatalog som er både lese og skrivebeskyttet (umask =0027)."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:82
+#: en/addUser.xml:104
 msgid ""
 "You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
@@ -318,31 +364,33 @@ msgstr ""
 "Brukeradministrasjon </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 "Tilgangstillatelsene kan også endres etter installasjonen."
 
 #. 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 "Avansert brukeradministrasjon"
 
 #. 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 ""
 "Alternativet <guibutton> Avansert </guibutton> lar deg redigere ytterligere "
 "innstillinger for brukeren du legger til."
 
 #. 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> Shell </guilabel>: Denne rullegardinlisten lar deg endre skallet "
 "som skal være tilgjengelig for alle brukere du la til i forrige skjermbilde. "
@@ -350,11 +398,12 @@ msgstr ""
 "\"fet\"> Dash </emphasis> og <emphasis role=\"bold\"> Sh </emphasis>"
 
 #. 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> Bruker ID </guilabel>: Her kan du sette <emphasis role=\"bold\"> "
 "bruker-ID </emphasis> for alle brukere du har lagt til i forrige "
@@ -362,16 +411,17 @@ msgstr ""
 "tomt."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:113
+#: en/addUser.xml:136
+#, fuzzy
 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 ""
 "<guilabel> Gruppe-ID </guilabel>: Dette lar deg sette <emphasis role=\"bold"
 "\"> gruppe-ID </emphasis>. Igjen, hvis du er usikker, la den være tom."
 
 #. type: Content of: <section><info><title>
-#: en/ask_mntpoint_s.xml:3
+#: en/ask_mntpoint_s.xml:10
 msgid "Choose the mount points"
 msgstr "Velg monteringspunktene"
 
@@ -386,15 +436,17 @@ msgstr "Velg monteringspunktene"
 #.        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 format=\"PNG\" xml:id="
 "\"chooseMountPoints-im1\" align=\"center\" fileref=\"dx2-chooseMountpoints."
@@ -404,57 +456,37 @@ msgstr ""
 "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 ""
 "Her ser du Linux partisjonene som har blitt funnet på din PC. Hvis du ikke "
 "vil bruke de foreslåtte av <application>DrakX</application> , kan du endre "
 "monterings punktene"
 
-#. type: Content of: <section><note><para>
-#: en/ask_mntpoint_s.xml:41
-msgid ""
-"If you change anything, make sure you still have a <emphasis role=\"bold"
-"\"><literal>/</literal></emphasis> (root) partition."
-msgstr ""
-"Hvis du endrer noe, må du sørge for at du fortsatt har en <emphasis role="
-"\"bold\"> <literal> / </literal> </emphasis> (root) partisjon."
-
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:46
+#: 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 ""
-"Hver partisjon vises til venstre som: <emphasis role=\"bold\"> Enhet "
-"(kapasitet, monteringspunkt, type). </emphasis>"
-
-#. 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 ""
-"<emphasis role=\"bold\"> Enhet </emphasis>, består av: <emphasis role=\"bold"
-"\"> harddisk </emphasis>,  [<emphasis role=\"bold\"> harddisknavn </"
-"emphasis> (brev)], <emphasis role=\"bold\"> partisjon nummer </emphasis> "
-"(for eksempel <emphasis role=\"bold\"> sda5 </emphasis>)."
 
 #. 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 ""
 "Hvis du har flere partisjoner, kan du velge forskjellige forskjellige "
 "monteringspunkter fra rullegardinmenyen, som <emphasis role=\"bold\"> / </"
@@ -466,7 +498,7 @@ msgstr ""
 "data."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:63
+#: en/ask_mntpoint_s.xml:73
 msgid ""
 "For any partitions that you don't need to make use of, you can leave the "
 "mount point field blank."
@@ -475,11 +507,22 @@ msgstr ""
 "monteringspunkt være tomt."
 
 #. type: Content of: <section><warning><para>
-#: en/ask_mntpoint_s.xml:69
+#: en/ask_mntpoint_s.xml:79
+#, fuzzy
+msgid ""
+"If you make any changes here, ensure you still have a <filename>/</filename> "
+"(root) partition."
+msgstr ""
+"Hvis du endrer noe, må du sørge for at du fortsatt har en <emphasis role="
+"\"bold\"> <literal> / </literal> </emphasis> (root) partisjon."
+
+#. type: Content of: <section><tip><para>
+#: en/ask_mntpoint_s.xml:84
+#, 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 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 ""
 "Hvis du ikke er sikker på hva du skal velge, klikker du på <emphasis role="
 "\"bold\"> Forrige </emphasis> for å gå tilbake og marker <guilabel> "
@@ -487,188 +530,244 @@ msgstr ""
 "partisjon for å se dens type og størrelse."
 
 #. 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 ""
 "Når du er sikker på at monteringspunktene er korrekte klikk  "
 "<guibutton>Neste</guibutton>, og velg om du bare vil formatere den/de "
 "partisjonen(e) DrakX foreslår eller flere."
 
 #. type: Content of: <section><info><title>
-#: en/bestTime.xml:10
-msgid "Clock settings"
+#: en/bestTime.xml:5
+#, fuzzy
+msgid "Clock Settings"
 msgstr "Klokkeparametre"
 
 #. 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 ""
 "På dette trinnet må du velge hvilken tid din interne klokke er satt, enten "
 "lokal tid eller UTC-tid."
 
 #. type: Content of: <section><para>
-#: en/bestTime.xml:23
-msgid "In advanced tab, you will find more options about clock settings."
+#: en/bestTime.xml:14
+msgid ""
+"In the <emphasis>Advanced</emphasis> tab, you can enable automatic time "
+"synchronization and specify an NTP server."
 msgstr ""
-"I det avanserte fanebladet finner du flere alternativer for "
-"klokkeinnstillinger."
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:1
+#: en/bootLive.xml:6
 msgid "Boot Mageia as Live system"
 msgstr "Start Mageia som et Live system"
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:1
+#: en/bootLive.xml:10
 msgid "Booting the medium"
 msgstr "Start mediet"
 
-#. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:1
-msgid "From a disc"
-msgstr "Fra en disk"
-
-#. 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 ""
-"Du kan starte opp direkte fra mediet du brukte til å brenne bildet ditt (CD-"
-"ROM, DVD-ROM ...). Du trenger vanligvis bare å sette den inn i CD / DVD-"
-"stasjonen for at bootloaderen starter installasjonen automatisk etter at du "
-"har startet datamaskinen på nytt. Hvis det ikke skjer, må du kanskje "
-"konfigurere BIOS-en eller trykke på en tast som vil gi deg mulighet til å "
-"velge den perifere som datamaskinen vil starte opp fra."
+#. 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 ""
-"Avhengig av hvilken maskinvare du har, og hvordan den er konfigurert, får du "
-"opp en av de to skjermene nedenfor."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:7
-msgid "From a USB device"
-msgstr "Fra en USB disk"
+#. 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 ""
-"Du kan starte opp fra USB-enheten som du dumpet ISO bildet på. I henhold til "
-"BIOS-innstillingene, kan datamaskinen oppstart skje direkte fra USB-enheten. "
-"Hvis det ikke skjer, må du kanskje konfigurere BIOS eller trykke på en tast "
-"som vil gi deg mulighet til å velge oppstartsmedium."
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:12
+#: en/bootLive.xml:35
 msgid "In BIOS/CSM/Legacy mode"
 msgstr "I BIOS/CSM/historisk modus"
 
+#. 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\">Arbeidsstasjon</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 ""
+"Konfigurasjonsparametrerne du har satt her, er lagret for bruk i "
+"installasjonen."
+
+#. 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\"> Vennligst velg ønsket sikkerhetsnivå </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\">Arbeidsstasjon</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 ""
+"Installer Mageia: Dette valget installerer Mage umiddelbart på harddisken."
+
+#. 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=\"dx2-selectKeyboard.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 "Første skjermbilde mens systemet starter i BIOS modus"
 
-#. type: Content of: <section><section><para>
-#: en/bootLive.xml:12
-msgid "In the middle menu, you have the choice between three actions:"
-msgstr "I midtmenyen har du tre valgmuligheter:"
+#. 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 ""
-"Boot Mageia: Det betyr at Mageia starter fra det tilkoblede media (CD / DVD "
-"eller USB-pinne) uten å skrive noe på disken, så forvent et veldig tregt "
-"system. Når oppstarten er ferdig, kan du fortsette til installasjonen på en "
-"harddisk."
+#: en/bootLive.xml:75
+#, fuzzy
+msgid "<keycap>F1</keycap> <emphasis role=\"bold\">Help</emphasis>"
+msgstr "<emphasis role=\"bold\">Tjener</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:16
+#: en/bootLive.xml:76
+#, fuzzy
 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 ""
-"Installer Mageia: Dette valget installerer Mage umiddelbart på harddisken."
+"I noen av alternativene <emphasis role=\"bold\"> F2 </emphasis> til "
+"<emphasis role=\"bold\"> F6 </emphasis> kan du vise relevant hjelp ved å "
+"trykke på <emphasis role=\"bold\"> F1 </emphasis>"
 
 #. 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\">Avansert</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 ""
-"Boot fra harddisk: Dette valget lar deg starte opp fra harddisken, som "
-"vanlig, når det ikke er koblet til noe medie (CD / DVD eller USB-pinne). "
-"(Virker ikke med Mageia 5)."
 
-#. type: Content of: <section><section><para>
-#: en/bootLive.xml:19
-msgid "In the bottom menu, are the Boot Options:"
-msgstr "I menyen nederst finns Oppstartsalternativene:"
+#. 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\">Avansert</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 - Hjelp. Forklarer alternativene \"splash\", \"apm\", \"acpi\" og \"Ide\""
+"Hvis nødvendig, endrer du skjermoppløsningen ved å trykke <emphasis role="
+"\"bold\"> F3 </emphasis> (Kun Legacy modus)."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:20
-msgid "F2 - Language. Choose the display language of the screens."
-msgstr "F2 - Språk. Velg visningsspråket på skjermbildene."
+#: en/bootLive.xml:93
+#, fuzzy
+msgid "<keycap>F4</keycap> <emphasis role=\"bold\">Source</emphasis>"
+msgstr "<emphasis role=\"bold\">Tjener</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:21
-msgid "F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728"
-msgstr "F3 - Skjermoppløsning. Velg mellom tekst, 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 ""
 
 #. 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 eller annet. Vanligvis utføres installasjonen fra det "
 "installerte installasjonsmediet. Her kan du velge andre kilder, som FTP- "
@@ -677,119 +776,178 @@ msgstr ""
 "serveren med dette alternativet."
 
 #. 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\">Tjener</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 - Driver. Ja eller Nei. Systemet er kjenner igjen en CD/DVD disk med en "
-"driveroppdatering, og vil be om at den blir tilgjengelig under "
-"installasjonsprosessen."
 
 #. 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\">Arbeidsstasjon</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:106
+#, fuzzy
 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 ""
+"Hvis du opplever problemer med installasjonen, kan du prøve å endre "
+"standardinnstillingene ved hjelp av <emphasis role=\"bold\"> F6 </emphasis> "
+"<emphasis role=\"bold\"> Kernel Options </emphasis> (for UEFI-systemer "
+"trykker <emphasis role=\"bold\"> e </emphasis> i stedet)."
+
+#. 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\">Juster til</emphasis> = MiB"
+
+#. 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 ""
+"- Ingen ACPI (Advanced Configuration and Power Interface), strømstyring blir "
+"ikke tatt i bruk."
+
+#. 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 ""
+"Ingen lokal APIC: (Local Advanced Programmable Interrupt Controller): CPU "
+"avbrudd. Velg dette alternativet hvis du opplever systemmishandling som "
+"kjernepanikk i forhold til APIC."
+
+#. 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 - Kjerne alternativer. Dette er en måte å spesifisere alternativer i "
-"henhold til din maskinvare og hvilke drivere som skal brukes."
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:29
+#: en/bootLive.xml:139
 msgid "In UEFI mode"
 msgstr "I UEFI modus"
 
 #. 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 "Første skjermbilde mens systemet starter fra UEFI på disken"
+#: en/bootLive.xml:146
+#, fuzzy
+msgid "First screen while booting in UEFI mode"
+msgstr "Første skjermbilde mens systemet starter i BIOS modus"
 
 #. 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 ""
-"Du har bare vlgene mellom å kjøre Mageia i Live modus (første valget) eller "
-"å fortsette installasjonen (andre valget)."
 
-#. 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 ""
-"Hvis du starter opp fra en USB-pinne, får du to tilleggslinjer som er en "
-"duplikat av de forrige linjene med med \"USB\" på slutten. Du må velge dem."
+"Boot Mageia: Det betyr at Mageia starter fra det tilkoblede media (CD / DVD "
+"eller USB-pinne) uten å skrive noe på disken, så forvent et veldig tregt "
+"system. Når oppstarten er ferdig, kan du fortsette til installasjonen på en "
+"harddisk."
 
-#. 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 ""
-"I hvert tilfelle vil de første trinnene være de samme for å velge språk, "
-"tidssone og tastatur. Prosessene er forskjellige, med <link linkend=\"testing"
-"\">ytterligere trinn i Live-modus</link>."
 
 #. type: Content of: <section><info><title>
-#: en/chooseDesktop.xml:3
+#: en/chooseDesktop.xml:16
 msgid "Desktop Selection"
 msgstr "Skrivebordsvalg"
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:8
-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 ""
-"Avhengig av valg ditt, kan du bli tilbudt ytterligere skjermerbilder for å "
-"finjustere valget ditt."
 
 #. 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 ""
 "Etter utvelgelsestrinne(ne) vil du se et lysbildefremvisning under "
 "pakkeinstallasjonen. Lysbildefremvisningen kan deaktiveres ved å trykke på "
 "<guilabel> Detaljer </guilabel> -knappen."
 
 #. 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 format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
 "align=\"center\"/> </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 <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."
+"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 ""
+"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 ""
 "Velg om du foretrekker å bruke <application>KDE</application> <emphasis role="
 "\"bold\"> Plasma </emphasis> eller <application> GNOME </application> "
@@ -807,8 +965,9 @@ msgid "Package Group Selection"
 msgstr "Valg pakkegruppe"
 
 #. 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
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
 "\" align=\"center\"/> </imageobject>"
@@ -817,7 +976,7 @@ msgstr ""
 "\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:14
+#: en/choosePackageGroups.xml:16
 msgid ""
 "Packages are arranged into common groups, to make choosing what you need on "
 "your system a lot easier. The groups are fairly self explanatory, however "
@@ -830,22 +989,22 @@ msgstr ""
 "musen svever over dem."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:21
+#: en/choosePackageGroups.xml:23
 msgid "<emphasis role=\"bold\">Workstation</emphasis>"
 msgstr "<emphasis role=\"bold\">Arbeidsstasjon</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:25
+#: en/choosePackageGroups.xml:27
 msgid "<emphasis role=\"bold\">Server</emphasis>"
 msgstr "<emphasis role=\"bold\">Tjener</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:29
+#: en/choosePackageGroups.xml:31
 msgid "<emphasis role=\"bold\">Graphical Environment</emphasis>"
 msgstr "<emphasis role=\"bold\">Grafisk Miljø</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:33
+#: en/choosePackageGroups.xml:35
 msgid ""
 "<emphasis role=\"bold\">Individual Package Selection</emphasis>: you can use "
 "this option to manually add or remove packages"
@@ -854,7 +1013,7 @@ msgstr ""
 "dette alternativet til å manuelt legge til eller fjerne pakker"
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:38
+#: en/choosePackageGroups.xml:40
 msgid ""
 "See <xref linkend=\"minimal-install\"/> for instructions on how to do a "
 "minimal install (without or with X &amp; IceWM)."
@@ -868,8 +1027,10 @@ msgid "Choose Individual Packages"
 msgstr "Individuelt pakkevalg"
 
 #. 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
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackagesTree.png"
 "\" align=\"center\"/> </imageobject>"
@@ -878,7 +1039,7 @@ msgstr ""
 "\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:14
+#: en/choosePackagesTree.xml:18
 msgid ""
 "Here you can add or remove any extra packages to customize your installation."
 msgstr ""
@@ -886,13 +1047,14 @@ msgstr ""
 "installasjonen."
 
 #. 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 ""
 "Etter at du har gjort ditt valg, kan du klikke på <guibutton>diskettikon</"
 "guibutton> nederst på siden for å lagre dine pakkevalg (lagring til en USB-"
@@ -907,8 +1069,10 @@ msgstr "Konfigurer tjenestene dine"
 
 #.  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
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-configureServices.png"
 "\" xml:id=\"configureServices-im1\" align=\"center\" revision=\"1\"/> </"
@@ -919,26 +1083,24 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:16
+#: en/configureServices.xml:20
 msgid ""
 "Here you can choose which services should start when you boot your system."
 msgstr ""
 "Her kan du velge hvilke tjenester som skal starte når du starter opp "
 "systemet ditt."
 
-#. 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
+#, fuzzy
+msgid ""
+"Click on a triangle to expand a group to all the relevant services. The "
+"settings DrakX chose are usually good."
 msgstr ""
 "Klikk på en trekant for å utvide en gruppe til alle relevante tjenester."
 
-#. type: Content of: <section><para>
-#: en/configureServices.xml:22
-msgid "The settings DrakX chose are usually good."
-msgstr "Parametrene som DrakX velger er som regel gode. "
-
-#. 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."
@@ -946,7 +1108,7 @@ msgstr ""
 "Når du markerer en tjeneste, vil det vises mer informasjon  i boksen under."
 
 #. 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 "Du bør bare endre ting når vet veldig godt hva du gjør."
 
@@ -957,14 +1119,17 @@ msgstr "Sett opp tidssonen din"
 
 #.  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 format=\"PNG\" xml:id="
 "\"configureTimezoneUTC-im1\" align=\"center\" fileref=\"dx2-"
@@ -972,17 +1137,18 @@ msgstr ""
 "<imagedata format=\"PNG\" fileref=\"live-timeZone.png\" condition=\"live\"/> "
 "</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 ""
 "Velg din tidssone gjennom å velge landet ditt eller en by nære deg i den "
 "samme tidssonen."
 
 #. type: Content of: <section><para>
-#: en/configureTimezoneUTC.xml:24
+#: en/configureTimezoneUTC.xml:32
 msgid ""
 "In the next screen you can choose to set your hardware clock to local time "
 "or to GMT, also known as UTC."
@@ -991,7 +1157,7 @@ msgstr ""
 "eller til GMT, også kjent som 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."
@@ -1000,23 +1166,23 @@ msgstr ""
 "til samme lokaltid eller UTC."
 
 #. 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 "Velg en X-tjener (Konfigurer grafikk kortet ditt)"
 
 #. 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=\"configureX_card_list-im1\" "
-"align=\"center\" fileref=\"dx2-configureX_card_list.png\" 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/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."
@@ -1025,7 +1191,7 @@ msgstr ""
 "identifisere videoenheten riktig."
 
 #. 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:"
@@ -1033,30 +1199,34 @@ msgstr ""
 "Hvis installatsjonen ikke har registrert ditt grafikkort på riktig måte, og "
 "du vet hvilket du har, kan du velge det fra treet ved å:"
 
-#. 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 "Leverandør"
 
 #. 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 "angi så navnet på kortet ditt"
 
 #. 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 "og korttypen"
 
 #. 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 ""
 "Hvis du ikke finner kortet ditt i leverandørlistene (fordi det ikke er i "
 "databasen eller det er et eldre kort), kan du finne en passende driver i "
@@ -1065,66 +1235,63 @@ msgstr ""
 "bestemt driver for kortet ditt, er det muligheten til å bruke <emphasis role="
 "\"bold\"> vesa </emphasis> -driveren som gir grunnleggende funksjoner."
 
-#. 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 ""
 "Vær oppmerksom på at hvis du velger en inkompatibel driver, risikerer du å "
 "bare få tilgang til grensesnittet <emphasis role=\"bold\"> Kommandolinje </"
 "emphasis>."
 
 #. 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 ""
 "Enkelte skjermkortprodusenter tilbyr proprietære drivere for Linux, som bare "
 "er tilgjengelige i <emphasis role=\"bold\"> Nonfree </emphasis> pakkebrønner "
 "og i enkelte tilfeller bare fra kortprodusentens nettsteder."
 
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:56
-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 ""
-"Pakkebrønnen <emphasis role=\"bold\"> Nonfree </emphasis> må eksplisitt "
-"aktiveres for å få tilgang til dem. Hvis du ikke aktiverte den tidligere, "
-"bør du gjøre dette etter første omstart."
-
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:3
+#: en/configureX_chooser.xml:11
 msgid "Graphic Card and Monitor Configuration"
 msgstr "Grafikk kort og Skjerm konfigurasjon"
 
 #.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
+#. 2018/02/15 apb: Some text and typography.
+#. 2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.
+#. 2018/02/23 apb: Typo.
 #. 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=\"configureX_chooser-im1\" "
-"fileref=\"dx2-configureX_chooser.png\" align=\"center\" 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/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 ""
 "Uansett hvilket grafisk miljø (også kjent som skrivebordsmiljø) du valgte "
 "for installasjonen av <application> Mageia </application>, er de alle basert "
@@ -1136,22 +1303,33 @@ msgstr ""
 "vises, eller hvis du tror at detaljene er feil."
 
 #. 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\">Grafisk Miljø</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>Grafikk kort</guibutton></emphasis>: Velg kortet ditt "
-"fra listen om nødvendig."
 
 #. 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\">Tjener</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> Skjermtype </guibutton> </emphasis>: Du kan velge "
 "<guilabel> Plug'n Play </guilabel> hvis det er aktuelt, eller velg skjermen "
@@ -1159,30 +1337,37 @@ msgstr ""
 "guilabel> liste. Velg <guilabel> Tilpasset </guilabel> hvis du foretrekker å "
 "manuelt angi horisontal og vertikal oppdateringshastighet på skjermen."
 
-#. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/configureX_chooser.xml:41
-msgid "Incorrect refresh rates may damage your monitor"
-msgstr "Feil oppdateringsfrekvens kan skade skjermen"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_chooser.xml:60
+#, fuzzy
+msgid "<emphasis role=\"bold\">Resolution</emphasis>"
+msgstr "<emphasis role=\"bold\">Arbeidsstasjon</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:47
-msgid ""
-"<emphasis><guibutton>Resolution</guibutton></emphasis>: The resolution and "
-"color depth of your monitor can be set here."
+#: en/configureX_chooser.xml:63
+#, fuzzy
+msgid "The resolution and color depth of your monitor can be set here"
 msgstr ""
 "<emphasis> <guibutton> Oppløsning </guibutton> </emphasis>: Oppløsningen og "
 "fargedybden på skjermen din kan stilles inn her."
 
 #. 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\">Tjener</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>: Testknappen vises ikke "
 "alltid under installasjonen. Hvis alternativet vises, og du tester "
@@ -1194,21 +1379,35 @@ msgstr ""
 "innstillingene er korrekte."
 
 #. 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\">Arbeidsstasjon</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>Alternativer</guibutton></emphasis>: Her kan du velge å "
 "aktivere eller deaktivere ulike alternativer."
 
+#. 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 "Velg en monitor"
 
 #. 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."
@@ -1217,7 +1416,7 @@ msgstr ""
 "identifisere dine korrekt."
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:19
+#: en/configureX_monitor.xml:30
 msgid ""
 "<emphasis role=\"bold\">Selecting a monitor with different characteristics "
 "could damage your monitor or video hardware. Please don't try something "
@@ -1229,25 +1428,26 @@ msgstr ""
 "gjør. </emphasis> Hvis du er i tvil, bør du konsultere skjermdokumentasjonen."
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:26
+#: en/configureX_monitor.xml:38
+#, fuzzy
 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=\"configureX_monitor-im1\" "
-"fileref=\"dx2-configureX_monitor.png\" align=\"center\" 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/configureX_monitor.xml:31
-msgid "<emphasis>Custom</emphasis>"
-msgstr "<emphasis>Tilpasset</emphasis>"
+#. type: Content of: <section><variablelist><varlistentry><term>
+#: en/configureX_monitor.xml:46
+msgid "Custom"
+msgstr ""
 
-#. 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."
@@ -1257,8 +1457,8 @@ msgstr ""
 "Vertikal oppdatering bestemmer hvor ofte skjermen oppdateres, og horisontal "
 "synkronisering er frekvensen der skannelinjer vises."
 
-#. 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 "
@@ -1270,27 +1470,23 @@ msgstr ""
 "skjermen. Hvis du er i tvil, velg en konservativ innstilling og konsulter "
 "skjermdokumentasjonen."
 
-#. 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 ""
 "Dette er standardalternativet og prøver å finne skjermtype fra "
 "skjermdatabasen."
 
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:51
-msgid "<emphasis>Vendor</emphasis>"
-msgstr "<emphasis>Leverandør</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:"
@@ -1298,30 +1494,30 @@ msgstr ""
 "Hvis installasjonen ikke har registrert skjermen riktig og du vet hvilken du "
 "har, kan du velge den fra treet ved å velge:"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:61
-msgid "the monitor manufacturers name"
-msgstr "skjermens produsent"
+#. 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 "skjermbeskrivelse"
+#. 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>Generisk</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 ""
 "Hvis du velger denne gruppen, vises nesten 30 skjermkonfigurasjoner som "
 "1024x768 @ 60Hz og inkluderer flatskjermer som brukes i bærbare "
@@ -1331,77 +1527,56 @@ msgstr ""
 "valgene dine."
 
 #. 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 "Egendefinert partisjonering med 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"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.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
-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 ""
-"Hvis du ønsker å bruke kryptering på <emphasis role=\"bold\"> / </emphasis> "
-"partisjonen, må du sørge for at du har en egen <emphasis role=\"bold\"> / "
-"boot </emphasis> partisjon. Krypteringsalternativet for <emphasis role=\"bold"
-"\"> / boot </emphasis> partisjonen må IKKE settes, ellers vil systemet ikke "
-"kunne startes."
+"<imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/> </imageobject>"
 
-#. 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 ""
 "Endre oppsettet til disken(e) dine her. Du kan fjerne eller opprette "
 "partisjoner, endre filsystemet til en partisjon eller endre størrelsen og "
 "til og med se detaljene for den før du starter."
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:34
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/diskdrake.xml:45
+#, fuzzy
 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>."
+"device, like a USB key). In the screenshot above there are two available "
+"devices: <filename>sda </filename>and <filename>sdb</filename>."
 msgstr ""
 "For hver oppdaget harddisk, (eller annen lagringsenhet som en USB-nøkkel), "
 "finnes det en kategori øverst . I skjermbildet ovenfor er det to "
 "tilgjengelige enheter: <emphasis role=\"bold\"> sda </emphasis> og <emphasis "
 "role=\"bold\"> sdb </emphasis>."
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:39
-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."
-msgstr ""
-"Vær forsiktig med <guibutton> Fjern alt </guibutton> -alternativet, bruk det "
-"bare hvis du er sikker på at du vil slette alle partisjoner på den valgte "
-"lageringsenheten."
-
-#. 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 ""
 "For alle andre handlinger: Klikk først på ønsket partisjon. Deretter se på "
 "den, eller velg et filsystem og et monteringspunkt, endre størrelsen på den "
@@ -1409,53 +1584,92 @@ msgstr ""
 "alternativer som å angi en etikett (gi navn til) en partisjon, eller å velge "
 "en partisjonstype."
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:49
-msgid "Continue until you have adjusted everything to your satisfaction."
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/diskdrake.xml:60
+#, fuzzy
+msgid ""
+"Continue until you have adjusted everything to your satisfaction, then click "
+"<emphasis>Done</emphasis> when you're ready."
 msgstr "Fortsett til du har justerert alt etter dine ønsker."
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:52
-msgid "Click <guibutton>Done</guibutton> when you're ready."
-msgstr "Klikk<guibutton>Ferdig</guibutton> når du er klar."
+#. 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 ""
+"Vær forsiktig med <guibutton> Fjern alt </guibutton> -alternativet, bruk det "
+"bare hvis du er sikker på at du vil slette alle partisjoner på den valgte "
+"lageringsenheten."
 
-#. 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 ""
+"Hvis du ønsker å bruke kryptering på <emphasis role=\"bold\"> / </emphasis> "
+"partisjonen, må du sørge for at du har en egen <emphasis role=\"bold\"> / "
+"boot </emphasis> partisjon. Krypteringsalternativet for <emphasis role=\"bold"
+"\"> / boot </emphasis> partisjonen må IKKE settes, ellers vil systemet ikke "
+"kunne startes."
+
+#. 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 ""
 "Hvis du installerer Mageia på et UEFI-system, må du kontrollere at en ESP "
 "(EFI System Partition) er tilstede og riktig montert på / boot / EFI (se "
 "nedenfor)"
 
-#. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:61
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/diskdrake.xml:93
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
-"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"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 ""
+"Hvis du installerer Mageia på et Legacy / GPT-system, må du kontrollere at "
+"en BIOS-oppstartspartisjon er tilstede og av riktig type"
+
+#. type: Content of: <section><figure><title>
+#: en/diskdrake.xml:101
+#, fuzzy
+msgid "EFI System Partition"
+msgstr "Bruk gamle partisjoner"
+
+#. type: Content of: <section><figure><mediaobject>
+#: en/diskdrake.xml:104
+#, fuzzy
+msgid ""
+"<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-diskdrake2.png"
 "\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/> </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
-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 ""
-"Hvis du installerer Mageia på et Legacy / GPT-system, må du kontrollere at "
-"en BIOS-oppstartspartisjon er tilstede og av riktig type"
 
-#. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:76
+#. type: Content of: <section><mediaobject>
+#: en/diskdrake.xml:118 en/doPartitionDisks.xml:200
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1468,50 +1682,60 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:9
-msgid "Partitioning"
+#: en/doPartitionDisks.xml:25
+#, fuzzy
+msgid "Suggested Partitioning"
 msgstr "Partisjonering"
 
 #. 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 ""
 "På denne skjermen kan du se innholdet på harddisken(e) dine og se løsningene "
 "som DrakX partisjoneringsveiviseren fant for å "
 "installere<application>Mageia</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 ""
 "Alternativene som er tilgjengelige fra listen nedenfor, vil variere avhengig "
 "av hvilken type harddisk (er) og innhold."
 
 #. 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-"
-"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
-"\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:32
-msgid "Use Existing Partitions"
-msgstr "Bruk gamle partisjoner"
+#. type: Content of: <section><itemizedlist><title>
+#: en/doPartitionDisks.xml:47
+#, fuzzy
+msgid "Main Options"
+msgstr "Valg"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>

path: root/perl-install/Makefile.config

# -*- Makefile -*-
VERSION:=10.10

SUDO        = sudo
TMPDIR      = /tmp
SO_FILES    = c/blib/arch/auto/c/c.so                                                                 

# PMS_DIRS is used only in drakxtools
PMS_DIRS    = c diskdrake harddrake interactive modules partition_table resize_fat security fs fs/remote

PMS         = *.pm $(PMS_DIRS:%=%/*.pm) install/*.pm install/help/*.pm install/commands install/install2
STANDALONEPMS_ = adduserdrake bootloader-config diskdrake drakauth drakboot drakbug drakbug_report drakclock drakedm drakfont drakhelp drakperm draksec draksound draksplash drakupdate_fstab drakups drakxservices drakxtv fileshareset finish-install harddrake2 localedrake logdrake lsnetdrake scannerdrake service_harddrake service_harddrake_confirm 

STANDALONEPMS = $(STANDALONEPMS_:%=standalone/%)
ALLPMS	    = $(PMS) $(STANDALONEPMS)
PERL        = perl
LOCALFILES  = $(patsubst %, ../tools/%,serial_probe/serial_probe xhost+)
DIRS        = c resize_fat #po 
CFLAGS	    = -Wall
override CFLAGS  += -pipe